Remove repaint.js include from css3/filters tests

BUG=345027 Review URL: https://codereview.chromium.org/207153002 git-svn-id: svn://svn.chromium.org/blink/trunk@170214 bbb929c8-8fbe-4397-9dbb-9b2b20218538
yoavweiss · Mar 27, 2014 · 11b4697 · 11b4697
1 parent a58af55
commit 11b4697
Show file tree

Hide file tree

Showing 15 changed files with 165 additions and 90 deletions.
diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
@@ -476,6 +476,14 @@ crbug.com/268588 [ Release ] http/tests/w3c/webperf/submission/Google/HighResolu
 crbug.com/316148 [ Win ] http/tests/w3c/webperf/approved/UserTiming/idlharness.html [ Pass Crash ]
 
 crbug.com/268692 [ SnowLeopard ] svg/custom/foreign-object-skew.svg [ ImageOnlyFailure Pass ]
+crbug.com/345027 css3/filters/filter-change-repaint-composited.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/345027 css3/filters/filter-repaint-blur.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/345027 css3/filters/filter-repaint-child-layers.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/345027 css3/filters/filter-repaint-sepia.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/345027 css3/filters/filter-repaint-shadow-clipped.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/345027 css3/filters/filter-repaint-shadow-rotated.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/345027 css3/filters/filter-repaint-shadow.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/345027 css3/filters/filter-repaint.html [ ImageOnlyFailure NeedsRebaseline ]
 
 crbug.com/268832 [ SnowLeopard Debug ] fast/multicol/newmulticol/direct-child-column-span-all.html [ Crash Pass ]
 

diff --git a/LayoutTests/css3/filters/blur-filter-page-scroll-parents.html b/LayoutTests/css3/filters/blur-filter-page-scroll-parents.html
@@ -10,6 +10,7 @@
             if (window.testRunner) {
                 // Force software rendering mode.
                 window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
+                window.testRunner.waitUntilDone();
             }
         </script>
         <!-- Make sure the mock scrollbars are enabled after the call to overridePreference, otherwise the setting will be overwritten. -->
@@ -47,14 +48,18 @@
                 height: 1000px;
             }
         </style>
-        <script src="../../fast/repaint/resources/repaint.js"></script>
+        <script src="../../resources/run-after-display.js"></script>
         <script type="text/javascript">
             function repaintTest() {
-                window.scrollTo(0, 100);
+                runAfterDisplay(function() {
+                  window.scrollTo(0, 100);
+                  if (window.testRunner)
+                    testRunner.notifyDone();
+                });
             }
         </script>
     </head>
-    <body onload="runRepaintTest()">
+    <body onload="repaintTest()">
         <div class="blur">
             <div class="layer">
                 <div id="fixedBox"></div>

diff --git a/LayoutTests/css3/filters/blur-filter-page-scroll-self.html b/LayoutTests/css3/filters/blur-filter-page-scroll-self.html
@@ -10,6 +10,7 @@
             if (window.testRunner) {
                 // Force software rendering mode.
                 window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
+                window.testRunner.waitUntilDone();
             }
         </script>
         <!-- Make sure the mock scrollbars are enabled after the call to overridePreference, otherwise the setting will be overwritten. -->
@@ -39,14 +40,18 @@
                 height: 1000px;
             }
         </style>
-        <script src="../../fast/repaint/resources/repaint.js"></script>
+        <script src="../../resources/run-after-display.js"></script>
         <script type="text/javascript">
             function repaintTest() {
-                window.scrollTo(0, 100);
+                runAfterDisplay(function() {
+                    window.scrollTo(0, 100);
+                    if (window.testRunner)
+                        testRunner.notifyDone();
+                });
             }
         </script>
     </head>
-    <body onload="runRepaintTest()">
+    <body onload="repaintTest()">
         <div id="fixedBox"></div>
         <div id="redBox"></div>
         <div id="greenBox"></div>

diff --git a/LayoutTests/css3/filters/blur-filter-page-scroll.html b/LayoutTests/css3/filters/blur-filter-page-scroll.html
@@ -10,6 +10,7 @@
             if (window.testRunner) {
                 // Force software rendering mode.
                 window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
+                window.testRunner.waitUntilDone();
             }
         </script>
         <!-- Make sure the mock scrollbars are enabled after the call to overridePreference, otherwise the setting will be overwritten. -->
