Changeset 73415 in webkit


Ignore:
Timestamp:
Dec 6, 2010 4:58:15 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2010-12-06 Cosmin Truta <​ctruta@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>.
Location:
trunk/LayoutTests
Files:
6 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r73413 r73415  
     12010-12-06  Cosmin Truta  <ctruta@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Fix testcase: textPath cannot be inside another textPath
     6        https://bugs.webkit.org/show_bug.cgi?id=50211
     7
     8        * platform/mac/svg/custom/text-linking-expected.checksum: Updated.
     9        * platform/mac/svg/custom/text-linking-expected.png: Updated.
     10        * platform/mac/svg/custom/text-linking-expected.txt: Updated.
     11        * platform/chromium-linux/svg/custom/text-linking-expected.checksum: Updated.
     12        * platform/chromium-linux/svg/custom/text-linking-expected.png: Updated.
     13        * platform/chromium-linux/svg/custom/text-linking-expected.txt: Updated.
     14        * platform/chromium-win-vista/svg/custom/text-linking-expected.checksum: Deleted.
     15        * platform/chromium-win-vista/svg/custom/text-linking-expected.png: Deleted.
     16        * platform/chromium-win-vista/svg/custom/text-linking-expected.txt: Deleted.
     17        * platform/chromium-win-xp/svg/custom/text-linking-expected.checksum: Deleted.
     18        * platform/chromium-win-xp/svg/custom/text-linking-expected.png: Deleted.
     19        * platform/chromium-win-xp/svg/custom/text-linking-expected.txt: Deleted.
     20        * svg/custom/text-linking.svg: Removed test for <textPath> inside <textPath>.
     21
    1222010-12-06  Jon Honeycutt  <jhoneycutt@apple.com>
    223

  • trunk/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.checksum

    r69989 r73415  
    1 c175719f6d5369de56b485a59183a07e
     164119c2a61ff435385e7fa8ead203e0d

  • trunk/LayoutTests/platform/chromium-linux/svg/custom/text-linking-expected.txt

    r70011 r73415  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (97,35) size 225x269
     4  RenderSVGRoot {svg} at (97,35) size 225x219
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    66      RenderSVGText {text} at (0,-15) size 159x19 contains 1 chunk(s)
    … …  
    88          chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 25 width 159.00: "Referenced character data"
    99      RenderSVGPath {path} at (100,140) size 100x10 [fill={[type=SOLID] [color=#000000]}] [data="M 100 150 L 150 140 L 200 150"]
    10       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"]
    1110    RenderSVGText {text} at (100,35) size 71x19 contains 1 chunk(s)
    1211      RenderSVGInline {a} at (0,0) size 71x19
    … …  
    4847        RenderSVGInlineText {#text} at (11,0) size 91x19
    4948          chunk 1 text run 1 at (111.00,200.00) startOffset 0 endOffset 15 width 91.00: "ltGlyph content"
    50     RenderSVGText {text}
    51       RenderSVGInline {a} at (0,0) size 0x0
    52     RenderSVGText {text} at (100,285) size 121x19 contains 1 chunk(s)
     49    RenderSVGText {text} at (100,235) size 121x19 contains 1 chunk(s)
    5350      RenderSVGTSpan {tspan} at (0,0) size 121x19
    5451        RenderSVGInline {a} at (0,0) size 121x19
    5552          RenderSVGTSpan {tspan} at (0,0) size 121x19
    5653            RenderSVGInlineText {#text} at (0,0) size 121x19
    57               chunk 1 text run 1 at (100.00,300.00) startOffset 0 endOffset 22 width 121.00: "tspan in link in tspan"
    58     RenderSVGText {text} at (97,224) size 156x30 contains 1 chunk(s)
    59       RenderSVGTextPath {textPath} at (0,0) size 156x30
    60         RenderSVGInline {a} at (0,0) size 156x30
    61           RenderSVGTextPath {textPath} at (0,0) size 156x30
    62             RenderSVGInlineText {#text} at (0,0) size 156x30
    63               chunk 1 text run 1 at (101.96,249.61) startOffset 0 endOffset 1 width 4.00: "t"
    64               chunk 1 text run 2 at (107.35,248.53) startOffset 1 endOffset 2 width 7.00: "e"
    65               chunk 1 text run 3 at (114.22,247.16) startOffset 2 endOffset 3 width 7.00: "x"
    66               chunk 1 text run 4 at (119.61,246.08) startOffset 3 endOffset 4 width 4.00: "t"
    67               chunk 1 text run 5 at (125.99,244.80) startOffset 4 endOffset 5 width 9.00: "P"
    68               chunk 1 text run 6 at (133.83,243.23) startOffset 5 endOffset 6 width 7.00: "a"
    69               chunk 1 text run 7 at (139.22,242.16) startOffset 6 endOffset 7 width 4.00: "t"
    70               chunk 1 text run 8 at (144.62,241.08) startOffset 7 endOffset 8 width 7.00: "h"
    71               chunk 1 text run 9 at (150.01,240.00) startOffset 8 endOffset 9 width 4.00: " "
    72               chunk 1 text run 10 at (153.44,240.69) startOffset 9 endOffset 10 width 3.00: "i"
    73               chunk 1 text run 11 at (158.34,241.67) startOffset 10 endOffset 11 width 7.00: "n"
    74               chunk 1 text run 12 at (163.74,242.75) startOffset 11 endOffset 12 width 4.00: " "
    75               chunk 1 text run 13 at (167.17,243.43) startOffset 12 endOffset 13 width 3.00: "l"
    76               chunk 1 text run 14 at (170.11,244.02) startOffset 13 endOffset 14 width 3.00: "i"
    77               chunk 1 text run 15 at (175.01,245.00) startOffset 14 endOffset 15 width 7.00: "n"
    78               chunk 1 text run 16 at (182.37,246.47) startOffset 15 endOffset 16 width 8.00: "k"
    79               chunk 1 text run 17 at (188.25,247.65) startOffset 16 endOffset 17 width 4.00: " "
    80               chunk 1 text run 18 at (191.68,248.34) startOffset 17 endOffset 18 width 3.00: "i"
    81               chunk 1 text run 19 at (196.59,249.32) startOffset 18 endOffset 19 width 7.00: "n"
    82               chunk 1 text run 20 at (201.98,249.60) startOffset 19 endOffset 20 width 4.00: " "
    83               chunk 1 text run 21 at (205.90,248.82) startOffset 20 endOffset 21 width 4.00: "t"
    84               chunk 1 text run 22 at (211.30,247.74) startOffset 21 endOffset 22 width 7.00: "e"
    85               chunk 1 text run 23 at (218.16,246.37) startOffset 22 endOffset 23 width 7.00: "x"
    86               chunk 1 text run 24 at (223.55,245.29) startOffset 23 endOffset 24 width 4.00: "t"
    87               chunk 1 text run 25 at (229.93,244.01) startOffset 24 endOffset 25 width 9.00: "P"
    88               chunk 1 text run 26 at (237.77,242.45) startOffset 25 endOffset 26 width 7.00: "a"
    89               chunk 1 text run 27 at (243.16,241.37) startOffset 26 endOffset 27 width 4.00: "t"
    90               chunk 1 text run 28 at (248.56,240.29) startOffset 27 endOffset 28 width 7.00: "h"
     54              chunk 1 text run 1 at (100.00,250.00) startOffset 0 endOffset 22 width 121.00: "tspan in link in tspan"
     55    RenderSVGText {text}
     56      RenderSVGInline {a} at (0,0) size 0x0

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r73262 r73415  
    27202720//BUGWK41968 LINUX WIN : svg/hittest/svg-rect-hit.html = TEXT
    27212721
     2722// Removed the last <textPath> line. Need to rebaseline on Windows.
     2723// The output should be identical on XP and Vista, and should go into platform/chromium-win,
     2724// although there were separate (but identical) expectations in chromium-win-xp and chromium-win-vista previously.
     2725BUGWK50310 WIN : svg/custom/text-linking.svg = IMAGE+TEXT
     2726
    27222727// Need to support DeviceMotion.
    27232728BUG51416 : fast/dom/DeviceMotion/window-property.html = TEXT

  • trunk/LayoutTests/platform/mac/svg/custom/text-linking-expected.checksum

    r70146 r73415  
    1 a8dad1d7b4cb656e9cee6922e7655548
     16815a1cdca012aed7d9581d2ed7eaf8a

  • trunk/LayoutTests/platform/mac/svg/custom/text-linking-expected.txt

    r69922 r73415  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (97,36) size 235x268
     4  RenderSVGRoot {svg} at (97,36) size 235x218
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    66      RenderSVGText {text} at (0,-14) size 163x18 contains 1 chunk(s)
    … …  
    88          chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 25 width 163.00: "Referenced character data"
    99      RenderSVGPath {path} at (100,140) size 100x10 [fill={[type=SOLID] [color=#000000]}] [data="M 100 150 L 150 140 L 200 150"]
    10       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"]
    1110    RenderSVGText {text} at (100,36) size 77x18 contains 1 chunk(s)
    1211      RenderSVGInline {a} at (0,0) size 77x18
    … …  
    4847        RenderSVGInlineText {#text} at (12,0) size 98x18
    4948          chunk 1 text run 1 at (112.00,200.00) startOffset 0 endOffset 15 width 98.00: "ltGlyph content"
    50     RenderSVGText {text}
    51       RenderSVGInline {a} at (0,0) size 0x0
    52     RenderSVGText {text} at (100,286) size 130x18 contains 1 chunk(s)
     49    RenderSVGText {text} at (100,236) size 130x18 contains 1 chunk(s)
    5350      RenderSVGTSpan {tspan} at (0,0) size 130x18
    5451        RenderSVGInline {a} at (0,0) size 130x18
    5552          RenderSVGTSpan {tspan} at (0,0) size 130x18
    5653            RenderSVGInlineText {#text} at (0,0) size 130x18
    57               chunk 1 text run 1 at (100.00,300.00) startOffset 0 endOffset 22 width 130.00: "tspan in link in tspan"
    58     RenderSVGText {text} at (97,226) size 169x29 contains 1 chunk(s)
    59       RenderSVGTextPath {textPath} at (0,0) size 169x29
    60         RenderSVGInline {a} at (0,0) size 169x29
    61           RenderSVGTextPath {textPath} at (0,0) size 169x29
    62             RenderSVGInlineText {#text} at (0,0) size 169x29
    63               chunk 1 text run 1 at (101.96,249.61) startOffset 0 endOffset 1 width 4.00: "t"
    64               chunk 1 text run 2 at (107.35,248.53) startOffset 1 endOffset 2 width 7.00: "e"
    65               chunk 1 text run 3 at (114.71,247.06) startOffset 2 endOffset 3 width 8.00: "x"
    66               chunk 1 text run 4 at (120.59,245.88) startOffset 3 endOffset 4 width 4.00: "t"
    67               chunk 1 text run 5 at (126.97,244.61) startOffset 4 endOffset 5 width 9.00: "P"
    68               chunk 1 text run 6 at (134.81,243.04) startOffset 5 endOffset 6 width 7.00: "a"
    69               chunk 1 text run 7 at (140.20,241.96) startOffset 6 endOffset 7 width 4.00: "t"
    70               chunk 1 text run 8 at (146.09,240.78) startOffset 7 endOffset 8 width 8.00: "h"
    71               chunk 1 text run 9 at (151.97,240.39) startOffset 8 endOffset 9 width 4.00: " "
    72               chunk 1 text run 10 at (155.89,241.18) startOffset 9 endOffset 10 width 4.00: "i"
    73               chunk 1 text run 11 at (161.78,242.36) startOffset 10 endOffset 11 width 8.00: "n"
    74               chunk 1 text run 12 at (167.66,243.53) startOffset 11 endOffset 12 width 4.00: " "
    75               chunk 1 text run 13 at (171.58,244.32) startOffset 12 endOffset 13 width 4.00: "l"
    76               chunk 1 text run 14 at (175.50,245.10) startOffset 13 endOffset 14 width 4.00: "i"
    77               chunk 1 text run 15 at (181.39,246.28) startOffset 14 endOffset 15 width 8.00: "n"
    78               chunk 1 text run 16 at (189.23,247.85) startOffset 15 endOffset 16 width 8.00: "k"
    79               chunk 1 text run 17 at (195.12,249.02) startOffset 16 endOffset 17 width 4.00: " "
    80               chunk 1 text run 18 at (199.04,249.81) startOffset 17 endOffset 18 width 4.00: "i"
    81               chunk 1 text run 19 at (204.92,249.02) startOffset 18 endOffset 19 width 8.00: "n"
    82               chunk 1 text run 20 at (210.81,247.84) startOffset 19 endOffset 20 width 4.00: " "
    83               chunk 1 text run 21 at (214.73,247.05) startOffset 20 endOffset 21 width 4.00: "t"
    84               chunk 1 text run 22 at (220.12,245.98) startOffset 21 endOffset 22 width 7.00: "e"
    85               chunk 1 text run 23 at (227.48,244.50) startOffset 22 endOffset 23 width 8.00: "x"
    86               chunk 1 text run 24 at (233.36,243.33) startOffset 23 endOffset 24 width 4.00: "t"
    87               chunk 1 text run 25 at (239.73,242.05) startOffset 24 endOffset 25 width 9.00: "P"
    88               chunk 1 text run 26 at (247.58,240.48) startOffset 25 endOffset 26 width 7.00: "a"
    89               chunk 1 text run 27 at (252.97,240.59) startOffset 26 endOffset 27 width 4.00: "t"
    90               chunk 1 text run 28 at (258.85,241.77) startOffset 27 endOffset 28 width 8.00: "h"
     54              chunk 1 text run 1 at (100.00,250.00) startOffset 0 endOffset 22 width 130.00: "tspan in link in tspan"
     55    RenderSVGText {text}
     56      RenderSVGInline {a} at (0,0) size 0x0

  • trunk/LayoutTests/svg/custom/text-linking.svg

    r69922 r73415  
    99    </text>
    1010    <path id="path1" d="M 100 150 L 150 140 L 200 150"/>
    11     <path id="path2" d="M 100 250 L 150 240 L 200 250 L 250 240 L 300 250"/>
    1211    <font id="Font1" horiz-adv-x="5">
    1312      <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"/>
    … …  
    2322    <text><a xlink:href="http://www.webkit.org"><textPath xlink:href="#path1">textPath in link</textPath></a></text>
    2423    <text x="100" y="200"><a xlink:href="http://www.webkit.org"><altGlyph xlink:href="#Asmile">A</altGlyph>ltGlyph content</a></text>
    25     <text x="100" y="250"><a xlink:href="http://www.webkit.org"><a>This should not be rendered</a></a></text>
    26     <text x="100" y="300"><tspan><a xlink:href="http://www.webkit.org"><tspan>tspan in link in tspan</tspan></a></tspan></text>
    27     <text><textPath><a xlink:href="http://www.webkit.org"><textPath xlink:href="#path2">textPath in link in textPath</textPath></a></textPath></text>
     24    <text x="100" y="250"><tspan><a xlink:href="http://www.webkit.org"><tspan>tspan in link in tspan</tspan></a></tspan></text>
     25    <text x="100" y="300"><a xlink:href="http://www.webkit.org"><a>This should not be rendered</a></a></text>
    2826</svg>
    29 
Note: See TracChangeset for help on using the changeset viewer.