WebKit Roll 55250:55339.

TBR=dumi
TEST=none
BUG=none

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

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

31 files changed, 108 insertions, 146 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textEffect3-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textEffect3-expected.checksum
index 46b88b4..a3f8464 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textEffect3-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textEffect3-expected.checksum
@@ -1 +1 @@
-6d3ba87b10148d58f476e1bff2b4dcce
\ No newline at end of file
+cf24494708b79fd82f0adbf9119b2654
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textEffect3-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textEffect3-expected.png
index b010f8d..2daa475 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textEffect3-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textEffect3-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/filter-on-tspan-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/filter-on-tspan-expected.checksum
new file mode 100644
index 0000000..16e16ea
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/filter-on-tspan-expected.checksum
@@ -0,0 +1 @@
+b90a1557b2cf3dc7143f06b302c41153
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/filter-on-tspan-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/filter-on-tspan-expected.png
new file mode 100644
index 0000000..399c1cc
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/filter-on-tspan-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/backgrounds/size/backgroundSize16-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/backgrounds/size/backgroundSize16-expected.checksum
new file mode 100644
index 0000000..488349e
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/backgrounds/size/backgroundSize16-expected.checksum
@@ -0,0 +1 @@
+22f0d818aa277e9b1f449a4dafaca35f
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt
deleted file mode 100644
index 8cadd2d..0000000
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-This test ensures basic functionality of the underlying graphics library
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Canvas.getContext
-PASS context exists
-
-Context is correct type
-PASS context is correct type
-
-Context contains getError
-PASS context contains getError
-
-Check default values
-PASS context.getParameter(context.ACTIVE_TEXTURE) is context.TEXTURE0
-PASS (context.getParameter(context.ALIASED_LINE_WIDTH_RANGE)[0] == 1) || (context.getParameter(context.ALIASED_LINE_WIDTH_RANGE)[1] == 1) is true
-PASS (context.getParameter(context.ALIASED_POINT_SIZE_RANGE)[0] == 1) || (context.getParameter(context.ALIASED_POINT_SIZE_RANGE)[1] == 1) is true
-PASS context.getParameter(context.ARRAY_BUFFER_BINDING) is null
-PASS context.getParameter(context.BLEND) is false
-PASS context.getParameter(context.BLEND_COLOR) is [0, 0, 0, 0]
-PASS context.getParameter(context.BLEND_DST_ALPHA) is 0
-PASS context.getParameter(context.BLEND_DST_RGB) is 0
-PASS context.getParameter(context.BLEND_EQUATION_ALPHA) is context.FUNC_ADD
-PASS context.getParameter(context.BLEND_EQUATION_RGB) is context.FUNC_ADD
-PASS context.getParameter(context.BLEND_SRC_ALPHA) is 1
-PASS context.getParameter(context.BLEND_SRC_RGB) is 1
-PASS context.getParameter(context.COLOR_CLEAR_VALUE) is [0, 0, 0, 0]
-PASS context.getParameter(context.COLOR_WRITEMASK) is [1, 1, 1, 1]
-PASS context.getParameter(context.CULL_FACE) is false
-PASS context.getParameter(context.CULL_FACE_MODE) is context.BACK
-PASS context.getParameter(context.CURRENT_PROGRAM) is null
-PASS context.getParameter(context.DEPTH_FUNC) is context.LESS
-PASS context.getParameter(context.DEPTH_RANGE) is [0, 1]
-PASS context.getParameter(context.DEPTH_TEST) is false
-PASS context.getParameter(context.DEPTH_WRITEMASK) is true
-PASS context.getParameter(context.DITHER) is true
-PASS context.getParameter(context.ELEMENT_ARRAY_BUFFER_BINDING) is null
-PASS context.getParameter(context.FRONT_FACE) is context.CCW
-PASS context.getParameter(context.GENERATE_MIPMAP_HINT) is context.DONT_CARE
-PASS context.getParameter(context.LINE_WIDTH) is 1
-PASS context.getParameter(context.POLYGON_OFFSET_FACTOR) is 0
-PASS context.getParameter(context.POLYGON_OFFSET_FILL) is false
-PASS context.getParameter(context.POLYGON_OFFSET_UNITS) is 0
-PASS context.getParameter(context.RENDERBUFFER_BINDING) is null
-PASS context.getParameter(context.SAMPLE_COVERAGE_INVERT) is false
-PASS context.getParameter(context.SAMPLE_COVERAGE_VALUE) is 1
-PASS context.getParameter(context.SCISSOR_BOX)[0] is 0
-PASS context.getParameter(context.SCISSOR_BOX)[1] is 0
-PASS context.getParameter(context.SCISSOR_TEST) is false
-PASS context.getParameter(context.STENCIL_BACK_FAIL) is context.KEEP
-PASS context.getParameter(context.STENCIL_BACK_FUNC) is context.ALWAYS
-PASS context.getParameter(context.STENCIL_BACK_PASS_DEPTH_FAIL) is context.KEEP
-PASS context.getParameter(context.STENCIL_BACK_PASS_DEPTH_PASS) is context.KEEP
-PASS context.getParameter(context.STENCIL_BACK_REF) is 0
-PASS context.getParameter(context.STENCIL_BITS) is 0
-PASS context.getParameter(context.STENCIL_CLEAR_VALUE) is 0
-PASS context.getParameter(context.STENCIL_FAIL) is context.KEEP
-PASS context.getParameter(context.STENCIL_FUNC) is context.ALWAYS
-PASS context.getParameter(context.STENCIL_PASS_DEPTH_FAIL) is context.KEEP
-PASS context.getParameter(context.STENCIL_PASS_DEPTH_PASS) is context.KEEP
-PASS context.getParameter(context.STENCIL_REF) is 0
-PASS context.getParameter(context.STENCIL_TEST) is false
-PASS context.getParameter(context.TEXTURE_BINDING_2D) is null
-PASS context.getParameter(context.TEXTURE_BINDING_CUBE_MAP) is null
-FAIL context.getParameter(context.VIEWPORT) should be 0,0,0,0. Was [object WebGLIntArray].
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/batik/text/textProperties-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/batik/text/textProperties-expected.txt
index a6b5f50..dce8cd2 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/batik/text/textProperties-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/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,-14) size 150x18
             chunk 1 (middle anchor) text run 1 at (-74.50,25.00) startOffset 0 endOffset 21 width 149.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 (-42,0) size 84x36 contains 1 chunk(s)
             RenderSVGInlineText {#text} at (0,-28) size 84x36
               chunk 1 (middle anchor) text run 1 at (-42.00,0.00) startOffset 0 endOffset 6 width 84.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 (-50,15) size 100x18 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-14) size 100x18
             chunk 1 (middle anchor) text run 1 at (-49.50,15.00) startOffset 0 endOffset 17 width 99.00: "text as clip-path"
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt
index 855e7e2..bba0842 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt
@@ -1,6 +1,5 @@
 CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
 CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-KCanvasResource {id="clip" [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]]]}
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
@@ -10,13 +9,14 @@ layer at (0,0) size 800x600
       RenderSVGContainer {use} at (0,0) size 50x50
         RenderSVGContainer {g} at (0,0) size 50x50
           RenderPath {rect} at (0,0) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