@@ -33,7 +34,7 @@
             }
 
             #redBox {
-                background-color: red; 
+                background-color: red;
                 height: 200px;
             }
 
@@ -42,14 +43,18 @@
                 height: 1000px;
             }
         </style>
-        <script src="../../fast/repaint/resources/repaint.js"></script>
+        <script src="../../resources/run-after-display.js"></script>
         <script type="text/javascript">
             function repaintTest() {
-                window.scrollTo(0, 100);
+                runAfterDisplay(function() {
+                    window.scrollTo(0, 100);
+                    if (window.testRunner)
+                        testRunner.notifyDone();
+                });
             }
         </script>
     </head>
-    <body onload="runRepaintTest()">
+    <body onload="repaintTest()">
         <div class="blur">
             <div id="fixedBox"></div>
             <div id="redBox"></div>

diff --git a/LayoutTests/css3/filters/filter-change-repaint-composited.html b/LayoutTests/css3/filters/filter-change-repaint-composited.html
@@ -15,79 +15,85 @@
             margin: 50px;
             background-color: green;
         }
-        
+
         .composited_from_none {
             -webkit-filter: drop-shadow(0px 0px 10px blue);
         }
-        
+
         .composited_from_none.before {
             -webkit-filter: none;
         }
-        
+
         .composited_from_composited {
             -webkit-filter: drop-shadow(0px 0px 10px blue);
         }
-        
+
         .composited_from_composited.before {
             -webkit-filter: drop-shadow(0px 0px 10px red);
         }
 
         .composited_from_composited_zero_radius {
             -webkit-filter: drop-shadow(0px 0px 10px blue);
         }
-        
+
         .composited_from_composited_zero_radius.before {
             -webkit-filter: drop-shadow(0px 0px 0px red);
         }
 
         .composited_from_composited_offset {
             -webkit-filter: drop-shadow(0px 0px 10px blue);
         }
-        
+
         .composited_from_composited_offset.before {
             -webkit-filter: drop-shadow(-100px -100px 10px red);
         }
 
         .composited_from_software {
             -webkit-filter: drop-shadow(0px 0px 10px blue);
         }
-        
+
         .composited_from_software.before {
             -webkit-filter: drop-shadow(0px 0px 10px red) blur(1px);
         }
-        
+
         .software_from_composited {
             -webkit-filter: drop-shadow(0px 0px 10px blue) blur(2px);
         }
-        
+
         .software_from_composited.before {
             -webkit-filter: drop-shadow(0px 0px 10px red);
         }
-        
+
         .none_from_composited {
             -webkit-filter: none;
         }
-        
+
         .none_from_composited.before {
             -webkit-filter: drop-shadow(0px 0px 10px red);
         }
     </style>
 
-    <script src="../../fast/repaint/resources/repaint.js"></script>
+    <script src="../../resources/run-after-display.js"></script>
     <script>
-        if (window.testRunner)
+        if (window.testRunner) {
             testRunner.dumpAsTextWithPixelResults();
+            testRunner.waitUntilDone();
+        }
 
         function repaintTest()
         {
-            var items = document.getElementsByClassName('before');
-            while (items.length)
-                items[0].classList.remove("before");
+            runAfterDisplay(function() {
+                var items = document.getElementsByClassName('before');
+                while (items.length)
+                    items[0].classList.remove("before");
+                if (window.testRunner)
+                    testRunner.notifyDone();
+            });
         }
     </script>
 </head>
 
-<body onload="runRepaintTest()">
+<body onload="repaintTest()">
     <div class="box composited_from_none before"></div>
     <div class="box composited_from_composited before"></div>
     <div class="box composited_from_composited_zero_radius before"></div>

diff --git a/LayoutTests/css3/filters/filter-change-repaint.html b/LayoutTests/css3/filters/filter-change-repaint.html
@@ -13,19 +13,19 @@
             margin-bottom: 60px;
             background-color: green;
         }
-        
+
         .software_from_none {
             -webkit-filter: drop-shadow(0px 0px 10px blue);
         }
