Changeset 237942 in webkit

Timestamp:

Nov 7, 2018, 1:46:19 PM (6 years ago)

Author:

Simon Fraser

Message:

Some WK1 repaint tests are flakey
​https://bugs.webkit.org/show_bug.cgi?id=190627

Reviewed by Zalan Bujtas.
Source/WebCore:

Repaint tracking in GraphicsLayerCA was sensitive to whether there were already dirty
rects on the layer, since tracking happened after checks against existing dirty rects.
This caused some WK1 repaint tests to be flakey, since there's no guarantee that
no repaints happen between the last layer flush and a test calling startTrackingRepaints().

Fix by moving the repaint tracking to before the checks against existing dirty rects.
This is more similar to how repaint tracking on FrameView works.

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::setNeedsDisplayInRect):

LayoutTests:

New baseline.

• compositing/masks/compositing-clip-path-change-no-repaint-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/masks/compositing-clip-path-change-no-repaint-expected.txt (modified) (1 diff)
• LayoutTests/platform/ios-wk2/compositing/columns/composited-lr-paginated-repaint-expected.txt (modified) (1 diff)
• LayoutTests/platform/ios-wk2/compositing/columns/composited-rl-paginated-repaint-expected.txt (modified) (1 diff)
• LayoutTests/platform/ios-wk2/compositing/repaint/repaint-on-layer-grouping-change-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-11-07  Simon Fraser  <simon.fraser@apple.com>
+
+        Some WK1 repaint tests are flakey
+        https://bugs.webkit.org/show_bug.cgi?id=190627
+
+        Reviewed by Zalan Bujtas.
+        
+        New baseline.
+
+        * compositing/masks/compositing-clip-path-change-no-repaint-expected.txt:
+
 2018-11-07  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/LayoutTests/compositing/masks/compositing-clip-path-change-no-repaint-expected.txt

@@ -30 +30 @@
               (repaint rects
                 (rect 0.00 0.00 300.00 300.00)
+                (rect 0.00 0.00 300.00 300.00)
+                (rect 0.00 0.00 300.00 300.00)
               )
             )
           (repaint rects
+            (rect 0.00 0.00 300.00 300.00)
+            (rect 0.00 0.00 300.00 300.00)
             (rect 0.00 0.00 300.00 300.00)
           )

trunk/LayoutTests/platform/ios-wk2/compositing/columns/composited-lr-paginated-repaint-expected.txt

@@ -14 +14 @@
           (repaint rects
             (rect 27.00 25.00 52.00 77.00)
+            (rect 27.00 25.00 52.00 77.00)
+            (rect 27.00 25.00 52.00 77.00)
           )
         )

trunk/LayoutTests/platform/ios-wk2/compositing/columns/composited-rl-paginated-repaint-expected.txt

@@ -16 +16 @@
           (repaint rects
             (rect 27.00 25.00 52.00 77.00)
+            (rect 27.00 25.00 52.00 77.00)
+            (rect 27.00 25.00 52.00 77.00)
           )
         )

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-07  Simon Fraser  <simon.fraser@apple.com>
+
+        Some WK1 repaint tests are flakey
+        https://bugs.webkit.org/show_bug.cgi?id=190627
+
+        Reviewed by Zalan Bujtas.
+
+        Repaint tracking in GraphicsLayerCA was sensitive to whether there were already dirty
+        rects on the layer, since tracking happened after checks against existing dirty rects.
+        This caused some WK1 repaint tests to be flakey, since there's no guarantee that
+        no repaints happen between the last layer flush and a test calling startTrackingRepaints().
+
+        Fix by moving the repaint tracking to before the checks against existing dirty rects.
+        This is more similar to how repaint tracking on FrameView works.
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::setNeedsDisplayInRect):
+
 2018-11-07  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -912 +912 @@
     if (rect.isEmpty())
         return;
-    
+
+    addRepaintRect(rect);
+
     const size_t maxDirtyRects = 32;
-    
+
     for (size_t i = 0; i < m_dirtyRects.size(); ++i) {
         if (m_dirtyRects[i].contains(rect))
             return;
     }
-    
+
     if (m_dirtyRects.size() < maxDirtyRects)
         m_dirtyRects.append(rect);
@@ -926 +928 @@
 
     noteLayerPropertyChanged(DirtyRectsChanged);
-
-    addRepaintRect(rect);
 }