-      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+      RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
         RenderSVGContainer {use} at (0,0) size 50x50
           RenderSVGContainer {g} at (0,0) size 50x50
             RenderSVGContainer {g} at (0,0) size 50x50
               RenderPath {rect} at (0,0) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
     RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
-    RenderSVGContainer {g} at (0,0) size 100x100 [clip path="clip"]
+    RenderSVGContainer {g} at (0,0) size 100x100
+      [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (0,0) size 0x0
       RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
     RenderSVGText {text} at (10,120) size 377x18 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,-14) size 377x18
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt
index a2c8f2f..fd2c512 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt
@@ -1,13 +1,13 @@
-KCanvasResource {id="myclip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z]]]}
 KCanvasResource {id="myfilter" [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
-      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+      RenderSVGResourceClipper {clipPath} [id="myclip"] [clipPathUnits=userSpaceOnUse]
         RenderPath {path} at (0,0) size 100x100 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
-    RenderSVGImage {image} at (0,0) size 100x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,-25.00)}] [clip path="myclip"] [filter=myfilter]
+    RenderSVGImage {image} at (0,0) size 100x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,-25.00)}] [filter=myfilter]
+      [clipPath="myclip"] RenderSVGResourceClipper {clipPath} at (0,0) size 100x100
     RenderSVGText {text} at (0,125) size 542x18 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,-14) size 542x18
         chunk 1 text run 1 at (0.00,125.00) startOffset 0 endOffset 84 width 542.00: "You should see a solid green block above (a blurred and clipped green checkerboard)."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
index 1eec20b..191f235 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
@@ -1,4 +1,3 @@
-KCanvasResource {id="one" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [bounding box mode=1] [path=M0.50,0.50 L0.50,0.51 L0.50,0.53 L0.50,0.54 L0.49,0.55 L0.49,0.56 L0.49,0.57 L0.48,0.59 L0.48,0.60 L0.47,0.61 L0.46,0.62 L0.45,0.63 L0.45,0.64 L0.44,0.65 L0.43,0.65 L0.42,0.66 L0.41,0.67 L0.40,0.68 L0.39,0.68 L0.37,0.69 L0.36,0.69 L0.35,0.69 L0.34,0.70 L0.33,0.70 L0.31,0.70 L0.30,0.70 L0.29,0.70 L0.27,0.70 L0.26,0.70 L0.25,0.69 L0.24,0.69 L0.23,0.69 L0.21,0.68 L0.20,0.68 L0.19,0.67 L0.18,0.66 L0.17,0.65 L0.16,0.65 L0.15,0.64 L0.15,0.63 L0.14,0.62 L0.13,0.61 L0.12,0.60 L0.12,0.59 L0.11,0.57 L0.11,0.56 L0.11,0.55 L0.10,0.54 L0.10,0.53 L0.10,0.51 L0.10,0.50 L0.10,0.49 L0.10,0.47 L0.10,0.46 L0.11,0.45 L0.11,0.44 L0.11,0.43 L0.12,0.41 L0.12,0.40 L0.13,0.39 L0.14,0.38 L0.15,0.37 L0.15,0.36 L0.16,0.35 L0.17,0.35 L0.18,0.34 L0.19,0.33 L0.20,0.32 L0.21,0.32 L0.23,0.31 L0.24,0.31 L0.25,0.31 L0.26,0.30 L0.27,0.30 L0.29,0.30 L0.30,0.30 L0.31,0.30 L0.33,0.30 L0.34,0.30 L0.35,0.31 L0.36,0.31 L0.37,0.31 L0.39,0.32 L0.40,0.32 L0.41,0.33 L0.42,0.34 L0.43,0.35 L0.44,0.35 L0.45,0.36 L0.45,0.37 L0.46,0.38 L0.47,0.39 L0.48,0.40 L0.48,0.41 L0.49,0.43 L0.49,0.44 L0.49,0.45 L0.50,0.46 L0.50,0.47 L0.50,0.49 Z], [winding=NON-ZERO] [bounding box mode=1] [path=M0.90,0.50 L0.90,0.51 L0.90,0.53 L0.90,0.54 L0.89,0.55 L0.89,0.56 L0.89,0.57 L0.88,0.59 L0.88,0.60 L0.87,0.61 L0.86,0.62 L0.85,0.63 L0.85,0.64 L0.84,0.65 L0.83,0.65 L0.82,0.66 L0.81,0.67 L0.80,0.68 L0.79,0.68 L0.77,0.69 L0.76,0.69 L0.75,0.69 L0.74,0.70 L0.73,0.70 L0.71,0.70 L0.70,0.70 L0.69,0.70 L0.67,0.70 L0.66,0.70 L0.65,0.69 L0.64,0.69 L0.63,0.69 L0.61,0.68 L0.60,0.68 L0.59,0.67 L0.58,0.66 L0.57,0.65 L0.56,0.65 L0.55,0.64 L0.55,0.63 L0.54,0.62 L0.53,0.61 L0.52,0.60 L0.52,0.59 L0.51,0.57 L0.51,0.56 L0.51,0.55 L0.50,0.54 L0.50,0.53 L0.50,0.51 L0.50,0.50 L0.50,0.49 L0.50,0.47 L0.50,0.46 L0.51,0.45 L0.51,0.44 L0.51,0.43 L0.52,0.41 L0.52,0.40 L0.53,0.39 L0.54,0.38 L0.55,0.37 L0.55,0.36 L0.56,0.35 L0.57,0.35 L0.58,0.34 L0.59,0.33 L0.60,0.32 L0.61,0.32 L0.63,0.31 L0.64,0.31 L0.65,0.31 L0.66,0.30 L0.67,0.30 L0.69,0.30 L0.70,0.30 L0.71,0.30 L0.73,0.30 L0.74,0.30 L0.75,0.31 L0.76,0.31 L0.77,0.31 L0.79,0.32 L0.80,0.32 L0.81,0.33 L0.82,0.34 L0.83,0.35 L0.84,0.35 L0.85,0.36 L0.85,0.37 L0.86,0.38 L0.87,0.39 L0.88,0.40 L0.88,0.41 L0.89,0.43 L0.89,0.44 L0.89,0.45 L0.90,0.46 L0.90,0.47 L0.90,0.49 Z]]]}
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
 layer at (0,0) size 480x360
