Changeset 86028 in webkit


Ignore:
Timestamp:
May 8, 2011 9:27:31 AM (13 years ago)
Author:
mitz@apple.com
Message:

<rdar://problem/9401853> REGRESSION (r78846): Insufficient expansion for justification when there are multiple inline boxes
https://bugs.webkit.org/show_bug.cgi?id=60432

Reviewed by Darin Adler.

Source/WebCore:

  • rendering/InlineTextBox.h:

(WebCore::InlineTextBox::setExpansion): Changed back to take a int, since the m_expansion member
variable is a (truncated) int anyway.

  • rendering/RenderBlockLineLayout.cpp:

(WebCore::computeExpansionForJustifiedText): Changed the expansion local variable into an int
so that the right amount is added to the total width. Also changed to use an early return.

LayoutTests:

  • fast/text/justify-nbsp-expected.png:
  • fast/text/justify-nbsp-expected.txt:
  • platform/mac-snowleopard/fast/text/justify-ideograph-leading-expansion-expected.txt:
  • platform/mac/css1/box_properties/clear_float-expected.png:
  • platform/mac/css1/box_properties/clear_float-expected.txt:
  • platform/mac/css1/box_properties/float_on_text_elements-expected.txt:
  • platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.png:
  • platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt:
  • platform/mac/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png:
  • platform/mac/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt:
  • platform/mac/css2.1/t1602-c546-txt-align-00-b-expected.png:
  • platform/mac/css2.1/t1602-c546-txt-align-00-b-expected.txt:
  • platform/mac/fast/multicol/float-avoidance-expected.png:
  • platform/mac/fast/multicol/float-avoidance-expected.txt:
  • platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.png:
  • platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.txt:
  • platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.png:
  • platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.txt:
  • platform/mac/fast/repaint/line-flow-with-floats-1-expected.png:
  • platform/mac/fast/repaint/line-flow-with-floats-1-expected.txt:
  • platform/mac/fast/repaint/line-flow-with-floats-10-expected.png:
  • platform/mac/fast/repaint/line-flow-with-floats-10-expected.txt:
  • platform/mac/fast/repaint/line-flow-with-floats-2-expected.png:
  • platform/mac/fast/repaint/line-flow-with-floats-2-expected.txt:
  • platform/mac/fast/repaint/line-flow-with-floats-3-expected.png:
  • platform/mac/fast/repaint/line-flow-with-floats-3-expected.txt:
  • platform/mac/fast/repaint/line-flow-with-floats-4-expected.png:
  • platform/mac/fast/repaint/line-flow-with-floats-4-expected.txt:
  • platform/mac/fast/repaint/line-flow-with-floats-5-expected.png:
  • platform/mac/fast/repaint/line-flow-with-floats-5-expected.txt:
  • platform/mac/fast/repaint/line-flow-with-floats-6-expected.png:
  • platform/mac/fast/repaint/line-flow-with-floats-6-expected.txt:
  • platform/mac/fast/repaint/line-flow-with-floats-7-expected.png:
  • platform/mac/fast/repaint/line-flow-with-floats-7-expected.txt:
  • platform/mac/fast/repaint/line-flow-with-floats-8-expected.png:
  • platform/mac/fast/repaint/line-flow-with-floats-8-expected.txt:
  • platform/mac/fast/repaint/line-flow-with-floats-9-expected.png:
  • platform/mac/fast/repaint/line-flow-with-floats-9-expected.txt:
  • platform/mac/fast/text/hyphenate-character-expected.png:
  • platform/mac/fast/text/hyphenate-character-expected.txt:
  • platform/mac/fast/text/hyphens-expected.png:
  • platform/mac/fast/text/hyphens-expected.txt:
  • platform/mac/fast/text/justified-selection-at-edge-expected.png:
  • platform/mac/fast/text/justified-selection-at-edge-expected.txt:
  • platform/mac/fast/text/justify-ideograph-leading-expansion-expected.png:
  • platform/mac/svg/custom/svg-fonts-in-html-expected.png:
  • platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
  • platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.png:
  • platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.txt:
  • platform/mac/tables/mozilla/marvin/x_td_align_justify-expected.png:
  • platform/mac/tables/mozilla/marvin/x_td_align_justify-expected.txt:
  • platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.png:
  • platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.txt:
  • platform/mac/tables/mozilla/marvin/x_th_align_justify-expected.png:
  • platform/mac/tables/mozilla/marvin/x_th_align_justify-expected.txt:
  • platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.png:
  • platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.txt:
  • platform/mac/tables/mozilla/marvin/x_tr_align_justify-expected.png:
  • platform/mac/tables/mozilla/marvin/x_tr_align_justify-expected.txt:
