Changeset 89268 in webkit
- Timestamp:
- Jun 20, 2011 12:17:27 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r89262 r89268 1 2011-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 1 17 2011-06-20 Stephen White <senorblanco@chromium.org> 2 18 -
trunk/LayoutTests/platform/mac/mathml/presentation/over-expected.txt
r78910 r89268 9 9 RenderBlock {math} at (36,0) size 12x31 10 10 RenderBlock {mover} at (1,0) size 10x28 11 RenderBlock {mover}at (0,0) size 10x1612 RenderInline {mi} at (0,0) size 6x1213 RenderText {#text} at ( 2,3) size 6x1214 text run at ( 2,3) width 6: "x"15 RenderBlock {mover}at (0,12) size 10x1611 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 16 16 RenderInline {mi} at (0,0) size 10x16 17 17 RenderText {#text} at (0,0) size 10x16 … … 23 23 RenderBlock {math} at (36,0) size 12x31 24 24 RenderBlock {mover} at (1,0) size 10x28 25 RenderBlock {mover}at (0,0) size 10x1626 RenderInline {mi} at (0,0) size 6x1227 RenderText {#text} at ( 2,3) size 6x1228 text run at ( 2,3) width 6: "y"29 RenderBlock {mover}at (0,12) size 10x1625 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 30 30 RenderInline {mi} at (0,0) size 10x16 31 31 RenderText {#text} at (0,0) size 10x16 … … 37 37 RenderBlock {math} at (36,0) size 17x37 38 38 RenderBlock {mover} at (1,0) size 15x36 39 RenderBlock {mover}at (0,0) size 15x1639 RenderBlock (anonymous) at (0,0) size 15x16 40 40 RenderInline {mi} at (0,0) size 5x12 41 RenderText {#text} at ( 5,3) size 5x1242 text run at ( 5,3) width 5: "y"43 RenderBlock {mover}at (0,12) size 15x2441 RenderText {#text} at (0,3) size 5x12 42 text run at (0,3) width 5: "y" 43 RenderBlock (anonymous) at (0,12) size 15x24 44 44 RenderInline {mi} at (0,0) size 15x24 45 45 RenderText {#text} at (0,0) size 15x24 … … 51 51 RenderBlock {math} at (36,0) size 19x37 52 52 RenderBlock {mover} at (1,0) size 17x36 53 RenderBlock {mover}at (0,0) size 17x1653 RenderBlock (anonymous) at (0,0) size 17x16 54 54 RenderInline {mi} at (0,0) size 5x12 55 RenderText {#text} at ( 6,3) size 5x1256 text run at ( 6,3) width 5: "y"57 RenderBlock {mover}at (0,12) size 17x2455 RenderText {#text} at (0,3) size 5x12 56 text run at (0,3) width 5: "y" 57 RenderBlock (anonymous) at (0,12) size 17x24 58 58 RenderBlock {mo} at (0,0) size 17x24 59 59 RenderBlock {mo} at (0,0) size 17x24 … … 66 66 RenderBlock {math} at (36,0) size 52x61 67 67 RenderBlock {mover} at (1,0) size 10x61 68 RenderBlock {mover}at (0,0) size 10x1669 RenderInline {mi} at (0,0) size 6x1270 RenderText {#text} at ( 2,3) size 6x1271 text run at ( 2,3) width 6: "y"72 RenderBlock {mover}at (0,12) size 10x4968 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 73 73 RenderBlock {mo} at (0,0) size 10x49 74 74 RenderBlock {div} at (11,3) size 40x40 -
trunk/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt
r82786 r89268 123 123 RenderBlock {mo} at (8,0) size 6x85 124 124 RenderBlock {munder} at (14,35) size 13x27 125 RenderBlock {munder}at (0,0) size 13x16125 RenderBlock (anonymous) at (0,0) size 13x16 126 126 RenderInline {mi} at (0,0) size 13x16 127 127 RenderText {#text} at (0,0) size 13x16 128 128 text run at (0,0) width 13: "\x{220F}" 129 RenderBlock {munder}at (0,11) size 13x16129 RenderBlock (anonymous) at (0,11) size 13x16 130 130 RenderInline {mi} at (0,0) size 5x12 131 RenderText {#text} at ( 4,3) size 5x12132 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" 133 133 RenderBlock {mfrac} at (27,10) size 54x70 134 134 RenderBlock {mfrac} at (0,0) size 54x34 -
trunk/LayoutTests/platform/mac/mathml/presentation/under-expected.txt
r78910 r89268 9 9 RenderBlock {math} at (44,0) size 12x27 10 10 RenderBlock {munder} at (1,0) size 10x27 11 RenderBlock {munder}at (0,0) size 10x1611 RenderBlock (anonymous) at (0,0) size 10x16 12 12 RenderInline {mi} at (0,0) size 10x16 13 13 RenderText {#text} at (0,0) size 10x16 14 14 text run at (0,0) width 10: "B" 15 RenderBlock {munder}at (0,11) size 10x1616 RenderInline {mi} at (0,0) size 6x1217 RenderText {#text} at ( 2,3) size 6x1218 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" 19 19 RenderText {#text} at (0,0) size 0x0 20 20 RenderBlock {p} at (0,43) size 784x27 … … 23 23 RenderBlock {math} at (44,0) size 12x27 24 24 RenderBlock {munder} at (1,0) size 10x27 25 RenderBlock {munder}at (0,0) size 10x1625 RenderBlock (anonymous) at (0,0) size 10x16 26 26 RenderInline {mi} at (0,0) size 10x16 27 27 RenderText {#text} at (0,0) size 10x16 28 28 text run at (0,0) width 10: "B" 29 RenderBlock {munder}at (0,11) size 10x1630 RenderInline {mi} at (0,0) size 8x1231 RenderText {#text} at ( 1,3) size 8x1232 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" 33 33 RenderText {#text} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/mathml/presentation/underover-expected.txt
r78910 r89268 9 9 RenderBlock {math} at (92,0) size 12x39 10 10 RenderBlock {munderover} at (1,0) size 10x39 11 RenderBlock {munderover}at (0,0) size 10x1612 RenderInline {mi} at (0,0) size 6x1213 RenderText {#text} at ( 2,3) size 6x1214 text run at ( 2,3) width 6: "y"15 RenderBlock {munderover}at (0,12) size 10x1611 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 16 16 RenderInline {mi} at (0,0) size 10x16 17 17 RenderText {#text} at (0,0) size 10x16 18 18 text run at (0,0) width 10: "B" 19 RenderBlock {munderover}at (0,23) size 10x1620 RenderInline {mi} at (0,0) size 6x1221 RenderText {#text} at ( 2,3) size 6x1222 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" 23 23 RenderText {#text} at (0,0) size 0x0 24 24 RenderBlock {p} at (0,55) size 784x39 … … 27 27 RenderBlock {math} at (92,0) size 12x39 28 28 RenderBlock {munderover} at (1,0) size 10x39 29 RenderBlock {munderover}at (0,0) size 10x1630 RenderInline {mi} at (0,0) size 6x1231 RenderText {#text} at ( 2,3) size 6x1232 text run at ( 2,3) width 6: "y"33 RenderBlock {munderover}at (0,12) size 10x1629 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 34 34 RenderInline {mi} at (0,0) size 10x16 35 35 RenderText {#text} at (0,0) size 10x16 36 36 text run at (0,0) width 10: "B" 37 RenderBlock {munderover}at (0,23) size 10x1638 RenderInline {mi} at (0,0) size 8x1239 RenderText {#text} at ( 1,3) size 8x1240 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" 41 41 RenderText {#text} at (0,0) size 0x0 42 42 RenderBlock {p} at (0,110) size 784x52 … … 45 45 RenderBlock {math} at (92,0) size 20x52 46 46 RenderBlock {munderover} at (1,0) size 18x52 47 RenderBlock {munderover}at (0,0) size 18x1647 RenderBlock (anonymous) at (0,0) size 18x16 48 48 RenderBlock {mrow} at (0,3) size 18x12 49 49 RenderInline {mi} at (0,0) size 5x12 … … 57 57 RenderText {#text} at (13,0) size 5x12 58 58 text run at (13,0) width 5: "y" 59 RenderBlock {munderover}at (0,12) size 18x2459 RenderBlock (anonymous) at (0,12) size 18x24 60 60 RenderBlock {mo} at (0,0) size 17x24 61 61 RenderBlock {mo} at (0,0) size 17x24 62 62 RenderText {mo} at (0,0) size 17x24 63 63 text run at (0,0) width 17: "\x{2211}" 64 RenderBlock {munderover}at (0,36) size 18x1665 RenderBlock {mrow} at ( 1,3) size 17x1264 RenderBlock (anonymous) at (0,36) size 18x16 65 RenderBlock {mrow} at (0,3) size 17x12 66 66 RenderInline {mi} at (0,0) size 3x12 67 67 RenderText {#text} at (0,0) size 3x12 … … 80 80 RenderBlock {math} at (92,0) size 22x52 81 81 RenderBlock {munderover} at (1,0) size 20x52 82 RenderBlock {munderover}at (0,0) size 20x1682 RenderBlock (anonymous) at (0,0) size 20x16 83 83 RenderBlock {mrow} at (0,3) size 20x12 84 84 RenderInline {mi} at (0,0) size 7x12 … … 92 92 RenderText {#text} at (15,0) size 5x12 93 93 text run at (15,0) width 5: "y" 94 RenderBlock {munderover}at (0,12) size 20x2494 RenderBlock (anonymous) at (0,12) size 20x24 95 95 RenderBlock {mo} at (0,0) size 17x24 96 96 RenderBlock {mo} at (0,0) size 17x24 97 97 RenderText {mo} at (0,0) size 17x24 98 98 text run at (0,0) width 17: "\x{2211}" 99 RenderBlock {munderover}at (0,36) size 20x16100 RenderBlock {mrow} at ( 1,3) size 18x1299 RenderBlock (anonymous) at (0,36) size 20x16 100 RenderBlock {mrow} at (0,3) size 18x12 101 101 RenderInline {mi} at (0,0) size 4x12 102 102 RenderText {#text} at (0,0) size 4x12 -
trunk/Source/WebCore/ChangeLog
r89267 r89268 1 2011-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 1 12 2011-06-20 Eric Seidel <eric@webkit.org> 2 13 -
trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp
r88730 r89268 61 61 RefPtr<RenderStyle> rowStyle = makeBlockStyle(); 62 62 row->setStyle(rowStyle.release()); 63 row->setIsAnonymous(true); 63 64 64 65 // look through the children for rendered elements counting the blocks so we know what child … … 101 102 break; 102 103 default: 103 // munderover shouldn't have more than three children. 104 // munderover shouldn't have more than three children. In theory we shouldn't 104 105 // get here if the MathML is correctly formed, but that isn't a guarantee. 105 106 // We will treat this as another under element and they'll get something funky. … … 287 288 if (!block->isRenderMathMLOperator()) 288 289 nonOperators += getOffsetHeight(current); 289 } else {290 } else 290 291 nonOperators += getOffsetHeight(current); 291 }292 292 } 293 293 return nonOperators;
Note: See TracChangeset
for help on using the changeset viewer.