Changeset 133807 in webkit

Timestamp:

Nov 7, 2012, 2:27:12 PM (12 years ago)

Author:

Beth Dakin

Message:

​https://bugs.webkit.org/show_bug.cgi?id=101303
Fixed position elements that are out of view still end up forcing
non-threaded scrolling
-and corresponding-
<rdar://problem/12642222>

Reviewed by Simon Fraser.

Source/WebCore:

Re-name hasNonLayerFixedObjects() to
hasVisibleSlowRepaintFixedObjects() and make it virtual.

• page/scrolling/ScrollingCoordinator.cpp:

(WebCore::ScrollingCoordinator::hasVisibleSlowRepaintFixedObjects):
(WebCore::ScrollingCoordinator::mainThreadScrollingReasons):

• page/scrolling/ScrollingCoordinator.h:

(ScrollingCoordinator):

Override hasVisibleSlowRepaintFixedObjects() to always return false.
We don't want to bother with the extra computation in the
ScrollingCoordinator implementation, though other ports might still
want it.

• page/scrolling/mac/ScrollingCoordinatorMac.h:

(WebCore::ScrollingCoordinatorMac::hasVisibleSlowRepaintFixedObjects):
(ScrollingCoordinatorMac):

Make this function const so that we can call it from
requiresCompositingForPosition().

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::calculateCompositedBounds):

Actually be thorough here and check if the fixed object has any
descendants that are visible in the view. If it does, then we do
want to composite the fixed object.
(WebCore::RenderLayerCompositor::requiresCompositingForPosition):

• rendering/RenderLayerCompositor.h:

LayoutTests:

New tests for an invisible fixed object that has visible children.

• compositing/absolute-inside-out-of-view-fixed-expected.txt: Added.
• compositing/absolute-inside-out-of-view-fixed.html: Added.
• platform/mac/tiled-drawing/fixed/absolute-inside-out-of-view-fixed-expected.txt: Added.
• platform/mac/tiled-drawing/fixed/absolute-inside-out-of-view-fixed.html: Added.

Updated results because these tests can now scroll on the scrolling
thread, yay!

• platform/mac/tiled-drawing/fixed/fixed-position-out-of-view-expected.txt:
• platform/mac/tiled-drawing/fixed/fixed-position-out-of-view-negative-zindex-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/absolute-inside-out-of-view-fixed-expected.txt (added)
• LayoutTests/compositing/absolute-inside-out-of-view-fixed.html (added)
• LayoutTests/platform/mac/tiled-drawing/fixed/absolute-inside-out-of-view-fixed-expected.txt (added)
• LayoutTests/platform/mac/tiled-drawing/fixed/absolute-inside-out-of-view-fixed.html (added)
• LayoutTests/platform/mac/tiled-drawing/fixed/fixed-position-out-of-view-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/tiled-drawing/fixed/fixed-position-out-of-view-negative-zindex-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (modified) (2 diffs)
• Source/WebCore/page/scrolling/ScrollingCoordinator.h (modified) (1 diff)
• Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderLayerCompositor.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2012-11-07  Beth Dakin  <bdakin@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=101303
+        Fixed position elements that are out of view still end up forcing 
+        non-threaded scrolling
+        -and corresponding-
+        <rdar://problem/12642222>
+
+        Reviewed by Simon Fraser.
+
+        New tests for an invisible fixed object that has visible children.
+        * compositing/absolute-inside-out-of-view-fixed-expected.txt: Added.
+        * compositing/absolute-inside-out-of-view-fixed.html: Added.
+        * platform/mac/tiled-drawing/fixed/absolute-inside-out-of-view-fixed-expected.txt: Added.
+        * platform/mac/tiled-drawing/fixed/absolute-inside-out-of-view-fixed.html: Added.
+
+        Updated results because these tests can now scroll on the scrolling 
+        thread, yay!
+        * platform/mac/tiled-drawing/fixed/fixed-position-out-of-view-expected.txt:
+        * platform/mac/tiled-drawing/fixed/fixed-position-out-of-view-negative-zindex-expected.txt:
+
 2012-11-07  Philip Rogers  <pdr@google.com>
 

trunk/LayoutTests/platform/mac/tiled-drawing/fixed/fixed-position-out-of-view-expected.txt ¶

@@ -2 +2 @@
   (viewport rect 0 0 785 600)
   (contents size 785 1021)