@@ -7,10 +6,11 @@ layer at (0,0) size 480x360
       RenderSVGInlineText {#text} at (0,-16) size 354x20
         chunk 1 (middle anchor) text run 1 at (63.50,35.00) startOffset 0 endOffset 51 width 353.00: "Testing stroke inclusion for 'clip-path' and 'mask'"
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+      RenderSVGResourceClipper {clipPath} [id="one"] [clipPathUnits=objectBoundingBox]
         RenderPath {circle} at (0,0) size 1x1 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [data="M0.50,0.50 L0.50,0.51 L0.50,0.53 L0.50,0.54 L0.49,0.55 L0.49,0.56 L0.49,0.57 L0.48,0.59 L0.48,0.60 L0.47,0.61 L0.46,0.62 L0.45,0.63 L0.45,0.64 L0.44,0.65 L0.43,0.65 L0.42,0.66 L0.41,0.67 L0.40,0.68 L0.39,0.68 L0.37,0.69 L0.36,0.69 L0.35,0.69 L0.34,0.70 L0.33,0.70 L0.31,0.70 L0.30,0.70 L0.29,0.70 L0.27,0.70 L0.26,0.70 L0.25,0.69 L0.24,0.69 L0.23,0.69 L0.21,0.68 L0.20,0.68 L0.19,0.67 L0.18,0.66 L0.17,0.65 L0.16,0.65 L0.15,0.64 L0.15,0.63 L0.14,0.62 L0.13,0.61 L0.12,0.60 L0.12,0.59 L0.11,0.57 L0.11,0.56 L0.11,0.55 L0.10,0.54 L0.10,0.53 L0.10,0.51 L0.10,0.50 L0.10,0.49 L0.10,0.47 L0.10,0.46 L0.11,0.45 L0.11,0.44 L0.11,0.43 L0.12,0.41 L0.12,0.40 L0.13,0.39 L0.14,0.38 L0.15,0.37 L0.15,0.36 L0.16,0.35 L0.17,0.35 L0.18,0.34 L0.19,0.33 L0.20,0.32 L0.21,0.32 L0.23,0.31 L0.24,0.31 L0.25,0.31 L0.26,0.30 L0.27,0.30 L0.29,0.30 L0.30,0.30 L0.31,0.30 L0.33,0.30 L0.34,0.30 L0.35,0.31 L0.36,0.31 L0.37,0.31 L0.39,0.32 L0.40,0.32 L0.41,0.33 L0.42,0.34 L0.43,0.35 L0.44,0.35 L0.45,0.36 L0.45,0.37 L0.46,0.38 L0.47,0.39 L0.48,0.40 L0.48,0.41 L0.49,0.43 L0.49,0.44 L0.49,0.45 L0.50,0.46 L0.50,0.47 L0.50,0.49 Z"]
         RenderPath {circle} at (0,0) size 1x1 [data="M0.90,0.50 L0.90,0.51 L0.90,0.53 L0.90,0.54 L0.89,0.55 L0.89,0.56 L0.89,0.57 L0.88,0.59 L0.88,0.60 L0.87,0.61 L0.86,0.62 L0.85,0.63 L0.85,0.64 L0.84,0.65 L0.83,0.65 L0.82,0.66 L0.81,0.67 L0.80,0.68 L0.79,0.68 L0.77,0.69 L0.76,0.69 L0.75,0.69 L0.74,0.70 L0.73,0.70 L0.71,0.70 L0.70,0.70 L0.69,0.70 L0.67,0.70 L0.66,0.70 L0.65,0.69 L0.64,0.69 L0.63,0.69 L0.61,0.68 L0.60,0.68 L0.59,0.67 L0.58,0.66 L0.57,0.65 L0.56,0.65 L0.55,0.64 L0.55,0.63 L0.54,0.62 L0.53,0.61 L0.52,0.60 L0.52,0.59 L0.51,0.57 L0.51,0.56 L0.51,0.55 L0.50,0.54 L0.50,0.53 L0.50,0.51 L0.50,0.50 L0.50,0.49 L0.50,0.47 L0.50,0.46 L0.51,0.45 L0.51,0.44 L0.51,0.43 L0.52,0.41 L0.52,0.40 L0.53,0.39 L0.54,0.38 L0.55,0.37 L0.55,0.36 L0.56,0.35 L0.57,0.35 L0.58,0.34 L0.59,0.33 L0.60,0.32 L0.61,0.32 L0.63,0.31 L0.64,0.31 L0.65,0.31 L0.66,0.30 L0.67,0.30 L0.69,0.30 L0.70,0.30 L0.71,0.30 L0.73,0.30 L0.74,0.30 L0.75,0.31 L0.76,0.31 L0.77,0.31 L0.79,0.32 L0.80,0.32 L0.81,0.33 L0.82,0.34 L0.83,0.35 L0.84,0.35 L0.85,0.36 L0.85,0.37 L0.86,0.38 L0.87,0.39 L0.88,0.40 L0.88,0.41 L0.89,0.43 L0.89,0.44 L0.89,0.45 L0.90,0.46 L0.90,0.47 L0.90,0.49 Z"]
-    RenderPath {rect} at (170,60) size 160x80 [fill={[type=SOLID] [color=#00008B]}] [clip path="one"] [data="M150.00,0.00 L350.00,0.00 L350.00,200.00 L150.00,200.00 Z"]
+    RenderPath {rect} at (170,60) size 160x80 [fill={[type=SOLID] [color=#00008B]}] [data="M150.00,0.00 L350.00,0.00 L350.00,200.00 L150.00,200.00 Z"]
+      [clipPath="one"] RenderSVGResourceClipper {clipPath} at (170,60) size 160x80
     RenderSVGText {text} at (50,110) size 106x19 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,-15) size 106x19
         chunk 1 text run 1 at (50.00,110.00) startOffset 0 endOffset 19 width 106.00: "With a 'clip-path':"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt
index 5ff7df3..4e6e775 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt
@@ -1,21 +1,21 @@
-KCanvasResource {id="clip1" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M200.00,10.00 L260.00,10.00 L260.00,110.00 L200.00,110.00 Z]]]}
-KCanvasResource {id="clip2" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M90.00,150.00 L265.00,150.00 L265.00,250.00 L90.00,250.00 Z], [winding=NON-ZERO] [path=M225.00,160.00 L320.00,160.00 L320.00,235.00 L225.00,235.00 Z]]]}
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
 layer at (0,0) size 480x360
   RenderSVGRoot {svg} at (0,0) size 480x360
     RenderSVGContainer {g} at (20,17) size 320x270
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+        RenderSVGResourceClipper {clipPath} [id="clip1"] [clipPathUnits=userSpaceOnUse]
           RenderPath {rect} at (200,10) size 60x100 [fill={[type=SOLID] [color=#000000]}] [data="M200.00,10.00 L260.00,10.00 L260.00,110.00 L200.00,110.00 Z"]
-        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+        RenderSVGResourceClipper {clipPath} [id="clip2"] [clipPathUnits=userSpaceOnUse]
           RenderPath {rect} at (90,150) size 175x100 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,150.00 L265.00,150.00 L265.00,250.00 L90.00,250.00 Z"]
           RenderPath {rect} at (225,160) size 95x75 [fill={[type=SOLID] [color=#000000]}] [data="M225.00,160.00 L320.00,160.00 L320.00,235.00 L225.00,235.00 Z"]
-      RenderPath {rect} at (200,17) size 60x66 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FF0000]}] [clip path="clip1"] [data="M20.00,20.00 L460.00,20.00 L460.00,80.00 L20.00,80.00 Z"]
+      RenderPath {rect} at (200,17) size 60x66 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M20.00,20.00 L460.00,20.00 L460.00,80.00 L20.00,80.00 Z"]
+        [clipPath="clip1"] RenderSVGResourceClipper {clipPath} at (200,10) size 60x100
       RenderSVGText {text} at (20,130) size 320x35 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-28) size 320x35
           chunk 1 text run 1 at (20.00,130.00) startOffset 0 endOffset 23 width 320.00: "Rectangle being clipped"
-      RenderSVGContainer {g} at (112,152) size 208x98 [clip path="clip2"]
+      RenderSVGContainer {g} at (112,152) size 208x98
+        [clipPath="clip2"] RenderSVGResourceClipper {clipPath} at (90,150) size 230x100
         RenderPath {rect} at (112,187) size 231x46 [stroke={[type=SOLID] [color=#0000FF] [stroke width=5.00]}] [fill={[type=SOLID] [color=#00FFFF]}] [data="M115.00,190.00 L340.00,190.00 L340.00,230.00 L115.00,230.00 Z"]
         RenderPath {rect} at (112,237) size 231x46 [stroke={[type=SOLID] [color=#008000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#00FF00]}] [data="M115.00,240.00 L340.00,240.00 L340.00,280.00 L115.00,280.00 Z"]
         RenderSVGText {text} at (115,180) size 320x35 contains 1 chunk(s)
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt
index 0533d18..97b6adf 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt
@@ -1,11 +1,10 @@
-KCanvasResource {id="sample" [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]]]}
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
 layer at (0,0) size 480x360
   RenderSVGRoot {svg} at (0,0) size 480x360
     RenderSVGContainer {g} at (20,20) size 420x310
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+        RenderSVGResourceClipper {clipPath} [id="sample"] [clipPathUnits=userSpaceOnUse]
           RenderSVGText {text} at (45,270) size 353x122 contains 1 chunk(s)
             RenderSVGInlineText {#text} at (0,-101) size 353x122
               chunk 1 text run 1 at (45.00,270.00) startOffset 0 endOffset 9 width 353.00: "Clip Test"
@@ -15,7 +14,8 @@ layer at (0,0) size 480x360
           RenderSVGInlineText {#text} at (0,-101) size 353x122
             chunk 1 text run 1 at (55.00,130.00) startOffset 0 endOffset 9 width 353.00: "Clip Test"
       RenderSVGContainer {g} at (20,170) size 410x160
-        RenderSVGImage {image} at (20,170) size 410x160 [clip path="sample"]
+        RenderSVGImage {image} at (20,170) size 410x160
+          [clipPath="sample"] RenderSVGResourceClipper {clipPath} at (0,0) size 0x0
     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.8 $"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
index 12d74a4..ff69412 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
@@ -1,5 +1,3 @@
-KCanvasResource {id="overflowHiddenClip1" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00 L2.00,0.00 L2.00,2.00 L0.00,2.00 Z]]]}
-KCanvasResource {id="overflowHiddenClip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00 L4.00,0.00 L4.00,4.00 L0.00,4.00 Z]]]}
 KCanvasResource {id="marker1" [type=MARKER] [angle=0.00] [ref x=5.00 y=5.00]}
 KCanvasResource {id="marker2" [type=MARKER] [angle=0.00] [ref x=10.00 y=10.00]}
 KCanvasResource {id="marker3" [type=MARKER] [angle=0.00] [ref x=10.00 y=10.00]}
@@ -10,9 +8,9 @@ layer at (0,0) size 480x360
   RenderSVGRoot {svg} at (0,0) size 480x360
     RenderSVGContainer {g} at (0,0) size 448x273
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+        RenderSVGResourceClipper {clipPath} [id="overflowHiddenClip1"] [clipPathUnits=userSpaceOnUse]
           RenderPath {rect} at (0,0) size 2x2 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L2.00,0.00 L2.00,2.00 L0.00,2.00 Z"]
-        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+        RenderSVGResourceClipper {clipPath} [id="overflowHiddenClip"] [clipPathUnits=userSpaceOnUse]
           RenderPath {rect} at (0,0) size 4x4 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L4.00,0.00 L4.00,4.00 L0.00,4.00 Z"]
       RenderSVGText {text} at (125,30) size 183x16 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-13) size 183x16
@@ -27,15 +25,18 @@ layer at (0,0) size 480x360
         RenderSVGContainer {g} at (142,52) size 66x66 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}]
           RenderPath {path} at (150,60) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M30.00,60.00 L80.00,60.00 L80.00,110.00 Z"]
           RenderSVGContainer {g} at (142,52) size 16x16 [transform={m=((8.00,0.00)(0.00,8.00)) t=(22.00,52.00)}]
-            RenderSVGContainer {g} at (142,52) size 16x16 [clip path="overflowHiddenClip1"]
+            RenderSVGContainer {g} at (142,52) size 16x16
+              [clipPath="overflowHiddenClip1"] RenderSVGResourceClipper {clipPath} at (0,0) size 2x2
               RenderSVGContainer {g} at (142,52) size 16x16 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
                 RenderPath {rect} at (142,52) size 16x16 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
           RenderSVGContainer {g} at (192,52) size 16x16 [transform={m=((8.00,0.00)(0.00,8.00)) t=(72.00,52.00)}]
-            RenderSVGContainer {g} at (192,52) size 16x16 [clip path="overflowHiddenClip1"]
+            RenderSVGContainer {g} at (192,52) size 16x16
+              [clipPath="overflowHiddenClip1"] RenderSVGResourceClipper {clipPath} at (0,0) size 2x2
               RenderSVGContainer {g} at (192,52) size 16x16 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
                 RenderPath {rect} at (192,52) size 16x16 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
           RenderSVGContainer {g} at (192,102) size 16x16 [transform={m=((8.00,0.00)(0.00,8.00)) t=(72.00,102.00)}]
-            RenderSVGContainer {g} at (192,102) size 16x16 [clip path="overflowHiddenClip1"]
+            RenderSVGContainer {g} at (192,102) size 16x16
+              [clipPath="overflowHiddenClip1"] RenderSVGResourceClipper {clipPath} at (0,0) size 2x2
               RenderSVGContainer {g} at (192,102) size 16x16 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
                 RenderPath {rect} at (192,102) size 16x16 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
       RenderSVGContainer {g} at (0,0) size 448x143
@@ -48,15 +49,18 @@ layer at (0,0) size 480x360
         RenderSVGContainer {g} at (382,52) size 66x66 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}]
           RenderPath {path} at (385,58) size 57x57 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M270.00,60.00 L320.00,60.00 L320.00,110.00 Z"]
           RenderSVGContainer {g} at (382,52) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(262.00,52.00)}]
