Index: LayoutTests/platform/win-xp/svg/batik/text/textOnPath-expected.txt |
diff --git a/LayoutTests/platform/win-xp/svg/batik/text/textOnPath-expected.txt b/LayoutTests/platform/win-xp/svg/batik/text/textOnPath-expected.txt |
index 36158ec7a5a3cbe36a063f885e9709f57d5d299b..c694094ce7aca718e23d342f6b40fca8018b1b9a 100644 |
--- a/LayoutTests/platform/win-xp/svg/batik/text/textOnPath-expected.txt |
+++ b/LayoutTests/platform/win-xp/svg/batik/text/textOnPath-expected.txt |
@@ -2,15 +2,15 @@ layer at (0,0) size 800x600 |
RenderView at (0,0) size 800x600 |
layer at (0,0) size 450x500 |
RenderSVGRoot {svg} at (0,0) size 448x498 |
- RenderSVGContainer {g} at (9,25) size 429x417 |
+ LayoutSVGContainer {g} at (9,25) size 429x417 |
LayoutSVGText {text} at (162,25) size 126x18 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 126x18 |
chunk 1 (middle anchor) text run 1 at (162.00,40.00) startOffset 0 endOffset 19 width 126.00: "Text on a path test" |
RenderSVGHiddenContainer {defs} at (0,0) size 0x0 |
RenderSVGPath {path} at (14,0) size 121x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"] |
RenderSVGPath {path} at (29,0) size 92x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M 100 100 C 100 0 400 0 400 100"] |
- RenderSVGContainer {g} at (12,56) size 117x86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,70.00)}] |
- RenderSVGContainer {use} at (29,70) size 92x50 |
+ LayoutSVGContainer {g} at (12,56) size 117x86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,70.00)}] |
+ LayoutSVGContainer {use} at (29,70) size 92x50 |
RenderSVGPath {path} at (29,70) size 92x50 [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="M 100 100 C 100 0 400 0 400 100"] |
LayoutSVGText {text} at (12,-14) size 117x65 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 116x65 |
@@ -40,8 +40,8 @@ layer at (0,0) size 450x500 |
LayoutSVGText {text} at (35,60) size 75x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 75x12 |
chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\"" |
- RenderSVGContainer {g} at (163,66) size 108x76 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,70.00)}] |
- RenderSVGContainer {use} at (179,70) size 92x50 |
+ LayoutSVGContainer {g} at (163,66) size 108x76 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,70.00)}] |
+ LayoutSVGContainer {use} at (179,70) size 92x50 |
RenderSVGPath {path} at (179,70) size 92x50 [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="M 100 100 C 100 0 400 0 400 100"] |
LayoutSVGText {text} at (13,-4) size 54x52 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 54x52 |
@@ -64,8 +64,8 @@ layer at (0,0) size 450x500 |
LayoutSVGText {text} at (35,60) size 86x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) 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 (303,65) size 118x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,70.00)}] |
- RenderSVGContainer {use} at (329,70) size 92x50 |
+ LayoutSVGContainer {g} at (303,65) size 118x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,70.00)}] |
+ LayoutSVGContainer {use} at (329,70) size 92x50 |
RenderSVGPath {path} at (329,70) size 92x50 [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="M 100 100 C 100 0 400 0 400 100"] |
LayoutSVGText {text} at (3,-5) size 73x51 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 72x51 |
@@ -89,8 +89,8 @@ layer at (0,0) size 450x500 |
LayoutSVGText {text} at (35,60) size 72x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 72x12 |
chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\"" |
- RenderSVGContainer {g} at (29,165) size 117x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,170.00)}] |
- RenderSVGContainer {use} at (29,170) size 92x50 |
+ LayoutSVGContainer {g} at (29,165) size 117x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,170.00)}] |
+ LayoutSVGContainer {use} at (29,170) size 92x50 |
RenderSVGPath {path} at (29,170) size 92x50 [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="M 100 100 C 100 0 400 0 400 100"] |
LayoutSVGText {text} at (74,-5) size 72x54 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 72x54 |
@@ -114,8 +114,8 @@ layer at (0,0) size 450x500 |
LayoutSVGText {text} at (35,60) size 75x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 75x12 |
chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\"" |
- RenderSVGContainer {g} at (165,155) size 120x87 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,170.00)}] |
- RenderSVGContainer {use} at (179,170) size 92x50 |
+ LayoutSVGContainer {g} at (165,155) size 120x87 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,170.00)}] |
+ LayoutSVGContainer {use} at (179,170) size 92x50 |
RenderSVGPath {path} at (179,170) size 92x50 [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="M 100 100 C 100 0 400 0 400 100"] |
LayoutSVGText {text} at (15,-15) size 120x58 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 120x58 |
@@ -145,8 +145,8 @@ layer at (0,0) size 450x500 |
LayoutSVGText {text} at (35,60) size 86x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) 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 (321,155) size 117x87 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,170.00)}] |
- RenderSVGContainer {use} at (329,170) size 92x50 |
+ LayoutSVGContainer {g} at (321,155) size 117x87 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,170.00)}] |
+ LayoutSVGContainer {use} at (329,170) size 92x50 |
RenderSVGPath {path} at (329,170) size 92x50 [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="M 100 100 C 100 0 400 0 400 100"] |
LayoutSVGText {text} at (21,-15) size 117x66 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 116x66 |
@@ -176,8 +176,8 @@ layer at (0,0) size 450x500 |
LayoutSVGText {text} at (35,60) size 72x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 72x12 |
chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\"" |
- RenderSVGContainer {g} at (29,256) size 109x86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,270.00)}] |
- RenderSVGContainer {use} at (29,270) size 92x50 |
+ LayoutSVGContainer {g} at (29,256) size 109x86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,270.00)}] |
+ LayoutSVGContainer {use} at (29,270) size 92x50 |
RenderSVGPath {path} at (29,270) size 92x50 [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="M 100 100 C 100 0 400 0 400 100"] |
LayoutSVGText {text} at (38,-14) size 100x67 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 99x66 |
@@ -205,8 +205,8 @@ layer at (0,0) size 450x500 |
LayoutSVGText {text} at (35,60) size 75x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 75x12 |
chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\"" |
- RenderSVGContainer {g} at (162,265) size 109x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,270.00)}] |
- RenderSVGContainer {use} at (179,270) size 92x50 |
+ LayoutSVGContainer {g} at (162,265) size 109x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,270.00)}] |
+ LayoutSVGContainer {use} at (179,270) size 92x50 |
RenderSVGPath {path} at (179,270) size 92x50 [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="M 100 100 C 100 0 400 0 400 100"] |
LayoutSVGText {text} at (12,-5) size 95x56 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 94x56 |
@@ -234,8 +234,8 @@ layer at (0,0) size 450x500 |
LayoutSVGText {text} at (35,60) size 86x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) 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 (312,270) size 109x72 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,270.00)}] |
- RenderSVGContainer {use} at (329,270) size 92x50 |
+ LayoutSVGContainer {g} at (312,270) size 109x72 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,270.00)}] |
+ LayoutSVGContainer {use} at (329,270) size 92x50 |
RenderSVGPath {path} at (329,270) size 92x50 [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="M 100 100 C 100 0 400 0 400 100"] |
LayoutSVGText {text} at (12,7) size 38x43 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 37x43 |
@@ -255,8 +255,8 @@ layer at (0,0) size 450x500 |
LayoutSVGText {text} at (35,60) size 72x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 72x12 |
chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\"" |
- RenderSVGContainer {g} at (9,360) size 136x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,370.00)}] |
- RenderSVGContainer {use} at (24,370) size 121x45 |
+ LayoutSVGContainer {g} at (9,360) size 136x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,370.00)}] |
+ LayoutSVGContainer {use} at (24,370) size 121x45 |
RenderSVGPath {path} at (24,370) size 121x45 [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="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"] |
LayoutSVGText {text} at (-1,-10) size 117x53 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 116x53 |
@@ -293,8 +293,8 @@ layer at (0,0) size 450x500 |
LayoutSVGText {text} at (20,60) size 97x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 97x12 |
chunk 1 text run 1 at (20.00,70.00) startOffset 0 endOffset 24 width 97.00: "and baseline-shift=\"sub\"" |
- RenderSVGContainer {g} at (158,362) size 132x70 [transform={m=((1.00,0.00)(0.00,1.00)) t=(155.00,370.00)}] |
- RenderSVGContainer {use} at (169,370) size 121x45 |
+ LayoutSVGContainer {g} at (158,362) size 132x70 [transform={m=((1.00,0.00)(0.00,1.00)) t=(155.00,370.00)}] |
+ LayoutSVGContainer {use} at (169,370) size 121x45 |
RenderSVGPath {path} at (169,370) size 121x45 [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="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"] |
LayoutSVGText {text} at (3,-8) size 117x52 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 117x51 |
@@ -328,9 +328,9 @@ layer at (0,0) size 450x500 |
LayoutSVGText {text} at (20,50) size 96x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 96x12 |
chunk 1 text run 1 at (20.00,60.00) startOffset 0 endOffset 23 width 96.00: "baseline-shift=\"+/-20%\"" |
- RenderSVGContainer {g} at (304,367) size 115x65 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,390.00)}] |
- RenderSVGContainer {g} at (304,367) size 115x48 [transform={m=((0.50,0.00)(0.00,0.50)) t=(0.00,0.00)}] |
- RenderSVGContainer {use} at (314,390) size 47x25 |
+ LayoutSVGContainer {g} at (304,367) size 115x65 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,390.00)}] |
+ LayoutSVGContainer {g} at (304,367) size 115x48 [transform={m=((0.50,0.00)(0.00,0.50)) t=(0.00,0.00)}] |
+ LayoutSVGContainer {use} at (314,390) size 47x25 |
RenderSVGPath {path} at (314,390) size 47x25 [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="M 100 100 C 100 0 400 0 400 100"] |
LayoutSVGText {text} at (9,-46) size 228x88 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (20,0) size 142x34 |
@@ -349,10 +349,10 @@ layer at (0,0) size 450x500 |
LayoutSVGText {text} at (15,30) size 96x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 96x12 |
chunk 1 text run 1 at (15.00,40.00) startOffset 0 endOffset 26 width 96.00: "text before/after textPath" |
- RenderSVGContainer {use} at (0,0) size 448x498 |
- RenderSVGContainer {g} at (0,0) size 448x498 |
+ LayoutSVGContainer {use} at (0,0) size 448x498 |
+ LayoutSVGContainer {g} at (0,0) size 448x498 |
RenderSVGRect {rect} at (0,0) size 448x498 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=446.00] [height=496.00] |
- RenderSVGContainer {g} at (418,466) size 28x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(418.00,467.00)}] |
+ LayoutSVGContainer {g} at (418,466) size 28x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(418.00,467.00)}] |
RenderSVGViewportContainer {svg} at (418,466) size 28x30 |
RenderSVGPath {path} at (418,468) size 14x19 [fill={[type=SOLID] [color=#6666FF]}] [data="M 172 44 C 137 60 31 135 11 199 C 3 226 33 247 55 232 C 14 306 -1 332 0 356 C 0 370 13 398 44 383 C 52 379 79 358 96 342 C 110 341 120 331 138 314 C 155 328 174 324 190 307 C 212 309 272 229 234 199 C 231 175 204 162 181 181 C 175 179 168 180 163 182 C 185 147 206 100 212 77 C 219 47 188 36 172 44 Z"] |
RenderSVGPath {path} at (432,466) size 14x17 [fill={[type=SOLID] [color=#FF0000]}] [data="M 400 0 C 382 3 351 31 351 31 C 322 54 308 89 323 126 C 310 140 294 170 294 193 C 294 221 314 245 344 222 C 351 230 365 238 381 227 C 376 256 384 275 407 276 C 408 286 420 307 443 293 C 459 283 501 254 522 237 C 547 214 547 143 504 148 C 537 89 501 52 477 64 C 467 68 431 89 425 94 C 424 87 420 82 414 80 C 436 45 436 -5 401 0 Z"] |