Diff
Modified: trunk/LayoutTests/ChangeLog (89738 => 89739)
--- trunk/LayoutTests/ChangeLog 2011-06-25 07:44:58 UTC (rev 89738)
+++ trunk/LayoutTests/ChangeLog 2011-06-25 08:01:00 UTC (rev 89739)
@@ -5,6 +5,20 @@
Integrate SVG Fonts within GlyphPage concept, removing the special SVG code paths from Font, making it possible to reuse the simple text code path for SVG Fonts
https://bugs.webkit.org/show_bug.cgi?id=59085
+ Update win baseline.
+
+ * platform/win-wk2/Skipped: Skip newly added svg/text test just like in mac-wk2.
+ * platform/win-xp/svg/custom: Added.
+ * platform/win-xp/svg/custom/svg-fonts-fallback-expected.txt: Added. XP has different metrics here.
+ * platform/win/svg/W3C-SVG-1.1-SE/types-dom-05-b-expected.txt: Update result from Win7 slave.
+
+2011-06-25 Nikolas Zimmermann <[email protected]>
+
+ Not reviewed.
+
+ Integrate SVG Fonts within GlyphPage concept, removing the special SVG code paths from Font, making it possible to reuse the simple text code path for SVG Fonts
+ https://bugs.webkit.org/show_bug.cgi?id=59085
+
Skip svg/text/select-text-svgfont.html on mac-wk2, just like the other svg/text tests.
* platform/mac-wk2/Skipped:
Modified: trunk/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/types-dom-05-b-expected.txt (89738 => 89739)
--- trunk/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/types-dom-05-b-expected.txt 2011-06-25 07:44:58 UTC (rev 89738)
+++ trunk/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/types-dom-05-b-expected.txt 2011-06-25 08:01:00 UTC (rev 89739)
@@ -24,7 +24,7 @@
RenderSVGInlineText {#text} at (0,0) size 175x15
chunk 1 text run 1 at (50.00,60.00) startOffset 0 endOffset 1 width 10.01: "V"
chunk 1 text run 2 at (59.12,60.00) startOffset 1 endOffset 7 width 35.01: "alid s"
- chunk 1 text run 3 at (94.08,60.00) startOffset 7 endOffset 9 width 9.16: "tr"
+ chunk 1 text run 3 at (94.09,60.00) startOffset 7 endOffset 9 width 9.16: "tr"
chunk 1 text run 4 at (103.26,60.00) startOffset 9 endOffset 17 width 55.03: "ing on S"
chunk 1 text run 5 at (157.67,60.00) startOffset 17 endOffset 18 width 10.00: "V"
chunk 1 text run 6 at (167.04,60.00) startOffset 18 endOffset 24 width 49.20: "GLengt"
@@ -34,16 +34,16 @@
chunk 1 text run 1 at (50.00,100.00) startOffset 0 endOffset 2 width 12.51: "In"
chunk 1 text run 2 at (62.31,100.00) startOffset 2 endOffset 3 width 7.50: "v"
chunk 1 text run 3 at (69.55,100.00) startOffset 3 endOffset 9 width 35.01: "alid s"
- chunk 1 text run 4 at (104.51,100.00) startOffset 9 endOffset 11 width 9.16: "tr"
+ chunk 1 text run 4 at (104.51,100.00) startOffset 9 endOffset 11 width 9.17: "tr"
chunk 1 text run 5 at (113.69,100.00) startOffset 11 endOffset 19 width 55.03: "ing on S"
- chunk 1 text run 6 at (168.09,100.00) startOffset 19 endOffset 20 width 10.00: "V"
+ chunk 1 text run 6 at (168.10,100.00) startOffset 19 endOffset 20 width 10.00: "V"
chunk 1 text run 7 at (177.47,100.00) startOffset 20 endOffset 26 width 49.20: "GLengt"
chunk 1 text run 8 at (226.62,100.00) startOffset 26 endOffset 27 width 8.34: "h"
RenderSVGText {text} at (50,128) size 167x15 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 167x15
chunk 1 text run 1 at (50.00,140.00) startOffset 0 endOffset 1 width 10.01: "V"
chunk 1 text run 2 at (59.12,140.00) startOffset 1 endOffset 7 width 35.01: "alid s"
- chunk 1 text run 3 at (94.08,140.00) startOffset 7 endOffset 9 width 9.16: "tr"
+ chunk 1 text run 3 at (94.09,140.00) startOffset 7 endOffset 9 width 9.16: "tr"
chunk 1 text run 4 at (103.26,140.00) startOffset 9 endOffset 17 width 55.03: "ing on S"
chunk 1 text run 5 at (157.67,140.00) startOffset 17 endOffset 18 width 10.00: "V"
chunk 1 text run 6 at (167.04,140.00) startOffset 18 endOffset 19 width 11.67: "G"
@@ -53,9 +53,9 @@
chunk 1 text run 1 at (50.00,180.00) startOffset 0 endOffset 2 width 12.51: "In"
chunk 1 text run 2 at (62.31,180.00) startOffset 2 endOffset 3 width 7.50: "v"
chunk 1 text run 3 at (69.55,180.00) startOffset 3 endOffset 9 width 35.01: "alid s"
- chunk 1 text run 4 at (104.51,180.00) startOffset 9 endOffset 11 width 9.16: "tr"
+ chunk 1 text run 4 at (104.51,180.00) startOffset 9 endOffset 11 width 9.17: "tr"
chunk 1 text run 5 at (113.69,180.00) startOffset 11 endOffset 19 width 55.03: "ing on S"
- chunk 1 text run 6 at (168.09,180.00) startOffset 19 endOffset 20 width 10.00: "V"
+ chunk 1 text run 6 at (168.10,180.00) startOffset 19 endOffset 20 width 10.00: "V"
chunk 1 text run 7 at (177.47,180.00) startOffset 20 endOffset 21 width 11.67: "G"
chunk 1 text run 8 at (189.05,180.00) startOffset 21 endOffset 26 width 38.35: "Angle"
RenderSVGResourceMarker {marker} [id="m"] [markerUnits=strokeWidth] [ref at (0,0)] [angle=1.80]
Modified: trunk/LayoutTests/platform/win-wk2/Skipped (89738 => 89739)
--- trunk/LayoutTests/platform/win-wk2/Skipped 2011-06-25 07:44:58 UTC (rev 89738)
+++ trunk/LayoutTests/platform/win-wk2/Skipped 2011-06-25 08:01:00 UTC (rev 89739)
@@ -184,6 +184,7 @@
media/video-zoom.html
svg/W3C-SVG-1.1/text-tselect-02-f.svg
svg/custom/scrolling-embedded-svg-file-image-repaint-problem.html
+svg/text/select-text-svgfont.html
tables/mozilla/bugs/bug30559.html
transitions/color-transition-all.html
http/tests/multipart/policy-ignore-crash.php
Added: trunk/LayoutTests/platform/win-xp/svg/custom/svg-fonts-fallback-expected.txt (0 => 89739)
--- trunk/LayoutTests/platform/win-xp/svg/custom/svg-fonts-fallback-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win-xp/svg/custom/svg-fonts-fallback-expected.txt 2011-06-25 08:01:00 UTC (rev 89739)
@@ -0,0 +1,36 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x450
+ RenderBlock {html} at (0,0) size 800x450
+ RenderBody {body} at (8,16) size 784x418
+ RenderBlock {p} at (0,0) size 784x92
+ RenderInline {span} at (0,0) size 58x46
+ RenderText {#text} at (0,0) size 58x46
+ text run at (0,0) width 58: "a \x{BE2} o"
+ RenderBR {br} at (58,22) size 0x18
+ RenderInline {span} at (0,0) size 58x46
+ RenderText {#text} at (0,46) size 58x46
+ text run at (0,46) width 58: "a \x{BE2} o"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {hr} at (0,108) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {p} at (0,126) size 784x56
+ RenderInline {span} at (0,0) size 90x52
+ RenderText {#text} at (0,2) size 90x52
+ text run at (0,2) width 90: "a \x{BE2} o"
+ RenderBR {br} at (89,30) size 1x18
+ RenderBlock {hr} at (0,198) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {p} at (0,216) size 784x112
+ RenderInline {span} at (0,0) size 93x52
+ RenderText {#text} at (0,2) size 93x52
+ text run at (0,2) width 93: "a \x{BE2} o"
+ RenderBR {br} at (92,30) size 1x18
+ RenderInline {span} at (0,0) size 93x52
+ RenderText {#text} at (0,58) size 93x52
+ text run at (0,58) width 93: "a \x{BE2} o"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {hr} at (0,344) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {p} at (0,362) size 784x56
+ RenderInline {span} at (0,0) size 73x52
+ RenderText {#text} at (0,2) size 73x52
+ text run at (0,2) width 73: "a \x{BE2} o"
+ RenderBR {br} at (72,30) size 1x18
