Commit 95ccc61b authored by zimmermann@webkit.org's avatar zimmermann@webkit.org
Browse files

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


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a0f3dadc
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:
2011-01-25 Mario Sanchez Prada <msanchez@igalia.com>
 
Unreviewed, skipping flaky test on GTK debug bots.
......
......@@ -5603,15 +5603,6 @@ http/tests/security/local-iFrame-from-remote.html
http/tests/security/local-image-from-remote.html
http/tests/security/local-user-CSS-from-remote.html
# 64bits bot fails and 32bits bots work on these tests
# https://bugs.webkit.org/show_bug.cgi?id=52996
svg/W3C-SVG-1.1-SE/filters-image-03-f.svg
svg/W3C-SVG-1.1-SE/pservers-pattern-03-f.svg
svg/text/text-hkern-on-vertical-text.svg
svg/text/text-hkern.svg
svg/text/text-vkern-on-horizontal-text.svg
svg/text/text-vkern.svg
# This media test seems to time out.
# https://bugs.webkit.org/show_bug.cgi?id=53056
media/unsupported-rtsp.html
......
e77f4e3d368a6745616b4bba8f27fc7b
\ No newline at end of file
f07a4f60a1d402a0b29f82a264ef7644
\ No newline at end of file
e14a142f0d5460b2f97b61cdce4f2610
\ No newline at end of file
e7acd6067d3bfdabb96650c7bc2b9c95
\ No newline at end of file
ad1b995d41094ed2c89f381290342b30
\ No newline at end of file
a73b1391929f72bfc963d351a9f68059
\ No newline at end of file
0db889d95c888c22b113e05907613704
\ No newline at end of file
f578ceabc7cef1088b29cdc021145b71
\ No newline at end of file
397aa17de66748a2aba4fddf879ef7ef
\ No newline at end of file
5d31634f249acba54652b5e09bcef70d
\ No newline at end of file
365aa91d56141671987e1296891083f2
\ No newline at end of file
c89d88e37a2b186cfdfb6eb9244c5757
\ No newline at end of file
9f915ead41dcba5bc22696cf8c7f7d42
\ No newline at end of file
f6db031052fcbc5d4b750f1f2e4a59f2
\ No newline at end of file
b1628680afe14164ca7fde517a464898
\ No newline at end of file
e137c04ded88306a5d8ca749a8970e51
\ No newline at end of file
......@@ -49,9 +49,9 @@ layer at (0,0) size 480x360
RenderSVGPath {rect} at (159,199) size 52x52 [stroke={[type=SOLID] [color=#0000FF]}] [x=100.00] [y=100.00] [width=50.00] [height=50.00]
RenderSVGPath {rect} at (259,199) size 52x52 [stroke={[type=SOLID] [color=#0000FF]}] [x=200.00] [y=100.00] [width=50.00] [height=50.00]
RenderSVGPath {rect} at (359,199) size 52x52 [stroke={[type=SOLID] [color=#0000FF]}] [x=300.00] [y=100.00] [width=50.00] [height=50.00]
RenderSVGContainer {g} at (10,314) size 223x32
RenderSVGText {text} at (10,314) size 223x32 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 223x32
RenderSVGContainer {g} at (10,313) size 223x33
RenderSVGText {text} at (10,313) size 223x33 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 223x33
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"
chunk 1 text run 3 at (67.82,340.00) startOffset 3 endOffset 12 width 117.38: "vision: 1"
......
......@@ -3,7 +3,7 @@ layer at (0,0) size 480x360
layer at (0,0) size 480x360
RenderSVGRoot {svg} at (0,0) size 480x360
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGContainer {g} at (49,81) size 376x172
RenderSVGContainer {g} at (49,81) size 376x173
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceLinearGradient {linearGradient} [id="grad"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,0)]
RenderSVGGradientStop {stop} [offset=0.00] [color=#000000]
......@@ -14,8 +14,8 @@ layer at (0,0) size 480x360
RenderSVGPath {line} at (119,82) size 6x144 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(420.00,-60.00)}] [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=180.00] [x2=480.00] [y2=180.00]
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]
RenderSVGPath {rect} at (49,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
RenderSVGText {text} at (69,236) size 102x17 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 102x17
RenderSVGText {text} at (69,235) size 102x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 102x19
chunk 1 (middle anchor) text run 1 at (69.04,250.00) startOffset 0 endOffset 1 width 16.99: "W"
chunk 1 (middle anchor) text run 2 at (86.02,250.00) startOffset 1 endOffset 3 width 9.00: "it"
chunk 1 (middle anchor) text run 3 at (94.96,250.00) startOffset 3 endOffset 6 width 20.02: "h f"
......@@ -27,16 +27,16 @@ layer at (0,0) size 480x360
RenderSVGPath {line} at (349,82) size 6x144 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(420.00,-60.00)}] [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=180.00] [x2=480.00] [y2=180.00]
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]
RenderSVGPath {rect} at (279,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
RenderSVGText {text} at (286,236) size 128x17 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 128x17
RenderSVGText {text} at (286,235) size 128x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 128x19
chunk 1 (middle anchor) text run 1 at (286.53,250.00) startOffset 0 endOffset 1 width 16.99: "W"
chunk 1 (middle anchor) text run 2 at (303.51,250.00) startOffset 1 endOffset 3 width 9.00: "it"
chunk 1 (middle anchor) text run 3 at (312.45,250.00) startOffset 3 endOffset 9 width 45.04: "hout f"
chunk 1 (middle anchor) text run 4 at (357.33,250.00) startOffset 9 endOffset 15 width 47.02: "allbac"
chunk 1 (middle anchor) text run 5 at (404.47,250.00) startOffset 15 endOffset 16 width 9.00: "k"
RenderSVGContainer {g} at (10,314) size 227x32
RenderSVGText {text} at (10,314) size 227x32 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 227x32
RenderSVGContainer {g} at (10,313) size 227x33
RenderSVGText {text} at (10,313) size 227x33 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 227x33
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"
chunk 1 text run 3 at (67.82,340.00) startOffset 3 endOffset 12 width 117.38: "vision: 1"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment