Changeset 82786 in webkit


Ignore:
Timestamp:
Apr 2, 2011 6:47:22 PM (13 years ago)
Author:
mitz@apple.com
Message:

Remove an unnecessary extra computeLogicalWidth() from line layout
https://bugs.webkit.org/show_bug.cgi?id=57711

Reviewed by Dave Hyatt.

Source/WebCore:

Changes in behavior (MathML progression) covered by existing layout tests.

  • rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::computeInlineDirectionPositionsForLine): Removed a
call to computeLogicalWidth(). Because of <http://webkit.org/b/57700>, this
actually prevents MathML rows from reverting to an incorrect width.

LayoutTests:

These updated expected results show progressions in MathML tests.
fast/table/colspanMinWidth-vertical results changed to show that text controls
still do not handle vertical writing modes correctly.

  • platform/mac/fast/table/colspanMinWidth-vertical-expected.checksum:
  • platform/mac/fast/table/colspanMinWidth-vertical-expected.png:
  • platform/mac/fast/table/colspanMinWidth-vertical-expected.txt:
  • platform/mac/mathml/presentation/fractions-expected.checksum:
  • platform/mac/mathml/presentation/fractions-expected.png:
  • platform/mac/mathml/presentation/fractions-expected.txt:
  • platform/mac/mathml/presentation/fractions-vertical-alignment-expected.checksum:
  • platform/mac/mathml/presentation/fractions-vertical-alignment-expected.png:
  • platform/mac/mathml/presentation/fractions-vertical-alignment-expected.txt:
  • platform/mac/mathml/presentation/roots-expected.checksum:
  • platform/mac/mathml/presentation/roots-expected.png:
  • platform/mac/mathml/presentation/roots-expected.txt:
  • platform/mac/mathml/presentation/row-alignment-expected.checksum:
  • platform/mac/mathml/presentation/row-alignment-expected.png:
  • platform/mac/mathml/presentation/row-alignment-expected.txt:
  • platform/mac/mathml/presentation/subsup-expected.checksum:
  • platform/mac/mathml/presentation/subsup-expected.png:
  • platform/mac/mathml/presentation/subsup-expected.txt:
Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r82785 r82786  
     12011-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
    1312011-04-02  Dan Bernstein  <mitz@apple.com>
    232
     
    93123        * platform/qt/fast/html/details-remove-summary-6-expected.txt:
    94124        * platform/qt/fast/html/details-writing-mode-expected.txt:
    95 
    96 2011-04-02  Dan Bernstein  <mitz@apple.com>
    97 
    98         Reviewed by Dave Hyatt.
    99 
    100         Remove an unnecessary extra computeLogicalWidth() from line layout
    101         https://bugs.webkit.org/show_bug.cgi?id=57711
    102 
    103         These updated expected results show progressions in MathML tests.
    104         fast/table/colspanMinWidth-vertical results changed to show that text controls
    105         still do not handle vertical writing modes correctly.
    106 
    107         * platform/mac/fast/table/colspanMinWidth-vertical-expected.checksum:
    108         * platform/mac/fast/table/colspanMinWidth-vertical-expected.png:
    109         * platform/mac/fast/table/colspanMinWidth-vertical-expected.txt:
    110         * platform/mac/mathml/presentation/fractions-expected.checksum:
    111         * platform/mac/mathml/presentation/fractions-expected.png:
    112         * platform/mac/mathml/presentation/fractions-expected.txt:
    113         * platform/mac/mathml/presentation/fractions-vertical-alignment-expected.checksum:
    114         * platform/mac/mathml/presentation/fractions-vertical-alignment-expected.png:
    115         * platform/mac/mathml/presentation/fractions-vertical-alignment-expected.txt:
    116         * platform/mac/mathml/presentation/roots-expected.checksum:
    117         * platform/mac/mathml/presentation/roots-expected.png:
    118         * platform/mac/mathml/presentation/roots-expected.txt:
    119         * platform/mac/mathml/presentation/row-alignment-expected.checksum:
    120         * platform/mac/mathml/presentation/row-alignment-expected.png:
    121         * platform/mac/mathml/presentation/row-alignment-expected.txt:
    122         * platform/mac/mathml/presentation/subsup-expected.checksum:
    123         * platform/mac/mathml/presentation/subsup-expected.png:
    124         * platform/mac/mathml/presentation/subsup-expected.txt:
    125125
    1261262011-04-02  Dan Bernstein  <mitz@apple.com>
  • trunk/LayoutTests/platform/mac/fast/table/colspanMinWidth-vertical-expected.checksum

    r82777 r82786  
    1 0a56791e922ec17cf524cca618a3135b
     1380de1b70c41fee6bcaf8d1d73428533
  • trunk/LayoutTests/platform/mac/fast/table/colspanMinWidth-vertical-expected.txt

    r82777 r82786  
    1919                    RenderTableCell {TD} at (2,8) size 14x-10 [bgcolor=#FF00FF] [r=0 c=0 rs=1 cs=1]
    2020                    RenderTableCell {TD} at (2,6) size 14x131 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1]
    21                       RenderTextControl {INPUT} at (3,3) size 8x125 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     21                      RenderTextControl {INPUT} at (3,3) size 8x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    2222                      RenderText {#text} at (0,0) size 0x0
    2323layer at (19,23) size 2x119 scrollX 13 scrollWidth 15
  • trunk/LayoutTests/platform/mac/mathml/presentation/fractions-expected.checksum

    r82777 r82786  
    1 21400ff9685ed48bf3516bf54f5fb98c
     1d5074898e3222fa0023c66d899964cbb
  • trunk/LayoutTests/platform/mac/mathml/presentation/fractions-expected.txt

    r82777 r82786  
    2222        RenderBlock {math} at (197,0) size 33x34
    2323          RenderBlock {mfrac} at (1,0) size 31x34 [color=#FF0000]
    24             RenderBlock {mfrac} at (0,0) size 22x16
     24            RenderBlock {mfrac} at (0,0) size 31x16
    2525              RenderBlock {mrow} at (3,0) size 25x16
    2626                RenderInline {mi} at (0,0) size 7x16
     
    3434                  RenderText {#text} at (17,0) size 8x16
    3535                    text run at (17,0) width 8: "1"
    36             RenderBlock {mfrac} at (0,16) size 22x18
     36            RenderBlock {mfrac} at (0,16) size 31x18
    3737              RenderBlock {mrow} at (3,2) size 25x16
    3838                RenderInline {mi} at (0,0) size 7x16
     
    9898        RenderBlock {math} at (138,0) size 89x34
    9999          RenderBlock {mfrac} at (1,0) size 87x34
    100             RenderBlock {mfrac} at (0,0) size 51x16
     100            RenderBlock {mfrac} at (0,0) size 87x16
    101101              RenderInline {mi} at (0,0) size 7x16
    102102                RenderText {#text} at (3,0) size 7x16
    103103                  text run at (3,0) width 7: "x"
    104             RenderBlock {mfrac} at (0,16) size 51x18
     104            RenderBlock {mfrac} at (0,16) size 87x18
    105105              RenderBlock {mrow} at (4,2) size 80x16
    106106                RenderInline {mn} at (0,0) size 8x16
     
    139139        RenderBlock {math} at (231,0) size 89x34
    140140          RenderBlock {mfrac} at (1,0) size 87x34
    141             RenderBlock {mfrac} at (0,0) size 51x16
    142               RenderInline {mi} at (0,0) size 7x16
    143                 RenderText {#text} at (22,0) size 7x16
    144                   text run at (22,0) width 7: "x"
    145             RenderBlock {mfrac} at (0,16) size 51x18
     141            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
    146146              RenderBlock {mrow} at (4,2) size 80x16
    147147                RenderInline {mn} at (0,0) size 8x16
     
    180180        RenderBlock {math} at (324,0) size 89x34
    181181          RenderBlock {mfrac} at (1,0) size 87x34
    182             RenderBlock {mfrac} at (0,0) size 51x16
    183               RenderInline {mi} at (0,0) size 7x16
    184                 RenderText {#text} at (41,0) size 7x16
    185                   text run at (41,0) width 7: "x"
    186             RenderBlock {mfrac} at (0,16) size 51x18
     182            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
    187187              RenderBlock {mrow} at (4,2) size 80x16
    188188                RenderInline {mn} at (0,0) size 8x16
     
    223223        RenderBlock {math} at (153,0) size 88x34
    224224          RenderBlock {mfrac} at (1,0) size 86x34
    225             RenderBlock {mfrac} at (0,0) size 50x16
     225            RenderBlock {mfrac} at (0,0) size 86x16
    226226              RenderBlock {mrow} at (3,0) size 80x16
    227227                RenderInline {mn} at (0,0) size 8x16
     
    256256                  RenderText {#text} at (72,0) size 8x16
    257257                    text run at (72,0) width 8: "5"
    258             RenderBlock {mfrac} at (0,16) size 50x18
     258            RenderBlock {mfrac} at (0,16) size 86x18
    259259              RenderInline {mi} at (0,0) size 7x16
    260260                RenderText {#text} at (3,2) size 7x16
     
    264264        RenderBlock {math} at (245,0) size 88x34
    265265          RenderBlock {mfrac} at (1,0) size 86x34
    266             RenderBlock {mfrac} at (0,0) size 50x16
     266            RenderBlock {mfrac} at (0,0) size 86x16
    267267              RenderBlock {mrow} at (3,0) size 80x16
    268268                RenderInline {mn} at (0,0) size 8x16
     
    297297                  RenderText {#text} at (72,0) size 8x16
    298298                    text run at (72,0) width 8: "5"
    299             RenderBlock {mfrac} at (0,16) size 50x18
     299            RenderBlock {mfrac} at (0,16) size 86x18
    300300              RenderInline {mi} at (0,0) size 8x16
    301                 RenderText {#text} at (21,2) size 8x16
    302                   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"
    303303        RenderText {#text} at (333,7) size 4x18
    304304          text run at (333,7) width 4: " "
    305305        RenderBlock {math} at (337,0) size 88x34
    306306          RenderBlock {mfrac} at (1,0) size 86x34
    307             RenderBlock {mfrac} at (0,0) size 50x16
     307            RenderBlock {mfrac} at (0,0) size 86x16
    308308              RenderBlock {mrow} at (3,0) size 80x16
    309309                RenderInline {mn} at (0,0) size 8x16
     
    338338                  RenderText {#text} at (72,0) size 8x16
    339339                    text run at (72,0) width 8: "5"
    340             RenderBlock {mfrac} at (0,16) size 50x18
    341               RenderInline {mi} at (0,0) size 7x16
    342                 RenderText {#text} at (40,2) size 7x16
    343                   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

    r82777 r82786  
    1 376f383f270a298fb863547365bd268c
     10e94b088d402196a8096c7571c8daf69
  • trunk/LayoutTests/platform/mac/mathml/presentation/fractions-vertical-alignment-expected.txt

    r82777 r82786  
    1717          text run at (0,0) width 9: "+"
    1818    RenderBlock {math:mfrac} at (28,18) size 44x52
    19       RenderBlock {math:mfrac} at (0,0) size 35x34
     19      RenderBlock {math:mfrac} at (0,0) size 44x34
    2020        RenderBlock {math:mrow} at (3,0) size 38x34
    2121          RenderInline {math:mi} at (0,0) size 10x16
     
    3535                RenderText {#text} at (4,2) size 10x16
    3636                  text run at (4,2) width 10: "E"
    37       RenderBlock {math:mfrac} at (0,34) size 35x18
    38         RenderInline {math:mi} at (0,0) size 11x16
    39           RenderText {#text} at (12,2) size 11x16
    40             text run at (12,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"
    4141    RenderBlock {math:mo} at (72,46) size 10x16
    4242      RenderBlock {math:mo} at (0,0) size 9x16
     
    4444          text run at (0,0) width 9: "+"
    4545    RenderBlock {math:mfrac} at (82,0) size 72x70
    46       RenderBlock {math:mfrac} at (0,0) size 54x52
     46      RenderBlock {math:mfrac} at (0,0) size 72x52
    4747        RenderBlock {math:mrow} at (3,0) size 66x52
    4848          RenderInline {math:mi} at (0,0) size 10x16
     
    5454                text run at (0,0) width 9: "+"
    5555          RenderBlock {math:mfrac} at (20,0) size 46x52
    56             RenderBlock {math:mfrac} at (0,0) size 37x34
     56            RenderBlock {math:mfrac} at (0,0) size 46x34
    5757              RenderBlock {math:mrow} at (3,0) size 40x34
    5858                RenderInline {math:mi} at (0,0) size 12x16
     
    7272                      RenderText {#text} at (3,2) size 12x16
    7373                        text run at (3,2) width 12: "G"
    74             RenderBlock {math:mfrac} at (0,34) size 37x18
    75               RenderInline {math:mi} at (0,0) size 11x16
    76                 RenderText {#text} at (13,2) size 11x16
    77                   text run at (13,2) width 11: "E"
    78       RenderBlock {math:mfrac} at (0,52) size 54x18
     74            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
    7979        RenderInline {math:mi} at (0,0) size 12x16
    80           RenderText {#text} at (21,2) size 12x16
    81             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"
    8282    RenderBlock {math:mo} at (154,46) size 10x16
    8383      RenderBlock {math:mo} at (0,0) size 9x16
     
    8585          text run at (0,0) width 9: "+"
    8686    RenderBlock {math:mfrac} at (164,36) size 73x70
    87       RenderBlock {math:mfrac} at (0,0) size 55x16
     87      RenderBlock {math:mfrac} at (0,0) size 73x16
    8888        RenderInline {math:mi} at (0,0) size 11x16
    89           RenderText {#text} at (22,0) size 11x16
    90             text run at (22,0) width 11: "B"
    91       RenderBlock {math:mfrac} at (0,16) size 55x54
     89          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
    9292        RenderBlock {math:mrow} at (4,2) size 66x52
    9393          RenderInline {math:mi} at (0,0) size 11x16
     
    9999                text run at (0,0) width 9: "+"
    100100          RenderBlock {math:mfrac} at (21,0) size 45x52
    101             RenderBlock {math:mfrac} at (0,0) size 36x16
    102               RenderInline {math:mi} at (0,0) size 12x16
    103                 RenderText {#text} at (12,0) size 12x16
    104                   text run at (12,0) width 12: "D"
    105             RenderBlock {math:mfrac} at (0,16) size 36x36
     101            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
    106106              RenderBlock {math:mrow} at (4,2) size 38x34
    107107                RenderInline {math:mi} at (0,0) size 10x16
  • trunk/LayoutTests/platform/mac/mathml/presentation/roots-expected.checksum

    r82777 r82786  
    1 bf37b7592dccb55d6244c20d81abec51
     165a1311babb8e3160f3020ba02eb0b4f
  • trunk/LayoutTests/platform/mac/mathml/presentation/roots-expected.txt

    r82777 r82786  
    5454          RenderBlock {msqrt} at (1,0) size 43x40
    5555            RenderBlock {mfrac} at (12,3) size 31x34
    56               RenderBlock {mfrac} at (0,0) size 22x16
     56              RenderBlock {mfrac} at (0,0) size 31x16
    5757                RenderBlock {mrow} at (3,0) size 25x16
    5858                  RenderInline {mi} at (0,0) size 7x16
     
    6666                    RenderText {#text} at (17,0) size 8x16
    6767                      text run at (17,0) width 8: "1"
    68               RenderBlock {mfrac} at (0,16) size 22x18
     68              RenderBlock {mfrac} at (0,16) size 31x18
    6969                RenderBlock {mrow} at (3,2) size 25x16
    7070                  RenderInline {mi} at (0,0) size 7x16
     
    168168        RenderText {#text} at (0,36) size 110x18
    169169          text run at (0,36) width 110: "Imbricated roots: "
    170         RenderBlock {math} at (110,0) size 327x76
     170        RenderBlock {math} at (110,0) size 328x76
    171171        RenderText {#text} at (0,0) size 0x0
    172172layer at (182,180) size 20x20
     
    212212    RenderBlock {mroot} at (39,3) size 32x34
    213213      RenderBlock {mfrac} at (1,0) size 31x34
    214         RenderBlock {mfrac} at (0,0) size 22x16
     214        RenderBlock {mfrac} at (0,0) size 31x16
    215215          RenderBlock {mrow} at (3,0) size 25x16
    216216            RenderInline {mi} at (0,0) size 7x16
     
    224224              RenderText {#text} at (17,0) size 8x16
    225225                text run at (17,0) width 8: "1"
    226         RenderBlock {mfrac} at (0,16) size 22x18
     226        RenderBlock {mfrac} at (0,16) size 31x18
    227227          RenderBlock {mrow} at (3,2) size 25x16
    228228            RenderInline {mi} at (0,0) size 7x16
     
    278278        RenderText {#text} at (4,2) size 5x12
    279279          text run at (4,2) width 5: "z"
    280 layer at (119,445) size 325x76
    281   RenderBlock (relative positioned) {mroot} at (1,0) size 325x76
     280layer at (119,445) size 326x76
     281  RenderBlock (relative positioned) {mroot} at (1,0) size 326x76
    282282    RenderBlock {mroot} at (18,50) size 0x0
    283     RenderBlock {mroot} at (18,3) size 307x70
    284       RenderBlock {mrow} at (11,0) size 296x70
     283    RenderBlock {mroot} at (18,3) size 308x70
     284      RenderBlock {mrow} at (11,0) size 297x70
    285285        RenderInline {mn} at (0,0) size 8x16
    286286          RenderText {#text} at (0,36) size 8x16
     
    294294    RenderText {#text} at (2,0) size 6x12
    295295      text run at (2,0) width 6: "3"
    296 layer at (166,448) size 278x70
    297   RenderBlock (relative positioned) {mroot} at (18,0) size 278x70
     296layer at (166,448) size 279x70
     297  RenderBlock (relative positioned) {mroot} at (18,0) size 279x70
    298298    RenderBlock {mroot} at (18,47) size 0x0
    299     RenderBlock {mroot} at (18,3) size 260x64
    300       RenderBlock {mrow} at (9,0) size 251x64
     299    RenderBlock {mroot} at (18,3) size 261x64
     300      RenderBlock {mrow} at (9,0) size 252x64
    301301        RenderInline {mn} at (0,0) size 8x16
    302302          RenderText {#text} at (0,33) size 8x16
     
    310310    RenderText {#text} at (2,0) size 6x12
    311311      text run at (2,0) width 6: "4"
    312 layer at (211,451) size 233x64
    313   RenderBlock (relative positioned) {mroot} at (18,0) size 233x64
     312layer at (211,451) size 234x64
     313  RenderBlock (relative positioned) {mroot} at (18,0) size 234x64
    314314    RenderBlock {mroot} at (18,44) size 0x0
    315     RenderBlock {mroot} at (18,3) size 215x58
    316       RenderBlock {mrow} at (7,0) size 208x58
     315    RenderBlock {mroot} at (18,3) size 216x58
     316      RenderBlock {mrow} at (8,0) size 208x58
    317317        RenderInline {mn} at (0,0) size 8x16
    318318          RenderText {#text} at (0,30) size 8x16
     
    326326    RenderText {#text} at (2,0) size 6x12
    327327      text run at (2,0) width 6: "5"
    328 layer at (254,454) size 190x58
     328layer at (255,454) size 190x58
    329329  RenderBlock (relative positioned) {mroot} at (18,0) size 190x58
    330330    RenderBlock {mroot} at (18,41) size 0x0
     
    338338            RenderText {mo} at (0,0) size 9x16
    339339              text run at (0,0) width 9: "+"
    340 layer at (254,476) size 12x14
     340layer at (255,476) size 12x14
    341341  RenderBlock (positioned) {mn} at (0,22) size 12x14
    342342    RenderText {#text} at (2,0) size 6x12
    343343      text run at (2,0) width 6: "6"
    344 layer at (296,457) size 148x52
     344layer at (297,457) size 148x52
    345345  RenderBlock (relative positioned) {mroot} at (18,0) size 148x52
    346346    RenderBlock {mroot} at (17,38) size 0x0
     
    354354            RenderText {mo} at (0,0) size 9x16
    355355              text run at (0,0) width 9: "+"
    356 layer at (296,475) size 12x14
     356layer at (297,475) size 12x14
    357357  RenderBlock (positioned) {mn} at (0,18) size 12x14
    358358    RenderText {#text} at (2,0) size 6x12
    359359      text run at (2,0) width 6: "7"
    360 layer at (335,460) size 109x46
     360layer at (336,460) size 109x46
    361361  RenderBlock (relative positioned) {mroot} at (18,0) size 109x46
    362362    RenderBlock {mroot} at (16,35) size 0x0
     
    370370            RenderText {mo} at (0,0) size 9x16
    371371              text run at (0,0) width 9: "+"
    372 layer at (335,474) size 12x14
     372layer at (336,474) size 12x14
    373373  RenderBlock (positioned) {mn} at (0,14) size 12x14
    374374    RenderText {#text} at (2,0) size 6x12
    375375      text run at (2,0) width 6: "8"
    376 layer at (372,463) size 72x40
     376layer at (373,463) size 72x40
    377377  RenderBlock (relative positioned) {mroot} at (18,0) size 72x40
    378378    RenderBlock {mroot} at (14,32) size 0x0
     
    386386            RenderText {mo} at (0,0) size 9x16
    387387              text run at (0,0) width 9: "+"
    388 layer at (372,474) size 12x14
     388layer at (373,474) size 12x14
    389389  RenderBlock (positioned) {mn} at (0,11) size 12x14
    390390    RenderText {#text} at (2,0) size 6x12
    391391      text run at (2,0) width 6: "9"
    392 layer at (406,466) size 38x34
     392layer at (407,466) size 38x34
    393393  RenderBlock (relative positioned) {mroot} at (18,0) size 38x34
    394394    RenderBlock {mroot} at (28,29) size 0x0
     
    397397        RenderText {#text} at (0,0) size 10x16
    398398          text run at (0,0) width 10: "A"
    399 layer at (406,466) size 28x28
     399layer at (407,466) size 28x28
    400400  RenderBlock (positioned) {mfrac} at (0,0) size 28x28
    401401    RenderBlock {mfrac} at (2,0) size 22x12
  • trunk/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.checksum

    r82777 r82786  
    1 c52ca74c7fa87ac83a6366bab4f32470
     117fe1b6f3126d973853f75da930caf60
  • trunk/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt

    r82777 r82786  
    3333          RenderBlock {math} at (27,0) size 33x34
    3434            RenderBlock {mfrac} at (1,0) size 31x34
    35               RenderBlock {mfrac} at (0,0) size 22x16
     35              RenderBlock {mfrac} at (0,0) size 31x16
    3636                RenderBlock {mrow} at (3,0) size 25x16
    3737                  RenderInline {mi} at (0,0) size 7x16
     
    4545                    RenderText {#text} at (17,0) size 8x16
    4646                      text run at (17,0) width 8: "1"
    47               RenderBlock {mfrac} at (0,16) size 22x18
    48                 RenderInline {mn} at (0,0) size 8x16
    49                   RenderText {#text} at (7,2) size 8x16
    50                     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"
    5151          RenderText {#text} at (0,0) size 0x0
    5252        RenderBlock {p} at (0,97) size 784x34
     
    6262                  text run at (0,0) width 9: "+"
    6363            RenderBlock {mfrac} at (18,0) size 31x34
    64               RenderBlock {mfrac} at (0,0) size 22x16
     64              RenderBlock {mfrac} at (0,0) size 31x16
    6565                RenderBlock {mrow} at (3,0) size 25x16
    6666                  RenderInline {mi} at (0,0) size 7x16
     
    7474                    RenderText {#text} at (17,0) size 8x16
    7575                      text run at (17,0) width 8: "1"
    76               RenderBlock {mfrac} at (0,16) size 22x18
    77                 RenderInline {mn} at (0,0) size 8x16
    78                   RenderText {#text} at (7,2) size 8x16
    79                     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"
    8080          RenderText {#text} at (0,0) size 0x0
    8181      RenderBlock {div} at (0,235) size 784x274
     
    9696                  text run at (0,0) width 9: "+"
    9797            RenderBlock {mfrac} at (24,2) size 31x34
    98               RenderBlock {mfrac} at (0,0) size 22x16
     98              RenderBlock {mfrac} at (0,0) size 31x16
    9999                RenderBlock {mrow} at (3,0) size 25x16
    100100                  RenderInline {mi} at (0,0) size 7x16
     
    108108                    RenderText {#text} at (17,0) size 8x16
    109109                      text run at (17,0) width 8: "1"
    110               RenderBlock {mfrac} at (0,16) size 22x18
    111                 RenderInline {mn} at (0,0) size 8x16
    112                   RenderText {#text} at (7,2) size 8x16
    113                     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"
    114114            RenderBlock {mo} at (55,0) size 6x41
    115115          RenderText {#text} at (0,0) size 0x0
     
    132132                    text run at (4,3) width 5: "x"
    133133            RenderBlock {mfrac} at (27,10) size 54x70
    134               RenderBlock {mfrac} at (0,0) size 36x34
     134              RenderBlock {mfrac} at (0,0) size 54x34
    135135                RenderBlock {mrow} at (3,0) size 48x34
    136136                  RenderInline {mi} at (0,0) size 7x16
     
    142142                        text run at (0,0) width 9: "+"
    143143                  RenderBlock {mfrac} at (17,0) size 31x34
    144                     RenderBlock {mfrac} at (0,0) size 22x16
     144                    RenderBlock {mfrac} at (0,0) size 31x16
    145145                      RenderBlock {mrow} at (3,0) size 25x16
    146146                        RenderInline {mi} at (0,0) size 7x16
     
    154154                          RenderText {#text} at (17,0) size 8x16
    155155                            text run at (17,0) width 8: "1"
    156                     RenderBlock {mfrac} at (0,16) size 22x18
    157                       RenderInline {mn} at (0,0) size 8x16
    158                         RenderText {#text} at (7,2) size 8x16
    159                           text run at (7,2) width 8: "2"
    160               RenderBlock {mfrac} at (0,34) size 36x36
     156                    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
    161161                RenderBlock {mrow} at (3,2) size 48x34
    162162                  RenderInline {mi} at (0,0) size 7x16
     
    168168                        text run at (0,0) width 9: "+"
    169169                  RenderBlock {mfrac} at (17,0) size 31x34
    170                     RenderBlock {mfrac} at (0,0) size 22x16
     170                    RenderBlock {mfrac} at (0,0) size 31x16
    171171                      RenderBlock {mrow} at (3,0) size 25x16
    172172                        RenderInline {mi} at (0,0) size 7x16
     
    180180                          RenderText {#text} at (17,0) size 8x16
    181181                            text run at (17,0) width 8: "1"
    182                     RenderBlock {mfrac} at (0,16) size 22x18
    183                       RenderInline {mn} at (0,0) size 8x16
    184                         RenderText {#text} at (7,2) size 8x16
    185                           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"
    186186            RenderBlock {mo} at (81,0) size 6x85
    187187          RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/mathml/presentation/subsup-expected.checksum

    r82777 r82786  
    1 54a5e9344659080a400249156d0b12e8
     17ed1a1e531a2bbb4c8610fa64a699410
  • trunk/LayoutTests/platform/mac/mathml/presentation/subsup-expected.txt

    r82777 r82786  
    3333                  text run at (0,8) width 9: "Z"
    3434            RenderBlock {msubsup} at (10,0) size 32x32
    35               RenderBlock {msubsup} at (0,0) size 18x16
     35              RenderBlock {msubsup} at (0,0) size 32x16
    3636                RenderInline {mi} at (0,0) size 3x12
    3737                  RenderText {#text} at (0,3) size 3x12
    3838                    text run at (0,3) width 3: "j"
    39               RenderBlock {msubsup} at (0,16) size 18x16
     39              RenderBlock {msubsup} at (0,16) size 32x16
    4040                RenderBlock {mrow} at (1,3) size 31x12
    4141                  RenderInline {mi} at (0,0) size 5x12
     
    6767                  text run at (0,8) width 9: "Z"
    6868            RenderBlock {msubsup} at (10,0) size 17x32
    69               RenderBlock {msubsup} at (0,0) size 10x16
     69              RenderBlock {msubsup} at (0,0) size 17x16
    7070                RenderBlock {mrow} at (1,3) size 16x12
    7171                  RenderInline {mi} at (0,0) size 5x12
     
    7979                    RenderText {#text} at (13,0) size 3x12
    8080                      text run at (13,0) width 3: "j"
    81               RenderBlock {msubsup} at (0,16) size 10x16
     81              RenderBlock {msubsup} at (0,16) size 17x16
    8282                RenderInline {mi} at (0,0) size 5x12
    8383                  RenderText {#text} at (0,3) size 5x12
     
    9494                  text run at (0,8) width 9: "Z"
    9595            RenderBlock {msubsup} at (10,0) size 32x32
    96               RenderBlock {msubsup} at (0,0) size 18x16
     96              RenderBlock {msubsup} at (0,0) size 32x16
    9797                RenderBlock {mrow} at (0,3) size 16x12
    9898                  RenderInline {mi} at (0,0) size 5x12
     
    106106                    RenderText {#text} at (13,0) size 3x12
    107107                      text run at (13,0) width 3: "j"
    108               RenderBlock {msubsup} at (0,16) size 18x16
     108              RenderBlock {msubsup} at (0,16) size 32x16
    109109                RenderBlock {mrow} at (1,3) size 31x12
    110110                  RenderInline {mi} at (0,0) size 5x12
  • trunk/Source/WebCore/ChangeLog

    r82783 r82786  
     12011-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
    1152011-04-02  Dan Bernstein  <mitz@apple.com>
    216
  • trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

    r82777 r82786  
    455455            if (!r->m_object->isRenderInline()) {
    456456                RenderBox* renderBox = toRenderBox(r->m_object);
    457                 renderBox->computeLogicalWidth();
    458457                r->m_box->setLogicalWidth(logicalWidthForChild(renderBox));
    459458                totalLogicalWidth += marginStartForChild(renderBox) + marginEndForChild(renderBox);
Note: See TracChangeset for help on using the changeset viewer.