Changeset 162480 in webkit

Timestamp:

Jan 21, 2014, 3:54:34 PM (12 years ago)

Author:

Simon Fraser

Message:

Remove #if PLATFORM(IOS) in various places around customFixedPositionLayoutRect() code
​https://bugs.webkit.org/show_bug.cgi?id=127373

Reviewed by Beth Dakin.

Instead of PLATFORM(IOS) #idefs at every call site for viewportConstrainedVisibleContentRect(),
move the #ifdef inside viewportConstrainedVisibleContentRect().

The one call site that needs special handling is RenderLayerBacking::updateCompositedBounds(),
which needs to avoid clipping fixed layers to the custom fixed position rect, but instead to
visibleContentRect() (which is really the document bounds on iOS). This ensures that the
fixed layers aren't clipped when zooming out.

• page/FrameView.cpp:

(WebCore::FrameView::viewportConstrainedVisibleContentRect):

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::stickyPositionOffset):

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateCompositedBounds):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::requiresCompositingForPosition):
(WebCore::RenderLayerCompositor::computeFixedViewportConstraints):
(WebCore::RenderLayerCompositor::computeStickyViewportConstraints):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-21  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove #if PLATFORM(IOS) in various places around customFixedPositionLayoutRect() code
+        https://bugs.webkit.org/show_bug.cgi?id=127373
+
+        Reviewed by Beth Dakin.
+
+        Instead of PLATFORM(IOS) #idefs at every call site for viewportConstrainedVisibleContentRect(),
+        move the #ifdef inside viewportConstrainedVisibleContentRect().
+        
+        The one call site that needs special handling is RenderLayerBacking::updateCompositedBounds(),
+        which needs to avoid clipping fixed layers to the custom fixed position rect, but instead to
+        visibleContentRect() (which is really the document bounds on iOS). This ensures that the
+        fixed layers aren't clipped when zooming out.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::viewportConstrainedVisibleContentRect):
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::stickyPositionOffset):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateCompositedBounds):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::requiresCompositingForPosition):
+        (WebCore::RenderLayerCompositor::computeFixedViewportConstraints):
+        (WebCore::RenderLayerCompositor::computeStickyViewportConstraints):
+
 2014-01-21  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1619 +1619 @@
 LayoutRect FrameView::viewportConstrainedVisibleContentRect() const
 {
+#if PLATFORM(IOS)
+    if (useCustomFixedPositionLayoutRect())
+        return customFixedPositionLayoutRect();
+#endif
     LayoutRect viewportRect = visibleContentRect();
     viewportRect.setLocation(toPoint(scrollOffsetForFixedPosition()));

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -433 +433 @@
         constrainingRect.setLocation(scrollOffset);
     } else {
-#if PLATFORM(IOS)
-        LayoutRect viewportRect = view().frameView().customFixedPositionLayoutRect();
-#else
         LayoutRect viewportRect = view().frameView().viewportConstrainedVisibleContentRect();
-#endif
         float scale = view().frameView().frame().frameScaleFactor();
         viewportRect.scale(1 / scale);

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -490 +490 @@
 
         LayoutRect clippingBounds;
-        if (renderer().style().position() == FixedPosition && renderer().container() == &view)
+        if (renderer().style().position() == FixedPosition && renderer().container() == &view) {
+#if PLATFORM(IOS)
+            clippingBounds = view.frameView().visibleContentRect();
+#else
             clippingBounds = view.frameView().viewportConstrainedVisibleContentRect();
-        else
+#endif
+        } else
             clippingBounds = view.unscaledDocumentRect();
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -2558 +2558 @@
 
     // Fixed position elements that are invisible in the current view don't get their own layer.
-#if PLATFORM(IOS)
-    LayoutRect viewBounds = m_renderView.frameView().customFixedPositionLayoutRect();
-#else
     LayoutRect viewBounds = m_renderView.frameView().viewportConstrainedVisibleContentRect();
-#endif
     LayoutRect layerBounds = layer.calculateLayerBounds(&layer, 0, RenderLayer::UseLocalClipRectIfPossible | RenderLayer::IncludeLayerFilterOutsets | RenderLayer::UseFragmentBoxes
         | RenderLayer::ExcludeHiddenDescendants | RenderLayer::DontConstrainForMask | RenderLayer::IncludeCompositedDescendants);
@@ -3386 +3382 @@
     ASSERT(layer.isComposited());
 
-#if PLATFORM(IOS)
-    LayoutRect viewportRect = m_renderView.frameView().customFixedPositionLayoutRect();
-#else
+    GraphicsLayer* graphicsLayer = layer.backing()->graphicsLayer();
     LayoutRect viewportRect = m_renderView.frameView().viewportConstrainedVisibleContentRect();
-#endif
 
     FixedPositionViewportConstraints constraints;
-
-    GraphicsLayer* graphicsLayer = layer.backing()->graphicsLayer();
-
     constraints.setLayerPositionAtLastLayout(graphicsLayer->position());
     constraints.setViewportRectAtLastLayout(viewportRect);
@@ -3432 +3422 @@
 #endif
 
-#if PLATFORM(IOS)
-    LayoutRect viewportRect = m_renderView.frameView().customFixedPositionLayoutRect();
-#else
     LayoutRect viewportRect = m_renderView.frameView().viewportConstrainedVisibleContentRect();
-#endif
-
     RenderBoxModelObject& renderer = toRenderBoxModelObject(layer.renderer());