-  (Scrolling on main thread because: Has non-layer fixed objects, )
   (children 1
     (Fixed node

trunk/LayoutTests/platform/mac/tiled-drawing/fixed/fixed-position-out-of-view-negative-zindex-expected.txt ¶

@@ -2 +2 @@
   (viewport rect 0 0 785 600)
   (contents size 785 1021)
-  (Scrolling on main thread because: Has non-layer fixed objects, )
   (children 1
     (Fixed node

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2012-11-07  Beth Dakin  <bdakin@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=101303
+        Fixed position elements that are out of view still end up forcing 
+        non-threaded scrolling
+        -and corresponding-
+        <rdar://problem/12642222>
+
+        Reviewed by Simon Fraser.
+
+        Re-name hasNonLayerFixedObjects() to 
+        hasVisibleSlowRepaintFixedObjects() and make it virtual. 
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::hasVisibleSlowRepaintFixedObjects):
+        (WebCore::ScrollingCoordinator::mainThreadScrollingReasons):
+        * page/scrolling/ScrollingCoordinator.h:
+        (ScrollingCoordinator):
+
+        Override hasVisibleSlowRepaintFixedObjects() to always return false. 
+        We don't want to bother with the extra computation in the 
+        ScrollingCoordinator implementation, though other ports might still 
+        want it.
+        * page/scrolling/mac/ScrollingCoordinatorMac.h:
+        (WebCore::ScrollingCoordinatorMac::hasVisibleSlowRepaintFixedObjects):
+        (ScrollingCoordinatorMac):
+
+        Make this function const so that we can call it from 
+        requiresCompositingForPosition().
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::calculateCompositedBounds):
+
+        Actually be thorough here and check if the fixed object has any 
+        descendants that are visible in the view. If it does, then we do 
+        want to composite the fixed object.
+        (WebCore::RenderLayerCompositor::requiresCompositingForPosition):
+        * rendering/RenderLayerCompositor.h:
+
 2012-11-07  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp ¶

@@ -265 +265 @@
 #endif
 
-bool ScrollingCoordinator::hasNonLayerFixedObjects(FrameView* frameView) const
+bool ScrollingCoordinator::hasVisibleSlowRepaintFixedObjects(FrameView* frameView) const
 {
     const FrameView::ViewportConstrainedObjectSet* viewportConstrainedObjects = frameView->viewportConstrainedObjects();
@@ -298 +298 @@
     if (!supportsFixedPositionLayers() && frameView->hasViewportConstrainedObjects())
         mainThreadScrollingReasons |= HasViewportConstrainedObjectsWithoutSupportingFixedLayers;
-    if (supportsFixedPositionLayers() && hasNonLayerFixedObjects(frameView))
+    if (supportsFixedPositionLayers() && hasVisibleSlowRepaintFixedObjects(frameView))
         mainThreadScrollingReasons |= HasNonLayerFixedObjects;
     if (m_page->mainFrame()->document()->isImageDocument())

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h ¶

@@ -156 +156 @@
     virtual void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons) { }
 
-    bool hasNonLayerFixedObjects(FrameView*) const;
+    virtual bool hasVisibleSlowRepaintFixedObjects(FrameView*) const;
     void updateShouldUpdateScrollLayerPositionOnMainThread();
 

trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h ¶

@@ -93 +93 @@
     virtual void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons);
 
+    virtual bool hasVisibleSlowRepaintFixedObjects(FrameView*) const { return false; }
+
     void ensureRootStateNodeForFrameView(FrameView*);
     ScrollingStateNode* stateNodeForID(ScrollingNodeID);

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp ¶

@@ -662 +662 @@
 // The bounds of the GraphicsLayer created for a compositing layer is the union of the bounds of all the descendant
 // RenderLayers that are rendered by the composited RenderLayer.
-IntRect RenderLayerCompositor::calculateCompositedBounds(const RenderLayer* layer, const RenderLayer* ancestorLayer)
+IntRect RenderLayerCompositor::calculateCompositedBounds(const RenderLayer* layer, const RenderLayer* ancestorLayer) const
 {
     if (!canBeComposited(layer))
@@ -1948 +1948 @@
 
     // Fixed position elements that are invisible in the current view don't get their own layer.
-    FrameView* frameView = m_renderView->frameView();
-    if (frameView && !layer->absoluteBoundingBox().intersects(IntRect(IntPoint(frameView->scrollOffsetForFixedPosition()), frameView->layoutSize())))
-        return false;
+    if (FrameView* frameView = m_renderView->frameView()) {
+        IntRect viewBounds = IntRect(IntPoint(frameView->scrollOffsetForFixedPosition()), frameView->layoutSize());
+        IntRect layerBounds = calculateCompositedBounds(layer, rootRenderLayer());
+        if (!viewBounds.intersects(layerBounds))
+            return false;
+    }
 
     return true;

trunk/Source/WebCore/rendering/RenderLayerCompositor.h ¶

@@ -131 +131 @@
     // Return the bounding box required for compositing layer and its childern, relative to ancestorLayer.
     // If layerBoundingBox is not 0, on return it contains the bounding box of this layer only.
-    IntRect calculateCompositedBounds(const RenderLayer*, const RenderLayer* ancestorLayer);
+    IntRect calculateCompositedBounds(const RenderLayer*, const RenderLayer* ancestorLayer) const;
 
     // Repaint the appropriate layers when the given RenderLayer starts or stops being composited.