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

Bug 725095 - Address Layout review comments. r=mats

Browse Source
This commit is contained in:
Ali Juma 2012-03-13 12:57:31 -04:00
parent 19c2ee8e00
commit 0e369cf4b3
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/base/FrameLayerBuilder.cpp
View File

@ -871,7 +871,7 @@ ContainerState::CreateOrRecycleThebesLayer(nsIFrame* aActiveScrolledRoot)
matrix.Translate(gfxPoint(pixOffset.x, pixOffset.y));
layer->SetTransform(gfx3DMatrix::From2D(matrix));
// FIXME: Temporary workaround for bug 681192 and bug 724786. Uncomment this code before review!
// FIXME: Temporary workaround for bug 681192 and bug 724786.
#ifndef MOZ_JAVA_COMPOSITOR
// Calculate exact position of the top-left of the active scrolled root.
// This might not be 0,0 due to the snapping in ScaleToNearestPixels.

9
layout/generic/nsGfxScrollFrame.cpp
View File

@ -2172,13 +2172,12 @@ nsGfxScrollFrameInner::BuildDisplayList(nsDisplayListBuilder* aBuilder,
nsRect scrollRange = GetScrollRange();
ScrollbarStyles styles = GetScrollbarStylesFromFrame();
mShouldBuildLayer =
((XRE_GetProcessType() == GeckoProcessType_Content || usingDisplayport) &&
(styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN ||
styles.mVertical != NS_STYLE_OVERFLOW_HIDDEN) &&
(scrollRange.width > 0 ||
scrollRange.height > 0 || usingDisplayport) &&
(usingDisplayport || !mIsRoot ||
!mOuter->PresContext()->IsRootContentDocument()));
(usingDisplayport ||
(XRE_GetProcessType() == GeckoProcessType_Content &&
(scrollRange.width > 0 || scrollRange.height > 0) &&
(!mIsRoot || !mOuter->PresContext()->IsRootContentDocument())));
if (ShouldBuildLayer()) {
// ScrollLayerWrapper must always be created because it initializes the