Changeset 170699 in webkit


Ignore:
Timestamp:
Jul 1, 2014 11:44:05 PM (10 years ago)
Author:
fred.wang@free.fr
Message:

The OpenType MATH table is not read on Mac
​https://bugs.webkit.org/show_bug.cgi?id=133569

Reviewed by Chris Fleizach.

Source/WebCore:
An incorrect tag format is used to load the OpenType MATH table on Mac.
This commit makes the format consistent with what is used for other tables on Mac.
This will allow to load the MATH table and to use it for the MathML rendering.

No new tests. platform/graphics/opentype already contains tests for the OpenType MATH support.

  • platform/graphics/opentype/OpenTypeMathData.cpp:

LayoutTests:
We update the references for some tests in LayoutTests/mathml/opentype/ and remove the failure from TestExpectations.
Other tests require a font with a MATH table to be installed on Mac bots and to be used by default (bug 133603).

  • platform/mac-wk2/mathml/opentype/opentype-stretchy-expected.txt: Removed.
  • platform/mac/TestExpectations: Enable mathml/opentype/opentype-stretchy-horizontal.html and mathml/opentype/opentype-stretchy.html.
  • platform/mac/mathml/horizontal-LatinModern-expected.txt: Removed. This file should not have been in this directory.
  • platform/mac/mathml/horizontal-LatinModern-munderover-expected.txt: Removed. This file should not have been in this directory.
  • platform/mac/mathml/opentype-stretchy-horizontal-expected.txt: Removed. This file should not have been in this directory.
  • platform/mac/mathml/opentype/opentype-stretchy-expected.txt: Add text reference.
  • platform/mac/mathml/opentype/opentype-stretchy-horizontal-expected.txt: Add text reference.
