Update expectations after WebKit roll.

TBR=dumi
TEST=none
BUG=none

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

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

5 files changed, 21 insertions, 6 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/filters/filter-on-tspan-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/filters/filter-on-tspan-expected.checksum
new file mode 100644
index 0000000..4ac279c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/filters/filter-on-tspan-expected.checksum
@@ -0,0 +1 @@
+4945001a069ecd64a668db3993f74412
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/filters/filter-on-tspan-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/filters/filter-on-tspan-expected.png
new file mode 100644
index 0000000..9ed82fe
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/filters/filter-on-tspan-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/filters/filter-on-tspan-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/filters/filter-on-tspan-expected.txt
new file mode 100644
index 0000000..7e84170
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/filters/filter-on-tspan-expected.txt
@@ -0,0 +1,14 @@
+KCanvasResource {id="filter" [type=FILTER]  [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
+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
+    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+    RenderSVGText {text} at (100,100) size 99x18 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-14) size 68x18
+        chunk 1 text run 1 at (100.00,100.00) startOffset 0 endOffset 12 width 68.00: "Die ist ein "
+      RenderSVGTSpan {tspan} at (0,0) size 27x18
+        RenderSVGInlineText {#text} at (68,-14) size 27x18
+          chunk 1 text run 2 at (168.00,100.00) startOffset 0 endOffset 4 width 27.00: "Test"
+      RenderSVGInlineText {#text} at (95,-14) size 4x18
+        chunk 1 text run 3 at (195.00,100.00) startOffset 0 endOffset 1 width 4.00: "."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textProperties-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textProperties-expected.txt
index 59e420b..cdc10f8 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textProperties-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textProperties-expected.txt
@@ -1,5 +1,4 @@
 KCanvasResource {id="gaussianBlur" [type=FILTER]  [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
-KCanvasResource {id="textClip" [type=CLIPPER] [clip data=[[winding=EVEN-ODD] [path=M0.00,0.00 L0.00,0.00 L0.00,0.00 L0.00,0.00 Z]]]}
 KRenderingPaintServer {id="gradient" [type=LINEAR-GRADIENT] [stops=[(0.00,#0000FF), (1.00,#008000)]] [bounding box mode=0] [start=(-50,-25)] [end=(50,25)]}
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
@@ -132,7 +131,7 @@ layer at (0,0) size 450x500
           RenderSVGInlineText {#text} at (0,-15) size 138x19
             chunk 1 (middle anchor) text run 1 at (-68.50,25.00) startOffset 0 endOffset 21 width 137.00: "stroke=\"MidnightBlue\""
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+        RenderSVGResourceClipper {clipPath} [id="textClip"] [clipPathUnits=userSpaceOnUse]
           RenderSVGText {text} at (-41,0) size 82x34 contains 1 chunk(s)
             RenderSVGInlineText {#text} at (0,-27) size 82x34
               chunk 1 (middle anchor) text run 1 at (-41.00,0.00) startOffset 0 endOffset 6 width 82.00: "sample"
@@ -140,7 +139,8 @@ layer at (0,0) size 450x500
           RenderSVGGradientStop {stop} at (0,0) size 0x0
           RenderSVGGradientStop {stop} at (0,0) size 0x0
       RenderSVGContainer {g} at (300,345) size 100x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,370.00)}]
-        RenderPath {rect} at (300,345) size 100x50 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#0000FF), (1.00,#008000)]] [bounding box mode=0] [start=(-50,-25)] [end=(50,25)]}] [clip path="textClip"] [data="M-50.00,-25.00 L50.00,-25.00 L50.00,25.00 L-50.00,25.00 Z"]
+        RenderPath {rect} at (300,345) size 100x50 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#0000FF), (1.00,#008000)]] [bounding box mode=0] [start=(-50,-25)] [end=(50,25)]}] [data="M-50.00,-25.00 L50.00,-25.00 L50.00,25.00 L-50.00,25.00 Z"]
+          [clipPath="textClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 0x0
         RenderSVGText {text} at (-48,15) size 96x19 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-15) size 96x19
             chunk 1 (middle anchor) text run 1 at (-48.00,15.00) startOffset 0 endOffset 17 width 96.00: "text as clip-path"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/resource-invalidate-on-target-update-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/resource-invalidate-on-target-update-expected.txt
index 0e8ec57..5415030 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/resource-invalidate-on-target-update-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/resource-invalidate-on-target-update-expected.txt
@@ -1,16 +1,16 @@
 KCanvasResource {id="filter" [type=FILTER]  [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
-KCanvasResource {id="clip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [bounding box mode=1] [path=M1.00,0.50 L1.00,0.53 L1.00,0.56 L0.99,0.59 L0.98,0.62 L0.98,0.65 L0.96,0.68 L0.95,0.71 L0.94,0.74 L0.92,0.77 L0.90,0.79 L0.89,0.82 L0.86,0.84 L0.84,0.86 L0.82,0.89 L0.79,0.90 L0.77,0.92 L0.74,0.94 L0.71,0.95 L0.68,0.96 L0.65,0.98 L0.62,0.98 L0.59,0.99 L0.56,1.00 L0.53,1.00 L0.50,1.00 L0.47,1.00 L0.44,1.00 L0.41,0.99 L0.38,0.98 L0.35,0.98 L0.32,0.96 L0.29,0.95 L0.26,0.94 L0.23,0.92 L0.21,0.90 L0.18,0.89 L0.16,0.86 L0.14,0.84 L0.11,0.82 L0.10,0.79 L0.08,0.77 L0.06,0.74 L0.05,0.71 L0.04,0.68 L0.02,0.65 L0.02,0.62 L0.01,0.59 L0.00,0.56 L0.00,0.53 L0.00,0.50 L0.00,0.47 L0.00,0.44 L0.01,0.41 L0.02,0.38 L0.02,0.35 L0.04,0.32 L0.05,0.29 L0.06,0.26 L0.08,0.23 L0.10,0.21 L0.11,0.18 L0.14,0.16 L0.16,0.14 L0.18,0.11 L0.21,0.10 L0.23,0.08 L0.26,0.06 L0.29,0.05 L0.32,0.04 L0.35,0.02 L0.38,0.02 L0.41,0.01 L0.44,0.00 L0.47,0.00 L0.50,0.00 L0.53,0.00 L0.56,0.00 L0.59,0.01 L0.62,0.02 L0.65,0.02 L0.68,0.04 L0.71,0.05 L0.74,0.06 L0.77,0.08 L0.79,0.10 L0.82,0.11 L0.84,0.14 L0.86,0.16 L0.89,0.18 L0.90,0.21 L0.92,0.23 L0.94,0.26 L0.95,0.29 L0.96,0.32 L0.98,0.35 L0.98,0.38 L0.99,0.41 L1.00,0.44 L1.00,0.47 Z]]]}
 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
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+      RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=objectBoundingBox]
         RenderPath {circle} at (0,0) size 1x1 [fill={[type=SOLID] [color=#000000]}] [data="M1.00,0.50 L1.00,0.53 L1.00,0.56 L0.99,0.59 L0.98,0.62 L0.98,0.65 L0.96,0.68 L0.95,0.71 L0.94,0.74 L0.92,0.77 L0.90,0.79 L0.89,0.82 L0.86,0.84 L0.84,0.86 L0.82,0.89 L0.79,0.90 L0.77,0.92 L0.74,0.94 L0.71,0.95 L0.68,0.96 L0.65,0.98 L0.62,0.98 L0.59,0.99 L0.56,1.00 L0.53,1.00 L0.50,1.00 L0.47,1.00 L0.44,1.00 L0.41,0.99 L0.38,0.98 L0.35,0.98 L0.32,0.96 L0.29,0.95 L0.26,0.94 L0.23,0.92 L0.21,0.90 L0.18,0.89 L0.16,0.86 L0.14,0.84 L0.11,0.82 L0.10,0.79 L0.08,0.77 L0.06,0.74 L0.05,0.71 L0.04,0.68 L0.02,0.65 L0.02,0.62 L0.01,0.59 L0.00,0.56 L0.00,0.53 L0.00,0.50 L0.00,0.47 L0.00,0.44 L0.01,0.41 L0.02,0.38 L0.02,0.35 L0.04,0.32 L0.05,0.29 L0.06,0.26 L0.08,0.23 L0.10,0.21 L0.11,0.18 L0.14,0.16 L0.16,0.14 L0.18,0.11 L0.21,0.10 L0.23,0.08 L0.26,0.06 L0.29,0.05 L0.32,0.04 L0.35,0.02 L0.38,0.02 L0.41,0.01 L0.44,0.00 L0.47,0.00 L0.50,0.00 L0.53,0.00 L0.56,0.00 L0.59,0.01 L0.62,0.02 L0.65,0.02 L0.68,0.04 L0.71,0.05 L0.74,0.06 L0.77,0.08 L0.79,0.10 L0.82,0.11 L0.84,0.14 L0.86,0.16 L0.89,0.18 L0.90,0.21 L0.92,0.23 L0.94,0.26 L0.95,0.29 L0.96,0.32 L0.98,0.35 L0.98,0.38 L0.99,0.41 L1.00,0.44 L1.00,0.47 Z"]
       RenderSVGResourceMasker {mask} [id="mask"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
         RenderPath {circle} at (0,0) size 1x1 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M1.00,0.50 L1.00,0.53 L1.00,0.56 L0.99,0.59 L0.98,0.62 L0.98,0.65 L0.96,0.68 L0.95,0.71 L0.94,0.74 L0.92,0.77 L0.90,0.79 L0.89,0.82 L0.86,0.84 L0.84,0.86 L0.82,0.89 L0.79,0.90 L0.77,0.92 L0.74,0.94 L0.71,0.95 L0.68,0.96 L0.65,0.98 L0.62,0.98 L0.59,0.99 L0.56,1.00 L0.53,1.00 L0.50,1.00 L0.47,1.00 L0.44,1.00 L0.41,0.99 L0.38,0.98 L0.35,0.98 L0.32,0.96 L0.29,0.95 L0.26,0.94 L0.23,0.92 L0.21,0.90 L0.18,0.89 L0.16,0.86 L0.14,0.84 L0.11,0.82 L0.10,0.79 L0.08,0.77 L0.06,0.74 L0.05,0.71 L0.04,0.68 L0.02,0.65 L0.02,0.62 L0.01,0.59 L0.00,0.56 L0.00,0.53 L0.00,0.50 L0.00,0.47 L0.00,0.44 L0.01,0.41 L0.02,0.38 L0.02,0.35 L0.04,0.32 L0.05,0.29 L0.06,0.26 L0.08,0.23 L0.10,0.21 L0.11,0.18 L0.14,0.16 L0.16,0.14 L0.18,0.11 L0.21,0.10 L0.23,0.08 L0.26,0.06 L0.29,0.05 L0.32,0.04 L0.35,0.02 L0.38,0.02 L0.41,0.01 L0.44,0.00 L0.47,0.00 L0.50,0.00 L0.53,0.00 L0.56,0.00 L0.59,0.01 L0.62,0.02 L0.65,0.02 L0.68,0.04 L0.71,0.05 L0.74,0.06 L0.77,0.08 L0.79,0.10 L0.82,0.11 L0.84,0.14 L0.86,0.16 L0.89,0.18 L0.90,0.21 L0.92,0.23 L0.94,0.26 L0.95,0.29 L0.96,0.32 L0.98,0.35 L0.98,0.38 L0.99,0.41 L1.00,0.44 L1.00,0.47 Z"]
     RenderSVGContainer {g} at (0,10) size 121x350
       RenderPath {rect} at (10,10) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M10.00,10.00 L110.00,10.00 L110.00,110.00 L10.00,110.00 Z"]
         [masker="mask"] RenderSVGResourceMasker {mask} at (0,0) size 120x120
-      RenderPath {rect} at (10,130) size 100x100 [fill={[type=SOLID] [color=#008000]}] [clip path="clip"] [data="M10.00,130.00 L110.00,130.00 L110.00,230.00 L10.00,230.00 Z"]
+      RenderPath {rect} at (10,130) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M10.00,130.00 L110.00,130.00 L110.00,230.00 L10.00,230.00 Z"]
+        [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (10,130) size 100x100
       RenderPath {rect} at (0,240) size 121x120 [fill={[type=SOLID] [color=#008000]}] [filter=filter] [data="M10.00,250.00 L110.00,250.00 L110.00,350.00 L10.00,350.00 Z"]