mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-20 16:55:40 +00:00
Bug 1644271 - Add some MOZ_LOG for scrollbar layout attempts. r=tnikkel
I found this useful while debugging. It might be overkill to land it. Depends on D80085 Differential Revision: https://phabricator.services.mozilla.com/D80086
This commit is contained in:
parent
6529d86dc8
commit
1d44fcb849
@ -97,6 +97,11 @@ static mozilla::LazyLogModule sApzPaintSkipLog("apz.paintskip");
|
||||
static mozilla::LazyLogModule sScrollRestoreLog("scrollrestore");
|
||||
#define SCROLLRESTORE_LOG(...) \
|
||||
MOZ_LOG(sScrollRestoreLog, LogLevel::Debug, (__VA_ARGS__))
|
||||
static mozilla::LazyLogModule sRootScrollbarsLog("rootscrollbars");
|
||||
#define ROOT_SCROLLBAR_LOG(...) \
|
||||
if (mHelper.mIsRoot) { \
|
||||
MOZ_LOG(sRootScrollbarsLog, LogLevel::Debug, (__VA_ARGS__)); \
|
||||
}
|
||||
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::dom;
|
||||
@ -411,6 +416,9 @@ bool nsHTMLScrollFrame::TryLayout(ScrollReflowInput* aState,
|
||||
mHelper.mScrolledFrame);
|
||||
}
|
||||
aKidMetrics->mOverflowAreas.Clear();
|
||||
ROOT_SCROLLBAR_LOG(
|
||||
"TryLayout reflowing scrolled frame with scrollbars h=%d, v=%d\n",
|
||||
aAssumeHScroll, aAssumeVScroll);
|
||||
ReflowScrolledFrame(aState, aAssumeHScroll, aAssumeVScroll, aKidMetrics);
|
||||
}
|
||||
|
||||
@ -465,6 +473,8 @@ bool nsHTMLScrollFrame::TryLayout(ScrollReflowInput* aState,
|
||||
}
|
||||
|
||||
nsSize visualViewportSize = scrollPortSize;
|
||||
ROOT_SCROLLBAR_LOG("TryLayout with VV %s\n",
|
||||
Stringify(visualViewportSize).c_str());
|
||||
mozilla::PresShell* presShell = PresShell();
|
||||
if (mHelper.mIsRoot && presShell->IsVisualViewportSizeSet()) {
|
||||
visualViewportSize = nsLayoutUtils::CalculateCompositionSizeForFrame(
|
||||
@ -477,6 +487,8 @@ bool nsHTMLScrollFrame::TryLayout(ScrollReflowInput* aState,
|
||||
float resolution = presShell->GetResolution();
|
||||
visualViewportSize.width /= resolution;
|
||||
visualViewportSize.height /= resolution;
|
||||
ROOT_SCROLLBAR_LOG("TryLayout now with VV %s\n",
|
||||
Stringify(visualViewportSize).c_str());
|
||||
}
|
||||
|
||||
nsRect overflowRect = aState->mContentsOverflowAreas.ScrollableOverflow();
|
||||
@ -497,6 +509,10 @@ bool nsHTMLScrollFrame::TryLayout(ScrollReflowInput* aState,
|
||||
}
|
||||
nsRect scrolledRect =
|
||||
mHelper.GetUnsnappedScrolledRectInternal(overflowRect, scrollPortSize);
|
||||
ROOT_SCROLLBAR_LOG(
|
||||
"TryLayout scrolledRect:%s overflowRect:%s scrollportSize:%s\n",
|
||||
Stringify(scrolledRect).c_str(), Stringify(overflowRect).c_str(),
|
||||
Stringify(scrollPortSize).c_str());
|
||||
nscoord oneDevPixel = aState->mBoxState.PresContext()->DevPixelsToAppUnits(1);
|
||||
|
||||
if (!aForce) {
|
||||
@ -512,6 +528,8 @@ bool nsHTMLScrollFrame::TryLayout(ScrollReflowInput* aState,
|
||||
scrollPortSize.width < hScrollbarMinSize.width) {
|
||||
wantHScrollbar = false;
|
||||
}
|
||||
ROOT_SCROLLBAR_LOG("TryLayout wants H Scrollbar: %d =? %d\n",
|
||||
wantHScrollbar, aAssumeHScroll);
|
||||
if (wantHScrollbar != aAssumeHScroll) {
|
||||
return false;
|
||||
}
|
||||
@ -529,6 +547,8 @@ bool nsHTMLScrollFrame::TryLayout(ScrollReflowInput* aState,
|
||||
scrollPortSize.height < vScrollbarMinSize.height) {
|
||||
wantVScrollbar = false;
|
||||
}
|
||||
ROOT_SCROLLBAR_LOG("TryLayout wants V Scrollbar: %d =? %d\n",
|
||||
wantVScrollbar, aAssumeVScroll);
|
||||
if (wantVScrollbar != aAssumeVScroll) {
|
||||
return false;
|
||||
}
|
||||
@ -828,10 +848,16 @@ void nsHTMLScrollFrame::ReflowContents(ScrollReflowInput* aState,
|
||||
|
||||
// Try leaving the horizontal scrollbar unchanged first. This will be more
|
||||
// efficient.
|
||||
ROOT_SCROLLBAR_LOG("Trying layout1 with %d, %d\n",
|
||||
aState->mReflowedContentsWithHScrollbar,
|
||||
aState->mReflowedContentsWithVScrollbar);
|
||||
if (TryLayout(aState, &kidDesiredSize,
|
||||
aState->mReflowedContentsWithHScrollbar,
|
||||
aState->mReflowedContentsWithVScrollbar, false))
|
||||
return;
|
||||
ROOT_SCROLLBAR_LOG("Trying layout2 with %d, %d\n",
|
||||
!aState->mReflowedContentsWithHScrollbar,
|
||||
aState->mReflowedContentsWithVScrollbar);
|
||||
if (TryLayout(aState, &kidDesiredSize,
|
||||
!aState->mReflowedContentsWithHScrollbar,
|
||||
aState->mReflowedContentsWithVScrollbar, false))
|
||||
@ -842,14 +868,17 @@ void nsHTMLScrollFrame::ReflowContents(ScrollReflowInput* aState,
|
||||
// does not exist here (we'll have to reflow due to the vertical scrollbar
|
||||
// change), so always try no horizontal scrollbar first.
|
||||
bool newVScrollbarState = !aState->mReflowedContentsWithVScrollbar;
|
||||
ROOT_SCROLLBAR_LOG("Trying layout3 with %d, %d\n", false, newVScrollbarState);
|
||||
if (TryLayout(aState, &kidDesiredSize, false, newVScrollbarState, false))
|
||||
return;
|
||||
ROOT_SCROLLBAR_LOG("Trying layout4 with %d, %d\n", true, newVScrollbarState);
|
||||
if (TryLayout(aState, &kidDesiredSize, true, newVScrollbarState, false))
|
||||
return;
|
||||
|
||||
// OK, we're out of ideas. Try again enabling whatever scrollbars we can
|
||||
// enable and force the layout to stick even if it's inconsistent.
|
||||
// This just happens sometimes.
|
||||
ROOT_SCROLLBAR_LOG("Giving up, adding both scrollbars...\n");
|
||||
TryLayout(aState, &kidDesiredSize,
|
||||
aState->mHScrollbar != ShowScrollbar::Never,
|
||||
aState->mVScrollbar != ShowScrollbar::Never, true);
|
||||
|
Loading…
Reference in New Issue
Block a user