Changeset 187298 in webkit

Timestamp:

Jul 23, 2015, 11:27:40 PM (11 years ago)

Author:

Lucas Forschler

Message:

Merged r187116. rdar://problem/21110936

Location:

branches/safari-601.1-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-cover-expected.html (copied) (copied from trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-cover-expected.html )
• LayoutTests/platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-cover.html (copied) (copied from trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-cover.html )
• LayoutTests/platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-local-expected.html (copied) (copied from trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-local-expected.html )
• LayoutTests/platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-local.html (copied) (copied from trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-local.html )
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)

branches/safari-601.1-branch/LayoutTests/ChangeLog

@@ +1 @@
+2015-07-23  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r187116
+
+    2015-07-21  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+            REGRESSION (r172417, r184065): Multiple rendering issues with fixed attached background-image
+            https://bugs.webkit.org/show_bug.cgi?id=147049
+            <rdar://problem/21110936>
+
+            Reviewed by Simon Fraser.
+
+            fixedLayoutSize background-image rendering for root and non-root elements.
+
+            * platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-cover-expected.html: Added.
+            * platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-cover.html: Added.
+            * platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-local-expected.html: Added.
+            * platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-local.html: Added.
+
 2015-07-23  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-601.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-23  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r187116
+
+    2015-07-21  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+            REGRESSION (r172417, r184065): Multiple rendering issues with fixed attached background-image
+            https://bugs.webkit.org/show_bug.cgi?id=147049
+            <rdar://problem/21110936>
+
+            Reviewed by Simon Fraser.
+
+            The fixed-attached background-image rendering is special. In general, to
+            display it, the destinationSize should be set to visibleContentSize. The
+            destinationLocation should be set such that the background-image does
+            not move with scrolling. The topContentInset should be subtracted from
+            the destinationLocation such that background-image can be rendered blurred
+            in the topContentArea. However there are cases in which these rules have to
+            be changed.
+
+            -- destinationSize: In the case of fixed layout size, the fixedLayoutSize
+            is bigger than the visibleContentSize. In this case, if the background-image
+            belongs to the root element, the destinationSize has to be set to fixedLayoutSize.
+            Otherwise it has to be set to the borderBoxSize unless the overflow is
+            hidden.
+
+            -- destinationLocation: If the background-image belongs to the root element, no
+            scroll offset to added to destinationLocation. For non-root element case,
+            FrameView::documentScrollOffsetRelativeToViewOrigin() should be used if no page
+            scaling is applied. Otherwise FrameView::scrollOffsetForFixedPosition() should be
+            used instead.
+
+            Tests: platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-cover.html
+                   platform/mac-wk2/tiled-drawing/fixed-layout-size-fixed-attachment-local.html
+
+            * rendering/RenderBoxModelObject.cpp:
+            (WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry): Ensure
+            the geometry for the fixed-attached background-image is calculated correctly.
+
+            * rendering/RenderLayerBacking.cpp:
+            (WebCore::RenderLayerBacking::updateGeometry): Ensure the background layer
+            gets the correct size for the fixedLayoutSize mode.
+
 2015-07-23  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-601.1-branch/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -1116 +1116 @@
         else {
             FrameView& frameView = view().frameView();
-            viewportRect.setSize(frameView.unscaledVisibleContentSizeIncludingObscuredArea());
-            topContentInset = frameView.topContentInset(ScrollView::TopContentInsetType::WebCoreOrPlatformContentInset);
-
-            if (fixedBackgroundPaintsInLocalCoordinates())
-                viewportRect.setLocation(LayoutPoint(0, -topContentInset));
-            else
+            bool useFixedLayout = frameView.useFixedLayout() && !frameView.fixedLayoutSize().isEmpty();
+
+            if (useFixedLayout) {
+                // Use the fixedLayoutSize() when useFixedLayout() because the rendering will scale
+                // down the frameView to to fit in the current viewport.
+                viewportRect.setSize(frameView.fixedLayoutSize());
+            } else
+                viewportRect.setSize(frameView.unscaledVisibleContentSizeIncludingObscuredArea());
+
+            if (fixedBackgroundPaintsInLocalCoordinates()) {
+                if (!useFixedLayout) {
+                    // Shifting location up by topContentInset is needed for layout tests which expect
+                    // layout to be shifted down when calling window.internals.setTopContentInset().
+                    topContentInset = frameView.topContentInset(ScrollView::TopContentInsetType::WebCoreOrPlatformContentInset);
+                    viewportRect.setLocation(LayoutPoint(0, -topContentInset));
+                }
+            } else if (useFixedLayout || frameView.frameScaleFactor() != 1) {
+                // scrollOffsetForFixedPosition() is adjusted for page scale and it does not include
+                // topContentInset so do not add it to the calculation below.
+                viewportRect.setLocation(toLayoutPoint(frameView.scrollOffsetForFixedPosition()));
+            } else {
+                // documentScrollOffsetRelativeToViewOrigin() includes -topContentInset in its height
+                // so we need to account for that in calculating the phase size
+                topContentInset = frameView.topContentInset(ScrollView::TopContentInsetType::WebCoreOrPlatformContentInset);
                 viewportRect.setLocation(toLayoutPoint(frameView.documentScrollOffsetRelativeToViewOrigin()));
+            }
 
             top += topContentInset;

branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -926 +926 @@
             const FrameView& frameView = renderer().view().frameView();
             backgroundPosition = toLayoutPoint(frameView.scrollOffsetForFixedPosition());
-            backgroundSize = frameView.visibleContentRect().size();
+            backgroundSize = frameView.layoutSize();
         }
         m_backgroundLayer->setPosition(backgroundPosition);