[webkit-changes] [89709] trunk/LayoutTests

Fri, 24 Jun 2011 15:15:35 -0700

Title: [89709] trunk/LayoutTests
Revision
89709
Author
[email protected]
Date
2011-06-24 15:15:29 -0700 (Fri, 24 Jun 2011)

Log Message

2011-06-24  Adrienne Walker  <[email protected]>

        Reviewed by Simon Fraser.

        REGRESSION (r89687): 5 compositing/rtl tests failing on Windows 7 Release (Tests)
        https://bugs.webkit.org/show_bug.cgi?id=63343

        These tests were failing since they were introduced in r89687.  The
        layerTreeAsText dump on the iframe document was causing the outer
        layerTreeAsText dump to be affected by font metrics.  Fixed in this
        case by not putting layerTreeAsText output in an element when inside
        an iframe.

        * compositing/rtl/rtl-absolute-overflow-scrolled.html:
        * compositing/rtl/rtl-absolute-overflow.html:
        * compositing/rtl/rtl-absolute.html:
        * compositing/rtl/rtl-fixed-overflow-scrolled.html:
        * compositing/rtl/rtl-fixed-overflow.html:
        * compositing/rtl/rtl-fixed.html:
        * compositing/rtl/rtl-iframe-absolute-expected.txt:
        * compositing/rtl/rtl-iframe-absolute-overflow-expected.txt:
        * compositing/rtl/rtl-iframe-fixed-expected.txt:
        * compositing/rtl/rtl-iframe-fixed-overflow-expected.txt:
        * compositing/rtl/rtl-iframe-relative-expected.txt:
        * compositing/rtl/rtl-relative.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (89708 => 89709)


--- trunk/LayoutTests/ChangeLog	2011-06-24 22:07:10 UTC (rev 89708)
+++ trunk/LayoutTests/ChangeLog	2011-06-24 22:15:29 UTC (rev 89709)
@@ -1,3 +1,29 @@
+2011-06-24  Adrienne Walker  <[email protected]>
+
+        Reviewed by Simon Fraser.
+
+        REGRESSION (r89687): 5 compositing/rtl tests failing on Windows 7 Release (Tests)
+        https://bugs.webkit.org/show_bug.cgi?id=63343
+
+        These tests were failing since they were introduced in r89687.  The
+        layerTreeAsText dump on the iframe document was causing the outer
+        layerTreeAsText dump to be affected by font metrics.  Fixed in this
+        case by not putting layerTreeAsText output in an element when inside
+        an iframe.
+
+        * compositing/rtl/rtl-absolute-overflow-scrolled.html:
+        * compositing/rtl/rtl-absolute-overflow.html:
+        * compositing/rtl/rtl-absolute.html:
+        * compositing/rtl/rtl-fixed-overflow-scrolled.html:
+        * compositing/rtl/rtl-fixed-overflow.html:
+        * compositing/rtl/rtl-fixed.html:
+        * compositing/rtl/rtl-iframe-absolute-expected.txt:
+        * compositing/rtl/rtl-iframe-absolute-overflow-expected.txt:
+        * compositing/rtl/rtl-iframe-fixed-expected.txt:
+        * compositing/rtl/rtl-iframe-fixed-overflow-expected.txt:
+        * compositing/rtl/rtl-iframe-relative-expected.txt:
+        * compositing/rtl/rtl-relative.html:
+
 2011-06-24  Abhishek Arya  <[email protected]>
 
         Reviewed by Darin Adler.

Modified: trunk/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled.html (89708 => 89709)


--- trunk/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled.html	2011-06-24 22:07:10 UTC (rev 89708)
+++ trunk/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled.html	2011-06-24 22:15:29 UTC (rev 89709)
@@ -49,7 +49,8 @@
         window.setTimeout(function() {
             window.scrollTo(offset, 0);
             if (window.layoutTestController) {
-                document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
+                if (top == self)
+                    document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
                 layoutTestController.notifyDone();
             }
         }, 0);

Modified: trunk/LayoutTests/compositing/rtl/rtl-absolute-overflow.html (89708 => 89709)


--- trunk/LayoutTests/compositing/rtl/rtl-absolute-overflow.html	2011-06-24 22:07:10 UTC (rev 89708)
+++ trunk/LayoutTests/compositing/rtl/rtl-absolute-overflow.html	2011-06-24 22:15:29 UTC (rev 89709)
@@ -37,7 +37,8 @@
 <script>
     function doTest() {
         if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
+            if (top == self)
+                document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
             layoutTestController.dumpAsText(true);
         }
     }

Modified: trunk/LayoutTests/compositing/rtl/rtl-absolute.html (89708 => 89709)


--- trunk/LayoutTests/compositing/rtl/rtl-absolute.html	2011-06-24 22:07:10 UTC (rev 89708)
+++ trunk/LayoutTests/compositing/rtl/rtl-absolute.html	2011-06-24 22:15:29 UTC (rev 89709)
@@ -32,7 +32,8 @@
 <script>
     function doTest() {
         if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
+            if (top == self)
+                document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
             layoutTestController.dumpAsText(true);
         }
     }

Modified: trunk/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled.html (89708 => 89709)


--- trunk/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled.html	2011-06-24 22:07:10 UTC (rev 89708)
+++ trunk/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled.html	2011-06-24 22:15:29 UTC (rev 89709)
@@ -47,7 +47,8 @@
         window.setTimeout(function() {
             window.scrollTo(offset, 0);
             if (window.layoutTestController) {
-                document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
+                if (top == self)
+                    document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
                 layoutTestController.notifyDone();
             }
         }, 0);

