Changeset 89268 in webkit


Ignore:
Timestamp:
Jun 20, 2011 12:17:27 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-06-20 Alex Milowski <alex@milowski.com>

Reviewed by Darin Adler.

New baselines for tests for the change to use anonymous blocks in the fix for:
https://bugs.webkit.org/show_bug.cgi?id=57901

  • platform/mac/mathml/presentation/over-expected.png:
  • platform/mac/mathml/presentation/over-expected.txt:
  • platform/mac/mathml/presentation/row-alignment-expected.png:
  • platform/mac/mathml/presentation/row-alignment-expected.txt:
  • platform/mac/mathml/presentation/under-expected.png:
  • platform/mac/mathml/presentation/under-expected.txt:
  • platform/mac/mathml/presentation/underover-expected.png:
  • platform/mac/mathml/presentation/underover-expected.txt:

2011-06-20 Alex Milowski <alex@milowski.com>

Reviewed by Darin Adler.

A change to mark wrapping blocks created by the renderer as anonymous to fix the crash for:
https://bugs.webkit.org/show_bug.cgi?id=57901

  • rendering/mathml/RenderMathMLUnderOver.cpp: (WebCore::RenderMathMLUnderOver::addChild): (WebCore::RenderMathMLUnderOver::nonOperatorHeight):
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r89262 r89268  
     12011-06-20  Alex Milowski  <alex@milowski.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        New baselines for tests for the change to use anonymous blocks in the fix for:
     6        https://bugs.webkit.org/show_bug.cgi?id=57901
     7
     8        * platform/mac/mathml/presentation/over-expected.png:
     9        * platform/mac/mathml/presentation/over-expected.txt:
     10        * platform/mac/mathml/presentation/row-alignment-expected.png:
     11        * platform/mac/mathml/presentation/row-alignment-expected.txt:
     12        * platform/mac/mathml/presentation/under-expected.png:
     13        * platform/mac/mathml/presentation/under-expected.txt:
     14        * platform/mac/mathml/presentation/underover-expected.png:
     15        * platform/mac/mathml/presentation/underover-expected.txt:
     16
    1172011-06-20  Stephen White  <senorblanco@chromium.org>
    218
  • trunk/LayoutTests/platform/mac/mathml/presentation/over-expected.txt

    r78910 r89268  
    99        RenderBlock {math} at (36,0) size 12x31
    1010          RenderBlock {mover} at (1,0) size 10x28
    11             RenderBlock {mover} at (0,0) size 10x16
    12               RenderInline {mi} at (0,0) size 6x12
    13                 RenderText {#text} at (2,3) size 6x12
    14                   text run at (2,3) width 6: "x"
    15             RenderBlock {mover} at (0,12) size 10x16
     11            RenderBlock (anonymous) at (0,0) size 10x16
     12              RenderInline {mi} at (0,0) size 5x12
     13                RenderText {#text} at (0,3) size 5x12
     14                  text run at (0,3) width 5: "x"
     15            RenderBlock (anonymous) at (0,12) size 10x16
    1616              RenderInline {mi} at (0,0) size 10x16
    1717                RenderText {#text} at (0,0) size 10x16
     
    2323        RenderBlock {math} at (36,0) size 12x31
    2424          RenderBlock {mover} at (1,0) size 10x28
    25             RenderBlock {mover} at (0,0) size 10x16
    26               RenderInline {mi} at (0,0) size 6x12
    27                 RenderText {#text} at (2,3) size 6x12
    28                   text run at (2,3) width 6: "y"
    29             RenderBlock {mover} at (0,12) size 10x16
     25            RenderBlock (anonymous) at (0,0) size 10x16
     26              RenderInline {mi} at (0,0) size 5x12
     27                RenderText {#text} at (0,3) size 5x12
     28                  text run at (0,3) width 5: "y"
     29            RenderBlock (anonymous) at (0,12) size 10x16
    3030              RenderInline {mi} at (0,0) size 10x16
    3131                RenderText {#text} at (0,0) size 10x16
     
    3737        RenderBlock {math} at (36,0) size 17x37
    3838          RenderBlock {mover} at (1,0) size 15x36
    39             RenderBlock {mover} at (0,0) size 15x16
     39            RenderBlock (anonymous) at (0,0) size 15x16
    4040              RenderInline {mi} at (0,0) size 5x12
    41                 RenderText {#text} at (5,3) size 5x12
    42                   text run at (5,3) width 5: "y"
    43             RenderBlock {mover} at (0,12) size 15x24
     41                RenderText {#text} at (0,3) size 5x12
     42                  text run at (0,3) width 5: "y"
     43            RenderBlock (anonymous) at (0,12) size 15x24
    4444              RenderInline {mi} at (0,0) size 15x24
    4545                RenderText {#text} at (0,0) size 15x24
     
    5151        RenderBlock {math} at (36,0) size 19x37
    5252          RenderBlock {mover} at (1,0) size 17x36
    53             RenderBlock {mover} at (0,0) size 17x16
     53            RenderBlock (anonymous) at (0,0) size 17x16
    5454              RenderInline {mi} at (0,0) size 5x12
    55                 RenderText {#text} at (6,3) size 5x12
    56                   text run at (6,3) width 5: "y"
    57             RenderBlock {mover} at (0,12) size 17x24
     55                RenderText {#text} at (0,3) size 5x12
     56                  text run at (0,3) width 5: "y"
     57            RenderBlock (anonymous) at (0,12) size 17x24
    5858              RenderBlock {mo} at (0,0) size 17x24
    5959                RenderBlock {mo} at (0,0) size 17x24
     
    6666        RenderBlock {math} at (36,0) size 52x61
    6767          RenderBlock {mover} at (1,0) size 10x61
    68             RenderBlock {mover} at (0,0) size 10x16
    69               RenderInline {mi} at (0,0) size 6x12
    70                 RenderText {#text} at (2,3) size 6x12
    71                   text run at (2,3) width 6: "y"
    72             RenderBlock {mover} at (0,12) size 10x49
     68            RenderBlock (anonymous) at (0,0) size 10x16
     69              RenderInline {mi} at (0,0) size 5x12
     70                RenderText {#text} at (0,3) size 5x12
     71                  text run at (0,3) width 5: "y"
     72            RenderBlock (anonymous) at (0,12) size 10x49
    7373              RenderBlock {mo} at (0,0) size 10x49
    7474          RenderBlock {div} at (11,3) size 40x40
  • trunk/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt

    r82786 r89268  
    123123            RenderBlock {mo} at (8,0) size 6x85
    124124            RenderBlock {munder} at (14,35) size 13x27
    125               RenderBlock {munder} at (0,0) size 13x16
     125              RenderBlock (anonymous) at (0,0) size 13x16
    126126                RenderInline {mi} at (0,0) size 13x16
    127127                  RenderText {#text} at (0,0) size 13x16
    128128                    text run at (0,0) width 13: "\x{220F}"
    129               RenderBlock {munder} at (0,11) size 13x16
     129              RenderBlock (anonymous) at (0,11) size 13x16
    130130                RenderInline {mi} at (0,0) size 5x12
    131                   RenderText {#text} at (4,3) size 5x12
    132                     text run at (4,3) width 5: "x"
     131                  RenderText {#text} at (0,3) size 5x12
     132                    text run at (0,3) width 5: "x"
    133133            RenderBlock {mfrac} at (27,10) size 54x70
    134134              RenderBlock {mfrac} at (0,0) size 54x34
  • trunk/LayoutTests/platform/mac/mathml/presentation/under-expected.txt

    r78910 r89268  
    99        RenderBlock {math} at (44,0) size 12x27
    1010          RenderBlock {munder} at (1,0) size 10x27
    11             RenderBlock {munder} at (0,0) size 10x16
     11            RenderBlock (anonymous) at (0,0) size 10x16
    1212              RenderInline {mi} at (0,0) size 10x16
    1313                RenderText {#text} at (0,0) size 10x16
    1414                  text run at (0,0) width 10: "B"
    15             RenderBlock {munder} at (0,11) size 10x16
    16               RenderInline {mi} at (0,0) size 6x12
    17                 RenderText {#text} at (2,3) size 6x12
    18                   text run at (2,3) width 6: "x"
     15            RenderBlock (anonymous) at (0,11) size 10x16
     16              RenderInline {mi} at (0,0) size 5x12
     17                RenderText {#text} at (0,3) size 5x12
     18                  text run at (0,3) width 5: "x"
    1919        RenderText {#text} at (0,0) size 0x0
    2020      RenderBlock {p} at (0,43) size 784x27
     
    2323        RenderBlock {math} at (44,0) size 12x27
    2424          RenderBlock {munder} at (1,0) size 10x27
    25             RenderBlock {munder} at (0,0) size 10x16
     25            RenderBlock (anonymous) at (0,0) size 10x16
    2626              RenderInline {mi} at (0,0) size 10x16
    2727                RenderText {#text} at (0,0) size 10x16
    2828                  text run at (0,0) width 10: "B"
    29             RenderBlock {munder} at (0,11) size 10x16
    30               RenderInline {mi} at (0,0) size 8x12
    31                 RenderText {#text} at (1,3) size 8x12
    32                   text run at (1,3) width 8: "X"
     29            RenderBlock (anonymous) at (0,11) size 10x16
     30              RenderInline {mi} at (0,0) size 7x12
     31                RenderText {#text} at (0,3) size 7x12
     32                  text run at (0,3) width 7: "X"
    3333        RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/mathml/presentation/underover-expected.txt

    r78910 r89268  
    99        RenderBlock {math} at (92,0) size 12x39
    1010          RenderBlock {munderover} at (1,0) size 10x39
    11             RenderBlock {munderover} at (0,0) size 10x16
    12               RenderInline {mi} at (0,0) size 6x12
    13                 RenderText {#text} at (2,3) size 6x12
    14                   text run at (2,3) width 6: "y"
    15             RenderBlock {munderover} at (0,12) size 10x16
     11            RenderBlock (anonymous) at (0,0) size 10x16
     12              RenderInline {mi} at (0,0) size 5x12
     13                RenderText {#text} at (0,3) size 5x12
     14                  text run at (0,3) width 5: "y"
     15            RenderBlock (anonymous) at (0,12) size 10x16
    1616              RenderInline {mi} at (0,0) size 10x16
    1717                RenderText {#text} at (0,0) size 10x16
    1818                  text run at (0,0) width 10: "B"
    19             RenderBlock {munderover} at (0,23) size 10x16
    20               RenderInline {mi} at (0,0) size 6x12
    21                 RenderText {#text} at (2,3) size 6x12
    22                   text run at (2,3) width 6: "x"
     19            RenderBlock (anonymous) at (0,23) size 10x16
     20              RenderInline {mi} at (0,0) size 5x12
     21                RenderText {#text} at (0,3) size 5x12
     22                  text run at (0,3) width 5: "x"
    2323        RenderText {#text} at (0,0) size 0x0
    2424      RenderBlock {p} at (0,55) size 784x39
     
    2727        RenderBlock {math} at (92,0) size 12x39
    2828          RenderBlock {munderover} at (1,0) size 10x39
    29             RenderBlock {munderover} at (0,0) size 10x16
    30               RenderInline {mi} at (0,0) size 6x12
    31                 RenderText {#text} at (2,3) size 6x12
    32                   text run at (2,3) width 6: "y"
    33             RenderBlock {munderover} at (0,12) size 10x16
     29            RenderBlock (anonymous) at (0,0) size 10x16
     30              RenderInline {mi} at (0,0) size 5x12
     31                RenderText {#text} at (0,3) size 5x12
     32                  text run at (0,3) width 5: "y"
     33            RenderBlock (anonymous) at (0,12) size 10x16
    3434              RenderInline {mi} at (0,0) size 10x16
    3535                RenderText {#text} at (0,0) size 10x16
    3636                  text run at (0,0) width 10: "B"
    37             RenderBlock {munderover} at (0,23) size 10x16
    38               RenderInline {mi} at (0,0) size 8x12
    39                 RenderText {#text} at (1,3) size 8x12
    40                   text run at (1,3) width 8: "X"
     37            RenderBlock (anonymous) at (0,23) size 10x16
     38              RenderInline {mi} at (0,0) size 7x12
     39                RenderText {#text} at (0,3) size 7x12
     40                  text run at (0,3) width 7: "X"
    4141        RenderText {#text} at (0,0) size 0x0
    4242      RenderBlock {p} at (0,110) size 784x52
     
    4545        RenderBlock {math} at (92,0) size 20x52
    4646          RenderBlock {munderover} at (1,0) size 18x52
    47             RenderBlock {munderover} at (0,0) size 18x16
     47            RenderBlock (anonymous) at (0,0) size 18x16
    4848              RenderBlock {mrow} at (0,3) size 18x12
    4949                RenderInline {mi} at (0,0) size 5x12
     
    5757                  RenderText {#text} at (13,0) size 5x12
    5858                    text run at (13,0) width 5: "y"
    59             RenderBlock {munderover} at (0,12) size 18x24
     59            RenderBlock (anonymous) at (0,12) size 18x24
    6060              RenderBlock {mo} at (0,0) size 17x24
    6161                RenderBlock {mo} at (0,0) size 17x24
    6262                  RenderText {mo} at (0,0) size 17x24
    6363                    text run at (0,0) width 17: "\x{2211}"
    64             RenderBlock {munderover} at (0,36) size 18x16
    65               RenderBlock {mrow} at (1,3) size 17x12
     64            RenderBlock (anonymous) at (0,36) size 18x16
     65              RenderBlock {mrow} at (0,3) size 17x12
    6666                RenderInline {mi} at (0,0) size 3x12
    6767                  RenderText {#text} at (0,0) size 3x12
     
    8080        RenderBlock {math} at (92,0) size 22x52
    8181          RenderBlock {munderover} at (1,0) size 20x52
    82             RenderBlock {munderover} at (0,0) size 20x16
     82            RenderBlock (anonymous) at (0,0) size 20x16
    8383              RenderBlock {mrow} at (0,3) size 20x12
    8484                RenderInline {mi} at (0,0) size 7x12
     
    9292                  RenderText {#text} at (15,0) size 5x12
    9393                    text run at (15,0) width 5: "y"
    94             RenderBlock {munderover} at (0,12) size 20x24
     94            RenderBlock (anonymous) at (0,12) size 20x24
    9595              RenderBlock {mo} at (0,0) size 17x24
    9696                RenderBlock {mo} at (0,0) size 17x24
    9797                  RenderText {mo} at (0,0) size 17x24
    9898                    text run at (0,0) width 17: "\x{2211}"
    99             RenderBlock {munderover} at (0,36) size 20x16
    100               RenderBlock {mrow} at (1,3) size 18x12
     99            RenderBlock (anonymous) at (0,36) size 20x16
     100              RenderBlock {mrow} at (0,3) size 18x12
    101101                RenderInline {mi} at (0,0) size 4x12
    102102                  RenderText {#text} at (0,0) size 4x12
  • trunk/Source/WebCore/ChangeLog

    r89267 r89268  
     12011-06-20  Alex Milowski  <alex@milowski.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        A change to mark wrapping blocks created by the renderer as anonymous to fix the crash for:
     6        https://bugs.webkit.org/show_bug.cgi?id=57901
     7
     8        * rendering/mathml/RenderMathMLUnderOver.cpp:
     9        (WebCore::RenderMathMLUnderOver::addChild):
     10        (WebCore::RenderMathMLUnderOver::nonOperatorHeight):
     11
    1122011-06-20  Eric Seidel  <eric@webkit.org>
    213
  • trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp

    r88730 r89268  
    6161    RefPtr<RenderStyle> rowStyle = makeBlockStyle();
    6262    row->setStyle(rowStyle.release());
     63    row->setIsAnonymous(true);
    6364   
    6465    // look through the children for rendered elements counting the blocks so we know what child
     
    101102        break;
    102103    default:
    103         // munderover shouldn't have more than three children.  In theory we shouldn't
     104        // munderover shouldn't have more than three children. In theory we shouldn't
    104105        // get here if the MathML is correctly formed, but that isn't a guarantee.
    105106        // We will treat this as another under element and they'll get something funky.
     
    287288            if (!block->isRenderMathMLOperator())
    288289                nonOperators += getOffsetHeight(current);
    289         } else {
     290        } else
    290291            nonOperators += getOffsetHeight(current);
    291         }
    292292    }
    293293    return nonOperators;
Note: See TracChangeset for help on using the changeset viewer.