[webkit-changes] [108000] trunk/LayoutTests

Thu, 16 Feb 2012 16:49:59 -0800

Title: [108000] trunk/LayoutTests
Revision
108000
Author
[email protected]
Date
2012-02-16 16:49:42 -0800 (Thu, 16 Feb 2012)

Log Message

[chromium] Disable mock scrollbars for rubber-banding tests
https://bugs.webkit.org/show_bug.cgi?id=78370

Turning on mock scrollbars caused rubber-banding tests to fail
because the overhang is painted by the ScrollbarTheme, which
was replaced by the mock theme. Disable mock scrollbars for
these tests.

Patch by Alexei Svitkine <[email protected]> on 2012-02-16
Reviewed by James Robinson.

* platform/chromium/test_expectations.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (107999 => 108000)


--- trunk/LayoutTests/ChangeLog	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/ChangeLog	2012-02-17 00:49:42 UTC (rev 108000)
@@ -1,3 +1,17 @@
+2012-02-16  Alexei Svitkine  <[email protected]>
+
+        [chromium] Disable mock scrollbars for rubber-banding tests
+        https://bugs.webkit.org/show_bug.cgi?id=78370
+
+        Turning on mock scrollbars caused rubber-banding tests to fail
+        because the overhang is painted by the ScrollbarTheme, which
+        was replaced by the mock theme. Disable mock scrollbars for
+        these tests.
+
+        Reviewed by James Robinson.
+
+        * platform/chromium/test_expectations.txt:
+
 2012-02-16  Michael Saboff  <[email protected]>
 
         ENH: Add ability to run subset of _javascript_ layout tests with JSC

Modified: trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-e.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-e.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-e.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -7,9 +7,10 @@
 
 <div id="info">This test requires DRT.</div>
 <script>
