Unreviewed gardening.

* platform/mac-future/svg/carto.net: Added.
* platform/mac-future/svg/carto.net/scrollbar-expected.png: Added.
* platform/mac/svg/carto.net/scrollbar-expected.png: Removed.
* platform/chromium-mac-leopard/svg/carto.net/scrollbar-expected.png:
* platform/chromium-mac-leopard/svg/carto.net/scrollbar-expected.txt: Added.
Updated the baseline here, thanks to the text on the button...

* platform/chromium/test_expectations.txt:
Marked one test as failing as some output don't make much sense.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2f3d5f3..a8ccfd4 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2012-02-08  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Unreviewed gardening.
+
+        * platform/mac-future/svg/carto.net: Added.
+        * platform/mac-future/svg/carto.net/scrollbar-expected.png: Added.
+        * platform/mac/svg/carto.net/scrollbar-expected.png: Removed.
+        * platform/chromium-mac-leopard/svg/carto.net/scrollbar-expected.png:
+        * platform/chromium-mac-leopard/svg/carto.net/scrollbar-expected.txt: Added.
+        Updated the baseline here, thanks to the text on the button...
+
+        * platform/chromium/test_expectations.txt:
+        Marked one test as failing as some output don't make much sense.
+
 2012-02-08  Dana Jansens  <danakj@chromium.org>
 
         [Chromium] Fix opaque tracking for box shadows and non-composited child elements

diff --git a/LayoutTests/platform/chromium-mac-leopard/svg/carto.net/scrollbar-expected.png b/LayoutTests/platform/chromium-mac-leopard/svg/carto.net/scrollbar-expected.png
index 4396e4a..e68eb4e 100644 (file)
Binary files a/LayoutTests/platform/chromium-mac-leopard/svg/carto.net/scrollbar-expected.png and b/LayoutTests/platform/chromium-mac-leopard/svg/carto.net/scrollbar-expected.png differ