-            RenderSVGContainer {g} at (382,52) size 16x16 [clip path="overflowHiddenClip"]
+            RenderSVGContainer {g} at (382,52) size 16x16
+              [clipPath="overflowHiddenClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 4x4
               RenderSVGContainer {g} at (378,48) size 24x24 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
                 RenderPath {rect} at (378,48) size 24x24 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
           RenderSVGContainer {g} at (432,52) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,52.00)}]
-            RenderSVGContainer {g} at (432,52) size 16x16 [clip path="overflowHiddenClip"]
+            RenderSVGContainer {g} at (432,52) size 16x16
+              [clipPath="overflowHiddenClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 4x4
               RenderSVGContainer {g} at (428,48) size 24x24 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
                 RenderPath {rect} at (428,48) size 24x24 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
           RenderSVGContainer {g} at (432,102) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,102.00)}]
-            RenderSVGContainer {g} at (432,102) size 16x16 [clip path="overflowHiddenClip"]
+            RenderSVGContainer {g} at (432,102) size 16x16
+              [clipPath="overflowHiddenClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 4x4
               RenderSVGContainer {g} at (428,98) size 24x24 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
                 RenderPath {rect} at (428,98) size 24x24 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
       RenderSVGContainer {g} at (0,0) size 5x5
@@ -73,15 +77,18 @@ layer at (0,0) size 480x360
           RenderPath {path} at (145,188) size 57x57 [stroke={[type=SOLID] [color=#800080] [stroke width=4.00]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M30.00,190.00 L80.00,190.00 L80.00,240.00 Z"]
           RenderSVGContainer {g} at (142,182) size 66x66
             RenderSVGContainer {g} at (142,182) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(22.00,182.00)}]
-              RenderSVGContainer {g} at (142,182) size 16x16 [clip path="overflowHiddenClip"]
+              RenderSVGContainer {g} at (142,182) size 16x16
+                [clipPath="overflowHiddenClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 4x4
                 RenderSVGContainer {g} at (138,178) size 24x24 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
                   RenderPath {rect} at (138,178) size 24x24 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
             RenderSVGContainer {g} at (192,182) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(72.00,182.00)}]
-              RenderSVGContainer {g} at (192,182) size 16x16 [clip path="overflowHiddenClip"]
+              RenderSVGContainer {g} at (192,182) size 16x16
+                [clipPath="overflowHiddenClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 4x4
                 RenderSVGContainer {g} at (188,178) size 24x24 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
                   RenderPath {rect} at (188,178) size 24x24 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
             RenderSVGContainer {g} at (192,232) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(72.00,232.00)}]