Location:
trunk
Files:
4 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r170694 r170699  
     12014-07-01  Frédéric Wang  <fred.wang@free.fr>
     2
     3        The OpenType MATH table is not read on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=133569
     5
     6        Reviewed by Chris Fleizach.
     7
     8        We update the references for some tests in LayoutTests/mathml/opentype/ and remove the failure from TestExpectations.
     9        Other tests require a font with a MATH table to be installed on Mac bots and to be used by default (bug 133603).
     10
     11        * platform/mac-wk2/mathml/opentype/opentype-stretchy-expected.txt: Removed.
     12        * platform/mac/TestExpectations: Enable mathml/opentype/opentype-stretchy-horizontal.html and mathml/opentype/opentype-stretchy.html.
     13        * platform/mac/mathml/horizontal-LatinModern-expected.txt: Removed. This file should not have been in this directory.
     14        * platform/mac/mathml/horizontal-LatinModern-munderover-expected.txt: Removed. This file should not have been in this directory.
     15        * platform/mac/mathml/opentype-stretchy-horizontal-expected.txt: Removed. This file should not have been in this directory.
     16        * platform/mac/mathml/opentype/opentype-stretchy-expected.txt: Add text reference.
     17        * platform/mac/mathml/opentype/opentype-stretchy-horizontal-expected.txt: Add text reference.
     18
    1192014-07-01  Eric Carlson  <eric.carlson@apple.com>
    220

  • trunk/LayoutTests/platform/mac/TestExpectations

    r170232 r170699  
    13201320webkit.org/b/130693 mathml/presentation/tokenElements-background-color.html [ ImageOnlyFailure ]
    13211321
    1322 # OpenType MATH tests failing
    1323 webkit.org/b/130322 [ MountainLion Mavericks ] mathml/opentype/large-operators.html [ Failure ]
    1324 webkit.org/b/130322 [ MountainLion Mavericks ] mathml/opentype/opentype-stretchy.html [ Failure ]
    1325 webkit.org/b/130322 [ MountainLion Mavericks ] mathml/opentype/vertical.html [ Failure ]
     1322# These tests require an OpenType MATH font on the Apple bots.
     1323webkit.org/b/130322 [ MountainLion Lion Mavericks ] mathml/opentype/large-operators.html [ Failure ]
     1324webkit.org/b/130322 [ MountainLion Lion Mavericks ] mathml/opentype/vertical.html [ Failure ]
    13261325webkit.org/b/72828 mathml/opentype/horizontal.html [ Failure ]
    1327 webkit.org/b/72828 mathml/opentype/opentype-stretchy-horizontal.html [ Failure ]
    13281326webkit.org/b/72828 mathml/opentype/horizontal-munderover.html [ Failure ]
    13291327

  • trunk/LayoutTests/platform/mac/mathml/opentype/opentype-stretchy-expected.txt

    r169305 r170699  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x118
    4   RenderBlock {HTML} at (0,0) size 800x118
    5     RenderBody {BODY} at (8,16) size 784x86
    6       RenderBlock {P} at (0,0) size 784x18
    7         RenderMathMLMath {math} at (0,7) size 15x8 [padding: 0 1 0 1]
    8           RenderMathMLRow {mrow} at (1,0) size 13x8
    9             RenderMathMLOperator {mo} at (0,0) size 13x8
    10               RenderMathMLBlock (anonymous, flex) at (2,0) size 8x8
    11                 RenderBlock (anonymous) at (0,0) size 7x8
    12                   RenderText at (0,-3) size 7x13
    13                     text run at (0,-3) width 7: "\x{219F}"
    14         RenderText {#text} at (14,0) size 5x18
    15           text run at (14,0) width 5: " "
    16         RenderMathMLMath {math} at (18,7) size 16x8 [padding: 0 1 0 1]
    17           RenderMathMLRow {mrow} at (1,0) size 13x8
    18             RenderMathMLOperator {mo} at (0,0) size 13x8
    19               RenderMathMLBlock (anonymous, flex) at (2,0) size 8x8
    20                 RenderBlock (anonymous) at (0,0) size 7x8
    21                   RenderText at (0,-3) size 7x13
    22                     text run at (0,-3) width 7: "\x{219F}"
    23         RenderText {#text} at (33,0) size 5x18
    24           text run at (33,0) width 5: " "
    25         RenderMathMLMath {math} at (37,7) size 15x8 [padding: 0 1 0 1]
    26           RenderMathMLRow {mrow} at (1,0) size 13x8
    27             RenderMathMLOperator {mo} at (0,0) size 13x8
    28               RenderMathMLBlock (anonymous, flex) at (2,0) size 8x8
    29                 RenderBlock (anonymous) at (0,0) size 7x8
    30                   RenderText at (0,-3) size 7x13
    31                     text run at (0,-3) width 7: "\x{219F}"
     3layer at (0,0) size 800x337
     4  RenderBlock {HTML} at (0,0) size 800x337
     5    RenderBody {BODY} at (8,16) size 784x305
     6      RenderBlock {P} at (0,0) size 784x34
     7        RenderMathMLMath {math} at (0,20) size 49x11 [padding: 0 1 0 1]
     8          RenderMathMLRow {mrow} at (1,0) size 47x11
     9            RenderMathMLOperator {mo} at (0,0) size 47x11
     10              RenderMathMLBlock (anonymous, flex) at (2,0) size 42x3
     11                RenderBlock (anonymous) at (0,0) size 3x3
     12                  RenderText at (0,-3) size 3x10
     13                    text run at (0,-3) width 3: "\x{219F}"
     14        RenderText {#text} at (48,16) size 5x18
     15          text run at (48,16) width 5: " "
     16        RenderMathMLMath {math} at (52,10) size 49x21 [padding: 0 1 0 1]
     17          RenderMathMLRow {mrow} at (1,0) size 47x21
     18            RenderMathMLOperator {mo} at (0,0) size 47x21
     19              RenderMathMLBlock (anonymous, flex) at (2,0) size 42x3
     20                RenderBlock (anonymous) at (0,0) size 3x3
     21                  RenderText at (0,-3) size 3x10
     22                    text run at (0,-3) width 3: "\x{219F}"
     23        RenderText {#text} at (100,16) size 5x18
     24          text run at (100,16) width 5: " "
     25        RenderMathMLMath {math} at (104,0) size 50x31 [padding: 0 1 0 1]
     26          RenderMathMLRow {mrow} at (1,0) size 47x31
     27            RenderMathMLOperator {mo} at (0,0) size 47x31
     28              RenderMathMLBlock (anonymous, flex) at (2,0) size 42x3
     29                RenderBlock (anonymous) at (0,0) size 3x3
     30                  RenderText at (0,-3) size 3x10
     31                    text run at (0,-3) width 3: "\x{219F}"
    3232        RenderText {#text} at (0,0) size 0x0
    33       RenderBlock {P} at (0,34) size 784x18
    34         RenderMathMLMath {math} at (0,7) size 15x8 [padding: 0 1 0 1]
    35           RenderMathMLRow {mrow} at (1,0) size 13x8
    36             RenderMathMLOperator {mo} at (0,0) size 13x8
    37               RenderMathMLBlock (anonymous, flex) at (2,0) size 8x8
    38                 RenderBlock (anonymous) at (0,0) size 7x8
    39                   RenderText at (0,-3) size 7x13
    40                     text run at (0,-3) width 7: "\x{219F}"
     33      RenderBlock {P} at (0,50) size 784x154
     34        RenderMathMLMath {math} at (0,0) size 49x150 [padding: 0 1 0 1]
     35          RenderMathMLRow {mrow} at (1,0) size 47x150
     36            RenderMathMLOperator {mo} at (0,0) size 47x150
     37              RenderMathMLBlock (anonymous, flex) at (2,0) size 42x3
     38                RenderBlock (anonymous) at (0,0) size 3x3
     39                  RenderText at (0,-3) size 3x10
     40                    text run at (0,-3) width 3: "\x{219F}"
    4141        RenderText {#text} at (0,0) size 0x0
    42       RenderBlock {P} at (0,68) size 784x18
    43         RenderMathMLMath {math} at (0,6) size 10x11 [padding: 0 1 0 1]
    44           RenderMathMLRow {mrow} at (1,0) size 8x11
    45             RenderMathMLOperator {mo} at (0,0) size 8x11
    46               RenderMathMLBlock (anonymous, flex) at (0,0) size 7x11
    47                 RenderBlock (anonymous) at (0,0) size 6x11
    48                   RenderText at (0,-2) size 6x13
    49                     text run at (0,-2) width 6: "\x{2A1B}"
     42      RenderBlock {P} at (0,220) size 784x85
     43        RenderMathMLMath {math} at (0,0) size 86x82 [padding: 0 1 0 1]
     44          RenderMathMLRow {mrow} at (1,0) size 84x82
     45            RenderMathMLOperator {mo} at (0,0) size 84x82
     46              RenderMathMLBlock (anonymous, flex) at (0,0) size 83x12
     47                RenderBlock (anonymous) at (0,0) size 11x12
     48                  RenderText at (0,6) size 11x10
     49                    text run at (0,6) width 11: "\x{2A1B}"
    5050        RenderText {#text} at (0,0) size 0x0

  • trunk/LayoutTests/platform/mac/mathml/opentype/opentype-stretchy-horizontal-expected.txt

    r169694 r170699  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x118
    4   RenderBlock {HTML} at (0,0) size 800x118
    5     RenderBody {BODY} at (8,16) size 784x86
    6       RenderBlock {P} at (0,0) size 784x18
    7         RenderMathMLMath {math} at (0,11) size 16x5 [padding: 0 1 0 1]
    8           RenderMathMLRow {mstyle} at (1,0) size 14x5
    9             RenderMathMLUnderOver {mover} at (0,0) size 14x5
    10               RenderMathMLOperator {mo} at (-3,1) size 19x4
    11                 RenderMathMLBlock (anonymous, flex) at (2,0) size 14x4
    12                   RenderBlock (anonymous) at (0,0) size 2x4
    13                     RenderText at (0,-3) size 2x10
    14                       text run at (0,-3) width 2: "\x{219C}"
    15               RenderMathMLSpace {mspace} at (2,0) size 9x1
    16         RenderText {#text} at (0,0) size 0x0
    17       RenderBlock {P} at (0,34) size 784x18
    18         RenderMathMLMath {math} at (0,11) size 23x5 [padding: 0 1 0 1]
    19           RenderMathMLRow {mstyle} at (1,0) size 21x5
    20             RenderMathMLUnderOver {mover} at (0,0) size 21x5
    21               RenderMathMLOperator {mo} at (-3,1) size 27x4
     3layer at (0,0) size 800x153
     4  RenderBlock {HTML} at (0,0) size 800x153
     5    RenderBody {BODY} at (8,16) size 784x121
     6      RenderBlock {P} at (0,0) size 784x24
     7        RenderMathMLMath {math} at (0,3) size 18x22 [padding: 0 1 0 1]
     8          RenderMathMLRow {mstyle} at (1,0) size 16x22
     9            RenderMathMLUnderOver {mover} at (0,0) size 16x22
     10              RenderMathMLOperator {mo} at (-6,1) size 27x21
    2211                RenderMathMLBlock (anonymous, flex) at (2,0) size 22x4
    2312                  RenderBlock (anonymous) at (0,0) size 2x4
    2413                    RenderText at (0,-3) size 2x10
    2514                      text run at (0,-3) width 2: "\x{219C}"
    26               RenderMathMLSpace {mspace} at (2,0) size 16x1
     15              RenderMathMLSpace {mspace} at (4,0) size 8x1
    2716        RenderText {#text} at (0,0) size 0x0
    28       RenderBlock {P} at (0,68) size 784x18
    29         RenderMathMLMath {math} at (0,11) size 158x5 [padding: 0 1 0 1]
    30           RenderMathMLRow {mstyle} at (1,0) size 156x5
    31             RenderMathMLUnderOver {mover} at (0,0) size 156x5
    32               RenderMathMLOperator {mo} at (-3,1) size 162x4
     17      RenderBlock {P} at (0,40) size 784x24
     18        RenderMathMLMath {math} at (0,3) size 28x22 [padding: 0 1 0 1]
     19          RenderMathMLRow {mstyle} at (1,0) size 26x22
     20            RenderMathMLUnderOver {mover} at (0,0) size 26x22
     21              RenderMathMLOperator {mo} at (-6,1) size 38x21
     22                RenderMathMLBlock (anonymous, flex) at (2,0) size 32x4
     23                  RenderBlock (anonymous) at (0,0) size 2x4
     24                    RenderText at (0,-3) size 2x10
     25                      text run at (0,-3) width 2: "\x{219C}"
     26              RenderMathMLSpace {mspace} at (5,0) size 16x1
     27        RenderText {#text} at (0,0) size 0x0
     28      RenderBlock {P} at (0,80) size 784x41
     29        RenderMathMLMath {math} at (0,0) size 158x42 [padding: 0 1 0 1]
     30          RenderMathMLRow {mstyle} at (1,0) size 156x42
     31            RenderMathMLUnderOver {mover} at (0,0) size 156x42
     32              RenderMathMLOperator {mo} at (-3,1) size 162x41
    3333                RenderMathMLBlock (anonymous, flex) at (2,0) size 157x4
    3434                  RenderBlock (anonymous) at (0,0) size 2x4

  • trunk/Source/WebCore/ChangeLog

    r170698 r170699  
     12014-07-01  Frédéric Wang  <fred.wang@free.fr>
     2
     3        The OpenType MATH table is not read on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=133569
     5
     6        Reviewed by Chris Fleizach.
     7
     8        An incorrect tag format is used to load the OpenType MATH table on Mac.
     9        This commit makes the format consistent with what is used for other tables on Mac.
     10        This will allow to load the MATH table and to use it for the MathML rendering.
     11
     12        No new tests. platform/graphics/opentype already contains tests for the OpenType MATH support.
     13
     14        * platform/graphics/opentype/OpenTypeMathData.cpp:
     15
    1162014-07-01  Alex Christensen  <achristensen@webkit.org>
    217

  • trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.cpp

    r169305 r170699  
    4040namespace OpenType {
    4141
     42#if OS(DARWIN)
     43const FourCharCode MATHTag = 'MATH';
     44#else
    4245const uint32_t MATHTag = OT_MAKE_TAG('M', 'A', 'T', 'H');
     46#endif
    4347
    4448#pragma pack(1)
Note: See TracChangeset for help on using the changeset viewer.