diff options
| author | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 21:18:54 +0000 |
|---|---|---|
| committer | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 21:18:54 +0000 |
| commit | 83bd0701243c19fda7a332dfd2631efc2be5dcdb (patch) | |
| tree | ab62ecd8d969f4312d7042bc358bc8406f4db4e5 | |
| parent | 53ab6f82cf9f8a6d8cc0b48d37665c51c0e2521b (diff) | |
| download | chromium_src-83bd0701243c19fda7a332dfd2631efc2be5dcdb.zip chromium_src-83bd0701243c19fda7a332dfd2631efc2be5dcdb.tar.gz chromium_src-83bd0701243c19fda7a332dfd2631efc2be5dcdb.tar.bz2 | |
Rebaseline some old tests. The rendering matches the Mac upstream except minute differences in font metrics and test appears to verify the intended feature.
BUG992321 LINUX WIN : LayoutTests/svg/batik/text/textOnPath.svg = FAIL
BUG1316221 LINUX WIN : LayoutTests/css2.1/t1202-counter-04-b.html = FAIL
BUG1316221 LINUX WIN : LayoutTests/css2.1/t1202-counters-04-b.html = FAIL
BUG1107191 : LayoutTests/svg/batik/text/textStyles.svg = FAIL PASS
Also created a new bug for these tests:
BUG19559 LINUX WIN : LayoutTests/svg/batik/text/textEffect.svg = FAIL
BUG19559 LINUX WIN : LayoutTests/svg/batik/text/textEffect3.svg = FAIL
since the original bug 5641 seems to be fixed but the tests do not render correctly anyways.
BUG=19559
TEST=none
Review URL: http://codereview.chromium.org/171098
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23650 0039d316-1c4b-4281-b951-d872f2087c98
23 files changed, 750 insertions, 45 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counter-04-b-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counter-04-b-expected.checksum new file mode 100644 index 0000000..75cfc8a --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counter-04-b-expected.checksum @@ -0,0 +1 @@ +5805f6e62b97594b1c86d4e1994764a7
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counter-04-b-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counter-04-b-expected.png Binary files differnew file mode 100644 index 0000000..8fe0ff2 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counter-04-b-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counter-04-b-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counter-04-b-expected.txt new file mode 100644 index 0000000..b827f1c --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counter-04-b-expected.txt @@ -0,0 +1,99 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x100 + RenderBlock {HTML} at (0,0) size 800x100 + RenderBody {BODY} at (8,16) size 784x76 + RenderBlock {P} at (0,0) size 784x20 + RenderText {#text} at (0,0) size 216x19 + text run at (0,0) width 216: "The following two lines should look " + RenderInline {EM} at (0,0) size 93x19 + RenderText {#text} at (216,0) size 93x19 + text run at (216,0) width 93: "approximately" + RenderText {#text} at (309,0) size 60x19 + text run at (309,0) width 60: " the same:" + RenderBlock {DIV} at (0,36) size 784x20 + RenderInline {SPAN} at (0,0) size 9x19 + RenderInline (generated) at (0,0) size 9x19 + RenderCounter at (0,0) size 9x19 + text run at (0,0) width 9: "\x{25A0}" + RenderText {#text} at (9,0) size 4x19 + text run at (9,0) width 4: " " + RenderInline {SPAN} at (0,0) size 9x19 + RenderInline (generated) at (0,0) size 9x19 + RenderCounter at (13,0) size 9x19 + text run at (13,0) width 9: "\x{25A0}" + RenderText {#text} at (22,0) size 4x19 + text run at (22,0) width 4: " " + RenderInline {SPAN} at (0,0) size 9x19 + RenderInline (generated) at (0,0) size 9x19 + RenderCounter at (26,0) size 9x19 + text run at (26,0) width 9: "\x{25A0}" + RenderText {#text} at (35,0) size 4x19 + text run at (35,0) width 4: " " + RenderInline {SPAN} at (0,0) size 9x19 + RenderInline (generated) at (0,0) size 9x19 + RenderCounter at (39,0) size 9x19 + text run at (39,0) width 9: "\x{25A0}" + RenderText {#text} at (48,0) size 4x19 + text run at (48,0) width 4: " " + RenderInline {SPAN} at (0,0) size 9x19 + RenderInline (generated) at (0,0) size 9x19 + RenderCounter at (52,0) size 9x19 + text run at (52,0) width 9: "\x{25A0}" + RenderText {#text} at (61,0) size 4x19 + text run at (61,0) width 4: " " + RenderInline {SPAN} at (0,0) size 9x19 + RenderInline (generated) at (0,0) size 9x19 + RenderCounter at (65,0) size 9x19 + text run at (65,0) width 9: "\x{25A0}" + RenderText {#text} at (74,0) size 4x19 + text run at (74,0) width 4: " " + RenderInline {SPAN} at (0,0) size 9x19 + RenderInline (generated) at (0,0) size 9x19 + RenderCounter at (78,0) size 9x19 + text run at (78,0) width 9: "\x{25A0}" + RenderText {#text} at (87,0) size 4x19 + text run at (87,0) width 4: " " + RenderInline {SPAN} at (0,0) size 9x19 + RenderInline (generated) at (0,0) size 9x19 + RenderCounter at (91,0) size 9x19 + text run at (91,0) width 9: "\x{25A0}" + RenderText {#text} at (100,0) size 4x19 + text run at (100,0) width 4: " " + RenderInline {SPAN} at (0,0) size 9x19 + RenderInline (generated) at (0,0) size 9x19 + RenderCounter at (104,0) size 9x19 + text run at (104,0) width 9: "\x{25A0}" + RenderText {#text} at (113,0) size 4x19 + text run at (113,0) width 4: " " + RenderInline {SPAN} at (0,0) size 9x19 + RenderInline (generated) at (0,0) size 9x19 + RenderCounter at (117,0) size 9x19 + text run at (117,0) width 9: "\x{25A0}" + RenderText {#text} at (126,0) size 4x19 + text run at (126,0) width 4: " " + RenderInline {SPAN} at (0,0) size 9x19 + RenderInline (generated) at (0,0) size 9x19 + RenderCounter at (130,0) size 9x19 + text run at (130,0) width 9: "\x{25A0}" + RenderText {#text} at (139,0) size 4x19 + text run at (139,0) width 4: " " + RenderInline {SPAN} at (0,0) size 9x19 + RenderInline (generated) at (0,0) size 9x19 + RenderCounter at (143,0) size 9x19 + text run at (143,0) width 9: "\x{25A0}" + RenderText {#text} at (0,0) size 0x0 + RenderBlock {DIV} at (0,56) size 784x20 + RenderText {#text} at (0,0) size 188x19 + text run at (0,0) width 16: "\x{25FE} " + text run at (16,0) width 16: "\x{25FE} " + text run at (32,0) width 16: "\x{25FE} " + text run at (48,0) width 16: "\x{25FE} " + text run at (64,0) width 16: "\x{25FE} " + text run at (80,0) width 16: "\x{25FE} " + text run at (96,0) width 16: "\x{25FE} " + text run at (112,0) width 16: "\x{25FE} " + text run at (128,0) width 16: "\x{25FE} " + text run at (144,0) width 16: "\x{25FE} " + text run at (160,0) width 16: "\x{25FE} " + text run at (176,0) width 12: "\x{25FE}" diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counters-04-b-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counters-04-b-expected.checksum new file mode 100644 index 0000000..635d0fd --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counters-04-b-expected.checksum @@ -0,0 +1 @@ +ebbd39ff84bb4480df25308ce40a0431
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counters-04-b-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counters-04-b-expected.png Binary files differnew file mode 100644 index 0000000..88e9c2e --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counters-04-b-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counters-04-b-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counters-04-b-expected.txt new file mode 100644 index 0000000..717fa54 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1202-counters-04-b-expected.txt @@ -0,0 +1,99 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x100 + RenderBlock {HTML} at (0,0) size 800x100 + RenderBody {BODY} at (8,16) size 784x76 + RenderBlock {P} at (0,0) size 784x20 + RenderText {#text} at (0,0) size 216x19 + text run at (0,0) width 216: "The following two lines should look " + RenderInline {EM} at (0,0) size 93x19 + RenderText {#text} at (216,0) size 93x19 + text run at (216,0) width 93: "approximately" + RenderText {#text} at (309,0) size 60x19 + text run at (309,0) width 60: " the same:" + RenderBlock {DIV} at (0,36) size 784x20 + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (0,0) size 22x19 + text run at (0,0) width 22: "\x{25A0}.\x{25A0}" + RenderText {#text} at (22,0) size 4x19 + text run at (22,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (26,0) size 22x19 + text run at (26,0) width 22: "\x{25A0}.\x{25A0}" + RenderText {#text} at (48,0) size 4x19 + text run at (48,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (52,0) size 22x19 + text run at (52,0) width 22: "\x{25A0}.\x{25A0}" + RenderText {#text} at (74,0) size 4x19 + text run at (74,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (78,0) size 22x19 + text run at (78,0) width 22: "\x{25A0}.\x{25A0}" + RenderText {#text} at (100,0) size 4x19 + text run at (100,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (104,0) size 22x19 + text run at (104,0) width 22: "\x{25A0}.\x{25A0}" + RenderText {#text} at (126,0) size 4x19 + text run at (126,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (130,0) size 22x19 + text run at (130,0) width 22: "\x{25A0}.\x{25A0}" + RenderText {#text} at (152,0) size 4x19 + text run at (152,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (156,0) size 22x19 + text run at (156,0) width 22: "\x{25A0}.\x{25A0}" + RenderText {#text} at (178,0) size 4x19 + text run at (178,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (182,0) size 22x19 + text run at (182,0) width 22: "\x{25A0}.\x{25A0}" + RenderText {#text} at (204,0) size 4x19 + text run at (204,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (208,0) size 22x19 + text run at (208,0) width 22: "\x{25A0}.\x{25A0}" + RenderText {#text} at (230,0) size 4x19 + text run at (230,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (234,0) size 22x19 + text run at (234,0) width 22: "\x{25A0}.\x{25A0}" + RenderText {#text} at (256,0) size 4x19 + text run at (256,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (260,0) size 22x19 + text run at (260,0) width 22: "\x{25A0}.\x{25A0}" + RenderText {#text} at (282,0) size 4x19 + text run at (282,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (286,0) size 22x19 + text run at (286,0) width 22: "\x{25A0}.\x{25A0}" + RenderText {#text} at (0,0) size 0x0 + RenderBlock {DIV} at (0,56) size 784x20 + RenderText {#text} at (0,0) size 380x19 + text run at (0,0) width 32: "\x{25FE}.\x{25FE} " + text run at (32,0) width 32: "\x{25FE}.\x{25FE} " + text run at (64,0) width 32: "\x{25FE}.\x{25FE} " + text run at (96,0) width 32: "\x{25FE}.\x{25FE} " + text run at (128,0) width 32: "\x{25FE}.\x{25FE} " + text run at (160,0) width 32: "\x{25FE}.\x{25FE} " + text run at (192,0) width 32: "\x{25FE}.\x{25FE} " + text run at (224,0) width 32: "\x{25FE}.\x{25FE} " + text run at (256,0) width 32: "\x{25FE}.\x{25FE} " + text run at (288,0) width 32: "\x{25FE}.\x{25FE} " + text run at (320,0) width 32: "\x{25FE}.\x{25FE} " + text run at (352,0) width 28: "\x{25FE}.\x{25FE}" diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textOnPath-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textOnPath-expected.checksum index 9d5700f..0b0a369 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textOnPath-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textOnPath-expected.checksum @@ -1 +1 @@ -a32c6e252c8091dc58aceae8956ae332
\ No newline at end of file +68aa7d08eb51eaa1a3695e7d4e3fbc23
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textOnPath-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textOnPath-expected.png Binary files differindex 14d8f58..f830e82 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textOnPath-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textOnPath-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textOnPath-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textOnPath-expected.txt new file mode 100644 index 0000000..62ec9da --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textOnPath-expected.txt @@ -0,0 +1,258 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 450x500 + RenderSVGRoot {svg} at (9,25) size 429x417 + RenderSVGContainer {g} at (9,25) size 429x417 + RenderSVGText {text} at (162,40) size 126x18 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) 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 + RenderPath {path} at (14.95,8.71) size 120.05x27.58 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderPath {path} at (29.85,12.25) size 90.30x37.75 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + 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,82) size 90.60x38 + RenderSVGContainer {g} at (29.70,82) size 90.60x38 + RenderPath {path} at (29.70,82) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,12) size 117x65 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 117x65 + RenderSVGInlineText {#text} at (-18,-9) size 41x48 + chunk 1 text run 1 at (30.45,19.25) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 28x28 + RenderSVGInlineText {#text} at (10,-26) size 28x28 + chunk 1 text run 2 at (54.87,13.51) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 62x40 + RenderSVGInlineText {#text} at (37,-17) size 62x40 + chunk 1 text run 3 at (70.95,12.57) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 66x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 66x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 66.00: "startOffset=\"0%\"" + RenderSVGText {text} at (35,70) size 75x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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 (150,66) size 121x76 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,70.00)}] + RenderSVGContainer {use} at (179.70,82) size 90.60x38 + RenderSVGContainer {g} at (179.70,82) size 90.60x38 + RenderPath {path} at (179.70,82) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,14) size 67x52 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 67x52 + RenderSVGInlineText {#text} at (-30,-14) size 0x0 + chunk 1 (middle anchor) text run 1 at (340282346638528859811704183484516925440.00,340282346638528859811704183484516925440.00) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 0x0 + RenderSVGInlineText {#text} at (-30,-14) size 0x0 + chunk 1 (middle anchor) text run 2 at (340282346638528859811704183484516925440.00,340282346638528859811704183484516925440.00) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 54x52 + RenderSVGInlineText {#text} at (-17,-18) size 54x52 + chunk 1 (middle anchor) text run 3 at (30.38,14.14) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 66x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 66x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 66.00: "startOffset=\"0%\"" + RenderSVGText {text} at (35,70) size 86x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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 (300,65) size 120.30x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,70.00)}] + RenderSVGContainer {use} at (329.70,82) size 90.60x38 + RenderSVGContainer {g} at (329.70,82) size 90.60x38 + RenderPath {path} at (329.70,82) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,12) size 76x51 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 76x51 + RenderSVGInlineText {#text} at (-30,-12) size 0x0 + chunk 1 (end anchor) text run 1 at (340282346638528859811704183484516925440.00,340282346638528859811704183484516925440.00) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 24x15 + RenderSVGInlineText {#text} at (-27,19) size 24x15 + chunk 1 (end anchor) text run 2 at (30.83,42.00) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 60x45 + RenderSVGInlineText {#text} at (-14,-17) size 60x45 + chunk 1 (end anchor) text run 3 at (33.01,12.67) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 71x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 71x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 71.00: "startOffset=\"50%\"" + RenderSVGText {text} at (35,70) size 72x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.70,165) size 116.30x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,170.00)}] + RenderSVGContainer {use} at (29.70,182) size 90.60x38 + RenderSVGContainer {g} at (29.70,182) size 90.60x38 + RenderPath {path} at (29.70,182) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (80,12) size 72x54 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 72x54 + RenderSVGInlineText {#text} at (-6,-17) size 50x36 + chunk 1 text run 1 at (80.99,12.80) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 31x31 + RenderSVGInlineText {#text} at (35,-1) size 31x31 + chunk 1 text run 2 at (114.32,30.56) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 23x8 + RenderSVGInlineText {#text} at (34,29) size 23x8 + chunk 1 text run 3 at (119.80,45.95) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 71x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 71x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 71.00: "startOffset=\"50%\"" + RenderSVGText {text} at (35,70) size 75x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.70,182) size 90.60x38 + RenderSVGContainer {g} at (179.70,182) size 90.60x38 + RenderPath {path} at (179.70,182) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (33,12) size 120x58 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 120x58 + RenderSVGInlineText {#text} at (-18,-14) size 46x45 + chunk 1 (middle anchor) text run 1 at (33.21,15.37) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 24x25 + RenderSVGInlineText {#text} at (21,-27) size 24x25 + chunk 1 (middle anchor) text run 2 at (64.06,12.52) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 58x48 + RenderSVGInlineText {#text} at (44,-17) size 58x48 + chunk 1 (middle anchor) text run 3 at (80.49,12.75) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 71x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 71x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 71.00: "startOffset=\"50%\"" + RenderSVGText {text} at (35,70) size 86x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.70,182) size 90.60x38 + RenderSVGContainer {g} at (329.70,182) size 90.60x38 + RenderPath {path} at (329.70,182) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (38,12) size 117x66 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 117x66 + RenderSVGInlineText {#text} at (-17,-17) size 49x40 + chunk 1 (end anchor) text run 1 at (38.47,13.16) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 25x24 + RenderSVGInlineText {#text} at (29,-27) size 25x24 + chunk 1 (end anchor) text run 2 at (73.56,12.52) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 52x54 + RenderSVGInlineText {#text} at (48,-15) size 52x54 + chunk 1 (end anchor) text run 3 at (89.89,14.39) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 76x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 76x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 18 width 76.00: "startOffset=\"100%\"" + RenderSVGText {text} at (35,70) size 72x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.70,256) size 108.30x86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,270.00)}] + RenderSVGContainer {use} at (29.70,282) size 90.60x38 + RenderSVGContainer {g} at (29.70,282) size 90.60x38 + RenderPath {path} at (29.70,282) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (51,12) size 100x67 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 100x67 + RenderSVGInlineText {#text} at (-13,-17) size 49x30 + chunk 1 text run 1 at (51.19,12.53) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 29x29 + RenderSVGInlineText {#text} at (34,-26) size 29x29 + chunk 1 text run 2 at (89.30,14.24) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 39x48 + RenderSVGInlineText {#text} at (48,-7) size 39x48 + chunk 1 text run 3 at (104.37,20.77) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 63x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 63x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 63.00: "startOffset=\"35\"" + RenderSVGText {text} at (35,70) size 75x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.70,282) size 90.60x38 + RenderSVGContainer {g} at (179.70,282) size 90.60x38 + RenderPath {path} at (179.70,282) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,12) size 94x56 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 94x56 + RenderSVGInlineText {#text} at (-18,12) size 28x27 + chunk 1 (middle anchor) text run 1 at (30.25,34.06) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 33x33 + RenderSVGInlineText {#text} at (-17,-16) size 33x33 + chunk 1 (middle anchor) text run 2 at (37.74,21.40) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 66x29 + RenderSVGInlineText {#text} at (10,-17) size 66x29 + chunk 1 (middle anchor) text run 3 at (50.74,12.58) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 63x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 63x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 63.00: "startOffset=\"35\"" + RenderSVGText {text} at (35,70) size 86x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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 (300,270) size 120.30x72 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,270.00)}] + RenderSVGContainer {use} at (329.70,282) size 90.60x38 + RenderSVGContainer {g} at (329.70,282) size 90.60x38 + RenderPath {path} at (329.70,282) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,23) size 49x50 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 49x50 + RenderSVGInlineText {#text} at (-30,-23) size 0x0 + chunk 1 (end anchor) text run 1 at (340282346638528859811704183484516925440.00,340282346638528859811704183484516925440.00) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 0x0 + RenderSVGInlineText {#text} at (-30,-23) size 0x0 + chunk 1 (end anchor) text run 2 at (340282346638528859811704183484516925440.00,340282346638528859811704183484516925440.00) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 37x43 + RenderSVGInlineText {#text} at (-18,-16) size 37x43 + chunk 1 (end anchor) text run 3 at (30.53,23.23) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 63x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 63x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 63.00: "startOffset=\"35\"" + RenderSVGText {text} at (35,70) size 72x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.89,378.64) size 120.11x27.73 + RenderSVGContainer {g} at (24.89,378.64) size 120.11x27.73 + RenderPath {path} at (24.89,378.64) size 120.11x27.73 [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="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (17,8) size 117x53 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 117x53 + RenderSVGTSpan {tspan} at (0,0) size 39x37 + RenderSVGInlineText {#text} at (-18,-18) size 39x37 + chunk 1 text run 1 at (17.12,11.21) startOffset 0 endOffset 5 width 32.00: "super" + RenderSVGInlineText {#text} at (19,-13) size 39x28 + chunk 1 text run 2 at (41.76,8.79) startOffset 0 endOffset 5 width 29.00: " and " + RenderSVGTSpan {tspan} at (0,0) size 27x27 + RenderSVGInlineText {#text} at (39,8) size 27x27 + chunk 1 text run 3 at (67.05,21.94) startOffset 0 endOffset 3 width 20.00: "sub" + RenderSVGInlineText {#text} at (61,4) size 38x29 + chunk 1 text run 4 at (82.94,24.86) startOffset 0 endOffset 7 width 38.00: "scripts" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (20,60) size 87x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 87x12 + chunk 1 text run 1 at (20.00,60.00) startOffset 0 endOffset 22 width 87.00: "baseline-shift=\"super\"" + RenderSVGText {text} at (20,70) size 97x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.89,378.64) size 120.11x27.73 + RenderSVGContainer {g} at (169.89,378.64) size 120.11x27.73 + RenderPath {path} at (169.89,378.64) size 120.11x27.73 [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="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (17,8) size 117x52 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 117x52 + RenderSVGTSpan {tspan} at (0,0) size 51x39 + RenderSVGInlineText {#text} at (-14,-16) size 51x39 + chunk 1 text run 1 at (17.48,8.85) startOffset 0 endOffset 8 width 44.00: "positive" + RenderSVGInlineText {#text} at (32,-11) size 34x34 + chunk 1 text run 2 at (53.47,10.27) startOffset 0 endOffset 5 width 29.00: " and " + RenderSVGTSpan {tspan} at (0,0) size 51x31 + RenderSVGInlineText {#text} at (52,5) size 51x31 + chunk 1 text run 3 at (76.55,23.38) startOffset 0 endOffset 8 width 49.00: "negative" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (20,60) size 96x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.50,366.50) size 115x65.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,390.00)}] + RenderSVGContainer {g} at (304.50,366.50) size 115x48.50 [transform={m=((0.50,0.00)(0.00,0.50)) t=(0.00,0.00)}] + RenderSVGContainer {use} at (314.85,396) size 45.30x19 + RenderSVGContainer {g} at (314.85,396) size 45.30x19 + RenderPath {path} at (314.85,396) size 45.30x19 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,-20) size 230x88 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-27) size 143x34 + chunk 1 text run 1 at (30.00,-20.00) startOffset 0 endOffset 12 width 143.00: "before path " + RenderSVGTextPath {textPath} at (0,0) size 115x56 + RenderSVGInlineText {#text} at (-21,5) size 115x56 + chunk 1 text run 2 at (35.71,12.90) startOffset 0 endOffset 7 width 89.00: "on path" + RenderSVGInlineText {#text} at (87,12) size 122x35 + chunk 1 text run 3 at (117.77,19.76) startOffset 0 endOffset 11 width 121.00: " after path" + RenderSVGText {text} at (15,40) size 96x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textStyles-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textStyles-expected.checksum index 2bc6df0..b2ca3d7 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textStyles-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textStyles-expected.checksum @@ -1 +1 @@ -19c5b5ef773966543ec7ae0b4241a0a7
\ No newline at end of file +2bdc634e05badfa1a001714a45e7674b
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textStyles-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textStyles-expected.png Binary files differindex a24ba0f..6dc67c2 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textStyles-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/batik/text/textStyles-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counter-04-b-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counter-04-b-expected.checksum index f875930..a02c059 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counter-04-b-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counter-04-b-expected.checksum @@ -1 +1 @@ -368dad7355da39c963a2b4fd5e33a54f
\ No newline at end of file +0225899955470cf88c3032349b70baa6
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counter-04-b-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counter-04-b-expected.png Binary files differindex f8378f5..af209f9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counter-04-b-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counter-04-b-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counter-04-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counter-04-b-expected.txt index 733d2f5..b827f1c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counter-04-b-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counter-04-b-expected.txt @@ -84,16 +84,16 @@ layer at (0,0) size 800x100 text run at (143,0) width 9: "\x{25A0}" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 236x19 - text run at (0,0) width 20: "\x{25FE} " - text run at (20,0) width 20: "\x{25FE} " - text run at (40,0) width 20: "\x{25FE} " - text run at (60,0) width 20: "\x{25FE} " - text run at (80,0) width 20: "\x{25FE} " - text run at (100,0) width 20: "\x{25FE} " - text run at (120,0) width 20: "\x{25FE} " - text run at (140,0) width 20: "\x{25FE} " - text run at (160,0) width 20: "\x{25FE} " - text run at (180,0) width 20: "\x{25FE} " - text run at (200,0) width 20: "\x{25FE} " - text run at (220,0) width 16: "\x{25FE}" + RenderText {#text} at (0,0) size 188x19 + text run at (0,0) width 16: "\x{25FE} " + text run at (16,0) width 16: "\x{25FE} " + text run at (32,0) width 16: "\x{25FE} " + text run at (48,0) width 16: "\x{25FE} " + text run at (64,0) width 16: "\x{25FE} " + text run at (80,0) width 16: "\x{25FE} " + text run at (96,0) width 16: "\x{25FE} " + text run at (112,0) width 16: "\x{25FE} " + text run at (128,0) width 16: "\x{25FE} " + text run at (144,0) width 16: "\x{25FE} " + text run at (160,0) width 16: "\x{25FE} " + text run at (176,0) width 12: "\x{25FE}" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counters-04-b-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counters-04-b-expected.checksum index a501b85..25d5da7 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counters-04-b-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counters-04-b-expected.checksum @@ -1 +1 @@ -5de309e01676fce247613e6ab6af98d8
\ No newline at end of file +477b2294db7086cfe2835e2fabb30327
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counters-04-b-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counters-04-b-expected.png Binary files differindex be20d84..2215e92 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counters-04-b-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counters-04-b-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counters-04-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counters-04-b-expected.txt index d2d3bda..717fa54 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counters-04-b-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1202-counters-04-b-expected.txt @@ -84,16 +84,16 @@ layer at (0,0) size 800x100 text run at (286,0) width 22: "\x{25A0}.\x{25A0}" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 476x19 - text run at (0,0) width 40: "\x{25FE}.\x{25FE} " - text run at (40,0) width 40: "\x{25FE}.\x{25FE} " - text run at (80,0) width 40: "\x{25FE}.\x{25FE} " - text run at (120,0) width 40: "\x{25FE}.\x{25FE} " - text run at (160,0) width 40: "\x{25FE}.\x{25FE} " - text run at (200,0) width 40: "\x{25FE}.\x{25FE} " - text run at (240,0) width 40: "\x{25FE}.\x{25FE} " - text run at (280,0) width 40: "\x{25FE}.\x{25FE} " - text run at (320,0) width 40: "\x{25FE}.\x{25FE} " - text run at (360,0) width 40: "\x{25FE}.\x{25FE} " - text run at (400,0) width 40: "\x{25FE}.\x{25FE} " - text run at (440,0) width 36: "\x{25FE}.\x{25FE}" + RenderText {#text} at (0,0) size 380x19 + text run at (0,0) width 32: "\x{25FE}.\x{25FE} " + text run at (32,0) width 32: "\x{25FE}.\x{25FE} " + text run at (64,0) width 32: "\x{25FE}.\x{25FE} " + text run at (96,0) width 32: "\x{25FE}.\x{25FE} " + text run at (128,0) width 32: "\x{25FE}.\x{25FE} " + text run at (160,0) width 32: "\x{25FE}.\x{25FE} " + text run at (192,0) width 32: "\x{25FE}.\x{25FE} " + text run at (224,0) width 32: "\x{25FE}.\x{25FE} " + text run at (256,0) width 32: "\x{25FE}.\x{25FE} " + text run at (288,0) width 32: "\x{25FE}.\x{25FE} " + text run at (320,0) width 32: "\x{25FE}.\x{25FE} " + text run at (352,0) width 28: "\x{25FE}.\x{25FE}" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textOnPath-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textOnPath-expected.checksum new file mode 100644 index 0000000..9b1ae41 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textOnPath-expected.checksum @@ -0,0 +1 @@ +8a8dcffe506cc22f346bd729fa7b111f
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textOnPath-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textOnPath-expected.png Binary files differnew file mode 100644 index 0000000..dcd1270 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textOnPath-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textOnPath-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textOnPath-expected.txt new file mode 100644 index 0000000..371b53f --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textOnPath-expected.txt @@ -0,0 +1,258 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 450x500 + RenderSVGRoot {svg} at (9,25) size 429x417 + RenderSVGContainer {g} at (9,25) size 429x417 + RenderSVGText {text} at (162,40) size 126x18 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-15) 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 + RenderPath {path} at (14.95,8.71) size 120.05x27.58 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderPath {path} at (29.85,12.25) size 90.30x37.75 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + 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,82) size 90.60x38 + RenderSVGContainer {g} at (29.70,82) size 90.60x38 + RenderPath {path} at (29.70,82) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,12) size 117x65 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 117x65 + RenderSVGInlineText {#text} at (-18,-9) size 41x48 + chunk 1 text run 1 at (30.45,19.25) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 28x28 + RenderSVGInlineText {#text} at (10,-26) size 28x28 + chunk 1 text run 2 at (54.87,13.51) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 62x40 + RenderSVGInlineText {#text} at (37,-17) size 62x40 + chunk 1 text run 3 at (70.95,12.57) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 66x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 66x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 66.00: "startOffset=\"0%\"" + RenderSVGText {text} at (35,70) size 75x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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 (150,66) size 121x76 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,70.00)}] + RenderSVGContainer {use} at (179.70,82) size 90.60x38 + RenderSVGContainer {g} at (179.70,82) size 90.60x38 + RenderPath {path} at (179.70,82) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,14) size 67x52 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 67x52 + RenderSVGInlineText {#text} at (-30,-14) size 0x0 + chunk 1 (middle anchor) text run 1 at (340282346638528860000000000000000000000.00,340282346638528860000000000000000000000.00) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 0x0 + RenderSVGInlineText {#text} at (-30,-14) size 0x0 + chunk 1 (middle anchor) text run 2 at (340282346638528860000000000000000000000.00,340282346638528860000000000000000000000.00) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 54x52 + RenderSVGInlineText {#text} at (-17,-18) size 54x52 + chunk 1 (middle anchor) text run 3 at (30.38,14.14) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 66x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 66x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 66.00: "startOffset=\"0%\"" + RenderSVGText {text} at (35,70) size 86x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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 (300,65) size 120.30x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,70.00)}] + RenderSVGContainer {use} at (329.70,82) size 90.60x38 + RenderSVGContainer {g} at (329.70,82) size 90.60x38 + RenderPath {path} at (329.70,82) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,12) size 76x51 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 76x51 + RenderSVGInlineText {#text} at (-30,-12) size 0x0 + chunk 1 (end anchor) text run 1 at (340282346638528860000000000000000000000.00,340282346638528860000000000000000000000.00) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 24x15 + RenderSVGInlineText {#text} at (-27,19) size 24x15 + chunk 1 (end anchor) text run 2 at (30.83,42.00) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 60x45 + RenderSVGInlineText {#text} at (-14,-17) size 60x45 + chunk 1 (end anchor) text run 3 at (33.01,12.67) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 71x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 71x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 71.00: "startOffset=\"50%\"" + RenderSVGText {text} at (35,70) size 72x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.70,165) size 116.30x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,170.00)}] + RenderSVGContainer {use} at (29.70,182) size 90.60x38 + RenderSVGContainer {g} at (29.70,182) size 90.60x38 + RenderPath {path} at (29.70,182) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (80,12) size 72x54 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 72x54 + RenderSVGInlineText {#text} at (-6,-17) size 50x36 + chunk 1 text run 1 at (80.99,12.80) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 31x31 + RenderSVGInlineText {#text} at (35,-1) size 31x31 + chunk 1 text run 2 at (114.32,30.56) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 23x8 + RenderSVGInlineText {#text} at (34,29) size 23x8 + chunk 1 text run 3 at (119.80,45.95) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 71x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 71x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 71.00: "startOffset=\"50%\"" + RenderSVGText {text} at (35,70) size 75x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.70,182) size 90.60x38 + RenderSVGContainer {g} at (179.70,182) size 90.60x38 + RenderPath {path} at (179.70,182) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (33,12) size 120x58 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 120x58 + RenderSVGInlineText {#text} at (-18,-14) size 46x45 + chunk 1 (middle anchor) text run 1 at (33.21,15.37) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 24x25 + RenderSVGInlineText {#text} at (21,-27) size 24x25 + chunk 1 (middle anchor) text run 2 at (64.06,12.52) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 58x48 + RenderSVGInlineText {#text} at (44,-17) size 58x48 + chunk 1 (middle anchor) text run 3 at (80.49,12.75) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 71x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 71x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 71.00: "startOffset=\"50%\"" + RenderSVGText {text} at (35,70) size 86x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.70,182) size 90.60x38 + RenderSVGContainer {g} at (329.70,182) size 90.60x38 + RenderPath {path} at (329.70,182) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (38,12) size 117x66 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 117x66 + RenderSVGInlineText {#text} at (-17,-17) size 49x40 + chunk 1 (end anchor) text run 1 at (38.47,13.16) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 25x24 + RenderSVGInlineText {#text} at (29,-27) size 25x24 + chunk 1 (end anchor) text run 2 at (73.56,12.52) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 52x54 + RenderSVGInlineText {#text} at (48,-15) size 52x54 + chunk 1 (end anchor) text run 3 at (89.89,14.39) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 76x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 76x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 18 width 76.00: "startOffset=\"100%\"" + RenderSVGText {text} at (35,70) size 72x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.70,256) size 108.30x86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,270.00)}] + RenderSVGContainer {use} at (29.70,282) size 90.60x38 + RenderSVGContainer {g} at (29.70,282) size 90.60x38 + RenderPath {path} at (29.70,282) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (51,12) size 100x67 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 100x67 + RenderSVGInlineText {#text} at (-13,-17) size 49x30 + chunk 1 text run 1 at (51.19,12.53) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 29x29 + RenderSVGInlineText {#text} at (34,-26) size 29x29 + chunk 1 text run 2 at (89.30,14.24) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 39x48 + RenderSVGInlineText {#text} at (48,-7) size 39x48 + chunk 1 text run 3 at (104.37,20.77) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 63x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 63x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 63.00: "startOffset=\"35\"" + RenderSVGText {text} at (35,70) size 75x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.70,282) size 90.60x38 + RenderSVGContainer {g} at (179.70,282) size 90.60x38 + RenderPath {path} at (179.70,282) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,12) size 94x56 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 94x56 + RenderSVGInlineText {#text} at (-18,12) size 28x27 + chunk 1 (middle anchor) text run 1 at (30.25,34.06) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 33x33 + RenderSVGInlineText {#text} at (-17,-16) size 33x33 + chunk 1 (middle anchor) text run 2 at (37.74,21.40) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 66x29 + RenderSVGInlineText {#text} at (10,-17) size 66x29 + chunk 1 (middle anchor) text run 3 at (50.74,12.58) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 63x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 63x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 63.00: "startOffset=\"35\"" + RenderSVGText {text} at (35,70) size 86x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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 (300,270) size 120.30x72 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,270.00)}] + RenderSVGContainer {use} at (329.70,282) size 90.60x38 + RenderSVGContainer {g} at (329.70,282) size 90.60x38 + RenderPath {path} at (329.70,282) size 90.60x38 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,23) size 49x50 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 49x50 + RenderSVGInlineText {#text} at (-30,-23) size 0x0 + chunk 1 (end anchor) text run 1 at (340282346638528860000000000000000000000.00,340282346638528860000000000000000000000.00) startOffset 0 endOffset 5 width 40.00: "Text " + RenderSVGTSpan {tspan} at (0,0) size 0x0 + RenderSVGInlineText {#text} at (-30,-23) size 0x0 + chunk 1 (end anchor) text run 2 at (340282346638528860000000000000000000000.00,340282346638528860000000000000000000000.00) startOffset 0 endOffset 2 width 19.00: "on" + RenderSVGTSpan {tspan} at (0,0) size 37x43 + RenderSVGInlineText {#text} at (-18,-16) size 37x43 + chunk 1 (end anchor) text run 3 at (30.53,23.23) startOffset 0 endOffset 7 width 53.00: " a Path" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (35,60) size 63x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 63x12 + chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 63.00: "startOffset=\"35\"" + RenderSVGText {text} at (35,70) size 72x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.89,378.64) size 120.11x27.73 + RenderSVGContainer {g} at (24.89,378.64) size 120.11x27.73 + RenderPath {path} at (24.89,378.64) size 120.11x27.73 [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="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (17,8) size 117x53 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 117x53 + RenderSVGTSpan {tspan} at (0,0) size 39x37 + RenderSVGInlineText {#text} at (-18,-18) size 39x37 + chunk 1 text run 1 at (17.12,11.21) startOffset 0 endOffset 5 width 32.00: "super" + RenderSVGInlineText {#text} at (19,-13) size 39x28 + chunk 1 text run 2 at (41.76,8.79) startOffset 0 endOffset 5 width 29.00: " and " + RenderSVGTSpan {tspan} at (0,0) size 27x27 + RenderSVGInlineText {#text} at (39,8) size 27x27 + chunk 1 text run 3 at (67.05,21.94) startOffset 0 endOffset 3 width 20.00: "sub" + RenderSVGInlineText {#text} at (61,4) size 38x29 + chunk 1 text run 4 at (82.94,24.86) startOffset 0 endOffset 7 width 38.00: "scripts" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (20,60) size 87x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) size 87x12 + chunk 1 text run 1 at (20.00,60.00) startOffset 0 endOffset 22 width 87.00: "baseline-shift=\"super\"" + RenderSVGText {text} at (20,70) size 97x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.89,378.64) size 120.11x27.73 + RenderSVGContainer {g} at (169.89,378.64) size 120.11x27.73 + RenderPath {path} at (169.89,378.64) size 120.11x27.73 [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="M100.00,200.00 C200.00,100.00,300.00,0.00,400.00,100.00 C500.00,200.00,600.00,300.00,700.00,200.00 C800.00,100.00,900.00,100.00,900.00,100.00"] + RenderSVGText {text} at (17,8) size 117x52 contains 1 chunk(s) + RenderSVGTextPath {textPath} at (0,0) size 117x52 + RenderSVGTSpan {tspan} at (0,0) size 51x39 + RenderSVGInlineText {#text} at (-14,-16) size 51x39 + chunk 1 text run 1 at (17.48,8.85) startOffset 0 endOffset 8 width 44.00: "positive" + RenderSVGInlineText {#text} at (32,-11) size 34x34 + chunk 1 text run 2 at (53.47,10.27) startOffset 0 endOffset 5 width 29.00: " and " + RenderSVGTSpan {tspan} at (0,0) size 51x31 + RenderSVGInlineText {#text} at (52,5) size 51x31 + chunk 1 text run 3 at (76.55,23.38) startOffset 0 endOffset 8 width 49.00: "negative" + RenderSVGInlineText {#text} at (0,0) size 0x0 + RenderSVGText {text} at (20,60) size 96x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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.50,366.50) size 115x65.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,390.00)}] + RenderSVGContainer {g} at (304.50,366.50) size 115x48.50 [transform={m=((0.50,0.00)(0.00,0.50)) t=(0.00,0.00)}] + RenderSVGContainer {use} at (314.85,396) size 45.30x19 + RenderSVGContainer {g} at (314.85,396) size 45.30x19 + RenderPath {path} at (314.85,396) size 45.30x19 [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="M100.00,100.00 C100.00,0.00,400.00,0.00,400.00,100.00"] + RenderSVGText {text} at (30,-20) size 230x88 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-27) size 143x34 + chunk 1 text run 1 at (30.00,-20.00) startOffset 0 endOffset 12 width 143.00: "before path " + RenderSVGTextPath {textPath} at (0,0) size 115x56 + RenderSVGInlineText {#text} at (-21,5) size 115x56 + chunk 1 text run 2 at (35.71,12.90) startOffset 0 endOffset 7 width 89.00: "on path" + RenderSVGInlineText {#text} at (87,12) size 122x35 + chunk 1 text run 3 at (117.77,19.76) startOffset 0 endOffset 11 width 121.00: " after path" + RenderSVGText {text} at (15,40) size 96x12 contains 1 chunk(s) + RenderSVGInlineText {#text} at (0,-10) 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 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textStyles-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textStyles-expected.checksum index ed9646a..cf844ef 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textStyles-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textStyles-expected.checksum @@ -1 +1 @@ -7deb53195f7b1dfb321a8134aaa19cc2
\ No newline at end of file +e0226432ff3598458f54fc7d645073d1
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textStyles-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textStyles-expected.png Binary files differindex 0f7c242..2eb5c13 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textStyles-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textStyles-expected.png diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index cdd6194..6264396 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -416,11 +416,6 @@ BUG8941 MAC : LayoutTests/http/tests/xmlhttprequest/web-apps/013.html = FAIL TIM // This class of test fails because of size differences in text runs. // Mostly this is because of international text rendering differences. -// These fail now that we use the same font code path in test_shell -// as in Chrome -BUG1316221 LINUX WIN : LayoutTests/css2.1/t1202-counter-04-b.html = FAIL -BUG1316221 LINUX WIN : LayoutTests/css2.1/t1202-counters-04-b.html = FAIL - // The max length doesn't appear to be applied correctly (or the test needs // changing), and furthermore, the over- and under-lines aren't placed // properly over the "x". @@ -749,8 +744,8 @@ BUG8635 LINUX WIN : LayoutTests/svg/custom/pattern-cycle-detection.svg = FAIL // Shows garbage instead of an image BUG8635 LINUX WIN : LayoutTests/svg/W3C-SVG-1.1/struct-use-01-t.svg = FAIL -BUG5641 LINUX WIN : LayoutTests/svg/batik/text/textEffect.svg = FAIL -BUG5641 LINUX WIN : LayoutTests/svg/batik/text/textEffect3.svg = FAIL +BUG19559 LINUX WIN : LayoutTests/svg/batik/text/textEffect.svg = FAIL +BUG19559 LINUX WIN : LayoutTests/svg/batik/text/textEffect3.svg = FAIL BUG8763 LINUX WIN : LayoutTests/svg/custom/use-on-g-containing-foreignObject-and-image.svg = FAIL @@ -860,8 +855,6 @@ BUG992321 SKIP : LayoutTests/svg/batik/text/smallFonts.svg = FAIL BUG992321 : LayoutTests/svg/batik/text/textBiDi.svg = FAIL // pixeltest failure: font baseline should be on the path, not the centerline -BUG992321 LINUX WIN : LayoutTests/svg/batik/text/textOnPath.svg = FAIL -// pixeltest failure: font baseline should be on the path, not the centerline BUG992321 LINUX WIN : LayoutTests/svg/batik/text/verticalTextOnPath.svg = FAIL BUG992321 LINUX WIN : LayoutTests/svg/custom/path-textPath-simulation.svg = FAIL @@ -900,11 +893,6 @@ BUG992321 LINUX : LayoutTests/svg/hixie/text/001-broken.xml = FAIL // ignore console messages while doing a pixel dump BUG992321 : LayoutTests/svg/custom/clip-path-referencing-use2.svg = FAIL PASS -// These flakily fail image diffs. Punting on SVG for now. -// Note that the "expected" images checked in are not necessarily correct. -// pixeltest failure: font baseline should be on the path, not the centerline -BUG1107191 : LayoutTests/svg/batik/text/textStyles.svg = FAIL PASS - // These two tests have a highlight color that is different from the Mac, // which is normal because selection color is different between Mac and // Windows, but even so it still doesn't look identical because there is still |
