Rebaseline Windows/Linux tests with workaround from PatternSkia.cpp. See Issue 17365 and WebKit r39921.

Review URL: http://codereview.chromium.org/17632


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8104 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 40 insertions, 44 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/patternfill-repeat-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/patternfill-repeat-expected.checksum
new file mode 100644
index 0000000..696847f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/patternfill-repeat-expected.checksum
@@ -0,0 +1 @@
+46f23b0280c2eead6cdb4e1b26e28924
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/patternfill-repeat-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/patternfill-repeat-expected.png
new file mode 100644
index 0000000..a289db8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/patternfill-repeat-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.checksum
new file mode 100644
index 0000000..4c86659
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.checksum
@@ -0,0 +1 @@
+686197bc05a6e04e473ca3d826fff06f
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png
new file mode 100644
index 0000000..ed55590
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/patternfill-repeat-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/patternfill-repeat-expected.checksum
new file mode 100755
index 0000000..55c59b2
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/patternfill-repeat-expected.checksum
@@ -0,0 +1 @@
+b90b75eff778a8b1d582354689c6c8ee
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/patternfill-repeat-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/patternfill-repeat-expected.png
new file mode 100755
index 0000000..abf114b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/patternfill-repeat-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.checksum
index ead2004..4abe25e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.checksum
@@ -1 +1 @@
-2ece344b9f5ee344cc8d0d2464c3a772
\ No newline at end of file
+8316599977c46ab82a8813da2f53fab9
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png
index a3b846d..7b59baa 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.txt
index 6085445..9b1fc79 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.txt
@@ -1,36 +1,36 @@
-KRenderingPaintServer {id="Grad1" [type=LINEAR-GRADIENT] [stops=[(0.00,#0000FF), (0.50,#FF0000), (1.00,#00FF00)]] [bounding box mode=0] [transform={m=((0.50,0.00)(0.00,0.50)) t=(25.00,35.00)}] [start=(0,0)] [end=(430,0)]}
-KRenderingPaintServer {id="Grad2" [type=RADIAL-GRADIENT] [stops=[(0.00,#000000), (1.00,#FFA500)]] [bounding box mode=0] [transform={m=((1.00,0.00)(1.00,1.00)) t=(240.00,155.00)}] [center=(0,0)] [focal=(0,0)] [radius=60.00]}
-KRenderingPaintServer {id="Pat3" [type=PATTERN] [bbox=at (0,0) size 1x1] [pattern transform={m=((2.00,0.00)(2.00,2.00)) t=(25.00,215.00)}]}
-layer at (0,0) size 480x360
-  RenderView at (0,0) size 480x360
-layer at (0,0) size 480x360
-  RenderSVGRoot {svg} at (0,0) size 479.50x359.50
-    RenderSVGContainer {g} at (0,0) size 460x297
-      RenderSVGHiddenContainer {linearGradient} at (0,0) size 0x0
-        RenderSVGGradientStop {stop} at (0,0) size 0x0
-        RenderSVGGradientStop {stop} at (0,0) size 0x0
-        RenderSVGGradientStop {stop} at (0,0) size 0x0
-      RenderPath {rect} at (20,20) size 440x50 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#0000FF), (0.50,#FF0000), (1.00,#00FF00)]] [bounding box mode=0] [transform={m=((0.50,0.00)(0.00,0.50)) t=(25.00,35.00)}] [start=(0,0)] [end=(430,0)]}] [data="M20.00,20.00 L460.00,20.00 L460.00,70.00 L20.00,70.00"]
-      RenderSVGText {text} at (20,100) size 288x35 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-28) size 288x35
-          chunk 1 text run 1 at (20.00,100.00) startOffset 0 endOffset 22 width 288.00: "scale(0.5) on gradient"
-      RenderSVGHiddenContainer {radialGradient} at (0,0) size 0x0
-        RenderSVGGradientStop {stop} at (0,0) size 0x0
-        RenderSVGGradientStop {stop} at (0,0) size 0x0
-      RenderPath {rect} at (20,110) size 440x50 [fill={[type=RADIAL-GRADIENT] [stops=[(0.00,#000000), (1.00,#FFA500)]] [bounding box mode=0] [transform={m=((1.00,0.00)(1.00,1.00)) t=(240.00,155.00)}] [center=(0,0)] [focal=(0,0)] [radius=60.00]}] [data="M20.00,110.00 L460.00,110.00 L460.00,160.00 L20.00,160.00"]
-      RenderSVGText {text} at (20,190) size 297x35 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-28) size 297x35
-          chunk 1 text run 1 at (20.00,190.00) startOffset 0 endOffset 21 width 297.00: "skewX(45) on gradient"
-      RenderSVGContainer {pattern} at (0,0) size 20x20
-        RenderPath {rect} at (0,0) size 10x10 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00"]
-        RenderPath {rect} at (10,0) size 10x10 [fill={[type=SOLID] [color=#008000]}] [data="M10.00,0.00 L20.00,0.00 L20.00,10.00 L10.00,10.00"]
-        RenderPath {rect} at (0,10) size 10x10 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,10.00 L10.00,10.00 L10.00,20.00 L0.00,20.00"]
-        RenderPath {rect} at (10,10) size 10x10 [fill={[type=SOLID] [color=#FFFF00]}] [data="M10.00,10.00 L20.00,10.00 L20.00,20.00 L10.00,20.00"]
-      RenderPath {rect} at (20,210) size 440x50 [fill={[type=PATTERN] [bbox=at (0,0) size 1x1] [pattern transform={m=((2.00,0.00)(2.00,2.00)) t=(25.00,215.00)}]}] [data="M20.00,210.00 L460.00,210.00 L460.00,260.00 L20.00,260.00"]
-      RenderSVGText {text} at (20,290) size 403x35 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-28) size 403x35
-          chunk 1 text run 1 at (20.00,290.00) startOffset 0 endOffset 30 width 403.00: "scale(2), skewX(45) on pattern"
-    RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,-36) size 261x46
-        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.7 $"
-    RenderPath {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00 L479.00,1.00 L479.00,359.00 L1.00,359.00"]
+KRenderingPaintServer {id="Grad1" [type=LINEAR-GRADIENT] [stops=[(0.00,#0000FF), (0.50,#FF0000), (1.00,#00FF00)]] [bounding box mode=0] [transform={m=((0.50,0.00)(0.00,0.50)) t=(25.00,35.00)}] [start=(0,0)] [end=(430,0)]}

+KRenderingPaintServer {id="Grad2" [type=RADIAL-GRADIENT] [stops=[(0.00,#000000), (1.00,#FFA500)]] [bounding box mode=0] [transform={m=((1.00,0.00)(1.00,1.00)) t=(240.00,155.00)}] [center=(0,0)] [focal=(0,0)] [radius=60.00]}

+KRenderingPaintServer {id="Pat3" [type=PATTERN] [bbox=at (0,0) size 1x1] [pattern transform={m=((2.00,0.00)(2.00,2.00)) t=(25.00,215.00)}]}

+layer at (0,0) size 480x360

+  RenderView at (0,0) size 480x360

+layer at (0,0) size 480x360

+  RenderSVGRoot {svg} at (0,0) size 479.50x359.50

+    RenderSVGContainer {g} at (0,0) size 460x297

+      RenderSVGHiddenContainer {linearGradient} at (0,0) size 0x0

+        RenderSVGGradientStop {stop} at (0,0) size 0x0

+        RenderSVGGradientStop {stop} at (0,0) size 0x0

+        RenderSVGGradientStop {stop} at (0,0) size 0x0

+      RenderPath {rect} at (20,20) size 440x50 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#0000FF), (0.50,#FF0000), (1.00,#00FF00)]] [bounding box mode=0] [transform={m=((0.50,0.00)(0.00,0.50)) t=(25.00,35.00)}] [start=(0,0)] [end=(430,0)]}] [data="M20.00,20.00 L460.00,20.00 L460.00,70.00 L20.00,70.00 Z"]

+      RenderSVGText {text} at (20,100) size 288x35 contains 1 chunk(s)

+        RenderSVGInlineText {#text} at (0,-28) size 288x35

+          chunk 1 text run 1 at (20.00,100.00) startOffset 0 endOffset 22 width 288.00: "scale(0.5) on gradient"

+      RenderSVGHiddenContainer {radialGradient} at (0,0) size 0x0

+        RenderSVGGradientStop {stop} at (0,0) size 0x0

+        RenderSVGGradientStop {stop} at (0,0) size 0x0

+      RenderPath {rect} at (20,110) size 440x50 [fill={[type=RADIAL-GRADIENT] [stops=[(0.00,#000000), (1.00,#FFA500)]] [bounding box mode=0] [transform={m=((1.00,0.00)(1.00,1.00)) t=(240.00,155.00)}] [center=(0,0)] [focal=(0,0)] [radius=60.00]}] [data="M20.00,110.00 L460.00,110.00 L460.00,160.00 L20.00,160.00 Z"]

+      RenderSVGText {text} at (20,190) size 297x35 contains 1 chunk(s)

+        RenderSVGInlineText {#text} at (0,-28) size 297x35

+          chunk 1 text run 1 at (20.00,190.00) startOffset 0 endOffset 21 width 297.00: "skewX(45) on gradient"

+      RenderSVGContainer {pattern} at (0,0) size 20x20

+        RenderPath {rect} at (0,0) size 10x10 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]

+        RenderPath {rect} at (10,0) size 10x10 [fill={[type=SOLID] [color=#008000]}] [data="M10.00,0.00 L20.00,0.00 L20.00,10.00 L10.00,10.00 Z"]

+        RenderPath {rect} at (0,10) size 10x10 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,10.00 L10.00,10.00 L10.00,20.00 L0.00,20.00 Z"]

+        RenderPath {rect} at (10,10) size 10x10 [fill={[type=SOLID] [color=#FFFF00]}] [data="M10.00,10.00 L20.00,10.00 L20.00,20.00 L10.00,20.00 Z"]

+      RenderPath {rect} at (20,210) size 440x50 [fill={[type=PATTERN] [bbox=at (0,0) size 1x1] [pattern transform={m=((2.00,0.00)(2.00,2.00)) t=(25.00,215.00)}]}] [data="M20.00,210.00 L460.00,210.00 L460.00,260.00 L20.00,260.00 Z"]

+      RenderSVGText {text} at (20,290) size 403x35 contains 1 chunk(s)

+        RenderSVGInlineText {#text} at (0,-28) size 403x35

+          chunk 1 text run 1 at (20.00,290.00) startOffset 0 endOffset 30 width 403.00: "scale(2), skewX(45) on pattern"

+    RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s)

+      RenderSVGInlineText {#text} at (0,-36) size 261x46

+        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.7 $"

+    RenderPath {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00 L479.00,1.00 L479.00,359.00 L1.00,359.00 Z"]

diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index ff42244..797eac0 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -911,9 +911,6 @@ DEFER SKIP : LayoutTests/security/autocomplete-cleared-on-back.html = TIMEOUT
 // same behavior as Chromium. Not required for beta so marking as deferred.
 DEFER LINUX WIN : LayoutTests/editing/selection/caret-rtl-2.html = FAIL
 
-// Flaky and wrong pattern output.
-LINUX WIN : LayoutTests/fast/canvas/patternfill-repeat.html = FAIL CRASH
-
 // This test assumes we're using unix paths and looks for a file:///test
 // path.  We correctly return file:///C:/test on Windows.  We should fix
 // upstream
@@ -1890,10 +1887,6 @@ LINUX WIN : LayoutTests/svg/custom/stroke-fallback.svg = FAIL
 // Another 12-Jan-2009 regression.
 LINUX : chrome/fonts/courier.html = FAIL
 
-
-// TODO(mmoss): rebaseline this when patterns are drawn correctly.
-LINUX WIN : LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b.svg = FAIL
-
 // Merge 39830:39880 - new tests
 LayoutTests/plugins/npruntime.html = TIMEOUT