Changeset 82775 in webkit
- Timestamp:
- Apr 2, 2011 2:37:11 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r82774 r82775 1 2011-04-02 Dan Bernstein <mitz@apple.com> 2 3 Reviewed by Dave Hyatt. 4 5 Remove an unnecessary extra computeLogicalWidth() from line layout 6 https://bugs.webkit.org/show_bug.cgi?id=57711 7 8 These updated expected results show progressions in MathML tests. 9 fast/table/colspanMinWidth-vertical results changed to show that text controls 10 still do not handle vertical writing modes correctly. 11 12 * platform/mac/fast/table/colspanMinWidth-vertical-expected.checksum: 13 * platform/mac/fast/table/colspanMinWidth-vertical-expected.png: 14 * platform/mac/fast/table/colspanMinWidth-vertical-expected.txt: 15 * platform/mac/mathml/presentation/fractions-expected.checksum: 16 * platform/mac/mathml/presentation/fractions-expected.png: 17 * platform/mac/mathml/presentation/fractions-expected.txt: 18 * platform/mac/mathml/presentation/fractions-vertical-alignment-expected.checksum: 19 * platform/mac/mathml/presentation/fractions-vertical-alignment-expected.png: 20 * platform/mac/mathml/presentation/fractions-vertical-alignment-expected.txt: 21 * platform/mac/mathml/presentation/roots-expected.checksum: 22 * platform/mac/mathml/presentation/roots-expected.png: 23 * platform/mac/mathml/presentation/roots-expected.txt: 24 * platform/mac/mathml/presentation/row-alignment-expected.checksum: 25 * platform/mac/mathml/presentation/row-alignment-expected.png: 26 * platform/mac/mathml/presentation/row-alignment-expected.txt: 27 * platform/mac/mathml/presentation/subsup-expected.checksum: 28 * platform/mac/mathml/presentation/subsup-expected.png: 29 * platform/mac/mathml/presentation/subsup-expected.txt: 30 1 31 2011-04-02 Dominic Cooney <dominicc@google.com> 2 32 -
trunk/LayoutTests/platform/mac/fast/table/colspanMinWidth-vertical-expected.checksum
r71382 r82775 1 0a56791e922ec17cf524cca618a3135b 1 380de1b70c41fee6bcaf8d1d73428533 -
trunk/LayoutTests/platform/mac/fast/table/colspanMinWidth-vertical-expected.txt
r79640 r82775 19 19 RenderTableCell {TD} at (2,8) size 14x-10 [bgcolor=#FF00FF] [r=0 c=0 rs=1 cs=1] 20 20 RenderTableCell {TD} at (2,6) size 14x131 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] 21 RenderTextControl {INPUT} at (3,3) size 8x1 25[bgcolor=#FFFFFF] [border: (2px inset #000000)]21 RenderTextControl {INPUT} at (3,3) size 8x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 22 22 RenderText {#text} at (0,0) size 0x0 23 23 layer at (19,23) size 2x119 scrollX 13 scrollWidth 15 -
trunk/LayoutTests/platform/mac/mathml/presentation/fractions-expected.checksum
r78910 r82775 1 21400ff9685ed48bf3516bf54f5fb98c 1 d5074898e3222fa0023c66d899964cbb -
trunk/LayoutTests/platform/mac/mathml/presentation/fractions-expected.txt
r78910 r82775 22 22 RenderBlock {math} at (197,0) size 33x34 23 23 RenderBlock {mfrac} at (1,0) size 31x34 [color=#FF0000] 24 RenderBlock {mfrac} at (0,0) size 22x1624 RenderBlock {mfrac} at (0,0) size 31x16 25 25 RenderBlock {mrow} at (3,0) size 25x16 26 26 RenderInline {mi} at (0,0) size 7x16 … … 34 34 RenderText {#text} at (17,0) size 8x16 35 35 text run at (17,0) width 8: "1" 36 RenderBlock {mfrac} at (0,16) size 22x1836 RenderBlock {mfrac} at (0,16) size 31x18 37 37 RenderBlock {mrow} at (3,2) size 25x16 38 38 RenderInline {mi} at (0,0) size 7x16 … … 98 98 RenderBlock {math} at (138,0) size 89x34 99 99 RenderBlock {mfrac} at (1,0) size 87x34 100 RenderBlock {mfrac} at (0,0) size 51x16100 RenderBlock {mfrac} at (0,0) size 87x16 101 101 RenderInline {mi} at (0,0) size 7x16 102 102 RenderText {#text} at (3,0) size 7x16 103 103 text run at (3,0) width 7: "x" 104 RenderBlock {mfrac} at (0,16) size 51x18104 RenderBlock {mfrac} at (0,16) size 87x18 105 105 RenderBlock {mrow} at (4,2) size 80x16 106 106 RenderInline {mn} at (0,0) size 8x16 … … 139 139 RenderBlock {math} at (231,0) size 89x34 140 140 RenderBlock {mfrac} at (1,0) size 87x34 141 RenderBlock {mfrac} at (0,0) size 51x16142 RenderInline {mi} at (0,0) size 7x16 143 RenderText {#text} at ( 22,0) size 7x16144 text run at ( 22,0) width 7: "x"145 RenderBlock {mfrac} at (0,16) size 51x18141 RenderBlock {mfrac} at (0,0) size 87x16 142 RenderInline {mi} at (0,0) size 7x16 143 RenderText {#text} at (40,0) size 7x16 144 text run at (40,0) width 7: "x" 145 RenderBlock {mfrac} at (0,16) size 87x18 146 146 RenderBlock {mrow} at (4,2) size 80x16 147 147 RenderInline {mn} at (0,0) size 8x16 … … 180 180 RenderBlock {math} at (324,0) size 89x34 181 181 RenderBlock {mfrac} at (1,0) size 87x34 182 RenderBlock {mfrac} at (0,0) size 51x16183 RenderInline {mi} at (0,0) size 7x16 184 RenderText {#text} at ( 41,0) size 7x16185 text run at ( 41,0) width 7: "x"186 RenderBlock {mfrac} at (0,16) size 51x18182 RenderBlock {mfrac} at (0,0) size 87x16 183 RenderInline {mi} at (0,0) size 7x16 184 RenderText {#text} at (77,0) size 7x16 185 text run at (77,0) width 7: "x" 186 RenderBlock {mfrac} at (0,16) size 87x18 187 187 RenderBlock {mrow} at (4,2) size 80x16 188 188 RenderInline {mn} at (0,0) size 8x16 … … 223 223 RenderBlock {math} at (153,0) size 88x34 224 224 RenderBlock {mfrac} at (1,0) size 86x34 225 RenderBlock {mfrac} at (0,0) size 50x16225 RenderBlock {mfrac} at (0,0) size 86x16 226 226 RenderBlock {mrow} at (3,0) size 80x16 227 227 RenderInline {mn} at (0,0) size 8x16 … … 256 256 RenderText {#text} at (72,0) size 8x16 257 257 text run at (72,0) width 8: "5" 258 RenderBlock {mfrac} at (0,16) size 50x18258 RenderBlock {mfrac} at (0,16) size 86x18 259 259 RenderInline {mi} at (0,0) size 7x16 260 260 RenderText {#text} at (3,2) size 7x16 … … 264 264 RenderBlock {math} at (245,0) size 88x34 265 265 RenderBlock {mfrac} at (1,0) size 86x34 266 RenderBlock {mfrac} at (0,0) size 50x16266 RenderBlock {mfrac} at (0,0) size 86x16 267 267 RenderBlock {mrow} at (3,0) size 80x16 268 268 RenderInline {mn} at (0,0) size 8x16 … … 297 297 RenderText {#text} at (72,0) size 8x16 298 298 text run at (72,0) width 8: "5" 299 RenderBlock {mfrac} at (0,16) size 50x18299 RenderBlock {mfrac} at (0,16) size 86x18 300 300 RenderInline {mi} at (0,0) size 8x16 301 RenderText {#text} at ( 21,2) size 8x16302 text run at ( 21,2) width 8: "x"301 RenderText {#text} at (39,2) size 8x16 302 text run at (39,2) width 8: "x" 303 303 RenderText {#text} at (333,7) size 4x18 304 304 text run at (333,7) width 4: " " 305 305 RenderBlock {math} at (337,0) size 88x34 306 306 RenderBlock {mfrac} at (1,0) size 86x34 307 RenderBlock {mfrac} at (0,0) size 50x16307 RenderBlock {mfrac} at (0,0) size 86x16 308 308 RenderBlock {mrow} at (3,0) size 80x16 309 309 RenderInline {mn} at (0,0) size 8x16 … … 338 338 RenderText {#text} at (72,0) size 8x16 339 339 text run at (72,0) width 8: "5" 340 RenderBlock {mfrac} at (0,16) size 50x18341 RenderInline {mi} at (0,0) size 7x16 342 RenderText {#text} at ( 40,2) size 7x16343 text run at ( 40,2) width 7: "x"344 RenderText {#text} at (0,0) size 0x0 340 RenderBlock {mfrac} at (0,16) size 86x18 341 RenderInline {mi} at (0,0) size 7x16 342 RenderText {#text} at (76,2) size 7x16 343 text run at (76,2) width 7: "x" 344 RenderText {#text} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/mathml/presentation/fractions-vertical-alignment-expected.checksum
r78910 r82775 1 376f383f270a298fb863547365bd268c 1 0e94b088d402196a8096c7571c8daf69 -
trunk/LayoutTests/platform/mac/mathml/presentation/fractions-vertical-alignment-expected.txt
r78910 r82775 17 17 text run at (0,0) width 9: "+" 18 18 RenderBlock {math:mfrac} at (28,18) size 44x52 19 RenderBlock {math:mfrac} at (0,0) size 35x3419 RenderBlock {math:mfrac} at (0,0) size 44x34 20 20 RenderBlock {math:mrow} at (3,0) size 38x34 21 21 RenderInline {math:mi} at (0,0) size 10x16 … … 35 35 RenderText {#text} at (4,2) size 10x16 36 36 text run at (4,2) width 10: "E" 37 RenderBlock {math:mfrac} at (0,34) size 35x1838 RenderInline {math:mi} at (0,0) size 1 1x1639 RenderText {#text} at (1 2,2) size 11x1640 text run at (1 2,2) width 11: "C"37 RenderBlock {math:mfrac} at (0,34) size 44x18 38 RenderInline {math:mi} at (0,0) size 12x16 39 RenderText {#text} at (16,2) size 12x16 40 text run at (16,2) width 12: "C" 41 41 RenderBlock {math:mo} at (72,46) size 10x16 42 42 RenderBlock {math:mo} at (0,0) size 9x16 … … 44 44 text run at (0,0) width 9: "+" 45 45 RenderBlock {math:mfrac} at (82,0) size 72x70 46 RenderBlock {math:mfrac} at (0,0) size 54x5246 RenderBlock {math:mfrac} at (0,0) size 72x52 47 47 RenderBlock {math:mrow} at (3,0) size 66x52 48 48 RenderInline {math:mi} at (0,0) size 10x16 … … 54 54 text run at (0,0) width 9: "+" 55 55 RenderBlock {math:mfrac} at (20,0) size 46x52 56 RenderBlock {math:mfrac} at (0,0) size 37x3456 RenderBlock {math:mfrac} at (0,0) size 46x34 57 57 RenderBlock {math:mrow} at (3,0) size 40x34 58 58 RenderInline {math:mi} at (0,0) size 12x16 … … 72 72 RenderText {#text} at (3,2) size 12x16 73 73 text run at (3,2) width 12: "G" 74 RenderBlock {math:mfrac} at (0,34) size 37x1875 RenderInline {math:mi} at (0,0) size 1 1x1676 RenderText {#text} at (1 3,2) size 11x1677 text run at (1 3,2) width 11: "E"78 RenderBlock {math:mfrac} at (0,52) size 54x1874 RenderBlock {math:mfrac} at (0,34) size 46x18 75 RenderInline {math:mi} at (0,0) size 10x16 76 RenderText {#text} at (18,2) size 10x16 77 text run at (18,2) width 10: "E" 78 RenderBlock {math:mfrac} at (0,52) size 72x18 79 79 RenderInline {math:mi} at (0,0) size 12x16 80 RenderText {#text} at ( 21,2) size 12x1681 text run at ( 21,2) width 12: "C"80 RenderText {#text} at (30,2) size 12x16 81 text run at (30,2) width 12: "C" 82 82 RenderBlock {math:mo} at (154,46) size 10x16 83 83 RenderBlock {math:mo} at (0,0) size 9x16 … … 85 85 text run at (0,0) width 9: "+" 86 86 RenderBlock {math:mfrac} at (164,36) size 73x70 87 RenderBlock {math:mfrac} at (0,0) size 55x1687 RenderBlock {math:mfrac} at (0,0) size 73x16 88 88 RenderInline {math:mi} at (0,0) size 11x16 89 RenderText {#text} at ( 22,0) size 11x1690 text run at ( 22,0) width 11: "B"91 RenderBlock {math:mfrac} at (0,16) size 55x5489 RenderText {#text} at (31,0) size 11x16 90 text run at (31,0) width 11: "B" 91 RenderBlock {math:mfrac} at (0,16) size 73x54 92 92 RenderBlock {math:mrow} at (4,2) size 66x52 93 93 RenderInline {math:mi} at (0,0) size 11x16 … … 99 99 text run at (0,0) width 9: "+" 100 100 RenderBlock {math:mfrac} at (21,0) size 45x52 101 RenderBlock {math:mfrac} at (0,0) size 36x16102 RenderInline {math:mi} at (0,0) size 1 2x16103 RenderText {#text} at (1 2,0) size 12x16104 text run at (1 2,0) width 12: "D"105 RenderBlock {math:mfrac} at (0,16) size 36x36101 RenderBlock {math:mfrac} at (0,0) size 45x16 102 RenderInline {math:mi} at (0,0) size 13x16 103 RenderText {#text} at (16,0) size 13x16 104 text run at (16,0) width 13: "D" 105 RenderBlock {math:mfrac} at (0,16) size 45x36 106 106 RenderBlock {math:mrow} at (4,2) size 38x34 107 107 RenderInline {math:mi} at (0,0) size 10x16 -
trunk/LayoutTests/platform/mac/mathml/presentation/roots-expected.checksum
r78910 r82775 1 bf37b7592dccb55d6244c20d81abec51 1 65a1311babb8e3160f3020ba02eb0b4f -
trunk/LayoutTests/platform/mac/mathml/presentation/roots-expected.txt
r78910 r82775 54 54 RenderBlock {msqrt} at (1,0) size 43x40 55 55 RenderBlock {mfrac} at (12,3) size 31x34 56 RenderBlock {mfrac} at (0,0) size 22x1656 RenderBlock {mfrac} at (0,0) size 31x16 57 57 RenderBlock {mrow} at (3,0) size 25x16 58 58 RenderInline {mi} at (0,0) size 7x16 … … 66 66 RenderText {#text} at (17,0) size 8x16 67 67 text run at (17,0) width 8: "1" 68 RenderBlock {mfrac} at (0,16) size 22x1868 RenderBlock {mfrac} at (0,16) size 31x18 69 69 RenderBlock {mrow} at (3,2) size 25x16 70 70 RenderInline {mi} at (0,0) size 7x16 … … 168 168 RenderText {#text} at (0,36) size 110x18 169 169 text run at (0,36) width 110: "Imbricated roots: " 170 RenderBlock {math} at (110,0) size 32 7x76170 RenderBlock {math} at (110,0) size 328x76 171 171 RenderText {#text} at (0,0) size 0x0 172 172 layer at (182,180) size 20x20 … … 212 212 RenderBlock {mroot} at (39,3) size 32x34 213 213 RenderBlock {mfrac} at (1,0) size 31x34 214 RenderBlock {mfrac} at (0,0) size 22x16214 RenderBlock {mfrac} at (0,0) size 31x16 215 215 RenderBlock {mrow} at (3,0) size 25x16 216 216 RenderInline {mi} at (0,0) size 7x16 … … 224 224 RenderText {#text} at (17,0) size 8x16 225 225 text run at (17,0) width 8: "1" 226 RenderBlock {mfrac} at (0,16) size 22x18226 RenderBlock {mfrac} at (0,16) size 31x18 227 227 RenderBlock {mrow} at (3,2) size 25x16 228 228 RenderInline {mi} at (0,0) size 7x16 … … 278 278 RenderText {#text} at (4,2) size 5x12 279 279 text run at (4,2) width 5: "z" 280 layer at (119,445) size 32 5x76281 RenderBlock (relative positioned) {mroot} at (1,0) size 32 5x76280 layer at (119,445) size 326x76 281 RenderBlock (relative positioned) {mroot} at (1,0) size 326x76 282 282 RenderBlock {mroot} at (18,50) size 0x0 283 RenderBlock {mroot} at (18,3) size 30 7x70284 RenderBlock {mrow} at (11,0) size 29 6x70283 RenderBlock {mroot} at (18,3) size 308x70 284 RenderBlock {mrow} at (11,0) size 297x70 285 285 RenderInline {mn} at (0,0) size 8x16 286 286 RenderText {#text} at (0,36) size 8x16 … … 294 294 RenderText {#text} at (2,0) size 6x12 295 295 text run at (2,0) width 6: "3" 296 layer at (166,448) size 27 8x70297 RenderBlock (relative positioned) {mroot} at (18,0) size 27 8x70296 layer at (166,448) size 279x70 297 RenderBlock (relative positioned) {mroot} at (18,0) size 279x70 298 298 RenderBlock {mroot} at (18,47) size 0x0 299 RenderBlock {mroot} at (18,3) size 26 0x64300 RenderBlock {mrow} at (9,0) size 25 1x64299 RenderBlock {mroot} at (18,3) size 261x64 300 RenderBlock {mrow} at (9,0) size 252x64 301 301 RenderInline {mn} at (0,0) size 8x16 302 302 RenderText {#text} at (0,33) size 8x16 … … 310 310 RenderText {#text} at (2,0) size 6x12 311 311 text run at (2,0) width 6: "4" 312 layer at (211,451) size 23 3x64313 RenderBlock (relative positioned) {mroot} at (18,0) size 23 3x64312 layer at (211,451) size 234x64 313 RenderBlock (relative positioned) {mroot} at (18,0) size 234x64 314 314 RenderBlock {mroot} at (18,44) size 0x0 315 RenderBlock {mroot} at (18,3) size 21 5x58316 RenderBlock {mrow} at ( 7,0) size 208x58315 RenderBlock {mroot} at (18,3) size 216x58 316 RenderBlock {mrow} at (8,0) size 208x58 317 317 RenderInline {mn} at (0,0) size 8x16 318 318 RenderText {#text} at (0,30) size 8x16 … … 326 326 RenderText {#text} at (2,0) size 6x12 327 327 text run at (2,0) width 6: "5" 328 layer at (25 4,454) size 190x58328 layer at (255,454) size 190x58 329 329 RenderBlock (relative positioned) {mroot} at (18,0) size 190x58 330 330 RenderBlock {mroot} at (18,41) size 0x0 … … 338 338 RenderText {mo} at (0,0) size 9x16 339 339 text run at (0,0) width 9: "+" 340 layer at (25 4,476) size 12x14340 layer at (255,476) size 12x14 341 341 RenderBlock (positioned) {mn} at (0,22) size 12x14 342 342 RenderText {#text} at (2,0) size 6x12 343 343 text run at (2,0) width 6: "6" 344 layer at (29 6,457) size 148x52344 layer at (297,457) size 148x52 345 345 RenderBlock (relative positioned) {mroot} at (18,0) size 148x52 346 346 RenderBlock {mroot} at (17,38) size 0x0 … … 354 354 RenderText {mo} at (0,0) size 9x16 355 355 text run at (0,0) width 9: "+" 356 layer at (29 6,475) size 12x14356 layer at (297,475) size 12x14 357 357 RenderBlock (positioned) {mn} at (0,18) size 12x14 358 358 RenderText {#text} at (2,0) size 6x12 359 359 text run at (2,0) width 6: "7" 360 layer at (33 5,460) size 109x46360 layer at (336,460) size 109x46 361 361 RenderBlock (relative positioned) {mroot} at (18,0) size 109x46 362 362 RenderBlock {mroot} at (16,35) size 0x0 … … 370 370 RenderText {mo} at (0,0) size 9x16 371 371 text run at (0,0) width 9: "+" 372 layer at (33 5,474) size 12x14372 layer at (336,474) size 12x14 373 373 RenderBlock (positioned) {mn} at (0,14) size 12x14 374 374 RenderText {#text} at (2,0) size 6x12 375 375 text run at (2,0) width 6: "8" 376 layer at (37 2,463) size 72x40376 layer at (373,463) size 72x40 377 377 RenderBlock (relative positioned) {mroot} at (18,0) size 72x40 378 378 RenderBlock {mroot} at (14,32) size 0x0 … … 386 386 RenderText {mo} at (0,0) size 9x16 387 387 text run at (0,0) width 9: "+" 388 layer at (37 2,474) size 12x14388 layer at (373,474) size 12x14 389 389 RenderBlock (positioned) {mn} at (0,11) size 12x14 390 390 RenderText {#text} at (2,0) size 6x12 391 391 text run at (2,0) width 6: "9" 392 layer at (40 6,466) size 38x34392 layer at (407,466) size 38x34 393 393 RenderBlock (relative positioned) {mroot} at (18,0) size 38x34 394 394 RenderBlock {mroot} at (28,29) size 0x0 … … 397 397 RenderText {#text} at (0,0) size 10x16 398 398 text run at (0,0) width 10: "A" 399 layer at (40 6,466) size 28x28399 layer at (407,466) size 28x28 400 400 RenderBlock (positioned) {mfrac} at (0,0) size 28x28 401 401 RenderBlock {mfrac} at (2,0) size 22x12 -
trunk/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.checksum
r78910 r82775 1 c52ca74c7fa87ac83a6366bab4f324701 17fe1b6f3126d973853f75da930caf60 -
trunk/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt
r78910 r82775 33 33 RenderBlock {math} at (27,0) size 33x34 34 34 RenderBlock {mfrac} at (1,0) size 31x34 35 RenderBlock {mfrac} at (0,0) size 22x1635 RenderBlock {mfrac} at (0,0) size 31x16 36 36 RenderBlock {mrow} at (3,0) size 25x16 37 37 RenderInline {mi} at (0,0) size 7x16 … … 45 45 RenderText {#text} at (17,0) size 8x16 46 46 text run at (17,0) width 8: "1" 47 RenderBlock {mfrac} at (0,16) size 22x1848 RenderInline {mn} at (0,0) size 8x1649 RenderText {#text} at ( 7,2) size 8x1650 text run at ( 7,2) width 8: "2"47 RenderBlock {mfrac} at (0,16) size 31x18 48 RenderInline {mn} at (0,0) size 9x16 49 RenderText {#text} at (11,2) size 9x16 50 text run at (11,2) width 9: "2" 51 51 RenderText {#text} at (0,0) size 0x0 52 52 RenderBlock {p} at (0,97) size 784x34 … … 62 62 text run at (0,0) width 9: "+" 63 63 RenderBlock {mfrac} at (18,0) size 31x34 64 RenderBlock {mfrac} at (0,0) size 22x1664 RenderBlock {mfrac} at (0,0) size 31x16 65 65 RenderBlock {mrow} at (3,0) size 25x16 66 66 RenderInline {mi} at (0,0) size 7x16 … … 74 74 RenderText {#text} at (17,0) size 8x16 75 75 text run at (17,0) width 8: "1" 76 RenderBlock {mfrac} at (0,16) size 22x1877 RenderInline {mn} at (0,0) size 8x1678 RenderText {#text} at ( 7,2) size 8x1679 text run at ( 7,2) width 8: "2"76 RenderBlock {mfrac} at (0,16) size 31x18 77 RenderInline {mn} at (0,0) size 9x16 78 RenderText {#text} at (11,2) size 9x16 79 text run at (11,2) width 9: "2" 80 80 RenderText {#text} at (0,0) size 0x0 81 81 RenderBlock {div} at (0,235) size 784x274 … … 96 96 text run at (0,0) width 9: "+" 97 97 RenderBlock {mfrac} at (24,2) size 31x34 98 RenderBlock {mfrac} at (0,0) size 22x1698 RenderBlock {mfrac} at (0,0) size 31x16 99 99 RenderBlock {mrow} at (3,0) size 25x16 100 100 RenderInline {mi} at (0,0) size 7x16 … … 108 108 RenderText {#text} at (17,0) size 8x16 109 109 text run at (17,0) width 8: "1" 110 RenderBlock {mfrac} at (0,16) size 22x18111 RenderInline {mn} at (0,0) size 8x16112 RenderText {#text} at ( 7,2) size 8x16113 text run at ( 7,2) width 8: "2"110 RenderBlock {mfrac} at (0,16) size 31x18 111 RenderInline {mn} at (0,0) size 9x16 112 RenderText {#text} at (11,2) size 9x16 113 text run at (11,2) width 9: "2" 114 114 RenderBlock {mo} at (55,0) size 6x41 115 115 RenderText {#text} at (0,0) size 0x0 … … 132 132 text run at (4,3) width 5: "x" 133 133 RenderBlock {mfrac} at (27,10) size 54x70 134 RenderBlock {mfrac} at (0,0) size 36x34134 RenderBlock {mfrac} at (0,0) size 54x34 135 135 RenderBlock {mrow} at (3,0) size 48x34 136 136 RenderInline {mi} at (0,0) size 7x16 … … 142 142 text run at (0,0) width 9: "+" 143 143 RenderBlock {mfrac} at (17,0) size 31x34 144 RenderBlock {mfrac} at (0,0) size 22x16144 RenderBlock {mfrac} at (0,0) size 31x16 145 145 RenderBlock {mrow} at (3,0) size 25x16 146 146 RenderInline {mi} at (0,0) size 7x16 … … 154 154 RenderText {#text} at (17,0) size 8x16 155 155 text run at (17,0) width 8: "1" 156 RenderBlock {mfrac} at (0,16) size 22x18157 RenderInline {mn} at (0,0) size 8x16158 RenderText {#text} at ( 7,2) size 8x16159 text run at ( 7,2) width 8: "2"160 RenderBlock {mfrac} at (0,34) size 36x36156 RenderBlock {mfrac} at (0,16) size 31x18 157 RenderInline {mn} at (0,0) size 9x16 158 RenderText {#text} at (11,2) size 9x16 159 text run at (11,2) width 9: "2" 160 RenderBlock {mfrac} at (0,34) size 54x36 161 161 RenderBlock {mrow} at (3,2) size 48x34 162 162 RenderInline {mi} at (0,0) size 7x16 … … 168 168 text run at (0,0) width 9: "+" 169 169 RenderBlock {mfrac} at (17,0) size 31x34 170 RenderBlock {mfrac} at (0,0) size 22x16170 RenderBlock {mfrac} at (0,0) size 31x16 171 171 RenderBlock {mrow} at (3,0) size 25x16 172 172 RenderInline {mi} at (0,0) size 7x16 … … 180 180 RenderText {#text} at (17,0) size 8x16 181 181 text run at (17,0) width 8: "1" 182 RenderBlock {mfrac} at (0,16) size 22x18183 RenderInline {mn} at (0,0) size 8x16184 RenderText {#text} at ( 7,2) size 8x16185 text run at ( 7,2) width 8: "2"182 RenderBlock {mfrac} at (0,16) size 31x18 183 RenderInline {mn} at (0,0) size 9x16 184 RenderText {#text} at (11,2) size 9x16 185 text run at (11,2) width 9: "2" 186 186 RenderBlock {mo} at (81,0) size 6x85 187 187 RenderText {#text} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/mathml/presentation/subsup-expected.checksum
r78910 r82775 1 54a5e9344659080a400249156d0b12e8 1 7ed1a1e531a2bbb4c8610fa64a699410 -
trunk/LayoutTests/platform/mac/mathml/presentation/subsup-expected.txt
r76012 r82775 33 33 text run at (0,8) width 9: "Z" 34 34 RenderBlock {msubsup} at (10,0) size 32x32 35 RenderBlock {msubsup} at (0,0) size 18x1635 RenderBlock {msubsup} at (0,0) size 32x16 36 36 RenderInline {mi} at (0,0) size 3x12 37 37 RenderText {#text} at (0,3) size 3x12 38 38 text run at (0,3) width 3: "j" 39 RenderBlock {msubsup} at (0,16) size 18x1639 RenderBlock {msubsup} at (0,16) size 32x16 40 40 RenderBlock {mrow} at (1,3) size 31x12 41 41 RenderInline {mi} at (0,0) size 5x12 … … 67 67 text run at (0,8) width 9: "Z" 68 68 RenderBlock {msubsup} at (10,0) size 17x32 69 RenderBlock {msubsup} at (0,0) size 1 0x1669 RenderBlock {msubsup} at (0,0) size 17x16 70 70 RenderBlock {mrow} at (1,3) size 16x12 71 71 RenderInline {mi} at (0,0) size 5x12 … … 79 79 RenderText {#text} at (13,0) size 3x12 80 80 text run at (13,0) width 3: "j" 81 RenderBlock {msubsup} at (0,16) size 1 0x1681 RenderBlock {msubsup} at (0,16) size 17x16 82 82 RenderInline {mi} at (0,0) size 5x12 83 83 RenderText {#text} at (0,3) size 5x12 … … 94 94 text run at (0,8) width 9: "Z" 95 95 RenderBlock {msubsup} at (10,0) size 32x32 96 RenderBlock {msubsup} at (0,0) size 18x1696 RenderBlock {msubsup} at (0,0) size 32x16 97 97 RenderBlock {mrow} at (0,3) size 16x12 98 98 RenderInline {mi} at (0,0) size 5x12 … … 106 106 RenderText {#text} at (13,0) size 3x12 107 107 text run at (13,0) width 3: "j" 108 RenderBlock {msubsup} at (0,16) size 18x16108 RenderBlock {msubsup} at (0,16) size 32x16 109 109 RenderBlock {mrow} at (1,3) size 31x12 110 110 RenderInline {mi} at (0,0) size 5x12 -
trunk/Source/WebCore/ChangeLog
r82772 r82775 1 2011-04-02 Dan Bernstein <mitz@apple.com> 2 3 Reviewed by Dave Hyatt. 4 5 Remove an unnecessary extra computeLogicalWidth() from line layout 6 https://bugs.webkit.org/show_bug.cgi?id=57711 7 8 Changes in behavior (MathML progression) covered by existing layout tests. 9 10 * rendering/RenderBlockLineLayout.cpp: 11 (WebCore::RenderBlock::computeInlineDirectionPositionsForLine): Removed a 12 call to computeLogicalWidth(). Because of <http://webkit.org/b/57700>, this 13 actually prevents MathML rows from reverting to an incorrect width. 14 1 15 2011-04-02 Ryuan Choi <ryuan.choi@samsung.com> 2 16 -
trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp
r82611 r82775 455 455 if (!r->m_object->isRenderInline()) { 456 456 RenderBox* renderBox = toRenderBox(r->m_object); 457 renderBox->computeLogicalWidth();458 457 r->m_box->setLogicalWidth(logicalWidthForChild(renderBox)); 459 458 totalLogicalWidth += marginStartForChild(renderBox) + marginEndForChild(renderBox);
Note: See TracChangeset
for help on using the changeset viewer.