Modified: trunk/LayoutTests/compositing/rtl/rtl-fixed-overflow.html (89708 => 89709)


--- trunk/LayoutTests/compositing/rtl/rtl-fixed-overflow.html	2011-06-24 22:07:10 UTC (rev 89708)
+++ trunk/LayoutTests/compositing/rtl/rtl-fixed-overflow.html	2011-06-24 22:15:29 UTC (rev 89709)
@@ -37,7 +37,8 @@
 <script>
     function doTest() {
         if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
+            if (top == self)
+                document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
             layoutTestController.dumpAsText(true);
         }
     }

Modified: trunk/LayoutTests/compositing/rtl/rtl-fixed.html (89708 => 89709)


--- trunk/LayoutTests/compositing/rtl/rtl-fixed.html	2011-06-24 22:07:10 UTC (rev 89708)
+++ trunk/LayoutTests/compositing/rtl/rtl-fixed.html	2011-06-24 22:15:29 UTC (rev 89709)
@@ -32,7 +32,8 @@
 <script>
     function doTest() {
         if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
+            if (top == self)
+                document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
             layoutTestController.dumpAsText(true);
         }
     }

Modified: trunk/LayoutTests/compositing/rtl/rtl-iframe-absolute-expected.txt (89708 => 89709)


--- trunk/LayoutTests/compositing/rtl/rtl-iframe-absolute-expected.txt	2011-06-24 22:07:10 UTC (rev 89708)
+++ trunk/LayoutTests/compositing/rtl/rtl-iframe-absolute-expected.txt	2011-06-24 22:15:29 UTC (rev 89709)
@@ -16,10 +16,10 @@
                     (GraphicsLayer
                       (children 1
                         (GraphicsLayer
-                          (bounds 400.00 10733.00)
+                          (bounds 400.00 400.00)
                           (children 1
                             (GraphicsLayer
-                              (bounds 400.00 10733.00)
+                              (bounds 400.00 400.00)
                               (drawsContent 1)
                               (children 1
                                 (GraphicsLayer

Modified: trunk/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt (89708 => 89709)


--- trunk/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt	2011-06-24 22:07:10 UTC (rev 89708)
+++ trunk/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt	2011-06-24 22:15:29 UTC (rev 89709)
@@ -17,10 +17,10 @@
                       (children 1
                         (GraphicsLayer
                           (position -608.00 0.00)
-                          (bounds 1008.00 10749.00)
+                          (bounds 1008.00 1016.00)
                           (children 1
                             (GraphicsLayer
-                              (bounds 1008.00 10749.00)
+                              (bounds 1008.00 1016.00)
                               (drawsContent 1)
                               (children 1
                                 (GraphicsLayer

Modified: trunk/LayoutTests/compositing/rtl/rtl-iframe-fixed-expected.txt (89708 => 89709)


--- trunk/LayoutTests/compositing/rtl/rtl-iframe-fixed-expected.txt	2011-06-24 22:07:10 UTC (rev 89708)
+++ trunk/LayoutTests/compositing/rtl/rtl-iframe-fixed-expected.txt	2011-06-24 22:15:29 UTC (rev 89709)
@@ -16,10 +16,10 @@
                     (GraphicsLayer
                       (children 1
                         (GraphicsLayer
-                          (bounds 400.00 10733.00)
+                          (bounds 400.00 400.00)
                           (children 1
                             (GraphicsLayer
-                              (bounds 400.00 10733.00)
+                              (bounds 400.00 400.00)
                               (drawsContent 1)
                               (children 1
                                 (GraphicsLayer

Modified: trunk/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt (89708 => 89709)


--- trunk/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt	2011-06-24 22:07:10 UTC (rev 89708)
+++ trunk/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt	2011-06-24 22:15:29 UTC (rev 89709)
@@ -17,10 +17,10 @@
                       (children 1
                         (GraphicsLayer
                           (position -608.00 0.00)
-                          (bounds 1008.00 10749.00)
+                          (bounds 1008.00 1016.00)
                           (children 1
                             (GraphicsLayer
-                              (bounds 1008.00 10749.00)
+                              (bounds 1008.00 1016.00)
                               (drawsContent 1)
                               (children 1
                                 (GraphicsLayer

Modified: trunk/LayoutTests/compositing/rtl/rtl-iframe-relative-expected.txt (89708 => 89709)


--- trunk/LayoutTests/compositing/rtl/rtl-iframe-relative-expected.txt	2011-06-24 22:07:10 UTC (rev 89708)
+++ trunk/LayoutTests/compositing/rtl/rtl-iframe-relative-expected.txt	2011-06-24 22:15:29 UTC (rev 89709)
@@ -16,10 +16,10 @@
                     (GraphicsLayer
                       (children 1
                         (GraphicsLayer
-                          (bounds 400.00 10733.00)
+                          (bounds 400.00 400.00)
                           (children 1
                             (GraphicsLayer
-                              (bounds 400.00 10733.00)
+                              (bounds 400.00 400.00)
                               (drawsContent 1)
                               (children 1
                                 (GraphicsLayer

Modified: trunk/LayoutTests/compositing/rtl/rtl-relative.html (89708 => 89709)


--- trunk/LayoutTests/compositing/rtl/rtl-relative.html	2011-06-24 22:07:10 UTC (rev 89708)
+++ trunk/LayoutTests/compositing/rtl/rtl-relative.html	2011-06-24 22:15:29 UTC (rev 89709)
@@ -34,7 +34,8 @@
 <script>
     function doTest() {
         if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
+            if (top == self)
+                document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
             layoutTestController.dumpAsText(true);
         }
     }

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

Reply via email to