-    if (window.internals) {
+    if (window.internals && window.layoutTestController) {
         layoutTestController.dumpAsText(true);
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, 50, 0);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-n.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-n.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-n.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -7,9 +7,10 @@
 
 <div id="info">This test requires DRT.</div>
 <script>
-    if (window.internals) {
+    if (window.internals && window.layoutTestController) {
         layoutTestController.dumpAsText(true);
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, 0, -50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-ne.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-ne.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-ne.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -7,9 +7,10 @@
 
 <div id="info">This test requires DRT.</div>
 <script>
-    if (window.internals) {
+    if (window.internals && window.layoutTestController) {
         layoutTestController.dumpAsText(true);
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, 50, -50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-nw.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-nw.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-nw.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -7,9 +7,10 @@
 
 <div id="info">This test requires DRT.</div>
 <script>
-    if (window.internals) {
+    if (window.internals && window.layoutTestController) {
         layoutTestController.dumpAsText(true);
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, -50, -50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-s.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-s.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-s.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -7,9 +7,10 @@
 
 <div id="info">This test requires DRT.</div>
 <script>
-    if (window.internals) {
+    if (window.internals && window.layoutTestController) {
         layoutTestController.dumpAsText(true);
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, 0, 50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-se.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-se.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-se.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -7,9 +7,10 @@
 
 <div id="info">This test requires DRT.</div>
 <script>
-    if (window.internals) {
+    if (window.internals && window.layoutTestController) {
         layoutTestController.dumpAsText(true);
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, 50, 50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-size-change.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-size-change.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-size-change.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -10,6 +10,7 @@
     if (window.internals && window.layoutTestController) {
         layoutTestController.dumpAsText(true);
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, -20, -20);
         layoutTestController.display();
         internals.setScrollViewPosition(document, -60, -60);

Modified: trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-sw.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-sw.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-sw.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -7,9 +7,10 @@
 
 <div id="info">This test requires DRT.</div>
 <script>
-    if (window.internals) {
+    if (window.internals && window.layoutTestController) {
         layoutTestController.dumpAsText(true);
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, -50, 50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-w.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-w.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-w.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -7,9 +7,10 @@
 
 <div id="info">This test requires DRT.</div>
 <script>
-    if (window.internals) {
+    if (window.internals && window.layoutTestController) {
         layoutTestController.dumpAsText(true);
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, -50, 0);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/rubberbanding/custom-scrollbars-ne.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/rubberbanding/custom-scrollbars-ne.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/rubberbanding/custom-scrollbars-ne.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -21,6 +21,7 @@
 <script>
     if (window.internals) {
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, 50, -50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/rubberbanding/custom-scrollbars-nw.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/rubberbanding/custom-scrollbars-nw.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/rubberbanding/custom-scrollbars-nw.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -21,6 +21,7 @@
 <script>
     if (window.internals) {
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, -50, -50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/rubberbanding/custom-scrollbars-se.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/rubberbanding/custom-scrollbars-se.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/rubberbanding/custom-scrollbars-se.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -21,6 +21,7 @@
 <script>
     if (window.internals) {
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, 50, 50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/rubberbanding/custom-scrollbars-sw.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/rubberbanding/custom-scrollbars-sw.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/rubberbanding/custom-scrollbars-sw.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -21,6 +21,7 @@
 <script>
     if (window.internals) {
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, -50, 50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/rubberbanding/overhang-e.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/rubberbanding/overhang-e.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/rubberbanding/overhang-e.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -6,6 +6,7 @@
 <script>
     if (window.internals) {
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, 50, 0);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/rubberbanding/overhang-n.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/rubberbanding/overhang-n.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/rubberbanding/overhang-n.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -6,6 +6,7 @@
 <script>
     if (window.internals) {
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, 0, -50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/rubberbanding/overhang-ne.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/rubberbanding/overhang-ne.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/rubberbanding/overhang-ne.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -6,6 +6,7 @@
 <script>
     if (window.internals) {
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, 50, -50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/rubberbanding/overhang-nw.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/rubberbanding/overhang-nw.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/rubberbanding/overhang-nw.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -6,6 +6,7 @@
 <script>
     if (window.internals) {
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, -50, -50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/rubberbanding/overhang-s.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/rubberbanding/overhang-s.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/rubberbanding/overhang-s.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -6,6 +6,7 @@
 <script>
     if (window.internals) {
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, 0, 50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/rubberbanding/overhang-se.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/rubberbanding/overhang-se.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/rubberbanding/overhang-se.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -6,6 +6,7 @@
 <script>
     if (window.internals) {
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, 50, 50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/rubberbanding/overhang-sw.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/rubberbanding/overhang-sw.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/rubberbanding/overhang-sw.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -6,6 +6,7 @@
 <script>
     if (window.internals) {
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, -50, 50);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/rubberbanding/overhang-w.html (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/rubberbanding/overhang-w.html	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/rubberbanding/overhang-w.html	2012-02-17 00:49:42 UTC (rev 108000)
@@ -6,6 +6,7 @@
 <script>
     if (window.internals) {
         document.getElementById('info').style.visibility = "hidden";
+        internals.settings.setMockScrollbarsEnabled(false);
         internals.setScrollViewPosition(document, -50, 0);
     }
 </script>

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (107999 => 108000)


--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-02-17 00:48:11 UTC (rev 107999)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-02-17 00:49:42 UTC (rev 108000)
@@ -3793,12 +3793,6 @@
 BUGWK78008 : platform/chromium/compositing/rubberbanding/transform-overhang-e.html = IMAGE
 BUGWK78008 : platform/chromium/compositing/rubberbanding/transform-overhang-se.html = IMAGE
 BUGWK78008 : platform/chromium/compositing/rubberbanding/transform-overhang-s.html = IMAGE
-BUGWK78370 : platform/chromium/compositing/rubberbanding/transform-overhang-nw.html = IMAGE
-BUGWK78370 : platform/chromium/compositing/rubberbanding/transform-overhang-sw.html = IMAGE
-BUGWK78370 : platform/chromium/compositing/rubberbanding/transform-overhang-n.html = IMAGE
-BUGWK78370 : platform/chromium/compositing/rubberbanding/transform-overhang-ne.html = IMAGE
-BUGWK78370 : platform/chromium/compositing/rubberbanding/transform-overhang-size-change.html = IMAGE
-BUGWK78370 : platform/chromium/compositing/rubberbanding/transform-overhang-w.html = IMAGE
 
 // SVGLoad event timing changes require some rebaselines.
 BUGWK78084 : svg/custom/polyline-setattribute-points-null.svg = IMAGE+TEXT

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to