diff --git a/LayoutTests/platform/chromium-mac-leopard/svg/carto.net/scrollbar-expected.txt b/LayoutTests/platform/chromium-mac-leopard/svg/carto.net/scrollbar-expected.txt
new file mode 100644 (file)
index 0000000..5ce8ca8
--- /dev/null
+++ b/LayoutTests/platform/chromium-mac-leopard/svg/carto.net/scrollbar-expected.txt
@@ -0,0 +1,98 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderSVGRoot {svg} at (0,0) size 800x600
+    RenderSVGRect {rect} at (0,0) size 800x600 [x=-1000.00] [y=-1000.00] [width=5000.00] [height=5000.00]
+    RenderSVGText {text} at (50,11) size 339x23 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 339x23
+        chunk 1 text run 1 at (50.00,30.00) startOffset 0 endOffset 34 width 338.75: "Demonstration of the SVG Scrollbar"
+    RenderSVGText {text} at (548,16) size 402x17 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 402x17
+        chunk 1 (end anchor) text run 1 at (548.75,30.00) startOffset 0 endOffset 59 width 401.25: "One can also drag the images and the scrollbars will adopt."
+    RenderSVGViewportContainer {svg} at (40,60) size 760x337
+      RenderSVGContainer {g} at (40,60) size 760x337
+        RenderSVGImage {image} at (40,60) size 760x337
+        RenderSVGContainer {g} at (368,112) size 432x260
+          RenderSVGText {text} at (410,75) size 92x17 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,0) size 92x17
+              chunk 1 (middle anchor) text run 1 at (410.38,88.80) startOffset 0 endOffset 13 width 91.25: "Furggeltihorn"
+          RenderSVGText {text} at (569,85) size 49x17 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,0) size 49x17
+              chunk 1 (middle anchor) text run 1 at (569.42,98.80) startOffset 0 endOffset 6 width 48.75: "P 2821"
+          RenderSVGText {text} at (589,66) size 92x17 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,0) size 92x17
+              chunk 1 (middle anchor) text run 1 at (589.38,79.80) startOffset 0 endOffset 13 width 91.25: "Zervreilahorn"
+          RenderSVGText {text} at (765,99) size 79x17 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,0) size 79x17
+              chunk 1 (middle anchor) text run 1 at (765.63,112.80) startOffset 0 endOffset 11 width 78.75: "Plattenberg"
+          RenderSVGText {text} at (2192,165) size 58x17 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,0) size 58x17
+              chunk 1 (middle anchor) text run 1 at (2192.15,178.80) startOffset 0 endOffset 8 width 57.50: "Piz Fess"
+          RenderSVGText {text} at (2250,149) size 82x17 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,0) size 82x17
+              chunk 1 (middle anchor) text run 1 at (2250.77,162.60) startOffset 0 endOffset 11 width 81.25: "Crap Grisch"
+          RenderSVGText {text} at (2378,136) size 68x17 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,0) size 68x17
+              chunk 1 (middle anchor) text run 1 at (2378.95,149.60) startOffset 0 endOffset 9 width 67.50: "Piz Tom\x{FC}l"
+          RenderSVGText {text} at (1734,99) size 57x17 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,0) size 57x17
+              chunk 1 (middle anchor) text run 1 at (1734.47,112.60) startOffset 0 endOffset 8 width 56.25: "Fruntalp"
+          RenderSVGText {text} at (961,372) size 85x17 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,0) size 85x17
+              chunk 1 (middle anchor) text run 1 at (961.30,386.50) startOffset 0 endOffset 12 width 85.00: "Zervreilasee"
+    RenderSVGContainer {g} at (40,60) size 733x173
+      RenderSVGContainer {g} at (40,220) size 720x13
+        RenderSVGRect {rect} at (52,220) size 696x13 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F5F5F5]}] [x=65.50] [y=250.50] [width=869.00] [height=15.00]
+        RenderSVGRect {rect} at (52,220) size 175x13 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=65.50] [y=250.50] [width=216.82] [height=15.00]
+        RenderSVGRect {rect} at (40,220) size 13x13 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=50.50] [y=250.50] [width=15.00] [height=15.00]
+        RenderSVGRect {rect} at (747,220) size 13x13 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=934.50] [y=250.50] [width=15.00] [height=15.00]
+        RenderSVGPath {path} at (43,223) size 7x7 [fill={[type=SOLID] [color=#696969]}] [data="M 54.5 258.5 L 62.5 254.5 L 62.5 262.5 Z"]
+        RenderSVGPath {path} at (750,223) size 8x7 [fill={[type=SOLID] [color=#696969]}] [data="M 946.5 258.5 L 938.5 262.5 L 938.5 254.5 Z"]
+      RenderSVGContainer {g} at (760,60) size 13x160
+        RenderSVGRect {rect} at (760,72) size 13x136 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F5F5F5]}] [x=950.50] [y=65.50] [width=15.00] [height=169.00]
+        RenderSVGRect {rect} at (760,72) size 13x66 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=950.50] [y=65.50] [width=15.00] [height=80.38]
+        RenderSVGRect {rect} at (760,60) size 13x13 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=950.50] [y=50.50] [width=15.00] [height=15.00]
+        RenderSVGRect {rect} at (760,207) size 13x13 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=950.50] [y=234.50] [width=15.00] [height=15.00]
+        RenderSVGPath {path} at (763,63) size 7x7 [fill={[type=SOLID] [color=#696969]}] [data="M 958 54.5 L 962.5 62.5 L 954.5 62.5 Z"]
+        RenderSVGPath {path} at (763,210) size 7x8 [fill={[type=SOLID] [color=#696969]}] [data="M 958 246.5 L 954.5 238.5 L 962.5 238.5 Z"]
+    RenderSVGText {text} at (396,268) size 554x14 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 554x14
+        chunk 1 (end anchor) text run 1 at (396.25,280.00) startOffset 0 endOffset 89 width 553.75: "Panorama Zervreilastausee, Vals, Graub\x{FC}nden, Switzerland, taken 2006-02-04 (\x{A9} A. Neumann)"
+    RenderSVGViewportContainer {svg} at (40,300) size 760x300
+      RenderSVGContainer {g} at (40,300) size 760x300
+        RenderSVGImage {image} at (40,300) size 760x300
+    RenderSVGContainer {g} at (40,300) size 729x169
+      RenderSVGContainer {g} at (40,460) size 720x9
+        RenderSVGRect {rect} at (40,460) size 704x9 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F5F5F5]}] [x=50.50] [y=550.50] [width=879.00] [height=10.00]
+        RenderSVGRect {rect} at (40,460) size 179x9 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=50.50] [y=550.50] [width=222.21] [height=10.00]
+        RenderSVGRect {rect} at (743,460) size 9x9 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=929.50] [y=550.50] [width=10.00] [height=10.00]
+        RenderSVGRect {rect} at (751,460) size 9x9 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=939.50] [y=550.50] [width=10.00] [height=10.00]
+        RenderSVGPath {path} at (746,462) size 5x6 [fill={[type=SOLID] [color=#696969]}] [data="M 932.5 556.5 L 938.5 553.5 L 938.5 559.5 Z"]
+        RenderSVGPath {path} at (754,462) size 5x6 [fill={[type=SOLID] [color=#696969]}] [data="M 948.5 556.5 L 942.5 559.5 L 942.5 553.5 Z"]
+      RenderSVGContainer {g} at (760,300) size 9x160
+        RenderSVGRect {rect} at (760,300) size 9x144 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F5F5F5]}] [x=950.50] [y=350.50] [width=10.00] [height=179.00]
+        RenderSVGRect {rect} at (760,300) size 9x43 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=950.50] [y=350.50] [width=10.00] [height=51.96]
+        RenderSVGRect {rect} at (760,443) size 9x9 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=950.50] [y=529.50] [width=10.00] [height=10.00]
+        RenderSVGRect {rect} at (760,451) size 9x9 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=950.50] [y=539.50] [width=10.00] [height=10.00]
+        RenderSVGPath {path} at (762,446) size 6x5 [fill={[type=SOLID] [color=#696969]}] [data="M 955.5 532.5 L 959.5 538.5 L 953.5 538.5 Z"]
+        RenderSVGPath {path} at (762,454) size 6x5 [fill={[type=SOLID] [color=#696969]}] [data="M 955.5 548.5 L 953.5 542.5 L 959.5 542.5 Z"]
+    RenderSVGText {text} at (403,563) size 547x14 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 547x14
+        chunk 1 (end anchor) text run 1 at (403.75,575.00) startOffset 0 endOffset 94 width 546.25: "Panorama Chalchtrittli, Tierfed, Linthal, Glarus, Switzerland, taken 2005-09-03 (\x{A9} A. Neumann)"
+    RenderSVGContainer {g} at (39,483) size 186x18
+      RenderSVGContainer {g} at (39,483) size 90x18
+        RenderSVGRect {rect} at (39,483) size 89x17 [fill={[type=SOLID] [color=#FFFFFF]}] [x=49.00] [y=579.00] [width=110.00] [height=20.00]
+        RenderSVGRect {rect} at (40,484) size 89x17 [fill={[type=SOLID] [color=#696969]}] [x=51.00] [y=581.00] [width=110.00] [height=20.00]
+        RenderSVGRect {rect} at (40,484) size 88x16 [fill={[type=SOLID] [color=#DCDCDC]}] [x=50.00] [y=580.00] [width=110.00] [height=20.00]
+        RenderSVGText {text} at (66,584) size 78x14 contains 1 chunk(s)
+          RenderSVGTSpan {tspan} at (0,0) size 78x14
+            RenderSVGInlineText {#text} at (0,0) size 78x14
+              chunk 1 (middle anchor) text run 1 at (66.00,595.40) startOffset 0 endOffset 14 width 78.00: "Hide Scrollbar"
+      RenderSVGContainer {g} at (135,483) size 90x18
+        RenderSVGRect {rect} at (135,483) size 89x17 [fill={[type=SOLID] [color=#FFFFFF]}] [x=169.00] [y=579.00] [width=110.00] [height=20.00]
+        RenderSVGRect {rect} at (136,484) size 89x17 [fill={[type=SOLID] [color=#696969]}] [x=171.00] [y=581.00] [width=110.00] [height=20.00]
+        RenderSVGRect {rect} at (136,484) size 88x16 [fill={[type=SOLID] [color=#DCDCDC]}] [x=170.00] [y=580.00] [width=110.00] [height=20.00]
+        RenderSVGText {text} at (176,584) size 98x14 contains 1 chunk(s)
+          RenderSVGTSpan {tspan} at (0,0) size 98x14
+            RenderSVGInlineText {#text} at (0,0) size 98x14
+              chunk 1 (middle anchor) text run 1 at (176.00,595.40) startOffset 0 endOffset 16 width 98.00: "Remove Scrollbar"

diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 7deafec..07ff2e8 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -4043,3 +4043,6 @@ BUGWK78038 DEBUG : compositing/iframes/invisible-nested-iframe-show.html = PASS
 BUGWK78038 DEBUG : compositing/iframes/layout-on-compositing-change.html = PASS CRASH
 
 BUGWK78159 DEBUG WIN SNOWLEOPARD : compositing/iframes/scrolling-iframe.html = PASS TEXT
+
+// Some of the new baselines don't make any sense.
+BUGWK78175 DEBUG SNOWLEOPARD : compositing/overflow/overflow-scaled-descendant-overlapping.html = IMAGE

diff --git a/LayoutTests/platform/mac/svg/carto.net/scrollbar-expected.png b/LayoutTests/platform/mac-future/svg/carto.net/scrollbar-expected.png
similarity index 100%
rename from LayoutTests/platform/mac/svg/carto.net/scrollbar-expected.png
rename to LayoutTests/platform/mac-future/svg/carto.net/scrollbar-expected.png