mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 725095 - Address Layout review comments. r=mats
This commit is contained in:
parent
031a31e69a
commit
62fb2dc162
@ -871,7 +871,7 @@ ContainerState::CreateOrRecycleThebesLayer(nsIFrame* aActiveScrolledRoot)
|
|||||||
matrix.Translate(gfxPoint(pixOffset.x, pixOffset.y));
|
matrix.Translate(gfxPoint(pixOffset.x, pixOffset.y));
|
||||||
layer->SetTransform(gfx3DMatrix::From2D(matrix));
|
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
|
#ifndef MOZ_JAVA_COMPOSITOR
|
||||||
// Calculate exact position of the top-left of the active scrolled root.
|
// Calculate exact position of the top-left of the active scrolled root.
|
||||||
// This might not be 0,0 due to the snapping in ScaleToNearestPixels.
|
// This might not be 0,0 due to the snapping in ScaleToNearestPixels.
|
||||||
|
@ -2172,13 +2172,12 @@ nsGfxScrollFrameInner::BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
|||||||
nsRect scrollRange = GetScrollRange();
|
nsRect scrollRange = GetScrollRange();
|
||||||
ScrollbarStyles styles = GetScrollbarStylesFromFrame();
|
ScrollbarStyles styles = GetScrollbarStylesFromFrame();
|
||||||
mShouldBuildLayer =
|
mShouldBuildLayer =
|
||||||
((XRE_GetProcessType() == GeckoProcessType_Content || usingDisplayport) &&
|
|
||||||
(styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN ||
|
(styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN ||
|
||||||
styles.mVertical != NS_STYLE_OVERFLOW_HIDDEN) &&
|
styles.mVertical != NS_STYLE_OVERFLOW_HIDDEN) &&
|
||||||
(scrollRange.width > 0 ||
|
(usingDisplayport ||
|
||||||
scrollRange.height > 0 || usingDisplayport) &&
|
(XRE_GetProcessType() == GeckoProcessType_Content &&
|
||||||
(usingDisplayport || !mIsRoot ||
|
(scrollRange.width > 0 || scrollRange.height > 0) &&
|
||||||
!mOuter->PresContext()->IsRootContentDocument()));
|
(!mIsRoot || !mOuter->PresContext()->IsRootContentDocument())));
|
||||||
|
|
||||||
if (ShouldBuildLayer()) {
|
if (ShouldBuildLayer()) {
|
||||||
// ScrollLayerWrapper must always be created because it initializes the
|
// ScrollLayerWrapper must always be created because it initializes the
|
||||||
|
Loading…
Reference in New Issue
Block a user