Index: third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textLayout-expected.txt |
diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textLayout-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textLayout-expected.txt |
index 0af7063ddaeb35f9dec72cb2a324c35154dd9f7b..59b57ce95eda674cc9f169c1f1e55cf6ab9ca845 100644 |
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textLayout-expected.txt |
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textLayout-expected.txt |
@@ -23,15 +23,15 @@ layer at (0,0) size 450x500 |
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.00: "l" |
chunk 1 text run 1 at (140.00,110.00) startOffset 0 endOffset 1 width 11.00: "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 |
+ LayoutSVGContainer {g} at (185,89) size 71x38 |
LayoutSVGText {text} at (185,89) size 67x27 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 67x27 |
chunk 1 text run 1 at (185.00,110.00) startOffset 0 endOffset 6 width 67.00: "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 117x38 |
LayoutSVGText {text} at (290,89) size 117x27 contains 1 chunk(s) |
@@ -43,8 +43,8 @@ layer at (0,0) size 450x500 |
chunk 1 text run 4 at (358.00,110.00) startOffset 3 endOffset 4 width 12.00: "p" |
chunk 1 text run 5 at (380.00,110.00) startOffset 4 endOffset 5 width 6.00: "l" |
chunk 1 text run 6 at (396.00,110.00) startOffset 5 endOffset 6 width 11.00: "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 |
@@ -58,8 +58,8 @@ layer at (0,0) size 450x500 |
chunk 1 text run 4 at (104.50,180.00) startOffset 3 endOffset 4 width 12.00: "p" |
chunk 1 text run 5 at (125.33,180.00) startOffset 4 endOffset 5 width 6.00: "l" |
chunk 1 text run 6 at (140.17,180.00) startOffset 5 endOffset 6 width 11.00: "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) |
@@ -70,28 +70,28 @@ layer at (0,0) size 450x500 |
chunk 1 text run 4 at (224.50,180.00) startOffset 3 endOffset 4 width 12.00: "p" |
chunk 1 text run 5 at (237.00,180.00) startOffset 4 endOffset 5 width 6.00: "l" |
chunk 1 text run 6 at (243.50,180.00) startOffset 5 endOffset 6 width 11.00: "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 |
chunk 1 text run 1 at (40.00,225.00) startOffset 0 endOffset 6 width 67.00: "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 |
+ LayoutSVGContainer {g} at (185,204) size 117x48 |
LayoutSVGText {text} at (185,204) size 70x27 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 70x27 |
chunk 1 text run 1 at (185.00,225.00) startOffset 0 endOffset 6 width 67.00: "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 103x38 |
LayoutSVGText {text} at (40,254) size 103x27 contains 1 chunk(s) |
@@ -102,10 +102,10 @@ layer at (0,0) size 450x500 |
chunk 1 text run 4 at (99.60,275.00) startOffset 3 endOffset 4 width 12.00: "p" |
chunk 1 text run 5 at (118.80,275.00) startOffset 4 endOffset 5 width 6.00: "l" |
chunk 1 text run 6 at (132.00,275.00) startOffset 5 endOffset 6 width 11.00: "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 |
+ LayoutSVGContainer {g} at (185,254) size 64x38 |
LayoutSVGText {text} at (185,254) size 52x27 contains 1 chunk(s) |
LayoutSVGInlineText {#text} at (0,0) size 52x27 |
chunk 1 text run 1 at (185.00,275.00) startOffset 0 endOffset 1 width 9.00: "s" |
@@ -114,8 +114,8 @@ layer at (0,0) size 450x500 |
chunk 1 text run 4 at (214.00,275.00) startOffset 3 endOffset 4 width 12.00: "p" |
chunk 1 text run 5 at (223.00,275.00) startOffset 4 endOffset 5 width 6.00: "l" |
chunk 1 text run 6 at (226.00,275.00) startOffset 5 endOffset 6 width 11.00: "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 117x38 |
LayoutSVGText {text} at (290,254) size 117x27 contains 1 chunk(s) |
@@ -126,11 +126,11 @@ layer at (0,0) size 450x500 |
chunk 1 text run 4 at (358.00,275.00) startOffset 3 endOffset 4 width 12.00: "p" |
chunk 1 text run 5 at (380.00,275.00) startOffset 4 endOffset 5 width 6.00: "l" |
chunk 1 text run 6 at (396.00,275.00) startOffset 5 endOffset 6 width 11.00: "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 |
+ LayoutSVGText {text} at (170,310) size 109x12 contains 1 chunk(s) |
+ LayoutSVGInlineText {#text} at (0,0) size 109x12 |
chunk 1 (middle anchor) text run 1 at (171.40,320.00) startOffset 0 endOffset 23 width 107.20: "Word Spacing Adjustment" |
LayoutSVGContainer {g} at (40,337) size 350x30 |
LayoutSVGText {text} at (40,337) size 350x17 contains 1 chunk(s) |
@@ -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 |