-              RenderSVGContainer {g} at (192,232) size 16x16 [clip path="overflowHiddenClip"]
+              RenderSVGContainer {g} at (192,232) size 16x16
+                [clipPath="overflowHiddenClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 4x4
                 RenderSVGContainer {g} at (188,228) size 24x24 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
                   RenderPath {rect} at (188,228) size 24x24 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
       RenderSVGContainer {g} at (258,178) size 190x95
@@ -93,15 +100,18 @@ layer at (0,0) size 480x360
           RenderPath {path} at (385,188) size 57x57 [stroke={[type=SOLID] [color=#800080] [stroke width=4.00]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M270.00,190.00 L320.00,190.00 L320.00,240.00 Z"]
           RenderSVGContainer {g} at (382,182) size 66x66
             RenderSVGContainer {g} at (382,182) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(262.00,182.00)}]
-              RenderSVGContainer {g} at (382,182) size 16x16 [clip path="overflowHiddenClip"]
+              RenderSVGContainer {g} at (382,182) size 16x16
+                [clipPath="overflowHiddenClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 4x4
                 RenderSVGContainer {g} at (378,178) size 24x24 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}]
                   RenderPath {rect} at (378,178) size 24x24 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
             RenderSVGContainer {g} at (432,182) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,182.00)}]
-              RenderSVGContainer {g} at (432,182) size 16x16 [clip path="overflowHiddenClip"]
+              RenderSVGContainer {g} at (432,182) size 16x16
+                [clipPath="overflowHiddenClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 4x4
                 RenderSVGContainer {g} at (428,178) size 24x24 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}]
                   RenderPath {rect} at (428,178) size 24x24 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
             RenderSVGContainer {g} at (432,232) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,232.00)}]
-              RenderSVGContainer {g} at (432,232) size 16x16 [clip path="overflowHiddenClip"]
+              RenderSVGContainer {g} at (432,232) size 16x16
+                [clipPath="overflowHiddenClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 4x4
                 RenderSVGContainer {g} at (428,228) size 24x24 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}]
                   RenderPath {rect} at (428,228) size 24x24 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
     RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s)
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textEffect2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textEffect2-expected.txt
index 622b7a7..d2712ed 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textEffect2-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textEffect2-expected.txt
@@ -1,6 +1,4 @@
 KRenderingPaintServer {id="grad" [type=LINEAR-GRADIENT] [stops=[(0.00,#FFD700), (0.50,#FFA500), (1.00,#DC143C)]] [start=(0,0)] [end=(1,0)]}
-KCanvasResource {id="clip" [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]]]}
-KCanvasResource {id="svgClip" [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]]]}
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
@@ -17,19 +15,21 @@ layer at (0,0) size 450x500
           RenderSVGGradientStop {stop} at (0,0) size 0x0
           RenderSVGGradientStop {stop} at (0,0) size 0x0
           RenderSVGGradientStop {stop} at (0,0) size 0x0
