Index: LayoutTests/platform/mac/svg/batik/text/textLayout2-expected.txt |
diff --git a/LayoutTests/platform/mac/svg/batik/text/textLayout2-expected.txt b/LayoutTests/platform/mac/svg/batik/text/textLayout2-expected.txt |
index ebca2014293a76dab0e47761973591688bc86920..e6415d46751fb1cc41c0286b38a70bf25323ad69 100644 |
--- a/LayoutTests/platform/mac/svg/batik/text/textLayout2-expected.txt |
+++ b/LayoutTests/platform/mac/svg/batik/text/textLayout2-expected.txt |
@@ -15,12 +15,12 @@ layer at (0,0) size 450x500 |
chunk 1 (middle anchor) text run 1 at (186.26,75.00) startOffset 0 endOffset 19 width 77.48: "Baseline Properties" |
LayoutSVGContainer {g} at (155,88) size 140x49 |
LayoutSVGText {text} at (164,88) size 122x35 contains 1 chunk(s) |
- RenderSVGTSpan {tspan} at (0,0) size 33x17 |
+ LayoutSVGTSpan {tspan} at (0,0) size 33x17 |
LayoutSVGInlineText {#text} at (0,0) size 33x17 |
chunk 1 (middle anchor) text run 1 at (164.18,101.50) startOffset 0 endOffset 5 width 32.49: "super" |
LayoutSVGInlineText {#text} at (32,8) size 30x17 |
chunk 1 (middle anchor) text run 1 at (196.67,110.00) startOffset 0 endOffset 5 width 29.16: " and " |
- RenderSVGTSpan {tspan} at (0,0) size 22x17 |
+ LayoutSVGTSpan {tspan} at (0,0) size 22x17 |
LayoutSVGInlineText {#text} at (61,17) size 21x17 |
chunk 1 (middle anchor) text run 1 at (225.82,118.50) startOffset 0 endOffset 3 width 20.84: "sub" |
LayoutSVGInlineText {#text} at (82,8) size 40x17 |
@@ -30,12 +30,12 @@ layer at (0,0) size 450x500 |
chunk 1 (middle anchor) text run 1 at (155.53,135.00) startOffset 0 endOffset 43 width 138.95: "baseline-shift=\"super\"/baseline-shift=\"sub\"" |
LayoutSVGContainer {g} at (118,149) size 214x33 |
LayoutSVGText {text} at (118,149) size 214x23 contains 1 chunk(s) |
- RenderSVGTSpan {tspan} at (0,0) size 48x17 |
+ LayoutSVGTSpan {tspan} at (0,0) size 48x17 |
LayoutSVGInlineText {#text} at (0,0) size 48x17 |
chunk 1 (middle anchor) text run 1 at (118.99,162.00) startOffset 0 endOffset 8 width 47.50: "positive" |
LayoutSVGInlineText {#text} at (47,3) size 30x17 |
chunk 1 (middle anchor) text run 1 at (166.49,165.00) startOffset 0 endOffset 5 width 29.16: " and " |
- RenderSVGTSpan {tspan} at (0,0) size 56x17 |
+ LayoutSVGTSpan {tspan} at (0,0) size 56x17 |
LayoutSVGInlineText {#text} at (76,6) size 55x17 |
chunk 1 (middle anchor) text run 1 at (195.64,168.00) startOffset 0 endOffset 9 width 54.56: "negative " |
LayoutSVGInlineText {#text} at (131,3) size 81x17 |
@@ -50,17 +50,17 @@ layer at (0,0) size 450x500 |
LayoutSVGInlineText {#text} at (0,0) size 123x9 |
chunk 1 (middle anchor) text run 1 at (163.86,225.00) startOffset 0 endOffset 42 width 122.27: "(Try selecting the following text regions)" |
LayoutSVGText {text} at (120,237) size 204x32 contains 1 chunk(s) |
- RenderSVGTSpan {tspan} at (0,0) size 200x17 |
+ LayoutSVGTSpan {tspan} at (0,0) size 200x17 |
LayoutSVGInlineText {#text} at (0,0) size 200x17 |
chunk 1 text run 1 at (120.00,250.00) startOffset 0 endOffset 33 width 199.94: "Text selections can span multiple" |
LayoutSVGInlineText {#text} at (199,0) size 4x17 |
chunk 1 text run 1 at (319.94,250.00) startOffset 0 endOffset 1 width 3.75: " " |
- RenderSVGTSpan {tspan} at (0,0) size 164x17 |
+ LayoutSVGTSpan {tspan} at (0,0) size 164x17 |
LayoutSVGInlineText {#text} at (0,15) size 164x17 |
chunk 1 text run 1 at (120.00,265.00) startOffset 0 endOffset 27 width 163.55: "lines via <tspan> elements." |
LayoutSVGInlineText {#text} at (0,0) size 0x0 |
LayoutSVGText {text} at (0,-68) size 106x123 contains 1 chunk(s) |
- RenderSVGTSpan {tspan} at (0,0) size 106x123 |
+ LayoutSVGTSpan {tspan} at (0,0) size 106x123 |
LayoutSVGInlineText {#text} at (0,50) size 106x123 |
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 12.22: "T" |
chunk 1 text run 1 at (10.00,-25.00) startOffset 0 endOffset 1 width 8.88: "e" |
@@ -96,7 +96,7 @@ layer at (0,0) size 450x500 |
LayoutSVGText {text} at (151,435) size 148x21 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,1) size 62x17 |
chunk 1 (middle anchor) text run 1 at (151.47,450.00) startOffset 0 endOffset 10 width 61.66: "Text with " |
- RenderSVGTSpan {tspan} at (0,0) size 46x20 |
+ LayoutSVGTSpan {tspan} at (0,0) size 46x20 |
LayoutSVGInlineText {#text} at (60,0) size 45x20 |
chunk 1 (middle anchor) text run 1 at (213.13,450.00) startOffset 0 endOffset 1 width 5.00: "r" |
chunk 1 (middle anchor) text run 2 at (218.12,450.00) startOffset 1 endOffset 2 width 7.50: "o" |
@@ -133,6 +133,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"] |