[Qt] remaining compositing tests after rebaseline for new testfonts
authorkbalazs@webkit.org <kbalazs@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Jul 2012 15:39:57 +0000 (15:39 +0000)
committerkbalazs@webkit.org <kbalazs@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Jul 2012 15:39:57 +0000 (15:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=91377

Unreviewed rebaseline.

* platform/qt-5.0-wk2/Skipped:
* platform/qt-5.0-wk2/compositing/overflow/theme-affects-visual-overflow-expected.txt: Removed.
* platform/qt/compositing/backing/no-backing-for-clip-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/backing/no-backing-for-clip-expected.txt.
* platform/qt/compositing/backing/no-backing-for-clip-overlap-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/backing/no-backing-for-clip-overlap-expected.txt.
* platform/qt/compositing/backing/no-backing-for-perspective-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/backing/no-backing-for-perspective-expected.txt.
* platform/qt/compositing/geometry/composited-html-size-expected.png: Copied from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/composited-html-size-expected.png.
* platform/qt/compositing/geometry/composited-html-size-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/composited-html-size-expected.txt.
* platform/qt/compositing/geometry/composited-in-columns-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/composited-in-columns-expected.txt.
* platform/qt/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.png: Copied from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.png.
* platform/qt/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.txt.
* platform/qt/compositing/geometry/object-clip-rects-assertion-expected.txt: Added.
* platform/qt/compositing/geometry/preserve-3d-switching-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/preserve-3d-switching-expected.txt.
* platform/qt/compositing/iframes/composited-iframe-scroll-expected.png: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.png.
* platform/qt/compositing/iframes/composited-iframe-scroll-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/iframes/composited-iframe-scroll-expected.txt.
* platform/qt/compositing/iframes/iframe-content-flipping-expected.png: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/composited-html-size-expected.png.
* platform/qt/compositing/iframes/iframe-content-flipping-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/iframes/iframe-content-flipping-expected.txt.
* platform/qt/compositing/iframes/invisible-nested-iframe-show-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/iframes/invisible-nested-iframe-show-expected.txt.
* platform/qt/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt.
* platform/qt/compositing/overflow/theme-affects-visual-overflow-expected.png: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/overflow/theme-affects-visual-overflow-expected.png.
* platform/qt/compositing/overflow/theme-affects-visual-overflow-expected.txt: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@122732 268f45cc-cd09-0410-ab3c-d52691b4dbfc

21 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/qt-5.0-wk2/Skipped
LayoutTests/platform/qt-5.0-wk2/compositing/overflow/theme-affects-visual-overflow-expected.txt [deleted file]
LayoutTests/platform/qt/compositing/backing/no-backing-for-clip-expected.txt [moved from LayoutTests/platform/qt-5.0-wk2/compositing/backing/no-backing-for-clip-expected.txt with 77% similarity]
LayoutTests/platform/qt/compositing/backing/no-backing-for-clip-overlap-expected.txt [moved from LayoutTests/platform/qt-5.0-wk2/compositing/backing/no-backing-for-clip-overlap-expected.txt with 77% similarity]
LayoutTests/platform/qt/compositing/backing/no-backing-for-perspective-expected.txt [moved from LayoutTests/platform/qt-5.0-wk2/compositing/backing/no-backing-for-perspective-expected.txt with 85% similarity]
LayoutTests/platform/qt/compositing/geometry/composited-html-size-expected.png [new file with mode: 0644]
LayoutTests/platform/qt/compositing/geometry/composited-html-size-expected.txt [moved from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/composited-html-size-expected.txt with 70% similarity]
LayoutTests/platform/qt/compositing/geometry/composited-in-columns-expected.txt [moved from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/composited-in-columns-expected.txt with 89% similarity]
LayoutTests/platform/qt/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.png [moved from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.png with 100% similarity]
LayoutTests/platform/qt/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.txt [moved from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.txt with 86% similarity]
LayoutTests/platform/qt/compositing/geometry/object-clip-rects-assertion-expected.txt [new file with mode: 0644]
LayoutTests/platform/qt/compositing/geometry/preserve-3d-switching-expected.txt [moved from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/preserve-3d-switching-expected.txt with 97% similarity]
LayoutTests/platform/qt/compositing/iframes/composited-iframe-scroll-expected.png [new file with mode: 0644]
LayoutTests/platform/qt/compositing/iframes/composited-iframe-scroll-expected.txt [moved from LayoutTests/platform/qt-5.0-wk2/compositing/iframes/composited-iframe-scroll-expected.txt with 89% similarity]
LayoutTests/platform/qt/compositing/iframes/iframe-content-flipping-expected.png [moved from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/composited-html-size-expected.png with 57% similarity]
LayoutTests/platform/qt/compositing/iframes/iframe-content-flipping-expected.txt [moved from LayoutTests/platform/qt-5.0-wk2/compositing/iframes/iframe-content-flipping-expected.txt with 84% similarity]
LayoutTests/platform/qt/compositing/iframes/invisible-nested-iframe-show-expected.txt [moved from LayoutTests/platform/qt-5.0-wk2/compositing/iframes/invisible-nested-iframe-show-expected.txt with 96% similarity]
LayoutTests/platform/qt/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt [moved from LayoutTests/platform/qt-5.0-wk2/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt with 77% similarity]
LayoutTests/platform/qt/compositing/overflow/theme-affects-visual-overflow-expected.png [moved from LayoutTests/platform/qt-5.0-wk2/compositing/overflow/theme-affects-visual-overflow-expected.png with 83% similarity]
LayoutTests/platform/qt/compositing/overflow/theme-affects-visual-overflow-expected.txt [new file with mode: 0644]

index e14f21d..0b3cbf4 100644 (file)
@@ -1,3 +1,31 @@
+2012-07-16  Balazs Kelemen  <kbalazs@webkit.org>
+
+        [Qt] remaining compositing tests after rebaseline for new testfonts
+        https://bugs.webkit.org/show_bug.cgi?id=91377
+
+        Unreviewed rebaseline.
+
+        * platform/qt-5.0-wk2/Skipped:
+        * platform/qt-5.0-wk2/compositing/overflow/theme-affects-visual-overflow-expected.txt: Removed.
+        * platform/qt/compositing/backing/no-backing-for-clip-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/backing/no-backing-for-clip-expected.txt.
+        * platform/qt/compositing/backing/no-backing-for-clip-overlap-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/backing/no-backing-for-clip-overlap-expected.txt.
+        * platform/qt/compositing/backing/no-backing-for-perspective-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/backing/no-backing-for-perspective-expected.txt.
+        * platform/qt/compositing/geometry/composited-html-size-expected.png: Copied from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/composited-html-size-expected.png.
+        * platform/qt/compositing/geometry/composited-html-size-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/composited-html-size-expected.txt.
+        * platform/qt/compositing/geometry/composited-in-columns-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/composited-in-columns-expected.txt.
+        * platform/qt/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.png: Copied from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.png.
+        * platform/qt/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.txt.
+        * platform/qt/compositing/geometry/object-clip-rects-assertion-expected.txt: Added.
+        * platform/qt/compositing/geometry/preserve-3d-switching-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/preserve-3d-switching-expected.txt.
+        * platform/qt/compositing/iframes/composited-iframe-scroll-expected.png: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.png.
+        * platform/qt/compositing/iframes/composited-iframe-scroll-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/iframes/composited-iframe-scroll-expected.txt.
+        * platform/qt/compositing/iframes/iframe-content-flipping-expected.png: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/composited-html-size-expected.png.
+        * platform/qt/compositing/iframes/iframe-content-flipping-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/iframes/iframe-content-flipping-expected.txt.
+        * platform/qt/compositing/iframes/invisible-nested-iframe-show-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/iframes/invisible-nested-iframe-show-expected.txt.
+        * platform/qt/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt.
+        * platform/qt/compositing/overflow/theme-affects-visual-overflow-expected.png: Renamed from LayoutTests/platform/qt-5.0-wk2/compositing/overflow/theme-affects-visual-overflow-expected.png.
+        * platform/qt/compositing/overflow/theme-affects-visual-overflow-expected.txt: Added.
+
 2012-07-16  Mike Reed  <reed@google.com>
 
         Update expectations : rebaseline images after skia 4600 lands
index 3410569..995a9fe 100644 (file)
@@ -400,24 +400,6 @@ http/tests/ssl
 # https://bugs.webkit.org/show_bug.cgi?id=90985
 fast/repaint/background-scaling.html
 
-# [Qt] remaining compositing tests after rebaseline for new testfonts
-# https://bugs.webkit.org/show_bug.cgi?id=91377
-compositing/backing/no-backing-for-clip-overlap.html
-compositing/backing/no-backing-for-clip.html
-compositing/backing/no-backing-for-perspective.html
-compositing/geometry/composited-html-size.html
-compositing/geometry/composited-in-columns.html
-compositing/geometry/fixed-in-composited.html
-compositing/geometry/limit-layer-bounds-overflow-repaint.html
-compositing/geometry/object-clip-rects-assertion.html
-compositing/geometry/partial-layout-update.html
-compositing/geometry/preserve-3d-switching.html
-compositing/iframes/composited-iframe-scroll.html
-compositing/iframes/iframe-content-flipping.html
-compositing/iframes/invisible-nested-iframe-show.html
-compositing/layer-creation/no-compositing-for-preserve-3d.html
-compositing/overflow/theme-affects-visual-overflow.html
-
 # [Qt] The test fonts used for Qt tests changed to the Liberation font family,
 # due to this we are skipping tons of tests. They will be unskipped in batches ASAP.
 # https://bugs.webkit.org/show_bug.cgi?id=85203
diff --git a/LayoutTests/platform/qt-5.0-wk2/compositing/overflow/theme-affects-visual-overflow-expected.txt b/LayoutTests/platform/qt-5.0-wk2/compositing/overflow/theme-affects-visual-overflow-expected.txt
deleted file mode 100644 (file)
index 27cd204..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x37
-  RenderBlock {HTML} at (0,0) size 800x37
-    RenderBody {BODY} at (8,8) size 784x21
-layer at (8,8) size 784x21
-  RenderBlock {DIV} at (0,0) size 784x21
-    RenderText {#text} at (23,0) size 4x21
-      text run at (23,0) width 4: " "
-    RenderBlock {SPAN} at (27,16) size 20x0
-    RenderText {#text} at (47,0) size 4x21
-      text run at (47,0) width 4: " "
-    RenderText {#text} at (0,0) size 0x0
-layer at (12,11) size 15x15
-  RenderBlock (relative positioned) {INPUT} at (4,3) size 15x15
-layer at (63,11) size 15x15
-  RenderBlock (relative positioned) {INPUT} at (55,3) size 15x15
@@ -8,22 +8,22 @@ This layer should not have backing store.
       (children 1
         (GraphicsLayer
           (position 8.00 8.00)
-          (bounds 342.00 246.00)
+          (bounds 342.00 242.00)
           (children 1
             (GraphicsLayer
               (position 1.00 1.00)
-              (bounds 340.00 244.00)
+              (bounds 340.00 240.00)
               (children 1
                 (GraphicsLayer
-                  (position 20.00 41.00)
-                  (bounds 320.00 183.00)
+                  (position 20.00 39.00)
+                  (bounds 320.00 181.00)
                   (children 1
                     (GraphicsLayer
                       (position 1.00 1.00)
-                      (bounds 340.00 181.00)
+                      (bounds 340.00 179.00)
                       (children 1
                         (GraphicsLayer
-                          (position 30.00 51.00)
+                          (position 30.00 49.00)
                           (bounds 100.00 100.00)
                           (drawsContent 1)
                         )
@@ -8,14 +8,14 @@ This layer should have backing store.
       (children 2
         (GraphicsLayer
           (position 8.00 8.00)
-          (bounds 342.00 183.00)
+          (bounds 342.00 181.00)
           (children 1
             (GraphicsLayer
               (position 1.00 1.00)
-              (bounds 340.00 181.00)
+              (bounds 340.00 179.00)
               (children 1
                 (GraphicsLayer
-                  (position 30.00 51.00)
+                  (position 30.00 49.00)
                   (bounds 100.00 100.00)
                   (drawsContent 1)
                 )
@@ -24,16 +24,16 @@ This layer should have backing store.
           )
         )
         (GraphicsLayer
-          (position 8.00 181.00)
-          (bounds 342.00 183.00)
+          (position 8.00 179.00)
+          (bounds 342.00 181.00)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
               (position 1.00 1.00)
-              (bounds 340.00 181.00)
+              (bounds 340.00 179.00)
               (children 1
                 (GraphicsLayer
-                  (position 30.00 51.00)
+                  (position 30.00 49.00)
                   (bounds 100.00 100.00)
                   (drawsContent 1)
                 )
@@ -8,16 +8,16 @@ This layer should not have backing store.
       (children 1
         (GraphicsLayer
           (position 8.00 8.00)
-          (bounds 342.00 246.00)
+          (bounds 342.00 242.00)
           (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00])
           (children 1
             (GraphicsLayer
-              (position 21.00 42.00)
-              (bounds 342.00 183.00)
+              (position 21.00 40.00)
+              (bounds 342.00 181.00)
               (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00])
               (children 1
                 (GraphicsLayer
-                  (position 31.00 52.00)
+                  (position 31.00 50.00)
                   (bounds 100.00 100.00)
                   (drawsContent 1)
                   (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
diff --git a/LayoutTests/platform/qt/compositing/geometry/composited-html-size-expected.png b/LayoutTests/platform/qt/compositing/geometry/composited-html-size-expected.png
new file mode 100644 (file)
index 0000000..28e6837
Binary files /dev/null and b/LayoutTests/platform/qt/compositing/geometry/composited-html-size-expected.png differ
@@ -3,10 +3,10 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x36 layerType: background only
 layer at (10,10) size 100x100
   RenderBlock (positioned) zI: -1 {DIV} at (10,10) size 100x100 [bgcolor=#0000FF]
-layer at (10,10) size 100x21
-  RenderBlock {DIV} at (0,0) size 100x21
-    RenderText {#text} at (0,0) size 90x21
-      text run at (0,0) width 90: "Compositing"
+layer at (10,10) size 100x19
+  RenderBlock {DIV} at (0,0) size 100x19
+    RenderText {#text} at (0,0) size 76x19
+      text run at (0,0) width 76: "Compositing"
 layer at (0,0) size 800x36 layerType: foreground only
   RenderBlock {HTML} at (0,0) size 800x36
     RenderBody {BODY} at (8,8) size 784x20 [bgcolor=#C0C0C0]
@@ -5,7 +5,7 @@
       (bounds 800.00 600.00)
       (children 2
         (GraphicsLayer
-          (position 14.00 164.00)
+          (position 14.00 162.00)
           (bounds 210.00 60.00)
           (drawsContent 1)
           (children 1
@@ -16,7 +16,7 @@
           )
         )
         (GraphicsLayer
-          (position 272.00 89.00)
+          (position 272.00 88.00)
           (bounds 210.00 60.00)
           (drawsContent 1)
           (children 1
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x243
-  RenderBlock {HTML} at (0,0) size 800x243
-    RenderBody {BODY} at (8,8) size 784x227
+layer at (0,0) size 800x242
+  RenderBlock {HTML} at (0,0) size 800x242
+    RenderBody {BODY} at (8,8) size 784x226
       RenderText {#text} at (0,0) size 0x0
 layer at (20,20) size 100x100
   RenderVideo {VIDEO} at (20,20) size 100x100
diff --git a/LayoutTests/platform/qt/compositing/geometry/object-clip-rects-assertion-expected.txt b/LayoutTests/platform/qt/compositing/geometry/object-clip-rects-assertion-expected.txt
new file mode 100644 (file)
index 0000000..74da4d2
--- /dev/null
@@ -0,0 +1,4 @@
+This testcase should not fire an assertion related to clip rects.
+
+
+
@@ -8,7 +8,7 @@ The green box appear angled out from the yellow box and embedded in it.
       (bounds 800.00 600.00)
       (children 1
         (GraphicsLayer
-          (position 108.00 74.00)
+          (position 108.00 72.00)
           (bounds 304.00 304.00)
           (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00])
           (children 1
diff --git a/LayoutTests/platform/qt/compositing/iframes/composited-iframe-scroll-expected.png b/LayoutTests/platform/qt/compositing/iframes/composited-iframe-scroll-expected.png
new file mode 100644 (file)
index 0000000..f8eabd3
Binary files /dev/null and b/LayoutTests/platform/qt/compositing/iframes/composited-iframe-scroll-expected.png differ
@@ -5,8 +5,8 @@ layer at (0,0) size 800x0
     RenderBody {BODY} at (0,0) size 800x0
 layer at (120,120) size 200x200
   RenderBlock (positioned) {DIV} at (120,120) size 200x200 [bgcolor=#FF0000]
-layer at (0,100) size 240x245
-  RenderBlock (positioned) {DIV} at (0,100) size 240x245
+layer at (0,100) size 240x244
+  RenderBlock (positioned) {DIV} at (0,100) size 240x244
     RenderText {#text} at (0,0) size 0x0
 layer at (10,110) size 220x220
   RenderPartObject {IFRAME} at (10,10) size 220x220
similarity index 57%
rename from LayoutTests/platform/qt-5.0-wk2/compositing/geometry/composited-html-size-expected.png
rename to LayoutTests/platform/qt/compositing/iframes/iframe-content-flipping-expected.png
index 154af43..f246103 100644 (file)
Binary files a/LayoutTests/platform/qt-5.0-wk2/compositing/geometry/composited-html-size-expected.png and b/LayoutTests/platform/qt/compositing/iframes/iframe-content-flipping-expected.png differ
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x263
-  RenderBlock {HTML} at (0,0) size 800x263
-    RenderBody {BODY} at (8,8) size 784x247
+layer at (0,0) size 800x262
+  RenderBlock {HTML} at (0,0) size 800x262
+    RenderBody {BODY} at (8,8) size 784x246
       RenderText {#text} at (0,0) size 0x0
 layer at (28,28) size 202x202
   RenderPartObject {IFRAME} at (20,20) size 202x202 [border: (1px solid #000000)]
                     (GraphicsLayer
                       (children 1
                         (GraphicsLayer
-                          (bounds 284.00 193.00)
+                          (bounds 284.00 192.00)
                           (children 1
                             (GraphicsLayer
-                              (bounds 284.00 193.00)
+                              (bounds 284.00 192.00)
                               (drawsContent 1)
                               (children 1
                                 (GraphicsLayer
@@ -74,7 +74,7 @@
           )
         )
         (GraphicsLayer
-          (position 18.00 203.00)
+          (position 18.00 202.00)
           (bounds 210.00 210.00)
           (drawsContent 1)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
@@ -2,19 +2,19 @@ This layer should not be composited.
 This layer should not be composited.
 This layer should be composited.
 (GraphicsLayer
-  (bounds 784.00 622.00)
+  (bounds 784.00 614.00)
   (children 1
     (GraphicsLayer
-      (bounds 784.00 622.00)
+      (bounds 784.00 614.00)
       (children 1
         (GraphicsLayer
-          (position 18.00 396.00)
-          (bounds 342.00 183.00)
+          (position 18.00 392.00)
+          (bounds 342.00 181.00)
           (preserves3D 1)
           (drawsContent 1)
           (children 1
             (GraphicsLayer
-              (position 31.00 52.00)
+              (position 31.00 50.00)
               (bounds 100.00 100.00)
               (drawsContent 1)
               (transform [0.98 0.00 -0.17 0.00] [0.00 1.00 0.00 0.00] [0.17 0.00 0.98 0.00] [0.00 0.00 0.00 1.00])
similarity index 83%
rename from LayoutTests/platform/qt-5.0-wk2/compositing/overflow/theme-affects-visual-overflow-expected.png
rename to LayoutTests/platform/qt/compositing/overflow/theme-affects-visual-overflow-expected.png
index 61032c2..4be73eb 100644 (file)
Binary files a/LayoutTests/platform/qt-5.0-wk2/compositing/overflow/theme-affects-visual-overflow-expected.png and b/LayoutTests/platform/qt/compositing/overflow/theme-affects-visual-overflow-expected.png differ
diff --git a/LayoutTests/platform/qt/compositing/overflow/theme-affects-visual-overflow-expected.txt b/LayoutTests/platform/qt/compositing/overflow/theme-affects-visual-overflow-expected.txt
new file mode 100644 (file)
index 0000000..9aec4c3
--- /dev/null
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x37
+  RenderBlock {HTML} at (0,0) size 800x37
+    RenderBody {BODY} at (8,8) size 784x21
+layer at (8,8) size 784x21
+  RenderBlock {DIV} at (0,0) size 784x21
+    RenderText {#text} at (21,1) size 4x19
+      text run at (21,1) width 4: " "
+    RenderBlock {SPAN} at (25,16) size 20x0
+    RenderText {#text} at (45,1) size 4x19
+      text run at (45,1) width 4: " "
+    RenderText {#text} at (0,0) size 0x0
+layer at (11,11) size 15x15
+  RenderBlock (relative positioned) {INPUT} at (3,3) size 15x15
+layer at (60,11) size 15x15
+  RenderBlock (relative positioned) {INPUT} at (52,3) size 15x15