-        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+        RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
           RenderSVGText {text} at (100,200) size 153x60 contains 1 chunk(s)
             RenderSVGInlineText {#text} at (0,-48) size 153x60
               chunk 1 text run 1 at (100.00,200.00) startOffset 0 endOffset 5 width 153.00: "BATIK"
-        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+        RenderSVGResourceClipper {clipPath} [id="svgClip"] [clipPathUnits=userSpaceOnUse]
           RenderSVGText {text} at (100,300) size 153x60 contains 1 chunk(s)
             RenderSVGInlineText {#text} at (0,-48) size 153x60
               chunk 1 text run 1 at (100.00,300.00) startOffset 0 endOffset 5 width 153.00: "BATIK"
-      RenderPath {rect} at (100,160) size 200x45 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#FFD700), (0.50,#FFA500), (1.00,#DC143C)]] [start=(0,0)] [end=(1,0)]}] [clip path="clip"] [data="M100.00,160.00 L300.00,160.00 L300.00,205.00 L100.00,205.00 Z"]
+      RenderPath {rect} at (100,160) size 200x45 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#FFD700), (0.50,#FFA500), (1.00,#DC143C)]] [start=(0,0)] [end=(1,0)]}] [data="M100.00,160.00 L300.00,160.00 L300.00,205.00 L100.00,205.00 Z"]
+        [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (0,0) size 0x0
       RenderSVGText {text} at (300,200) size 67x15 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-12) size 67x15
           chunk 1 text run 1 at (300.00,200.00) startOffset 0 endOffset 13 width 67.00: "(System font)"
-      RenderPath {rect} at (100,260) size 200x45 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#FFD700), (0.50,#FFA500), (1.00,#DC143C)]] [start=(0,0)] [end=(1,0)]}] [clip path="svgClip"] [data="M100.00,260.00 L300.00,260.00 L300.00,305.00 L100.00,305.00 Z"]
+      RenderPath {rect} at (100,260) size 200x45 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#FFD700), (0.50,#FFA500), (1.00,#DC143C)]] [start=(0,0)] [end=(1,0)]}] [data="M100.00,260.00 L300.00,260.00 L300.00,305.00 L100.00,305.00 Z"]
+        [clipPath="svgClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 0x0
       RenderSVGText {text} at (300,300) size 54x15 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-12) size 54x15
           chunk 1 text run 1 at (300.00,300.00) startOffset 0 endOffset 10 width 54.00: "(SVG font)"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textEffect3-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textEffect3-expected.checksum
index c0fef6c..aa4a11e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textEffect3-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textEffect3-expected.checksum
@@ -1 +1 @@
-b36aeda707327e9c71e864b24a07159e
\ No newline at end of file
+2e383170311b52c4320fd297e43d118c
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textEffect3-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textEffect3-expected.png
index 3b2146f..6a6fdcce 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textEffect3-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textEffect3-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-display-none-child-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-display-none-child-expected.txt
index ffedb83..ac78e3f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-display-none-child-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-display-none-child-expected.txt
@@ -1,12 +1,12 @@
-KCanvasResource {id="c" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 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="c"] [clipPathUnits=userSpaceOnUse]
         RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
-    RenderSVGContainer {g} at (0,0) size 100x100 [clip path="c"]
+    RenderSVGContainer {g} at (0,0) size 100x100
+      [clipPath="c"] RenderSVGResourceClipper {clipPath} at (0,0) size 100x100
       RenderPath {rect} at (0,0) size 200x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L200.00,0.00 L200.00,100.00 L0.00,100.00 Z"]
       RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
     RenderSVGContainer {g} at (0,115) size 334x79
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-referencing-use-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-referencing-use-expected.txt
index e57a685..93507a8 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-referencing-use-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-referencing-use-expected.txt
@@ -1,15 +1,15 @@
-KCanvasResource {id="clip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 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
       RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
-      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+      RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
         RenderSVGContainer {use} at (0,0) size 100x100
           RenderSVGContainer {g} at (0,0) size 100x100
             RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
-    RenderSVGContainer {g} at (0,0) size 100x100 [clip path="clip"]
+    RenderSVGContainer {g} at (0,0) size 100x100
+      [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (0,0) size 100x100
       RenderPath {rect} at (0,0) size 200x200 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L200.00,0.00 L200.00,200.00 L0.00,200.00 Z"]
       RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
     RenderSVGText {text} at (10,120) size 465x19 contains 1 chunk(s)
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt
index ad2c5e8..282d867 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt
@@ -1,6 +1,5 @@
 CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
 CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-KCanvasResource {id="clip" [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]]]}
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
@@ -10,13 +9,14 @@ layer at (0,0) size 800x600
       RenderSVGContainer {use} at (0,0) size 50x50
         RenderSVGContainer {g} at (0,0) size 50x50
           RenderPath {rect} at (0,0) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
-      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+      RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
         RenderSVGContainer {use} at (0,0) size 50x50
           RenderSVGContainer {g} at (0,0) size 50x50
             RenderSVGContainer {g} at (0,0) size 50x50
               RenderPath {rect} at (0,0) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
     RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
-    RenderSVGContainer {g} at (0,0) size 100x100 [clip path="clip"]
+    RenderSVGContainer {g} at (0,0) size 100x100
+      [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (0,0) size 0x0
       RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
     RenderSVGText {text} at (10,120) size 360x19 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,-15) size 360x19
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-clip-path-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-clip-path-expected.txt
index bd439ca..c16bc1d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-clip-path-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-clip-path-expected.txt
@@ -1,17 +1,17 @@
-KCanvasResource {id="nothing" [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]]]}
-KCanvasResource {id="emptyrect" [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]]]}
 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
-      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+      RenderSVGResourceClipper {clipPath} [id="nothing"] [clipPathUnits=userSpaceOnUse]
+      RenderSVGResourceClipper {clipPath} [id="emptyrect"] [clipPathUnits=userSpaceOnUse]
         RenderPath {rect} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [data=""]
     RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
-    RenderSVGContainer {g} at (0,0) size 100x100 [clip path="nothing"]
+    RenderSVGContainer {g} at (0,0) size 100x100
+      [clipPath="nothing"] RenderSVGResourceClipper {clipPath} at (0,0) size 0x0
       RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