-        
+
         .software_from_none.before {
             -webkit-filter: none;
         }
-        
+
         .software_from_software {
             -webkit-filter: drop-shadow(0px 0px 10px blue);
         }
-        
+
         .software_from_software.before {
             -webkit-filter: drop-shadow(0px 0px 10px red);
         }
@@ -35,47 +35,53 @@
             -webkit-transform: translate3d(0, 0, 0);
             -webkit-filter: drop-shadow(0px 0px 10px blue);
         }
-        
+
         .composited_from_software.before {
             -webkit-transform: none;
             -webkit-filter: drop-shadow(0px 0px 10px red);
         }
-        
+
         .software_from_composited {
             -webkit-transform: none;
             -webkit-filter: drop-shadow(0px 0px 10px blue);
         }
-        
+
         .software_from_composited.before {
             /* force a composited layer */
             -webkit-transform: translate3d(0, 0, 0);
             -webkit-filter: drop-shadow(0px 0px 10px red);
         }
-        
+
         .none_from_software {
             -webkit-filter: none;
         }
-        
+
         .none_from_software.before {
             -webkit-filter: drop-shadow(0px 0px 10px red);
         }
     </style>
 
-    <script src="../../fast/repaint/resources/repaint.js"></script>
+    <script src="../../resources/run-after-display.js"></script>
     <script>
-        if (window.testRunner)
+        if (window.testRunner) {
             testRunner.dumpAsTextWithPixelResults();
+            testRunner.waitUntilDone();
+        }
 
         function repaintTest()
         {
-            var items = document.getElementsByClassName('before');
-            while (items.length)
-                items[0].classList.remove("before");
+            runAfterDisplay(function() {
+                var items = document.getElementsByClassName('before');
+                while (items.length)
+                    items[0].classList.remove("before");
+                if (window.testRunner)
+                    testRunner.notifyDone();
+            });
         }
     </script>
 </head>
 
-<body onload="runRepaintTest()">
+<body onload="repaintTest()">
     <div class="box software_from_none before"></div>
     <div class="box software_from_software before"></div>
     <div class="box composited_from_software before"></div>

diff --git a/LayoutTests/css3/filters/filter-repaint-blur.html b/LayoutTests/css3/filters/filter-repaint-blur.html
@@ -23,25 +23,29 @@
         }
     </style>
 
-    <script src="../../fast/repaint/resources/repaint.js"></script>
+    <script src="../../resources/run-after-display.js"></script>
     <script>
-        if (window.testRunner)
+        if (window.testRunner) {
             testRunner.dumpAsTextWithPixelResults();
+            testRunner.waitUntilDone();
+        }
 
         function repaintTest()
         {
-            document.querySelector(".before").classList.remove("before");
+            runAfterDisplay(function() {
+                document.querySelector(".before").classList.remove("before");
+                if (window.testRunner)
+                    testRunner.notifyDone();
+            });
         }
     </script>
 </head>
 
-<body onload="runRepaintTest()">
-
+<body onload="repaintTest()">
     <div class="blur">
         <div class="box"></div>
         <div class="box before"></div>
         <div class="box"></div>
     </div>
-
 </body>
 </html>
diff --git a/LayoutTests/css3/filters/filter-repaint-child-layers.html b/LayoutTests/css3/filters/filter-repaint-child-layers.html
@@ -31,19 +31,25 @@
         }
     </style>
 
-    <script src="../../fast/repaint/resources/repaint.js"></script>
+    <script src="../../resources/run-after-display.js"></script>
     <script>
-        if (window.testRunner)
+        if (window.testRunner) {
             testRunner.dumpAsTextWithPixelResults();
+            testRunner.waitUntilDone();
+        }
 
         function repaintTest()
         {
-            document.querySelector(".before").classList.remove("before");
+            runAfterDisplay(function() {
+                document.querySelector(".before").classList.remove("before");
+                if (window.testRunner)
+                    testRunner.notifyDone();
+            });
         }
     </script>
 </head>
 
-<body onload="runRepaintTest()">
+<body onload="repaintTest()">
 
     <div class="blur">
         <div class="box"></div>