Index: third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textLayout-expected.txt |
diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textLayout-expected.txt b/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textLayout-expected.txt |
index e14a1d79afa1c5a98f6397fbf6b34f3da299c3a8..acee1f577cd5f2b6b07ed2aec4610ae4960f28e3 100644 |
--- a/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textLayout-expected.txt |
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textLayout-expected.txt |
@@ -3,8 +3,8 @@ layer at (0,0) size 800x600 |
layer at (0,0) size 450x500 |
LayoutSVGRoot {svg} at (0,0) size 448x498 |
LayoutSVGHiddenContainer {defs} at (0,0) size 0x0 |
- LayoutSVGText {text} at (0,-14) size 46x18 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 46x18 |
+ LayoutSVGText {text} at (0,-14) size 46x17 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 46x17 |
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 6 width 45.32: "sample" |
LayoutSVGContainer {g} at (40,36) size 368x421 |
LayoutSVGText {text} at (152,36) size 146x17 contains 1 chunk(s) |
@@ -14,120 +14,120 @@ layer at (0,0) size 450x500 |
LayoutSVGInlineText {#text} at (0,0) size 110x12 |
chunk 1 (middle anchor) text run 1 at (170.00,75.00) startOffset 0 endOffset 26 width 110.00: "Explicit Glyph Positioning" |
LayoutSVGContainer {g} at (40,89) size 111x38 |
- LayoutSVGText {text} at (40,89) size 111x27 contains 1 chunk(s) |
- LayoutSVGTSpan {tspan} at (0,0) size 111x27 |
- LayoutSVGInlineText {#text} at (0,0) size 111x27 |
+ LayoutSVGText {text} at (40,89) size 111x26 contains 1 chunk(s) |
+ LayoutSVGTSpan {tspan} at (0,0) size 111x26 |
+ LayoutSVGInlineText {#text} at (0,0) size 111x26 |
chunk 1 text run 1 at (40.00,110.00) startOffset 0 endOffset 1 width 9.34: "s" |
chunk 1 text run 1 at (60.00,110.00) startOffset 0 endOffset 1 width 10.65: "a" |
chunk 1 text run 1 at (80.00,110.00) startOffset 0 endOffset 1 width 18.67: "m" |
chunk 1 text run 1 at (105.00,110.00) startOffset 0 endOffset 1 width 12.00: "p" |
chunk 1 text run 1 at (125.00,110.00) startOffset 0 endOffset 1 width 6.67: "l" |
chunk 1 text run 1 at (140.00,110.00) startOffset 0 endOffset 1 width 10.65: "e" |
- LayoutSVGText {text} at (40,117) size 104x10 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 104x10 |
+ LayoutSVGText {text} at (40,117) size 105x10 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 105x10 |
chunk 1 text run 1 at (40.00,125.00) startOffset 0 endOffset 30 width 104.00: "tspan x=\"40,60,80,105,125,140\"" |
- LayoutSVGContainer {g} at (185,89) size 70x38 |
- LayoutSVGText {text} at (185,89) size 68x27 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 68x27 |
+ LayoutSVGContainer {g} at (185,89) size 71x38 |
+ LayoutSVGText {text} at (185,89) size 68x26 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 68x26 |
chunk 1 text run 1 at (185.00,110.00) startOffset 0 endOffset 6 width 67.98: "sample" |
- LayoutSVGText {text} at (185,117) size 70x10 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 70x10 |
+ LayoutSVGText {text} at (185,117) size 71x10 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 71x10 |
chunk 1 text run 1 at (185.00,125.00) startOffset 0 endOffset 22 width 70.00: "Serif, default spacing" |
LayoutSVGContainer {g} at (290,89) size 118x38 |
- LayoutSVGText {text} at (290,89) size 118x27 contains 1 chunk(s) |
- LayoutSVGTSpan {tspan} at (0,0) size 118x27 |
- LayoutSVGInlineText {#text} at (0,0) size 118x27 |
+ LayoutSVGText {text} at (290,89) size 118x26 contains 1 chunk(s) |
+ LayoutSVGTSpan {tspan} at (0,0) size 118x26 |
+ LayoutSVGInlineText {#text} at (0,0) size 118x26 |
chunk 1 text run 1 at (290.00,110.00) startOffset 0 endOffset 1 width 9.34: "s" |
chunk 1 text run 2 at (309.34,110.00) startOffset 1 endOffset 2 width 10.65: "a" |
chunk 1 text run 3 at (329.99,110.00) startOffset 2 endOffset 3 width 18.67: "m" |
chunk 1 text run 4 at (358.66,110.00) startOffset 3 endOffset 4 width 12.00: "p" |
chunk 1 text run 5 at (380.66,110.00) startOffset 4 endOffset 5 width 6.67: "l" |
chunk 1 text run 6 at (397.33,110.00) startOffset 5 endOffset 6 width 10.65: "e" |
- LayoutSVGText {text} at (290,117) size 102x10 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 102x10 |
+ LayoutSVGText {text} at (290,117) size 103x10 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 103x10 |
chunk 1 text run 1 at (290.00,125.00) startOffset 0 endOffset 29 width 102.00: "x=\"175\" dx=\"0,10,10,10,10,10\"" |
LayoutSVGText {text} at (102,140) size 246x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 245x12 |
chunk 1 (middle anchor) text run 1 at (102.50,150.00) startOffset 0 endOffset 59 width 245.00: "Letter Spacing Adjustment and Explicit Length Specification" |
LayoutSVGContainer {g} at (40,159) size 112x38 |
- LayoutSVGText {text} at (40,159) size 112x27 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 112x27 |
+ LayoutSVGText {text} at (40,159) size 112x26 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 112x26 |
chunk 1 text run 1 at (40.00,180.00) startOffset 0 endOffset 1 width 9.34: "s" |
chunk 1 text run 2 at (58.01,180.00) startOffset 1 endOffset 2 width 10.65: "a" |
chunk 1 text run 3 at (77.33,180.00) startOffset 2 endOffset 3 width 18.67: "m" |
chunk 1 text run 4 at (104.67,180.00) startOffset 3 endOffset 4 width 12.00: "p" |
chunk 1 text run 5 at (125.34,180.00) startOffset 4 endOffset 5 width 6.67: "l" |
chunk 1 text run 6 at (140.68,180.00) startOffset 5 endOffset 6 width 10.65: "e" |
- LayoutSVGText {text} at (40,187) size 58x10 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 58x10 |
+ LayoutSVGText {text} at (40,187) size 59x10 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 59x10 |
chunk 1 text run 1 at (40.00,195.00) startOffset 0 endOffset 16 width 58.00: "textLength=\"120\"" |
LayoutSVGContainer {g} at (185,159) size 70x38 |
- LayoutSVGText {text} at (185,159) size 70x27 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 70x27 |
+ LayoutSVGText {text} at (185,159) size 70x26 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 70x26 |
chunk 1 text run 1 at (185.00,180.00) startOffset 0 endOffset 1 width 9.34: "s" |
chunk 1 text run 2 at (194.68,180.00) startOffset 1 endOffset 2 width 10.65: "a" |
chunk 1 text run 3 at (205.67,180.00) startOffset 2 endOffset 3 width 18.67: "m" |
chunk 1 text run 4 at (224.67,180.00) startOffset 3 endOffset 4 width 12.00: "p" |
chunk 1 text run 5 at (237.01,180.00) startOffset 4 endOffset 5 width 6.67: "l" |
chunk 1 text run 6 at (244.01,180.00) startOffset 5 endOffset 6 width 10.65: "e" |
- LayoutSVGText {text} at (185,187) size 54x10 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 54x10 |
+ LayoutSVGText {text} at (185,187) size 55x10 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 55x10 |
chunk 1 text run 1 at (185.00,195.00) startOffset 0 endOffset 15 width 54.00: "textLength=\"70\"" |
LayoutSVGContainer {g} at (40,204) size 120x48 |
- LayoutSVGText {text} at (40,204) size 120x27 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 120x27 |
+ LayoutSVGText {text} at (40,204) size 120x26 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 120x26 |
chunk 1 text run 1 at (40.00,225.00) startOffset 0 endOffset 6 width 67.98: "sample" |
- LayoutSVGText {text} at (40,232) size 116x20 contains 1 chunk(s) |
+ LayoutSVGText {text} at (40,232) size 117x20 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 62x10 |
chunk 1 text run 1 at (40.00,240.00) startOffset 0 endOffset 18 width 62.00: "textLength=\"120\", " |
- LayoutSVGTSpan {tspan} at (0,0) size 116x10 |
- LayoutSVGInlineText {#text} at (0,10) size 116x10 |
+ LayoutSVGTSpan {tspan} at (0,0) size 117x10 |
+ LayoutSVGInlineText {#text} at (0,10) size 117x10 |
chunk 1 text run 1 at (40.00,250.00) startOffset 0 endOffset 31 width 116.00: "lengthAdjust=\"spacingAndGlyphs\"" |
- LayoutSVGContainer {g} at (185,204) size 116x48 |
- LayoutSVGText {text} at (185,204) size 70x27 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 70x27 |
+ LayoutSVGContainer {g} at (185,204) size 117x48 |
+ LayoutSVGText {text} at (185,204) size 70x26 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 70x26 |
chunk 1 text run 1 at (185.00,225.00) startOffset 0 endOffset 6 width 67.98: "sample" |
- LayoutSVGText {text} at (185,232) size 116x20 contains 1 chunk(s) |
+ LayoutSVGText {text} at (185,232) size 117x20 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 56x10 |
chunk 1 text run 1 at (185.00,240.00) startOffset 0 endOffset 16 width 56.00: "textLength=\"70\" " |
- LayoutSVGTSpan {tspan} at (0,0) size 116x10 |
- LayoutSVGInlineText {#text} at (0,10) size 116x10 |
+ LayoutSVGTSpan {tspan} at (0,0) size 117x10 |
+ LayoutSVGInlineText {#text} at (0,10) size 117x10 |
chunk 1 text run 1 at (185.00,250.00) startOffset 0 endOffset 31 width 116.00: "lengthAdjust=\"spacingAndGlyphs\"" |
LayoutSVGContainer {g} at (40,254) size 104x38 |
- LayoutSVGText {text} at (40,254) size 104x27 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 104x27 |
+ LayoutSVGText {text} at (40,254) size 104x26 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 104x26 |
chunk 1 text run 1 at (40.00,275.00) startOffset 0 endOffset 1 width 9.34: "s" |
chunk 1 text run 2 at (56.54,275.00) startOffset 1 endOffset 2 width 10.65: "a" |
chunk 1 text run 3 at (74.39,275.00) startOffset 2 endOffset 3 width 18.67: "m" |
chunk 1 text run 4 at (100.26,275.00) startOffset 3 endOffset 4 width 12.00: "p" |
chunk 1 text run 5 at (119.46,275.00) startOffset 4 endOffset 5 width 6.67: "l" |
chunk 1 text run 6 at (133.33,275.00) startOffset 5 endOffset 6 width 10.65: "e" |
- LayoutSVGText {text} at (40,282) size 77x10 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 77x10 |
+ LayoutSVGText {text} at (40,282) size 78x10 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 78x10 |
chunk 1 text run 1 at (40.00,290.00) startOffset 0 endOffset 22 width 76.84: "letter-spacing=\"0.3em\"" |
- LayoutSVGContainer {g} at (185,254) size 63x38 |
- LayoutSVGText {text} at (185,254) size 53x27 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 53x27 |
+ LayoutSVGContainer {g} at (185,254) size 64x38 |
+ LayoutSVGText {text} at (185,254) size 53x26 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 53x26 |
chunk 1 text run 1 at (185.00,275.00) startOffset 0 endOffset 1 width 9.34: "s" |
chunk 1 text run 2 at (191.34,275.00) startOffset 1 endOffset 2 width 10.65: "a" |
chunk 1 text run 3 at (198.99,275.00) startOffset 2 endOffset 3 width 18.67: "m" |
chunk 1 text run 4 at (214.66,275.00) startOffset 3 endOffset 4 width 12.00: "p" |
chunk 1 text run 5 at (223.66,275.00) startOffset 4 endOffset 5 width 6.67: "l" |
chunk 1 text run 6 at (227.33,275.00) startOffset 5 endOffset 6 width 10.65: "e" |
- LayoutSVGText {text} at (185,282) size 63x10 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 63x10 |
+ LayoutSVGText {text} at (185,282) size 64x10 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 64x10 |
chunk 1 text run 1 at (185.00,290.00) startOffset 0 endOffset 19 width 62.84: "letter-spacing=\"-3\"" |
LayoutSVGContainer {g} at (290,254) size 118x38 |
- LayoutSVGText {text} at (290,254) size 118x27 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 118x27 |
+ LayoutSVGText {text} at (290,254) size 118x26 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 118x26 |
chunk 1 text run 1 at (290.00,275.00) startOffset 0 endOffset 1 width 9.34: "s" |
chunk 1 text run 2 at (309.34,275.00) startOffset 1 endOffset 2 width 10.65: "a" |
chunk 1 text run 3 at (329.99,275.00) startOffset 2 endOffset 3 width 18.67: "m" |
chunk 1 text run 4 at (358.66,275.00) startOffset 3 endOffset 4 width 12.00: "p" |
chunk 1 text run 5 at (380.66,275.00) startOffset 4 endOffset 5 width 6.67: "l" |
chunk 1 text run 6 at (397.33,275.00) startOffset 5 endOffset 6 width 10.65: "e" |
- LayoutSVGText {text} at (290,282) size 64x10 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 64x10 |
+ LayoutSVGText {text} at (290,282) size 65x10 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 65x10 |
chunk 1 text run 1 at (290.00,290.00) startOffset 0 endOffset 19 width 63.84: "letter-spacing=\"10\"" |
LayoutSVGText {text} at (171,310) size 108x12 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 108x12 |
@@ -164,8 +164,8 @@ layer at (0,0) size 450x500 |
chunk 1 text run 27 at (369.25,350.00) startOffset 26 endOffset 27 width 5.00: "r" |
chunk 1 text run 28 at (375.17,350.00) startOffset 27 endOffset 28 width 7.00: "d" |
chunk 1 text run 29 at (383.08,350.00) startOffset 28 endOffset 29 width 6.00: "s" |
- LayoutSVGText {text} at (40,357) size 131x10 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 131x10 |
+ LayoutSVGText {text} at (40,357) size 132x10 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 132x10 |
chunk 1 text run 1 at (40.00,365.00) startOffset 0 endOffset 35 width 131.00: "textLength=\"350\" word-spacing=\"3em\"" |
LayoutSVGContainer {g} at (40,382) size 345x30 |
LayoutSVGText {text} at (40,382) size 345x17 contains 1 chunk(s) |
@@ -201,8 +201,8 @@ layer at (0,0) size 450x500 |
chunk 1 text run 29 at (356.42,395.00) startOffset 28 endOffset 29 width 5.00: "r" |
chunk 1 text run 30 at (366.61,395.00) startOffset 29 endOffset 30 width 7.00: "d" |
chunk 1 text run 31 at (378.81,395.00) startOffset 30 endOffset 31 width 6.00: "s" |
- LayoutSVGText {text} at (40,402) size 123x10 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 123x10 |
+ LayoutSVGText {text} at (40,402) size 124x10 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 124x10 |
chunk 1 text run 1 at (40.00,410.00) startOffset 0 endOffset 34 width 123.00: "textLength=\"350\" word-spacing=\"-5\"" |
LayoutSVGContainer {g} at (40,427) size 350x30 |
LayoutSVGText {text} at (40,427) size 350x17 contains 1 chunk(s) |
@@ -211,8 +211,8 @@ layer at (0,0) size 450x500 |
chunk 1 text run 2 at (85.00,440.00) startOffset 7 endOffset 18 width 64.00: "separation " |
chunk 1 text run 3 at (144.00,440.00) startOffset 18 endOffset 26 width 54.00: "between " |
chunk 1 text run 4 at (193.00,440.00) startOffset 26 endOffset 31 width 36.00: "words" |
- LayoutSVGText {text} at (40,447) size 241x10 contains 1 chunk(s) |
- LayoutSVGInlineText {#text} at (0,0) size 241x10 |
+ LayoutSVGText {text} at (40,447) size 242x10 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 242x10 |
chunk 1 text run 1 at (40.00,455.00) startOffset 0 endOffset 66 width 241.00: "textLength=\"350\" lengthAdjust=\"spacingAndGlyphs\" word-spacing=\"-5\"" |
LayoutSVGContainer {use} at (0,0) size 448x498 |
LayoutSVGContainer {g} at (0,0) size 448x498 |