-    RenderSVGContainer {g} at (0,0) size 100x100 [clip path="emptyrect"]
+    RenderSVGContainer {g} at (0,0) size 100x100
+      [clipPath="emptyrect"] RenderSVGResourceClipper {clipPath} at (0,0) size 0x0
       RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
     RenderSVGContainer {g} at (0,115) size 431x39
       RenderSVGText {text} at (0,130) size 274x19 contains 1 chunk(s)
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/focus-ring-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/focus-ring-expected.txt
index 40f5620..a42a4a7 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/focus-ring-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/focus-ring-expected.txt
@@ -1,4 +1,3 @@
-KCanvasResource {id="clip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z]]]}
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
@@ -22,9 +21,12 @@ layer at (0,0) size 800x600
       RenderSVGText {text} at (0,0) size 73x19 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-15) size 73x19
           chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 12 width 73.00: "focused text"
-    RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+    RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
       RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
-    RenderSVGImage {image} at (0,0) size 0x0 [clip path="clip"]
-    RenderSVGImage {image} at (150,400) size 137x137 [transform={m=((0.87,0.50)(-0.50,0.87)) t=(200.00,400.00)}] [clip path="clip"]
+    RenderSVGImage {image} at (0,0) size 0x0
+      [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (0,0) size 100x100
+    RenderSVGImage {image} at (150,400) size 137x137 [transform={m=((0.87,0.50)(-0.50,0.87)) t=(200.00,400.00)}]
+      [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (0,0) size 100x100
     RenderSVGContainer {g} at (310,400) size 137x137 [transform={m=((0.87,0.50)(-0.50,0.87)) t=(360.00,400.00)}]
-      RenderSVGImage {image} at (310,400) size 137x137 [clip path="clip"]
+      RenderSVGImage {image} at (310,400) size 137x137
+        [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (0,0) size 100x100
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt
index 61ac308..5616d2f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt
@@ -1,13 +1,13 @@
-KCanvasResource {id="myclip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z]]]}
 KCanvasResource {id="myfilter" [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
-      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+      RenderSVGResourceClipper {clipPath} [id="myclip"] [clipPathUnits=userSpaceOnUse]
         RenderPath {path} at (0,0) size 100x100 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
-    RenderSVGImage {image} at (0,0) size 100x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,-25.00)}] [clip path="myclip"] [filter=myfilter]
+    RenderSVGImage {image} at (0,0) size 100x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,-25.00)}] [filter=myfilter]
+      [clipPath="myclip"] RenderSVGResourceClipper {clipPath} at (0,0) size 100x100
     RenderSVGText {text} at (0,125) size 523x19 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,-15) size 523x19
         chunk 1 text run 1 at (0.00,125.00) startOffset 0 endOffset 84 width 523.00: "You should see a solid green block above (a blurred and clipped green checkerboard)."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/invalid-css-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/invalid-css-expected.txt
