[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 18:05:49 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d1612f8797e073817591dc7f46cb8f7c51843684
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 7 00:58:15 2010 +0000
2010-12-06 Cosmin Truta <ctruta at chromium.org>
Reviewed by Eric Seidel.
Fix testcase: textPath cannot be inside another textPath
https://bugs.webkit.org/show_bug.cgi?id=50211
* platform/mac/svg/custom/text-linking-expected.checksum: Updated.
* platform/mac/svg/custom/text-linking-expected.png: Updated.
* platform/mac/svg/custom/text-linking-expected.txt: Updated.
* platform/chromium-linux/svg/custom/text-linking-expected.checksum: Updated.
* platform/chromium-linux/svg/custom/text-linking-expected.png: Updated.
* platform/chromium-linux/svg/custom/text-linking-expected.txt: Updated.
* platform/chromium-win-vista/svg/custom/text-linking-expected.checksum: Deleted.
* platform/chromium-win-vista/svg/custom/text-linking-expected.png: Deleted.
* platform/chromium-win-vista/svg/custom/text-linking-expected.txt: Deleted.
* platform/chromium-win-xp/svg/custom/text-linking-expected.checksum: Deleted.
* platform/chromium-win-xp/svg/custom/text-linking-expected.png: Deleted.
* platform/chromium-win-xp/svg/custom/text-linking-expected.txt: Deleted.
* svg/custom/text-linking.svg: Removed test for <textPath> inside <textPath>.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73415 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 225c383..e33f4eb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2010-12-06 Cosmin Truta <ctruta at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ Fix testcase: textPath cannot be inside another textPath
+ https://bugs.webkit.org/show_bug.cgi?id=50211
+
+ * platform/mac/svg/custom/text-linking-expected.checksum: Updated.
+ * platform/mac/svg/custom/text-linking-expected.png: Updated.
+ * platform/mac/svg/custom/text-linking-expected.txt: Updated.
+ * platform/chromium-linux/svg/custom/text-linking-expected.checksum: Updated.
+ * platform/chromium-linux/svg/custom/text-linking-expected.png: Updated.
+ * platform/chromium-linux/svg/custom/text-linking-expected.txt: Updated.
+ * platform/chromium-win-vista/svg/custom/text-linking-expected.checksum: Deleted.
+ * platform/chromium-win-vista/svg/custom/text-linking-expected.png: Deleted.
+ * platform/chromium-win-vista/svg/custom/text-linking-expected.txt: Deleted.
+ * platform/chromium-win-xp/svg/custom/text-linking-expected.checksum: Deleted.
+ * platform/chromium-win-xp/svg/custom/text-linking-expected.png: Deleted.
+ * platform/chromium-win-xp/svg/custom/text-linking-expected.txt: Deleted.
+ * svg/custom/text-linking.svg: Removed test for <textPath> inside <textPath>.
+
2010-12-06 Jon Honeycutt <jhoneycutt at apple.com>
Update Windows results after r73385.
diff --git a/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.checksum b/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.checksum
index 8a6c1a3..86159af 100644
--- a/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.checksum
+++ b/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.checksum
@@ -1 +1 @@
-c175719f6d5369de56b485a59183a07e
\ No newline at end of file
+64119c2a61ff435385e7fa8ead203e0d
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.png b/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.png
index b3f045d..c2705c0 100644
Binary files a/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.png and b/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.png differ
diff --git a/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.txt b/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.txt
index 96c7f23..e7ce37a 100644
--- a/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.txt
+++ b/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.txt
@@ -1,13 +1,12 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (97,35) size 225x269
+ RenderSVGRoot {svg} at (97,35) size 225x219
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGText {text} at (0,-15) size 159x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 159x19
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 25 width 159.00: "Referenced character data"
RenderSVGPath {path} at (100,140) size 100x10 [fill={[type=SOLID] [color=#000000]}] [data="M 100 150 L 150 140 L 200 150"]
- RenderSVGPath {path} at (100,240) size 200x10 [fill={[type=SOLID] [color=#000000]}] [data="M 100 250 L 150 240 L 200 250 L 250 240 L 300 250"]
RenderSVGText {text} at (100,35) size 71x19 contains 1 chunk(s)
RenderSVGInline {a} at (0,0) size 71x19
RenderSVGTSpan {tspan} at (0,0) size 71x19
@@ -47,44 +46,11 @@ layer at (0,0) size 800x600
chunk 1 text run 1 at (100.00,200.00) startOffset 0 endOffset 1 width 11.00: "A"
RenderSVGInlineText {#text} at (11,0) size 91x19
chunk 1 text run 1 at (111.00,200.00) startOffset 0 endOffset 15 width 91.00: "ltGlyph content"
- RenderSVGText {text}
- RenderSVGInline {a} at (0,0) size 0x0
- RenderSVGText {text} at (100,285) size 121x19 contains 1 chunk(s)
+ RenderSVGText {text} at (100,235) size 121x19 contains 1 chunk(s)
RenderSVGTSpan {tspan} at (0,0) size 121x19
RenderSVGInline {a} at (0,0) size 121x19
RenderSVGTSpan {tspan} at (0,0) size 121x19
RenderSVGInlineText {#text} at (0,0) size 121x19
- chunk 1 text run 1 at (100.00,300.00) startOffset 0 endOffset 22 width 121.00: "tspan in link in tspan"
- RenderSVGText {text} at (97,224) size 156x30 contains 1 chunk(s)
- RenderSVGTextPath {textPath} at (0,0) size 156x30
- RenderSVGInline {a} at (0,0) size 156x30
- RenderSVGTextPath {textPath} at (0,0) size 156x30
- RenderSVGInlineText {#text} at (0,0) size 156x30
- chunk 1 text run 1 at (101.96,249.61) startOffset 0 endOffset 1 width 4.00: "t"
- chunk 1 text run 2 at (107.35,248.53) startOffset 1 endOffset 2 width 7.00: "e"
- chunk 1 text run 3 at (114.22,247.16) startOffset 2 endOffset 3 width 7.00: "x"
- chunk 1 text run 4 at (119.61,246.08) startOffset 3 endOffset 4 width 4.00: "t"
- chunk 1 text run 5 at (125.99,244.80) startOffset 4 endOffset 5 width 9.00: "P"
- chunk 1 text run 6 at (133.83,243.23) startOffset 5 endOffset 6 width 7.00: "a"
- chunk 1 text run 7 at (139.22,242.16) startOffset 6 endOffset 7 width 4.00: "t"
- chunk 1 text run 8 at (144.62,241.08) startOffset 7 endOffset 8 width 7.00: "h"
- chunk 1 text run 9 at (150.01,240.00) startOffset 8 endOffset 9 width 4.00: " "
- chunk 1 text run 10 at (153.44,240.69) startOffset 9 endOffset 10 width 3.00: "i"
- chunk 1 text run 11 at (158.34,241.67) startOffset 10 endOffset 11 width 7.00: "n"
- chunk 1 text run 12 at (163.74,242.75) startOffset 11 endOffset 12 width 4.00: " "
- chunk 1 text run 13 at (167.17,243.43) startOffset 12 endOffset 13 width 3.00: "l"
- chunk 1 text run 14 at (170.11,244.02) startOffset 13 endOffset 14 width 3.00: "i"
- chunk 1 text run 15 at (175.01,245.00) startOffset 14 endOffset 15 width 7.00: "n"
- chunk 1 text run 16 at (182.37,246.47) startOffset 15 endOffset 16 width 8.00: "k"
- chunk 1 text run 17 at (188.25,247.65) startOffset 16 endOffset 17 width 4.00: " "
- chunk 1 text run 18 at (191.68,248.34) startOffset 17 endOffset 18 width 3.00: "i"
- chunk 1 text run 19 at (196.59,249.32) startOffset 18 endOffset 19 width 7.00: "n"
- chunk 1 text run 20 at (201.98,249.60) startOffset 19 endOffset 20 width 4.00: " "
- chunk 1 text run 21 at (205.90,248.82) startOffset 20 endOffset 21 width 4.00: "t"
- chunk 1 text run 22 at (211.30,247.74) startOffset 21 endOffset 22 width 7.00: "e"
- chunk 1 text run 23 at (218.16,246.37) startOffset 22 endOffset 23 width 7.00: "x"
- chunk 1 text run 24 at (223.55,245.29) startOffset 23 endOffset 24 width 4.00: "t"
- chunk 1 text run 25 at (229.93,244.01) startOffset 24 endOffset 25 width 9.00: "P"
- chunk 1 text run 26 at (237.77,242.45) startOffset 25 endOffset 26 width 7.00: "a"
- chunk 1 text run 27 at (243.16,241.37) startOffset 26 endOffset 27 width 4.00: "t"
- chunk 1 text run 28 at (248.56,240.29) startOffset 27 endOffset 28 width 7.00: "h"
+ chunk 1 text run 1 at (100.00,250.00) startOffset 0 endOffset 22 width 121.00: "tspan in link in tspan"
+ RenderSVGText {text}
+ RenderSVGInline {a} at (0,0) size 0x0
diff --git a/LayoutTests/platform/chromium-win-vista/svg/custom/text-linking-expected.checksum b/LayoutTests/platform/chromium-win-vista/svg/custom/text-linking-expected.checksum
deleted file mode 100644
index 7c4ead7..0000000
--- a/LayoutTests/platform/chromium-win-vista/svg/custom/text-linking-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-086af8d874de93e8eb480390f348046a
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win-vista/svg/custom/text-linking-expected.png b/LayoutTests/platform/chromium-win-vista/svg/custom/text-linking-expected.png
deleted file mode 100644
index e063ca7..0000000
Binary files a/LayoutTests/platform/chromium-win-vista/svg/custom/text-linking-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win-vista/svg/custom/text-linking-expected.txt b/LayoutTests/platform/chromium-win-vista/svg/custom/text-linking-expected.txt
deleted file mode 100644
index 96c7f23..0000000
--- a/LayoutTests/platform/chromium-win-vista/svg/custom/text-linking-expected.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (97,35) size 225x269
- RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGText {text} at (0,-15) size 159x19 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 159x19
- chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 25 width 159.00: "Referenced character data"
- RenderSVGPath {path} at (100,140) size 100x10 [fill={[type=SOLID] [color=#000000]}] [data="M 100 150 L 150 140 L 200 150"]
- RenderSVGPath {path} at (100,240) size 200x10 [fill={[type=SOLID] [color=#000000]}] [data="M 100 250 L 150 240 L 200 250 L 250 240 L 300 250"]
- RenderSVGText {text} at (100,35) size 71x19 contains 1 chunk(s)
- RenderSVGInline {a} at (0,0) size 71x19
- RenderSVGTSpan {tspan} at (0,0) size 71x19
- RenderSVGInlineText {#text} at (0,0) size 71x19
- chunk 1 text run 1 at (100.00,50.00) startOffset 0 endOffset 13 width 71.00: "tspan in link"
- RenderSVGText {text} at (100,85) size 222x19 contains 1 chunk(s)
- RenderSVGInline {a} at (0,0) size 222x19
- RenderSVGInline {tref} at (0,0) size 222x19
- RenderSVGInlineText {#text} at (0,0) size 163x19
- chunk 1 text run 1 at (100.00,100.00) startOffset 0 endOffset 26 width 163.00: "Referenced character data "
- RenderSVGInlineText {#text} at (163,0) size 59x19
- chunk 1 text run 1 at (263.00,100.00) startOffset 0 endOffset 12 width 59.00: "tref in link"
- RenderSVGText {text} at (97,124) size 93x30 contains 1 chunk(s)
- RenderSVGInline {a} at (0,0) size 93x30
- RenderSVGTextPath {textPath} at (0,0) size 93x30
- RenderSVGInlineText {#text} at (0,0) size 93x30
- chunk 1 text run 1 at (101.96,149.61) startOffset 0 endOffset 1 width 4.00: "t"
- chunk 1 text run 2 at (107.35,148.53) startOffset 1 endOffset 2 width 7.00: "e"
- chunk 1 text run 3 at (114.22,147.16) startOffset 2 endOffset 3 width 7.00: "x"
- chunk 1 text run 4 at (119.61,146.08) startOffset 3 endOffset 4 width 4.00: "t"
- chunk 1 text run 5 at (125.99,144.80) startOffset 4 endOffset 5 width 9.00: "P"
- chunk 1 text run 6 at (133.83,143.23) startOffset 5 endOffset 6 width 7.00: "a"
- chunk 1 text run 7 at (139.22,142.16) startOffset 6 endOffset 7 width 4.00: "t"
- chunk 1 text run 8 at (144.62,141.08) startOffset 7 endOffset 8 width 7.00: "h"
- chunk 1 text run 9 at (150.01,140.00) startOffset 8 endOffset 9 width 4.00: " "
- chunk 1 text run 10 at (153.44,140.69) startOffset 9 endOffset 10 width 3.00: "i"
- chunk 1 text run 11 at (158.34,141.67) startOffset 10 endOffset 11 width 7.00: "n"
- chunk 1 text run 12 at (163.74,142.75) startOffset 11 endOffset 12 width 4.00: " "
- chunk 1 text run 13 at (167.17,143.43) startOffset 12 endOffset 13 width 3.00: "l"
- chunk 1 text run 14 at (170.11,144.02) startOffset 13 endOffset 14 width 3.00: "i"
- chunk 1 text run 15 at (175.01,145.00) startOffset 14 endOffset 15 width 7.00: "n"
- chunk 1 text run 16 at (182.37,146.47) startOffset 15 endOffset 16 width 8.00: "k"
- RenderSVGText {text} at (100,185) size 102x19 contains 1 chunk(s)
- RenderSVGInline {a} at (0,0) size 102x19
- RenderSVGTSpan {altGlyph} at (0,0) size 11x19
- RenderSVGInlineText {#text} at (0,0) size 11x19
- chunk 1 text run 1 at (100.00,200.00) startOffset 0 endOffset 1 width 11.00: "A"
- RenderSVGInlineText {#text} at (11,0) size 91x19
- chunk 1 text run 1 at (111.00,200.00) startOffset 0 endOffset 15 width 91.00: "ltGlyph content"
- RenderSVGText {text}
- RenderSVGInline {a} at (0,0) size 0x0
- RenderSVGText {text} at (100,285) size 121x19 contains 1 chunk(s)
- RenderSVGTSpan {tspan} at (0,0) size 121x19
- RenderSVGInline {a} at (0,0) size 121x19
- RenderSVGTSpan {tspan} at (0,0) size 121x19
- RenderSVGInlineText {#text} at (0,0) size 121x19
- chunk 1 text run 1 at (100.00,300.00) startOffset 0 endOffset 22 width 121.00: "tspan in link in tspan"
- RenderSVGText {text} at (97,224) size 156x30 contains 1 chunk(s)
- RenderSVGTextPath {textPath} at (0,0) size 156x30
- RenderSVGInline {a} at (0,0) size 156x30
- RenderSVGTextPath {textPath} at (0,0) size 156x30
- RenderSVGInlineText {#text} at (0,0) size 156x30
- chunk 1 text run 1 at (101.96,249.61) startOffset 0 endOffset 1 width 4.00: "t"
- chunk 1 text run 2 at (107.35,248.53) startOffset 1 endOffset 2 width 7.00: "e"
- chunk 1 text run 3 at (114.22,247.16) startOffset 2 endOffset 3 width 7.00: "x"
- chunk 1 text run 4 at (119.61,246.08) startOffset 3 endOffset 4 width 4.00: "t"
- chunk 1 text run 5 at (125.99,244.80) startOffset 4 endOffset 5 width 9.00: "P"
- chunk 1 text run 6 at (133.83,243.23) startOffset 5 endOffset 6 width 7.00: "a"
- chunk 1 text run 7 at (139.22,242.16) startOffset 6 endOffset 7 width 4.00: "t"
- chunk 1 text run 8 at (144.62,241.08) startOffset 7 endOffset 8 width 7.00: "h"
- chunk 1 text run 9 at (150.01,240.00) startOffset 8 endOffset 9 width 4.00: " "
- chunk 1 text run 10 at (153.44,240.69) startOffset 9 endOffset 10 width 3.00: "i"
- chunk 1 text run 11 at (158.34,241.67) startOffset 10 endOffset 11 width 7.00: "n"
- chunk 1 text run 12 at (163.74,242.75) startOffset 11 endOffset 12 width 4.00: " "
- chunk 1 text run 13 at (167.17,243.43) startOffset 12 endOffset 13 width 3.00: "l"
- chunk 1 text run 14 at (170.11,244.02) startOffset 13 endOffset 14 width 3.00: "i"
- chunk 1 text run 15 at (175.01,245.00) startOffset 14 endOffset 15 width 7.00: "n"
- chunk 1 text run 16 at (182.37,246.47) startOffset 15 endOffset 16 width 8.00: "k"
- chunk 1 text run 17 at (188.25,247.65) startOffset 16 endOffset 17 width 4.00: " "
- chunk 1 text run 18 at (191.68,248.34) startOffset 17 endOffset 18 width 3.00: "i"
- chunk 1 text run 19 at (196.59,249.32) startOffset 18 endOffset 19 width 7.00: "n"
- chunk 1 text run 20 at (201.98,249.60) startOffset 19 endOffset 20 width 4.00: " "
- chunk 1 text run 21 at (205.90,248.82) startOffset 20 endOffset 21 width 4.00: "t"
- chunk 1 text run 22 at (211.30,247.74) startOffset 21 endOffset 22 width 7.00: "e"
- chunk 1 text run 23 at (218.16,246.37) startOffset 22 endOffset 23 width 7.00: "x"
- chunk 1 text run 24 at (223.55,245.29) startOffset 23 endOffset 24 width 4.00: "t"
- chunk 1 text run 25 at (229.93,244.01) startOffset 24 endOffset 25 width 9.00: "P"
- chunk 1 text run 26 at (237.77,242.45) startOffset 25 endOffset 26 width 7.00: "a"
- chunk 1 text run 27 at (243.16,241.37) startOffset 26 endOffset 27 width 4.00: "t"
- chunk 1 text run 28 at (248.56,240.29) startOffset 27 endOffset 28 width 7.00: "h"
diff --git a/LayoutTests/platform/chromium-win-xp/svg/custom/text-linking-expected.checksum b/LayoutTests/platform/chromium-win-xp/svg/custom/text-linking-expected.checksum
deleted file mode 100644
index 7c4ead7..0000000
--- a/LayoutTests/platform/chromium-win-xp/svg/custom/text-linking-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-086af8d874de93e8eb480390f348046a
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win-xp/svg/custom/text-linking-expected.png b/LayoutTests/platform/chromium-win-xp/svg/custom/text-linking-expected.png
deleted file mode 100644
index e063ca7..0000000
Binary files a/LayoutTests/platform/chromium-win-xp/svg/custom/text-linking-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win-xp/svg/custom/text-linking-expected.txt b/LayoutTests/platform/chromium-win-xp/svg/custom/text-linking-expected.txt
deleted file mode 100644
index 96c7f23..0000000
--- a/LayoutTests/platform/chromium-win-xp/svg/custom/text-linking-expected.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (97,35) size 225x269
- RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGText {text} at (0,-15) size 159x19 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 159x19
- chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 25 width 159.00: "Referenced character data"
- RenderSVGPath {path} at (100,140) size 100x10 [fill={[type=SOLID] [color=#000000]}] [data="M 100 150 L 150 140 L 200 150"]
- RenderSVGPath {path} at (100,240) size 200x10 [fill={[type=SOLID] [color=#000000]}] [data="M 100 250 L 150 240 L 200 250 L 250 240 L 300 250"]
- RenderSVGText {text} at (100,35) size 71x19 contains 1 chunk(s)
- RenderSVGInline {a} at (0,0) size 71x19
- RenderSVGTSpan {tspan} at (0,0) size 71x19
- RenderSVGInlineText {#text} at (0,0) size 71x19
- chunk 1 text run 1 at (100.00,50.00) startOffset 0 endOffset 13 width 71.00: "tspan in link"
- RenderSVGText {text} at (100,85) size 222x19 contains 1 chunk(s)
- RenderSVGInline {a} at (0,0) size 222x19
- RenderSVGInline {tref} at (0,0) size 222x19
- RenderSVGInlineText {#text} at (0,0) size 163x19
- chunk 1 text run 1 at (100.00,100.00) startOffset 0 endOffset 26 width 163.00: "Referenced character data "
- RenderSVGInlineText {#text} at (163,0) size 59x19
- chunk 1 text run 1 at (263.00,100.00) startOffset 0 endOffset 12 width 59.00: "tref in link"
- RenderSVGText {text} at (97,124) size 93x30 contains 1 chunk(s)
- RenderSVGInline {a} at (0,0) size 93x30
- RenderSVGTextPath {textPath} at (0,0) size 93x30
- RenderSVGInlineText {#text} at (0,0) size 93x30
- chunk 1 text run 1 at (101.96,149.61) startOffset 0 endOffset 1 width 4.00: "t"
- chunk 1 text run 2 at (107.35,148.53) startOffset 1 endOffset 2 width 7.00: "e"
- chunk 1 text run 3 at (114.22,147.16) startOffset 2 endOffset 3 width 7.00: "x"
- chunk 1 text run 4 at (119.61,146.08) startOffset 3 endOffset 4 width 4.00: "t"
- chunk 1 text run 5 at (125.99,144.80) startOffset 4 endOffset 5 width 9.00: "P"
- chunk 1 text run 6 at (133.83,143.23) startOffset 5 endOffset 6 width 7.00: "a"
- chunk 1 text run 7 at (139.22,142.16) startOffset 6 endOffset 7 width 4.00: "t"
- chunk 1 text run 8 at (144.62,141.08) startOffset 7 endOffset 8 width 7.00: "h"
- chunk 1 text run 9 at (150.01,140.00) startOffset 8 endOffset 9 width 4.00: " "
- chunk 1 text run 10 at (153.44,140.69) startOffset 9 endOffset 10 width 3.00: "i"
- chunk 1 text run 11 at (158.34,141.67) startOffset 10 endOffset 11 width 7.00: "n"
- chunk 1 text run 12 at (163.74,142.75) startOffset 11 endOffset 12 width 4.00: " "
- chunk 1 text run 13 at (167.17,143.43) startOffset 12 endOffset 13 width 3.00: "l"
- chunk 1 text run 14 at (170.11,144.02) startOffset 13 endOffset 14 width 3.00: "i"
- chunk 1 text run 15 at (175.01,145.00) startOffset 14 endOffset 15 width 7.00: "n"
- chunk 1 text run 16 at (182.37,146.47) startOffset 15 endOffset 16 width 8.00: "k"
- RenderSVGText {text} at (100,185) size 102x19 contains 1 chunk(s)
- RenderSVGInline {a} at (0,0) size 102x19
- RenderSVGTSpan {altGlyph} at (0,0) size 11x19
- RenderSVGInlineText {#text} at (0,0) size 11x19
- chunk 1 text run 1 at (100.00,200.00) startOffset 0 endOffset 1 width 11.00: "A"
- RenderSVGInlineText {#text} at (11,0) size 91x19
- chunk 1 text run 1 at (111.00,200.00) startOffset 0 endOffset 15 width 91.00: "ltGlyph content"
- RenderSVGText {text}
- RenderSVGInline {a} at (0,0) size 0x0
- RenderSVGText {text} at (100,285) size 121x19 contains 1 chunk(s)
- RenderSVGTSpan {tspan} at (0,0) size 121x19
- RenderSVGInline {a} at (0,0) size 121x19
- RenderSVGTSpan {tspan} at (0,0) size 121x19
- RenderSVGInlineText {#text} at (0,0) size 121x19
- chunk 1 text run 1 at (100.00,300.00) startOffset 0 endOffset 22 width 121.00: "tspan in link in tspan"
- RenderSVGText {text} at (97,224) size 156x30 contains 1 chunk(s)
- RenderSVGTextPath {textPath} at (0,0) size 156x30
- RenderSVGInline {a} at (0,0) size 156x30
- RenderSVGTextPath {textPath} at (0,0) size 156x30
- RenderSVGInlineText {#text} at (0,0) size 156x30
- chunk 1 text run 1 at (101.96,249.61) startOffset 0 endOffset 1 width 4.00: "t"
- chunk 1 text run 2 at (107.35,248.53) startOffset 1 endOffset 2 width 7.00: "e"
- chunk 1 text run 3 at (114.22,247.16) startOffset 2 endOffset 3 width 7.00: "x"
- chunk 1 text run 4 at (119.61,246.08) startOffset 3 endOffset 4 width 4.00: "t"
- chunk 1 text run 5 at (125.99,244.80) startOffset 4 endOffset 5 width 9.00: "P"
- chunk 1 text run 6 at (133.83,243.23) startOffset 5 endOffset 6 width 7.00: "a"
- chunk 1 text run 7 at (139.22,242.16) startOffset 6 endOffset 7 width 4.00: "t"
- chunk 1 text run 8 at (144.62,241.08) startOffset 7 endOffset 8 width 7.00: "h"
- chunk 1 text run 9 at (150.01,240.00) startOffset 8 endOffset 9 width 4.00: " "
- chunk 1 text run 10 at (153.44,240.69) startOffset 9 endOffset 10 width 3.00: "i"
- chunk 1 text run 11 at (158.34,241.67) startOffset 10 endOffset 11 width 7.00: "n"
- chunk 1 text run 12 at (163.74,242.75) startOffset 11 endOffset 12 width 4.00: " "
- chunk 1 text run 13 at (167.17,243.43) startOffset 12 endOffset 13 width 3.00: "l"
- chunk 1 text run 14 at (170.11,244.02) startOffset 13 endOffset 14 width 3.00: "i"
- chunk 1 text run 15 at (175.01,245.00) startOffset 14 endOffset 15 width 7.00: "n"
- chunk 1 text run 16 at (182.37,246.47) startOffset 15 endOffset 16 width 8.00: "k"
- chunk 1 text run 17 at (188.25,247.65) startOffset 16 endOffset 17 width 4.00: " "
- chunk 1 text run 18 at (191.68,248.34) startOffset 17 endOffset 18 width 3.00: "i"
- chunk 1 text run 19 at (196.59,249.32) startOffset 18 endOffset 19 width 7.00: "n"
- chunk 1 text run 20 at (201.98,249.60) startOffset 19 endOffset 20 width 4.00: " "
- chunk 1 text run 21 at (205.90,248.82) startOffset 20 endOffset 21 width 4.00: "t"
- chunk 1 text run 22 at (211.30,247.74) startOffset 21 endOffset 22 width 7.00: "e"
- chunk 1 text run 23 at (218.16,246.37) startOffset 22 endOffset 23 width 7.00: "x"
- chunk 1 text run 24 at (223.55,245.29) startOffset 23 endOffset 24 width 4.00: "t"
- chunk 1 text run 25 at (229.93,244.01) startOffset 24 endOffset 25 width 9.00: "P"
- chunk 1 text run 26 at (237.77,242.45) startOffset 25 endOffset 26 width 7.00: "a"
- chunk 1 text run 27 at (243.16,241.37) startOffset 26 endOffset 27 width 4.00: "t"
- chunk 1 text run 28 at (248.56,240.29) startOffset 27 endOffset 28 width 7.00: "h"
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 7bcfed8..c6a841d 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2719,6 +2719,11 @@ BUGWK43459 : http/tests/appcache/origin-quota.html = TEXT MISSING
// This test has not landed yet, though the fix has.
//BUGWK41968 LINUX WIN : svg/hittest/svg-rect-hit.html = TEXT
+// Removed the last <textPath> line. Need to rebaseline on Windows.
+// The output should be identical on XP and Vista, and should go into platform/chromium-win,
+// although there were separate (but identical) expectations in chromium-win-xp and chromium-win-vista previously.
+BUGWK50310 WIN : svg/custom/text-linking.svg = IMAGE+TEXT
+
// Need to support DeviceMotion.
BUG51416 : fast/dom/DeviceMotion/window-property.html = TEXT
diff --git a/LayoutTests/platform/mac/svg/custom/text-linking-expected.checksum b/LayoutTests/platform/mac/svg/custom/text-linking-expected.checksum
index 13b5e27..f351e41 100644
--- a/LayoutTests/platform/mac/svg/custom/text-linking-expected.checksum
+++ b/LayoutTests/platform/mac/svg/custom/text-linking-expected.checksum
@@ -1 +1 @@
-a8dad1d7b4cb656e9cee6922e7655548
\ No newline at end of file
+6815a1cdca012aed7d9581d2ed7eaf8a
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/custom/text-linking-expected.png b/LayoutTests/platform/mac/svg/custom/text-linking-expected.png
index 3154047..2b40077 100644
Binary files a/LayoutTests/platform/mac/svg/custom/text-linking-expected.png and b/LayoutTests/platform/mac/svg/custom/text-linking-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/custom/text-linking-expected.txt b/LayoutTests/platform/mac/svg/custom/text-linking-expected.txt
index 88a85fd..752de34 100644
--- a/LayoutTests/platform/mac/svg/custom/text-linking-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/text-linking-expected.txt
@@ -1,13 +1,12 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (97,36) size 235x268
+ RenderSVGRoot {svg} at (97,36) size 235x218
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGText {text} at (0,-14) size 163x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 163x18
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 25 width 163.00: "Referenced character data"
RenderSVGPath {path} at (100,140) size 100x10 [fill={[type=SOLID] [color=#000000]}] [data="M 100 150 L 150 140 L 200 150"]
- RenderSVGPath {path} at (100,240) size 200x10 [fill={[type=SOLID] [color=#000000]}] [data="M 100 250 L 150 240 L 200 250 L 250 240 L 300 250"]
RenderSVGText {text} at (100,36) size 77x18 contains 1 chunk(s)
RenderSVGInline {a} at (0,0) size 77x18
RenderSVGTSpan {tspan} at (0,0) size 77x18
@@ -47,44 +46,11 @@ layer at (0,0) size 800x600
chunk 1 text run 1 at (100.00,200.00) startOffset 0 endOffset 1 width 12.00: "A"
RenderSVGInlineText {#text} at (12,0) size 98x18
chunk 1 text run 1 at (112.00,200.00) startOffset 0 endOffset 15 width 98.00: "ltGlyph content"
- RenderSVGText {text}
- RenderSVGInline {a} at (0,0) size 0x0
- RenderSVGText {text} at (100,286) size 130x18 contains 1 chunk(s)
+ RenderSVGText {text} at (100,236) size 130x18 contains 1 chunk(s)
RenderSVGTSpan {tspan} at (0,0) size 130x18
RenderSVGInline {a} at (0,0) size 130x18
RenderSVGTSpan {tspan} at (0,0) size 130x18
RenderSVGInlineText {#text} at (0,0) size 130x18
- chunk 1 text run 1 at (100.00,300.00) startOffset 0 endOffset 22 width 130.00: "tspan in link in tspan"
- RenderSVGText {text} at (97,226) size 169x29 contains 1 chunk(s)
- RenderSVGTextPath {textPath} at (0,0) size 169x29
- RenderSVGInline {a} at (0,0) size 169x29
- RenderSVGTextPath {textPath} at (0,0) size 169x29
- RenderSVGInlineText {#text} at (0,0) size 169x29
- chunk 1 text run 1 at (101.96,249.61) startOffset 0 endOffset 1 width 4.00: "t"
- chunk 1 text run 2 at (107.35,248.53) startOffset 1 endOffset 2 width 7.00: "e"
- chunk 1 text run 3 at (114.71,247.06) startOffset 2 endOffset 3 width 8.00: "x"
- chunk 1 text run 4 at (120.59,245.88) startOffset 3 endOffset 4 width 4.00: "t"
- chunk 1 text run 5 at (126.97,244.61) startOffset 4 endOffset 5 width 9.00: "P"
- chunk 1 text run 6 at (134.81,243.04) startOffset 5 endOffset 6 width 7.00: "a"
- chunk 1 text run 7 at (140.20,241.96) startOffset 6 endOffset 7 width 4.00: "t"
- chunk 1 text run 8 at (146.09,240.78) startOffset 7 endOffset 8 width 8.00: "h"
- chunk 1 text run 9 at (151.97,240.39) startOffset 8 endOffset 9 width 4.00: " "
- chunk 1 text run 10 at (155.89,241.18) startOffset 9 endOffset 10 width 4.00: "i"
- chunk 1 text run 11 at (161.78,242.36) startOffset 10 endOffset 11 width 8.00: "n"
- chunk 1 text run 12 at (167.66,243.53) startOffset 11 endOffset 12 width 4.00: " "
- chunk 1 text run 13 at (171.58,244.32) startOffset 12 endOffset 13 width 4.00: "l"
- chunk 1 text run 14 at (175.50,245.10) startOffset 13 endOffset 14 width 4.00: "i"
- chunk 1 text run 15 at (181.39,246.28) startOffset 14 endOffset 15 width 8.00: "n"
- chunk 1 text run 16 at (189.23,247.85) startOffset 15 endOffset 16 width 8.00: "k"
- chunk 1 text run 17 at (195.12,249.02) startOffset 16 endOffset 17 width 4.00: " "
- chunk 1 text run 18 at (199.04,249.81) startOffset 17 endOffset 18 width 4.00: "i"
- chunk 1 text run 19 at (204.92,249.02) startOffset 18 endOffset 19 width 8.00: "n"
- chunk 1 text run 20 at (210.81,247.84) startOffset 19 endOffset 20 width 4.00: " "
- chunk 1 text run 21 at (214.73,247.05) startOffset 20 endOffset 21 width 4.00: "t"
- chunk 1 text run 22 at (220.12,245.98) startOffset 21 endOffset 22 width 7.00: "e"
- chunk 1 text run 23 at (227.48,244.50) startOffset 22 endOffset 23 width 8.00: "x"
- chunk 1 text run 24 at (233.36,243.33) startOffset 23 endOffset 24 width 4.00: "t"
- chunk 1 text run 25 at (239.73,242.05) startOffset 24 endOffset 25 width 9.00: "P"
- chunk 1 text run 26 at (247.58,240.48) startOffset 25 endOffset 26 width 7.00: "a"
- chunk 1 text run 27 at (252.97,240.59) startOffset 26 endOffset 27 width 4.00: "t"
- chunk 1 text run 28 at (258.85,241.77) startOffset 27 endOffset 28 width 8.00: "h"
+ chunk 1 text run 1 at (100.00,250.00) startOffset 0 endOffset 22 width 130.00: "tspan in link in tspan"
+ RenderSVGText {text}
+ RenderSVGInline {a} at (0,0) size 0x0
diff --git a/LayoutTests/svg/custom/text-linking.svg b/LayoutTests/svg/custom/text-linking.svg
index eba6c64..30ce5ea 100644
--- a/LayoutTests/svg/custom/text-linking.svg
+++ b/LayoutTests/svg/custom/text-linking.svg
@@ -8,7 +8,6 @@
Referenced character data
</text>
<path id="path1" d="M 100 150 L 150 140 L 200 150"/>
- <path id="path2" d="M 100 250 L 150 240 L 200 250 L 250 240 L 300 250"/>
<font id="Font1" horiz-adv-x="5">
<font-face font-family="HappySad" font-weight="bold" font-style="normal" units-per-em="8" cap-height="8" x-height="4" ascent="8" descent="2" alphabetic="0" mathematical="4" ideographic="-2" hanging="8"/>
<missing-glyph d="M1,3h2v2h-2z"/>
@@ -22,8 +21,6 @@
<text x="100" y="100"><a xlink:href="http://www.webkit.org"><tref xlink:href="#ReferencedText">tref in link</tref></a></text>
<text><a xlink:href="http://www.webkit.org"><textPath xlink:href="#path1">textPath in link</textPath></a></text>
<text x="100" y="200"><a xlink:href="http://www.webkit.org"><altGlyph xlink:href="#Asmile">A</altGlyph>ltGlyph content</a></text>
- <text x="100" y="250"><a xlink:href="http://www.webkit.org"><a>This should not be rendered</a></a></text>
- <text x="100" y="300"><tspan><a xlink:href="http://www.webkit.org"><tspan>tspan in link in tspan</tspan></a></tspan></text>
- <text><textPath><a xlink:href="http://www.webkit.org"><textPath xlink:href="#path2">textPath in link in textPath</textPath></a></textPath></text>
+ <text x="100" y="250"><tspan><a xlink:href="http://www.webkit.org"><tspan>tspan in link in tspan</tspan></a></tspan></text>
+ <text x="100" y="300"><a xlink:href="http://www.webkit.org"><a>This should not be rendered</a></a></text>
</svg>
-
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list