Changeset 76586 in webkit


Ignore:
Timestamp:
Jan 25, 2011 4:47:00 AM (13 years ago)
Author:
Nikolas Zimmermann
Message:

2011-01-25 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Dirk Schulze.

Introduce FontMetrics abstraction
​https://bugs.webkit.org/show_bug.cgi?id=51456

Use accurate floating-point metrics for SVG Font calculations instead of casting float -> integer.
This hopefully fixes differences between 32/64 bit bots.

Needs new layout test results for several platforms, which need to be taken from the bots landing afterwards.

  • platform/graphics/SimpleFontData.cpp: (WebCore::SimpleFontData::SimpleFontData): (WebCore::SimpleFontData::initCharWidths):

2011-01-25 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Dirk Schulze.

Introduce FontMetrics abstraction
​https://bugs.webkit.org/show_bug.cgi?id=51456

Update mac/mac-leopard pixel baseline after removing the float -> int truncation in the SVG Fonts ascent/descent calculation code.

  • platform/gtk/Skipped: Unskip several tests.
  • platform/mac-leopard/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.checksum:
  • platform/mac-leopard/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.png:
  • platform/mac-leopard/svg/batik/text/textEffect-expected.checksum:
  • platform/mac-leopard/svg/batik/text/textEffect-expected.png:
  • platform/mac-leopard/svg/batik/text/textEffect3-expected.checksum:
  • platform/mac-leopard/svg/batik/text/textEffect3-expected.png:
  • platform/mac-leopard/svg/custom/svg-fonts-in-html-expected.checksum:
  • platform/mac-leopard/svg/custom/svg-fonts-in-html-expected.png:
  • platform/mac-leopard/svg/custom/svg-fonts-with-no-element-reference-expected.checksum:
  • platform/mac-leopard/svg/custom/svg-fonts-with-no-element-reference-expected.png:
  • platform/mac-leopard/svg/custom/svg-fonts-without-missing-glyph-expected.checksum:
  • platform/mac-leopard/svg/custom/svg-fonts-without-missing-glyph-expected.png:
  • platform/mac-leopard/svg/text/text-text-05-t-expected.checksum:
  • platform/mac-leopard/svg/text/text-text-05-t-expected.png:
  • platform/mac-leopard/svg/text/text-text-06-t-expected.checksum:
  • platform/mac-leopard/svg/text/text-text-06-t-expected.png:
  • platform/mac/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt:
  • platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.txt:
  • platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.txt:
  • platform/mac/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt:
  • platform/mac/svg/W3C-SVG-1.1/animate-elem-24-t-expected.png:
  • platform/mac/svg/W3C-SVG-1.1/animate-elem-24-t-expected.txt:
  • platform/mac/svg/W3C-SVG-1.1/fonts-glyph-02-t-expected.png:
  • platform/mac/svg/W3C-SVG-1.1/fonts-glyph-02-t-expected.txt:
  • platform/mac/svg/W3C-SVG-1.1/fonts-kern-01-t-expected.txt:
  • platform/mac/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.txt:
  • platform/mac/svg/W3C-SVG-1.1/text-text-05-t-expected.txt:
  • platform/mac/svg/W3C-SVG-1.1/text-text-06-t-expected.txt:
  • platform/mac/svg/batik/text/textEffect-expected.txt:
  • platform/mac/svg/batik/text/textEffect3-expected.txt:
  • platform/mac/svg/batik/text/textPosition2-expected.png:
  • platform/mac/svg/batik/text/textPosition2-expected.txt:
  • platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
  • platform/mac/svg/custom/svg-fonts-with-no-element-reference-expected.txt:
  • platform/mac/svg/custom/svg-fonts-without-missing-glyph-expected.txt:
  • platform/mac/svg/text/text-text-05-t-expected.txt:
  • platform/mac/svg/text/text-text-06-t-expected.txt:
  • svg/custom/glyph-transformation-with-hkern-expected.txt:

-This line, and those below, will be ignored--

M LayoutTests/platform/mac-leopard/svg/text/text-text-05-t-expected.checksum
M LayoutTests/platform/mac-leopard/svg/text/text-text-06-t-expected.checksum
M LayoutTests/platform/mac-leopard/svg/text/text-text-05-t-expected.png
M LayoutTests/platform/mac-leopard/svg/text/text-text-06-t-expected.png
M LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.png
M LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.checksum
M LayoutTests/platform/mac-leopard/svg/batik/text/textEffect3-expected.checksum
M LayoutTests/platform/mac-leopard/svg/batik/text/textEffect-expected.checksum
M LayoutTests/platform/mac-leopard/svg/batik/text/textEffect-expected.png
M LayoutTests/platform/mac-leopard/svg/batik/text/textEffect3-expected.png
M LayoutTests/platform/mac-leopard/svg/custom/svg-fonts-without-missing-glyph-expected.png
M LayoutTests/platform/mac-leopard/svg/custom/svg-fonts-with-no-element-reference-expected.checksum
M LayoutTests/platform/mac-leopard/svg/custom/svg-fonts-in-html-expected.checksum
M LayoutTests/platform/mac-leopard/svg/custom/svg-fonts-without-missing-glyph-expected.checksum
M LayoutTests/platform/mac-leopard/svg/custom/svg-fonts-with-no-element-reference-expected.png
M LayoutTests/platform/mac-leopard/svg/custom/svg-fonts-in-html-expected.png
M LayoutTests/platform/mac/svg/text/text-text-06-t-expected.txt
M LayoutTests/platform/mac/svg/text/text-text-05-t-expected.txt
M LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-text-05-t-expected.txt
M LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-24-t-expected.txt
M LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-glyph-02-t-expected.txt
M LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-text-06-t-expected.txt
M LayoutTests/platform/mac/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.txt
M LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-24-t-expected.png
M LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-kern-01-t-expected.txt
M LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-glyph-02-t-expected.png
M LayoutTests/platform/mac/svg/batik/text/textEffect3-expected.txt
M LayoutTests/platform/mac/svg/batik/text/textPosition2-expected.png
M LayoutTests/platform/mac/svg/batik/text/textEffect-expected.txt
M LayoutTests/platform/mac/svg/batik/text/textPosition2-expected.txt
M LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.txt
M LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt
M LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.txt
M LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt
M LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt
M LayoutTests/platform/mac/svg/custom/svg-fonts-with-no-element-reference-expected.txt
M LayoutTests/platform/mac/svg/custom/svg-fonts-without-missing-glyph-expected.txt
M LayoutTests/platform/gtk/Skipped
M LayoutTests/ChangeLog
M LayoutTests/svg/custom/glyph-transformation-with-hkern-expected.txt
M Source/WebCore/ChangeLog
M Source/WebCore/platform/graphics/SimpleFontData.cpp