index 6f4a994..0b03919 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/invalid-css-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/invalid-css-expected.txt
@@ -1,4 +1,3 @@
-KCanvasResource {id="clip1" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M40.00,40.00 L39.98,40.63 L39.92,41.25 L39.82,41.87 L39.69,42.49 L39.51,43.09 L39.30,43.68 L39.05,44.26 L38.76,44.82 L38.44,45.36 L38.09,45.88 L37.71,46.37 L37.29,46.85 L36.85,47.29 L36.37,47.71 L35.88,48.09 L35.36,48.44 L34.82,48.76 L34.26,49.05 L33.68,49.30 L33.09,49.51 L32.49,49.69 L31.87,49.82 L31.25,49.92 L30.63,49.98 L30.00,50.00 L29.37,49.98 L28.75,49.92 L28.13,49.82 L27.51,49.69 L26.91,49.51 L26.32,49.30 L25.74,49.05 L25.18,48.76 L24.64,48.44 L24.12,48.09 L23.63,47.71 L23.15,47.29 L22.71,46.85 L22.29,46.37 L21.91,45.88 L21.56,45.36 L21.24,44.82 L20.95,44.26 L20.70,43.68 L20.49,43.09 L20.31,42.49 L20.18,41.87 L20.08,41.25 L20.02,40.63 L20.00,40.00 L20.02,39.37 L20.08,38.75 L20.18,38.13 L20.31,37.51 L20.49,36.91 L20.70,36.32 L20.95,35.74 L21.24,35.18 L21.56,34.64 L21.91,34.12 L22.29,33.63 L22.71,33.15 L23.15,32.71 L23.63,32.29 L24.12,31.91 L24.64,31.56 L25.18,31.24 L25.74,30.95 L26.32,30.70 L26.91,30.49 L27.51,30.31 L28.13,30.18 L28.75,30.08 L29.37,30.02 L30.00,30.00 L30.63,30.02 L31.25,30.08 L31.87,30.18 L32.49,30.31 L33.09,30.49 L33.68,30.70 L34.26,30.95 L34.82,31.24 L35.36,31.56 L35.88,31.91 L36.37,32.29 L36.85,32.71 L37.29,33.15 L37.71,33.63 L38.09,34.12 L38.44,34.64 L38.76,35.18 L39.05,35.74 L39.30,36.32 L39.51,36.91 L39.69,37.51 L39.82,38.13 L39.92,38.75 L39.98,39.37 Z]]]}
 KRenderingPaintServer {id="grad" [type=LINEAR-GRADIENT] [stops=[(0.00,#008000)]] [start=(0,0)] [end=(1,0)]}
 KCanvasResource {id="blurxy" [type=FILTER]  [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
 KCanvasResource {id="marker1" [type=MARKER] [angle=0.00] [ref x=5.00 y=5.00]}
@@ -7,7 +6,7 @@ layer 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="clip1"] [clipPathUnits=userSpaceOnUse]
         RenderPath {circle} at (33,50) size 34x34 [fill={[type=SOLID] [color=#000000]}] [data="M40.00,40.00 L39.98,40.63 L39.92,41.25 L39.82,41.87 L39.69,42.49 L39.51,43.09 L39.30,43.68 L39.05,44.26 L38.76,44.82 L38.44,45.36 L38.09,45.88 L37.71,46.37 L37.29,46.85 L36.85,47.29 L36.37,47.71 L35.88,48.09 L35.36,48.44 L34.82,48.76 L34.26,49.05 L33.68,49.30 L33.09,49.51 L32.49,49.69 L31.87,49.82 L31.25,49.92 L30.63,49.98 L30.00,50.00 L29.37,49.98 L28.75,49.92 L28.13,49.82 L27.51,49.69 L26.91,49.51 L26.32,49.30 L25.74,49.05 L25.18,48.76 L24.64,48.44 L24.12,48.09 L23.63,47.71 L23.15,47.29 L22.71,46.85 L22.29,46.37 L21.91,45.88 L21.56,45.36 L21.24,44.82 L20.95,44.26 L20.70,43.68 L20.49,43.09 L20.31,42.49 L20.18,41.87 L20.08,41.25 L20.02,40.63 L20.00,40.00 L20.02,39.37 L20.08,38.75 L20.18,38.13 L20.31,37.51 L20.49,36.91 L20.70,36.32 L20.95,35.74 L21.24,35.18 L21.56,34.64 L21.91,34.12 L22.29,33.63 L22.71,33.15 L23.15,32.71 L23.63,32.29 L24.12,31.91 L24.64,31.56 L25.18,31.24 L25.74,30.95 L26.32,30.70 L26.91,30.49 L27.51,30.31 L28.13,30.18 L28.75,30.08 L29.37,30.02 L30.00,30.00 L30.63,30.02 L31.25,30.08 L31.87,30.18 L32.49,30.31 L33.09,30.49 L33.68,30.70 L34.26,30.95 L34.82,31.24 L35.36,31.56 L35.88,31.91 L36.37,32.29 L36.85,32.71 L37.29,33.15 L37.71,33.63 L38.09,34.12 L38.44,34.64 L38.76,35.18 L39.05,35.74 L39.30,36.32 L39.51,36.91 L39.69,37.51 L39.82,38.13 L39.92,38.75 L39.98,39.37 Z"]
       RenderSVGHiddenContainer {linearGradient} at (0,0) size 0x0
         RenderSVGGradientStop {stop} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/js-late-clipPath-and-object-creation-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/js-late-clipPath-and-object-creation-expected.txt
index e485dcf..b0c3d28 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/js-late-clipPath-and-object-creation-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/js-late-clipPath-and-object-creation-expected.txt
@@ -1,11 +1,12 @@
-KCanvasResource {id="dynClip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00 L200.00,0.00 L200.00,200.00 L0.00,200.00 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
     RenderSVGContainer {g} at (16,40) size 318x170 [transform={m=((1.00,0.00)(0.00,1.50)) t=(0.00,0.00)}]
       RenderSVGText {text} at (10,70) size 522x68 contains 1 chunk(s)
+        [clipPath="dynClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 200x200
         RenderSVGInlineText {#text} at (0,-54) size 522x68
+          [clipPath="dynClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 200x200
           chunk 1 text run 1 at (10.00,70.00) startOffset 0 endOffset 19 width 522.00: "Clipped. INVISIBLE."
-      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+      RenderSVGResourceClipper {clipPath} [id="dynClip"] [clipPathUnits=userSpaceOnUse]
         RenderPath {path} at (0,0) size 334x500 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L200.00,0.00 L200.00,200.00 L0.00,200.00 Z"]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/js-late-clipPath-creation-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/js-late-clipPath-creation-expected.txt
index e485dcf..b0c3d28 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/js-late-clipPath-creation-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/js-late-clipPath-creation-expected.txt
@@ -1,11 +1,12 @@
-KCanvasResource {id="dynClip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00 L200.00,0.00 L200.00,200.00 L0.00,200.00 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
     RenderSVGContainer {g} at (16,40) size 318x170 [transform={m=((1.00,0.00)(0.00,1.50)) t=(0.00,0.00)}]
       RenderSVGText {text} at (10,70) size 522x68 contains 1 chunk(s)
+        [clipPath="dynClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 200x200
         RenderSVGInlineText {#text} at (0,-54) size 522x68
+          [clipPath="dynClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 200x200
           chunk 1 text run 1 at (10.00,70.00) startOffset 0 endOffset 19 width 522.00: "Clipped. INVISIBLE."
-      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+      RenderSVGResourceClipper {clipPath} [id="dynClip"] [clipPathUnits=userSpaceOnUse]
         RenderPath {path} at (0,0) size 334x500 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L200.00,0.00 L200.00,200.00 L0.00,200.00 Z"]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/text-clip-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/text-clip-expected.txt
index 9d7f26c..b9090ba 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/text-clip-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/text-clip-expected.txt
@@ -1,15 +1,16 @@
-KCanvasResource {id="myclip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M200.00,200.00 L300.00,200.00 L300.00,400.00 L200.00,400.00 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="myclip"] [clipPathUnits=userSpaceOnUse]
         RenderPath {path} at (200,200) size 100x200 [fill={[type=SOLID] [color=#000000]}] [data="M200.00,200.00 L300.00,200.00 L300.00,400.00 L200.00,400.00 Z"]
     RenderSVGContainer {g} at (0,76) size 130x62
       RenderSVGText {text} at (0,125) size 130x62 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-49) size 130x62
           chunk 1 text run 1 at (0.00,125.00) startOffset 0 endOffset 4 width 130.00: "PASS"
       RenderSVGText {text} at (0,125) size 641x62 contains 1 chunk(s)
+        [clipPath="myclip"] RenderSVGResourceClipper {clipPath} at (200,200) size 100x200
         RenderSVGInlineText {#text} at (0,-49) size 641x62
+          [clipPath="myclip"] RenderSVGResourceClipper {clipPath} at (200,200) size 100x200
           chunk 1 text run 1 at (0.00,125.00) startOffset 0 endOffset 28 width 641.00: "FAIL (should be clipped out)"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-on-clip-path-with-transformation-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-on-clip-path-with-transformation-expected.checksum
new file mode 100644
index 0000000..a0b7595
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-on-clip-path-with-transformation-expected.checksum
@@ -0,0 +1 @@
+973c3a3dac5aed9c5bc3981a25b77da4
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-on-clip-path-with-transformation-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-on-clip-path-with-transformation-expected.png
new file mode 100644
index 0000000..10071e0
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-on-clip-path-with-transformation-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/filter-on-tspan-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/filter-on-tspan-expected.checksum
new file mode 100644
index 0000000..1884475
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/filter-on-tspan-expected.checksum
@@ -0,0 +1 @@
+01e8418b114ccace57d26c496e292fe8
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/filter-on-tspan-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/filter-on-tspan-expected.png
new file mode 100644
index 0000000..c69ba7d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/filter-on-tspan-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/filter-on-tspan-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/filter-on-tspan-expected.txt
new file mode 100644
index 0000000..abd0d9f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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 93x19 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-15) size 63x19
+        chunk 1 text run 1 at (100.00,100.00) startOffset 0 endOffset 12 width 63.00: "Die ist ein "
+      RenderSVGTSpan {tspan} at (0,0) size 26x19
+        RenderSVGInlineText {#text} at (63,-15) size 26x19
+          chunk 1 text run 2 at (163.00,100.00) startOffset 0 endOffset 4 width 26.00: "Test"
+      RenderSVGInlineText {#text} at (89,-15) size 4x19
+        chunk 1 text run 3 at (189.00,100.00) startOffset 0 endOffset 1 width 4.00: "."