Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 20:30:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1514679 - Drop aFirstPass from ReflowScrolledFrame. r=botond

Browse Source 
It hasn't been used since bug 300030.

Depends on D14715

Differential Revision: https://phabricator.services.mozilla.com/D14716

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Hiroyuki Ikezoe 2018-12-17 21:54:41 +00:00
parent d864a9f8f1
commit f0fe14fe8d
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/nsGfxScrollFrame.cpp
View File

@ -332,8 +332,7 @@ bool nsHTMLScrollFrame::TryLayout(ScrollReflowInput* aState,
mHelper.mScrolledFrame);
}
aKidMetrics->mOverflowAreas.Clear();
ReflowScrolledFrame(aState, aAssumeHScroll, aAssumeVScroll, aKidMetrics,
false);
ReflowScrolledFrame(aState, aAssumeHScroll, aAssumeVScroll, aKidMetrics);
}
nsSize vScrollbarMinSize(0, 0);
@ -474,8 +473,7 @@ bool nsHTMLScrollFrame::ScrolledContentDependsOnHeight(
void nsHTMLScrollFrame::ReflowScrolledFrame(ScrollReflowInput* aState,
bool aAssumeHScroll,
bool aAssumeVScroll,
ReflowOutput* aMetrics,
bool aFirstPass) {
ReflowOutput* aMetrics) {
WritingMode wm = mHelper.mScrolledFrame->GetWritingMode();
// these could be NS_UNCONSTRAINEDSIZE ... std::min arithmetic should
@ -683,7 +681,7 @@ void nsHTMLScrollFrame::ReflowContents(ScrollReflowInput* aState,
const ReflowOutput& aDesiredSize) {
ReflowOutput kidDesiredSize(aDesiredSize.GetWritingMode());
ReflowScrolledFrame(aState, GuessHScrollbarNeeded(*aState),
GuessVScrollbarNeeded(*aState), &kidDesiredSize, true);
GuessVScrollbarNeeded(*aState), &kidDesiredSize);
// There's an important special case ... if the child appears to fit
// in the inside-border rect (but overflows the scrollport), we
@ -715,7 +713,7 @@ void nsHTMLScrollFrame::ReflowContents(ScrollReflowInput* aState,
if (nsRect(nsPoint(0, 0), insideBorderSize).Contains(scrolledRect)) {
// Let's pretend we had no scrollbars coming in here
kidDesiredSize.mOverflowAreas.Clear();
ReflowScrolledFrame(aState, false, false, &kidDesiredSize, false);
ReflowScrolledFrame(aState, false, false, &kidDesiredSize);
}
}

3
layout/generic/nsGfxScrollFrame.h
View File

@ -739,8 +739,7 @@ class nsHTMLScrollFrame : public nsContainerFrame,
bool aAssumeVScroll, bool aAssumeHScroll, bool aForce);
bool ScrolledContentDependsOnHeight(ScrollReflowInput* aState);
void ReflowScrolledFrame(ScrollReflowInput* aState, bool aAssumeHScroll,
bool aAssumeVScroll, ReflowOutput* aMetrics,
bool aFirstPass);
bool aAssumeVScroll, ReflowOutput* aMetrics);
void ReflowContents(ScrollReflowInput* aState,
const ReflowOutput& aDesiredSize);
void PlaceScrollArea(ScrollReflowInput& aState,