Changeset 134628 in webkit

Timestamp:

Nov 14, 2012 10:51:51 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Optimize painting of composited scrolling layers
​https://bugs.webkit.org/show_bug.cgi?id=96087

Patch by Sami Kyostila <​skyostil@chromium.org> on 2012-11-14
Reviewed by Simon Fraser.

Source/WebCore:

Don't completely repaint accelerated scrolling layers when the scroll offset
changes.

Test: compositing/overflow/scrolling-without-painting.html

• platform/graphics/GraphicsLayer.cpp:

(WebCore::GraphicsLayer::setOffsetFromRenderer):

• platform/graphics/GraphicsLayer.h:

(GraphicsLayer):

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):

LayoutTests:

Test that accelerated scrolling layers can be scrolled without repainting
their contents. Note that this test will not pass unless
ENABLE_ACCELERATED_OVERFLOW_SCROLLING is enabled.

• compositing/overflow/scrolling-without-painting-expected.txt: Added.
• compositing/overflow/scrolling-without-painting.html: Added.
• platform/chromium/TestExpectations: Mark test as expected to fail by default.
• platform/mac/TestExpectations: Skip the test.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/overflow/scrolling-without-painting-expected.txt (copied) (copied from trunk/LayoutTests/compositing/overflow/updating-scrolling-content-expected.txt) (2 diffs)
• LayoutTests/compositing/overflow/scrolling-without-painting.html (added)
• LayoutTests/compositing/overflow/updating-scrolling-content-expected.txt (modified) (1 diff)
• LayoutTests/platform/chromium/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/GraphicsLayer.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/GraphicsLayer.h (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-11-14  Sami Kyostila  <skyostil@chromium.org>
+
+        Optimize painting of composited scrolling layers
+        https://bugs.webkit.org/show_bug.cgi?id=96087
+
+        Reviewed by Simon Fraser.
+
+        Test that accelerated scrolling layers can be scrolled without repainting
+        their contents. Note that this test will not pass unless
+        ENABLE_ACCELERATED_OVERFLOW_SCROLLING is enabled.
+
+        * compositing/overflow/scrolling-without-painting-expected.txt: Added.
+        * compositing/overflow/scrolling-without-painting.html: Added.
+        * platform/chromium/TestExpectations: Mark test as expected to fail
+          by default.
+        * platform/mac/TestExpectations: Skip the test.
+
 2012-11-14  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/LayoutTests/compositing/overflow/scrolling-without-painting-expected.txt

@@ -7 +7 @@
         (GraphicsLayer
           (position 8.00 8.00)
-          (bounds 200.00 200.00)
+          (bounds 202.00 202.00)
+          (drawsContent 1)
           (children 4
             (GraphicsLayer
+              (position 1.00 1.00)
               (bounds 200.00 200.00)
               (children 1
                 (GraphicsLayer
-                  (bounds 185.00 1200.00)
+                  (position 0.00 -25.00)
+                  (bounds 185.00 1025.00)
                   (drawsContent 1)
-                  (repaint rects
-                    (rect 0.00 0.00 185.00 200.00)
-                    (rect 0.00 0.00 185.00 200.00)
-                    (rect 0.00 0.00 185.00 200.00)
-                    (rect 0.00 0.00 185.00 1200.00)
-                  )
                 )
               )
             )
             (GraphicsLayer
-              (position 0.00 185.00)
+              (position 1.00 186.00)
               (bounds 185.00 15.00)
               (drawsContent 1)
             )
             (GraphicsLayer
-              (position 185.00 0.00)
+              (position 186.00 1.00)
               (bounds 15.00 185.00)
               (drawsContent 1)
@@ -38 +35 @@
             )
             (GraphicsLayer
-              (position 185.00 185.00)
+              (position 186.00 186.00)
               (bounds 15.00 15.00)
               (drawsContent 1)

trunk/LayoutTests/compositing/overflow/updating-scrolling-content-expected.txt

@@ -19 +19 @@
                     (rect 0.00 0.00 185.00 200.00)
                     (rect 0.00 0.00 185.00 200.00)
-                    (rect 0.00 0.00 185.00 1200.00)
                   )
                 )

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -3769 +3769 @@
 webkit.org/b/94353 compositing/overflow/scrolling-content-clip-to-viewport.html [ Failure ]
 webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/scrolling-content-clip-to-viewport.html [ Failure ]
+webkit.org/b/94353 compositing/overflow/scrolling-without-painting.html [ Failure ]
+webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/scrolling-without-painting.html [ Failure ]
 webkit.org/b/94353 compositing/overflow/updating-scrolling-content.html [ Failure ]
 webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/updating-scrolling-content.html [ Failure ]

trunk/LayoutTests/platform/mac/TestExpectations

@@ -857 +857 @@
 compositing/overflow/textarea-scroll-touch.html
 compositing/overflow/updating-scrolling-content.html
+compositing/overflow/scrolling-without-painting.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=95027

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-14  Sami Kyostila  <skyostil@chromium.org>
+
+        Optimize painting of composited scrolling layers
+        https://bugs.webkit.org/show_bug.cgi?id=96087
+
+        Reviewed by Simon Fraser.
+
+        Don't completely repaint accelerated scrolling layers when the scroll offset
+        changes.
+
+        Test: compositing/overflow/scrolling-without-painting.html
+
+        * platform/graphics/GraphicsLayer.cpp:
+        (WebCore::GraphicsLayer::setOffsetFromRenderer):
+        * platform/graphics/GraphicsLayer.h:
+        (GraphicsLayer):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+
 2012-11-14  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

@@ -297 +297 @@
 }
 
-void GraphicsLayer::setOffsetFromRenderer(const IntSize& offset)
+void GraphicsLayer::setOffsetFromRenderer(const IntSize& offset, ShouldSetNeedsDisplay shouldSetNeedsDisplay)
 {
     if (offset == m_offsetFromRenderer)
@@ -305 +305 @@
 
     // If the compositing layer offset changes, we need to repaint.
-    setNeedsDisplay();
+    if (shouldSetNeedsDisplay == SetNeedsDisplay)
+        setNeedsDisplay();
 }
 

trunk/Source/WebCore/platform/graphics/GraphicsLayer.h

@@ -243 +243 @@
     void setReplicatedLayerPosition(const FloatPoint& p) { m_replicatedLayerPosition = p; }
 
+    enum ShouldSetNeedsDisplay {
+        DontSetNeedsDisplay,
+        SetNeedsDisplay
+    };
+
     // Offset is origin of the renderer minus origin of the graphics layer (so either zero or negative).
     IntSize offsetFromRenderer() const { return m_offsetFromRenderer; }
-    void setOffsetFromRenderer(const IntSize&);
+    void setOffsetFromRenderer(const IntSize&, ShouldSetNeedsDisplay = SetNeedsDisplay);
 
     // The position of the layer (the location of its top-left corner in its parent)

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -743 +743 @@
 
         m_scrollingContentsLayer->setSize(scrollSize);
-        // FIXME: Scrolling the content layer does not need to trigger a repaint. The offset will be compensated away during painting.
         // FIXME: The paint offset and the scroll offset should really be separate concepts.
-        m_scrollingContentsLayer->setOffsetFromRenderer(scrollingContentsOffset);
+        m_scrollingContentsLayer->setOffsetFromRenderer(scrollingContentsOffset, GraphicsLayer::DontSetNeedsDisplay);
     }