diff options
author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-14 18:03:45 +0000 |
---|---|---|
committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-14 18:03:45 +0000 |
commit | d2cc85e28cb0230ed7423cd68c7a42692e654df7 (patch) | |
tree | f0af73b38af60e00e54272fa88f212b3325cb2ae /webkit | |
parent | 91314de9d95ccf3996af9688e4489e2b96a802ed (diff) | |
download | chromium_src-d2cc85e28cb0230ed7423cd68c7a42692e654df7.zip chromium_src-d2cc85e28cb0230ed7423cd68c7a42692e654df7.tar.gz chromium_src-d2cc85e28cb0230ed7423cd68c7a42692e654df7.tar.bz2 |
Roll Webkit to r53246.
TBR=yaar
Review URL: http://codereview.chromium.org/545055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
28 files changed, 620 insertions, 0 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/fast/backgrounds/svg-as-background-2-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/fast/backgrounds/svg-as-background-2-expected.checksum new file mode 100644 index 0000000..03c050d --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/fast/backgrounds/svg-as-background-2-expected.checksum @@ -0,0 +1 @@ +e955df48558c79af253acffedde392a4
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/svg/custom/relative-sized-content-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/svg/custom/relative-sized-content-expected.checksum new file mode 100644 index 0000000..bab9803 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/svg/custom/relative-sized-content-expected.checksum @@ -0,0 +1 @@ +af55424e5ce614a9e37c9ca457fa7fe3
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/svg/custom/relative-sized-content-expected.png b/webkit/data/layout_tests/platform/chromium-linux/svg/custom/relative-sized-content-expected.png Binary files differnew file mode 100644 index 0000000..0827c92 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/svg/custom/relative-sized-content-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-mac/fast/backgrounds/svg-as-background-2-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/fast/backgrounds/svg-as-background-2-expected.checksum new file mode 100644 index 0000000..24d2154 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/fast/backgrounds/svg-as-background-2-expected.checksum @@ -0,0 +1 @@ +aa59408bbce4468d57cb40e9b580eab6
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-mac/fast/backgrounds/svg-as-background-2-expected.png b/webkit/data/layout_tests/platform/chromium-mac/fast/backgrounds/svg-as-background-2-expected.png Binary files differnew file mode 100644 index 0000000..510f1d2 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/fast/backgrounds/svg-as-background-2-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-mac/svg/custom/image-with-transform-clip-filter-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/svg/custom/image-with-transform-clip-filter-expected.txt new file mode 100644 index 0000000..bfca7f9 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/svg/custom/image-with-transform-clip-filter-expected.txt @@ -0,0 +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,-16) size 542x145 + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0 + 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,-16) size 100x91 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,-25.00)}] [clip path="myclip"] [filter=myfilter] + 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/fast/backgrounds/svg-as-background-2-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/fast/backgrounds/svg-as-background-2-expected.checksum new file mode 100644 index 0000000..abdb468 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/fast/backgrounds/svg-as-background-2-expected.checksum @@ -0,0 +1 @@ +01f502452d74526c5592f98ba324ccb0
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/fast/backgrounds/svg-as-background-2-expected.png b/webkit/data/layout_tests/platform/chromium-win/fast/backgrounds/svg-as-background-2-expected.png Binary files differnew file mode 100644 index 0000000..f687db5 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/fast/backgrounds/svg-as-background-2-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt new file mode 100644 index 0000000..c0095e1 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt @@ -0,0 +1,29 @@ +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]]]} +KCanvasResource {id="two" [type=MASKER]} +layer at (0,0) size 480x360 + RenderView at (0,0) size 480x360 +layer at (0,0) size 480x360 + RenderSVGRoot {svg} at (0.50,0.50) size 479x359 + RenderSVGText {text} at (63,35) size 354x20 contains 1 chunk(s) + 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 + RenderPath {circle} at (0.02,0.22) size 0.55x0.55 [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.50,0.30) size 0.40x0.40 [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"] + 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':" + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderSVGContainer {mask} at (0.02,0.22) size 0.88x0.55 + RenderPath {circle} at (0.02,0.22) size 0.55x0.55 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [fill={[type=SOLID] [color=#0000FF]}] [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.50,0.30) size 0.40x0.40 [fill={[type=SOLID] [color=#0000FF]}] [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 (150,150) size 200x200 [fill={[type=SOLID] [color=#00008B]}] [data="M150.00,150.00 L350.00,150.00 L350.00,350.00 L150.00,350.00 Z"] + RenderSVGText {text} at (50,260) size 85x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 85x19 + chunk 1 text run 1 at (50.00,260.00) startOffset 0 endOffset 14 width 85.00: "With a 'mask':" + 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/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt new file mode 100644 index 0000000..a6e5a75 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt @@ -0,0 +1,33 @@ +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.50,0.50) size 479x359 + RenderSVGContainer {g} at (20,17.50) size 320x269.50 + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0 + 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 + 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.50) size 60x65 [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"] + 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.50,152) size 207.50x98 [clip path="clip2"] + RenderPath {rect} at (112.50,187.50) size 230x45 [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.50,237.50) size 230x45 [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) + RenderSVGInlineText {#text} at (0,-28) size 320x35 + chunk 1 text run 1 at (115.00,180.00) startOffset 0 endOffset 26 width 320.00: "Line of text to be clipped" + RenderSVGText {text} at (20,280) size 269x35 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-28) size 269x35 + chunk 1 text run 1 at (20.00,280.00) startOffset 0 endOffset 19 width 269.00: "Group being clipped" + RenderSVGContainer {g} at (89,149) size 232x102 + RenderPath {rect} at (89,149) size 177x102 [stroke={[type=SOLID] [color=#999999] [stroke width=2.00]}] [data="M90.00,150.00 L265.00,150.00 L265.00,250.00 L90.00,250.00 Z"] + RenderPath {rect} at (224,159) size 97x77 [stroke={[type=SOLID] [color=#999999] [stroke width=2.00]}] [data="M225.00,160.00 L320.00,160.00 L320.00,235.00 L225.00,235.00 Z"] + RenderSVGText {text} at (10,340) size 281x46 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-36) size 281x46 + chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 17 width 281.00: "$Revision: 1.10 $" + 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/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt new file mode 100644 index 0000000..38f382f --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt @@ -0,0 +1,22 @@ +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.50,0.50) size 479x359 + RenderSVGContainer {g} at (20,20) size 420x310 + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0 + 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" + RenderSVGContainer {g} at (30,20) size 410x140 + RenderSVGImage {image} at (30,20) size 410x140 + RenderSVGText {text} at (55,130) size 353x122 contains 1 chunk(s) + 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"] + 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 $" + 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/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt new file mode 100644 index 0000000..6078183 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt @@ -0,0 +1,110 @@ +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]} +KCanvasResource {id="marker4" [type=MARKER] [angle=0.00] [ref x=5.00 y=5.00]} +layer at (0,0) size 480x360 + RenderView at (0,0) size 480x360 +layer at (0,0) size 480x360 + RenderSVGRoot {svg} at (-0.80,-0.80) size 480.30x360.30 + RenderSVGContainer {g} at (-0.80,-0.80) size 448.80x273.80 + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0 + 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 + 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 + chunk 1 text run 1 at (125.00,30.00) startOffset 0 endOffset 27 width 183.00: "Marker Rendering Properties" + RenderSVGContainer {g} at (0,0) size 208x143 + RenderSVGViewportContainer {marker} at (0,0) size 2x2 + RenderPath {rect} at (0,0) size 2x2 [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 (100,140) size 57x13 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 57x13 + chunk 1 text run 1 at (100.00,140.00) startOffset 0 endOffset 13 width 57.00: "Fill Property" + RenderPath {path} at (22,52) size 66x66 [fill={[type=SOLID] [color=#000000]}] [start marker=marker1] [middle marker=marker1] [end marker=marker1] [data="M30.00,60.00 L80.00,60.00 L80.00,110.00 Z"] + 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 [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 [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 [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.40,-0.40) size 448.40x143.40 + RenderSVGViewportContainer {marker} at (-0.40,-0.40) size 4.80x4.80 + RenderPath {rect} at (-0.40,-0.40) size 4.80x4.80 [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"] + RenderSVGText {text} at (340,140) size 71x13 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 71x13 + chunk 1 text run 1 at (340.00,140.00) startOffset 0 endOffset 15 width 71.00: "Stroke Property" + RenderPath {path} at (260.40,50.40) size 69.20x69.20 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [start marker=marker2] [middle marker=marker2] [end marker=marker2] [data="M270.00,60.00 L320.00,60.00 L320.00,110.00 Z"] + 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.17,58) size 56.83x56.83 [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 (380.40,50.40) size 19.20x19.20 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}] + RenderPath {rect} at (380.40,50.40) size 19.20x19.20 [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 (430.40,50.40) size 19.20x19.20 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}] + RenderPath {rect} at (430.40,50.40) size 19.20x19.20 [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 (430.40,100.40) size 19.20x19.20 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}] + RenderPath {rect} at (430.40,100.40) size 19.20x19.20 [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.80,-0.80) size 5.60x5.60 + RenderSVGViewportContainer {marker} at (-0.80,-0.80) size 5.60x5.60 + RenderPath {rect} at (-0.80,-0.80) size 5.60x5.60 [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"] + RenderSVGViewportContainer {marker} at (-0.80,-0.80) size 5.60x5.60 + RenderPath {rect} at (-0.80,-0.80) size 5.60x5.60 [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 (18.80,178.80) size 189.20x94.20 + RenderSVGText {text} at (90,270) size 79x13 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 79x13 + chunk 1 text run 1 at (90.00,270.00) startOffset 0 endOffset 16 width 79.00: "Mixed Properties" + RenderPath {path} at (18.80,178.80) size 72.40x72.40 [stroke={[type=SOLID] [color=#800080] [stroke width=4.00]}] [fill={[type=SOLID] [color=#FF0000]}] [start marker=marker3] [middle marker=marker3] [end marker=marker3] [data="M30.00,190.00 L80.00,190.00 L80.00,240.00 Z"] + RenderSVGContainer {g} at (142,182) size 66x66 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}] + RenderPath {path} at (145.17,188) size 56.83x56.83 [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 (138.80,178.80) size 22.40x22.40 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}] + RenderPath {rect} at (138.80,178.80) size 22.40x22.40 [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 (188.80,178.80) size 22.40x22.40 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}] + RenderPath {rect} at (188.80,178.80) size 22.40x22.40 [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 (188.80,228.80) size 22.40x22.40 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}] + RenderPath {rect} at (188.80,228.80) size 22.40x22.40 [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.80,178.80) size 189.20x94.20 + RenderSVGText {text} at (340,270) size 79x13 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 79x13 + chunk 1 text run 1 at (340.00,270.00) startOffset 0 endOffset 16 width 79.00: "Mixed Properties" + RenderPath {path} at (258.80,178.80) size 72.40x72.40 [stroke={[type=SOLID] [color=#800080] [stroke width=4.00]}] [fill={[type=SOLID] [color=#FF0000]}] [start marker=marker4] [middle marker=marker4] [end marker=marker4] [data="M270.00,190.00 L320.00,190.00 L320.00,240.00 Z"] + RenderSVGContainer {g} at (382,182) size 66x66 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}] + RenderPath {path} at (385.17,188) size 56.83x56.83 [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 (378.80,178.80) size 22.40x22.40 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}] + RenderPath {rect} at (378.80,178.80) size 22.40x22.40 [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 (428.80,178.80) size 22.40x22.40 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}] + RenderPath {rect} at (428.80,178.80) size 22.40x22.40 [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 (428.80,228.80) size 22.40x22.40 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}] + RenderPath {rect} at (428.80,228.80) size 22.40x22.40 [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) + 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 $" + 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/data/layout_tests/platform/chromium-win/svg/batik/text/textEffect2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/batik/text/textEffect2-expected.txt new file mode 100644 index 0000000..2c15ea46 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/batik/text/textEffect2-expected.txt @@ -0,0 +1,36 @@ +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 + RenderSVGRoot {svg} at (100,15) size 267x290 + RenderSVGContainer {g} at (100,15) size 267x290 + RenderSVGText {text} at (161,30) size 128x18 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 128x18 + chunk 1 (middle anchor) text run 1 at (161.00,30.00) startOffset 0 endOffset 20 width 128.00: "clip-path using text" + RenderSVGText {text} at (109,50) size 232x18 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 232x18 + chunk 1 (middle anchor) text run 1 at (109.00,50.00) startOffset 0 endOffset 32 width 232.00: "(Using System font and SVG font)" + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + 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 + RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0 + 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 + 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"] + 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"] + 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)" + RenderSVGContainer {use} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/batik/text/textProperties-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/batik/text/textProperties-expected.txt new file mode 100644 index 0000000..c63c70a --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/batik/text/textProperties-expected.txt @@ -0,0 +1,165 @@ +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 +layer at (0,0) size 450x500 + RenderSVGRoot {svg} at (0,36) size 427x434 + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderSVGText {text} at (-21,0) size 42x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 42x19 + chunk 1 (middle anchor) text run 1 at (-21.00,0.00) startOffset 0 endOffset 6 width 42.00: "sample" + RenderSVGContainer {g} at (0,36) size 427x434 + RenderSVGText {text} at (60,50) size 330x17 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-14) size 330x17 + chunk 1 (middle anchor) text run 1 at (60.00,50.00) startOffset 0 endOffset 47 width 330.00: "Text Alignment, Geometry, References, and Spans" + RenderSVGContainer {g} at (119,70) size 217x70 + RenderPath {line} at (224.50,70) size 1x70 [stroke={[type=SOLID] [color=#808080]}] [fill={[type=SOLID] [color=#000000]}] [data="M225.00,70.00 L225.00,140.00"] + RenderSVGText {text} at (225,90) size 111x17 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-13) size 111x17 + chunk 1 text run 1 at (225.00,90.00) startOffset 0 endOffset 19 width 111.00: "text-anchor=\"start\"" + RenderSVGText {text} at (163,110) size 124x17 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-13) size 124x17 + chunk 1 (middle anchor) text run 1 at (163.50,110.00) startOffset 0 endOffset 20 width 123.00: "text-anchor=\"middle\"" + RenderSVGText {text} at (119,130) size 106x17 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-13) size 106x17 + chunk 1 (end anchor) text run 1 at (119.00,130.00) startOffset 0 endOffset 17 width 106.00: "text-anchor=\"end\"" + RenderSVGContainer {g} at (46,146) size 108x53 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,180.00)}] + RenderSVGText {text} at (-54,0) size 108x43 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-34) size 108x43 + chunk 1 (middle anchor) text run 1 at (-54.00,0.00) startOffset 0 endOffset 6 width 108.00: "sample" + 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 15 width 96.00: "font-size=\"1cm\"" + RenderSVGContainer {g} at (171,152) size 108x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,180.00)}] + RenderSVGText {text} at (-44,0) size 88x36 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-28) size 88x36 + chunk 1 (middle anchor) text run 1 at (-43.50,0.00) startOffset 0 endOffset 6 width 87.00: "sample" + RenderSVGText {text} at (-54,15) size 108x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 108x19 + chunk 1 (middle anchor) text run 1 at (-53.50,15.00) startOffset 0 endOffset 16 width 107.00: "font-size=\"200%\"" + RenderSVGContainer {g} at (293,144) size 114x55 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,180.00)}] + RenderSVGText {text} at (-57,0) size 114x46 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-36) size 114x46 + chunk 1 (middle anchor) text run 1 at (-56.50,0.00) startOffset 0 endOffset 6 width 113.00: "sample" + RenderSVGText {text} at (-43,15) size 86x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 86x19 + chunk 1 (middle anchor) text run 1 at (-43.00,15.00) startOffset 0 endOffset 14 width 86.00: "font-size=\"28\"" + RenderSVGContainer {g} at (23,198) size 154x46 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,225.00)}] + RenderSVGText {text} at (-41,0) size 82x34 contains 1 chunk(s) + RenderSVGInline {tref} at (0,0) size 82x34 + 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" + RenderSVGText {text} at (-77,15) size 154x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 154x19 + chunk 1 (middle anchor) text run 1 at (-76.50,15.00) startOffset 0 endOffset 26 width 153.00: "referenced text via <tref>" + RenderSVGContainer {g} at (180,197) size 90x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,225.00)}] + RenderSVGText {text} at (-42,0) size 84x35 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-27) size 25x34 + chunk 1 (middle anchor) text run 1 at (-41.50,0.00) startOffset 0 endOffset 2 width 24.00: "sa" + RenderSVGTSpan {tspan} at (0,0) size 25x35 + RenderSVGInlineText {#text} at (24,-28) size 25x35 + chunk 1 (middle anchor) text run 2 at (-17.50,0.00) startOffset 0 endOffset 1 width 24.00: "m" + RenderSVGInlineText {#text} at (48,-27) size 36x34 + chunk 1 (middle anchor) text run 3 at (6.50,0.00) startOffset 0 endOffset 3 width 35.00: "ple" + RenderSVGText {text} at (-45,15) size 90x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 90x19 + chunk 1 (middle anchor) text run 1 at (-45.00,15.00) startOffset 0 endOffset 14 width 90.00: "use of <tspan>" + RenderSVGContainer {g} at (273,198) size 154x46 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,225.00)}] + RenderSVGContainer {g} at (309,198) size 82x34 + RenderSVGContainer {use} at (309,198) size 82x34 + RenderSVGContainer {g} at (309,198) size 82x34 + 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" + RenderSVGText {text} at (-77,15) size 154x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 154x19 + chunk 1 (middle anchor) text run 1 at (-76.50,15.00) startOffset 0 endOffset 25 width 153.00: "predefined text via <use>" + RenderSVGText {text} at (147,280) size 156x17 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-13) size 156x17 + chunk 1 (middle anchor) text run 1 at (147.50,280.00) startOffset 0 endOffset 25 width 155.00: "Text Rendering Properties" + RenderSVGContainer {g} at (27,298) size 146x41 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,305.00)}] + RenderSVGContainer {g} at (59,298) size 82x34 [transform={m=((-1.00,0.00)(-0.00,-1.00)) t=(0.00,0.00)}] + RenderSVGContainer {use} at (59,298) size 82x34 + RenderSVGContainer {g} at (59,298) size 82x34 + 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" + RenderSVGText {text} at (-73,30) size 146x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 146x19 + chunk 1 (middle anchor) text run 1 at (-72.50,30.00) startOffset 0 endOffset 23 width 145.00: "transform=\"rotate(180)\"" + RenderSVGContainer {g} at (183,293) size 84x46 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,320.00)}] + RenderSVGContainer {g} at (184,293) size 82x34 [opacity=0.50] + RenderSVGContainer {use} at (184,293) size 82x34 + RenderSVGContainer {g} at (184,293) size 82x34 + 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" + RenderSVGText {text} at (-42,15) size 84x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 84x19 + chunk 1 (middle anchor) text run 1 at (-41.50,15.00) startOffset 0 endOffset 13 width 83.00: "opacity=\"0.5\"" + RenderSVGContainer {g} at (306,293) size 88x46 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,320.00)}] + RenderSVGContainer {g} at (309,293) size 82x34 + RenderSVGContainer {use} at (309,293) size 82x34 + RenderSVGContainer {g} at (309,293) size 82x34 + 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" + RenderSVGText {text} at (-44,15) size 88x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 88x19 + chunk 1 (middle anchor) text run 1 at (-44.00,15.00) startOffset 0 endOffset 14 width 88.00: "fill=\"DarkRed\"" + RenderSVGContainer {g} at (0,270) size 200x200 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,370.00)}] + RenderSVGContainer {g} at (0,270) size 200x200 [filter=gaussianBlur] + RenderSVGContainer {use} at (59,343) size 82x34 + RenderSVGContainer {g} at (59,343) size 82x34 + 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" + RenderSVGText {text} at (-77,15) size 154x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 154x19 + chunk 1 (middle anchor) text run 1 at (-76.50,15.00) startOffset 0 endOffset 27 width 153.00: "filter=\"url(#gaussianBlur)\"" + RenderSVGContainer {g} at (156,343) size 138x56 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,370.00)}] + RenderSVGContainer {g} at (184,343) size 82x34 + RenderSVGContainer {use} at (184,343) size 82x34 + RenderSVGContainer {g} at (184,343) size 82x34 + 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" + RenderSVGText {text} at (-38,15) size 76x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 76x19 + chunk 1 (middle anchor) text run 1 at (-37.50,15.00) startOffset 0 endOffset 14 width 75.00: "fill=\"yellow\";" + RenderSVGText {text} at (-69,25) size 138x19 contains 1 chunk(s) + 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 + 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" + RenderSVGHiddenContainer {linearGradient} at (0,0) size 0x0 + 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"] + 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" + RenderSVGText {text} at (136,440) size 28x68 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-54) size 28x68 + chunk 1 (middle anchor) text run 1 at (136.50,440.00) startOffset 0 endOffset 1 width 27.00: "a" + RenderSVGText {text} at (82,455) size 136x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 136x19 + chunk 1 (middle anchor) text run 1 at (82.50,455.00) startOffset 0 endOffset 23 width 135.00: "stroke-linejoin=\"miter\"" + RenderSVGText {text} at (77,465) size 146x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 146x19 + chunk 1 (middle anchor) text run 1 at (77.50,465.00) startOffset 0 endOffset 23 width 145.00: "stroke-linecap=\"square\"" + RenderSVGText {text} at (286,440) size 28x68 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-54) size 28x68 + chunk 1 (middle anchor) text run 1 at (286.50,440.00) startOffset 0 endOffset 1 width 27.00: "a" + RenderSVGText {text} at (230,455) size 140x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 140x19 + chunk 1 (middle anchor) text run 1 at (230.00,455.00) startOffset 0 endOffset 23 width 140.00: "stroke-linejoin=\"round\"" + RenderSVGText {text} at (230,465) size 140x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 140x19 + chunk 1 (middle anchor) text run 1 at (230.00,465.00) startOffset 0 endOffset 22 width 140.00: "stroke-linecap=\"round\"" + RenderSVGContainer {use} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/custom/clip-path-display-none-child-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/custom/clip-path-display-none-child-expected.txt new file mode 100644 index 0000000..87b3f9f --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/custom/clip-path-display-none-child-expected.txt @@ -0,0 +1,24 @@ +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 334x194 + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderSVGHiddenContainer {clipPath} 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"] + RenderSVGContainer {g} at (0,0) size 100x100 [clip path="c"] + 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 + RenderSVGText {text} at (0,130) size 274x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 274x19 + chunk 1 text run 1 at (0.00,130.00) startOffset 0 endOffset 44 width 274.00: "Above a green rectangle should be displayed." + RenderSVGText {text} at (0,150) size 277x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 277x19 + chunk 1 text run 1 at (0.00,150.00) startOffset 0 endOffset 49 width 277.00: "It tests that a clip path child with display=none" + RenderSVGText {text} at (0,170) size 329x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 329x19 + chunk 1 text run 1 at (0.00,170.00) startOffset 0 endOffset 57 width 329.00: "does not contribute to the clip-path and that a clip path" + RenderSVGText {text} at (0,190) size 334x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 334x19 + chunk 1 text run 1 at (0.00,190.00) startOffset 0 endOffset 56 width 334.00: "child with visibility=hidden does contribute. Bug 18340." diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/custom/clip-path-referencing-use-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/custom/clip-path-referencing-use-expected.txt new file mode 100644 index 0000000..3a50195 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/custom/clip-path-referencing-use-expected.txt @@ -0,0 +1,20 @@ +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 579x144 + 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 + 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"] + 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) + RenderSVGInlineText {#text} at (0,-15) size 465x19 + chunk 1 text run 1 at (10.00,120.00) startOffset 0 endOffset 76 width 465.00: "The graphic above uses a 100x100 clipPath referencing a rectangle using use." + RenderSVGText {text} at (10,140) size 569x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 569x19 + chunk 1 text run 1 at (10.00,140.00) startOffset 0 endOffset 92 width 569.00: "It should clip the 200x200 red rectangle out and leave a 100x100 green rectangle. Bug 16557." diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/custom/empty-clip-path-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/custom/empty-clip-path-expected.txt new file mode 100644 index 0000000..7d25bfe --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/custom/empty-clip-path-expected.txt @@ -0,0 +1,22 @@ +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 431x154 + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0 + RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0 + 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"] + 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"] + 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) + RenderSVGInlineText {#text} at (0,-15) size 274x19 + chunk 1 text run 1 at (0.00,130.00) startOffset 0 endOffset 44 width 274.00: "Above a green rectangle should be displayed." + RenderSVGText {text} at (0,150) size 431x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 431x19 + chunk 1 text run 1 at (0.00,150.00) startOffset 0 endOffset 74 width 431.00: "It tests that an empty clip path clips the referencing graphic. Bug 15289." diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/custom/focus-ring-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/custom/focus-ring-expected.txt new file mode 100644 index 0000000..f3bdac5 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/custom/focus-ring-expected.txt @@ -0,0 +1,30 @@ +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 800x1000 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x1000 + RenderSVGRoot {svg} at (10,10) size 436.60x526.60 + RenderPath {circle} at (15,10) size 100x100 [fill={[type=SOLID] [color=#FFA500]}] [data="M115.00,60.00 L114.90,63.14 L114.61,66.27 L114.11,69.37 L113.43,72.43 L112.55,75.45 L111.49,78.41 L110.24,81.29 L108.82,84.09 L107.22,86.79 L105.45,89.39 L103.53,91.87 L101.45,94.23 L99.23,96.45 L96.87,98.53 L94.39,100.45 L91.79,102.22 L89.09,103.82 L86.29,105.24 L83.41,106.49 L80.45,107.55 L77.43,108.43 L74.37,109.11 L71.27,109.61 L68.14,109.90 L65.00,110.00 L61.86,109.90 L58.73,109.61 L55.63,109.11 L52.57,108.43 L49.55,107.55 L46.59,106.49 L43.71,105.24 L40.91,103.82 L38.21,102.22 L35.61,100.45 L33.13,98.53 L30.77,96.45 L28.55,94.23 L26.47,91.87 L24.55,89.39 L22.78,86.79 L21.18,84.09 L19.76,81.29 L18.51,78.41 L17.45,75.45 L16.57,72.43 L15.89,69.37 L15.39,66.27 L15.10,63.14 L15.00,60.00 L15.10,56.86 L15.39,53.73 L15.89,50.63 L16.57,47.57 L17.45,44.55 L18.51,41.59 L19.76,38.71 L21.18,35.91 L22.78,33.21 L24.55,30.61 L26.47,28.13 L28.55,25.77 L30.77,23.55 L33.13,21.47 L35.61,19.55 L38.21,17.78 L40.91,16.18 L43.71,14.76 L46.59,13.51 L49.55,12.45 L52.57,11.57 L55.63,10.89 L58.73,10.39 L61.86,10.10 L65.00,10.00 L68.14,10.10 L71.27,10.39 L74.37,10.89 L77.43,11.57 L80.45,12.45 L83.41,13.51 L86.29,14.76 L89.09,16.18 L91.79,17.78 L94.39,19.55 L96.87,21.47 L99.23,23.55 L101.45,25.77 L103.53,28.13 L105.45,30.61 L107.22,33.21 L108.82,35.91 L110.24,38.71 L111.49,41.59 L112.55,44.55 L113.43,47.57 L114.11,50.63 L114.61,53.73 L114.90,56.86 Z"] + RenderPath {path} at (140,10) size 100x100 [fill={[type=SOLID] [color=#FFA500]}] [data="M140.00,10.00 L190.00,110.00 L240.00,60.00 L220.00,60.00 L200.00,30.00 Z"] + RenderSVGContainer {g} at (270,10) size 100x100 + RenderPath {rect} at (270,10) size 100x100 [fill={[type=SOLID] [color=#FFA500]}] [data="M270.00,10.00 L370.00,10.00 L370.00,110.00 L270.00,110.00 Z"] + RenderSVGContainer {g} at (10,140) size 136.60x136.60 [transform={m=((0.87,0.50)(-0.50,0.87)) t=(60.00,140.00)}] + RenderPath {rect} at (10,140) size 136.60x136.60 [fill={[type=SOLID] [color=#FFA500]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"] + RenderPath {rect} at (150,140) size 136.60x136.60 [transform={m=((0.87,0.50)(-0.50,0.87)) t=(200.00,140.00)}] [fill={[type=SOLID] [color=#FFA500]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"] + RenderSVGContainer {g} at (310,140) size 136.60x136.60 + RenderPath {rect} at (310,140) size 136.60x136.60 [transform={m=((0.87,0.50)(-0.50,0.87)) t=(360.00,140.00)}] [fill={[type=SOLID] [color=#FFA500]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"] + RenderSVGText {text} at (10,320) size 73x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 73x19 + chunk 1 text run 1 at (10.00,320.00) startOffset 0 endOffset 12 width 73.00: "focused text" + 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" + RenderSVGContainer {g} at (198,307.01) size 72.72x52.95 + 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 + 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 136.60x136.60 [transform={m=((0.87,0.50)(-0.50,0.87)) t=(200.00,400.00)}] [clip path="clip"] + RenderSVGContainer {g} at (310,400) size 136.60x136.60 [transform={m=((0.87,0.50)(-0.50,0.87)) t=(360.00,400.00)}] + RenderSVGImage {image} at (310,400) size 136.60x136.60 [clip path="clip"] diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/custom/image-with-transform-clip-filter-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/custom/image-with-transform-clip-filter-expected.txt new file mode 100644 index 0000000..42b8524 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/custom/image-with-transform-clip-filter-expected.txt @@ -0,0 +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,-16) size 523x145 + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0 + 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,-16) size 100x91 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,-25.00)}] [clip path="myclip"] [filter=myfilter] + 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/svg/custom/invalid-css-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/custom/invalid-css-expected.txt new file mode 100644 index 0000000..c8b42b7 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/custom/invalid-css-expected.txt @@ -0,0 +1,29 @@ +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]} +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x600 + RenderSVGRoot {svg} at (0,-3.33) size 475x226.67 + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0 + RenderPath {circle} at (20,30) size 20x20 [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 + RenderSVGViewportContainer {marker} at (0,0) size 3.33x3.33 + RenderPath {rect} at (0,0) size 3.33x3.33 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"] + RenderSVGText {text} at (0,13) size 285x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 285x19 + chunk 1 text run 1 at (0.00,13.00) startOffset 0 endOffset 46 width 285.00: "The rect should be opaque green, black stroke," + RenderSVGText {text} at (0,33) size 162x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 162x19 + chunk 1 text run 1 at (0.00,33.00) startOffset 0 endOffset 25 width 162.00: "no markers and no dashes." + RenderPath {path} at (49.17,65.83) size 85x85.00 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#008000]}] [data="M30.00,40.00 L80.00,40.00 L80.00,90.00 L30.00,90.00 Z"] + RenderPath {circle} at (265.83,65.83) size 68.33x68.33 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#008000)]] [start=(0,0)] [end=(1,0)]}] [data="M200.00,60.00 L199.96,61.26 L199.84,62.51 L199.65,63.75 L199.37,64.97 L199.02,66.18 L198.60,67.36 L198.10,68.52 L197.53,69.64 L196.89,70.72 L196.18,71.76 L195.41,72.75 L194.58,73.69 L193.69,74.58 L192.75,75.41 L191.76,76.18 L190.72,76.89 L189.64,77.53 L188.52,78.10 L187.36,78.60 L186.18,79.02 L184.97,79.37 L183.75,79.65 L182.51,79.84 L181.26,79.96 L180.00,80.00 L178.74,79.96 L177.49,79.84 L176.25,79.65 L175.03,79.37 L173.82,79.02 L172.64,78.60 L171.48,78.10 L170.36,77.53 L169.28,76.89 L168.24,76.18 L167.25,75.41 L166.31,74.58 L165.42,73.69 L164.59,72.75 L163.82,71.76 L163.11,70.72 L162.47,69.64 L161.90,68.52 L161.40,67.36 L160.98,66.18 L160.63,64.97 L160.35,63.75 L160.16,62.51 L160.04,61.26 L160.00,60.00 L160.04,58.74 L160.16,57.49 L160.35,56.25 L160.63,55.03 L160.98,53.82 L161.40,52.64 L161.90,51.48 L162.47,50.36 L163.11,49.28 L163.82,48.24 L164.59,47.25 L165.42,46.31 L166.31,45.42 L167.25,44.59 L168.24,43.82 L169.28,43.11 L170.36,42.47 L171.48,41.90 L172.64,41.40 L173.82,40.98 L175.03,40.63 L176.25,40.35 L177.49,40.16 L178.74,40.04 L180.00,40.00 L181.26,40.04 L182.51,40.16 L183.75,40.35 L184.97,40.63 L186.18,40.98 L187.36,41.40 L188.52,41.90 L189.64,42.47 L190.72,43.11 L191.76,43.82 L192.75,44.59 L193.69,45.42 L194.58,46.31 L195.41,47.25 L196.18,48.24 L196.89,49.28 L197.53,50.36 L198.10,51.48 L198.60,52.64 L199.02,53.82 L199.37,55.03 L199.65,56.25 L199.84,57.49 L199.96,58.74 Z"] + RenderSVGText {text} at (0,110) size 264x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 264x19 + chunk 1 text run 1 at (0.00,110.00) startOffset 0 endOffset 45 width 264.00: "The circle should be opaque green, no filter," + RenderSVGText {text} at (0,130) size 102x19 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 102x19 + chunk 1 text run 1 at (0.00,130.00) startOffset 0 endOffset 17 width 102.00: "green stop color." diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/custom/js-late-clipPath-and-object-creation-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/custom/js-late-clipPath-and-object-creation-expected.txt new file mode 100644 index 0000000..922973d --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/custom/js-late-clipPath-and-object-creation-expected.txt @@ -0,0 +1,11 @@ +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 (16.67,40) size 316.67x170 + RenderSVGContainer {g} at (16.67,40) size 316.67x170 [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) + RenderSVGInlineText {#text} at (0,-54) size 522x68 + 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 + RenderPath {path} at (0,0) size 200x200 [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/svg/custom/js-late-clipPath-creation-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/custom/js-late-clipPath-creation-expected.txt new file mode 100644 index 0000000..922973d --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/custom/js-late-clipPath-creation-expected.txt @@ -0,0 +1,11 @@ +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 (16.67,40) size 316.67x170 + RenderSVGContainer {g} at (16.67,40) size 316.67x170 [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) + RenderSVGInlineText {#text} at (0,-54) size 522x68 + 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 + RenderPath {path} at (0,0) size 200x200 [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/svg/custom/relative-sized-content-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/svg/custom/relative-sized-content-expected.checksum new file mode 100644 index 0000000..53cae58 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/custom/relative-sized-content-expected.checksum @@ -0,0 +1 @@ +b33ddf969b6c10755311dd69e9226f34
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/custom/relative-sized-content-expected.png b/webkit/data/layout_tests/platform/chromium-win/svg/custom/relative-sized-content-expected.png Binary files differnew file mode 100644 index 0000000..de2a13f --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/custom/relative-sized-content-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/custom/relative-sized-content-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/custom/relative-sized-content-expected.txt new file mode 100644 index 0000000..2d77ee2 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/custom/relative-sized-content-expected.txt @@ -0,0 +1,13 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x482 + RenderBlock {html} at (0,0) size 800x482 + RenderBody {body} at (8,16) size 784x458 + RenderBlock {p} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 751x39 + text run at (0,0) width 751: "The svg area contained in the div element (red box), should fill out the whole area (blue rectangle), especially after resizing the" + text run at (0,20) width 177: "content box to a different size" + RenderBlock {div} at (0,56) size 402x402 [border: (1px solid #FF0000)] + RenderSVGRoot {svg} at (9,73) size 400x400 + RenderPath {rect} at (9,73) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00 L400.00,0.00 L400.00,400.00 L0.00,400.00 Z"] + RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/custom/resource-invalidate-on-target-update-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/custom/resource-invalidate-on-target-update-expected.txt new file mode 100644 index 0000000..ea3d1f9 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/custom/resource-invalidate-on-target-update-expected.txt @@ -0,0 +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]]]} +KCanvasResource {id="mask" [type=MASKER]} +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x600 + RenderSVGRoot {svg} at (0,10) size 120x350 + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0 + 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"] + RenderSVGContainer {mask} at (0,0) size 1x1 + 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 120x350 + 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"] + 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 (0,240) size 120x120 [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"] diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/custom/text-clip-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/custom/text-clip-expected.txt new file mode 100644 index 0000000..3b1bcdd --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/svg/custom/text-clip-expected.txt @@ -0,0 +1,15 @@ +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,76) size 130x62 + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0 + 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) + RenderSVGInlineText {#text} at (0,-49) size 641x62 + 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/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index d586181..697a7a7 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -3079,3 +3079,6 @@ BUG_ATWILSON MAC LINUX : svg/dom/SVGScriptElement/script-load-and-error-events.s BUG_ATWILSON MAC WIN : svg/custom/js-repaint-rect-on-path-with-stroke.svg = IMAGE BUG_ATWILSON : svg/webarchive/svg-feimage-subresources.svg = IMAGE+TEXT BUG_ATWILSON MAC WIN : svg/W3C-SVG-1.1/filters-example-01-b.svg = IMAGE+TEXT + +BUG_ATWILSON WIN : storage/close-during-stress-test.html = CRASH PASS +BUG_ATWILSON WIN : storage/transaction-error-callback.html = CRASH PASS |