Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 01:05:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1050412 part 1: Use nsFrameList::Enumerator in nsSimplePageSequenceFrame to iterate over child frames. r=tn

Browse Source
This commit is contained in:
Daniel Holbert 2014-08-07 22:07:15 -07:00
parent c8bac35511
commit 405e80dc03
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
layout/generic/nsSimplePageSequenceFrame.cpp
View File

@ -201,7 +201,8 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext* aPresContext,
// Tile the pages vertically
nsHTMLReflowMetrics kidSize(aReflowState);
for (nsIFrame* kidFrame = mFrames.FirstChild(); nullptr != kidFrame; ) {
for (nsFrameList::Enumerator e(mFrames); !e.AtEnd(); e.Next()) {
nsIFrame* kidFrame = e.get();
// Set the shared data into the page frame before reflow
nsPageFrame * pf = static_cast<nsPageFrame*>(kidFrame);
pf->SetSharedPageData(mPageData);
@ -244,22 +245,17 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext* aPresContext,
// Add it to our child list
mFrames.InsertFrame(nullptr, kidFrame, continuingPage);
}
// Get the next page
kidFrame = kidFrame->GetNextSibling();
}
// Get Total Page Count
nsIFrame* page;
int32_t pageTot = 0;
for (page = mFrames.FirstChild(); page; page = page->GetNextSibling()) {
pageTot++;
}
// XXXdholbert technically we could calculate this in the loop above,
// instead of needing a separate walk.
int32_t pageTot = mFrames.GetLength();
// Set Page Number Info
int32_t pageNum = 1;
for (page = mFrames.FirstChild(); page; page = page->GetNextSibling()) {
nsPageFrame * pf = static_cast<nsPageFrame*>(page);
for (nsFrameList::Enumerator e(mFrames); !e.AtEnd(); e.Next()) {
nsPageFrame * pf = static_cast<nsPageFrame*>(e.get());
if (pf != nullptr) {
pf->SetPageNumInfo(pageNum, pageTot);
}
@ -421,8 +417,8 @@ nsSimplePageSequenceFrame::StartPrint(nsPresContext* aPresContext,
int32_t pageNum = 1;
nscoord y = 0;//mMargin.top;
for (nsIFrame* page = mFrames.FirstChild(); page;
page = page->GetNextSibling()) {
for (nsFrameList::Enumerator e(mFrames); !e.AtEnd(); e.Next()) {
nsIFrame* page = e.get();
if (pageNum >= mFromPageNum && pageNum <= mToPageNum) {
nsRect rect = page->GetRect();
rect.y = y;