Location:
trunk
Files:
42 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r76583 r76586  
     12011-01-25  Nikolas Zimmermann  <nzimmermann@rim.com>
     2
     3        Reviewed by Dirk Schulze.
     4
     5        Introduce FontMetrics abstraction
     6        https://bugs.webkit.org/show_bug.cgi?id=51456
     7
     8        Update mac/mac-leopard pixel baseline after removing the float -> int truncation in the SVG Fonts ascent/descent calculation code.
     9
     10        * platform/gtk/Skipped: Unskip several tests.
     11        * platform/mac-leopard/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.checksum:
     12        * platform/mac-leopard/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.png:
     13        * platform/mac-leopard/svg/batik/text/textEffect-expected.checksum:
     14        * platform/mac-leopard/svg/batik/text/textEffect-expected.png:
     15        * platform/mac-leopard/svg/batik/text/textEffect3-expected.checksum:
     16        * platform/mac-leopard/svg/batik/text/textEffect3-expected.png:
     17        * platform/mac-leopard/svg/custom/svg-fonts-in-html-expected.checksum:
     18        * platform/mac-leopard/svg/custom/svg-fonts-in-html-expected.png:
     19        * platform/mac-leopard/svg/custom/svg-fonts-with-no-element-reference-expected.checksum:
     20        * platform/mac-leopard/svg/custom/svg-fonts-with-no-element-reference-expected.png:
     21        * platform/mac-leopard/svg/custom/svg-fonts-without-missing-glyph-expected.checksum:
     22        * platform/mac-leopard/svg/custom/svg-fonts-without-missing-glyph-expected.png:
     23        * platform/mac-leopard/svg/text/text-text-05-t-expected.checksum:
     24        * platform/mac-leopard/svg/text/text-text-05-t-expected.png:
     25        * platform/mac-leopard/svg/text/text-text-06-t-expected.checksum:
     26        * platform/mac-leopard/svg/text/text-text-06-t-expected.png:
     27        * platform/mac/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt:
     28        * platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.txt:
     29        * platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.txt:
     30        * platform/mac/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt:
     31        * platform/mac/svg/W3C-SVG-1.1/animate-elem-24-t-expected.png:
     32        * platform/mac/svg/W3C-SVG-1.1/animate-elem-24-t-expected.txt:
     33        * platform/mac/svg/W3C-SVG-1.1/fonts-glyph-02-t-expected.png:
     34        * platform/mac/svg/W3C-SVG-1.1/fonts-glyph-02-t-expected.txt:
     35        * platform/mac/svg/W3C-SVG-1.1/fonts-kern-01-t-expected.txt:
     36        * platform/mac/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.txt:
     37        * platform/mac/svg/W3C-SVG-1.1/text-text-05-t-expected.txt:
     38        * platform/mac/svg/W3C-SVG-1.1/text-text-06-t-expected.txt:
     39        * platform/mac/svg/batik/text/textEffect-expected.txt:
     40        * platform/mac/svg/batik/text/textEffect3-expected.txt:
     41        * platform/mac/svg/batik/text/textPosition2-expected.png:
     42        * platform/mac/svg/batik/text/textPosition2-expected.txt:
     43        * platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
     44        * platform/mac/svg/custom/svg-fonts-with-no-element-reference-expected.txt:
     45        * platform/mac/svg/custom/svg-fonts-without-missing-glyph-expected.txt:
     46        * platform/mac/svg/text/text-text-05-t-expected.txt:
     47        * platform/mac/svg/text/text-text-06-t-expected.txt:
     48        * svg/custom/glyph-transformation-with-hkern-expected.txt:
     49
    1502011-01-25  Mario Sanchez Prada  <msanchez@igalia.com>
    251

  • trunk/LayoutTests/platform/gtk/Skipped

    r76583 r76586  
    56045604http/tests/security/local-user-CSS-from-remote.html
    56055605
    5606 # 64bits bot fails and 32bits bots work on these tests
    5607 # https://bugs.webkit.org/show_bug.cgi?id=52996
    5608 svg/W3C-SVG-1.1-SE/filters-image-03-f.svg
    5609 svg/W3C-SVG-1.1-SE/pservers-pattern-03-f.svg
    5610 svg/text/text-hkern-on-vertical-text.svg
    5611 svg/text/text-hkern.svg
    5612 svg/text/text-vkern-on-horizontal-text.svg
    5613 svg/text/text-vkern.svg
    5614 
    56155606# This media test seems to time out.
    56165607# https://bugs.webkit.org/show_bug.cgi?id=53056

  • trunk/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.checksum

    r69191 r76586  
    1 e77f4e3d368a6745616b4bba8f27fc7b
     1f07a4f60a1d402a0b29f82a264ef7644

  • trunk/LayoutTests/platform/mac-leopard/svg/batik/text/textEffect-expected.checksum

    r69224 r76586  
    1 e14a142f0d5460b2f97b61cdce4f2610
     1e7acd6067d3bfdabb96650c7bc2b9c95

  • trunk/LayoutTests/platform/mac-leopard/svg/batik/text/textEffect3-expected.checksum

    r69224 r76586  
    1 ad1b995d41094ed2c89f381290342b30
     1a73b1391929f72bfc963d351a9f68059

  • trunk/LayoutTests/platform/mac-leopard/svg/custom/svg-fonts-in-html-expected.checksum

    r64194 r76586  
    1 0db889d95c888c22b113e05907613704
     1f578ceabc7cef1088b29cdc021145b71

  • trunk/LayoutTests/platform/mac-leopard/svg/custom/svg-fonts-with-no-element-reference-expected.checksum

    r69209 r76586  
    1 397aa17de66748a2aba4fddf879ef7ef
     15d31634f249acba54652b5e09bcef70d

  • trunk/LayoutTests/platform/mac-leopard/svg/custom/svg-fonts-without-missing-glyph-expected.checksum

    r69209 r76586  
    1 365aa91d56141671987e1296891083f2
     1c89d88e37a2b186cfdfb6eb9244c5757

  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-text-05-t-expected.checksum

    r69292 r76586  
    1 9f915ead41dcba5bc22696cf8c7f7d42
     1f6db031052fcbc5d4b750f1f2e4a59f2

  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-text-06-t-expected.checksum

    r69292 r76586  
    1 b1628680afe14164ca7fde517a464898
     1e137c04ded88306a5d8ca749a8970e51

  • trunk/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt

    r76450 r76586  
    5050          RenderSVGPath {rect} at (259,199) size 52x52 [stroke={[type=SOLID] [color=#0000FF]}] [x=200.00] [y=100.00] [width=50.00] [height=50.00]
    5151          RenderSVGPath {rect} at (359,199) size 52x52 [stroke={[type=SOLID] [color=#0000FF]}] [x=300.00] [y=100.00] [width=50.00] [height=50.00]
    52     RenderSVGContainer {g} at (10,314) size 223x32
    53       RenderSVGText {text} at (10,314) size 223x32 contains 1 chunk(s)
    54         RenderSVGInlineText {#text} at (0,0) size 223x32
     52    RenderSVGContainer {g} at (10,313) size 223x33
     53      RenderSVGText {text} at (10,313) size 223x33 contains 1 chunk(s)
     54        RenderSVGInlineText {#text} at (0,0) size 223x33
    5555          chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
    5656          chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"

  • trunk/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.txt

    r69413 r76586  
    44  RenderSVGRoot {svg} at (0,0) size 480x360
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    6     RenderSVGContainer {g} at (49,81) size 376x172
     6    RenderSVGContainer {g} at (49,81) size 376x173
    77      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    88        RenderSVGResourceLinearGradient {linearGradient} [id="grad"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,0)]
    … …  
    1515        RenderSVGPath {line} at (68,100) size 108x108 [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=410.00] [y1=10.00] [x2=70.00] [y2=350.00]
    1616        RenderSVGPath {rect} at (49,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
    17       RenderSVGText {text} at (69,236) size 102x17 contains 1 chunk(s)
    18         RenderSVGInlineText {#text} at (0,0) size 102x17
     17      RenderSVGText {text} at (69,235) size 102x19 contains 1 chunk(s)
     18        RenderSVGInlineText {#text} at (0,0) size 102x19
    1919          chunk 1 (middle anchor) text run 1 at (69.04,250.00) startOffset 0 endOffset 1 width 16.99: "W"
    2020          chunk 1 (middle anchor) text run 2 at (86.02,250.00) startOffset 1 endOffset 3 width 9.00: "it"
    … …  
    2828        RenderSVGPath {line} at (298,100) size 108x108 [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=410.00] [y1=10.00] [x2=70.00] [y2=350.00]
    2929        RenderSVGPath {rect} at (279,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
    30       RenderSVGText {text} at (286,236) size 128x17 contains 1 chunk(s)
    31         RenderSVGInlineText {#text} at (0,0) size 128x17
     30      RenderSVGText {text} at (286,235) size 128x19 contains 1 chunk(s)
     31        RenderSVGInlineText {#text} at (0,0) size 128x19
    3232          chunk 1 (middle anchor) text run 1 at (286.53,250.00) startOffset 0 endOffset 1 width 16.99: "W"
    3333          chunk 1 (middle anchor) text run 2 at (303.51,250.00) startOffset 1 endOffset 3 width 9.00: "it"
    … …  
    3535          chunk 1 (middle anchor) text run 4 at (357.33,250.00) startOffset 9 endOffset 15 width 47.02: "allbac"
    3636          chunk 1 (middle anchor) text run 5 at (404.47,250.00) startOffset 15 endOffset 16 width 9.00: "k"
    37     RenderSVGContainer {g} at (10,314) size 227x32
    38       RenderSVGText {text} at (10,314) size 227x32 contains 1 chunk(s)
    39         RenderSVGInlineText {#text} at (0,0) size 227x32
     37    RenderSVGContainer {g} at (10,313) size 227x33
     38      RenderSVGText {text} at (10,313) size 227x33 contains 1 chunk(s)
     39        RenderSVGInlineText {#text} at (0,0) size 227x33
    4040          chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
    4141          chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"

  • trunk/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.txt

    r69413 r76586  
    44  RenderSVGRoot {svg} at (0,0) size 480x360
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    6     RenderSVGContainer {g} at (49,81) size 376x172
     6    RenderSVGContainer {g} at (49,81) size 376x173
    77      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    88        RenderSVGResourceLinearGradient {linearGradient} [id="grad"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,0)]
    … …  
    1515        RenderSVGPath {path} at (68,100) size 108x108 [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M 410 10 L 70 350"]
    1616        RenderSVGPath {rect} at (49,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
    17       RenderSVGText {text} at (69,236) size 102x17 contains 1 chunk(s)
    18         RenderSVGInlineText {#text} at (0,0) size 102x17
     17      RenderSVGText {text} at (69,235) size 102x19 contains 1 chunk(s)
     18        RenderSVGInlineText {#text} at (0,0) size 102x19
    1919          chunk 1 (middle anchor) text run 1 at (69.04,250.00) startOffset 0 endOffset 1 width 16.99: "W"
    2020          chunk 1 (middle anchor) text run 2 at (86.02,250.00) startOffset 1 endOffset 3 width 9.00: "it"
    … …  
    2828        RenderSVGPath {path} at (298,100) size 108x108 [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M 410 10 L 70 350"]
    2929        RenderSVGPath {rect} at (279,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
    30       RenderSVGText {text} at (286,236) size 128x17 contains 1 chunk(s)
    31         RenderSVGInlineText {#text} at (0,0) size 128x17
     30      RenderSVGText {text} at (286,235) size 128x19 contains 1 chunk(s)
     31        RenderSVGInlineText {#text} at (0,0) size 128x19
    3232          chunk 1 (middle anchor) text run 1 at (286.53,250.00) startOffset 0 endOffset 1 width 16.99: "W"
    3333          chunk 1 (middle anchor) text run 2 at (303.51,250.00) startOffset 1 endOffset 3 width 9.00: "it"
    … …  
    3535          chunk 1 (middle anchor) text run 4 at (357.33,250.00) startOffset 9 endOffset 15 width 47.02: "allbac"
    3636          chunk 1 (middle anchor) text run 5 at (404.47,250.00) startOffset 15 endOffset 16 width 9.00: "k"
    37     RenderSVGContainer {g} at (10,314) size 227x32
    38       RenderSVGText {text} at (10,314) size 227x32 contains 1 chunk(s)
    39         RenderSVGInlineText {#text} at (0,0) size 227x32
     37    RenderSVGContainer {g} at (10,313) size 227x33
     38      RenderSVGText {text} at (10,313) size 227x33 contains 1 chunk(s)
     39        RenderSVGInlineText {#text} at (0,0) size 227x33
    4040          chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
    4141          chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"

  • trunk/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt

    r76450 r76586  
    2929        RenderSVGPath {rect} at (239,159) size 102x102 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="invisible7"]}] [x=200.00] [y=100.00] [width=100.00] [height=100.00]
    3030        RenderSVGPath {rect} at (339,159) size 102x102 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#00FF00]}] [x=300.00] [y=100.00] [width=100.00] [height=100.00]
    31     RenderSVGContainer {g} at (10,314) size 223x32
    32       RenderSVGText {text} at (10,314) size 223x32 contains 1 chunk(s)
    33         RenderSVGInlineText {#text} at (0,0) size 223x32
     31    RenderSVGContainer {g} at (10,313) size 223x33
     32      RenderSVGText {text} at (10,313) size 223x33 contains 1 chunk(s)
     33        RenderSVGInlineText {#text} at (0,0) size 223x33
    3434          chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
    3535          chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"

  • trunk/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-24-t-expected.txt

    r76450 r76586  
    44  RenderSVGRoot {svg} at (0,0) size 480x360
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    6     RenderSVGContainer {g} at (42,38) size 289x239
     6    RenderSVGContainer {g} at (42,38) size 289x240
    77      RenderSVGContainer {g} at (70,92) size 149x133
    88        RenderSVGText {text} at (70,92) size 149x23 contains 1 chunk(s)
    … …  
    1515          RenderSVGInlineText {#text} at (0,0) size 80x23
    1616            chunk 1 text run 1 at (100.00,220.00) startOffset 0 endOffset 10 width 80.00: "Text at 9s"
    17       RenderSVGContainer {g} at (42,38) size 289x239
    18         RenderSVGText {text} at (0,-15) size 77x17 contains 1 chunk(s)
    19           RenderSVGInlineText {#text} at (0,0) size 77x17
     17      RenderSVGContainer {g} at (42,38) size 289x240
     18        RenderSVGText {text} at (0,-15) size 77x18 contains 1 chunk(s)
     19          RenderSVGInlineText {#text} at (0,0) size 77x18
    2020            chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 11 width 76.84: "It's alive!"
    2121        RenderSVGText {text} at (0,-30) size 154x35 contains 1 chunk(s)
    2222          RenderSVGInlineText {#text} at (0,0) size 154x35
    2323            chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 11 width 153.68: "It's alive!"
    24         RenderSVGText {text} at (100,225) size 231x52 contains 1 chunk(s)
    25           RenderSVGInlineText {#text} at (0,0) size 231x52
     24        RenderSVGText {text} at (100,225) size 231x53 contains 1 chunk(s)
     25          RenderSVGInlineText {#text} at (0,0) size 231x53
    2626            chunk 1 text run 1 at (100.00,270.00) startOffset 0 endOffset 11 width 230.52: "It's alive!"
    27       RenderSVGContainer {g} at (42,38) size 76x54 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,90.00)}]
    28         RenderSVGText {text} at (0,-15) size 77x17 contains 1 chunk(s)
    29           RenderSVGInlineText {#text} at (0,0) size 77x17
     27      RenderSVGContainer {g} at (42,38) size 77x55 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,90.00)}]
     28        RenderSVGText {text} at (0,-15) size 77x18 contains 1 chunk(s)
     29          RenderSVGInlineText {#text} at (0,0) size 77x18
    3030            chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 11 width 76.84: "It's alive!"
    3131          RenderSVGInlineText {#text} at (0,0) size 0x0

  • trunk/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-glyph-02-t-expected.txt

    r69386 r76586  
    33layer at (0,0) size 480x360
    44  RenderSVGRoot {svg} at (0,0) size 480x360
    5     RenderSVGContainer {g} at (100,32) size 224x199
     5    RenderSVGContainer {g} at (100,32) size 224x200
    66      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    77      RenderSVGContainer {g} at (100,32) size 184x84
    … …  
    99          RenderSVGInlineText {#text} at (0,0) size 184x84
    1010            chunk 1 text run 1 at (100.00,100.00) startOffset 0 endOffset 5 width 184.00 RTL: "\x{69A} \x{69A}\x{69A}\x{69A}"
    11       RenderSVGContainer {g} at (100,114) size 224x117
    12         RenderSVGText {text} at (100,114) size 224x117 contains 1 chunk(s)
    13           RenderSVGInlineText {#text} at (0,0) size 224x117
     11      RenderSVGContainer {g} at (100,114) size 224x118
     12        RenderSVGText {text} at (100,114) size 224x118 contains 1 chunk(s)
     13          RenderSVGInlineText {#text} at (0,0) size 224x118
    1414            chunk 1 text run 1 at (100.00,200.00) startOffset 0 endOffset 5 width 223.92 RTL: "\x{62E} \x{62E}\x{62E}\x{62E}"
    1515    RenderSVGText {text} at (10,304) size 264x46 contains 1 chunk(s)

  • trunk/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-kern-01-t-expected.txt

    r69386 r76586  
    3232            RenderSVGInlineText {#text} at (0,0) size 73x14
    3333              chunk 1 text run 1 at (5.00,15.00) startOffset 0 endOffset 13 width 73.00: "u1=\"1\" u2=\"2\""
    34           RenderSVGContainer {g} at (31,81) size 54x28 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
     34          RenderSVGContainer {g} at (31,81) size 54x30 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
    3535            RenderSVGContainer {use} at (31,81) size 28x28
    3636              RenderSVGContainer {g} at (31,81) size 28x28
    … …  
    4545                  RenderSVGPath {line} at (59,103) size 26x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=12.00] [y2=0.00]
    4646                  RenderSVGPath {rect} at (55,101) size 10x8 [fill={[type=SOLID] [color=#FF0000]}] [x=-2.00] [y=-2.00] [width=4.00] [height=4.00]
    47             RenderSVGText {text} at (0,-9) size 18x11 contains 1 chunk(s)
    48               RenderSVGInlineText {#text} at (0,0) size 18x11
     47            RenderSVGText {text} at (0,-9) size 18x12 contains 1 chunk(s)
     48              RenderSVGInlineText {#text} at (0,0) size 18x12
    4949                chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
    5050                chunk 1 text run 2 at (12.50,0.00) startOffset 1 endOffset 2 width 5.00: "2"
    … …  
    6464            RenderSVGInlineText {#text} at (0,0) size 138x18
    6565              chunk 1 text run 1 at (5.00,15.00) startOffset 0 endOffset 19 width 138.00: "g1=\"gl_1\" g2=\"gl_2\""
    66           RenderSVGContainer {g} at (31,136) size 74x28 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
     66          RenderSVGContainer {g} at (31,136) size 74x30 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
    6767            RenderSVGContainer {use} at (31,136) size 28x28
    6868              RenderSVGContainer {g} at (31,136) size 28x28
    … …  
    7777                  RenderSVGPath {line} at (79,158) size 26x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=12.00] [y2=0.00]
    7878                  RenderSVGPath {rect} at (75,156) size 10x8 [fill={[type=SOLID] [color=#FF0000]}] [x=-2.00] [y=-2.00] [width=4.00] [height=4.00]
    79             RenderSVGText {text} at (0,-9) size 28x11 contains 1 chunk(s)
    80               RenderSVGInlineText {#text} at (0,0) size 28x11
     79            RenderSVGText {text} at (0,-9) size 28x12 contains 1 chunk(s)
     80              RenderSVGInlineText {#text} at (0,0) size 28x12
    8181                chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
    8282                chunk 1 text run 2 at (22.50,0.00) startOffset 1 endOffset 2 width 5.00: "2"
    … …  
    9696            RenderSVGInlineText {#text} at (0,0) size 240x18
    9797              chunk 1 text run 1 at (5.00,15.00) startOffset 0 endOffset 33 width 240.00: "u1=\"1\" u2=\"2\" g1=\"gl_3\" g2=\"gl_4\""
    98           RenderSVGContainer {g} at (31,191) size 138x28 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
     98          RenderSVGContainer {g} at (31,191) size 138x30 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
    9999            RenderSVGContainer {use} at (31,191) size 28x28
    100100              RenderSVGContainer {g} at (31,191) size 28x28
    … …  
    121121                  RenderSVGPath {line} at (145,213) size 24x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=12.00] [y2=0.00]
    122122                  RenderSVGPath {rect} at (141,211) size 8x8 [fill={[type=SOLID] [color=#FF0000]}] [x=-2.00] [y=-2.00] [width=4.00] [height=4.00]
    123             RenderSVGText {text} at (0,-9) size 65x11 contains 1 chunk(s)
    124               RenderSVGInlineText {#text} at (0,0) size 65x11
     123            RenderSVGText {text} at (0,-9) size 65x12 contains 1 chunk(s)
     124              RenderSVGInlineText {#text} at (0,0) size 65x12
    125125                chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
    126126                chunk 1 text run 2 at (17.50,0.00) startOffset 1 endOffset 3 width 22.50: "23"
    … …  
    141141            RenderSVGInlineText {#text} at (0,0) size 122x18
    142142              chunk 1 text run 1 at (5.00,15.00) startOffset 0 endOffset 17 width 122.00: "u1=\"1,3\" u2=\"2,4\""
    143           RenderSVGContainer {g} at (31,246) size 138x28 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
     143          RenderSVGContainer {g} at (31,246) size 138x30 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
    144144            RenderSVGContainer {use} at (31,246) size 28x28
    145145              RenderSVGContainer {g} at (31,246) size 28x28
    … …  
    166166                  RenderSVGPath {line} at (145,268) size 24x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=12.00] [y2=0.00]
    167167                  RenderSVGPath {rect} at (141,266) size 8x8 [fill={[type=SOLID] [color=#FF0000]}] [x=-2.00] [y=-2.00] [width=4.00] [height=4.00]
    168             RenderSVGText {text} at (0,-9) size 65x11 contains 1 chunk(s)
    169               RenderSVGInlineText {#text} at (0,0) size 65x11
     168            RenderSVGText {text} at (0,-9) size 65x12 contains 1 chunk(s)
     169              RenderSVGInlineText {#text} at (0,0) size 65x12
    170170                chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
    171171                chunk 1 text run 2 at (17.50,0.00) startOffset 1 endOffset 3 width 22.50: "23"
    … …  
    186186            RenderSVGInlineText {#text} at (0,0) size 202x18
    187187              chunk 1 text run 1 at (5.00,15.00) startOffset 0 endOffset 29 width 202.00: "g1=\"gl_1,gl_3\" g2=\"gl_2,gl_4\""
    188           RenderSVGContainer {g} at (271,81) size 138x28 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
     188          RenderSVGContainer {g} at (271,81) size 138x30 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
    189189            RenderSVGContainer {use} at (271,81) size 28x28
    190190              RenderSVGContainer {g} at (271,81) size 28x28
    … …  
    211211                  RenderSVGPath {line} at (385,103) size 24x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=12.00] [y2=0.00]
    212212                  RenderSVGPath {rect} at (381,101) size 8x8 [fill={[type=SOLID] [color=#FF0000]}] [x=-2.00] [y=-2.00] [width=4.00] [height=4.00]
    213             RenderSVGText {text} at (0,-9) size 65x11 contains 1 chunk(s)
    214               RenderSVGInlineText {#text} at (0,0) size 65x11
     213            RenderSVGText {text} at (0,-9) size 65x12 contains 1 chunk(s)
     214              RenderSVGInlineText {#text} at (0,0) size 65x12
    215215                chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
    216216                chunk 1 text run 2 at (17.50,0.00) startOffset 1 endOffset 3 width 22.50: "23"
    … …  
    231231            RenderSVGInlineText {#text} at (0,0) size 208x18
    232232              chunk 1 text run 1 at (5.00,15.00) startOffset 0 endOffset 26 width 208.00: "u1=\"U+003?\" u2=\"U+0031-34\""
    233           RenderSVGContainer {g} at (271,136) size 168x28 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
     233          RenderSVGContainer {g} at (271,136) size 168x30 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
    234234            RenderSVGContainer {use} at (271,136) size 28x28
    235235              RenderSVGContainer {g} at (271,136) size 28x28
    … …  
    256256                  RenderSVGPath {line} at (415,158) size 24x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=12.00] [y2=0.00]
    257257                  RenderSVGPath {rect} at (411,156) size 8x8 [fill={[type=SOLID] [color=#FF0000]}] [x=-2.00] [y=-2.00] [width=4.00] [height=4.00]
    258             RenderSVGText {text} at (0,-9) size 80x11 contains 1 chunk(s)
    259               RenderSVGInlineText {#text} at (0,0) size 80x11
     258            RenderSVGText {text} at (0,-9) size 80x12 contains 1 chunk(s)
     259              RenderSVGInlineText {#text} at (0,0) size 80x12
    260260                chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
    261261                chunk 1 text run 2 at (17.50,0.00) startOffset 1 endOffset 2 width 15.00: "2"
    … …  
    277277            RenderSVGInlineText {#text} at (0,0) size 118x18
    278278              chunk 1 text run 1 at (5.00,15.00) startOffset 0 endOffset 16 width 118.00: "u1=\"1\" g2=\"gl_2\""
    279           RenderSVGContainer {g} at (271,191) size 60x28 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
     279          RenderSVGContainer {g} at (271,191) size 60x30 [transform={m=((2.00,0.00)(0.00,2.00)) t=(5.00,45.00)}]
    280280            RenderSVGContainer {use} at (271,191) size 28x28
    281281              RenderSVGContainer {g} at (271,191) size 28x28
    … …  
    290290                  RenderSVGPath {line} at (299,213) size 26x4 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=12.00] [y2=0.00]
    291291                  RenderSVGPath {rect} at (295,211) size 10x8 [fill={[type=SOLID] [color=#FF0000]}] [x=-2.00] [y=-2.00] [width=4.00] [height=4.00]
    292             RenderSVGText {text} at (0,-9) size 28x11 contains 1 chunk(s)
    293               RenderSVGInlineText {#text} at (0,0) size 28x11
     292            RenderSVGText {text} at (0,-9) size 28x12 contains 1 chunk(s)
     293              RenderSVGInlineText {#text} at (0,0) size 28x12
    294294                chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
    295295                chunk 1 text run 2 at (12.50,0.00) startOffset 1 endOffset 2 width 15.00: "2"

  • trunk/LayoutTests/platform/mac/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.txt

    r69386 r76586  
    44  RenderSVGRoot {svg} at (0,0) size 480x360
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    6     RenderSVGContainer {g} at (17,30) size 450x224 [transform={m=((1.00,0.00)(0.00,1.50)) t=(0.00,0.00)}]
     6    RenderSVGContainer {g} at (17,28) size 450x227 [transform={m=((1.00,0.00)(0.00,1.50)) t=(0.00,0.00)}]
    77      RenderSVGResourceLinearGradient {linearGradient} [id="Gradient"] [gradientUnits=userSpaceOnUse] [start=(10,10)] [end=(440,10)]
    88        RenderSVGGradientStop {stop} [offset=0.00] [color=#0000FF]
    99        RenderSVGGradientStop {stop} [offset=1.00] [color=#FF0000]
    10       RenderSVGText {text} at (20,20) size 447x58 contains 1 chunk(s)
    11         RenderSVGInlineText {#text} at (0,0) size 447x58
     10      RenderSVGText {text} at (20,19) size 447x60 contains 1 chunk(s)
     11        RenderSVGInlineText {#text} at (0,0) size 447x60
    1212          chunk 1 text run 1 at (20.00,70.00) startOffset 0 endOffset 16 width 446.28: "Gradient on fill"
    13       RenderSVGText {text} at (20,120) size 430x46 contains 1 chunk(s)
    14         RenderSVGInlineText {#text} at (0,0) size 430x46
     13      RenderSVGText {text} at (20,118) size 430x49 contains 1 chunk(s)
     14        RenderSVGInlineText {#text} at (0,0) size 430x49
    1515          chunk 1 text run 1 at (20.00,160.00) startOffset 0 endOffset 18 width 429.88: "Gradient on stroke"
    1616    RenderSVGText {text} at (40,117) size 342x36 contains 1 chunk(s)

  • trunk/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-text-05-t-expected.txt

    r69386 r76586  
    5151                RenderSVGPath {line} at (149,55) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    5252                RenderSVGPath {rect} at (146,66) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    53           RenderSVGText {text} at (0,21) size 60x11 contains 1 chunk(s)
    54             RenderSVGInlineText {#text} at (0,0) size 60x11
     53          RenderSVGText {text} at (0,21) size 60x12 contains 1 chunk(s)
     54            RenderSVGInlineText {#text} at (0,0) size 60x12
    5555              chunk 1 text run 1 at (0.00,30.00) startOffset 0 endOffset 4 width 60.00: "1234"
    5656          RenderSVGContainer {use} at (156,85) size 8x19
    … …  
    7474                RenderSVGPath {line} at (189,85) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    7575                RenderSVGPath {rect} at (186,96) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    76           RenderSVGText {text} at (10,51) size 45x11 contains 1 chunk(s)
    77             RenderSVGInlineText {#text} at (0,0) size 45x11
     76          RenderSVGText {text} at (10,51) size 45x12 contains 1 chunk(s)
     77            RenderSVGInlineText {#text} at (0,0) size 45x12
    7878              chunk 1 text run 1 at (10.00,60.00) startOffset 0 endOffset 1 width 15.00: "1"
    7979              chunk 1 text run 1 at (20.00,60.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    9090                RenderSVGPath {line} at (209,115) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    9191                RenderSVGPath {rect} at (206,126) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    92           RenderSVGText {text} at (10,81) size 95x11 contains 1 chunk(s)
    93             RenderSVGInlineText {#text} at (0,0) size 95x11
     92          RenderSVGText {text} at (10,81) size 95x12 contains 1 chunk(s)
     93            RenderSVGInlineText {#text} at (0,0) size 95x12
    9494              chunk 1 text run 1 at (10.00,90.00) startOffset 0 endOffset 1 width 15.00: "1"
    9595              chunk 1 text run 1 at (60.00,90.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    115115                  RenderSVGPath {line} at (194,155) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    116116                  RenderSVGPath {rect} at (191,166) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    117             RenderSVGText {text} at (0,-19) size 60x31 contains 1 chunk(s)
    118               RenderSVGInlineText {#text} at (0,0) size 60x31
     117            RenderSVGText {text} at (0,-19) size 60x32 contains 1 chunk(s)
     118              RenderSVGInlineText {#text} at (0,0) size 60x32
    119119                chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    120120                chunk 1 text run 1 at (15.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    142142                  RenderSVGPath {line} at (189,185) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    143143                  RenderSVGPath {rect} at (186,196) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    144             RenderSVGText {text} at (10,-19) size 45x31 contains 1 chunk(s)
    145               RenderSVGInlineText {#text} at (0,0) size 45x31
     144            RenderSVGText {text} at (10,-19) size 45x32 contains 1 chunk(s)
     145              RenderSVGInlineText {#text} at (0,0) size 45x32
    146146                chunk 1 text run 1 at (10.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    147147                chunk 1 text run 1 at (20.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    169169                  RenderSVGPath {line} at (199,215) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    170170                  RenderSVGPath {rect} at (196,226) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    171             RenderSVGText {text} at (10,-19) size 55x31 contains 1 chunk(s)
    172               RenderSVGInlineText {#text} at (0,0) size 55x31
     171            RenderSVGText {text} at (10,-19) size 55x32 contains 1 chunk(s)
     172              RenderSVGInlineText {#text} at (0,0) size 55x32
    173173                chunk 1 text run 1 at (10.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    174174                chunk 1 text run 1 at (20.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    186186                  RenderSVGPath {line} at (164,240) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    187187                  RenderSVGPath {rect} at (161,251) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    188             RenderSVGText {text} at (0,-19) size 60x26 contains 1 chunk(s)
    189               RenderSVGInlineText {#text} at (0,0) size 60x26
     188            RenderSVGText {text} at (0,-19) size 60x27 contains 1 chunk(s)
     189              RenderSVGInlineText {#text} at (0,0) size 60x27
    190190                chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    191191                chunk 1 text run 1 at (15.00,5.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    211211                  RenderSVGPath {line} at (189,260) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    212212                  RenderSVGPath {rect} at (186,271) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    213             RenderSVGText {text} at (10,-19) size 45x16 contains 1 chunk(s)
    214               RenderSVGInlineText {#text} at (0,0) size 45x16
     213            RenderSVGText {text} at (10,-19) size 45x17 contains 1 chunk(s)
     214              RenderSVGInlineText {#text} at (0,0) size 45x17
    215215                chunk 1 text run 1 at (10.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    216216                chunk 1 text run 1 at (20.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    228228                  RenderSVGPath {line} at (209,290) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    229229                  RenderSVGPath {rect} at (206,301) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    230             RenderSVGText {text} at (10,-19) size 95x16 contains 1 chunk(s)
    231               RenderSVGInlineText {#text} at (0,0) size 95x16
     230            RenderSVGText {text} at (10,-19) size 95x17 contains 1 chunk(s)
     231              RenderSVGInlineText {#text} at (0,0) size 95x17
    232232                chunk 1 text run 1 at (10.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    233233                chunk 1 text run 1 at (60.00,-5.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    247247                  RenderSVGPath {line} at (249,55) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    248248                  RenderSVGPath {rect} at (246,66) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    249               RenderSVGText {text} at (-30,21) size 60x11 contains 1 chunk(s)
    250                 RenderSVGInlineText {#text} at (0,0) size 60x11
     249              RenderSVGText {text} at (-30,21) size 60x12 contains 1 chunk(s)
     250                RenderSVGInlineText {#text} at (0,0) size 60x12
    251251                  chunk 1 (middle anchor) text run 1 at (-30.00,30.00) startOffset 0 endOffset 4 width 60.00: "1234"
    252252              RenderSVGContainer {g} at (256,85) size 8x19 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,60.00)}]
    … …  
    266266                  RenderSVGPath {line} at (289,85) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    267267                  RenderSVGPath {rect} at (286,96) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    268               RenderSVGText {text} at (2,51) size 46x11 contains 1 chunk(s)
    269                 RenderSVGInlineText {#text} at (0,0) size 46x11
     268              RenderSVGText {text} at (2,51) size 46x12 contains 1 chunk(s)
     269                RenderSVGInlineText {#text} at (0,0) size 46x12
    270270                  chunk 1 (middle anchor) text run 1 at (2.50,60.00) startOffset 0 endOffset 1 width 15.00: "1"
    271271                  chunk 1 (middle anchor) text run 1 at (12.50,60.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    280280                  RenderSVGPath {line} at (309,115) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    281281                  RenderSVGPath {rect} at (306,126) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    282               RenderSVGText {text} at (2,81) size 81x11 contains 1 chunk(s)
    283                 RenderSVGInlineText {#text} at (0,0) size 81x11
     282              RenderSVGText {text} at (2,81) size 81x12 contains 1 chunk(s)
     283                RenderSVGInlineText {#text} at (0,0) size 81x12
    284284                  chunk 1 (middle anchor) text run 1 at (2.50,90.00) startOffset 0 endOffset 1 width 15.00: "1"
    285285                  chunk 1 (middle anchor) text run 1 at (37.50,90.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    301301                    RenderSVGPath {line} at (294,155) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    302302                    RenderSVGPath {rect} at (291,166) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    303                 RenderSVGText {text} at (-8,-19) size 61x31 contains 1 chunk(s)
    304                   RenderSVGInlineText {#text} at (0,0) size 61x31
     303                RenderSVGText {text} at (-8,-19) size 61x32 contains 1 chunk(s)
     304                  RenderSVGInlineText {#text} at (0,0) size 61x32
    305305                    chunk 1 (middle anchor) text run 1 at (-7.50,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    306306                    chunk 1 (middle anchor) text run 1 at (7.50,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    324324                    RenderSVGPath {line} at (289,185) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    325325                    RenderSVGPath {rect} at (286,196) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    326                 RenderSVGText {text} at (2,-19) size 46x31 contains 1 chunk(s)
    327                   RenderSVGInlineText {#text} at (0,0) size 46x31
     326                RenderSVGText {text} at (2,-19) size 46x32 contains 1 chunk(s)
     327                  RenderSVGInlineText {#text} at (0,0) size 46x32
    328328                    chunk 1 (middle anchor) text run 1 at (2.50,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    329329                    chunk 1 (middle anchor) text run 1 at (12.50,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    347347                    RenderSVGPath {line} at (299,215) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    348348                    RenderSVGPath {rect} at (296,226) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    349                 RenderSVGText {text} at (2,-19) size 56x31 contains 1 chunk(s)
    350                   RenderSVGInlineText {#text} at (0,0) size 56x31
     349                RenderSVGText {text} at (2,-19) size 56x32 contains 1 chunk(s)
     350                  RenderSVGInlineText {#text} at (0,0) size 56x32
    351351                    chunk 1 (middle anchor) text run 1 at (2.50,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    352352                    chunk 1 (middle anchor) text run 1 at (12.50,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    362362                    RenderSVGPath {line} at (264,240) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    363363                    RenderSVGPath {rect} at (261,251) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    364                 RenderSVGText {text} at (-8,-19) size 46x26 contains 1 chunk(s)
    365                   RenderSVGInlineText {#text} at (0,0) size 46x26
     364                RenderSVGText {text} at (-8,-19) size 46x27 contains 1 chunk(s)
     365                  RenderSVGInlineText {#text} at (0,0) size 46x27
    366366                    chunk 1 (middle anchor) text run 1 at (-7.50,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    367367                    chunk 1 (middle anchor) text run 1 at (-7.50,5.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    383383                    RenderSVGPath {line} at (289,260) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    384384                    RenderSVGPath {rect} at (286,271) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    385                 RenderSVGText {text} at (2,-19) size 46x16 contains 1 chunk(s)
    386                   RenderSVGInlineText {#text} at (0,0) size 46x16
     385                RenderSVGText {text} at (2,-19) size 46x17 contains 1 chunk(s)
     386                  RenderSVGInlineText {#text} at (0,0) size 46x17
    387387                    chunk 1 (middle anchor) text run 1 at (2.50,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    388388                    chunk 1 (middle anchor) text run 1 at (12.50,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    398398                    RenderSVGPath {line} at (309,290) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    399399                    RenderSVGPath {rect} at (306,301) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    400                 RenderSVGText {text} at (2,-19) size 81x16 contains 1 chunk(s)
    401                   RenderSVGInlineText {#text} at (0,0) size 81x16
     400                RenderSVGText {text} at (2,-19) size 81x17 contains 1 chunk(s)
     401                  RenderSVGInlineText {#text} at (0,0) size 81x17
    402402                    chunk 1 (middle anchor) text run 1 at (2.50,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    403403                    chunk 1 (middle anchor) text run 1 at (37.50,-5.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    417417                  RenderSVGPath {line} at (349,55) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    418418                  RenderSVGPath {rect} at (346,66) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    419               RenderSVGText {text} at (-60,21) size 60x11 contains 1 chunk(s)
    420                 RenderSVGInlineText {#text} at (0,0) size 60x11
     419              RenderSVGText {text} at (-60,21) size 60x12 contains 1 chunk(s)
     420                RenderSVGInlineText {#text} at (0,0) size 60x12
    421421                  chunk 1 (end anchor) text run 1 at (-60.00,30.00) startOffset 0 endOffset 4 width 60.00: "1234"
    422422              RenderSVGContainer {g} at (356,85) size 8x19 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,60.00)}]
    … …  
    436436                  RenderSVGPath {line} at (389,85) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    437437                  RenderSVGPath {rect} at (386,96) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    438               RenderSVGText {text} at (-5,51) size 45x11 contains 1 chunk(s)
    439                 RenderSVGInlineText {#text} at (0,0) size 45x11
     438              RenderSVGText {text} at (-5,51) size 45x12 contains 1 chunk(s)
     439                RenderSVGInlineText {#text} at (0,0) size 45x12
    440440                  chunk 1 (end anchor) text run 1 at (-5.00,60.00) startOffset 0 endOffset 1 width 15.00: "1"
    441441                  chunk 1 (end anchor) text run 1 at (5.00,60.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    450450                  RenderSVGPath {line} at (409,115) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    451451                  RenderSVGPath {rect} at (406,126) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    452               RenderSVGText {text} at (-5,81) size 65x11 contains 1 chunk(s)
    453                 RenderSVGInlineText {#text} at (0,0) size 65x11
     452              RenderSVGText {text} at (-5,81) size 65x12 contains 1 chunk(s)
     453                RenderSVGInlineText {#text} at (0,0) size 65x12
    454454                  chunk 1 (end anchor) text run 1 at (-5.00,90.00) startOffset 0 endOffset 1 width 15.00: "1"
    455455                  chunk 1 (end anchor) text run 1 at (15.00,90.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    471471                    RenderSVGPath {line} at (394,155) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    472472                    RenderSVGPath {rect} at (391,166) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    473                 RenderSVGText {text} at (-15,-19) size 60x31 contains 1 chunk(s)
    474                   RenderSVGInlineText {#text} at (0,0) size 60x31
     473                RenderSVGText {text} at (-15,-19) size 60x32 contains 1 chunk(s)
     474                  RenderSVGInlineText {#text} at (0,0) size 60x32
    475475                    chunk 1 (end anchor) text run 1 at (-15.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    476476                    chunk 1 (end anchor) text run 1 at (0.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    494494                    RenderSVGPath {line} at (389,185) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    495495                    RenderSVGPath {rect} at (386,196) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    496                 RenderSVGText {text} at (-5,-19) size 45x31 contains 1 chunk(s)
    497                   RenderSVGInlineText {#text} at (0,0) size 45x31
     496                RenderSVGText {text} at (-5,-19) size 45x32 contains 1 chunk(s)
     497                  RenderSVGInlineText {#text} at (0,0) size 45x32
    498498                    chunk 1 (end anchor) text run 1 at (-5.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    499499                    chunk 1 (end anchor) text run 1 at (5.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    517517                    RenderSVGPath {line} at (399,215) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    518518                    RenderSVGPath {rect} at (396,226) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    519                 RenderSVGText {text} at (-5,-19) size 55x31 contains 1 chunk(s)
    520                   RenderSVGInlineText {#text} at (0,0) size 55x31
     519                RenderSVGText {text} at (-5,-19) size 55x32 contains 1 chunk(s)
     520                  RenderSVGInlineText {#text} at (0,0) size 55x32
    521521                    chunk 1 (end anchor) text run 1 at (-5.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    522522                    chunk 1 (end anchor) text run 1 at (5.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    532532                    RenderSVGPath {line} at (364,240) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    533533                    RenderSVGPath {rect} at (361,251) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    534                 RenderSVGText {text} at (-30,-19) size 45x26 contains 1 chunk(s)
    535                   RenderSVGInlineText {#text} at (15,0) size 45x26
     534                RenderSVGText {text} at (-30,-19) size 45x27 contains 1 chunk(s)
     535                  RenderSVGInlineText {#text} at (15,0) size 45x27
    536536                    chunk 1 (end anchor) text run 1 at (-15.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    537537                    chunk 1 (end anchor) text run 1 at (-30.00,5.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    553553                    RenderSVGPath {line} at (389,260) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    554554                    RenderSVGPath {rect} at (386,271) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    555                 RenderSVGText {text} at (-5,-19) size 45x16 contains 1 chunk(s)
    556                   RenderSVGInlineText {#text} at (0,0) size 45x16
     555                RenderSVGText {text} at (-5,-19) size 45x17 contains 1 chunk(s)
     556                  RenderSVGInlineText {#text} at (0,0) size 45x17
    557557                    chunk 1 (end anchor) text run 1 at (-5.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    558558                    chunk 1 (end anchor) text run 1 at (5.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    568568                    RenderSVGPath {line} at (409,290) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    569569                    RenderSVGPath {rect} at (406,301) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    570                 RenderSVGText {text} at (-5,-19) size 65x16 contains 1 chunk(s)
    571                   RenderSVGInlineText {#text} at (0,0) size 65x16
     570                RenderSVGText {text} at (-5,-19) size 65x17 contains 1 chunk(s)
     571                  RenderSVGInlineText {#text} at (0,0) size 65x17
    572572                    chunk 1 (end anchor) text run 1 at (-5.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    573573                    chunk 1 (end anchor) text run 1 at (15.00,-5.00) startOffset 0 endOffset 3 width 45.00: "234"

  • trunk/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-text-06-t-expected.txt

    r69386 r76586  
    5151                RenderSVGPath {line} at (249,55) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    5252                RenderSVGPath {rect} at (246,66) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    53           RenderSVGText {text} at (10,-9) size 135x11 contains 1 chunk(s)
    54             RenderSVGInlineText {#text} at (0,0) size 135x11
     53          RenderSVGText {text} at (10,-9) size 135x12 contains 1 chunk(s)
     54            RenderSVGInlineText {#text} at (0,0) size 135x12
    5555              chunk 1 text run 1 at (10.00,0.00) startOffset 0 endOffset 2 width 15.00: "fi"
    5656              chunk 1 text run 1 at (40.00,0.00) startOffset 0 endOffset 1 width 15.00: "1"
    … …  
    8989                RenderSVGPath {line} at (179,125) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    9090                RenderSVGPath {rect} at (176,136) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    91           RenderSVGText {text} at (0,-19) size 75x51 contains 1 chunk(s)
    92             RenderSVGInlineText {#text} at (0,0) size 75x51
     91          RenderSVGText {text} at (0,-19) size 75x52 contains 1 chunk(s)
     92            RenderSVGInlineText {#text} at (0,0) size 75x52
    9393              chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 2 width 15.00: "fi"
    9494              chunk 1 text run 1 at (15.00,0.00) startOffset 0 endOffset 1 width 15.00: "1"
    … …  
    127127                RenderSVGPath {line} at (249,225) size 2x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    128128                RenderSVGPath {rect} at (246,236) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    129           RenderSVGText {text} at (10,-19) size 135x51 contains 1 chunk(s)
    130             RenderSVGInlineText {#text} at (0,0) size 135x51
     129          RenderSVGText {text} at (10,-19) size 135x52 contains 1 chunk(s)
     130            RenderSVGInlineText {#text} at (0,0) size 135x52
    131131              chunk 1 text run 1 at (10.00,-10.00) startOffset 0 endOffset 2 width 15.00: "fi"
    132132              chunk 1 text run 1 at (40.00,0.00) startOffset 0 endOffset 1 width 15.00: "1"

  • trunk/LayoutTests/platform/mac/svg/batik/text/textEffect-expected.txt

    r68976 r76586  
    2525        RenderSVGInlineText {#text} at (0,0) size 152x60
    2626          chunk 1 (middle anchor) text run 1 at (44.00,160.00) startOffset 0 endOffset 5 width 152.00: "BATIK"
    27       RenderSVGText {text} at (252,111) size 156x60 contains 1 chunk(s)
    28         RenderSVGInlineText {#text} at (0,0) size 156x60
     27      RenderSVGText {text} at (252,110) size 156x61 contains 1 chunk(s)
     28        RenderSVGInlineText {#text} at (0,0) size 156x61
    2929          chunk 1 (middle anchor) text run 1 at (252.94,160.00) startOffset 0 endOffset 5 width 154.11: "BATIK"
    3030      RenderSVGText {text} at (44,211) size 152x60 contains 1 chunk(s)
    3131        RenderSVGInlineText {#text} at (0,0) size 152x60
    3232          chunk 1 (middle anchor) text run 1 at (44.00,260.00) startOffset 0 endOffset 5 width 152.00: "BATIK"
    33       RenderSVGText {text} at (252,211) size 156x60 contains 1 chunk(s)
    34         RenderSVGInlineText {#text} at (0,0) size 156x60
     33      RenderSVGText {text} at (252,210) size 156x61 contains 1 chunk(s)
     34        RenderSVGInlineText {#text} at (0,0) size 156x61
    3535          chunk 1 (middle anchor) text run 1 at (252.94,260.00) startOffset 0 endOffset 5 width 154.11: "BATIK"
    3636      RenderSVGText {text} at (44,311) size 152x60 contains 1 chunk(s)
    … …  
    3939          [filter="dropShadow"] RenderSVGResourceFilter {filter} at (0,0) size 0x0
    4040          chunk 1 (middle anchor) text run 1 at (44.00,360.00) startOffset 0 endOffset 5 width 152.00: "BATIK"
    41       RenderSVGText {text} at (252,311) size 156x60 contains 1 chunk(s)
    42         [filter="dropShadow"] RenderSVGResourceFilter {filter} at (236.40,305) size 187.20x72
    43         RenderSVGInlineText {#text} at (0,0) size 156x60
     41      RenderSVGText {text} at (252,310) size 156x61 contains 1 chunk(s)
     42        [filter="dropShadow"] RenderSVGResourceFilter {filter} at (236.40,303.90) size 187.20x73.20
     43        RenderSVGInlineText {#text} at (0,0) size 156x61
    4444          [filter="dropShadow"] RenderSVGResourceFilter {filter} at (0,0) size 0x0
    4545          chunk 1 (middle anchor) text run 1 at (252.94,360.00) startOffset 0 endOffset 5 width 154.11: "BATIK"

  • trunk/LayoutTests/platform/mac/svg/batik/text/textEffect3-expected.txt

    r68976 r76586  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 450x500
    4   RenderSVGRoot {svg} at (39,16) size 387x387
    5     RenderSVGContainer {g} at (39,16) size 387x387
     4  RenderSVGRoot {svg} at (39,16) size 388x387
     5    RenderSVGContainer {g} at (39,16) size 388x387
    66      RenderSVGText {text} at (99,16) size 252x17 contains 1 chunk(s)
    77        RenderSVGInlineText {#text} at (0,0) size 252x17
    … …  
    3737            chunk 1 (middle anchor) text run 1 at (150.50,140.00) startOffset 0 endOffset 1 width 35.00: "K"
    3838        RenderSVGInlineText {#text} at (0,0) size 0x0
    39       RenderSVGText {text} at (263,91) size 148x80 contains 1 chunk(s)
    40         RenderSVGInlineText {#text} at (0,20) size 37x60
     39      RenderSVGText {text} at (263,90) size 149x81 contains 1 chunk(s)
     40        RenderSVGInlineText {#text} at (0,20) size 37x61
    4141          chunk 1 (middle anchor) text run 1 at (263.69,160.00) startOffset 0 endOffset 1 width 35.57: "B"
    42         RenderSVGTSpan {tspan} at (0,0) size 19x30
    43           RenderSVGInlineText {#text} at (36,24) size 19x30
     42        RenderSVGTSpan {tspan} at (0,0) size 19x31
     43          RenderSVGInlineText {#text} at (36,25) size 19x31
    4444            chunk 1 (middle anchor) text run 1 at (299.26,140.00) startOffset 0 endOffset 1 width 17.79: "A"
    45         RenderSVGInlineText {#text} at (54,0) size 33x60
     45        RenderSVGInlineText {#text} at (54,0) size 33x61
    4646          chunk 1 (middle anchor) text run 1 at (317.05,140.00) startOffset 0 endOffset 1 width 32.58: "T"
    4747        RenderSVGTSpan {tspan} at (0,0) size 12x46
    48           RenderSVGInlineText {#text} at (86,11) size 12x46
     48          RenderSVGInlineText {#text} at (86,12) size 12x46
    4949            chunk 1 (middle anchor) text run 1 at (349.63,140.00) startOffset 0 endOffset 1 width 11.11: "I"
    50         RenderSVGTSpan {tspan} at (0,0) size 55x70
    51           RenderSVGInlineText {#text} at (93,2) size 55x70
     50        RenderSVGTSpan {tspan} at (0,0) size 56x70
     51          RenderSVGInlineText {#text} at (93,3) size 56x70
    5252            chunk 1 (middle anchor) text run 1 at (360.74,140.00) startOffset 0 endOffset 1 width 35.57: "K"
    5353        RenderSVGInlineText {#text} at (0,0) size 0x0
    … …  
    6767            chunk 1 (middle anchor) text run 1 at (150.50,240.00) startOffset 0 endOffset 1 width 35.00: "K"
    6868        RenderSVGInlineText {#text} at (0,0) size 0x0
    69       RenderSVGText {text} at (263,191) size 148x80 contains 1 chunk(s)
    70         RenderSVGInlineText {#text} at (0,20) size 37x60
     69      RenderSVGText {text} at (263,190) size 149x81 contains 1 chunk(s)
     70        RenderSVGInlineText {#text} at (0,20) size 37x61
    7171          chunk 1 (middle anchor) text run 1 at (263.69,260.00) startOffset 0 endOffset 1 width 35.57: "B"
    72         RenderSVGTSpan {tspan} at (0,0) size 19x30
    73           RenderSVGInlineText {#text} at (36,24) size 19x30
     72        RenderSVGTSpan {tspan} at (0,0) size 19x31
     73          RenderSVGInlineText {#text} at (36,25) size 19x31
    7474            chunk 1 (middle anchor) text run 1 at (299.26,240.00) startOffset 0 endOffset 1 width 17.79: "A"
    75         RenderSVGInlineText {#text} at (54,0) size 33x60
     75        RenderSVGInlineText {#text} at (54,0) size 33x61
    7676          chunk 1 (middle anchor) text run 1 at (317.05,240.00) startOffset 0 endOffset 1 width 32.58: "T"
    7777        RenderSVGTSpan {tspan} at (0,0) size 12x46
    78           RenderSVGInlineText {#text} at (86,11) size 12x46
     78          RenderSVGInlineText {#text} at (86,12) size 12x46
    7979            chunk 1 (middle anchor) text run 1 at (349.63,240.00) startOffset 0 endOffset 1 width 11.11: "I"
    80         RenderSVGTSpan {tspan} at (0,0) size 55x70
    81           RenderSVGInlineText {#text} at (93,2) size 55x70
     80        RenderSVGTSpan {tspan} at (0,0) size 56x70
     81          RenderSVGInlineText {#text} at (93,3) size 56x70
    8282            chunk 1 (middle anchor) text run 1 at (360.74,240.00) startOffset 0 endOffset 1 width 35.57: "K"
    8383        RenderSVGInlineText {#text} at (0,0) size 0x0
    … …  
    101101        RenderSVGInlineText {#text} at (0,0) size 0x0
    102102          [filter="dropShadow"] RenderSVGResourceFilter {filter} at (0,0) size 0x0
    103       RenderSVGText {text} at (263,291) size 148x80 contains 1 chunk(s)
    104         [filter="dropShadow"] RenderSVGResourceFilter {filter} at (248.20,283) size 177.60x96
    105         RenderSVGInlineText {#text} at (0,20) size 37x60
     103      RenderSVGText {text} at (263,290) size 149x81 contains 1 chunk(s)
     104        [filter="dropShadow"] RenderSVGResourceFilter {filter} at (248.10,281.90) size 178.80x97.20
     105        RenderSVGInlineText {#text} at (0,20) size 37x61
    106106          [filter="dropShadow"] RenderSVGResourceFilter {filter} at (0,0) size 0x0
    107107          chunk 1 (middle anchor) text run 1 at (263.69,360.00) startOffset 0 endOffset 1 width 35.57: "B"
    108         RenderSVGTSpan {tspan} at (0,0) size 19x30
    109           RenderSVGInlineText {#text} at (36,24) size 19x30
     108        RenderSVGTSpan {tspan} at (0,0) size 19x31
     109          RenderSVGInlineText {#text} at (36,25) size 19x31
    110110            chunk 1 (middle anchor) text run 1 at (299.26,340.00) startOffset 0 endOffset 1 width 17.79: "A"
    111         RenderSVGInlineText {#text} at (54,0) size 33x60
     111        RenderSVGInlineText {#text} at (54,0) size 33x61
    112112          [filter="dropShadow"] RenderSVGResourceFilter {filter} at (0,0) size 0x0
    113113          chunk 1 (middle anchor) text run 1 at (317.05,340.00) startOffset 0 endOffset 1 width 32.58: "T"
    114114        RenderSVGTSpan {tspan} at (0,0) size 12x46
    115           RenderSVGInlineText {#text} at (86,11) size 12x46
     115          RenderSVGInlineText {#text} at (86,12) size 12x46
    116116            chunk 1 (middle anchor) text run 1 at (349.63,340.00) startOffset 0 endOffset 1 width 11.11: "I"
    117         RenderSVGTSpan {tspan} at (0,0) size 55x70
    118           RenderSVGInlineText {#text} at (93,2) size 55x70
     117        RenderSVGTSpan {tspan} at (0,0) size 56x70
     118          RenderSVGInlineText {#text} at (93,3) size 56x70
    119119            chunk 1 (middle anchor) text run 1 at (360.74,340.00) startOffset 0 endOffset 1 width 35.57: "K"
    120120        RenderSVGInlineText {#text} at (0,0) size 0x0

  • trunk/LayoutTests/platform/mac/svg/batik/text/textPosition2-expected.txt

    r68976 r76586  
    77      RenderSVGInlineText {#text} at (0,0) size 106x17
    88        chunk 1 (middle anchor) text run 1 at (172.00,30.00) startOffset 0 endOffset 15 width 106.00: "Text Position 2"
    9     RenderSVGContainer {g} at (50,58) size 399x295
    10       RenderSVGText {text} at (50,58) size 54x27 contains 1 chunk(s)
    11         RenderSVGInlineText {#text} at (0,0) size 54x27
     9    RenderSVGContainer {g} at (50,57) size 399x296
     10      RenderSVGText {text} at (50,57) size 54x28 contains 1 chunk(s)
     11        RenderSVGInlineText {#text} at (0,0) size 54x28
    1212          chunk 1 text run 1 at (50.00,80.00) startOffset 0 endOffset 5 width 53.36: "Batik"
    1313      RenderSVGText {text} at (50,91) size 103x11 contains 1 chunk(s)
    1414        RenderSVGInlineText {#text} at (0,0) size 103x11
    1515          chunk 1 text run 1 at (50.00,100.00) startOffset 0 endOffset 21 width 103.00: "<text x=\"100\" y=\"80\">"
    16       RenderSVGText {text} at (240,58) size 134x27 contains 1 chunk(s)
    17         RenderSVGInlineText {#text} at (0,0) size 134x27
     16      RenderSVGText {text} at (240,57) size 134x28 contains 1 chunk(s)
     17        RenderSVGInlineText {#text} at (0,0) size 134x28
    1818          chunk 1 text run 1 at (240.00,80.00) startOffset 0 endOffset 1 width 16.01: "B"
    1919          chunk 1 text run 2 at (276.01,80.00) startOffset 1 endOffset 2 width 13.35: "a"
    … …  
    2424        RenderSVGInlineText {#text} at (0,0) size 194x11
    2525          chunk 1 text run 1 at (240.00,100.00) startOffset 0 endOffset 41 width 194.00: "<text x=\"240\" y=\"80\" letter-spacing=\"20\">"
    26       RenderSVGText {text} at (50,118) size 92x27 contains 1 chunk(s)
    27         RenderSVGInlineText {#text} at (0,0) size 92x27
     26      RenderSVGText {text} at (50,117) size 92x28 contains 1 chunk(s)
     27        RenderSVGInlineText {#text} at (0,0) size 92x28
    2828          chunk 1 text run 1 at (50.00,140.00) startOffset 0 endOffset 1 width 16.01: "B"
    2929          chunk 1 text run 1 at (70.00,140.00) startOffset 0 endOffset 1 width 13.35: "a"
    … …  
    3434        RenderSVGInlineText {#text} at (0,0) size 175x11
    3535          chunk 1 text run 1 at (50.00,160.00) startOffset 0 endOffset 35 width 175.00: "<text x=\"50 70 90 110 130\" y=\"140\">"
    36       RenderSVGText {text} at (240,118) size 134x27 contains 1 chunk(s)
    37         RenderSVGInlineText {#text} at (0,0) size 134x27
     36      RenderSVGText {text} at (240,117) size 134x28 contains 1 chunk(s)
     37        RenderSVGInlineText {#text} at (0,0) size 134x28
    3838          chunk 1 text run 1 at (240.00,140.00) startOffset 0 endOffset 1 width 16.01: "B"
    3939          chunk 1 text run 2 at (276.01,140.00) startOffset 1 endOffset 2 width 13.35: "a"
    … …  
    4444        RenderSVGInlineText {#text} at (0,0) size 175x11
    4545          chunk 1 text run 1 at (240.00,160.00) startOffset 0 endOffset 35 width 175.00: "<text dx=\"240 20 20 20 20\" y=\"140\">"
    46       RenderSVGText {text} at (50,178) size 54x27 contains 1 chunk(s)
    47         RenderSVGTSpan {tspan} at (0,0) size 54x27
    48           RenderSVGInlineText {#text} at (0,0) size 54x27
     46      RenderSVGText {text} at (50,177) size 54x28 contains 1 chunk(s)
     47        RenderSVGTSpan {tspan} at (0,0) size 54x28
     48          RenderSVGInlineText {#text} at (0,0) size 54x28
    4949            chunk 1 text run 1 at (50.00,200.00) startOffset 0 endOffset 5 width 53.36: "Batik"
    5050      RenderSVGText {text} at (50,211) size 112x11 contains 1 chunk(s)
    5151        RenderSVGInlineText {#text} at (0,0) size 112x11
    5252          chunk 1 text run 1 at (50.00,220.00) startOffset 0 endOffset 22 width 112.00: "<tspan x=\"50\" y=\"200\">"
    53       RenderSVGText {text} at (240,178) size 134x27 contains 1 chunk(s)
    54         RenderSVGTSpan {tspan} at (0,0) size 134x27
    55           RenderSVGInlineText {#text} at (0,0) size 134x27
     53      RenderSVGText {text} at (240,177) size 134x28 contains 1 chunk(s)
     54        RenderSVGTSpan {tspan} at (0,0) size 134x28
     55          RenderSVGInlineText {#text} at (0,0) size 134x28
    5656            chunk 1 text run 1 at (240.00,200.00) startOffset 0 endOffset 1 width 16.01: "B"
    5757            chunk 1 text run 2 at (276.01,200.00) startOffset 1 endOffset 2 width 13.35: "a"
    … …  
    6363          RenderSVGInlineText {#text} at (0,0) size 209x11
    6464            chunk 1 text run 1 at (240.00,220.00) startOffset 0 endOffset 43 width 209.00: "<tspan x=\"240\" y=\"200\" letter-spacing=\"20\">"
    65       RenderSVGText {text} at (50,238) size 92x27 contains 1 chunk(s)
    66         RenderSVGTSpan {tspan} at (0,0) size 92x27
    67           RenderSVGInlineText {#text} at (0,0) size 92x27
     65      RenderSVGText {text} at (50,237) size 92x28 contains 1 chunk(s)
     66        RenderSVGTSpan {tspan} at (0,0) size 92x28
     67          RenderSVGInlineText {#text} at (0,0) size 92x28
    6868            chunk 1 text run 1 at (50.00,260.00) startOffset 0 endOffset 1 width 16.01: "B"
    6969            chunk 1 text run 1 at (70.00,260.00) startOffset 0 endOffset 1 width 13.35: "a"
    … …  
    7474        RenderSVGInlineText {#text} at (0,0) size 184x11
    7575          chunk 1 text run 1 at (50.00,280.00) startOffset 0 endOffset 36 width 184.00: "<tspan x=\"50 70 90 110 130\" y=\"260\">"
    76       RenderSVGText {text} at (240,238) size 134x27 contains 1 chunk(s)
    77         RenderSVGTSpan {tspan} at (0,0) size 134x27
    78           RenderSVGInlineText {#text} at (0,0) size 134x27
     76      RenderSVGText {text} at (240,237) size 134x28 contains 1 chunk(s)
     77        RenderSVGTSpan {tspan} at (0,0) size 134x28
     78          RenderSVGInlineText {#text} at (0,0) size 134x28
    7979            chunk 1 text run 1 at (240.00,260.00) startOffset 0 endOffset 1 width 16.01: "B"
    8080            chunk 1 text run 2 at (276.01,260.00) startOffset 1 endOffset 2 width 13.35: "a"
    … …  
    8585        RenderSVGInlineText {#text} at (0,0) size 184x11
    8686          chunk 1 text run 1 at (240.00,280.00) startOffset 0 endOffset 36 width 184.00: "<tspan dx=\"240 20 20 20 20\" y=\"260\">"
    87       RenderSVGText {text} at (50,298) size 92x27 contains 1 chunk(s)
    88         RenderSVGTSpan {tspan} at (0,0) size 92x27
    89           RenderSVGInlineText {#text} at (0,0) size 92x27
     87      RenderSVGText {text} at (50,297) size 92x28 contains 1 chunk(s)
     88        RenderSVGTSpan {tspan} at (0,0) size 92x28
     89          RenderSVGInlineText {#text} at (0,0) size 92x28
    9090            chunk 1 text run 1 at (50.00,320.00) startOffset 0 endOffset 1 width 16.01: "B"
    9191            chunk 1 text run 1 at (70.00,320.00) startOffset 0 endOffset 1 width 13.35: "a"
    … …  
    9999          RenderSVGInlineText {#text} at (33,11) size 137x11
    100100            chunk 1 text run 1 at (83.00,351.00) startOffset 0 endOffset 27 width 137.00: "dx=\"0 10 20 30 40\" y=\"320\">"
    101       RenderSVGText {text} at (240,298) size 134x27 contains 1 chunk(s)
    102         RenderSVGTSpan {tspan} at (0,0) size 134x27
    103           RenderSVGInlineText {#text} at (0,0) size 134x27
     101      RenderSVGText {text} at (240,297) size 134x28 contains 1 chunk(s)
     102        RenderSVGTSpan {tspan} at (0,0) size 134x28
     103          RenderSVGInlineText {#text} at (0,0) size 134x28
    104104            chunk 1 text run 1 at (240.00,320.00) startOffset 0 endOffset 1 width 16.01: "B"
    105105            chunk 1 text run 2 at (276.01,320.00) startOffset 1 endOffset 2 width 13.35: "a"

  • trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt

    r76450 r76586  
    2626        text run at (63,-1) width 327: "CSS ZEN"
    2727        text run at (56,93) width 340: "GARDEN"
    28 layer at (173,118) size 453x20
    29   RenderBlock (positioned) {H2} at (0,86) size 453x20 [color=#EEFF00]
     28layer at (173,118) size 453x21
     29  RenderBlock (positioned) {H2} at (0,86) size 453x21 [color=#EEFF00]
    3030    RenderInline {SPAN} at (0,0) size 149x19
    31       RenderText {#text} at (152,0) size 88x19
    32         text run at (152,0) width 88: "The Beauty of "
     31      RenderText {#text} at (152,1) size 88x19
     32        text run at (152,1) width 88: "The Beauty of "
    3333      RenderInline {ACRONYM} at (0,0) size 21x19
    34         RenderText {#text} at (240,0) size 21x19
    35           text run at (240,0) width 21: "CSS"
    36       RenderText {#text} at (261,0) size 40x19
    37         text run at (261,0) width 40: " Design"
     34        RenderText {#text} at (240,1) size 21x19
     35          text run at (240,1) width 21: "CSS"
     36      RenderText {#text} at (261,1) size 40x19
     37        text run at (261,1) width 40: " Design"
    3838layer at (173,351) size 453x134
    3939  RenderBlock (positioned) {DIV} at (0,319) size 453x134

  • trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-with-no-element-reference-expected.txt

    r76450 r76586  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x94
    4   RenderBlock {HTML} at (0,0) size 800x94
    5     RenderBody {BODY} at (8,18) size 784x58
    6       RenderBlock {P} at (0,0) size 784x20
    7         RenderText {#text} at (0,0) size 278x19
    8           text run at (0,0) width 278: "This text should be rendered with a first font."
    9       RenderBlock {P} at (0,38) size 784x20
    10         RenderText {#text} at (0,0) size 287x19
    11           text run at (0,0) width 287: "This text should be rendered with a second font."
     3layer at (0,0) size 800x96
     4  RenderBlock {HTML} at (0,0) size 800x96
     5    RenderBody {BODY} at (8,18) size 784x60
     6      RenderBlock {P} at (0,0) size 784x21
     7        RenderText {#text} at (0,1) size 278x19
     8          text run at (0,1) width 278: "This text should be rendered with a first font."
     9      RenderBlock {P} at (0,39) size 784x21
     10        RenderText {#text} at (0,1) size 287x19
     11          text run at (0,1) width 287: "This text should be rendered with a second font."

  • trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-without-missing-glyph-expected.txt

    r63422 r76586  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x273
    4   RenderBlock {html} at (0,0) size 800x273
    5     RenderBody {body} at (8,21) size 784x236
     3layer at (0,0) size 800x283
     4  RenderBlock {html} at (0,0) size 800x283
     5    RenderBody {body} at (8,21) size 784x246
    66      RenderBlock {h1} at (0,0) size 784x37
    77        RenderText {#text} at (0,0) size 115x37
    … …  
    1313        RenderText {#text} at (0,0) size 506x18
    1414          text run at (0,0) width 506: "Following text should be rendered as usual. Only \"A\" has a glyph in SVG Font."
    15       RenderBlock {p} at (0,92) size 784x16
    16         RenderText {#text} at (0,0) size 37x15
    17           text run at (0,0) width 37: "XXA"
    18       RenderBlock {p} at (0,124) size 784x16
    19         RenderText {#text} at (0,0) size 37x15
    20           text run at (0,0) width 37: "XAX"
    21       RenderBlock {p} at (0,156) size 784x16
    22         RenderText {#text} at (0,0) size 37x15
    23           text run at (0,0) width 37: "AXX"
    24       RenderBlock {p} at (0,188) size 784x16
    25         RenderText {#text} at (0,0) size 36x15
    26           text run at (0,0) width 36: "XXX"
    27       RenderBlock {p} at (0,220) size 784x16
    28         RenderText {#text} at (0,0) size 38x15
    29           text run at (0,0) width 38: "AAA"
     15      RenderBlock {p} at (0,92) size 784x18
     16        RenderText {#text} at (0,1) size 37x16
     17          text run at (0,1) width 37: "XXA"
     18      RenderBlock {p} at (0,126) size 784x18
     19        RenderText {#text} at (0,1) size 37x16
     20          text run at (0,1) width 37: "XAX"
     21      RenderBlock {p} at (0,160) size 784x18
     22        RenderText {#text} at (0,1) size 37x16
     23          text run at (0,1) width 37: "AXX"
     24      RenderBlock {p} at (0,194) size 784x18
     25        RenderText {#text} at (0,1) size 36x16
     26          text run at (0,1) width 36: "XXX"
     27      RenderBlock {p} at (0,228) size 784x18
     28        RenderText {#text} at (0,1) size 38x16
     29          text run at (0,1) width 38: "AAA"

  • trunk/LayoutTests/platform/mac/svg/text/text-text-05-t-expected.txt

    r69386 r76586  
    5151                RenderSVGPath {line} at (248,91) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    5252                RenderSVGPath {rect} at (243,110) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    53           RenderSVGText {text} at (0,21) size 60x11 contains 1 chunk(s)
    54             RenderSVGInlineText {#text} at (0,0) size 60x11
     53          RenderSVGText {text} at (0,21) size 60x12 contains 1 chunk(s)
     54            RenderSVGInlineText {#text} at (0,0) size 60x12
    5555              chunk 1 text run 1 at (0.00,30.00) startOffset 0 endOffset 4 width 60.00: "1234"
    5656          RenderSVGContainer {use} at (260,141) size 14x33
    … …  
    7474                RenderSVGPath {line} at (315,141) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    7575                RenderSVGPath {rect} at (310,160) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    76           RenderSVGText {text} at (10,51) size 45x11 contains 1 chunk(s)
    77             RenderSVGInlineText {#text} at (0,0) size 45x11
     76          RenderSVGText {text} at (10,51) size 45x12 contains 1 chunk(s)
     77            RenderSVGInlineText {#text} at (0,0) size 45x12
    7878              chunk 1 text run 1 at (10.00,60.00) startOffset 0 endOffset 1 width 15.00: "1"
    7979              chunk 1 text run 1 at (20.00,60.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    9090                RenderSVGPath {line} at (348,191) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    9191                RenderSVGPath {rect} at (343,210) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    92           RenderSVGText {text} at (10,81) size 95x11 contains 1 chunk(s)
    93             RenderSVGInlineText {#text} at (0,0) size 95x11
     92          RenderSVGText {text} at (10,81) size 95x12 contains 1 chunk(s)
     93            RenderSVGInlineText {#text} at (0,0) size 95x12
    9494              chunk 1 text run 1 at (10.00,90.00) startOffset 0 endOffset 1 width 15.00: "1"
    9595              chunk 1 text run 1 at (60.00,90.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    115115                  RenderSVGPath {line} at (323,258) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    116116                  RenderSVGPath {rect} at (318,276) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    117             RenderSVGText {text} at (0,-19) size 60x31 contains 1 chunk(s)
    118               RenderSVGInlineText {#text} at (0,0) size 60x31
     117            RenderSVGText {text} at (0,-19) size 60x32 contains 1 chunk(s)
     118              RenderSVGInlineText {#text} at (0,0) size 60x32
    119119                chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    120120                chunk 1 text run 1 at (15.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    142142                  RenderSVGPath {line} at (315,308) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    143143                  RenderSVGPath {rect} at (310,326) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    144             RenderSVGText {text} at (10,-19) size 45x31 contains 1 chunk(s)
    145               RenderSVGInlineText {#text} at (0,0) size 45x31
     144            RenderSVGText {text} at (10,-19) size 45x32 contains 1 chunk(s)
     145              RenderSVGInlineText {#text} at (0,0) size 45x32
    146146                chunk 1 text run 1 at (10.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    147147                chunk 1 text run 1 at (20.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    169169                  RenderSVGPath {line} at (331,358) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    170170                  RenderSVGPath {rect} at (326,376) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    171             RenderSVGText {text} at (10,-19) size 55x31 contains 1 chunk(s)
    172               RenderSVGInlineText {#text} at (0,0) size 55x31
     171            RenderSVGText {text} at (10,-19) size 55x32 contains 1 chunk(s)
     172              RenderSVGInlineText {#text} at (0,0) size 55x32
    173173                chunk 1 text run 1 at (10.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    174174                chunk 1 text run 1 at (20.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    186186                  RenderSVGPath {line} at (273,400) size 4x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    187187                  RenderSVGPath {rect} at (268,418) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    188             RenderSVGText {text} at (0,-19) size 60x26 contains 1 chunk(s)
    189               RenderSVGInlineText {#text} at (0,0) size 60x26
     188            RenderSVGText {text} at (0,-19) size 60x27 contains 1 chunk(s)
     189              RenderSVGInlineText {#text} at (0,0) size 60x27
    190190                chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    191191                chunk 1 text run 1 at (15.00,5.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    211211                  RenderSVGPath {line} at (315,433) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    212212                  RenderSVGPath {rect} at (310,451) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    213             RenderSVGText {text} at (10,-19) size 45x16 contains 1 chunk(s)
    214               RenderSVGInlineText {#text} at (0,0) size 45x16
     213            RenderSVGText {text} at (10,-19) size 45x17 contains 1 chunk(s)
     214              RenderSVGInlineText {#text} at (0,0) size 45x17
    215215                chunk 1 text run 1 at (10.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    216216                chunk 1 text run 1 at (20.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    228228                  RenderSVGPath {line} at (348,483) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    229229                  RenderSVGPath {rect} at (343,501) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    230             RenderSVGText {text} at (10,-19) size 95x16 contains 1 chunk(s)
    231               RenderSVGInlineText {#text} at (0,0) size 95x16
     230            RenderSVGText {text} at (10,-19) size 95x17 contains 1 chunk(s)
     231              RenderSVGInlineText {#text} at (0,0) size 95x17
    232232                chunk 1 text run 1 at (10.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    233233                chunk 1 text run 1 at (60.00,-5.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    247247                  RenderSVGPath {line} at (415,91) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    248248                  RenderSVGPath {rect} at (410,110) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    249               RenderSVGText {text} at (-30,21) size 60x11 contains 1 chunk(s)
    250                 RenderSVGInlineText {#text} at (0,0) size 60x11
     249              RenderSVGText {text} at (-30,21) size 60x12 contains 1 chunk(s)
     250                RenderSVGInlineText {#text} at (0,0) size 60x12
    251251                  chunk 1 (middle anchor) text run 1 at (-30.00,30.00) startOffset 0 endOffset 4 width 60.00: "1234"
    252252              RenderSVGContainer {g} at (426,141) size 14x33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,60.00)}]
    … …  
    266266                  RenderSVGPath {line} at (481,141) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    267267                  RenderSVGPath {rect} at (476,160) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    268               RenderSVGText {text} at (2,51) size 46x11 contains 1 chunk(s)
    269                 RenderSVGInlineText {#text} at (0,0) size 46x11
     268              RenderSVGText {text} at (2,51) size 46x12 contains 1 chunk(s)
     269                RenderSVGInlineText {#text} at (0,0) size 46x12
    270270                  chunk 1 (middle anchor) text run 1 at (2.50,60.00) startOffset 0 endOffset 1 width 15.00: "1"
    271271                  chunk 1 (middle anchor) text run 1 at (12.50,60.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    280280                  RenderSVGPath {line} at (515,191) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    281281                  RenderSVGPath {rect} at (510,210) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    282               RenderSVGText {text} at (2,81) size 81x11 contains 1 chunk(s)
    283                 RenderSVGInlineText {#text} at (0,0) size 81x11
     282              RenderSVGText {text} at (2,81) size 81x12 contains 1 chunk(s)
     283                RenderSVGInlineText {#text} at (0,0) size 81x12
    284284                  chunk 1 (middle anchor) text run 1 at (2.50,90.00) startOffset 0 endOffset 1 width 15.00: "1"
    285285                  chunk 1 (middle anchor) text run 1 at (37.50,90.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    301301                    RenderSVGPath {line} at (490,258) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    302302                    RenderSVGPath {rect} at (485,276) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    303                 RenderSVGText {text} at (-8,-19) size 61x31 contains 1 chunk(s)
    304                   RenderSVGInlineText {#text} at (0,0) size 61x31
     303                RenderSVGText {text} at (-8,-19) size 61x32 contains 1 chunk(s)
     304                  RenderSVGInlineText {#text} at (0,0) size 61x32
    305305                    chunk 1 (middle anchor) text run 1 at (-7.50,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    306306                    chunk 1 (middle anchor) text run 1 at (7.50,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    324324                    RenderSVGPath {line} at (481,308) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    325325                    RenderSVGPath {rect} at (476,326) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    326                 RenderSVGText {text} at (2,-19) size 46x31 contains 1 chunk(s)
    327                   RenderSVGInlineText {#text} at (0,0) size 46x31
     326                RenderSVGText {text} at (2,-19) size 46x32 contains 1 chunk(s)
     327                  RenderSVGInlineText {#text} at (0,0) size 46x32
    328328                    chunk 1 (middle anchor) text run 1 at (2.50,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    329329                    chunk 1 (middle anchor) text run 1 at (12.50,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    347347                    RenderSVGPath {line} at (498,358) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    348348                    RenderSVGPath {rect} at (493,376) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    349                 RenderSVGText {text} at (2,-19) size 56x31 contains 1 chunk(s)
    350                   RenderSVGInlineText {#text} at (0,0) size 56x31
     349                RenderSVGText {text} at (2,-19) size 56x32 contains 1 chunk(s)
     350                  RenderSVGInlineText {#text} at (0,0) size 56x32
    351351                    chunk 1 (middle anchor) text run 1 at (2.50,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    352352                    chunk 1 (middle anchor) text run 1 at (12.50,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    362362                    RenderSVGPath {line} at (440,400) size 4x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    363363                    RenderSVGPath {rect} at (435,418) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    364                 RenderSVGText {text} at (-8,-19) size 46x26 contains 1 chunk(s)
    365                   RenderSVGInlineText {#text} at (0,0) size 46x26
     364                RenderSVGText {text} at (-8,-19) size 46x27 contains 1 chunk(s)
     365                  RenderSVGInlineText {#text} at (0,0) size 46x27
    366366                    chunk 1 (middle anchor) text run 1 at (-7.50,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    367367                    chunk 1 (middle anchor) text run 1 at (-7.50,5.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    383383                    RenderSVGPath {line} at (481,433) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    384384                    RenderSVGPath {rect} at (476,451) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    385                 RenderSVGText {text} at (2,-19) size 46x16 contains 1 chunk(s)
    386                   RenderSVGInlineText {#text} at (0,0) size 46x16
     385                RenderSVGText {text} at (2,-19) size 46x17 contains 1 chunk(s)
     386                  RenderSVGInlineText {#text} at (0,0) size 46x17
    387387                    chunk 1 (middle anchor) text run 1 at (2.50,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    388388                    chunk 1 (middle anchor) text run 1 at (12.50,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    398398                    RenderSVGPath {line} at (515,483) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    399399                    RenderSVGPath {rect} at (510,501) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    400                 RenderSVGText {text} at (2,-19) size 81x16 contains 1 chunk(s)
    401                   RenderSVGInlineText {#text} at (0,0) size 81x16
     400                RenderSVGText {text} at (2,-19) size 81x17 contains 1 chunk(s)
     401                  RenderSVGInlineText {#text} at (0,0) size 81x17
    402402                    chunk 1 (middle anchor) text run 1 at (2.50,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    403403                    chunk 1 (middle anchor) text run 1 at (37.50,-5.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    417417                  RenderSVGPath {line} at (581,91) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    418418                  RenderSVGPath {rect} at (576,110) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    419               RenderSVGText {text} at (-60,21) size 60x11 contains 1 chunk(s)
    420                 RenderSVGInlineText {#text} at (0,0) size 60x11
     419              RenderSVGText {text} at (-60,21) size 60x12 contains 1 chunk(s)
     420                RenderSVGInlineText {#text} at (0,0) size 60x12
    421421                  chunk 1 (end anchor) text run 1 at (-60.00,30.00) startOffset 0 endOffset 4 width 60.00: "1234"
    422422              RenderSVGContainer {g} at (593,141) size 14x33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,60.00)}]
    … …  
    436436                  RenderSVGPath {line} at (648,141) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    437437                  RenderSVGPath {rect} at (643,160) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    438               RenderSVGText {text} at (-5,51) size 45x11 contains 1 chunk(s)
    439                 RenderSVGInlineText {#text} at (0,0) size 45x11
     438              RenderSVGText {text} at (-5,51) size 45x12 contains 1 chunk(s)
     439                RenderSVGInlineText {#text} at (0,0) size 45x12
    440440                  chunk 1 (end anchor) text run 1 at (-5.00,60.00) startOffset 0 endOffset 1 width 15.00: "1"
    441441                  chunk 1 (end anchor) text run 1 at (5.00,60.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    450450                  RenderSVGPath {line} at (681,191) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    451451                  RenderSVGPath {rect} at (676,210) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    452               RenderSVGText {text} at (-5,81) size 65x11 contains 1 chunk(s)
    453                 RenderSVGInlineText {#text} at (0,0) size 65x11
     452              RenderSVGText {text} at (-5,81) size 65x12 contains 1 chunk(s)
     453                RenderSVGInlineText {#text} at (0,0) size 65x12
    454454                  chunk 1 (end anchor) text run 1 at (-5.00,90.00) startOffset 0 endOffset 1 width 15.00: "1"
    455455                  chunk 1 (end anchor) text run 1 at (15.00,90.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    471471                    RenderSVGPath {line} at (656,258) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    472472                    RenderSVGPath {rect} at (651,276) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    473                 RenderSVGText {text} at (-15,-19) size 60x31 contains 1 chunk(s)
    474                   RenderSVGInlineText {#text} at (0,0) size 60x31
     473                RenderSVGText {text} at (-15,-19) size 60x32 contains 1 chunk(s)
     474                  RenderSVGInlineText {#text} at (0,0) size 60x32
    475475                    chunk 1 (end anchor) text run 1 at (-15.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    476476                    chunk 1 (end anchor) text run 1 at (0.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    494494                    RenderSVGPath {line} at (648,308) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    495495                    RenderSVGPath {rect} at (643,326) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    496                 RenderSVGText {text} at (-5,-19) size 45x31 contains 1 chunk(s)
    497                   RenderSVGInlineText {#text} at (0,0) size 45x31
     496                RenderSVGText {text} at (-5,-19) size 45x32 contains 1 chunk(s)
     497                  RenderSVGInlineText {#text} at (0,0) size 45x32
    498498                    chunk 1 (end anchor) text run 1 at (-5.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    499499                    chunk 1 (end anchor) text run 1 at (5.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    517517                    RenderSVGPath {line} at (665,358) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    518518                    RenderSVGPath {rect} at (660,376) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    519                 RenderSVGText {text} at (-5,-19) size 55x31 contains 1 chunk(s)
    520                   RenderSVGInlineText {#text} at (0,0) size 55x31
     519                RenderSVGText {text} at (-5,-19) size 55x32 contains 1 chunk(s)
     520                  RenderSVGInlineText {#text} at (0,0) size 55x32
    521521                    chunk 1 (end anchor) text run 1 at (-5.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    522522                    chunk 1 (end anchor) text run 1 at (5.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    532532                    RenderSVGPath {line} at (606,400) size 4x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    533533                    RenderSVGPath {rect} at (601,418) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    534                 RenderSVGText {text} at (-30,-19) size 45x26 contains 1 chunk(s)
    535                   RenderSVGInlineText {#text} at (15,0) size 45x26
     534                RenderSVGText {text} at (-30,-19) size 45x27 contains 1 chunk(s)
     535                  RenderSVGInlineText {#text} at (15,0) size 45x27
    536536                    chunk 1 (end anchor) text run 1 at (-15.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    537537                    chunk 1 (end anchor) text run 1 at (-30.00,5.00) startOffset 0 endOffset 3 width 45.00: "234"
    … …  
    553553                    RenderSVGPath {line} at (648,433) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    554554                    RenderSVGPath {rect} at (643,451) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    555                 RenderSVGText {text} at (-5,-19) size 45x16 contains 1 chunk(s)
    556                   RenderSVGInlineText {#text} at (0,0) size 45x16
     555                RenderSVGText {text} at (-5,-19) size 45x17 contains 1 chunk(s)
     556                  RenderSVGInlineText {#text} at (0,0) size 45x17
    557557                    chunk 1 (end anchor) text run 1 at (-5.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    558558                    chunk 1 (end anchor) text run 1 at (5.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
    … …  
    568568                    RenderSVGPath {line} at (681,483) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    569569                    RenderSVGPath {rect} at (676,501) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    570                 RenderSVGText {text} at (-5,-19) size 65x16 contains 1 chunk(s)
    571                   RenderSVGInlineText {#text} at (0,0) size 65x16
     570                RenderSVGText {text} at (-5,-19) size 65x17 contains 1 chunk(s)
     571                  RenderSVGInlineText {#text} at (0,0) size 65x17
    572572                    chunk 1 (end anchor) text run 1 at (-5.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
    573573                    chunk 1 (end anchor) text run 1 at (15.00,-5.00) startOffset 0 endOffset 3 width 45.00: "234"

  • trunk/LayoutTests/platform/mac/svg/text/text-text-06-t-expected.txt

    r69386 r76586  
    5151                RenderSVGPath {line} at (415,91) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    5252                RenderSVGPath {rect} at (410,110) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    53           RenderSVGText {text} at (10,-9) size 135x11 contains 1 chunk(s)
    54             RenderSVGInlineText {#text} at (0,0) size 135x11
     53          RenderSVGText {text} at (10,-9) size 135x12 contains 1 chunk(s)
     54            RenderSVGInlineText {#text} at (0,0) size 135x12
    5555              chunk 1 text run 1 at (10.00,0.00) startOffset 0 endOffset 2 width 15.00: "fi"
    5656              chunk 1 text run 1 at (40.00,0.00) startOffset 0 endOffset 1 width 15.00: "1"
    … …  
    8989                RenderSVGPath {line} at (298,208) size 4x26 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    9090                RenderSVGPath {rect} at (293,226) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    91           RenderSVGText {text} at (0,-19) size 75x51 contains 1 chunk(s)
    92             RenderSVGInlineText {#text} at (0,0) size 75x51
     91          RenderSVGText {text} at (0,-19) size 75x52 contains 1 chunk(s)
     92            RenderSVGInlineText {#text} at (0,0) size 75x52
    9393              chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 2 width 15.00: "fi"
    9494              chunk 1 text run 1 at (15.00,0.00) startOffset 0 endOffset 1 width 15.00: "1"
    … …  
    127127                RenderSVGPath {line} at (415,375) size 4x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-15.00]
    128128                RenderSVGPath {rect} at (410,393) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
    129           RenderSVGText {text} at (10,-19) size 135x51 contains 1 chunk(s)
    130             RenderSVGInlineText {#text} at (0,0) size 135x51
     129          RenderSVGText {text} at (10,-19) size 135x52 contains 1 chunk(s)
     130            RenderSVGInlineText {#text} at (0,0) size 135x52
    131131              chunk 1 text run 1 at (10.00,-10.00) startOffset 0 endOffset 2 width 15.00: "fi"
    132132              chunk 1 text run 1 at (40.00,0.00) startOffset 0 endOffset 1 width 15.00: "1"

  • trunk/LayoutTests/svg/custom/glyph-transformation-with-hkern-expected.txt

    r68976 r76586  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (30,1) size 138x152
     4  RenderSVGRoot {svg} at (30,0) size 138x153
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    6     RenderSVGText {text} at (30,1) size 138x152 contains 1 chunk(s)
    7       RenderSVGInlineText {#text} at (0,0) size 138x152
     6    RenderSVGText {text} at (30,0) size 138x153 contains 1 chunk(s)
     7      RenderSVGInlineText {#text} at (0,0) size 138x153
    88        chunk 1 text run 1 at (30.00,30.00) startOffset 0 endOffset 1 width 25.27: "R"
    99        chunk 1 text run 1 at (50.00,50.00) startOffset 0 endOffset 1 width 27.23: "O"

  • trunk/Source/WebCore/ChangeLog

    r76581 r76586  
     12011-01-25  Nikolas Zimmermann  <nzimmermann@rim.com>
     2
     3        Reviewed by Dirk Schulze.
     4
     5        Introduce FontMetrics abstraction
     6        https://bugs.webkit.org/show_bug.cgi?id=51456
     7
     8        Use accurate floating-point metrics for SVG Font calculations instead of casting float -> integer.
     9        This hopefully fixes differences between 32/64 bit bots.
     10
     11        Needs new layout test results for several platforms, which need to be taken from the bots landing afterwards.
     12
     13        * platform/graphics/SimpleFontData.cpp:
     14        (WebCore::SimpleFontData::SimpleFontData):
     15        (WebCore::SimpleFontData::initCharWidths):
     16
    1172011-01-24  Pavel Podivilov  <podivilov@chromium.org>
    218

  • trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp

    r76445 r76586  
    8080        scale /= unitsPerEm;
    8181
    82     // FIXME: Use floating-point metrics, now that they're exposed!
    83     int xHeight = static_cast<int>(svgFontFaceElement->xHeight() * scale);
    84     int ascent = static_cast<int>(svgFontFaceElement->ascent() * scale);
    85     int descent = static_cast<int>(svgFontFaceElement->descent() * scale);
    86     int lineGap = static_cast<int>(0.1f * size);
     82    float xHeight = svgFontFaceElement->xHeight() * scale;
     83    float ascent = svgFontFaceElement->ascent() * scale;
     84    float descent = svgFontFaceElement->descent() * scale;
     85    float lineGap = 0.1f * size;
    8786    m_fontMetrics.setUnitsPerEm(unitsPerEm);
    8887    m_fontMetrics.setAscent(ascent);
    8988    m_fontMetrics.setDescent(descent);
    9089    m_fontMetrics.setLineGap(lineGap);
    91     m_fontMetrics.setLineSpacing(ascent + descent + lineGap);
     90    m_fontMetrics.setLineSpacing(roundf(ascent) + roundf(descent) + roundf(lineGap));
    9291    m_fontMetrics.setXHeight(xHeight);
    9392
    … …  
    9695    Vector<SVGGlyphIdentifier> spaceGlyphs;
    9796    associatedFontElement->getGlyphIdentifiersForString(String(" ", 1), spaceGlyphs);
    98     m_spaceWidth = spaceGlyphs.isEmpty() ? xHeight : static_cast<float>(spaceGlyphs.first().horizontalAdvanceX * scale);
     97    m_spaceWidth = spaceGlyphs.isEmpty() ? xHeight : spaceGlyphs.first().horizontalAdvanceX * scale;
    9998
    10099    Vector<SVGGlyphIdentifier> numeralZeroGlyphs;
    101100    associatedFontElement->getGlyphIdentifiersForString(String("0", 1), numeralZeroGlyphs);
    102     m_avgCharWidth = numeralZeroGlyphs.isEmpty() ? m_spaceWidth : static_cast<float>(numeralZeroGlyphs.first().horizontalAdvanceX * scale);
     101    m_avgCharWidth = numeralZeroGlyphs.isEmpty() ? m_spaceWidth : numeralZeroGlyphs.first().horizontalAdvanceX * scale;
    103102
    104103    Vector<SVGGlyphIdentifier> letterWGlyphs;
    105104    associatedFontElement->getGlyphIdentifiersForString(String("W", 1), letterWGlyphs);
    106     m_maxCharWidth = letterWGlyphs.isEmpty() ? ascent : static_cast<float>(letterWGlyphs.first().horizontalAdvanceX * scale);
     105    m_maxCharWidth = letterWGlyphs.isEmpty() ? ascent : letterWGlyphs.first().horizontalAdvanceX * scale;
    107106
    108107    // FIXME: is there a way we can get the space glyph from the SVGGlyphIdentifier above?
    … …  
    134133        m_avgCharWidth = m_fontMetrics.xHeight();
    135134
    136     // FIXME: Use floating-point metrics, now that they're exposed!
    137135    if (m_maxCharWidth <= 0.f)
    138         m_maxCharWidth = max<float>(m_avgCharWidth, m_fontMetrics.ascent());
     136        m_maxCharWidth = max(m_avgCharWidth, m_fontMetrics.floatAscent());
    139137}
    140138
Note: See TracChangeset for help on using the changeset viewer.