Title: [134287] trunk/LayoutTests
Revision
134287
Author
voll...@chromium.org
Date
2012-11-12 12:51:27 -0800 (Mon, 12 Nov 2012)

Log Message

Layout Test compositing/repaint/invalidations-on-composited-layers.html is failing/flaky
https://bugs.webkit.org/show_bug.cgi?id=101219

Reviewed by James Robinson.

Force a style recalc before starting repaint tracking.

* compositing/repaint/invalidations-on-composited-layers-expected.txt:
* compositing/repaint/invalidations-on-composited-layers.html:
* platform/chromium/TestExpectations:
* platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (134286 => 134287)


--- trunk/LayoutTests/ChangeLog	2012-11-12 20:44:24 UTC (rev 134286)
+++ trunk/LayoutTests/ChangeLog	2012-11-12 20:51:27 UTC (rev 134287)
@@ -1,3 +1,17 @@
+2012-11-12  Ian Vollick  <voll...@chromium.org>
+
+        Layout Test compositing/repaint/invalidations-on-composited-layers.html is failing/flaky
+        https://bugs.webkit.org/show_bug.cgi?id=101219
+
+        Reviewed by James Robinson.
+
+        Force a style recalc before starting repaint tracking.
+
+        * compositing/repaint/invalidations-on-composited-layers-expected.txt:
+        * compositing/repaint/invalidations-on-composited-layers.html:
+        * platform/chromium/TestExpectations:
+        * platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt:
+
 2012-11-12  Dirk Pranke  <dpra...@chromium.org>
 
         Unreviewed, update chromium-mac-mountainlion baselines.

Modified: trunk/LayoutTests/compositing/repaint/invalidations-on-composited-layers-expected.txt (134286 => 134287)


--- trunk/LayoutTests/compositing/repaint/invalidations-on-composited-layers-expected.txt	2012-11-12 20:44:24 UTC (rev 134286)
+++ trunk/LayoutTests/compositing/repaint/invalidations-on-composited-layers-expected.txt	2012-11-12 20:51:27 UTC (rev 134287)
@@ -1,10 +1,7 @@
 (repaint rects
-  (rect 0 0 800 600)
-  (rect 0 0 800 600)
-  (rect 0 0 800 450)
-  (rect 0 0 800 600)
-  (rect 0 0 800 450)
-  (rect 0 0 800 600)
+  (rect 8 13 784 16)
+  (rect 8 413 784 29)
+  (rect 0 421 800 29)
 )
 (GraphicsLayer
   (bounds 800.00 600.00)
@@ -18,6 +15,8 @@
           (drawsContent 1)
           (repaint rects
             (rect 0.00 0.00 400.00 400.00)
+            (rect 0.00 0.00 400.00 400.00)
+            (rect 0.00 0.00 400.00 400.00)
           )
           (children 1
             (GraphicsLayer
@@ -26,6 +25,8 @@
               (drawsContent 1)
               (repaint rects
                 (rect 0.00 0.00 75.00 75.00)
+                (rect 0.00 0.00 75.00 75.00)
+                (rect 0.00 0.00 75.00 75.00)
               )
             )
           )

Modified: trunk/LayoutTests/compositing/repaint/invalidations-on-composited-layers.html (134286 => 134287)


--- trunk/LayoutTests/compositing/repaint/invalidations-on-composited-layers.html	2012-11-12 20:44:24 UTC (rev 134286)
+++ trunk/LayoutTests/compositing/repaint/invalidations-on-composited-layers.html	2012-11-12 20:51:27 UTC (rev 134287)
@@ -42,6 +42,10 @@
           var parent = document.getElementById('parent');
           var child = document.getElementById('child');
 
+          // Ensure that we've recalculated style before starting repaint
+          // tracking (we don't want our lists of invalidated rects to be
+          // polluted).
+          document.body.offsetTop;
           window.internals.startTrackingRepaints(document);
 
           child.style.background = '';
@@ -51,7 +55,7 @@
           text.innerHTML = 'This text will be replaced with the layer tree';
 
           // Force a style recalc.
-          var dummy = child.offsetTop;
+          document.body.offsetTop;
 
           var layerTreeText = window.internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_REPAINT_RECTS);
 

Modified: trunk/LayoutTests/platform/chromium/TestExpectations (134286 => 134287)


--- trunk/LayoutTests/platform/chromium/TestExpectations	2012-11-12 20:44:24 UTC (rev 134286)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2012-11-12 20:51:27 UTC (rev 134287)
@@ -4049,10 +4049,6 @@
 # Started failing at r133443.
 webkit.org/b/101218 [ Win ] fast/dom/shadow/shadowroot-type.html  [ Failure Crash ]
 
-# Started failing/flaky around r133332
-webkit.org/b/101219 compositing/repaint/invalidations-on-composited-layers.html [ Failure Pass ]
-webkit.org/b/101219 platform/chromium/virtual/softwarecompositing/repaint/invalidations-on-composited-layers.html [ Failure Pass ]
-
 # Flaky on win7 since at least r162410
 webkit.org/b/99886 [ Win7 ] fast/dom/shadow/input-with-validation.html [ ImageOnlyFailure Pass ]
 

Modified: trunk/LayoutTests/platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt (134286 => 134287)


--- trunk/LayoutTests/platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt	2012-11-12 20:44:24 UTC (rev 134286)
+++ trunk/LayoutTests/platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt	2012-11-12 20:51:27 UTC (rev 134287)
@@ -1,10 +1,7 @@
 (repaint rects
-  (rect 0 0 800 600)
-  (rect 0 0 800 600)
-  (rect 0 0 800 449)
-  (rect 0 0 800 600)
-  (rect 0 0 800 449)
-  (rect 0 0 800 600)
+  (rect 8 13 784 15)
+  (rect 8 413 784 28)
+  (rect 0 421 800 28)
 )
 (GraphicsLayer
   (bounds 800.00 600.00)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to