Location:
trunk
Files:
63 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r86024 r86028  
     12011-05-08  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        <rdar://problem/9401853> REGRESSION (r78846): Insufficient expansion for justification when there are multiple inline boxes
     6        https://bugs.webkit.org/show_bug.cgi?id=60432
     7
     8        * fast/text/justify-nbsp-expected.png:
     9        * fast/text/justify-nbsp-expected.txt:
     10        * platform/mac-snowleopard/fast/text/justify-ideograph-leading-expansion-expected.txt:
     11        * platform/mac/css1/box_properties/clear_float-expected.png:
     12        * platform/mac/css1/box_properties/clear_float-expected.txt:
     13        * platform/mac/css1/box_properties/float_on_text_elements-expected.txt:
     14        * platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.png:
     15        * platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt:
     16        * platform/mac/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png:
     17        * platform/mac/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt:
     18        * platform/mac/css2.1/t1602-c546-txt-align-00-b-expected.png:
     19        * platform/mac/css2.1/t1602-c546-txt-align-00-b-expected.txt:
     20        * platform/mac/fast/multicol/float-avoidance-expected.png:
     21        * platform/mac/fast/multicol/float-avoidance-expected.txt:
     22        * platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.png:
     23        * platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.txt:
     24        * platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.png:
     25        * platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.txt:
     26        * platform/mac/fast/repaint/line-flow-with-floats-1-expected.png:
     27        * platform/mac/fast/repaint/line-flow-with-floats-1-expected.txt:
     28        * platform/mac/fast/repaint/line-flow-with-floats-10-expected.png:
     29        * platform/mac/fast/repaint/line-flow-with-floats-10-expected.txt:
     30        * platform/mac/fast/repaint/line-flow-with-floats-2-expected.png:
     31        * platform/mac/fast/repaint/line-flow-with-floats-2-expected.txt:
     32        * platform/mac/fast/repaint/line-flow-with-floats-3-expected.png:
     33        * platform/mac/fast/repaint/line-flow-with-floats-3-expected.txt:
     34        * platform/mac/fast/repaint/line-flow-with-floats-4-expected.png:
     35        * platform/mac/fast/repaint/line-flow-with-floats-4-expected.txt:
     36        * platform/mac/fast/repaint/line-flow-with-floats-5-expected.png:
     37        * platform/mac/fast/repaint/line-flow-with-floats-5-expected.txt:
     38        * platform/mac/fast/repaint/line-flow-with-floats-6-expected.png:
     39        * platform/mac/fast/repaint/line-flow-with-floats-6-expected.txt:
     40        * platform/mac/fast/repaint/line-flow-with-floats-7-expected.png:
     41        * platform/mac/fast/repaint/line-flow-with-floats-7-expected.txt:
     42        * platform/mac/fast/repaint/line-flow-with-floats-8-expected.png:
     43        * platform/mac/fast/repaint/line-flow-with-floats-8-expected.txt:
     44        * platform/mac/fast/repaint/line-flow-with-floats-9-expected.png:
     45        * platform/mac/fast/repaint/line-flow-with-floats-9-expected.txt:
     46        * platform/mac/fast/text/hyphenate-character-expected.png:
     47        * platform/mac/fast/text/hyphenate-character-expected.txt:
     48        * platform/mac/fast/text/hyphens-expected.png:
     49        * platform/mac/fast/text/hyphens-expected.txt:
     50        * platform/mac/fast/text/justified-selection-at-edge-expected.png:
     51        * platform/mac/fast/text/justified-selection-at-edge-expected.txt:
     52        * platform/mac/fast/text/justify-ideograph-leading-expansion-expected.png:
     53        * platform/mac/svg/custom/svg-fonts-in-html-expected.png:
     54        * platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
     55        * platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.png:
     56        * platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.txt:
     57        * platform/mac/tables/mozilla/marvin/x_td_align_justify-expected.png:
     58        * platform/mac/tables/mozilla/marvin/x_td_align_justify-expected.txt:
     59        * platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.png:
     60        * platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.txt:
     61        * platform/mac/tables/mozilla/marvin/x_th_align_justify-expected.png:
     62        * platform/mac/tables/mozilla/marvin/x_th_align_justify-expected.txt:
     63        * platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.png:
     64        * platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.txt:
     65        * platform/mac/tables/mozilla/marvin/x_tr_align_justify-expected.png:
     66        * platform/mac/tables/mozilla/marvin/x_tr_align_justify-expected.txt:
     67
    1682011-05-07  Dan Bernstein  <mitz@apple.com>
    269
  • trunk/LayoutTests/fast/text/justify-nbsp-expected.txt

    r78913 r86028  
    88          RenderText {#text} at (3,15) size 357x25
    99            text run at (3,15) width 357: "a b c d "
    10         RenderText {#text} at (360,15) size 649x75
    11           text run at (360,15) width 292: "e f g h"
     10        RenderText {#text} at (360,15) size 650x75
     11          text run at (360,15) width 293: "e f g h"
    1212          text run at (3,65) width 300: "xxxxxxxxxxx "
    1313        RenderBR {BR} at (0,0) size 0x0
     
    1515          RenderText {#text} at (3,115) size 357x25
    1616            text run at (3,115) width 357: "a b c d "
    17         RenderText {#text} at (360,115) size 649x75
    18           text run at (360,115) width 292: "e f g h"
     17        RenderText {#text} at (360,115) size 650x75
     18          text run at (360,115) width 293: "e f g h"
    1919          text run at (3,165) width 275: "xxxxxxxxxxx"
  • trunk/LayoutTests/platform/mac-snowleopard/fast/text/justify-ideograph-leading-expansion-expected.txt

    r82026 r86028  
    1111            RenderText {#text} at (68,6) size 5x17
    1212              text run at (68,6) width 5: "i"
    13           RenderText {#text} at (73,6) size 99x41
    14             text run at (73,6) width 29: "\x{306F}"
     13          RenderText {#text} at (73,6) size 100x41
     14            text run at (73,6) width 30: "\x{306F}"
    1515            text run at (3,30) width 63: "xxxxxxx"
    1616        RenderBlock {DIV} at (0,62) size 106x54 [border: (3px solid #000000)]
     
    2929            RenderText {#text} at (68,6) size 5x17
    3030              text run at (68,6) width 5: "i"
    31           RenderText {#text} at (73,6) size 99x41
    32             text run at (73,6) width 29: "\x{306F}"
     31          RenderText {#text} at (73,6) size 100x41
     32            text run at (73,6) width 30: "\x{306F}"
    3333            text run at (3,30) width 63: "xxxxxxx"
    3434        RenderBlock {DIV} at (0,62) size 106x54 [border: (3px solid #000000)]
  • trunk/LayoutTests/platform/mac/css1/box_properties/clear_float-expected.txt

    r78910 r86028  
    7676            text run at (0,0) width 497: "This page has two floating \"menus\" on the side; one has a green background,"
    7777            text run at (0,18) width 231: "and the other a blue background. "
    78             text run at (231,18) width 265: "Due to settings on the 'float' and 'clear'"
     78            text run at (231,18) width 266: "Due to settings on the 'float' and 'clear'"
    7979            text run at (0,36) width 497: "properties, the two menus should appear on the left side of the page, the blue"
    8080            text run at (0,54) width 497: "below the green. There should be a 10px gap between the two menus. There"
     
    147147                    text run at (0,18) width 283: "side; one has a green background, and the"
    148148                    text run at (0,36) width 165: "other a blue background. "
    149                     text run at (165,36) width 117: "Due to settings on"
     149                    text run at (165,36) width 118: "Due to settings on"
    150150                    text run at (0,54) width 283: "the 'float' and 'clear' properties, the two"
    151151                    text run at (0,72) width 283: "menus should appear on the left side of the"
  • trunk/LayoutTests/platform/mac/css1/box_properties/float_on_text_elements-expected.txt

    r78910 r86028  
    8989          text run at (193,36) width 220: "The content of this element should"
    9090          text run at (0,54) width 219: "flow around the floated element. "
    91           text run at (219,54) width 193: "However, the floated element"
     91          text run at (219,54) width 194: "However, the floated element"
    9292          text run at (0,72) width 413: "may or may not be obscured by the blue background of this"
    9393          text run at (0,90) width 413: "element, as the specification does not say which is drawn \"on"
    9494          text run at (0,108) width 37: "top.\" "
    95           text run at (37,108) width 375: "Even if the floated element is obscured, it still forces the"
     95          text run at (37,108) width 376: "Even if the floated element is obscured, it still forces the"
    9696          text run at (0,126) width 263: "content of this element to flow around it. "
    97           text run at (263,126) width 149: "If the floated element is"
     97          text run at (263,126) width 150: "If the floated element is"
    9898          text run at (0,144) width 413: "not obscured, then the blue rectangle of this paragraph should"
    9999          text run at (0,162) width 413: "extend 10px above and to the right of the sidebar's red border,"
     
    157157            text run at (0,18) width 422: "background of the DIV element is blue and its width is 75%. This"
    158158            text run at (0,36) width 364: "text should all be inside the blue rectangle. The blue DIV "
    159             text run at (364,36) width 211: "element has another DIV element"
     159            text run at (364,36) width 212: "element has another DIV element"
    160160            text run at (0,54) width 166: "as a child. It has a yellow "
    161161            text run at (166,54) width 361: "background color and is floated to the right. Since it is a "
    162             text run at (527,54) width 48: "child of"
     162            text run at (527,54) width 49: "child of"
    163163            text run at (0,72) width 374: "the blue DIV, the yellow DIV should appear inside the "
    164164            text run at (374,72) width 202: "blue rectangle. Due to it being"
    165165            text run at (0,90) width 193: "floated to the right and having "
    166             text run at (193,90) width 382: "a 10px right margin, the yellow rectange should have a 10px"
     166            text run at (193,90) width 383: "a 10px right margin, the yellow rectange should have a 10px"
    167167            text run at (0,108) width 31: "blue "
    168168            text run at (31,108) width 138: "stripe on its right side."
     
    243243                  text run at (48,0) width 699: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph, as"
    244244                  text run at (48,18) width 513: "well as bold, with a content width of 1.5em and a background-color of silver. "
    245                   text run at (561,18) width 185: "The top of the big letter \"T\""
     245                  text run at (561,18) width 186: "The top of the big letter \"T\""
    246246                  text run at (48,36) width 699: "should be vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-"
    247247                  text run at (0,54) width 33: "cap\"."
     
    266266                  text run at (0,18) width 391: "textual content of the paragraph should appear on the left side"
    267267                  text run at (0,36) width 260: "of the yellow \"sidebar\" on the right. "
    268                   text run at (260,36) width 130: "The content of this"
     268                  text run at (260,36) width 131: "The content of this"
    269269                  text run at (0,54) width 328: "element should flow around the floated element. "
    270270                  text run at (328,54) width 63: "However,"
     
    272272                  text run at (0,90) width 391: "background of this element, as the specification does not say"
    273273                  text run at (0,108) width 185: "which is drawn \"on top.\" "
    274                   text run at (185,108) width 205: "Even if the floated element is"
     274                  text run at (185,108) width 206: "Even if the floated element is"
    275275                  text run at (0,126) width 391: "obscured, it still forces the content of this element to flow"
    276276                  text run at (0,144) width 65: "around it. "
    277                   text run at (65,144) width 325: "If the floated element is not obscured, then the blue"
     277                  text run at (65,144) width 326: "If the floated element is not obscured, then the blue"
    278278                  text run at (0,162) width 391: "rectangle of this paragraph should extend 10px above and to"
    279279                  text run at (0,180) width 391: "the right of the sidebar's red border, due to the margin styles"
     
    339339                    text run at (0,36) width 32: "This "
    340340                    text run at (32,36) width 368: "text should all be inside the blue rectangle. The blue DIV "
    341                     text run at (400,36) width 159: "element has another DIV"
     341                    text run at (400,36) width 160: "element has another DIV"
    342342                    text run at (0,54) width 217: "element as a child. It has a yellow "
    343                     text run at (217,54) width 342: "background color and is floated to the right. Since it is"
     343                    text run at (217,54) width 343: "background color and is floated to the right. Since it is"
    344344                    text run at (0,72) width 11: "a "
    345345                    text run at (11,72) width 408: "child of the blue DIV, the yellow DIV should appear inside the "
    346                     text run at (419,72) width 140: "blue rectangle. Due to"
     346                    text run at (419,72) width 141: "blue rectangle. Due to"
    347347                    text run at (0,90) width 252: "it being floated to the right and having "
    348348                    text run at (252,90) width 308: "a 10px right margin, the yellow rectange should"
  • trunk/LayoutTests/platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt

    r85011 r86028  
    1212              text run at (94,18) width 200: "tightly squeezed in between the"
    1313              text run at (0,36) width 193: "edge of the teal box and the "
    14               text run at (193,36) width 100: "outside edge of"
     14              text run at (193,36) width 101: "outside edge of"
    1515              text run at (0,57) width 113: "the blue block. \x{21E8}"
    1616        RenderBlock {P} at (0,0) size 588x258
     
    1818            text run at (0,0) width 277: "Inside this blue block on the right there"
    1919            text run at (0,21) width 159: "should be a teal box. \x{21E8} "
    20           RenderInline {SPAN} at (0,0) size 587x237 [color=#000080]
    21             RenderText {#text} at (159,21) size 587x237
    22               text run at (159,21) width 117: "FAIL FAIL FAIL"
     20          RenderInline {SPAN} at (0,0) size 588x237 [color=#000080]
     21            RenderText {#text} at (159,21) size 588x237
     22              text run at (159,21) width 118: "FAIL FAIL FAIL"
    2323              text run at (0,42) width 277: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
    2424              text run at (0,60) width 80: "FAIL FAIL "
    25               text run at (80,60) width 196: "FAIL FAIL FAIL FAIL FAIL"
     25              text run at (80,60) width 197: "FAIL FAIL FAIL FAIL FAIL"
    2626              text run at (0,78) width 297: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
    27               text run at (297,78) width 290: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
     27              text run at (297,78) width 291: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
    2828              text run at (0,96) width 212: "FAIL FAIL FAIL FAIL FAIL "
    29               text run at (212,96) width 375: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
     29              text run at (212,96) width 376: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
    3030              text run at (0,114) width 127: "FAIL FAIL FAIL "
    31               text run at (127,114) width 460: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
     31              text run at (127,114) width 461: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
    3232              text run at (0,132) width 42: "FAIL "
    33               text run at (42,132) width 509: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
    34               text run at (551,132) width 36: "FAIL"
     33              text run at (42,132) width 510: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
     34              text run at (552,132) width 36: "FAIL"
    3535              text run at (0,150) width 467: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
    36               text run at (467,150) width 120: "FAIL FAIL FAIL"
     36              text run at (467,150) width 121: "FAIL FAIL FAIL"
    3737              text run at (0,168) width 382: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
    38               text run at (382,168) width 205: "FAIL FAIL FAIL FAIL FAIL"
     38              text run at (382,168) width 206: "FAIL FAIL FAIL FAIL FAIL"
    3939              text run at (0,186) width 297: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
    40               text run at (297,186) width 290: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
     40              text run at (297,186) width 291: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
    4141              text run at (0,204) width 212: "FAIL FAIL FAIL FAIL FAIL "
    42               text run at (212,204) width 375: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
     42              text run at (212,204) width 376: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
    4343              text run at (0,222) width 127: "FAIL FAIL FAIL "
    44               text run at (127,222) width 460: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
     44              text run at (127,222) width 461: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
    4545              text run at (0,240) width 40: "FAIL "
    4646              text run at (40,240) width 476: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
  • trunk/LayoutTests/platform/mac/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt

    r78910 r86028  
    1414          text run at (0,0) width 384: "ignore this float text ignore this float text ignore this"
    1515          text run at (0,18) width 42: "float "
    16           text run at (42,18) width 341: "text ignore this float text ignore this float text"
     16          text run at (42,18) width 342: "text ignore this float text ignore this float text"
    1717          text run at (0,36) width 78: "ignore this "
    18           text run at (78,36) width 305: "float text ignore this float text ignore this"
     18          text run at (78,36) width 306: "float text ignore this float text ignore this"
    1919          text run at (0,54) width 125: "float text ignore "
    20           text run at (125,54) width 258: "this float text ignore this float text"
     20          text run at (125,54) width 259: "this float text ignore this float text"
    2121          text run at (0,72) width 155: "ignore this float text "
    22           text run at (155,72) width 228: "ignore this float text ignore this"
     22          text run at (155,72) width 229: "ignore this float text ignore this"
    2323          text run at (0,90) width 198: "float text ignore this float "
    24           text run at (198,90) width 185: "text ignore this float text"
     24          text run at (198,90) width 186: "text ignore this float text"
    2525          text run at (0,108) width 234: "ignore this float text ignore this "
    26           text run at (234,108) width 149: "float text ignore this"
     26          text run at (234,108) width 150: "float text ignore this"
    2727          text run at (0,126) width 281: "float text ignore this float text ignore "
    28           text run at (281,126) width 102: "this float text"
     28          text run at (281,126) width 103: "this float text"
    2929          text run at (0,144) width 311: "ignore this float text ignore this float text "
    30           text run at (311,144) width 72: "ignore this"
     30          text run at (311,144) width 73: "ignore this"
    3131          text run at (0,162) width 355: "float text ignore this float text ignore this float "
    3232          text run at (355,162) width 29: "text"
     
    3434          text run at (0,198) width 384: "float text ignore this float text ignore this float text"
    3535          text run at (0,216) width 47: "ignore "
    36           text run at (47,216) width 336: "this float text ignore this float text ignore this"
     36          text run at (47,216) width 337: "this float text ignore this float text ignore this"
    3737          text run at (0,234) width 77: "float text "
    38           text run at (77,234) width 306: "ignore this float text ignore this float text"
     38          text run at (77,234) width 307: "ignore this float text ignore this float text"
    3939          text run at (0,252) width 120: "ignore this float "
    40           text run at (120,252) width 263: "text ignore this float text ignore this"
     40          text run at (120,252) width 264: "text ignore this float text ignore this"
    4141          text run at (0,270) width 156: "float text ignore this "
    42           text run at (156,270) width 227: "float text ignore this float text"
     42          text run at (156,270) width 228: "float text ignore this float text"
    4343          text run at (0,288) width 203: "ignore this float text ignore "
    44           text run at (203,288) width 180: "this float text ignore this"
     44          text run at (203,288) width 181: "this float text ignore this"
    4545          text run at (0,306) width 233: "float text ignore this float text "
    46           text run at (233,306) width 150: "ignore this float text"
     46          text run at (233,306) width 151: "ignore this float text"
    4747          text run at (0,324) width 259: "ignore this float text ignore this float"
    4848      RenderBlock {DIV} at (0,154) size 769x468 [color=#C0C0C0]
     
    5050          text run at (384,0) width 385: "this is some dummy text this is some dummy text this is some"
    5151          text run at (384,18) width 54: "dummy "
    52           text run at (438,18) width 330: "text this is some dummy text this is some dummy"
     52          text run at (438,18) width 331: "text this is some dummy text this is some dummy"
    5353          text run at (384,36) width 107: "text this is some "
    54           text run at (491,36) width 277: "dummy text this is some dummy text this is"
     54          text run at (491,36) width 278: "dummy text this is some dummy text this is"
    5555          text run at (384,54) width 176: "some dummy text this is "
    5656          text run at (560,54) width 209: "some dummy text this is some"
    5757          text run at (384,72) width 252: "dummy text this is some dummy text "
    58           text run at (636,72) width 132: "this is some dummy"
     58          text run at (636,72) width 133: "this is some dummy"
    5959          text run at (384,90) width 320: "text this is some dummy text this is some dummy "
    60           text run at (704,90) width 64: "text this is"
     60          text run at (704,90) width 65: "text this is"
    6161          text run at (384,108) width 385: "some dummy text this is some dummy text this is some"
    6262          text run at (384,126) width 385: "dummy text this is some dummy text this is some dummy"
    6363          text run at (384,144) width 69: "text this is "
    64           text run at (453,144) width 315: "some dummy text this is some dummy text this is"
     64          text run at (453,144) width 316: "some dummy text this is some dummy text this is"
    6565          text run at (384,162) width 128: "some dummy text "
    6666          text run at (512,162) width 257: "this is some dummy text this is some"
     
    6868          text run at (607,180) width 162: "text this is some dummy"
    6969          text run at (384,198) width 267: "text this is some dummy text this is some "
    70           text run at (651,198) width 117: "dummy text this is"
     70          text run at (651,198) width 118: "dummy text this is"
    7171          text run at (384,216) width 352: "some dummy text this is some dummy text this is "
    7272          text run at (736,216) width 33: "some"
    7373          text run at (384,234) width 385: "dummy text this is some dummy text this is some dummy"
    7474          text run at (384,252) width 27: "text "
    75           text run at (411,252) width 357: "this is some dummy text this is some dummy text this is"
     75          text run at (411,252) width 358: "this is some dummy text this is some dummy text this is"
    7676          text run at (384,270) width 97: "some dummy "
    7777          text run at (481,270) width 288: "text this is some dummy text this is some"
    7878          text run at (384,288) width 168: "dummy text this is some "
    79           text run at (552,288) width 216: "dummy text this is some dummy"
     79          text run at (552,288) width 217: "dummy text this is some dummy"
    8080          text run at (384,306) width 229: "text this is some dummy text this is "
    81           text run at (613,306) width 155: "some dummy text this is"
     81          text run at (613,306) width 156: "some dummy text this is"
    8282          text run at (384,324) width 304: "some dummy text this is some dummy text "
    8383          text run at (688,324) width 81: "this is some"
    8484          text run at (0,342) width 378: "dummy text this is some dummy text this is some dummy "
    85           text run at (378,342) width 390: "text this is some dummy text this is some dummy text this is"
     85          text run at (378,342) width 391: "text this is some dummy text this is some dummy text this is"
    8686          text run at (0,360) width 37: "some "
    8787          text run at (37,360) width 435: "dummy text this is some dummy text this is some dummy text this is "
    88           text run at (472,360) width 296: "some dummy text this is some dummy text this"
     88          text run at (472,360) width 297: "some dummy text this is some dummy text this"
    8989          text run at (0,378) width 133: "is some dummy text "
    9090          text run at (133,378) width 452: "this is some dummy text this is some dummy text this is some dummy "
    91           text run at (585,378) width 183: "text this is some dummy text"
     91          text run at (585,378) width 184: "text this is some dummy text"
    9292          text run at (0,396) width 239: "this is some dummy text this is some "
    93           text run at (239,396) width 443: "dummy text this is some dummy text this is some dummy text this is "
    94           text run at (682,396) width 85: "some dummy"
     93          text run at (239,396) width 444: "dummy text this is some dummy text this is some dummy text this is "
     94          text run at (683,396) width 86: "some dummy"
    9595          text run at (0,414) width 360: "text this is some dummy text this is some dummy text "
    96           text run at (360,414) width 408: "this is some dummy text this is some dummy text this is some"
     96          text run at (360,414) width 409: "this is some dummy text this is some dummy text this is some"
    9797          text run at (0,432) width 53: "dummy "
    9898          text run at (53,432) width 434: "text this is some dummy text this is some dummy text this is some "
    99           text run at (487,432) width 281: "dummy text this is some dummy text this is"
     99          text run at (487,432) width 282: "dummy text this is some dummy text this is"
    100100          text run at (0,450) width 156: "some dummy text this is "
    101101          text run at (156,450) width 268: "some dummy text this is some dummy text"
  • trunk/LayoutTests/platform/mac/css2.1/t1602-c546-txt-align-00-b-expected.txt

    r78910 r86028  
    1919        RenderInline {SPAN} at (0,0) size 784x252 [color=#C0C0C0]
    2020          RenderText {#text} at (496,0) size 784x252
    21             text run at (496,0) width 286: "This is just lovely dummy text. Dummy text."
     21            text run at (496,0) width 288: "This is just lovely dummy text. Dummy text."
    2222            text run at (0,18) width 56: "Dummy "
    23             text run at (56,18) width 528: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
    24             text run at (584,18) width 198: "This is just lovely dummy text."
     23            text run at (56,18) width 529: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
     24            text run at (585,18) width 199: "This is just lovely dummy text."
    2525            text run at (0,36) width 349: "This is just lovely dummy text. Dummy text. Dummy "
    26             text run at (349,36) width 434: "text. This is just lovely dummy text. This is just lovely dummy text."
     26            text run at (349,36) width 435: "text. This is just lovely dummy text. This is just lovely dummy text."
    2727            text run at (0,54) width 88: "Dummy text. "
    2828            text run at (88,54) width 550: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
    29             text run at (638,54) width 145: "text. This is just lovely"
     29            text run at (638,54) width 146: "text. This is just lovely"
    3030            text run at (0,72) width 379: "dummy text. This is just lovely dummy text. Dummy text. "
    31             text run at (379,72) width 404: "This is just lovely dummy text. This is just lovely dummy text."
     31            text run at (379,72) width 405: "This is just lovely dummy text. This is just lovely dummy text."
    3232            text run at (0,90) width 145: "Dummy text. Dummy "
    3333            text run at (145,90) width 525: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
    34             text run at (670,90) width 113: "This is just lovely"
     34            text run at (670,90) width 114: "This is just lovely"
    3535            text run at (0,108) width 434: "dummy text. This is just lovely dummy text. Dummy text. Dummy "
    36             text run at (434,108) width 349: "text. This is just lovely dummy text. This is just lovely"
     36            text run at (434,108) width 350: "text. This is just lovely dummy text. This is just lovely"
    3737            text run at (0,126) width 170: "dummy text. Dummy text. "
    3838            text run at (170,126) width 540: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
    39             text run at (710,126) width 73: "text. This is"
     39            text run at (710,126) width 74: "text. This is"
    4040            text run at (0,144) width 458: "just lovely dummy text. This is just lovely dummy text. Dummy text. "
    41             text run at (458,144) width 325: "This is just lovely dummy text. This is just lovely"
     41            text run at (458,144) width 326: "This is just lovely dummy text. This is just lovely"
    4242            text run at (0,162) width 226: "dummy text. Dummy text. Dummy "
    4343            text run at (226,162) width 515: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
    44             text run at (741,162) width 42: "This is"
     44            text run at (741,162) width 43: "This is"
    4545            text run at (0,180) width 505: "just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
    46             text run at (505,180) width 278: "text. This is just lovely dummy text. This is"
     46            text run at (505,180) width 279: "text. This is just lovely dummy text. This is"
    4747            text run at (0,198) width 242: "just lovely dummy text. Dummy text. "
    4848            text run at (242,198) width 542: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy"
    4949            text run at (0,216) width 516: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
    50             text run at (516,216) width 267: "This is just lovely dummy text. This is just"
     50            text run at (516,216) width 268: "This is just lovely dummy text. This is just"
    5151            text run at (0,234) width 269: "lovely dummy text. Dummy text. Dummy "
    5252            text run at (269,234) width 118: "text. Dummy text. "
  • trunk/LayoutTests/platform/mac/fast/multicol/float-avoidance-expected.txt

    r78906 r86028  
    1111        text run at (0,0) width 415: "This technology preview of our award winning next generation"
    1212        text run at (0,18) width 56: "browser "
    13         text run at (56,18) width 358: "is a sign of things to come from Mozilla. Powerful yet"
     13        text run at (56,18) width 359: "is a sign of things to come from Mozilla. Powerful yet"
    1414        text run at (0,36) width 122: "easy to use. This "
    15         text run at (122,36) width 292: "maintenance release provides a few updates"
     15        text run at (122,36) width 293: "maintenance release provides a few updates"
    1616        text run at (0,54) width 246: "based on user feedback - including "
    17         text run at (246,54) width 168: "changes to the Extension"
     17        text run at (246,54) width 169: "changes to the Extension"
    1818        text run at (0,72) width 201: "System and icon improvements."
  • trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.txt

    r78906 r86028  
    1111        text run at (0,0) width 415: "This technology preview of our award winning next generation"
    1212        text run at (18,0) width 56: "browser "
    13         text run at (18,56) width 358: "is a sign of things to come from Mozilla. Powerful yet"
     13        text run at (18,56) width 359: "is a sign of things to come from Mozilla. Powerful yet"
    1414        text run at (36,0) width 122: "easy to use. This "
    15         text run at (36,122) width 292: "maintenance release provides a few updates"
     15        text run at (36,122) width 293: "maintenance release provides a few updates"
    1616        text run at (54,0) width 246: "based on user feedback - including "
    17         text run at (54,246) width 168: "changes to the Extension"
     17        text run at (54,246) width 169: "changes to the Extension"
    1818        text run at (72,0) width 201: "System and icon improvements."
  • trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.txt

    r78906 r86028  
    1111        text run at (0,0) width 415: "This technology preview of our award winning next generation"
    1212        text run at (18,0) width 56: "browser "
    13         text run at (18,56) width 358: "is a sign of things to come from Mozilla. Powerful yet"
     13        text run at (18,56) width 359: "is a sign of things to come from Mozilla. Powerful yet"
    1414        text run at (36,0) width 122: "easy to use. This "
    15         text run at (36,122) width 292: "maintenance release provides a few updates"
     15        text run at (36,122) width 293: "maintenance release provides a few updates"
    1616        text run at (54,0) width 246: "based on user feedback - including "
    17         text run at (54,246) width 168: "changes to the Extension"
     17        text run at (54,246) width 169: "changes to the Extension"
    1818        text run at (72,0) width 201: "System and icon improvements."
  • trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-1-expected.txt

    r78886 r86028  
    1616                  text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
    1717                  text run at (6,24) width 25: "her "
    18                   text run at (31,24) width 328: "flamingo: she succeeded in getting its body tucked"
     18                  text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
    1919                  text run at (6,42) width 42: "away, "
    20                   text run at (48,42) width 311: "comfortably enough, under her arm, with its legs"
     20                  text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
    2121                  text run at (6,60) width 106: "hanging down, "
    22                   text run at (112,60) width 247: "but generally, just as she had got its"
     22                  text run at (112,60) width 248: "but generally, just as she had got its"
    2323                  text run at (6,78) width 176: "neck nicely straightened "
    2424                  text run at (182,78) width 230: "out, and was going to give the"
     
    2727                  RenderText {#text} at (230,96) size 39x18
    2828                    text run at (230,96) width 39: "would"
    29                 RenderText {#text} at (269,96) size 405x72
    30                   text run at (269,96) width 142: " twist itself round and"
     29                RenderText {#text} at (269,96) size 406x72
     30                  text run at (269,96) width 143: " twist itself round and"
    3131                  text run at (6,114) width 175: "look up in her face, with "
    32                   text run at (181,114) width 230: "such a puzzled expression that she"
     32                  text run at (181,114) width 231: "such a puzzled expression that she"
    3333                  text run at (6,132) width 179: "could not help bursting out "
    34                   text run at (185,132) width 226: "laughing: and when she had got its"
     34                  text run at (185,132) width 227: "laughing: and when she had got its"
    3535                  text run at (6,150) width 229: "head down, and was going to "
    3636                RenderText {#text} at (235,150) size 406x126
    37                   text run at (235,150) width 176: "begin again, it was very"
     37                  text run at (235,150) width 177: "begin again, it was very"
    3838                  text run at (6,168) width 259: "provoking to find that the hedgehog had "
    39                   text run at (265,168) width 146: "unrolled itself, and was"
     39                  text run at (265,168) width 147: "unrolled itself, and was"
    4040                  text run at (6,186) width 252: "in the act of crawling away: besides all "
    41                   text run at (258,186) width 153: "this, there was generally"
     41                  text run at (258,186) width 154: "this, there was generally"
    4242                  text run at (6,204) width 256: "a ridge or furrow in the way wherever "
    43                   text run at (262,204) width 149: "she wanted to send the"
     43                  text run at (262,204) width 150: "she wanted to send the"
    4444                  text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
    45                   text run at (270,222) width 141: "soldiers were always"
     45                  text run at (270,222) width 142: "soldiers were always"
    4646                  text run at (6,240) width 292: "getting up and walking off to other parts of "
    4747                  text run at (298,240) width 114: "the ground, Alice"
     
    5555                  text run at (57,294) width 304: "The players all played at once without waiting"
    5656                RenderBlock (floating) {SPAN} at (364,297) size 48x80 [bgcolor=#90EE90]
    57                 RenderText {#text} at (57,312) size 354x36
     57                RenderText {#text} at (57,312) size 355x36
    5858                  text run at (57,312) width 63: "for turns, "
    59                   text run at (120,312) width 240: "quarrelling all the while, and fighting"
     59                  text run at (120,312) width 241: "quarrelling all the while, and fighting"
    6060                  text run at (6,330) width 172: "for the hedgehogs; and in "
    61                   text run at (178,330) width 115: "a very short time "
    62                 RenderInline {SPAN} at (0,0) size 66x18
    63                   RenderText {#text} at (293,330) size 66x18
    64                     text run at (293,330) width 66: "the Queen"
    65                 RenderText {#text} at (6,348) size 354x54
     61                  text run at (178,330) width 116: "a very short time "
     62                RenderInline {SPAN} at (0,0) size 67x18
     63                  RenderText {#text} at (294,330) size 67x18
     64                    text run at (294,330) width 67: "the Queen"
     65                RenderText {#text} at (6,348) size 355x54
    6666                  text run at (6,348) width 226: "was in a furious passion, and went "
    67                   text run at (232,348) width 128: "stamping about, and"
     67                  text run at (232,348) width 129: "stamping about, and"
    6868                  text run at (6,366) width 288: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
    69                   text run at (294,366) width 66: "her head!\x{2019}"
     69                  text run at (294,366) width 67: "her head!\x{2019}"
    7070                  text run at (6,384) width 151: "about once in a minute. "
    7171                RenderBR {BR} at (0,0) size 0x0
     
    7676                  text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
    7777                  text run at (6,456) width 75: "become of "
    78                   text run at (81,456) width 330: "me? They\x{2019}re dreadfully fond of beheading people"
     78                  text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
    7979                  text run at (6,474) width 93: "here; the great "
    8080                  text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
  • trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-10-expected.txt

    r78886 r86028  
    1616                  text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
    1717                  text run at (6,24) width 25: "her "
    18                   text run at (31,24) width 328: "flamingo: she succeeded in getting its body tucked"
     18                  text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
    1919                  text run at (6,42) width 42: "away, "
    20                   text run at (48,42) width 311: "comfortably enough, under her arm, with its legs"
     20                  text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
    2121                  text run at (6,60) width 106: "hanging down, "
    22                   text run at (112,60) width 247: "but generally, just as she had got its"
     22                  text run at (112,60) width 248: "but generally, just as she had got its"
    2323                  text run at (6,78) width 158: "neck nicely straightened "
    24                   text run at (164,78) width 195: "out, and was going to give the"
     24                  text run at (164,78) width 196: "out, and was going to give the"
    2525                  text run at (6,96) width 239: "hedgehog a blow with its head, it "
    2626                RenderInline {I} at (0,0) size 39x18
    2727                  RenderText {#text} at (245,96) size 39x18
    2828                    text run at (245,96) width 39: "would"
    29                 RenderText {#text} at (284,96) size 405x72
    30                   text run at (284,96) width 75: " twist itself"
     29                RenderText {#text} at (284,96) size 406x72
     30                  text run at (284,96) width 76: " twist itself"
    3131                  text run at (6,114) width 237: "round and look up in her face, with "
    32                   text run at (243,114) width 168: "such a puzzled expression"
     32                  text run at (243,114) width 169: "such a puzzled expression"
    3333                  text run at (6,132) width 227: "that she could not help bursting out "
    34                   text run at (233,132) width 178: "laughing: and when she had"
     34                  text run at (233,132) width 179: "laughing: and when she had"
    3535                  text run at (6,150) width 248: "got its head down, and was going to "
    3636                RenderText {#text} at (254,150) size 406x126
    3737                  text run at (254,150) width 158: "begin again, it was very"
    3838                  text run at (6,168) width 259: "provoking to find that the hedgehog had "
    39                   text run at (265,168) width 146: "unrolled itself, and was"
     39                  text run at (265,168) width 147: "unrolled itself, and was"
    4040                  text run at (6,186) width 252: "in the act of crawling away: besides all "
    41                   text run at (258,186) width 153: "this, there was generally"
     41                  text run at (258,186) width 154: "this, there was generally"
    4242                  text run at (6,204) width 256: "a ridge or furrow in the way wherever "
    43                   text run at (262,204) width 149: "she wanted to send the"
     43                  text run at (262,204) width 150: "she wanted to send the"
    4444                  text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
    45                   text run at (270,222) width 141: "soldiers were always"
     45                  text run at (270,222) width 142: "soldiers were always"
    4646                  text run at (6,240) width 292: "getting up and walking off to other parts of "
    4747                  text run at (298,240) width 114: "the ground, Alice"
     
    5555                  text run at (57,294) width 304: "The players all played at once without waiting"
    5656                RenderBlock (floating) {SPAN} at (364,297) size 48x80 [bgcolor=#90EE90]
    57                 RenderText {#text} at (57,312) size 303x36
     57                RenderText {#text} at (57,312) size 304x36
    5858                  text run at (57,312) width 63: "for turns, "
    59                   text run at (120,312) width 240: "quarrelling all the while, and fighting"
     59                  text run at (120,312) width 241: "quarrelling all the while, and fighting"
    6060                  text run at (57,330) width 170: "for the hedgehogs; and in "
    61                   text run at (227,330) width 114: "a very short time "
    62                 RenderInline {SPAN} at (0,0) size 354x36
    63                   RenderText {#text} at (341,330) size 354x36
    64                     text run at (341,330) width 19: "the"
     61                  text run at (227,330) width 115: "a very short time "
     62                RenderInline {SPAN} at (0,0) size 355x36
     63                  RenderText {#text} at (342,330) size 355x36
     64                    text run at (342,330) width 19: "the"
    6565                    text run at (6,348) width 42: "Queen"
    6666                RenderText {#text} at (48,348) size 355x54
     
    7676                  text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
    7777                  text run at (6,456) width 75: "become of "
    78                   text run at (81,456) width 330: "me? They\x{2019}re dreadfully fond of beheading people"
     78                  text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
    7979                  text run at (6,474) width 93: "here; the great "
    8080                  text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
  • trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-2-expected.txt

    r78886 r86028  
    1616                  text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
    1717                  text run at (6,24) width 25: "her "
    18                   text run at (31,24) width 328: "flamingo: she succeeded in getting its body tucked"
     18                  text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
    1919                  text run at (6,42) width 42: "away, "
    20                   text run at (48,42) width 311: "comfortably enough, under her arm, with its legs"
     20                  text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
    2121                  text run at (6,60) width 106: "hanging down, "
    22                   text run at (112,60) width 247: "but generally, just as she had got its"
     22                  text run at (112,60) width 248: "but generally, just as she had got its"
    2323                  text run at (6,78) width 158: "neck nicely straightened "
    24                   text run at (164,78) width 195: "out, and was going to give the"
     24                  text run at (164,78) width 196: "out, and was going to give the"
    2525                  text run at (6,99) width 235: "hedgehog a blow with its head, it "
    2626                RenderInline {I} at (0,0) size 44x22
    2727                  RenderText {#text} at (241,96) size 44x22
    2828                    text run at (241,96) width 44: "would"
    29                 RenderText {#text} at (285,99) size 405x73
    30                   text run at (285,99) width 74: " twist itself"
     29                RenderText {#text} at (285,99) size 406x73
     30                  text run at (285,99) width 75: " twist itself"
    3131                  text run at (6,118) width 237: "round and look up in her face, with "
    32                   text run at (243,118) width 168: "such a puzzled expression"
     32                  text run at (243,118) width 169: "such a puzzled expression"
    3333                  text run at (6,136) width 227: "that she could not help bursting out "
    34                   text run at (233,136) width 178: "laughing: and when she had"
     34                  text run at (233,136) width 179: "laughing: and when she had"
    3535                  text run at (6,154) width 248: "got its head down, and was going to "
    3636                RenderText {#text} at (254,154) size 406x126
    3737                  text run at (254,154) width 158: "begin again, it was very"
    3838                  text run at (6,172) width 259: "provoking to find that the hedgehog had "
    39                   text run at (265,172) width 146: "unrolled itself, and was"
     39                  text run at (265,172) width 147: "unrolled itself, and was"
    4040                  text run at (6,190) width 252: "in the act of crawling away: besides all "
    41                   text run at (258,190) width 153: "this, there was generally"
     41                  text run at (258,190) width 154: "this, there was generally"
    4242                  text run at (6,208) width 256: "a ridge or furrow in the way wherever "
    43                   text run at (262,208) width 149: "she wanted to send the"
     43                  text run at (262,208) width 150: "she wanted to send the"
    4444                  text run at (6,226) width 264: "hedgehog to, and, as the doubled-up "
    45                   text run at (270,226) width 141: "soldiers were always"
     45                  text run at (270,226) width 142: "soldiers were always"
    4646                  text run at (6,244) width 292: "getting up and walking off to other parts of "
    4747                  text run at (298,244) width 114: "the ground, Alice"
     
    5555                  text run at (57,298) width 304: "The players all played at once without waiting"
    5656                RenderBlock (floating) {SPAN} at (364,301) size 48x80 [bgcolor=#90EE90]
    57                 RenderText {#text} at (57,316) size 354x36
     57                RenderText {#text} at (57,316) size 355x36
    5858                  text run at (57,316) width 63: "for turns, "
    59                   text run at (120,316) width 240: "quarrelling all the while, and fighting"
     59                  text run at (120,316) width 241: "quarrelling all the while, and fighting"
    6060                  text run at (6,334) width 172: "for the hedgehogs; and in "
    61                   text run at (178,334) width 115: "a very short time "
    62                 RenderInline {SPAN} at (0,0) size 66x18
    63                   RenderText {#text} at (293,334) size 66x18
    64                     text run at (293,334) width 66: "the Queen"
    65                 RenderText {#text} at (6,352) size 354x54
     61                  text run at (178,334) width 116: "a very short time "
     62                RenderInline {SPAN} at (0,0) size 67x18
     63                  RenderText {#text} at (294,334) size 67x18
     64                    text run at (294,334) width 67: "the Queen"
     65                RenderText {#text} at (6,352) size 355x54
    6666                  text run at (6,352) width 226: "was in a furious passion, and went "
    67                   text run at (232,352) width 128: "stamping about, and"
     67                  text run at (232,352) width 129: "stamping about, and"
    6868                  text run at (6,370) width 288: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
    69                   text run at (294,370) width 66: "her head!\x{2019}"
     69                  text run at (294,370) width 67: "her head!\x{2019}"
    7070                  text run at (6,388) width 151: "about once in a minute. "
    7171                RenderBR {BR} at (0,0) size 0x0
     
    7676                  text run at (6,442) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
    7777                  text run at (6,460) width 75: "become of "
    78                   text run at (81,460) width 330: "me? They\x{2019}re dreadfully fond of beheading people"
     78                  text run at (81,460) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
    7979                  text run at (6,478) width 93: "here; the great "
    8080                  text run at (99,478) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
  • trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-3-expected.txt

    r78886 r86028  
    1616                  text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
    1717                  text run at (6,24) width 25: "her "
    18                   text run at (31,24) width 328: "flamingo: she succeeded in getting its body tucked"
     18                  text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
    1919                  text run at (6,42) width 42: "away, "
    20                   text run at (48,42) width 311: "comfortably enough, under her arm, with its legs"
     20                  text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
    2121                  text run at (6,60) width 106: "hanging down, "
    22                   text run at (112,60) width 247: "but generally, just as she had got its"
     22                  text run at (112,60) width 248: "but generally, just as she had got its"
    2323                  text run at (6,78) width 158: "neck nicely straightened "
    24                   text run at (164,78) width 195: "out, and was going to give the"
     24                  text run at (164,78) width 196: "out, and was going to give the"
    2525                  text run at (6,96) width 239: "hedgehog a blow with its head, it "
    2626                RenderInline {I} at (0,0) size 39x18
    2727                  RenderText {#text} at (245,96) size 39x18
    2828                    text run at (245,96) width 39: "would"
    29                 RenderText {#text} at (284,96) size 405x72
    30                   text run at (284,96) width 75: " twist itself"
     29                RenderText {#text} at (284,96) size 406x72
     30                  text run at (284,96) width 76: " twist itself"
    3131                  text run at (6,114) width 237: "round and look up in her face, with "
    32                   text run at (243,114) width 168: "such a puzzled expression"
     32                  text run at (243,114) width 169: "such a puzzled expression"
    3333                  text run at (6,132) width 227: "that she could not help bursting out "
    34                   text run at (233,132) width 178: "laughing: and when she had"
     34                  text run at (233,132) width 179: "laughing: and when she had"
    3535                  text run at (6,150) width 248: "got its head down, and was going to "
    3636                RenderText {#text} at (254,150) size 406x126
    3737                  text run at (254,150) width 158: "begin again, it was very"
    3838                  text run at (6,168) width 259: "provoking to find that the hedgehog had "
    39                   text run at (265,168) width 146: "unrolled itself, and was"
     39                  text run at (265,168) width 147: "unrolled itself, and was"
    4040                  text run at (6,186) width 252: "in the act of crawling away: besides all "
    41                   text run at (258,186) width 153: "this, there was generally"
     41                  text run at (258,186) width 154: "this, there was generally"
    4242                  text run at (6,204) width 256: "a ridge or furrow in the way wherever "
    43                   text run at (262,204) width 149: "she wanted to send the"
     43                  text run at (262,204) width 150: "she wanted to send the"
    4444                  text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
    45                   text run at (270,222) width 141: "soldiers were always"
     45                  text run at (270,222) width 142: "soldiers were always"
    4646                  text run at (6,240) width 292: "getting up and walking off to other parts of "
    4747                  text run at (298,240) width 114: "the ground, Alice"
     
    5555                  text run at (57,294) width 297: "The players all played at once without waiting "
    5656                RenderBlock (floating) {SPAN} at (348,315) size 64x80 [bgcolor=#90EE90]
    57                 RenderText {#text} at (354,294) size 405x54
    58                   text run at (354,294) width 57: "for turns,"
     57                RenderText {#text} at (354,294) size 406x54
     58                  text run at (354,294) width 58: "for turns,"
    5959                  text run at (57,312) width 288: "quarrelling all the while, and fighting for the"
    6060                  text run at (6,330) width 119: "hedgehogs; and in "
     
    6363                  RenderText {#text} at (234,330) size 65x18
    6464                    text run at (234,330) width 65: "the Queen"
    65                 RenderText {#text} at (299,330) size 338x72
    66                   text run at (299,330) width 45: " was in"
     65                RenderText {#text} at (299,330) size 339x72
     66                  text run at (299,330) width 46: " was in"
    6767                  text run at (6,348) width 201: "a furious passion, and went "
    68                   text run at (207,348) width 137: "stamping about, and"
     68                  text run at (207,348) width 138: "stamping about, and"
    6969                  text run at (6,366) width 274: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
    70                   text run at (280,366) width 64: "her head!\x{2019}"
     70                  text run at (280,366) width 65: "her head!\x{2019}"
    7171                  text run at (6,384) width 151: "about once in a minute. "
    7272                RenderBR {BR} at (0,0) size 0x0
     
    7777                  text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
    7878                  text run at (6,456) width 75: "become of "
    79                   text run at (81,456) width 330: "me? They\x{2019}re dreadfully fond of beheading people"
     79                  text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
    8080                  text run at (6,474) width 93: "here; the great "
    8181                  text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
  • trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-4-expected.txt

    r78886 r86028  
    1616                  text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
    1717                  text run at (6,24) width 25: "her "
    18                   text run at (31,24) width 328: "flamingo: she succeeded in getting its body tucked"
     18                  text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
    1919                  text run at (6,42) width 42: "away, "
    20                   text run at (48,42) width 311: "comfortably enough, under her arm, with its legs"
     20                  text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
    2121                  text run at (6,60) width 106: "hanging down, "
    22                   text run at (112,60) width 247: "but generally, just as she had got its"
     22                  text run at (112,60) width 248: "but generally, just as she had got its"
    2323                  text run at (6,78) width 158: "neck nicely straightened "
    24                   text run at (164,78) width 195: "out, and was going to give the"
     24                  text run at (164,78) width 196: "out, and was going to give the"
    2525                  text run at (6,96) width 239: "hedgehog a blow with its head, it "
    2626                RenderInline {I} at (0,0) size 39x18
    2727                  RenderText {#text} at (245,96) size 39x18
    2828                    text run at (245,96) width 39: "would"
    29                 RenderText {#text} at (284,96) size 405x72
    30                   text run at (284,96) width 75: " twist itself"
     29                RenderText {#text} at (284,96) size 406x72
     30                  text run at (284,96) width 76: " twist itself"
    3131                  text run at (6,114) width 237: "round and look up in her face, with "
    32                   text run at (243,114) width 168: "such a puzzled expression"
     32                  text run at (243,114) width 169: "such a puzzled expression"
    3333                  text run at (6,132) width 227: "that she could not help bursting out "
    34                   text run at (233,132) width 178: "laughing: and when she had"
     34                  text run at (233,132) width 179: "laughing: and when she had"
    3535                  text run at (6,150) width 248: "got its head down, and was going to "
    3636                RenderText {#text} at (254,150) size 406x126
    3737                  text run at (254,150) width 158: "begin again, it was very"
    3838                  text run at (6,168) width 259: "provoking to find that the hedgehog had "
    39                   text run at (265,168) width 146: "unrolled itself, and was"
     39                  text run at (265,168) width 147: "unrolled itself, and was"
    4040                  text run at (6,186) width 252: "in the act of crawling away: besides all "
    41                   text run at (258,186) width 153: "this, there was generally"
     41                  text run at (258,186) width 154: "this, there was generally"
    4242                  text run at (6,204) width 256: "a ridge or furrow in the way wherever "
    43                   text run at (262,204) width 149: "she wanted to send the"
     43                  text run at (262,204) width 150: "she wanted to send the"
    4444                  text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
    45                   text run at (270,222) width 141: "soldiers were always"
     45                  text run at (270,222) width 142: "soldiers were always"
    4646                  text run at (6,240) width 292: "getting up and walking off to other parts of "
    4747                  text run at (298,240) width 114: "the ground, Alice"
     
    5555                  text run at (57,294) width 304: "The players all played at once without waiting"
    5656                RenderBlock (floating) {SPAN} at (364,297) size 48x64 [bgcolor=#90EE90]
    57                 RenderText {#text} at (57,312) size 354x36
     57                RenderText {#text} at (57,312) size 355x36
    5858                  text run at (57,312) width 63: "for turns, "
    59                   text run at (120,312) width 240: "quarrelling all the while, and fighting"
     59                  text run at (120,312) width 241: "quarrelling all the while, and fighting"
    6060                  text run at (6,330) width 172: "for the hedgehogs; and in "
    61                   text run at (178,330) width 115: "a very short time "
    62                 RenderInline {SPAN} at (0,0) size 66x18
    63                   RenderText {#text} at (293,330) size 66x18
    64                     text run at (293,330) width 66: "the Queen"
    65                 RenderText {#text} at (6,348) size 405x54
     61                  text run at (178,330) width 116: "a very short time "
     62                RenderInline {SPAN} at (0,0) size 67x18
     63                  RenderText {#text} at (294,330) size 67x18
     64                    text run at (294,330) width 67: "the Queen"
     65                RenderText {#text} at (6,348) size 406x54
    6666                  text run at (6,348) width 226: "was in a furious passion, and went "
    67                   text run at (232,348) width 128: "stamping about, and"
     67                  text run at (232,348) width 129: "stamping about, and"
    6868                  text run at (6,366) width 268: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
    69                   text run at (274,366) width 137: "her head!\x{2019} about once"
     69                  text run at (274,366) width 138: "her head!\x{2019} about once"
    7070                  text run at (6,384) width 78: "in a minute. "
    7171                RenderBR {BR} at (0,0) size 0x0
     
    7676                  text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
    7777                  text run at (6,456) width 75: "become of "
    78                   text run at (81,456) width 330: "me? They\x{2019}re dreadfully fond of beheading people"
     78                  text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
    7979                  text run at (6,474) width 93: "here; the great "
    8080                  text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
  • trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-5-expected.txt

    r78886 r86028  
    1616                  text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
    1717                  text run at (6,24) width 25: "her "
    18                   text run at (31,24) width 328: "flamingo: she succeeded in getting its body tucked"
     18                  text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
    1919                  text run at (6,42) width 42: "away, "
    20                   text run at (48,42) width 311: "comfortably enough, under her arm, with its legs"
     20                  text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
    2121                  text run at (6,60) width 106: "hanging down, "
    22                   text run at (112,60) width 247: "but generally, just as she had got its"
     22                  text run at (112,60) width 248: "but generally, just as she had got its"
    2323                  text run at (6,78) width 158: "neck nicely straightened "
    24                   text run at (164,78) width 195: "out, and was going to give the"
     24                  text run at (164,78) width 196: "out, and was going to give the"
    2525                  text run at (6,96) width 239: "hedgehog a blow with its head, it "
    2626                RenderInline {I} at (0,0) size 39x18
    2727                  RenderText {#text} at (245,96) size 39x18
    2828                    text run at (245,96) width 39: "would"
    29                 RenderText {#text} at (284,96) size 405x72
    30                   text run at (284,96) width 75: " twist itself"
     29                RenderText {#text} at (284,96) size 406x72
     30                  text run at (284,96) width 76: " twist itself"
    3131                  text run at (6,114) width 237: "round and look up in her face, with "
    32                   text run at (243,114) width 168: "such a puzzled expression"
     32                  text run at (243,114) width 169: "such a puzzled expression"
    3333                  text run at (6,132) width 227: "that she could not help bursting out "
    34                   text run at (233,132) width 178: "laughing: and when she had"
     34                  text run at (233,132) width 179: "laughing: and when she had"
    3535                  text run at (6,150) width 248: "got its head down, and was going to "
    3636                RenderText {#text} at (254,150) size 406x126
    3737                  text run at (254,150) width 158: "begin again, it was very"
    3838                  text run at (6,168) width 259: "provoking to find that the hedgehog had "
    39                   text run at (265,168) width 146: "unrolled itself, and was"
     39                  text run at (265,168) width 147: "unrolled itself, and was"
    4040                  text run at (6,186) width 252: "in the act of crawling away: besides all "
    41                   text run at (258,186) width 153: "this, there was generally"
     41                  text run at (258,186) width 154: "this, there was generally"
    4242                  text run at (6,204) width 256: "a ridge or furrow in the way wherever "
    43                   text run at (262,204) width 149: "she wanted to send the"
     43                  text run at (262,204) width 150: "she wanted to send the"
    4444                  text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
    45                   text run at (270,222) width 141: "soldiers were always"
     45                  text run at (270,222) width 142: "soldiers were always"
    4646                  text run at (6,240) width 292: "getting up and walking off to other parts of "
    4747                  text run at (298,240) width 114: "the ground, Alice"
     
    5858                  text run at (343,294) width 18: "for"
    5959                  text run at (41,312) width 39: "turns, "
    60                   text run at (80,312) width 280: "quarrelling all the while, and fighting for the"
     60                  text run at (80,312) width 281: "quarrelling all the while, and fighting for the"
    6161                  text run at (6,330) width 120: "hedgehogs; and in "
    6262                  text run at (126,330) width 111: "a very short time "
     
    6464                  RenderText {#text} at (237,330) size 65x18
    6565                    text run at (237,330) width 65: "the Queen"
    66                 RenderText {#text} at (302,330) size 354x72
    67                   text run at (302,330) width 57: " was in a"
     66                RenderText {#text} at (302,330) size 355x72
     67                  text run at (302,330) width 59: " was in a"
    6868                  text run at (6,348) width 167: "furious passion, and went "
    69                   text run at (173,348) width 187: "stamping about, and shouting"
     69                  text run at (173,348) width 188: "stamping about, and shouting"
    7070                  text run at (6,366) width 215: "\x{2018}Off with his head!\x{2019} or \x{2018}Off with "
    71                   text run at (221,366) width 139: "her head!\x{2019} about once"
     71                  text run at (221,366) width 140: "her head!\x{2019} about once"
    7272                  text run at (6,384) width 78: "in a minute. "
    7373                RenderBR {BR} at (0,0) size 0x0
     
    7878                  text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
    7979                  text run at (6,456) width 75: "become of "
    80                   text run at (81,456) width 330: "me? They\x{2019}re dreadfully fond of beheading people"
     80                  text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
    8181                  text run at (6,474) width 93: "here; the great "
    8282                  text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
  • trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-6-expected.txt

    r78886 r86028  
    1616                  text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
    1717                  text run at (6,24) width 25: "her "
    18                   text run at (31,24) width 328: "flamingo: she succeeded in getting its body tucked"
     18                  text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
    1919                  text run at (6,42) width 42: "away, "
    20                   text run at (48,42) width 311: "comfortably enough, under her arm, with its legs"
     20                  text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
    2121                  text run at (6,60) width 106: "hanging down, "
    22                   text run at (112,60) width 247: "but generally, just as she had got its"
     22                  text run at (112,60) width 248: "but generally, just as she had got its"
    2323                  text run at (6,78) width 158: "neck nicely straightened "
    24                   text run at (164,78) width 195: "out, and was going to give the"
     24                  text run at (164,78) width 196: "out, and was going to give the"
    2525                  text run at (6,96) width 239: "hedgehog a blow with its head, it "
    2626                RenderInline {I} at (0,0) size 39x18
    2727                  RenderText {#text} at (245,96) size 39x18
    2828                    text run at (245,96) width 39: "would"
    29                 RenderText {#text} at (284,96) size 405x72
    30                   text run at (284,96) width 75: " twist itself"
     29                RenderText {#text} at (284,96) size 406x72
     30                  text run at (284,96) width 76: " twist itself"
    3131                  text run at (6,114) width 237: "round and look up in her face, with "
    32                   text run at (243,114) width 168: "such a puzzled expression"
     32                  text run at (243,114) width 169: "such a puzzled expression"
    3333                  text run at (6,132) width 227: "that she could not help bursting out "
    34                   text run at (233,132) width 178: "laughing: and when she had"
     34                  text run at (233,132) width 179: "laughing: and when she had"
    3535                  text run at (6,150) width 248: "got its head down, and was going to "
    3636                RenderText {#text} at (254,150) size 406x126
    3737                  text run at (254,150) width 158: "begin again, it was very"
    3838                  text run at (6,168) width 259: "provoking to find that the hedgehog had "
    39                   text run at (265,168) width 146: "unrolled itself, and was"
     39                  text run at (265,168) width 147: "unrolled itself, and was"
    4040                  text run at (6,186) width 252: "in the act of crawling away: besides all "
    41                   text run at (258,186) width 153: "this, there was generally"
     41                  text run at (258,186) width 154: "this, there was generally"
    4242                  text run at (6,204) width 256: "a ridge or furrow in the way wherever "
    43                   text run at (262,204) width 149: "she wanted to send the"
     43                  text run at (262,204) width 150: "she wanted to send the"
    4444                  text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
    45                   text run at (270,222) width 141: "soldiers were always"
     45                  text run at (270,222) width 142: "soldiers were always"
    4646                  text run at (6,240) width 292: "getting up and walking off to other parts of "
    4747                  text run at (298,240) width 114: "the ground, Alice"
     
    5757                  text run at (57,294) width 304: "The players all played at once without waiting"
    5858                RenderBlock (floating) {SPAN} at (364,297) size 48x80 [bgcolor=#90EE90]
    59                 RenderText {#text} at (57,312) size 354x36
     59                RenderText {#text} at (57,312) size 355x36
    6060                  text run at (57,312) width 63: "for turns, "
    61                   text run at (120,312) width 240: "quarrelling all the while, and fighting"
     61                  text run at (120,312) width 241: "quarrelling all the while, and fighting"
    6262                  text run at (6,330) width 172: "for the hedgehogs; and in "
    63                   text run at (178,330) width 115: "a very short time "
    64                 RenderInline {SPAN} at (0,0) size 66x18
    65                   RenderText {#text} at (293,330) size 66x18
    66                     text run at (293,330) width 66: "the Queen"
    67                 RenderText {#text} at (6,348) size 354x54
     63                  text run at (178,330) width 116: "a very short time "
     64                RenderInline {SPAN} at (0,0) size 67x18
     65                  RenderText {#text} at (294,330) size 67x18
     66                    text run at (294,330) width 67: "the Queen"
     67                RenderText {#text} at (6,348) size 355x54
    6868                  text run at (6,348) width 226: "was in a furious passion, and went "
    69                   text run at (232,348) width 128: "stamping about, and"
     69                  text run at (232,348) width 129: "stamping about, and"
    7070                  text run at (6,366) width 288: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
    71                   text run at (294,366) width 66: "her head!\x{2019}"
     71                  text run at (294,366) width 67: "her head!\x{2019}"
    7272                  text run at (6,384) width 151: "about once in a minute. "
    7373                RenderBR {BR} at (0,0) size 0x0
     
    7878                  text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
    7979                  text run at (6,456) width 75: "become of "
    80                   text run at (81,456) width 330: "me? They\x{2019}re dreadfully fond of beheading people"
     80                  text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
    8181                  text run at (6,474) width 93: "here; the great "
    8282                  text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
  • trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-7-expected.txt

    r78886 r86028  
    1616                  text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
    1717                  text run at (6,24) width 25: "her "
    18                   text run at (31,24) width 328: "flamingo: she succeeded in getting its body tucked"
     18                  text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
    1919                  text run at (6,42) width 42: "away, "
    20                   text run at (48,42) width 311: "comfortably enough, under her arm, with its legs"
     20                  text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
    2121                  text run at (6,60) width 106: "hanging down, "
    22                   text run at (112,60) width 247: "but generally, just as she had got its"
     22                  text run at (112,60) width 248: "but generally, just as she had got its"
    2323                  text run at (6,78) width 158: "neck nicely straightened "
    24                   text run at (164,78) width 195: "out, and was going to give the"
     24                  text run at (164,78) width 196: "out, and was going to give the"
    2525                  text run at (6,96) width 239: "hedgehog a blow with its head, it "
    2626                RenderInline {I} at (0,0) size 39x18
    2727                  RenderText {#text} at (245,96) size 39x18
    2828                    text run at (245,96) width 39: "would"
    29                 RenderText {#text} at (284,96) size 405x72
    30                   text run at (284,96) width 75: " twist itself"
     29                RenderText {#text} at (284,96) size 406x72
     30                  text run at (284,96) width 76: " twist itself"
    3131                  text run at (6,114) width 237: "round and look up in her face, with "
    32                   text run at (243,114) width 168: "such a puzzled expression"
     32                  text run at (243,114) width 169: "such a puzzled expression"
    3333                  text run at (6,132) width 227: "that she could not help bursting out "
    34                   text run at (233,132) width 178: "laughing: and when she had"
     34                  text run at (233,132) width 179: "laughing: and when she had"
    3535                  text run at (6,150) width 248: "got its head down, and was going to "
    3636                RenderText {#text} at (254,150) size 406x126
    3737                  text run at (254,150) width 158: "begin again, it was very"
    3838                  text run at (6,168) width 259: "provoking to find that the hedgehog had "
    39                   text run at (265,168) width 146: "unrolled itself, and was"
     39                  text run at (265,168) width 147: "unrolled itself, and was"
    4040                  text run at (6,186) width 252: "in the act of crawling away: besides all "
    41                   text run at (258,186) width 153: "this, there was generally"
     41                  text run at (258,186) width 154: "this, there was generally"
    4242                  text run at (6,204) width 256: "a ridge or furrow in the way wherever "
    43                   text run at (262,204) width 149: "she wanted to send the"
     43                  text run at (262,204) width 150: "she wanted to send the"
    4444                  text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
    45                   text run at (270,222) width 141: "soldiers were always"
     45                  text run at (270,222) width 142: "soldiers were always"
    4646                  text run at (6,240) width 292: "getting up and walking off to other parts of "
    4747                  text run at (298,240) width 114: "the ground, Alice"
     
    5555                  text run at (57,294) width 304: "The players all played at once without waiting"
    5656                RenderBlock (floating) {SPAN} at (364,297) size 48x80 [bgcolor=#90EE90]
    57                 RenderText {#text} at (57,312) size 354x36
     57                RenderText {#text} at (57,312) size 355x36
    5858                  text run at (57,312) width 63: "for turns, "
    59                   text run at (120,312) width 240: "quarrelling all the while, and fighting"
     59                  text run at (120,312) width 241: "quarrelling all the while, and fighting"
    6060                  text run at (6,330) width 170: "for the hedgehogs; and in "
    6161                  text run at (176,330) width 114: "a very short time "
    62                 RenderInline {SPAN} at (0,0) size 70x18
    63                   RenderText {#text} at (290,330) size 70x18
    64                     text run at (290,330) width 70: "the Queen"
    65                 RenderText {#text} at (6,348) size 354x54
     62                RenderInline {SPAN} at (0,0) size 71x18
     63                  RenderText {#text} at (290,330) size 71x18
     64                    text run at (290,330) width 71: "the Queen"
     65                RenderText {#text} at (6,348) size 355x54
    6666                  text run at (6,348) width 226: "was in a furious passion, and went "
    67                   text run at (232,348) width 128: "stamping about, and"
     67                  text run at (232,348) width 129: "stamping about, and"
    6868                  text run at (6,366) width 288: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
    69                   text run at (294,366) width 66: "her head!\x{2019}"
     69                  text run at (294,366) width 67: "her head!\x{2019}"
    7070                  text run at (6,384) width 151: "about once in a minute. "
    7171                RenderBR {BR} at (0,0) size 0x0
     
    7676                  text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
    7777                  text run at (6,456) width 75: "become of "
    78                   text run at (81,456) width 330: "me? They\x{2019}re dreadfully fond of beheading people"
     78                  text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
    7979                  text run at (6,474) width 93: "here; the great "
    8080                  text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
  • trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-8-expected.txt

    r78886 r86028  
    1616                  text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
    1717                  text run at (6,24) width 25: "her "
    18                   text run at (31,24) width 328: "flamingo: she succeeded in getting its body tucked"
     18                  text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
    1919                  text run at (6,42) width 42: "away, "
    20                   text run at (48,42) width 311: "comfortably enough, under her arm, with its legs"
     20                  text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
    2121                  text run at (6,60) width 106: "hanging down, "
    22                   text run at (112,60) width 247: "but generally, just as she had got its"
     22                  text run at (112,60) width 248: "but generally, just as she had got its"
    2323                  text run at (6,78) width 158: "neck nicely straightened "
    24                   text run at (164,78) width 195: "out, and was going to give the"
     24                  text run at (164,78) width 196: "out, and was going to give the"
    2525                  text run at (6,96) width 239: "hedgehog a blow with its head, it "
    2626                RenderInline {I} at (0,0) size 39x18
    2727                  RenderText {#text} at (245,96) size 39x18
    2828                    text run at (245,96) width 39: "would"
    29                 RenderText {#text} at (284,96) size 405x72
    30                   text run at (284,96) width 75: " twist itself"
     29                RenderText {#text} at (284,96) size 406x72
     30                  text run at (284,96) width 76: " twist itself"
    3131                  text run at (6,114) width 237: "round and look up in her face, with "
    32                   text run at (243,114) width 168: "such a puzzled expression"
     32                  text run at (243,114) width 169: "such a puzzled expression"
    3333                  text run at (6,132) width 227: "that she could not help bursting out "
    34                   text run at (233,132) width 178: "laughing: and when she had"
     34                  text run at (233,132) width 179: "laughing: and when she had"
    3535                  text run at (6,150) width 248: "got its head down, and was going to "
    3636                RenderText {#text} at (254,150) size 406x126
    3737                  text run at (254,150) width 158: "begin again, it was very"
    3838                  text run at (6,168) width 259: "provoking to find that the hedgehog had "
    39                   text run at (265,168) width 146: "unrolled itself, and was"
     39                  text run at (265,168) width 147: "unrolled itself, and was"
    4040                  text run at (6,186) width 252: "in the act of crawling away: besides all "
    41                   text run at (258,186) width 153: "this, there was generally"
     41                  text run at (258,186) width 154: "this, there was generally"
    4242                  text run at (6,204) width 256: "a ridge or furrow in the way wherever "
    43                   text run at (262,204) width 149: "she wanted to send the"
     43                  text run at (262,204) width 150: "she wanted to send the"
    4444                  text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
    45                   text run at (270,222) width 141: "soldiers were always"
     45                  text run at (270,222) width 142: "soldiers were always"
    4646                  text run at (6,240) width 292: "getting up and walking off to other parts of "
    4747                  text run at (298,240) width 114: "the ground, Alice"
    4848                  text run at (6,258) width 316: "soon came to the conclusion that it was a very "
    49                 RenderText {#text} at (322,258) size 405x36
    50                   text run at (322,258) width 89: "difficult game"
     49                RenderText {#text} at (322,258) size 406x36
     50                  text run at (322,258) width 90: "difficult game"
    5151                  text run at (6,276) width 50: "indeed. "
    5252                RenderBR {BR} at (0,0) size 0x0
     
    5555                RenderBlock (floating) {SPAN} at (364,297) size 48x80 [bgcolor=#90EE90]
    5656                RenderText {#text} at (303,294) size 355x54
    57                   text run at (303,294) width 57: "for turns,"
     57                  text run at (303,294) width 58: "for turns,"
    5858                  text run at (6,312) width 355: "quarrelling all the while, and fighting for the hedgehogs;"
    5959                  text run at (6,330) width 49: "and in "
     
    6262                  RenderText {#text} at (176,330) size 68x18
    6363                    text run at (176,330) width 68: "the Queen"
    64                 RenderText {#text} at (244,330) size 354x72
    65                   text run at (244,330) width 116: " was in a furious"
     64                RenderText {#text} at (244,330) size 355x72
     65                  text run at (244,330) width 117: " was in a furious"
    6666                  text run at (6,348) width 126: "passion, and went "
    67                   text run at (132,348) width 228: "stamping about, and shouting \x{2018}Off"
     67                  text run at (132,348) width 229: "stamping about, and shouting \x{2018}Off"
    6868                  text run at (6,366) width 185: "with his head!\x{2019} or \x{2018}Off with "
    69                   text run at (191,366) width 169: "her head!\x{2019} about once in a"
     69                  text run at (191,366) width 170: "her head!\x{2019} about once in a"
    7070                  text run at (6,384) width 51: "minute. "
    7171                RenderBR {BR} at (0,0) size 0x0
     
    7676                  text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
    7777                  text run at (6,456) width 75: "become of "
    78                   text run at (81,456) width 330: "me? They\x{2019}re dreadfully fond of beheading people"
     78                  text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
    7979                  text run at (6,474) width 93: "here; the great "
    8080                  text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
  • trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-9-expected.txt

    r78886 r86028  
    1616                  text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
    1717                  text run at (6,24) width 25: "her "
    18                   text run at (31,24) width 328: "flamingo: she succeeded in getting its body tucked"
     18                  text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
    1919                  text run at (6,42) width 42: "away, "
    20                   text run at (48,42) width 311: "comfortably enough, under her arm, with its legs"
     20                  text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
    2121                  text run at (6,60) width 106: "hanging down, "
    22                   text run at (112,60) width 247: "but generally, just as she had got its"
     22                  text run at (112,60) width 248: "but generally, just as she had got its"
    2323                  text run at (6,78) width 158: "neck nicely straightened "
    24                   text run at (164,78) width 195: "out, and was going to give the"
     24                  text run at (164,78) width 196: "out, and was going to give the"
    2525                  text run at (6,96) width 239: "hedgehog a blow with its head, it "
    2626                RenderInline {I} at (0,0) size 39x18
    2727                  RenderText {#text} at (245,96) size 39x18
    2828                    text run at (245,96) width 39: "would"
    29                 RenderText {#text} at (284,96) size 405x72
    30                   text run at (284,96) width 75: " twist itself"
     29                RenderText {#text} at (284,96) size 406x72
     30                  text run at (284,96) width 76: " twist itself"
    3131                  text run at (6,114) width 237: "round and look up in her face, with "
    32                   text run at (243,114) width 168: "such a puzzled expression"
     32                  text run at (243,114) width 169: "such a puzzled expression"
    3333                  text run at (6,132) width 227: "that she could not help bursting out "
    34                   text run at (233,132) width 178: "laughing: and when she had"
     34                  text run at (233,132) width 179: "laughing: and when she had"
    3535                  text run at (6,150) width 235: "got its head down, and was going to "
    3636                RenderBlock (floating) {SPAN} at (364,153) size 48x48 [bgcolor=#FFFFE0]
    3737                RenderText {#text} at (241,150) size 406x126
    38                   text run at (241,150) width 119: "begin again, it was"
     38                  text run at (241,150) width 120: "begin again, it was"
    3939                  text run at (6,168) width 303: "very provoking to find that the hedgehog had "
    4040                  text run at (309,168) width 52: "unrolled"
     
    5151                  text run at (57,294) width 304: "The players all played at once without waiting"
    5252                RenderBlock (floating) {SPAN} at (364,297) size 48x80 [bgcolor=#90EE90]
    53                 RenderText {#text} at (57,312) size 303x36
     53                RenderText {#text} at (57,312) size 304x36
    5454                  text run at (57,312) width 63: "for turns, "
    55                   text run at (120,312) width 240: "quarrelling all the while, and fighting"
     55                  text run at (120,312) width 241: "quarrelling all the while, and fighting"
    5656                  text run at (57,330) width 170: "for the hedgehogs; and in "
    57                   text run at (227,330) width 114: "a very short time "
    58                 RenderInline {SPAN} at (0,0) size 354x36
    59                   RenderText {#text} at (341,330) size 354x36
    60                     text run at (341,330) width 19: "the"
     57                  text run at (227,330) width 115: "a very short time "
     58                RenderInline {SPAN} at (0,0) size 355x36
     59                  RenderText {#text} at (342,330) size 355x36
     60                    text run at (342,330) width 19: "the"
    6161                    text run at (6,348) width 42: "Queen"
    6262                RenderText {#text} at (48,348) size 355x54
     
    7272                  text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
    7373                  text run at (6,456) width 75: "become of "
    74                   text run at (81,456) width 330: "me? They\x{2019}re dreadfully fond of beheading people"
     74                  text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
    7575                  text run at (6,474) width 93: "here; the great "
    7676                  text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
  • trunk/LayoutTests/platform/mac/fast/text/hyphenate-character-expected.txt

    r80996 r86028  
    2626            text run at (7,139) width 330: "just as she had got its neck nicely straight" + hyphen string "-"
    2727            text run at (7,161) width 41: "ened "
    28             text run at (48,161) width 288: "out, and was going to give the hedge" + hyphen string "-"
     28            text run at (48,161) width 289: "out, and was going to give the hedge" + hyphen string "-"
    2929            text run at (7,183) width 204: "hog a blow with its head, it "
    3030            text run at (211,183) width 126: "would twist itself"
     
    5252            text run at (7,139) width 330: "just as she had got its neck nicely straight" + hyphen string "-"
    5353            text run at (7,161) width 41: "ened "
    54             text run at (48,161) width 288: "out, and was going to give the hedge" + hyphen string "-"
     54            text run at (48,161) width 289: "out, and was going to give the hedge" + hyphen string "-"
    5555            text run at (7,183) width 204: "hog a blow with its head, it "
    5656            text run at (211,183) width 126: "would twist itself"
     
    7878            text run at (7,139) width 330: "just as she had got its neck nicely straight" + hyphen string "\x{2022}"
    7979            text run at (7,161) width 41: "ened "
    80             text run at (48,161) width 288: "out, and was going to give the hedge" + hyphen string "\x{2022}"
     80            text run at (48,161) width 289: "out, and was going to give the hedge" + hyphen string "\x{2022}"
    8181            text run at (7,183) width 204: "hog a blow with its head, it "
    8282            text run at (211,183) width 126: "would twist itself"
  • trunk/LayoutTests/platform/mac/fast/text/hyphens-expected.txt

    r80996 r86028  
    2323            text run at (7,139) width 330: "generally, just as she had got its neck nicely"
    2424            text run at (7,161) width 95: "straightened "
    25             text run at (102,161) width 234: "out, and was going to give the"
     25            text run at (102,161) width 235: "out, and was going to give the"
    2626            text run at (7,183) width 285: "hedgehog a blow with its head, it "
    2727            text run at (292,183) width 45: "would"
     
    4646            text run at (7,139) width 330: "generally, just as she had got its neck nicely"
    4747            text run at (7,161) width 95: "straight\x{AD}ened "
    48             text run at (102,161) width 234: "out, and was going to give the"
     48            text run at (102,161) width 235: "out, and was going to give the"
    4949            text run at (7,183) width 285: "hedge\x{AD}hog a blow with its head, it "
    5050            text run at (292,183) width 45: "would"
     
    7070            text run at (7,139) width 330: "just as she had got its neck nicely straight\x{AD}" + hyphen string "-"
    7171            text run at (7,161) width 41: "ened "
    72             text run at (48,161) width 288: "out, and was going to give the hedge\x{AD}" + hyphen string "-"
     72            text run at (48,161) width 289: "out, and was going to give the hedge\x{AD}" + hyphen string "-"
    7373            text run at (7,183) width 204: "hog a blow with its head, it "
    7474            text run at (211,183) width 126: "would twist itself"
     
    9494            text run at (7,139) width 330: "just as she had got its neck nicely straight" + hyphen string "-"
    9595            text run at (7,161) width 41: "ened "
    96             text run at (48,161) width 288: "out, and was going to give the hedge" + hyphen string "-"
     96            text run at (48,161) width 289: "out, and was going to give the hedge" + hyphen string "-"
    9797            text run at (7,183) width 204: "hog a blow with its head, it "
    9898            text run at (211,183) width 126: "would twist itself"
  • trunk/LayoutTests/platform/mac/fast/text/justified-selection-at-edge-expected.txt

    r78866 r86028  
    1313        RenderText {#text} at (3,3) size 189x18
    1414          text run at (3,3) width 189: "Lorem ipsum dolor si"
    15         RenderInline {SPAN} at (0,0) size 60x18 [color=#008000] [bgcolor=#FFFF00]
    16           RenderText {#text} at (192,3) size 60x18
    17             text run at (192,3) width 60: "t amet,"
     15        RenderInline {SPAN} at (0,0) size 61x18 [color=#008000] [bgcolor=#FFFF00]
     16          RenderText {#text} at (192,3) size 61x18
     17            text run at (192,3) width 61: "t amet,"
    1818        RenderText {#text} at (3,21) size 173x18
    1919          text run at (3,21) width 173: "consectetuer adipiscing elit."
  • trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt

    r78910 r86028  
    4646          RenderText {#text} at (207,14) size 31x15
    4747            text run at (207,14) width 31: "DOM"
    48         RenderText {#text} at (238,14) size 111x15
    49           text run at (238,14) width 111: "s, and broken "
     48        RenderText {#text} at (238,14) size 112x15
     49          text run at (238,14) width 112: "s, and broken "
    5050        RenderInline {ACRONYM} at (0,0) size 27x15
    51           RenderText {#text} at (349,14) size 27x15
    52             text run at (349,14) width 27: "CSS"
    53         RenderText {#text} at (376,14) size 64x15
    54           text run at (376,14) width 64: " support."
     51          RenderText {#text} at (350,14) size 27x15
     52            text run at (350,14) width 27: "CSS"
     53        RenderText {#text} at (377,14) size 65x15
     54          text run at (377,14) width 65: " support."
    5555    RenderText {#text} at (0,0) size 0x0
    5656    RenderInline {P} at (0,0) size 431x43
     
    7070        RenderText {#text} at (191,56) size 221x15
    7171          text run at (191,56) width 221: " and the major browser creators."
    72     RenderText {#text} at (412,56) size 4x15
    73       text run at (412,56) width 4: " "
     72    RenderText {#text} at (412,56) size 5x15
     73      text run at (412,56) width 5: " "
    7474    RenderInline {P} at (0,0) size 431x71
    7575      RenderInline {SPAN} at (0,0) size 431x71
    76         RenderText {#text} at (416,56) size 431x71
    77           text run at (416,56) width 25: "The"
     76        RenderText {#text} at (417,56) size 431x71
     77          text run at (417,56) width 25: "The"
    7878          text run at (11,70) width 431: "css Zen Garden invites you to relax and meditate on the"
    7979          text run at (11,84) width 431: "important lessons of the masters. Begin to see with clarity."
  • trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.txt

    r78910 r86028  
    2424                text run at (2,2) width 290: "This TBODY text should be justified which"
    2525                text run at (2,20) width 136: "means that the right "
    26                 text run at (138,20) width 153: "and left margins should"
     26                text run at (138,20) width 154: "and left margins should"
    2727                text run at (2,38) width 290: "line up, no matter how long the content"
    2828                text run at (2,56) width 290: "becomes (except the last line which should be"
  • trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_justify-expected.txt

    r78910 r86028  
    88          RenderTableRow {tr} at (0,2) size 782x76
    99            RenderTableCell {td} at (2,2) size 388x76 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    10               RenderText {#text} at (2,2) size 383x72
     10              RenderText {#text} at (2,2) size 384x72
    1111                text run at (2,2) width 212: "This cell text should be justified "
    12                 text run at (214,2) width 171: "which means that the right"
     12                text run at (214,2) width 172: "which means that the right"
    1313                text run at (2,20) width 247: "and left margins should line up, no "
    14                 text run at (249,20) width 136: "matter how long the"
     14                text run at (249,20) width 137: "matter how long the"
    1515                text run at (2,38) width 294: "content becomes (except the last line which "
    16                 text run at (296,38) width 89: "should be left"
     16                text run at (296,38) width 90: "should be left"
    1717                text run at (2,56) width 51: "aligned)"
    1818            RenderTableCell {td} at (392,29) size 388x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
  • trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.txt

    r78910 r86028  
    1919                text run at (2,2) width 290: "This TFOOT text should be justified which"
    2020                text run at (2,20) width 136: "means that the right "
    21                 text run at (138,20) width 153: "and left margins should"
     21                text run at (138,20) width 154: "and left margins should"
    2222                text run at (2,38) width 290: "line up, no matter how long the content"
    2323                text run at (2,56) width 290: "becomes (except the last line which should be"
  • trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_justify-expected.txt

    r78910 r86028  
    1212                text run at (234,2) width 152: "which means that the"
    1313                text run at (2,20) width 302: "right and left margins should line up, no "
    14                 text run at (304,20) width 81: "matter how"
     14                text run at (304,20) width 82: "matter how"
    1515                text run at (2,38) width 384: "long the content becomes (except the last line which"
    1616                text run at (2,56) width 148: "should be left aligned)"
  • trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.txt

    r78910 r86028  
    1414                text run at (2,2) width 290: "This THEAD text should be justified which"
    1515                text run at (2,20) width 136: "means that the right "
    16                 text run at (138,20) width 153: "and left margins should"
     16                text run at (138,20) width 154: "and left margins should"
    1717                text run at (2,38) width 290: "line up, no matter how long the content"
    1818                text run at (2,56) width 290: "becomes (except the last line which should be"
  • trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_justify-expected.txt

    r78910 r86028  
    1111                text run at (2,2) width 292: "Cell text should be justified which means that"
    1212                text run at (2,20) width 89: "the right and "
    13                 text run at (91,20) width 202: "left margins should line up, no"
     13                text run at (91,20) width 203: "left margins should line up, no"
    1414                text run at (2,38) width 246: "matter how long the content becomes "
    1515                text run at (248,38) width 46: "(except"
     
    1919                text run at (2,2) width 292: "Cell text should be justified which means that"
    2020                text run at (2,20) width 89: "the right and "
    21                 text run at (91,20) width 202: "left margins should line up, no"
     21                text run at (91,20) width 203: "left margins should line up, no"
    2222                text run at (2,38) width 246: "matter how long the content becomes "
    2323                text run at (248,38) width 46: "(except"
  • trunk/Source/WebCore/ChangeLog

    r86027 r86028  
     12011-05-08  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        <rdar://problem/9401853> REGRESSION (r78846): Insufficient expansion for justification when there are multiple inline boxes
     6        https://bugs.webkit.org/show_bug.cgi?id=60432
     7
     8        * rendering/InlineTextBox.h:
     9        (WebCore::InlineTextBox::setExpansion): Changed back to take a int, since the m_expansion member
     10        variable is a (truncated) int anyway.
     11        * rendering/RenderBlockLineLayout.cpp:
     12        (WebCore::computeExpansionForJustifiedText): Changed the expansion local variable into an int
     13        so that the right amount is added to the total width. Also changed to use an early return.
     14
    1152011-05-08  Pavel Feldman  <pfeldman@chromium.org>
    216
  • trunk/Source/WebCore/rendering/InlineTextBox.h

    r85512 r86028  
    128128    virtual bool isLineBreak() const;
    129129
    130     void setExpansion(float expansion) { m_logicalWidth -= m_expansion; m_expansion = expansion; m_logicalWidth += m_expansion; }
     130    void setExpansion(int expansion) { m_logicalWidth -= m_expansion; m_expansion = expansion; m_logicalWidth += m_expansion; }
    131131
    132132private:
  • trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

    r85810 r86028  
    503503static inline void computeExpansionForJustifiedText(BidiRun* firstRun, BidiRun* trailingSpaceRun, Vector<unsigned, 16>& expansionOpportunities, unsigned expansionOpportunityCount, float& totalLogicalWidth, float availableLogicalWidth)
    504504{
    505     if (expansionOpportunityCount && availableLogicalWidth > totalLogicalWidth) {
    506         size_t i = 0;
    507         for (BidiRun* r = firstRun; r; r = r->next()) {
    508             if (!r->m_box || r == trailingSpaceRun)
    509                 continue;
     505    if (!expansionOpportunityCount || availableLogicalWidth <= totalLogicalWidth)
     506        return;
     507
     508    size_t i = 0;
     509    for (BidiRun* r = firstRun; r; r = r->next()) {
     510        if (!r->m_box || r == trailingSpaceRun)
     511            continue;
     512       
     513        if (r->m_object->isText()) {
     514            unsigned opportunitiesInRun = expansionOpportunities[i++];
    510515           
    511             if (r->m_object->isText()) {
    512                 unsigned opportunitiesInRun = expansionOpportunities[i++];
    513                
    514                 ASSERT(opportunitiesInRun <= expansionOpportunityCount);
    515                
    516                 // Only justify text if whitespace is collapsed.
    517                 if (r->m_object->style()->collapseWhiteSpace()) {
    518                     InlineTextBox* textBox = static_cast<InlineTextBox*>(r->m_box);
    519                     float expansion = (availableLogicalWidth - totalLogicalWidth) * opportunitiesInRun / expansionOpportunityCount;
    520                     textBox->setExpansion(expansion);
    521                     totalLogicalWidth += expansion;
    522                 }
    523                 expansionOpportunityCount -= opportunitiesInRun;
    524                 if (!expansionOpportunityCount)
    525                     break;
    526             }
     516            ASSERT(opportunitiesInRun <= expansionOpportunityCount);
     517           
     518            // Only justify text if whitespace is collapsed.
     519            if (r->m_object->style()->collapseWhiteSpace()) {
     520                InlineTextBox* textBox = static_cast<InlineTextBox*>(r->m_box);
     521                int expansion = (availableLogicalWidth - totalLogicalWidth) * opportunitiesInRun / expansionOpportunityCount;
     522                textBox->setExpansion(expansion);
     523                totalLogicalWidth += expansion;
     524            }
     525            expansionOpportunityCount -= opportunitiesInRun;
     526            if (!expansionOpportunityCount)
     527                break;
    527528        }
    528529    }
Note: See TracChangeset for help on using the changeset viewer.