Changeset 160711 in webkit


Ignore:
Timestamp:
Dec 17, 2013 9:56:21 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Ensure inferred mrows for msqrt, mstyle, merror, mphantom and math.
​https://bugs.webkit.org/show_bug.cgi?id=124841

Patch by Frédéric Wang <​fred.wang@free.fr> on 2013-12-17
Reviewed by Darin Adler.

Source/WebCore:

Tests: mathml/presentation/inferred-mrow-baseline.html

mathml/presentation/inferred-mrow-stretchy.html

  • css/mathml.css: make merror, mphantom and mstyle behave like an mrow.

(mo, mrow, mfenced, mfrac, msub, msup, msubsup, mmultiscripts, mprescripts, none, munder, mover, munderover, msqrt, mroot, merror, mphantom, mstyle):
(math, mrow, mfenced, msqrt, mroot, merror, mphantom, mstyle):

  • mathml/MathMLInlineContainerElement.cpp: ditto

(WebCore::MathMLInlineContainerElement::createRenderer):

  • mathml/mathtags.in: ditto
  • rendering/mathml/RenderMathMLOperator.cpp:

(WebCore::RenderMathMLOperator::paint): fix failure in mathml/presentation/phantom.html now that phantom can stretch operators.

LayoutTests:

  • mathml/presentation/inferred-mrow-baseline-expected.txt: Added.
  • mathml/presentation/inferred-mrow-baseline.html: Added.
  • mathml/presentation/inferred-mrow-stretchy-expected.txt: Added.
  • mathml/presentation/inferred-mrow-stretchy.html: Added.
Location:
trunk
Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r160709 r160711  
     12013-12-17  Frédéric Wang  <fred.wang@free.fr>
     2
     3        Ensure inferred mrows for msqrt, mstyle, merror, mphantom and math.
     4        https://bugs.webkit.org/show_bug.cgi?id=124841
     5
     6        Reviewed by Darin Adler.
     7
     8        * mathml/presentation/inferred-mrow-baseline-expected.txt: Added.
     9        * mathml/presentation/inferred-mrow-baseline.html: Added.
     10        * mathml/presentation/inferred-mrow-stretchy-expected.txt: Added.
     11        * mathml/presentation/inferred-mrow-stretchy.html: Added.
     12
    1132013-12-17  Brent Fulgham  <bfulgham@apple.com>
    214

  • trunk/Source/WebCore/ChangeLog

    r160704 r160711  
     12013-12-17  Frédéric Wang  <fred.wang@free.fr>
     2
     3        Ensure inferred mrows for msqrt, mstyle, merror, mphantom and math.
     4        https://bugs.webkit.org/show_bug.cgi?id=124841
     5
     6        Reviewed by Darin Adler.
     7
     8        Tests: mathml/presentation/inferred-mrow-baseline.html
     9               mathml/presentation/inferred-mrow-stretchy.html
     10
     11        * css/mathml.css: make merror, mphantom and mstyle behave like an mrow.
     12        (mo, mrow, mfenced, mfrac, msub, msup, msubsup, mmultiscripts, mprescripts, none, munder, mover, munderover, msqrt, mroot, merror, mphantom, mstyle):
     13        (math, mrow, mfenced, msqrt, mroot, merror, mphantom, mstyle):
     14        * mathml/MathMLInlineContainerElement.cpp: ditto
     15        (WebCore::MathMLInlineContainerElement::createRenderer):
     16        * mathml/mathtags.in: ditto
     17        * rendering/mathml/RenderMathMLOperator.cpp:
     18        (WebCore::RenderMathMLOperator::paint): fix failure in mathml/presentation/phantom.html now that phantom can stretch operators.
     19
    1202013-12-17  Simon Pena  <simon.pena@samsung.com>
    221

  • trunk/Source/WebCore/css/mathml.css

    r160005 r160711  
    3333}
    3434
    35 mo, mrow, mfenced, mfrac, msub, msup, msubsup, mmultiscripts, mprescripts, none, munder, mover, munderover, msqrt, mroot {
     35mo, mrow, mfenced, mfrac, msub, msup, msubsup, mmultiscripts, mprescripts, none, munder, mover, munderover, msqrt, mroot, merror, mphantom, mstyle {
    3636    display: -webkit-inline-flex !important;
    3737}
    3838
    39 math, mrow, mfenced, msqrt, mroot {
     39math, mrow, mfenced, msqrt, mroot, merror, mphantom, mstyle {
    4040    -webkit-align-items: baseline;
    4141}

  • trunk/Source/WebCore/mathml/MathMLInlineContainerElement.cpp

    r160005 r160711  
    5959    if (hasLocalName(annotation_xmlTag))
    6060        return new RenderMathMLRow(*this, std::move(style));
    61     if (hasLocalName(mrowTag))
     61    if (hasLocalName(merrorTag) || hasLocalName(mphantomTag) || hasLocalName(mrowTag) || hasLocalName(mstyleTag))
    6262        return new RenderMathMLRow(*this, std::move(style));
    6363    if (hasLocalName(msubTag))

  • trunk/Source/WebCore/mathml/mathtags.in

    r160005 r160711  
    1111mfenced interfaceName=MathMLInlineContainerElement
    1212msubsup interfaceName=MathMLInlineContainerElement
     13merror interfaceName=MathMLInlineContainerElement
     14mphantom interfaceName=MathMLInlineContainerElement
    1315mrow interfaceName=MathMLInlineContainerElement
    14 mstyle interfaceName=MathMLElement
     16mstyle interfaceName=MathMLInlineContainerElement
    1517mover interfaceName=MathMLInlineContainerElement
    1618munder interfaceName=MathMLInlineContainerElement

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp

    r159219 r160711  
    361361    RenderMathMLBlock::paint(info, paintOffset);
    362362
    363     if (info.context->paintingDisabled() || info.phase != PaintPhaseForeground)
     363    if (info.context->paintingDisabled() || info.phase != PaintPhaseForeground || style().visibility() != VISIBLE)
    364364        return;
    365365
Note: See TracChangeset for help on using the changeset viewer.