diff options
author | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 00:16:50 +0000 |
---|---|---|
committer | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 00:16:50 +0000 |
commit | c17c798ba2c45b9e3ad2eaa3c048d7ad7fda1e7b (patch) | |
tree | b0017712b77ec4904795de5d77b526659f8d9854 | |
parent | 8e14284ed88d453f7ae280f033fffe7bcd6d8450 (diff) | |
download | chromium_src-c17c798ba2c45b9e3ad2eaa3c048d7ad7fda1e7b.zip chromium_src-c17c798ba2c45b9e3ad2eaa3c048d7ad7fda1e7b.tar.gz chromium_src-c17c798ba2c45b9e3ad2eaa3c048d7ad7fda1e7b.tar.bz2 |
Rebaseline a few svg/batik tests. We are now passing them.
TBR=senorblanco
TEST=none
BUG=23468
BUG=10288
BUG=24198
Review URL: http://codereview.chromium.org/546057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36312 0039d316-1c4b-4281-b951-d872f2087c98
21 files changed, 708 insertions, 21 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textPosition-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textPosition-expected.checksum index e6cabc3..eee1dc7 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textPosition-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textPosition-expected.checksum @@ -1 +1 @@ -7b515b201d5a2e24b16d7dfc98263aad
\ No newline at end of file +a68fdc0668e27b8c250eb3d44dc9c20a
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textPosition-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textPosition-expected.png Binary files differindex 572ea04..f634c9f 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textPosition-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textPosition-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textPosition-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textPosition-expected.txt new file mode 100644 index 0000000..d076f43 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textPosition-expected.txt @@ -0,0 +1,110 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 450x500 + RenderSVGRoot {svg} at (50,15) size 2147483648.00x2147483648.00 + RenderSVGText {text} at (180,30) size 90x18 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 90x18 + chunk 1 (middle anchor) text run 1 at (180.00,30.00) startOffset 0 endOffset 13 width 90.00: "Text Position" + RenderSVGContainer {g} at (50,59) size 2147483648.00x2147483648.00 + RenderSVGText {text} at (50,80) size 53x27 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-21) size 53x27 + chunk 1 text run 1 at (50.00,80.00) startOffset 0 endOffset 5 width 53.00: "Batik" + RenderSVGText {text} at (50,100) size 103x13 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 103x13 + chunk 1 text run 1 at (50.00,100.00) startOffset 0 endOffset 21 width 103.00: "<text x=\"100\" y=\"80\">" + RenderSVGText {text} at (240,80) size 133x27 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-21) size 133x27 + chunk 1 text run 1 at (240.00,80.00) startOffset 0 endOffset 5 width 53.00: "Batik" + RenderSVGText {text} at (240,100) size 196x13 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 196x13 + chunk 1 text run 1 at (240.00,100.00) startOffset 0 endOffset 41 width 196.00: "<text x=\"240\" y=\"80\" letter-spacing=\"20\">" + RenderSVGText {text} at (50,140) size 92x27 contains 5 chunk(s) + RenderSVGInlineText {#text} at (0,-21) size 92x27 + chunk 1 text run 1 at (50.00,140.00) startOffset 0 endOffset 1 width 16.00: "B" + chunk 2 text run 1 at (70.00,140.00) startOffset 1 endOffset 2 width 13.00: "a" + chunk 3 text run 1 at (90.00,140.00) startOffset 2 endOffset 3 width 7.00: "t" + chunk 4 text run 1 at (110.00,140.00) startOffset 3 endOffset 4 width 5.00: "i" + chunk 5 text run 1 at (130.00,140.00) startOffset 4 endOffset 5 width 12.00: "k" + RenderSVGText {text} at (50,160) size 175x13 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 175x13 + chunk 1 text run 1 at (50.00,160.00) startOffset 0 endOffset 35 width 175.00: "<text x=\"50 70 90 110 130\" y=\"140\">" + RenderSVGText {text} at (240,140) size 133x27 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-21) size 133x27 + chunk 1 text run 1 at (240.00,140.00) startOffset 0 endOffset 5 width 53.00: "Batik" + RenderSVGText {text} at (240,160) size 175x13 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 175x13 + chunk 1 text run 1 at (240.00,160.00) startOffset 0 endOffset 35 width 175.00: "<text dx=\"240 20 20 20 20\" y=\"140\">" + RenderSVGText {text} at (50,200) size 53x27 contains 1 chunk(s) + RenderSVGTSpan {tspan} at (0,0) size 53x27 + RenderSVGInlineText {#text} at (0,-21) size 53x27 + chunk 1 text run 1 at (50.00,200.00) startOffset 0 endOffset 5 width 53.00: "Batik" + RenderSVGText {text} at (50,220) size 111x13 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 111x13 + chunk 1 text run 1 at (50.00,220.00) startOffset 0 endOffset 22 width 111.00: "<tspan x=\"50\" y=\"200\">" + RenderSVGText {text} at (240,200) size 133x27 contains 1 chunk(s) + RenderSVGTSpan {tspan} at (0,0) size 133x27 + RenderSVGInlineText {#text} at (0,-21) size 133x27 + chunk 1 text run 1 at (240.00,200.00) startOffset 0 endOffset 5 width 53.00: "Batik" + RenderSVGText {text} at (240,220) size 210x13 contains 1 chunk(s) + RenderSVGTSpan {tspan} at (0,0) size 210x13 + RenderSVGInlineText {#text} at (0,-10) size 210x13 + chunk 1 text run 1 at (240.00,220.00) startOffset 0 endOffset 43 width 210.00: "<tspan x=\"240\" y=\"200\" letter-spacing=\"20\">" + RenderSVGText {text} at (50,260) size 92x27 contains 5 chunk(s) + RenderSVGTSpan {tspan} at (0,0) size 92x27 + RenderSVGInlineText {#text} at (0,-21) size 92x27 + chunk 1 text run 1 at (50.00,260.00) startOffset 0 endOffset 1 width 16.00: "B" + chunk 2 text run 1 at (70.00,260.00) startOffset 1 endOffset 2 width 13.00: "a" + chunk 3 text run 1 at (90.00,260.00) startOffset 2 endOffset 3 width 7.00: "t" + chunk 4 text run 1 at (110.00,260.00) startOffset 3 endOffset 4 width 5.00: "i" + chunk 5 text run 1 at (130.00,260.00) startOffset 4 endOffset 5 width 12.00: "k" + RenderSVGText {text} at (50,280) size 183x13 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 183x13 + chunk 1 text run 1 at (50.00,280.00) startOffset 0 endOffset 36 width 183.00: "<tspan x=\"50 70 90 110 130\" y=\"260\">" + RenderSVGText {text} at (240,260) size 133x27 contains 1 chunk(s) + RenderSVGTSpan {tspan} at (0,0) size 133x27 + RenderSVGInlineText {#text} at (0,-21) size 133x27 + chunk 1 text run 1 at (240.00,260.00) startOffset 0 endOffset 5 width 53.00: "Batik" + RenderSVGText {text} at (240,280) size 183x13 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 183x13 + chunk 1 text run 1 at (240.00,280.00) startOffset 0 endOffset 36 width 183.00: "<tspan dx=\"240 20 20 20 20\" y=\"260\">" + RenderSVGText {text} at (50,320) size 92x27 contains 5 chunk(s) + RenderSVGTSpan {tspan} at (0,0) size 92x27 + RenderSVGInlineText {#text} at (0,-21) size 92x27 + chunk 1 text run 1 at (50.00,320.00) startOffset 0 endOffset 1 width 16.00: "B" + chunk 2 text run 1 at (70.00,320.00) startOffset 1 endOffset 2 width 13.00: "a" + chunk 3 text run 1 at (90.00,320.00) startOffset 2 endOffset 3 width 7.00: "t" + chunk 4 text run 1 at (110.00,320.00) startOffset 3 endOffset 4 width 5.00: "i" + chunk 5 text run 1 at (130.00,320.00) startOffset 4 endOffset 5 width 12.00: "k" + RenderSVGText {text} at (50,340) size 170x24 contains 2 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 128x13 + chunk 1 text run 1 at (50.00,340.00) startOffset 0 endOffset 26 width 128.00: "<tspan x=\"50 60 70 80 90\" " + RenderSVGTSpan {tspan} at (0,0) size 137x13 + RenderSVGInlineText {#text} at (33,1) size 137x13 + chunk 2 text run 1 at (83.00,351.00) startOffset 0 endOffset 27 width 137.00: "dx=\"0 10 20 30 40\" y=\"320\">" + RenderSVGText {text} at (240,320) size 133x27 contains 1 chunk(s) + RenderSVGTSpan {tspan} at (0,0) size 133x27 + RenderSVGInlineText {#text} at (0,-21) size 133x27 + chunk 1 text run 1 at (240.00,320.00) startOffset 0 endOffset 5 width 53.00: "Batik" + RenderSVGText {text} at (240,340) size 193x24 contains 2 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 168x13 + chunk 1 text run 1 at (240.00,340.00) startOffset 0 endOffset 34 width 168.00: "<tspan x=\"240\" dx=\"0 10 10 10 10\" " + RenderSVGTSpan {tspan} at (0,0) size 160x13 + RenderSVGInlineText {#text} at (33,1) size 160x13 + chunk 2 text run 1 at (273.00,351.00) startOffset 0 endOffset 34 width 160.00: "y=\"320\" style=\"letter-spacing:10\">" + RenderSVGText {text} at (50,380) size 93x27 contains 1 chunk(s) + RenderSVGTSpan {tspan} at (0,0) size 93x27 + RenderSVGInlineText {#text} at (0,-21) size 93x27 + chunk 1 text run 1 at (50.00,380.00) startOffset 0 endOffset 5 width 53.00: "Batik" + RenderSVGTSpan {tspan} at (0,0) size 1x1 + RenderSVGText {text} at (50,400) size 98x13 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 98x13 + chunk 1 text run 1 at (50.00,400.00) startOffset 0 endOffset 20 width 98.00: "Empty Trailing tspan" + RenderSVGText {text} at (240,380) size 133x27 contains 1 chunk(s) + RenderSVGTSpan {tspan} at (0,0) size 0x0 + RenderSVGTSpan {tspan} at (0,0) size 133x27 + RenderSVGInlineText {#text} at (0,-21) size 133x27 + chunk 1 text run 1 at (240.00,380.00) startOffset 0 endOffset 5 width 53.00: "Batik" + RenderSVGText {text} at (240,400) size 116x13 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 116x13 + chunk 1 text run 1 at (240.00,400.00) startOffset 0 endOffset 22 width 116.00: "Empty Preceeding tspan" + RenderSVGContainer {use} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalText-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalText-expected.checksum new file mode 100644 index 0000000..d201ee2 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalText-expected.checksum @@ -0,0 +1 @@ +0359938ee6e7e28f7b3052a3c201c3ed
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalText-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalText-expected.png Binary files differnew file mode 100644 index 0000000..a032a23 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalText-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalTextOnPath-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalTextOnPath-expected.checksum index b5f20bc..e2b156c 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalTextOnPath-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalTextOnPath-expected.checksum @@ -1 +1 @@ -86294c299bb89296d0b226d3f3bcffbc
\ No newline at end of file +f89f4ae2f3724438382f999fe8bad416
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalTextOnPath-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalTextOnPath-expected.png Binary files differindex e2b880c..ed2d888 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalTextOnPath-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalTextOnPath-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalTextOnPath-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalTextOnPath-expected.txt new file mode 100644 index 0000000..99b25a5 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/verticalTextOnPath-expected.txt @@ -0,0 +1,291 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 450x500 + RenderSVGRoot {svg} at (0,25) size 447x457 + RenderSVGContainer {g} at (0,25) size 447x457 + RenderSVGText {text} at (136,40) size 178x18 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 178x18 + chunk 1 (middle anchor) text run 1 at (136.00,40.00) startOffset 0 endOffset 28 width 178.00: "Vertical text on a path test" + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderPath {path} at (14.95,0) size 120.05x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderPath {path} at (29.85,0) size 90.30x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGContainer {g} at (11,59) size 124x93 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,70.00)}] + RenderSVGContainer {use} at (14.89,70) size 120.11x45 + RenderSVGContainer {g} at (14.89,70) size 120.11x45 + RenderPath {path} at (14.89,70) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (18,8) size 83x56 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 83x56 + RenderSVGInlineText {#text} at (-7,-8) size 36x33 + chunk 1 (vertical) text run 1 at (18.19,11.43) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 23x20 + RenderSVGInlineText {#text} at (19,-19) size 23x20 + chunk 1 (vertical) text run 2 at (42.24,8.97) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 42x42 + RenderSVGInlineText {#text} at (34,-5) size 42x42 + chunk 1 (vertical) text run 3 at (54.36,10.72) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 66x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 66x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 66.00: "startOffset=\"0%\"" + RenderSVGText {text} at (35,70) size 75x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 75x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\"" + RenderSVGText {text} at (35,80) size 100x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 100x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\"" + RenderSVGContainer {g} at (150,70) size 137x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,70.00)}] + RenderSVGContainer {use} at (164.89,70) size 120.11x45 + RenderSVGContainer {g} at (164.89,70) size 120.11x45 + RenderPath {path} at (164.89,70) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (21,9) size 116x39 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 116x39 + RenderSVGInlineText {#text} at (-21,-9) size 0x0 + chunk 1 (middle anchor, vertical) text run 1 at (340282346638528859811704183484516925440.00,340282346638528859811704183484516925440.00) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 0x0 + RenderSVGInlineText {#text} at (-21,-9) size 0x0 + chunk 1 (middle anchor, vertical) text run 2 at (340282346638528859811704183484516925440.00,340282346638528859811704183484516925440.00) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 103x34 + RenderSVGInlineText {#text} at (-8,-4) size 103x34 + chunk 1 (middle anchor, vertical) text run 3 at (21.05,9.15) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 66x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 66x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 66.00: "startOffset=\"0%\"" + RenderSVGText {text} at (35,70) size 86x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 86x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\"" + RenderSVGText {text} at (35,80) size 102x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 102x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 24 width 102.00: "glyph-orientation=\"0deg\"" + RenderSVGContainer {g} at (300,70) size 147x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,70.00)}] + RenderSVGContainer {use} at (314.89,70) size 120.11x45 + RenderSVGContainer {g} at (314.89,70) size 120.11x45 + RenderPath {path} at (314.89,70) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (23,10) size 75x31 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 75x31 + RenderSVGInlineText {#text} at (-23,-10) size 0x0 + chunk 1 (end anchor, vertical) text run 1 at (340282346638528859811704183484516925440.00,340282346638528859811704183484516925440.00) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 0x0 + RenderSVGInlineText {#text} at (-23,-10) size 0x0 + chunk 1 (end anchor, vertical) text run 2 at (340282346638528859811704183484516925440.00,340282346638528859811704183484516925440.00) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 61x27 + RenderSVGInlineText {#text} at (-9,-6) size 61x27 + chunk 1 (end anchor, vertical) text run 3 at (23.40,10.16) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 71x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 71x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 71.00: "startOffset=\"50%\"" + RenderSVGText {text} at (35,70) size 72x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 72x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\"" + RenderSVGText {text} at (35,80) size 112x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 112x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 26 width 112.00: "glyph-orientation=\"180deg\"" + RenderSVGContainer {g} at (14.89,170) size 132.11x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,170.00)}] + RenderSVGContainer {use} at (14.89,170) size 120.11x45 + RenderSVGContainer {g} at (14.89,170) size 120.11x45 + RenderPath {path} at (14.89,170) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (75,16) size 69x41 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 69x41 + RenderSVGInlineText {#text} at (-5,6) size 38x25 + chunk 1 (vertical) text run 1 at (75.93,29.60) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 23x23 + RenderSVGInlineText {#text} at (16,-8) size 23x23 + chunk 1 (vertical) text run 2 at (103.18,26.92) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 30x24 + RenderSVGInlineText {#text} at (34,-10) size 30x24 + chunk 1 (vertical) text run 3 at (112.64,16.06) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 71x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 71x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 71.00: "startOffset=\"50%\"" + RenderSVGText {text} at (35,70) size 75x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 75x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\"" + RenderSVGText {text} at (35,80) size 112x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 112x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 26 width 112.00: "glyph-orientation=\"270deg\"" + RenderSVGContainer {g} at (164.89,164) size 122.11x88 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,170.00)}] + RenderSVGContainer {use} at (164.89,170) size 120.11x45 + RenderSVGContainer {g} at (164.89,170) size 120.11x45 + RenderPath {path} at (164.89,170) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (23,10) size 119x48 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 119x48 + RenderSVGInlineText {#text} at (-8,-5) size 31x25 + chunk 1 (middle anchor, vertical) text run 1 at (23.40,11.56) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 34x29 + RenderSVGInlineText {#text} at (25,-16) size 34x29 + chunk 1 (middle anchor, vertical) text run 2 at (53.23,10.16) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 64x32 + RenderSVGInlineText {#text} at (47,0) size 64x32 + chunk 1 (middle anchor, vertical) text run 3 at (79.22,17.60) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 71x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 71x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 71.00: "startOffset=\"50%\"" + RenderSVGText {text} at (35,70) size 86x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 86x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\"" + RenderSVGText {text} at (35,80) size 102x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 102x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 24 width 102.00: "glyph-orientation=\"0deg\"" + RenderSVGContainer {g} at (314.89,170) size 127.11x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,170.00)}] + RenderSVGContainer {use} at (314.89,170) size 120.11x45 + RenderSVGContainer {g} at (314.89,170) size 120.11x45 + RenderPath {path} at (314.89,170) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (56,12) size 82x41 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 82x41 + RenderSVGInlineText {#text} at (-5,-8) size 35x35 + chunk 1 (end anchor, vertical) text run 1 at (56.88,12.30) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 19x20 + RenderSVGInlineText {#text} at (24,4) size 19x20 + chunk 1 (end anchor, vertical) text run 2 at (79.42,32.01) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 41x38 + RenderSVGInlineText {#text} at (36,-5) size 41x38 + chunk 1 (end anchor, vertical) text run 3 at (91.05,18.27) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 76x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 76x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 18 width 76.00: "startOffset=\"100%\"" + RenderSVGText {text} at (35,70) size 72x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 72x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\"" + RenderSVGText {text} at (35,80) size 107x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 107x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 25 width 107.00: "glyph-orientation=\"90deg\"" + RenderSVGContainer {g} at (0,270) size 147x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,270.00)}] + RenderSVGContainer {use} at (14.89,270) size 120.11x45 + RenderSVGContainer {g} at (14.89,270) size 120.11x45 + RenderPath {path} at (14.89,270) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (51,9) size 127x39 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 127x39 + RenderSVGInlineText {#text} at (-10,-7) size 75x37 + chunk 1 (vertical) text run 1 at (51.13,9.40) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 19x14 + RenderSVGInlineText {#text} at (57,-7) size 19x14 + chunk 1 (vertical) text run 2 at (121.54,18.46) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 0x0 + RenderSVGInlineText {#text} at (-51,-9) size 0x0 + chunk 1 (vertical) text run 3 at (340282346638528859811704183484516925440.00,340282346638528859811704183484516925440.00) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 63x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 63x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 63.00: "startOffset=\"35\"" + RenderSVGText {text} at (35,70) size 75x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 75x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\"" + RenderSVGText {text} at (35,80) size 112x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 112x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 26 width 112.00: "glyph-orientation=\"180deg\"" + RenderSVGContainer {g} at (164,262) size 121x80 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,270.00)}] + RenderSVGContainer {use} at (164.89,270) size 120.11x45 + RenderSVGContainer {g} at (164.89,270) size 120.11x45 + RenderPath {path} at (164.89,270) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (19,8) size 69x46 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 69x46 + RenderSVGInlineText {#text} at (-5,1) size 23x23 + chunk 1 (middle anchor, vertical) text run 1 at (19.26,19.27) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 24x23 + RenderSVGInlineText {#text} at (0,-16) size 24x23 + chunk 1 (middle anchor, vertical) text run 2 at (30.43,11.91) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 43x38 + RenderSVGInlineText {#text} at (21,-8) size 43x38 + chunk 1 (middle anchor, vertical) text run 3 at (41.28,8.79) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 63x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 63x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 63.00: "startOffset=\"35\"" + RenderSVGText {text} at (35,70) size 86x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 86x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\"" + RenderSVGContainer {g} at (300,270) size 142x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,270.00)}] + RenderSVGContainer {use} at (314.89,270) size 120.11x45 + RenderSVGContainer {g} at (314.89,270) size 120.11x45 + RenderPath {path} at (314.89,270) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (16,15) size 42x35 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 42x35 + RenderSVGInlineText {#text} at (-16,-15) size 0x0 + chunk 1 (end anchor, vertical) text run 1 at (340282346638528859811704183484516925440.00,340282346638528859811704183484516925440.00) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 0x0 + RenderSVGInlineText {#text} at (-16,-15) size 0x0 + chunk 1 (end anchor, vertical) text run 2 at (340282346638528859811704183484516925440.00,340282346638528859811704183484516925440.00) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 32x32 + RenderSVGInlineText {#text} at (-6,-12) size 32x32 + chunk 1 (end anchor, vertical) text run 3 at (16.77,15.48) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 63x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 63x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 63.00: "startOffset=\"35\"" + RenderSVGText {text} at (35,70) size 72x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 72x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\"" + RenderSVGText {text} at (35,80) size 107x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 107x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 25 width 107.00: "glyph-orientation=\"90deg\"" + RenderSVGContainer {g} at (22,370) size 117x87 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,370.00)}] + RenderSVGContainer {use} at (39.70,370) size 90.60x50 + RenderSVGContainer {g} at (39.70,370) size 90.60x50 + RenderPath {path} at (39.70,370) size 90.60x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,12) size 117x43 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 117x43 + RenderSVGTSpan {tspan} at (0,0) size 35x40 + RenderSVGInlineText {#text} at (-18,-6) size 35x40 + chunk 1 (vertical) text run 1 at (30.11,23.88) startOffset 0 endOffset 5 height 85.00: "super" + RenderSVGInlineText {#text} at (11,-9) size 35x24 + chunk 1 (vertical) text run 2 at (45.13,12.86) startOffset 0 endOffset 5 height 85.00: " and " + RenderSVGTSpan {tspan} at (0,0) size 21x21 + RenderSVGInlineText {#text} at (44,-1) size 21x21 + chunk 1 (vertical) text run 3 at (73.44,12.52) startOffset 0 endOffset 3 height 51.00: "sub" + RenderSVGInlineText {#text} at (61,-5) size 38x39 + chunk 1 (vertical) text run 4 at (93.14,15.35) startOffset 0 endOffset 7 height 119.00: "scripts" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (20,65) size 87x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 87x12 + chunk 1 text run 1 at (20.00,65.00) startOffset 0 endOffset 22 width 87.00: "baseline-shift=\"super\"" + RenderSVGText {text} at (20,75) size 97x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 97x12 + chunk 1 text run 1 at (20.00,75.00) startOffset 0 endOffset 24 width 97.00: "and baseline-shift=\"sub\"" + RenderSVGText {text} at (20,85) size 100x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 100x12 + chunk 1 text run 1 at (20.00,85.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\"" + RenderSVGContainer {g} at (318,370) size 109x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,370.00)}] + RenderSVGContainer {use} at (329.70,370) size 90.60x50 + RenderSVGContainer {g} at (329.70,370) size 90.60x50 + RenderPath {path} at (329.70,370) size 90.60x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,12) size 109x46 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 109x46 + RenderSVGTSpan {tspan} at (0,0) size 42x44 + RenderSVGInlineText {#text} at (-12,-9) size 42x44 + chunk 1 (vertical) text run 1 at (30.15,17.84) startOffset 0 endOffset 8 height 136.00: "positive" + RenderSVGInlineText {#text} at (24,-9) size 34x20 + chunk 1 (vertical) text run 2 at (55.81,12.50) startOffset 0 endOffset 5 height 85.00: " and " + RenderSVGTSpan {tspan} at (0,0) size 43x42 + RenderSVGInlineText {#text} at (54,-5) size 43x42 + chunk 1 (vertical) text run 3 at (85.88,13.49) startOffset 0 endOffset 8 height 136.00: "negative" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (20,65) size 96x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 96x12 + chunk 1 text run 1 at (20.00,65.00) startOffset 0 endOffset 23 width 96.00: "baseline-shift=\"+/-20%\"" + RenderSVGText {text} at (20,75) size 100x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 100x12 + chunk 1 text run 1 at (20.00,75.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\"" + RenderSVGContainer {g} at (179.25,358.75) size 100.75x123.25 [transform={m=((1.00,0.00)(0.00,1.00)) t=(180.00,370.00)}] + RenderSVGContainer {g} at (179.25,358.75) size 90.98x87 [transform={m=((0.75,0.00)(0.00,0.75)) t=(0.00,0.00)}] + RenderSVGContainer {use} at (202.27,370) size 67.95x37.50 + RenderSVGContainer {g} at (202.27,370) size 67.95x37.50 + RenderPath {path} at (202.27,370) size 67.95x37.50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (-12,-15) size 89x116 contains 1 chunk(s) + RenderSVGInlineText {#text} at (11,0) size 23x94 + chunk 1 (vertical) text run 1 at (-12.00,-15.00) startOffset 0 endOffset 12 height 264.00: "before path " + RenderSVGTextPath {textPath} at (0,0) size 62x38 + RenderSVGInlineText {#text} at (35,15) size 62x38 + chunk 1 (vertical) text run 2 at (34.39,12.50) startOffset 0 endOffset 7 height 154.00: "on path" + RenderSVGInlineText {#text} at (77,41) size 23x75 + chunk 1 (vertical) text run 3 at (53.06,26.50) startOffset 0 endOffset 10 height 220.00: "after path" + RenderSVGText {text} at (0,100) size 96x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 96x12 + chunk 1 text run 1 at (0.00,100.00) startOffset 0 endOffset 26 width 96.00: "text before/after textPath" + RenderSVGText {text} at (0,110) size 100x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 100x12 + chunk 1 text run 1 at (0.00,110.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\"" + RenderSVGContainer {use} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/xmlSpace-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/xmlSpace-expected.checksum index af477b7..9c0c17a 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/xmlSpace-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/xmlSpace-expected.checksum @@ -1 +1 @@ -46e2bd4211c7ceb910f99dc31b9bab4b
\ No newline at end of file +c8a5d3d38840e2cca812a9b9dcfb7fea
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/xmlSpace-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/xmlSpace-expected.png Binary files differindex 89d702f..22f4db7 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/xmlSpace-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/xmlSpace-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textPosition-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textPosition-expected.checksum index 588b053..cba4e37 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textPosition-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textPosition-expected.checksum @@ -1 +1 @@ -318fab6d4a756ed3900b11df484cf23a
\ No newline at end of file +e14dc2485fdfb6228d0c494e68c24377
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textPosition-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textPosition-expected.png Binary files differindex bf92412..6e5b059 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textPosition-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textPosition-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalText-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalText-expected.checksum index 1f17acb..55e4258 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalText-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalText-expected.checksum @@ -1 +1 @@ -78912127c08408706115f4f2c977ca2f
\ No newline at end of file +eb4bd2c40944f048c463163fd30a26fa
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalText-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalText-expected.png Binary files differindex 1a11c51..6ec013d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalText-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalText-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalText-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalText-expected.txt index b0b8f42..8d930c1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalText-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalText-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 layer at (0,0) size 450x500 - RenderSVGRoot {svg} at (20,25) size 410x466 + RenderSVGRoot {svg} at (20,25) size 410x470 RenderSVGHiddenContainer {defs} at (0,0) size 0x0 - RenderPath {path} at (14.95,8.71) size 315.11x27.58 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,0.00,1000.00,100.00 C1100.00,200.00,1200.00,300.00,1300.00,200.00 C1400.00,100.00,1500.00,0.00,1600.00,100.00 C1700.00,200.00,1800.00,300.00,1900.00,200.00 C2000.00,100.00,2100.00,0.00,2200.00,100.00"] - RenderSVGContainer {g} at (20,25) size 410x466 + RenderPath {path} at (14.95,0) size 315.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,0.00,1000.00,100.00 C1100.00,200.00,1200.00,300.00,1300.00,200.00 C1400.00,100.00,1500.00,0.00,1600.00,100.00 C1700.00,200.00,1800.00,300.00,1900.00,200.00 C2000.00,100.00,2100.00,0.00,2200.00,100.00"] + RenderSVGContainer {g} at (20,25) size 410x470 RenderSVGText {text} at (165,40) size 120x18 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 120x18 chunk 1 (middle anchor) text run 1 at (165.00,40.00) startOffset 0 endOffset 18 width 120.00: "Vertical Text Test" @@ -42,7 +42,7 @@ layer at (0,0) size 450x500 RenderSVGInlineText {#text} at (-8,-13) size 16x391 chunk 1 (vertical) text run 1 at (250.00,88.00) startOffset 0 endOffset 23 height 391.00: "Glyph Orientation:180\x{753B}\x{50CF}" RenderSVGText {text} at (317,79) size 17x157 contains 1 chunk(s) - RenderSVGInlineText {#text} at (-26,0) size 26x157 + RenderSVGInlineText {#text} at (-26,0) size 17x157 chunk 1 (vertical) text run 1 at (317.00,79.00) startOffset 0 endOffset 23 height 391.00: "Glyph Orientation:270\x{753B}\x{50CF}" RenderSVGText {text} at (333,79) size 17x163 contains 1 chunk(s) RenderSVGInlineText {#text} at (9,0) size 17x66 @@ -60,10 +60,10 @@ layer at (0,0) size 450x500 chunk 1 (vertical) text run 2 at (396.50,154.00) startOffset 0 endOffset 10 height 170.00: "orientated" RenderSVGInlineText {#text} at (9,236) size 17x50 chunk 1 (vertical) text run 3 at (383.00,315.00) startOffset 0 endOffset 8 height 136.00: " element" - RenderSVGContainer {g} at (52,451) size 318.11x40 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,450.00)}] - RenderSVGContainer {use} at (54.89,458.64) size 315.21x27.73 - RenderSVGContainer {g} at (54.89,458.64) size 315.21x27.73 - RenderPath {path} at (54.89,458.64) size 315.21x27.73 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,0.00,1000.00,100.00 C1100.00,200.00,1200.00,300.00,1300.00,200.00 C1400.00,100.00,1500.00,0.00,1600.00,100.00 C1700.00,200.00,1800.00,300.00,1900.00,200.00 C2000.00,100.00,2100.00,0.00,2200.00,100.00"] + RenderSVGContainer {g} at (52,450) size 318.11x45 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,450.00)}] + RenderSVGContainer {use} at (54.89,450) size 315.21x45 + RenderSVGContainer {g} at (54.89,450) size 315.21x45 + RenderPath {path} at (54.89,450) size 315.21x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,0.00,1000.00,100.00 C1100.00,200.00,1200.00,300.00,1300.00,200.00 C1400.00,100.00,1500.00,0.00,1600.00,100.00 C1700.00,200.00,1800.00,300.00,1900.00,200.00 C2000.00,100.00,2100.00,0.00,2200.00,100.00"] RenderSVGText {text} at (20,8) size 318x40 contains 1 chunk(s) RenderSVGTextPath {textPath} at (0,0) size 318x40 RenderSVGInlineText {#text} at (-8,-7) size 318x40 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalTextOnPath-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalTextOnPath-expected.checksum new file mode 100644 index 0000000..48c8b6a --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalTextOnPath-expected.checksum @@ -0,0 +1 @@ +fc747eadba5644d3a898b786e1dfab93
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalTextOnPath-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalTextOnPath-expected.png Binary files differnew file mode 100644 index 0000000..d63aaa6 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalTextOnPath-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalTextOnPath-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalTextOnPath-expected.txt new file mode 100644 index 0000000..aead8f7 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/verticalTextOnPath-expected.txt @@ -0,0 +1,291 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 450x500 + RenderSVGRoot {svg} at (0,25) size 447x457 + RenderSVGContainer {g} at (0,25) size 447x457 + RenderSVGText {text} at (136,40) size 178x18 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) size 178x18 + chunk 1 (middle anchor) text run 1 at (136.00,40.00) startOffset 0 endOffset 28 width 178.00: "Vertical text on a path test" + RenderSVGHiddenContainer {defs} at (0,0) size 0x0 + RenderPath {path} at (14.95,0) size 120.05x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderPath {path} at (29.85,0) size 90.30x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGContainer {g} at (11,59) size 124x93 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,70.00)}] + RenderSVGContainer {use} at (14.89,70) size 120.11x45 + RenderSVGContainer {g} at (14.89,70) size 120.11x45 + RenderPath {path} at (14.89,70) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (18,8) size 83x56 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 83x56 + RenderSVGInlineText {#text} at (-7,-8) size 36x33 + chunk 1 (vertical) text run 1 at (18.19,11.43) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 23x20 + RenderSVGInlineText {#text} at (19,-19) size 23x20 + chunk 1 (vertical) text run 2 at (42.24,8.97) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 42x42 + RenderSVGInlineText {#text} at (34,-5) size 42x42 + chunk 1 (vertical) text run 3 at (54.36,10.72) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 66x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 66x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 66.00: "startOffset=\"0%\"" + RenderSVGText {text} at (35,70) size 75x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 75x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\"" + RenderSVGText {text} at (35,80) size 100x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 100x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\"" + RenderSVGContainer {g} at (150,70) size 137x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,70.00)}] + RenderSVGContainer {use} at (164.89,70) size 120.11x45 + RenderSVGContainer {g} at (164.89,70) size 120.11x45 + RenderPath {path} at (164.89,70) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (21,9) size 116x39 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 116x39 + RenderSVGInlineText {#text} at (-21,-9) size 0x0 + chunk 1 (middle anchor, vertical) text run 1 at (340282346638528860000000000000000000000.00,340282346638528860000000000000000000000.00) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 0x0 + RenderSVGInlineText {#text} at (-21,-9) size 0x0 + chunk 1 (middle anchor, vertical) text run 2 at (340282346638528860000000000000000000000.00,340282346638528860000000000000000000000.00) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 103x34 + RenderSVGInlineText {#text} at (-8,-4) size 103x34 + chunk 1 (middle anchor, vertical) text run 3 at (21.05,9.15) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 66x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 66x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 66.00: "startOffset=\"0%\"" + RenderSVGText {text} at (35,70) size 86x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 86x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\"" + RenderSVGText {text} at (35,80) size 102x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 102x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 24 width 102.00: "glyph-orientation=\"0deg\"" + RenderSVGContainer {g} at (300,70) size 147x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,70.00)}] + RenderSVGContainer {use} at (314.89,70) size 120.11x45 + RenderSVGContainer {g} at (314.89,70) size 120.11x45 + RenderPath {path} at (314.89,70) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (23,10) size 75x31 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 75x31 + RenderSVGInlineText {#text} at (-23,-10) size 0x0 + chunk 1 (end anchor, vertical) text run 1 at (340282346638528860000000000000000000000.00,340282346638528860000000000000000000000.00) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 0x0 + RenderSVGInlineText {#text} at (-23,-10) size 0x0 + chunk 1 (end anchor, vertical) text run 2 at (340282346638528860000000000000000000000.00,340282346638528860000000000000000000000.00) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 61x27 + RenderSVGInlineText {#text} at (-9,-6) size 61x27 + chunk 1 (end anchor, vertical) text run 3 at (23.40,10.16) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 71x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 71x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 71.00: "startOffset=\"50%\"" + RenderSVGText {text} at (35,70) size 72x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 72x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\"" + RenderSVGText {text} at (35,80) size 112x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 112x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 26 width 112.00: "glyph-orientation=\"180deg\"" + RenderSVGContainer {g} at (14.89,170) size 132.11x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,170.00)}] + RenderSVGContainer {use} at (14.89,170) size 120.11x45 + RenderSVGContainer {g} at (14.89,170) size 120.11x45 + RenderPath {path} at (14.89,170) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (75,16) size 69x41 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 69x41 + RenderSVGInlineText {#text} at (-5,6) size 38x25 + chunk 1 (vertical) text run 1 at (75.93,29.60) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 23x23 + RenderSVGInlineText {#text} at (16,-8) size 23x23 + chunk 1 (vertical) text run 2 at (103.18,26.92) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 30x24 + RenderSVGInlineText {#text} at (34,-10) size 30x24 + chunk 1 (vertical) text run 3 at (112.64,16.06) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 71x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 71x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 71.00: "startOffset=\"50%\"" + RenderSVGText {text} at (35,70) size 75x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 75x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\"" + RenderSVGText {text} at (35,80) size 112x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 112x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 26 width 112.00: "glyph-orientation=\"270deg\"" + RenderSVGContainer {g} at (164.89,164) size 122.11x88 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,170.00)}] + RenderSVGContainer {use} at (164.89,170) size 120.11x45 + RenderSVGContainer {g} at (164.89,170) size 120.11x45 + RenderPath {path} at (164.89,170) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (23,10) size 119x48 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 119x48 + RenderSVGInlineText {#text} at (-8,-5) size 31x25 + chunk 1 (middle anchor, vertical) text run 1 at (23.40,11.56) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 34x29 + RenderSVGInlineText {#text} at (25,-16) size 34x29 + chunk 1 (middle anchor, vertical) text run 2 at (53.23,10.16) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 64x32 + RenderSVGInlineText {#text} at (47,0) size 64x32 + chunk 1 (middle anchor, vertical) text run 3 at (79.22,17.60) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 71x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 71x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 71.00: "startOffset=\"50%\"" + RenderSVGText {text} at (35,70) size 86x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 86x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\"" + RenderSVGText {text} at (35,80) size 102x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 102x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 24 width 102.00: "glyph-orientation=\"0deg\"" + RenderSVGContainer {g} at (314.89,170) size 127.11x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,170.00)}] + RenderSVGContainer {use} at (314.89,170) size 120.11x45 + RenderSVGContainer {g} at (314.89,170) size 120.11x45 + RenderPath {path} at (314.89,170) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (56,12) size 82x41 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 82x41 + RenderSVGInlineText {#text} at (-5,-8) size 35x35 + chunk 1 (end anchor, vertical) text run 1 at (56.88,12.30) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 19x20 + RenderSVGInlineText {#text} at (24,4) size 19x20 + chunk 1 (end anchor, vertical) text run 2 at (79.42,32.01) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 41x38 + RenderSVGInlineText {#text} at (36,-5) size 41x38 + chunk 1 (end anchor, vertical) text run 3 at (91.05,18.27) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 76x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 76x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 18 width 76.00: "startOffset=\"100%\"" + RenderSVGText {text} at (35,70) size 72x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 72x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\"" + RenderSVGText {text} at (35,80) size 107x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 107x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 25 width 107.00: "glyph-orientation=\"90deg\"" + RenderSVGContainer {g} at (0,270) size 147x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,270.00)}] + RenderSVGContainer {use} at (14.89,270) size 120.11x45 + RenderSVGContainer {g} at (14.89,270) size 120.11x45 + RenderPath {path} at (14.89,270) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (51,9) size 127x39 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 127x39 + RenderSVGInlineText {#text} at (-10,-7) size 75x37 + chunk 1 (vertical) text run 1 at (51.13,9.40) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 19x14 + RenderSVGInlineText {#text} at (57,-7) size 19x14 + chunk 1 (vertical) text run 2 at (121.54,18.46) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 0x0 + RenderSVGInlineText {#text} at (-51,-9) size 0x0 + chunk 1 (vertical) text run 3 at (340282346638528860000000000000000000000.00,340282346638528860000000000000000000000.00) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 63x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 63x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 63.00: "startOffset=\"35\"" + RenderSVGText {text} at (35,70) size 75x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 75x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\"" + RenderSVGText {text} at (35,80) size 112x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 112x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 26 width 112.00: "glyph-orientation=\"180deg\"" + RenderSVGContainer {g} at (164,262) size 121x80 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,270.00)}] + RenderSVGContainer {use} at (164.89,270) size 120.11x45 + RenderSVGContainer {g} at (164.89,270) size 120.11x45 + RenderPath {path} at (164.89,270) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (19,8) size 69x46 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 69x46 + RenderSVGInlineText {#text} at (-5,1) size 23x23 + chunk 1 (middle anchor, vertical) text run 1 at (19.26,19.27) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 24x23 + RenderSVGInlineText {#text} at (0,-16) size 24x23 + chunk 1 (middle anchor, vertical) text run 2 at (30.43,11.91) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 43x38 + RenderSVGInlineText {#text} at (21,-8) size 43x38 + chunk 1 (middle anchor, vertical) text run 3 at (41.28,8.79) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 63x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 63x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 63.00: "startOffset=\"35\"" + RenderSVGText {text} at (35,70) size 86x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 86x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\"" + RenderSVGContainer {g} at (300,270) size 142x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,270.00)}] + RenderSVGContainer {use} at (314.89,270) size 120.11x45 + RenderSVGContainer {g} at (314.89,270) size 120.11x45 + RenderPath {path} at (314.89,270) size 120.11x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (16,15) size 42x35 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 42x35 + RenderSVGInlineText {#text} at (-16,-15) size 0x0 + chunk 1 (end anchor, vertical) text run 1 at (340282346638528860000000000000000000000.00,340282346638528860000000000000000000000.00) startOffset 0 endOffset 5 height 85.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 0x0 + RenderSVGInlineText {#text} at (-16,-15) size 0x0 + chunk 1 (end anchor, vertical) text run 2 at (340282346638528860000000000000000000000.00,340282346638528860000000000000000000000.00) startOffset 0 endOffset 2 height 34.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 32x32 + RenderSVGInlineText {#text} at (-6,-12) size 32x32 + chunk 1 (end anchor, vertical) text run 3 at (16.77,15.48) startOffset 0 endOffset 7 height 119.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 63x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 63x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 63.00: "startOffset=\"35\"" + RenderSVGText {text} at (35,70) size 72x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 72x12 + chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\"" + RenderSVGText {text} at (35,80) size 107x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 107x12 + chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 25 width 107.00: "glyph-orientation=\"90deg\"" + RenderSVGContainer {g} at (22,370) size 117x87 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,370.00)}] + RenderSVGContainer {use} at (39.70,370) size 90.60x50 + RenderSVGContainer {g} at (39.70,370) size 90.60x50 + RenderPath {path} at (39.70,370) size 90.60x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,12) size 117x43 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 117x43 + RenderSVGTSpan {tspan} at (0,0) size 35x40 + RenderSVGInlineText {#text} at (-18,-6) size 35x40 + chunk 1 (vertical) text run 1 at (30.11,23.88) startOffset 0 endOffset 5 height 85.00: "super" + RenderSVGInlineText {#text} at (11,-9) size 35x24 + chunk 1 (vertical) text run 2 at (45.13,12.86) startOffset 0 endOffset 5 height 85.00: " and " + RenderSVGTSpan {tspan} at (0,0) size 21x21 + RenderSVGInlineText {#text} at (44,-1) size 21x21 + chunk 1 (vertical) text run 3 at (73.44,12.52) startOffset 0 endOffset 3 height 51.00: "sub" + RenderSVGInlineText {#text} at (61,-5) size 38x39 + chunk 1 (vertical) text run 4 at (93.14,15.35) startOffset 0 endOffset 7 height 119.00: "scripts" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (20,65) size 87x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 87x12 + chunk 1 text run 1 at (20.00,65.00) startOffset 0 endOffset 22 width 87.00: "baseline-shift=\"super\"" + RenderSVGText {text} at (20,75) size 97x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 97x12 + chunk 1 text run 1 at (20.00,75.00) startOffset 0 endOffset 24 width 97.00: "and baseline-shift=\"sub\"" + RenderSVGText {text} at (20,85) size 100x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 100x12 + chunk 1 text run 1 at (20.00,85.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\"" + RenderSVGContainer {g} at (318,370) size 109x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,370.00)}] + RenderSVGContainer {use} at (329.70,370) size 90.60x50 + RenderSVGContainer {g} at (329.70,370) size 90.60x50 + RenderPath {path} at (329.70,370) size 90.60x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,12) size 109x46 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 109x46 + RenderSVGTSpan {tspan} at (0,0) size 42x44 + RenderSVGInlineText {#text} at (-12,-9) size 42x44 + chunk 1 (vertical) text run 1 at (30.15,17.84) startOffset 0 endOffset 8 height 136.00: "positive" + RenderSVGInlineText {#text} at (24,-9) size 34x20 + chunk 1 (vertical) text run 2 at (55.81,12.50) startOffset 0 endOffset 5 height 85.00: " and " + RenderSVGTSpan {tspan} at (0,0) size 43x42 + RenderSVGInlineText {#text} at (54,-5) size 43x42 + chunk 1 (vertical) text run 3 at (85.88,13.49) startOffset 0 endOffset 8 height 136.00: "negative" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (20,65) size 96x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 96x12 + chunk 1 text run 1 at (20.00,65.00) startOffset 0 endOffset 23 width 96.00: "baseline-shift=\"+/-20%\"" + RenderSVGText {text} at (20,75) size 100x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 100x12 + chunk 1 text run 1 at (20.00,75.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\"" + RenderSVGContainer {g} at (179.25,358.75) size 100.75x123.25 [transform={m=((1.00,0.00)(0.00,1.00)) t=(180.00,370.00)}] + RenderSVGContainer {g} at (179.25,358.75) size 90.98x87 [transform={m=((0.75,0.00)(0.00,0.75)) t=(0.00,0.00)}] + RenderSVGContainer {use} at (202.27,370) size 67.95x37.50 + RenderSVGContainer {g} at (202.27,370) size 67.95x37.50 + RenderPath {path} at (202.27,370) size 67.95x37.50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (-12,-15) size 89x116 contains 1 chunk(s) + RenderSVGInlineText {#text} at (11,0) size 23x94 + chunk 1 (vertical) text run 1 at (-12.00,-15.00) startOffset 0 endOffset 12 height 264.00: "before path " + RenderSVGTextPath {textPath} at (0,0) size 62x38 + RenderSVGInlineText {#text} at (35,15) size 62x38 + chunk 1 (vertical) text run 2 at (34.39,12.50) startOffset 0 endOffset 7 height 154.00: "on path" + RenderSVGInlineText {#text} at (77,41) size 23x75 + chunk 1 (vertical) text run 3 at (53.06,26.50) startOffset 0 endOffset 10 height 220.00: "after path" + RenderSVGText {text} at (0,100) size 96x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 96x12 + chunk 1 text run 1 at (0.00,100.00) startOffset 0 endOffset 26 width 96.00: "text before/after textPath" + RenderSVGText {text} at (0,110) size 100x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 100x12 + chunk 1 text run 1 at (0.00,110.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\"" + RenderSVGContainer {use} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/xmlSpace-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/xmlSpace-expected.checksum index 1a67358..50cae17 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/xmlSpace-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/xmlSpace-expected.checksum @@ -1 +1 @@ -686e8755d37909a80eef12902b2bfcae
\ No newline at end of file +6b18da1177128b67997ef93b78a6aa2e
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/xmlSpace-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/xmlSpace-expected.png Binary files differindex 5d0f41e..f02938d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/xmlSpace-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/xmlSpace-expected.png diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 182a083..af107c8 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -910,7 +910,6 @@ BUG8635 WIN DEBUG : svg/W3C-SVG-1.1/coords-units-01-b.svg = IMAGE+TEXT BUG8635 SLOW WIN RELEASE : svg/W3C-SVG-1.1/coords-units-01-b.svg = IMAGE+TEXT BUG8635 LINUX : svg/W3C-SVG-1.1/coords-units-01-b.svg = IMAGE+TEXT -BUG10288 WIN LINUX : svg/batik/text/verticalText.svg = FAIL // Bug in Skia, see https://bugs.webkit.org/show_bug.cgi?id=24534 . BUG8635 WIN LINUX : svg/W3C-SVG-1.1/pservers-grad-06-b.svg = FAIL @@ -982,7 +981,6 @@ BUG10298 LINUX : svg/custom/use-on-disallowed-foreign-object-3.svg = FAIL BUG24198 SKIP : svg/batik/text/smallFonts.svg = FAIL // pixeltest failure: font baseline should be on the path, not the centerline -BUG24198 LINUX WIN : svg/batik/text/verticalTextOnPath.svg = FAIL BUG24198 LINUX WIN : svg/custom/path-textPath-simulation.svg = FAIL // This test fails because of an oddity in stroke width calculation. A @@ -2494,11 +2492,6 @@ BUG19248 : fast/js/const.html = FAIL // WebKit roll r47417:47528 BUG19766 LINUX : fast/replaced/width100percent-menulist.html = FAIL -// SVG empty trailing tspan causes text to not show up -BUG23468 WIN : svg/batik/text/textPosition.svg = IMAGE -BUG23468 LINUX : svg/batik/text/textPosition.svg = IMAGE+TEXT -BUG23468 WIN LINUX : svg/batik/text/xmlSpace.svg = IMAGE - // Fails due to textInputController.setInputMethod not implemented for Mac. BUG19665 MAC : platform/mac/editing/input/hangul-enter-confirms-and-sends-keypress.html = FAIL BUG19665 MAC : platform/mac/editing/input/kotoeri-enter-to-confirm-and-newline.html = FAIL |