Changeset 133221 in webkit


Ignore:
Timestamp:
Nov 1, 2012 1:42:29 PM (11 years ago)
Author:
Dave Barton
Message:

REGRESSION (r128837): mathml/presentation/subsup.xhtml became flaky
​https://bugs.webkit.org/show_bug.cgi?id=97390

Reviewed by Ojan Vafai.

Source/WebCore:

In a RenderMathMLSubSup, we need to set the base's wrapper's style so that baseHeight
in layout() will be the base's true height, without any flexbox stretching.

Tested by existing tests.

  • rendering/mathml/RenderMathMLSubSup.cpp:

(WebCore::RenderMathMLSubSup::fixAnonymousStyles):
(WebCore::RenderMathMLSubSup::addChild):
(WebCore::RenderMathMLSubSup::styleDidChange):

  • rendering/mathml/RenderMathMLSubSup.h:

(RenderMathMLSubSup):

LayoutTests:

  • platform/chromium/TestExpectations:
  • platform/efl/TestExpectations:
  • platform/gtk/TestExpectations:
  • platform/mac/TestExpectations:
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r133218 r133221  
     12012-11-01  David Barton  <dbarton@mathscribe.com>
     2
     3        REGRESSION (r128837): mathml/presentation/subsup.xhtml became flaky
     4        https://bugs.webkit.org/show_bug.cgi?id=97390
     5
     6        Reviewed by Ojan Vafai.
     7
     8        * platform/chromium/TestExpectations:
     9        * platform/efl/TestExpectations:
     10        * platform/gtk/TestExpectations:
     11        * platform/mac/TestExpectations:
     12
    1132012-11-01  Stephen White  <senorblanco@chromium.org>
    214

  • trunk/LayoutTests/platform/chromium/TestExpectations

    r133218 r133221  
    19851985webkit.org/b/96960 [ Android Linux Win ] mathml/xHeight.xhtml [ Pass Failure ImageOnlyFailure ]
    19861986webkit.org/b/96960 [ Android Linux Win ] mathml/presentation [ Pass Failure ImageOnlyFailure ]
    1987 # The next 2 are flaky, but I have a fix and will submit it soon.
     1987# Needs rebaseline after bug 97390
     1988webkit.org/b/97390 [ Mac ] mathml/presentation/mo-stretch.html [ Failure Pass ]
     1989webkit.org/b/97390 [ Mac ] mathml/presentation/row-alignment.xhtml [ Failure Pass ]
     1990webkit.org/b/97390 [ Mac ] mathml/presentation/tables.xhtml [ Failure Pass ]
    19881991webkit.org/b/97390 [ Mac ] mathml/presentation/subsup.xhtml [ Failure Pass ]
    1989 webkit.org/b/97390 [ Mac ] mathml/presentation/msubsup-base-changed.xhtml [ ImageOnlyFailure Pass ]
    19901992# Once chromium decides to definitely enable MathML, we can delete the old platform/chromium baseline for this:
    19911993webkit.org/b/96960 http/tests/xmlviewer/dumpAsText/mathml.xml [ Pass Failure ]

  • trunk/LayoutTests/platform/efl/TestExpectations

    r133140 r133221  
    15711571
    15721572webkit.org/b/100463 mathml/msubsup-fuzz.html [ Crash Pass ]
    1573 # Needs rebaseline eventually
     1573# Needs rebaseline
    15741574webkit.org/b/97990 mathml/presentation/attributes.xhtml [ Failure ]
    15751575webkit.org/b/97990 mathml/presentation/fractions.xhtml [ Failure ]
    15761576webkit.org/b/97990 mathml/presentation/fractions-vertical-alignment.xhtml [ Failure ]
    1577 webkit.org/b/97990 mathml/presentation/mo-stretch.html [ Failure ]
    15781577webkit.org/b/97990 mathml/presentation/roots.xhtml [ Failure ]
    1579 webkit.org/b/97990 mathml/presentation/row-alignment.xhtml [ Failure ]
    1580 webkit.org/b/97990 mathml/presentation/subsup.xhtml [ Failure ]
    15811578webkit.org/b/99921 mathml/presentation/fenced.xhtml [ Failure ]
     1579# Needs rebaseline after bug 97390
     1580webkit.org/b/97390 mathml/presentation/mo-stretch.html [ Failure Pass ]
     1581webkit.org/b/97390 mathml/presentation/row-alignment.xhtml [ Failure Pass ]
     1582webkit.org/b/97390 mathml/presentation/tables.xhtml [ Failure Pass ]
     1583webkit.org/b/97390 mathml/presentation/subsup.xhtml [ Failure Pass ]
    15821584
    15831585# css3-conditionals support is not yet enabled.

  • trunk/LayoutTests/platform/gtk/TestExpectations

    r133084 r133221  
    424424
    425425webkit.org/b/100463 mathml/msubsup-fuzz.html [ Crash Pass ]
    426 # MathML layout is being tuned/reworked.
     426# Needs rebaseline
    427427webkit.org/b/99921 mathml/presentation/fenced.xhtml [ Failure ]
    428428webkit.org/b/99921 mathml/presentation/mo.xhtml [ Failure ]
    429 webkit.org/b/99921 mathml/presentation/mo-stretch.html [ Failure ]
    430429webkit.org/b/99921 mathml/presentation/over.xhtml [ Failure ]
    431430webkit.org/b/99921 mathml/presentation/row.xhtml [ Failure ]
    432 webkit.org/b/99921 mathml/presentation/row-alignment.xhtml [ Failure ]
     431# Needs rebaseline after bug 97390
     432webkit.org/b/97390 mathml/presentation/mo-stretch.html [ Failure Pass ]
     433webkit.org/b/97390 mathml/presentation/row-alignment.xhtml [ Failure Pass ]
     434webkit.org/b/97390 mathml/presentation/tables.xhtml [ Failure Pass ]
     435webkit.org/b/97390 mathml/presentation/subsup.xhtml [ Failure Pass ]
    433436
    434437# Requires Resolution Media Query support
    … …  
    581584
    582585webkit.org/b/95430 fast/layers/scroll-no-visible-content-but-visible-descendant.html [ ImageOnlyFailure Pass ]
    583 
    584 webkit.org/b/97390 mathml/presentation/subsup.xhtml [ Failure Pass ]
    585 webkit.org/b/97390 mathml/presentation/msubsup-base-changed.xhtml [ ImageOnlyFailure Pass ]
    586586
    587587webkit.org/b/73409 fast/forms/textarea-placeholder-set-attribute.html [ ImageOnlyFailure Pass ]

  • trunk/LayoutTests/platform/mac/TestExpectations

    r133084 r133221  
    13051305
    13061306webkit.org/b/100463 mathml/msubsup-fuzz.html [ Crash Pass ]
    1307 # Needs rebaselining after bug 99921
     1307# Needs rebaseline
    13081308webkit.org/b/99921 mathml/presentation/fenced.xhtml [ Failure ]
    13091309webkit.org/b/99921 mathml/presentation/mo.xhtml [ Failure ]
    1310 webkit.org/b/99921 mathml/presentation/mo-stretch.html [ Failure ]
    13111310webkit.org/b/99921 mathml/presentation/over.xhtml [ Failure ]
    13121311webkit.org/b/99921 mathml/presentation/row.xhtml [ Failure ]
    1313 webkit.org/b/99921 mathml/presentation/row-alignment.xhtml [ Failure ]
    1314 webkit.org/b/99921 mathml/presentation/subsup.xhtml [ Failure ]
     1312# Needs rebaseline after bug 97390
     1313webkit.org/b/97390 mathml/presentation/mo-stretch.html [ Failure Pass ]
     1314webkit.org/b/97390 mathml/presentation/row-alignment.xhtml [ Failure Pass ]
     1315webkit.org/b/97390 mathml/presentation/tables.xhtml [ Failure Pass ]
     1316webkit.org/b/97390 mathml/presentation/subsup.xhtml [ Failure Pass ]
    13151317
    13161318# css3-conditionals support is not yet enabled.

  • trunk/Source/WebCore/ChangeLog

    r133214 r133221  
     12012-11-01  David Barton  <dbarton@mathscribe.com>
     2
     3        REGRESSION (r128837): mathml/presentation/subsup.xhtml became flaky
     4        https://bugs.webkit.org/show_bug.cgi?id=97390
     5
     6        Reviewed by Ojan Vafai.
     7
     8        In a RenderMathMLSubSup, we need to set the base's wrapper's style so that baseHeight
     9        in layout() will be the base's true height, without any flexbox stretching.
     10
     11        Tested by existing tests.
     12
     13        * rendering/mathml/RenderMathMLSubSup.cpp:
     14        (WebCore::RenderMathMLSubSup::fixAnonymousStyles):
     15        (WebCore::RenderMathMLSubSup::addChild):
     16        (WebCore::RenderMathMLSubSup::styleDidChange):
     17        * rendering/mathml/RenderMathMLSubSup.h:
     18        (RenderMathMLSubSup):
     19
    1202012-11-01  Antti Koivisto  <antti@apple.com>
    221

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

    r132735 r133221  
    6262}
    6363
    64 void RenderMathMLSubSup::fixScriptsStyle()
     64void RenderMathMLSubSup::fixAnonymousStyles()
    6565{
     66    // Set the base wrapper's style so that baseHeight in layout() will be an unstretched height.
     67    ASSERT(firstChild() && firstChild()->style()->refCount() == 1);
     68    firstChild()->style()->setAlignSelf(AlignFlexStart);
     69   
    6670    ASSERT(m_scripts && m_scripts->style()->refCount() == 1);
    6771    RenderStyle* scriptsStyle = m_scripts->style();
    … …  
    8185        m_scripts = createAnonymousMathMLBlock();
    8286        RenderMathMLBlock::addChild(m_scripts);
    83         fixScriptsStyle();
     87       
     88        fixAnonymousStyles();
    8489    }
    8590   
    … …  
    9499    RenderMathMLBlock::styleDidChange(diff, oldStyle);
    95100   
    96     if (m_scripts)
    97         fixScriptsStyle();
     101    if (!isEmpty())
     102        fixAnonymousStyles();
    98103}
    99104

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLSubSup.h

    r128837 r133221  
    4545   
    4646private:
    47     void fixScriptsStyle();
     47    void fixAnonymousStyles();
    4848    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
    4949
Note: See TracChangeset for help on using the changeset viewer.