Changeset 163182 in webkit

Timestamp:

Jan 31, 2014 11:36:57 AM (10 years ago)

Author:

Simon Fraser

Message:

Even when in fixed layout mode, some platforms need to do layout after a viewport change
​https://bugs.webkit.org/show_bug.cgi?id=128003

Reviewed by Andreas Kling.

iOS uses fixed layout mode in both WK1 and WK2, but lays out fixed position
elements relative to a variable viewport. This code assumed that fixed layout
implies a fixed viewport.

Fix by testing for useCustomFixedPositionLayoutRect() in the fixed layout case.

Also removed RenderView::hasCustomFixedPosition() which is no longer used.

• page/FrameView.cpp:

(WebCore::FrameView::shouldLayoutAfterViewportChange):
(WebCore::FrameView::visibleContentsResized):

• page/FrameView.h:
• rendering/RenderView.cpp:
• rendering/RenderView.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (2 diffs)
• page/FrameView.h (modified) (2 diffs)
• rendering/RenderView.cpp (modified) (1 diff)
• rendering/RenderView.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-31  Simon Fraser  <simon.fraser@apple.com>
+
+        Even when in fixed layout mode, some platforms need to do layout after a viewport change
+        https://bugs.webkit.org/show_bug.cgi?id=128003
+
+        Reviewed by Andreas Kling.
+
+        iOS uses fixed layout mode in both WK1 and WK2, but lays out fixed position
+        elements relative to a variable viewport. This code assumed that fixed layout
+        implies a fixed viewport.
+        
+        Fix by testing for useCustomFixedPositionLayoutRect() in the fixed layout case.
+        
+        Also removed RenderView::hasCustomFixedPosition() which is no longer used.
+        
+        * page/FrameView.cpp:
+        (WebCore::FrameView::shouldLayoutAfterViewportChange):
+        (WebCore::FrameView::visibleContentsResized):
+        * page/FrameView.h:
+        * rendering/RenderView.cpp:
+        * rendering/RenderView.h:
+
 2014-01-31  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2140 +2140 @@
 }
 
+bool FrameView::shouldLayoutAfterViewportChange() const
+{
+    return hasViewportConstrainedObjects() && (!useFixedLayout() || useCustomFixedPositionLayoutRect());
+}
+
 void FrameView::visibleContentsResized()
 {
@@ -2161 +2166 @@
 #endif
 
-    if (!useFixedLayout() && needsLayout())
+    if (shouldLayoutAfterViewportChange() && needsLayout())
         layout();
 

trunk/Source/WebCore/page/FrameView.h

@@ -130 +130 @@
     void setCustomFixedPositionLayoutRect(const IntRect&);
     bool updateFixedPositionLayoutRect();
+#else
+    bool useCustomFixedPositionLayoutRect() const { return false; }
 #endif
 
@@ -480 +482 @@
     void updateCanBlitOnScrollRecursively();
     bool contentsInCompositedLayer() const;
+    bool shouldLayoutAfterViewportChange() const;
 
     bool shouldUpdateCompositingLayersAfterScrolling() const;

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -1198 +1198 @@
 }
 
-#if PLATFORM(IOS)
-static bool isFixedPositionInViewport(const RenderObject& renderer, const RenderObject* container)
-{
-    return (renderer.style().position() == FixedPosition) && renderer.container() == container;
-}
-
-bool RenderView::hasCustomFixedPosition(const RenderObject& renderer, ContainingBlockCheck checkContainer) const
-{
-    if (!frameView().useCustomFixedPositionLayoutRect())
-        return false;
-
-    if (checkContainer == CheckContainingBlock)
-        return isFixedPositionInViewport(renderer, this);
-
-    return renderer.style().position() == FixedPosition;
-}
-#endif
-
 void RenderView::pushLayoutStateForCurrentFlowThread(const RenderObject& object)
 {

trunk/Source/WebCore/rendering/RenderView.h

@@ -192 +192 @@
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
 
-#if PLATFORM(IOS)
-    enum ContainingBlockCheck { CheckContainingBlock, DontCheckContainingBlock };
-    bool hasCustomFixedPosition(const RenderObject&, ContainingBlockCheck = CheckContainingBlock) const;
-#endif
-
     IntervalArena* intervalArena();