Index: LayoutTests/platform/win/svg/batik/text/textOnPathSpaces-expected.txt |
diff --git a/LayoutTests/platform/win/svg/batik/text/textOnPathSpaces-expected.txt b/LayoutTests/platform/win/svg/batik/text/textOnPathSpaces-expected.txt |
index 32833cd0cdac4fc518fc0f0a753ad4d01db7fbe5..3756c21adb939764d114708c3c97db2d6fbe2e0f 100644 |
--- a/LayoutTests/platform/win/svg/batik/text/textOnPathSpaces-expected.txt |
+++ b/LayoutTests/platform/win/svg/batik/text/textOnPathSpaces-expected.txt |
@@ -7,14 +7,14 @@ layer at (0,0) size 450x500 |
LayoutSVGInlineText {#text} at (0,0) size 260x17 |
chunk 1 (middle anchor) text run 1 at (95.14,40.00) startOffset 0 endOffset 36 width 259.72: "Text on a path with adjusted spacing" |
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"] |
+ LayoutSVGPath {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"] |
+ LayoutSVGPath {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"] |
LayoutSVGContainer {g} at (2,60) size 133x72 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,70.00)}] |
LayoutSVGContainer {use} at (14,70) size 121x45 |
- RenderSVGPath {path} at (14,70) 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"] |
+ LayoutSVGPath {path} at (14,70) 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 (2,-10) size 72x43 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 72x43 |
- RenderSVGTSpan {tspan} at (0,0) size 72x43 |
+ LayoutSVGTSpan {tspan} at (0,0) size 72x43 |
LayoutSVGInlineText {#text} at (0,0) size 72x43 |
chunk 1 text run 1 at (17.81,27.20) startOffset 0 endOffset 1 width 7.78: "s" |
chunk 1 text run 2 at (23.82,21.40) startOffset 1 endOffset 2 width 8.88: "a" |
@@ -28,10 +28,10 @@ layer at (0,0) size 450x500 |
chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 15 width 59.00: "default spacing" |
LayoutSVGContainer {g} at (160,60) size 128x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,70.00)}] |
LayoutSVGContainer {use} at (164,70) size 121x45 |
- RenderSVGPath {path} at (164,70) 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"] |
+ LayoutSVGPath {path} at (164,70) 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 (10,-10) size 106x51 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 106x50 |
- RenderSVGTSpan {tspan} at (0,0) size 106x50 |
+ LayoutSVGTSpan {tspan} at (0,0) size 106x50 |
LayoutSVGInlineText {#text} at (0,13) size 106x50 |
chunk 1 text run 1 at (25.03,20.30) startOffset 0 endOffset 1 width 7.78: "s" |
chunk 1 text run 1 at (42.24,9.41) startOffset 0 endOffset 1 width 8.88: "a" |
@@ -48,10 +48,10 @@ layer at (0,0) size 450x500 |
chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 7 width 34.00: "y=\"110\"" |
LayoutSVGContainer {g} at (302,60) size 133x72 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,70.00)}] |
LayoutSVGContainer {use} at (314,70) size 121x45 |
- RenderSVGPath {path} at (314,70) 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"] |
+ LayoutSVGPath {path} at (314,70) 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 (2,-10) size 105x50 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 104x50 |
- RenderSVGTSpan {tspan} at (0,0) size 104x50 |
+ LayoutSVGTSpan {tspan} at (0,0) size 104x50 |
LayoutSVGInlineText {#text} at (0,0) size 104x50 |
chunk 1 text run 1 at (17.81,27.20) startOffset 0 endOffset 1 width 7.78: "s" |
chunk 1 text run 2 at (31.43,15.03) startOffset 1 endOffset 2 width 8.88: "a" |
@@ -65,7 +65,7 @@ layer at (0,0) size 450x500 |
chunk 1 text run 1 at (15.00,60.00) startOffset 0 endOffset 27 width 118.00: "tspan dx=\"0,10,10,10,10,10\"" |
LayoutSVGContainer {g} at (2,155) size 133x67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,160.00)}] |
LayoutSVGContainer {use} at (14,160) size 121x45 |
- RenderSVGPath {path} at (14,160) 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"] |
+ LayoutSVGPath {path} at (14,160) 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 (2,-5) size 120x45 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 120x45 |
LayoutSVGInlineText {#text} at (0,0) size 120x45 |
@@ -81,7 +81,7 @@ layer at (0,0) size 450x500 |
chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 72.00: "textLength=\"140\"" |
LayoutSVGContainer {g} at (152,150) size 133x72 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,160.00)}] |
LayoutSVGContainer {use} at (164,160) size 121x45 |
- RenderSVGPath {path} at (164,160) 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"] |
+ LayoutSVGPath {path} at (164,160) 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 (2,-10) size 81x43 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 81x42 |
LayoutSVGInlineText {#text} at (0,0) size 81x42 |
@@ -97,7 +97,7 @@ layer at (0,0) size 450x500 |
chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 15 width 67.00: "textLength=\"70\"" |
LayoutSVGContainer {g} at (2,239) size 133x93 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,250.00)}] |
LayoutSVGContainer {use} at (14,250) size 121x45 |
- RenderSVGPath {path} at (14,250) 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"] |
+ LayoutSVGPath {path} at (14,250) 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 (2,-11) size 132x52 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 132x52 |
LayoutSVGInlineText {#text} at (0,0) size 132x52 |
@@ -119,7 +119,7 @@ layer at (0,0) size 450x500 |
chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 18 width 84.00: "\"spacingAndGlyphs\"" |
LayoutSVGContainer {g} at (152,240) size 133x92 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,250.00)}] |
LayoutSVGContainer {use} at (164,250) size 121x45 |
- RenderSVGPath {path} at (164,250) 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"] |
+ LayoutSVGPath {path} at (164,250) 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 (2,-10) size 63x43 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 63x43 |
LayoutSVGInlineText {#text} at (0,0) size 63x43 |
@@ -141,7 +141,7 @@ layer at (0,0) size 450x500 |
chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 18 width 84.00: "\"spacingAndGlyphs\"" |
LayoutSVGContainer {g} at (2,340) size 133x72 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,350.00)}] |
LayoutSVGContainer {use} at (14,350) size 121x45 |
- RenderSVGPath {path} at (14,350) 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"] |
+ LayoutSVGPath {path} at (14,350) 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 (2,-10) size 48x43 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 48x43 |
LayoutSVGInlineText {#text} at (0,0) size 48x43 |
@@ -157,7 +157,7 @@ layer at (0,0) size 450x500 |
chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 19 width 75.00: "letter-spacing=\"-3\"" |
LayoutSVGContainer {g} at (152,340) size 134x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,350.00)}] |
LayoutSVGContainer {use} at (164,350) size 121x45 |
- RenderSVGPath {path} at (164,350) 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"] |
+ LayoutSVGPath {path} at (164,350) 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 (2,-10) size 134x51 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 133x50 |
LayoutSVGInlineText {#text} at (0,0) size 133x50 |
@@ -183,7 +183,7 @@ layer at (0,0) size 450x500 |
chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 18 width 84.00: "word-spacing=\"2em\"" |
LayoutSVGContainer {g} at (302,340) size 133x102 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,350.00)}] |
LayoutSVGContainer {use} at (314,350) size 121x45 |
- RenderSVGPath {path} at (314,350) 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"] |
+ LayoutSVGPath {path} at (314,350) 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 (2,-10) size 132x53 contains 1 chunk(s) |
LayoutSVGTextPath {textPath} at (0,0) size 132x52 |
LayoutSVGInlineText {#text} at (0,0) size 132x52 |
@@ -218,6 +218,6 @@ layer at (0,0) size 450x500 |
LayoutSVGRect {rect} at (0,0) size 448x498 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=446.00] [height=496.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"] |
- RenderSVGPath {path} at (425,484) size 16x12 [fill={[type=SOLID] [color=#33CC33]}] [data="M 275 353 C 229 365 187 396 161 444 C 152 460 167 481 186 477 C 172 501 146 544 171 558 C 199 574 223 550 231 543 C 249 564 281 553 312 526 C 353 540 380 524 415 473 C 423 461 445 430 445 408 C 445 392 430 378 410 387 C 409 375 401 349 357 368 C 347 362 326 363 303 385 C 308 375 300 347 275 353 Z"] |
+ LayoutSVGPath {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"] |
+ LayoutSVGPath {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"] |
+ LayoutSVGPath {path} at (425,484) size 16x12 [fill={[type=SOLID] [color=#33CC33]}] [data="M 275 353 C 229 365 187 396 161 444 C 152 460 167 481 186 477 C 172 501 146 544 171 558 C 199 574 223 550 231 543 C 249 564 281 553 312 526 C 353 540 380 524 415 473 C 423 461 445 430 445 408 C 445 392 430 378 410 387 C 409 375 401 349 357 368 C 347 362 326 363 303 385 C 308 375 300 347 275 353 Z"] |