Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (261190 => 261191)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2020-05-05 19:21:11 UTC (rev 261190)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2020-05-05 19:23:53 UTC (rev 261191)
@@ -1,3 +1,19 @@
+2020-05-05 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Update two svg tests from WPT
+ https://bugs.webkit.org/show_bug.cgi?id=211331
+ <rdar://problem/61844271>
+
+ Unreviewed.
+
+ Apply https://github.com/web-platform-tests/wpt/commit/51151cf5bfc32adb8d96fca51a30c126d1e0200d
+ to our own tree.
+
+ * platform/mac/imported/w3c/web-platform-tests/svg/import/pservers-grad-08-b-manual-expected.txt:
+ * platform/mac/imported/w3c/web-platform-tests/svg/import/text-altglyph-01-b-manual-expected.txt:
+ * web-platform-tests/svg/import/pservers-grad-08-b-manual.svg:
+ * web-platform-tests/svg/import/text-altglyph-01-b-manual.svg:
+
2020-05-05 Rob Buis <rb...@igalia.com>
A URL cannot have a username/password/port if its host is null
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/svg/import/pservers-grad-08-b-manual.svg (261190 => 261191)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/svg/import/pservers-grad-08-b-manual.svg 2020-05-05 19:21:11 UTC (rev 261190)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/svg/import/pservers-grad-08-b-manual.svg 2020-05-05 19:23:53 UTC (rev 261191)
@@ -75,11 +75,11 @@
<!-- ====================================================================== -->
<!-- Gradient on fill of text ======== -->
<!-- ====================================================================== -->
- <text font-family="Blocky" font-size="68" fill="url(#Gradient)" x="20" y="70">Gradient on fill</text>
+ <text font-family="Blocky, sans-serif" font-size="68" fill="url(#Gradient)" x="20" y="70">Gradient on fill</text>
<!-- ====================================================================== -->
<!-- Gradient on stroke of text ======== -->
<!-- ====================================================================== -->
- <text font-family="Blocky" x="20" y="160" font-size="55" fill="none" stroke="url(#Gradient)" stroke-width="3">Gradient on stroke</text>
+ <text font-family="Blocky, sans-serif" x="20" y="160" font-size="55" fill="none" stroke="url(#Gradient)" stroke-width="3">Gradient on stroke</text>
</g>
<g font-family="SVGFreeSansASCII,sans-serif" font-size="28">
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/svg/import/text-altglyph-01-b-manual.svg (261190 => 261191)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/svg/import/text-altglyph-01-b-manual.svg 2020-05-05 19:21:11 UTC (rev 261190)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/svg/import/text-altglyph-01-b-manual.svg 2020-05-05 19:23:53 UTC (rev 261191)
@@ -100,7 +100,7 @@
<glyphRef xlink:href=""
</altGlyphDef>
</defs>
- <g font-family="HappySad" font-size="60" fill="none" stroke-width="5">
+ <g font-family="HappySad, sans-serif" font-size="60" fill="none" stroke-width="5">
<text x="140" y="190" stroke="fuchsia">
<altGlyph xlink:href=""
<altGlyph xlink:href=""
Modified: trunk/LayoutTests/platform/mac/imported/w3c/web-platform-tests/svg/import/pservers-grad-08-b-manual-expected.txt (261190 => 261191)
--- trunk/LayoutTests/platform/mac/imported/w3c/web-platform-tests/svg/import/pservers-grad-08-b-manual-expected.txt 2020-05-05 19:21:11 UTC (rev 261190)
+++ trunk/LayoutTests/platform/mac/imported/w3c/web-platform-tests/svg/import/pservers-grad-08-b-manual-expected.txt 2020-05-05 19:23:53 UTC (rev 261191)
@@ -3,18 +3,18 @@
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 800x600
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGContainer {g} at (28,56) size 766x422
+ RenderSVGContainer {g} at (28,56) size 757x422
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGContainer {g} at (28,56) size 766x352 [transform={m=((1.00,0.00)(0.00,1.50)) t=(0.00,0.00)}]
+ RenderSVGContainer {g} at (28,56) size 757x352 [transform={m=((1.00,0.00)(0.00,1.50)) t=(0.00,0.00)}]
RenderSVGResourceLinearGradient {linearGradient} [id="Gradient"] [gradientUnits=userSpaceOnUse] [start=(10,10)] [end=(440,10)]
RenderSVGGradientStop {stop} [offset=0.00] [color=#0000FF]
RenderSVGGradientStop {stop} [offset=1.00] [color=#00FF00]
- RenderSVGText {text} at (20,22) size 457x48 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 457x48
- chunk 1 text run 1 at (20.00,70.00) startOffset 0 endOffset 16 width 456.13: "Gradient on fill"
- RenderSVGText {text} at (20,121) size 440x39 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 440x39
- chunk 1 text run 1 at (20.00,160.00) startOffset 0 endOffset 18 width 439.61: "Gradient on stroke"
+ RenderSVGText {text} at (20,22) size 451x48 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 451x48
+ chunk 1 text run 1 at (20.00,70.00) startOffset 0 endOffset 16 width 450.90: "Gradient on fill"
+ RenderSVGText {text} at (20,121) size 436x39 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 436x39
+ chunk 1 text run 1 at (20.00,160.00) startOffset 0 endOffset 18 width 435.36: "Gradient on stroke"
RenderSVGContainer {g} at (50,198) size 662x280
RenderSVGText {text} at (40,119) size 347x33 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 347x33
Modified: trunk/LayoutTests/platform/mac/imported/w3c/web-platform-tests/svg/import/text-altglyph-01-b-manual-expected.txt (261190 => 261191)
--- trunk/LayoutTests/platform/mac/imported/w3c/web-platform-tests/svg/import/text-altglyph-01-b-manual-expected.txt 2020-05-05 19:21:11 UTC (rev 261190)
+++ trunk/LayoutTests/platform/mac/imported/w3c/web-platform-tests/svg/import/text-altglyph-01-b-manual-expected.txt 2020-05-05 19:23:53 UTC (rev 261191)
@@ -13,26 +13,26 @@
chunk 1 text run 1 at (5.00,90.00) startOffset 0 endOffset 32 width 460.21: "and many-to-many chars to glyphs"
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGContainer {g} at (75,208) size 713x276
- RenderSVGText {text} at (140,129) size 196x76 contains 1 chunk(s)
- RenderSVGTSpan {altGlyph} at (0,0) size 47x76
- RenderSVGInlineText {#text} at (0,0) size 47x76
- chunk 1 text run 1 at (140.00,190.00) startOffset 0 endOffset 1 width 46.82: "H"
+ RenderSVGText {text} at (140,129) size 199x76 contains 1 chunk(s)
+ RenderSVGTSpan {altGlyph} at (0,0) size 44x76
+ RenderSVGInlineText {#text} at (0,0) size 44x76
+ chunk 1 text run 1 at (140.00,190.00) startOffset 0 endOffset 1 width 43.33: "H"
RenderSVGInlineText {#text} at (0,0) size 0x0
- RenderSVGTSpan {altGlyph} at (0,0) size 39x76
- RenderSVGInlineText {#text} at (46,0) size 38x76
- chunk 1 text run 1 at (186.82,190.00) startOffset 0 endOffset 1 width 37.50: "A"
- RenderSVGInlineText {#text} at (0,0) size 0x0
RenderSVGTSpan {altGlyph} at (0,0) size 38x76
- RenderSVGInlineText {#text} at (84,0) size 37x76
- chunk 1 text run 1 at (224.32,190.00) startOffset 0 endOffset 1 width 36.80: "P"
+ RenderSVGInlineText {#text} at (43,0) size 38x76
+ chunk 1 text run 1 at (183.33,190.00) startOffset 0 endOffset 1 width 37.50: "A"
RenderSVGInlineText {#text} at (0,0) size 0x0
- RenderSVGTSpan {altGlyph} at (0,0) size 37x76
- RenderSVGInlineText {#text} at (121,0) size 37x76
- chunk 1 text run 1 at (261.11,190.00) startOffset 0 endOffset 1 width 36.80: "P"
+ RenderSVGTSpan {altGlyph} at (0,0) size 41x76
+ RenderSVGInlineText {#text} at (80,0) size 41x76
+ chunk 1 text run 1 at (220.83,190.00) startOffset 0 endOffset 1 width 40.02: "P"
RenderSVGInlineText {#text} at (0,0) size 0x0
+ RenderSVGTSpan {altGlyph} at (0,0) size 41x76
+ RenderSVGInlineText {#text} at (120,0) size 41x76
+ chunk 1 text run 1 at (260.85,190.00) startOffset 0 endOffset 1 width 40.02: "P"
+ RenderSVGInlineText {#text} at (0,0) size 0x0
RenderSVGTSpan {altGlyph} at (0,0) size 39x76
- RenderSVGInlineText {#text} at (157,0) size 38x76
- chunk 1 text run 1 at (297.91,190.00) startOffset 0 endOffset 1 width 37.50: "Y"
+ RenderSVGInlineText {#text} at (160,0) size 38x76
+ chunk 1 text run 1 at (300.87,190.00) startOffset 0 endOffset 1 width 37.50: "Y"
RenderSVGInlineText {#text} at (0,0) size 0x0
RenderSVGText {text} at (50,209) size 113x76 contains 1 chunk(s)
RenderSVGTSpan {altGlyph} at (0,0) size 38x76
