Changeset 170257 in webkit


Ignore:
Timestamp:
Jun 21, 2014 4:55:44 PM (10 years ago)
Author:
dino@apple.com
Message:

[Mac] Margins for new form controls need tweaking
https://bugs.webkit.org/show_bug.cgi?id=134135
<rdar://problem/17262164>

Reviewed by Sam Weinig.

Source/WebCore:
Take 2 of this patch. Only the mac-mountainlion LayoutTest
results are different from the first attempt.

With the newer animated controls in OS X Yosemite, we need
to tweak the fudge-factor margins for positioning. In a recent
patch I added another fudge, which I'm removing with this. I'm
not sure where the older values came from, but I've checked with
the latest AppKit sources and am using the sizes they implement
for the controls.

This will rebaseline a lot of tests, since I've made small tweaks
to the form layout.

  • platform/mac/ThemeMac.mm:

(WebCore::checkboxMargins): New margin amounts.
(WebCore::radioSizes): New sizes.
(WebCore::radioMargins): New margin amounts.
(WebCore::paintToggleButton): No need to call the positioning fudge any more.
(WebCore::checkboxOffsets): Deleted.
(WebCore::radioOffsets): Deleted.

LayoutTests:
Take 2 of this patch adds some Mountain Lion results.

Rebaseline a bunch of results since some <input> dimensions
changed slightly.

  • platform/mac-mountainlion/fast/block/margin-collapse/103-expected.txt:
  • platform/mac-mountainlion/fast/forms/basic-inputs-expected.png: Added.
  • platform/mac-mountainlion/fast/forms/basic-inputs-expected.txt:
  • platform/mac-mountainlion/fast/forms/box-shadow-override-expected.txt:
  • platform/mac-mountainlion/fast/forms/form-element-geometry-expected.png: Added.
  • platform/mac-mountainlion/fast/forms/form-element-geometry-expected.txt:
  • platform/mac-mountainlion/fast/forms/input-appearance-height-expected.txt:
  • platform/mac-mountainlion/fast/forms/input-value-expected.txt:
  • platform/mac-mountainlion/fast/replaced/replaced-breaking-expected.txt:
  • platform/mac-mountainlion/http/tests/navigation/javascriptlink-frame-expected.txt: Added.
  • platform/mac-mountainlion/tables/mozilla/bugs/bug4527-expected.txt:
  • platform/mac/css1/box_properties/acid_test-expected.png:
  • platform/mac/css1/box_properties/acid_test-expected.txt:
  • platform/mac/css2.1/t09-c5526c-display-00-e-expected.png:
  • platform/mac/css2.1/t09-c5526c-display-00-e-expected.txt:
  • platform/mac/fast/block/basic/011-expected.png:
  • platform/mac/fast/block/basic/011-expected.txt:
  • platform/mac/fast/block/margin-collapse/103-expected.png:
  • platform/mac/fast/block/margin-collapse/103-expected.txt:
  • platform/mac/fast/forms/basic-inputs-expected.png:
  • platform/mac/fast/forms/basic-inputs-expected.txt:
  • platform/mac/fast/forms/box-shadow-override-expected.png:
  • platform/mac/fast/forms/box-shadow-override-expected.txt:
  • platform/mac/fast/forms/form-element-geometry-expected.png:
  • platform/mac/fast/forms/form-element-geometry-expected.txt:
  • platform/mac/fast/forms/formmove-expected.txt:
  • platform/mac/fast/forms/formmove2-expected.png:
  • platform/mac/fast/forms/formmove2-expected.txt:
  • platform/mac/fast/forms/input-appearance-height-expected.png:
  • platform/mac/fast/forms/input-appearance-height-expected.txt:
  • platform/mac/fast/forms/input-value-expected.png:
  • platform/mac/fast/forms/input-value-expected.txt:
  • platform/mac/fast/inline/positionedLifetime-expected.txt:
  • platform/mac/fast/replaced/replaced-breaking-expected.png:
  • platform/mac/fast/replaced/replaced-breaking-expected.txt:
  • platform/mac/fast/replaced/width100percent-radio-expected.txt:
  • platform/mac/http/tests/navigation/javascriptlink-frames-expected.png:
  • platform/mac/http/tests/navigation/javascriptlink-frames-expected.txt:
  • platform/mac/tables/mozilla/bugs/bug1318-expected.png:
  • platform/mac/tables/mozilla/bugs/bug1318-expected.txt:
  • platform/mac/tables/mozilla/bugs/bug4527-expected.png:
  • platform/mac/tables/mozilla/bugs/bug4527-expected.txt:
  • platform/mac/tables/mozilla_expected_failures/core/captions1-expected.png:
  • platform/mac/tables/mozilla_expected_failures/core/captions1-expected.txt:
  • platform/mac/tables/mozilla_expected_failures/core/captions2-expected.png:
  • platform/mac/tables/mozilla_expected_failures/core/captions2-expected.txt:
Location:
trunk
Files:
3 added
46 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r170242 r170257  
     12014-06-21  Dean Jackson  <dino@apple.com>
     2
     3        [Mac] Margins for new form controls need tweaking
     4        https://bugs.webkit.org/show_bug.cgi?id=134135
     5        <rdar://problem/17262164>
     6
     7        Reviewed by Sam Weinig.
     8
     9        Take 2 of this patch adds some Mountain Lion results.
     10
     11        Rebaseline a bunch of results since some <input> dimensions
     12        changed slightly.
     13
     14        * platform/mac-mountainlion/fast/block/margin-collapse/103-expected.txt:
     15        * platform/mac-mountainlion/fast/forms/basic-inputs-expected.png: Added.
     16        * platform/mac-mountainlion/fast/forms/basic-inputs-expected.txt:
     17        * platform/mac-mountainlion/fast/forms/box-shadow-override-expected.txt:
     18        * platform/mac-mountainlion/fast/forms/form-element-geometry-expected.png: Added.
     19        * platform/mac-mountainlion/fast/forms/form-element-geometry-expected.txt:
     20        * platform/mac-mountainlion/fast/forms/input-appearance-height-expected.txt:
     21        * platform/mac-mountainlion/fast/forms/input-value-expected.txt:
     22        * platform/mac-mountainlion/fast/replaced/replaced-breaking-expected.txt:
     23        * platform/mac-mountainlion/http/tests/navigation/javascriptlink-frame-expected.txt: Added.
     24        * platform/mac-mountainlion/tables/mozilla/bugs/bug4527-expected.txt:
     25        * platform/mac/css1/box_properties/acid_test-expected.png:
     26        * platform/mac/css1/box_properties/acid_test-expected.txt:
     27        * platform/mac/css2.1/t09-c5526c-display-00-e-expected.png:
     28        * platform/mac/css2.1/t09-c5526c-display-00-e-expected.txt:
     29        * platform/mac/fast/block/basic/011-expected.png:
     30        * platform/mac/fast/block/basic/011-expected.txt:
     31        * platform/mac/fast/block/margin-collapse/103-expected.png:
     32        * platform/mac/fast/block/margin-collapse/103-expected.txt:
     33        * platform/mac/fast/forms/basic-inputs-expected.png:
     34        * platform/mac/fast/forms/basic-inputs-expected.txt:
     35        * platform/mac/fast/forms/box-shadow-override-expected.png:
     36        * platform/mac/fast/forms/box-shadow-override-expected.txt:
     37        * platform/mac/fast/forms/form-element-geometry-expected.png:
     38        * platform/mac/fast/forms/form-element-geometry-expected.txt:
     39        * platform/mac/fast/forms/formmove-expected.txt:
     40        * platform/mac/fast/forms/formmove2-expected.png:
     41        * platform/mac/fast/forms/formmove2-expected.txt:
     42        * platform/mac/fast/forms/input-appearance-height-expected.png:
     43        * platform/mac/fast/forms/input-appearance-height-expected.txt:
     44        * platform/mac/fast/forms/input-value-expected.png:
     45        * platform/mac/fast/forms/input-value-expected.txt:
     46        * platform/mac/fast/inline/positionedLifetime-expected.txt:
     47        * platform/mac/fast/replaced/replaced-breaking-expected.png:
     48        * platform/mac/fast/replaced/replaced-breaking-expected.txt:
     49        * platform/mac/fast/replaced/width100percent-radio-expected.txt:
     50        * platform/mac/http/tests/navigation/javascriptlink-frames-expected.png:
     51        * platform/mac/http/tests/navigation/javascriptlink-frames-expected.txt:
     52        * platform/mac/tables/mozilla/bugs/bug1318-expected.png:
     53        * platform/mac/tables/mozilla/bugs/bug1318-expected.txt:
     54        * platform/mac/tables/mozilla/bugs/bug4527-expected.png:
     55        * platform/mac/tables/mozilla/bugs/bug4527-expected.txt:
     56        * platform/mac/tables/mozilla_expected_failures/core/captions1-expected.png:
     57        * platform/mac/tables/mozilla_expected_failures/core/captions1-expected.txt:
     58        * platform/mac/tables/mozilla_expected_failures/core/captions2-expected.png:
     59        * platform/mac/tables/mozilla_expected_failures/core/captions2-expected.txt:
     60
    1612014-06-21  Commit Queue  <commit-queue@webkit.org>
    262
  • trunk/LayoutTests/platform/mac-mountainlion/fast/block/margin-collapse/103-expected.txt

    r162742 r170257  
    8181                text run at (0,2) width 220: "Your research is primarily focused on:"
    8282            RenderBlock {SPAN} at (325,250) size 180x21 [color=#333333]
    83               RenderBlock {INPUT} at (2,3) size 12x13 [color=#000000]
     83              RenderBlock {INPUT} at (2,4) size 12x12 [color=#000000]
    8484              RenderText {#text} at (16,2) size 32x15
    8585                text run at (16,2) width 32: "Texts"
    8686            RenderBlock {SPAN} at (325,270) size 180x21 [color=#333333]
    87               RenderBlock {INPUT} at (2,3) size 12x13 [color=#000000]
     87              RenderBlock {INPUT} at (2,4) size 12x12 [color=#000000]
    8888              RenderText {#text} at (16,2) size 133x15
    8989                text run at (16,2) width 133: "Performance materials"
    9090            RenderBlock {SPAN} at (325,290) size 180x21 [color=#333333]
    91               RenderBlock {INPUT} at (2,3) size 12x13 [color=#000000]
     91              RenderBlock {INPUT} at (2,4) size 12x12 [color=#000000]
    9292              RenderText {#text} at (16,2) size 21x15
    9393                text run at (16,2) width 21: "n/a"
     
    101101              RenderText {#text} at (0,2) size 19x15
    102102                text run at (0,2) width 19: "Yes"
    103               RenderBlock {INPUT} at (21,3) size 12x13 [color=#000000]
     103              RenderBlock {INPUT} at (21,4) size 12x12 [color=#000000]
    104104              RenderText {#text} at (35,2) size 19x15
    105105                text run at (35,2) width 4: " "
    106106                text run at (39,2) width 15: "No"
    107               RenderBlock {INPUT} at (56,3) size 12x13 [color=#000000]
     107              RenderBlock {INPUT} at (56,4) size 12x12 [color=#000000]
    108108              RenderText {#text} at (0,0) size 0x0
    109109            RenderBlock {P} at (0,394) size 560x21 [color=#333333]
  • trunk/LayoutTests/platform/mac-mountainlion/fast/forms/basic-inputs-expected.txt

    r162742 r170257  
    6161        RenderText {#text} at (1,1) size 7x18
    6262          text run at (1,1) width 7: "a"
    63         RenderBlock {INPUT} at (10,4) size 12x13
     63        RenderBlock {INPUT} at (10,5) size 12x12
    6464        RenderText {#text} at (24,1) size 36x18
    6565          text run at (24,1) width 36: "radio "
    66         RenderBlock {INPUT} at (62,4) size 12x13
     66        RenderBlock {INPUT} at (62,5) size 12x12
    6767        RenderText {#text} at (76,1) size 8x18
    6868          text run at (76,1) width 8: "b"
  • trunk/LayoutTests/platform/mac-mountainlion/fast/forms/box-shadow-override-expected.txt

    r162803 r170257  
    3232        RenderText {#text} at (0,0) size 0x0
    3333      RenderBlock (anonymous) at (0,137) size 784x32
    34         RenderBlock {INPUT} at (2,12) size 12x13
     34        RenderBlock {INPUT} at (2,13) size 12x12
    3535        RenderText {#text} at (16,9) size 4x18
    3636          text run at (16,9) width 4: " "
  • trunk/LayoutTests/platform/mac-mountainlion/fast/forms/form-element-geometry-expected.txt

    r162803 r170257  
    3030                      RenderText at (8,2) size 31x13
    3131                        text run at (8,2) width 31: "menu"
    32             RenderTableCell {TD} at (132,4) size 18x19 [r=0 c=2 rs=1 cs=1]
    33               RenderBlock {DIV} at (1,1) size 16x17 [border: (2px solid #0000FF)]
     32            RenderTableCell {TD} at (132,5) size 18x18 [r=0 c=2 rs=1 cs=1]
     33              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
    3434                RenderInline {FONT} at (0,0) size 12x28
    35                   RenderBlock {INPUT} at (2,2) size 12x13
     35                  RenderBlock {INPUT} at (2,2) size 12x12
    3636            RenderTableCell {TD} at (152,5) size 18x18 [r=0 c=3 rs=1 cs=1]
    3737              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
     
    5353                    RenderText at (8,2) size 31x13
    5454                      text run at (8,2) width 31: "menu"
    55             RenderTableCell {TD} at (132,4) size 18x19 [r=0 c=2 rs=1 cs=1]
    56               RenderBlock {DIV} at (1,1) size 16x17 [border: (2px solid #0000FF)]
    57                 RenderBlock {INPUT} at (2,2) size 12x13
     55            RenderTableCell {TD} at (132,5) size 18x18 [r=0 c=2 rs=1 cs=1]
     56              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
     57                RenderBlock {INPUT} at (2,2) size 12x12
    5858            RenderTableCell {TD} at (152,5) size 18x18 [r=0 c=3 rs=1 cs=1]
    5959              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
     
    7676                      RenderText at (8,2) size 31x13
    7777                        text run at (8,2) width 31: "menu"
    78             RenderTableCell {TD} at (132,4) size 18x19 [r=0 c=2 rs=1 cs=1]
    79               RenderBlock {DIV} at (1,1) size 16x17 [border: (2px solid #0000FF)]
     78            RenderTableCell {TD} at (132,5) size 18x18 [r=0 c=2 rs=1 cs=1]
     79              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
    8080                RenderInline {FONT} at (0,0) size 12x13
    81                   RenderBlock {INPUT} at (2,2) size 12x13
     81                  RenderBlock {INPUT} at (2,2) size 12x12
    8282            RenderTableCell {TD} at (152,5) size 18x18 [r=0 c=3 rs=1 cs=1]
    8383              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
     
    121121          RenderText {#text} at (170,0) size 7x28
    122122            text run at (170,0) width 7: " "
    123           RenderBlock {INPUT} at (178,11) size 13x13
     123          RenderBlock {INPUT} at (178,12) size 13x12
    124124          RenderText {#text} at (192,0) size 7x28
    125125            text run at (192,0) width 7: " "
     
    141141        RenderText {#text} at (152,1) size 5x18
    142142          text run at (152,1) width 5: " "
    143         RenderBlock {INPUT} at (158,4) size 13x13
     143        RenderBlock {INPUT} at (158,5) size 13x12
    144144        RenderText {#text} at (172,1) size 5x18
    145145          text run at (172,1) width 5: " "
     
    162162          RenderText {#text} at (142,5) size 4x13
    163163            text run at (142,5) width 4: " "
    164           RenderBlock {INPUT} at (147,4) size 13x13
     164          RenderBlock {INPUT} at (147,5) size 13x12
    165165          RenderText {#text} at (161,5) size 4x13
    166166            text run at (161,5) width 4: " "
  • trunk/LayoutTests/platform/mac-mountainlion/fast/forms/input-appearance-height-expected.txt

    r162803 r170257  
    4444        RenderText {#text} at (0,105) size 36x18
    4545          text run at (0,105) width 36: "radio "
    46         RenderBlock {INPUT} at (38,108) size 12x13
     46        RenderBlock {INPUT} at (38,109) size 12x12
    4747        RenderText {#text} at (52,105) size 4x18
    4848          text run at (52,105) width 4: " "
  • trunk/LayoutTests/platform/mac-mountainlion/fast/forms/input-value-expected.txt

    r162803 r170257  
    1212          text run at (0,0) width 713: "Results that match Gecko are like WinIE, but with \"before\" for the attribute in the first two rows and the last row."
    1313      RenderBlock {HR} at (0,86) size 784x2 [border: (1px inset #000000)]
    14       RenderBlock {FORM} at (0,96) size 784x366
    15         RenderTable {TABLE} at (0,0) size 761x366
     14      RenderBlock {FORM} at (0,96) size 784x365
     15        RenderTable {TABLE} at (0,0) size 761x365
    1616          RenderTableSection {THEAD} at (0,0) size 761x24
    1717            RenderTableRow {TR} at (0,2) size 761x20
     
    2828                RenderText {#text} at (1,1) size 59x18
    2929                  text run at (1,1) width 59: "attribute"
    30           RenderTableSection {TBODY} at (0,24) size 761x342
     30          RenderTableSection {TBODY} at (0,24) size 761x341
    3131            RenderTableRow {TR} at (0,0) size 761x25
    3232              RenderTableCell {TD} at (2,2) size 385x20 [r=0 c=0 rs=1 cs=1]
     
    103103                RenderText {#text} at (1,1) size 28x18
    104104                  text run at (1,1) width 28: "after"
    105             RenderTableRow {TR} at (0,146) size 761x21
     105            RenderTableRow {TR} at (0,146) size 761x20
    106106              RenderTableCell {TD} at (2,146) size 385x20 [r=6 c=0 rs=1 cs=1]
    107107                RenderText {#text} at (1,1) size 216x18
    108108                  text run at (1,1) width 216: "radio with value property changed"
    109               RenderTableCell {TD} at (389,146) size 243x21 [r=6 c=1 rs=1 cs=1]
    110                 RenderBlock {INPUT} at (3,4) size 12x13
     109              RenderTableCell {TD} at (389,146) size 243x20 [r=6 c=1 rs=1 cs=1]
     110                RenderBlock {INPUT} at (3,4) size 12x12
    111111              RenderTableCell {TD} at (634,146) size 62x20 [r=6 c=2 rs=1 cs=1]
    112112                RenderText {#text} at (1,1) size 28x18
     
    115115                RenderText {#text} at (1,1) size 28x18
    116116                  text run at (1,1) width 28: "after"
    117             RenderTableRow {TR} at (0,169) size 761x25
    118               RenderTableCell {TD} at (2,171) size 385x20 [r=7 c=0 rs=1 cs=1]
     117            RenderTableRow {TR} at (0,168) size 761x25
     118              RenderTableCell {TD} at (2,170) size 385x20 [r=7 c=0 rs=1 cs=1]
    119119                RenderText {#text} at (1,1) size 205x18
    120120                  text run at (1,1) width 205: "text with value attribute changed"
    121               RenderTableCell {TD} at (389,169) size 243x25 [r=7 c=1 rs=1 cs=1]
    122                 RenderTextControl {INPUT} at (3,3) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    123               RenderTableCell {TD} at (634,171) size 62x20 [r=7 c=2 rs=1 cs=1]
    124                 RenderText {#text} at (1,1) size 28x18
    125                   text run at (1,1) width 28: "after"
    126               RenderTableCell {TD} at (698,171) size 61x20 [r=7 c=3 rs=1 cs=1]
    127                 RenderText {#text} at (1,1) size 28x18
    128                   text run at (1,1) width 28: "after"
    129             RenderTableRow {TR} at (0,196) size 761x20
    130               RenderTableCell {TD} at (2,196) size 385x20 [r=8 c=0 rs=1 cs=1]
     121              RenderTableCell {TD} at (389,168) size 243x25 [r=7 c=1 rs=1 cs=1]
     122                RenderTextControl {INPUT} at (3,3) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     123              RenderTableCell {TD} at (634,170) size 62x20 [r=7 c=2 rs=1 cs=1]
     124                RenderText {#text} at (1,1) size 28x18
     125                  text run at (1,1) width 28: "after"
     126              RenderTableCell {TD} at (698,170) size 61x20 [r=7 c=3 rs=1 cs=1]
     127                RenderText {#text} at (1,1) size 28x18
     128                  text run at (1,1) width 28: "after"
     129            RenderTableRow {TR} at (0,195) size 761x20
     130              RenderTableCell {TD} at (2,195) size 385x20 [r=8 c=0 rs=1 cs=1]
    131131                RenderText {#text} at (1,1) size 247x18
    132132                  text run at (1,1) width 247: "check box with value attribute changed"
    133               RenderTableCell {TD} at (389,196) size 243x20 [r=8 c=1 rs=1 cs=1]
    134                 RenderBlock {INPUT} at (3,4) size 12x12
    135               RenderTableCell {TD} at (634,196) size 62x20 [r=8 c=2 rs=1 cs=1]
    136                 RenderText {#text} at (1,1) size 28x18
    137                   text run at (1,1) width 28: "after"
    138               RenderTableCell {TD} at (698,196) size 61x20 [r=8 c=3 rs=1 cs=1]
    139                 RenderText {#text} at (1,1) size 28x18
    140                   text run at (1,1) width 28: "after"
    141             RenderTableRow {TR} at (0,218) size 761x20
    142               RenderTableCell {TD} at (2,218) size 385x20 [r=9 c=0 rs=1 cs=1]
     133              RenderTableCell {TD} at (389,195) size 243x20 [r=8 c=1 rs=1 cs=1]
     134                RenderBlock {INPUT} at (3,4) size 12x12
     135              RenderTableCell {TD} at (634,195) size 62x20 [r=8 c=2 rs=1 cs=1]
     136                RenderText {#text} at (1,1) size 28x18
     137                  text run at (1,1) width 28: "after"
     138              RenderTableCell {TD} at (698,195) size 61x20 [r=8 c=3 rs=1 cs=1]
     139                RenderText {#text} at (1,1) size 28x18
     140                  text run at (1,1) width 28: "after"
     141            RenderTableRow {TR} at (0,217) size 761x20
     142              RenderTableCell {TD} at (2,217) size 385x20 [r=9 c=0 rs=1 cs=1]
    143143                RenderText {#text} at (1,1) size 383x18
    144144                  text run at (1,1) width 383: "text with value property changed, then turned into check box"
    145               RenderTableCell {TD} at (389,218) size 243x20 [r=9 c=1 rs=1 cs=1]
    146                 RenderBlock {INPUT} at (3,4) size 12x12
    147               RenderTableCell {TD} at (634,218) size 62x20 [r=9 c=2 rs=1 cs=1]
    148                 RenderText {#text} at (1,1) size 28x18
    149                   text run at (1,1) width 28: "after"
    150               RenderTableCell {TD} at (698,218) size 61x20 [r=9 c=3 rs=1 cs=1]
    151                 RenderText {#text} at (1,1) size 28x18
    152                   text run at (1,1) width 28: "after"
    153             RenderTableRow {TR} at (0,240) size 761x25
    154               RenderTableCell {TD} at (2,242) size 385x20 [r=10 c=0 rs=1 cs=1]
     145              RenderTableCell {TD} at (389,217) size 243x20 [r=9 c=1 rs=1 cs=1]
     146                RenderBlock {INPUT} at (3,4) size 12x12
     147              RenderTableCell {TD} at (634,217) size 62x20 [r=9 c=2 rs=1 cs=1]
     148                RenderText {#text} at (1,1) size 28x18
     149                  text run at (1,1) width 28: "after"
     150              RenderTableCell {TD} at (698,217) size 61x20 [r=9 c=3 rs=1 cs=1]
     151                RenderText {#text} at (1,1) size 28x18
     152                  text run at (1,1) width 28: "after"
     153            RenderTableRow {TR} at (0,239) size 761x25
     154              RenderTableCell {TD} at (2,241) size 385x20 [r=10 c=0 rs=1 cs=1]
    155155                RenderText {#text} at (1,1) size 383x18
    156156                  text run at (1,1) width 383: "check box with value property changed, then turned into text"
    157               RenderTableCell {TD} at (389,240) size 243x25 [r=10 c=1 rs=1 cs=1]
    158                 RenderTextControl {INPUT} at (3,3) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    159               RenderTableCell {TD} at (634,242) size 62x20 [r=10 c=2 rs=1 cs=1]
    160                 RenderText {#text} at (1,1) size 28x18
    161                   text run at (1,1) width 28: "after"
    162               RenderTableCell {TD} at (698,242) size 61x20 [r=10 c=3 rs=1 cs=1]
    163                 RenderText {#text} at (1,1) size 28x18
    164                   text run at (1,1) width 28: "after"
    165             RenderTableRow {TR} at (0,267) size 761x20
    166               RenderTableCell {TD} at (2,267) size 385x20 [r=11 c=0 rs=1 cs=1]
     157              RenderTableCell {TD} at (389,239) size 243x25 [r=10 c=1 rs=1 cs=1]
     158                RenderTextControl {INPUT} at (3,3) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     159              RenderTableCell {TD} at (634,241) size 62x20 [r=10 c=2 rs=1 cs=1]
     160                RenderText {#text} at (1,1) size 28x18
     161                  text run at (1,1) width 28: "after"
     162              RenderTableCell {TD} at (698,241) size 61x20 [r=10 c=3 rs=1 cs=1]
     163                RenderText {#text} at (1,1) size 28x18
     164                  text run at (1,1) width 28: "after"
     165            RenderTableRow {TR} at (0,266) size 761x20
     166              RenderTableCell {TD} at (2,266) size 385x20 [r=11 c=0 rs=1 cs=1]
    167167                RenderText {#text} at (1,1) size 381x18
    168168                  text run at (1,1) width 381: "text with value attribute changed, then turned into check box"
    169               RenderTableCell {TD} at (389,267) size 243x20 [r=11 c=1 rs=1 cs=1]
    170                 RenderBlock {INPUT} at (3,4) size 12x12
    171               RenderTableCell {TD} at (634,267) size 62x20 [r=11 c=2 rs=1 cs=1]
    172                 RenderText {#text} at (1,1) size 28x18
    173                   text run at (1,1) width 28: "after"
    174               RenderTableCell {TD} at (698,267) size 61x20 [r=11 c=3 rs=1 cs=1]
    175                 RenderText {#text} at (1,1) size 28x18
    176                   text run at (1,1) width 28: "after"
    177             RenderTableRow {TR} at (0,289) size 761x25
    178               RenderTableCell {TD} at (2,291) size 385x20 [r=12 c=0 rs=1 cs=1]
     169              RenderTableCell {TD} at (389,266) size 243x20 [r=11 c=1 rs=1 cs=1]
     170                RenderBlock {INPUT} at (3,4) size 12x12
     171              RenderTableCell {TD} at (634,266) size 62x20 [r=11 c=2 rs=1 cs=1]
     172                RenderText {#text} at (1,1) size 28x18
     173                  text run at (1,1) width 28: "after"
     174              RenderTableCell {TD} at (698,266) size 61x20 [r=11 c=3 rs=1 cs=1]
     175                RenderText {#text} at (1,1) size 28x18
     176                  text run at (1,1) width 28: "after"
     177            RenderTableRow {TR} at (0,288) size 761x25
     178              RenderTableCell {TD} at (2,290) size 385x20 [r=12 c=0 rs=1 cs=1]
    179179                RenderText {#text} at (1,1) size 381x18
    180180                  text run at (1,1) width 381: "check box with value attribute changed, then turned into text"
    181               RenderTableCell {TD} at (389,289) size 243x25 [r=12 c=1 rs=1 cs=1]
    182                 RenderTextControl {INPUT} at (3,3) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    183               RenderTableCell {TD} at (634,291) size 62x20 [r=12 c=2 rs=1 cs=1]
    184                 RenderText {#text} at (1,1) size 28x18
    185                   text run at (1,1) width 28: "after"
    186               RenderTableCell {TD} at (698,291) size 61x20 [r=12 c=3 rs=1 cs=1]
    187                 RenderText {#text} at (1,1) size 28x18
    188                   text run at (1,1) width 28: "after"
    189             RenderTableRow {TR} at (0,316) size 761x24
    190               RenderTableCell {TD} at (2,318) size 385x20 [r=13 c=0 rs=1 cs=1]
     181              RenderTableCell {TD} at (389,288) size 243x25 [r=12 c=1 rs=1 cs=1]
     182                RenderTextControl {INPUT} at (3,3) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     183              RenderTableCell {TD} at (634,290) size 62x20 [r=12 c=2 rs=1 cs=1]
     184                RenderText {#text} at (1,1) size 28x18
     185                  text run at (1,1) width 28: "after"
     186              RenderTableCell {TD} at (698,290) size 61x20 [r=12 c=3 rs=1 cs=1]
     187                RenderText {#text} at (1,1) size 28x18
     188                  text run at (1,1) width 28: "after"
     189            RenderTableRow {TR} at (0,315) size 761x24
     190              RenderTableCell {TD} at (2,317) size 385x20 [r=13 c=0 rs=1 cs=1]
    191191                RenderText {#text} at (1,1) size 204x18
    192192                  text run at (1,1) width 204: "file with value property changed"
    193               RenderTableCell {TD} at (389,316) size 243x24 [r=13 c=1 rs=1 cs=1]
     193              RenderTableCell {TD} at (389,315) size 243x24 [r=13 c=1 rs=1 cs=1]
    194194                RenderFileUploadControl {INPUT} at (3,3) size 237x18 "no file selected"
    195195                  RenderButton {INPUT} at (0,0) size 78x18 [bgcolor=#C0C0C0]
     
    197197                      RenderText at (0,0) size 62x13
    198198                        text run at (0,0) width 62: "Choose File"
    199               RenderTableCell {TD} at (634,327) size 62x2 [r=13 c=2 rs=1 cs=1]
    200               RenderTableCell {TD} at (698,318) size 61x20 [r=13 c=3 rs=1 cs=1]
     199              RenderTableCell {TD} at (634,326) size 62x2 [r=13 c=2 rs=1 cs=1]
     200              RenderTableCell {TD} at (698,317) size 61x20 [r=13 c=3 rs=1 cs=1]
    201201                RenderText {#text} at (1,1) size 40x18
    202202                  text run at (1,1) width 40: "before"
     
    209209    RenderText {#text} at (0,0) size 37x13
    210210      text run at (0,0) width 37: "\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}"
    211 layer at (403,303) size 117x13
     211layer at (403,302) size 117x13
    212212  RenderBlock {DIV} at (3,3) size 117x13
    213213    RenderText {#text} at (0,0) size 25x13
    214214      text run at (0,0) width 25: "after"
    215 layer at (403,374) size 117x13
     215layer at (403,373) size 117x13
    216216  RenderBlock {DIV} at (3,3) size 117x13
    217217    RenderText {#text} at (0,0) size 25x13
    218218      text run at (0,0) width 25: "after"
    219 layer at (403,423) size 117x13
     219layer at (403,422) size 117x13
    220220  RenderBlock {DIV} at (3,3) size 117x13
    221221    RenderText {#text} at (0,0) size 25x13
  • trunk/LayoutTests/platform/mac-mountainlion/fast/replaced/replaced-breaking-expected.txt

    r162803 r170257  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x584
    6       RenderBlock {DIV} at (0,0) size 32x538 [border: (1px solid #FF0000)]
     6      RenderBlock {DIV} at (0,0) size 32x536 [border: (1px solid #FF0000)]
    77        RenderTextControl {INPUT} at (3,3) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    88        RenderTextControl {INPUT} at (3,26) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     
    4444        RenderBlock {INPUT} at (3,376) size 12x12
    4545        RenderText {#text} at (0,0) size 0x0
    46         RenderBlock {INPUT} at (3,394) size 12x13
    47         RenderBlock {INPUT} at (3,413) size 12x13
     46        RenderBlock {INPUT} at (3,394) size 12x12
     47        RenderBlock {INPUT} at (3,412) size 12x12
    4848        RenderText {#text} at (0,0) size 0x0
    49         RenderIFrame {IFRAME} at (1,429) size 27x27 [border: (1px solid #000000)]
     49        RenderIFrame {IFRAME} at (1,427) size 27x27 [border: (1px solid #000000)]
    5050          layer at (0,0) size 25x25
    5151            RenderView at (0,0) size 25x25
     
    5353            RenderBlock {HTML} at (0,0) size 25x25
    5454              RenderBody {BODY} at (8,8) size 9x9
    55         RenderIFrame {IFRAME} at (1,456) size 27x27 [border: (1px solid #000000)]
     55        RenderIFrame {IFRAME} at (1,454) size 27x27 [border: (1px solid #000000)]
    5656          layer at (0,0) size 25x25
    5757            RenderView at (0,0) size 25x25
     
    6060              RenderBody {BODY} at (8,8) size 9x9
    6161        RenderText {#text} at (0,0) size 0x0
    62         RenderEmbeddedObject {EMBED} at (1,483) size 27x27 [border: (1px solid #000000)]
    63         RenderEmbeddedObject {EMBED} at (1,510) size 27x27 [border: (1px solid #000000)]
     62        RenderEmbeddedObject {EMBED} at (1,481) size 27x27 [border: (1px solid #000000)]
     63        RenderEmbeddedObject {EMBED} at (1,508) size 27x27 [border: (1px solid #000000)]
    6464        RenderText {#text} at (0,0) size 0x0
    6565layer at (14,14) size 117x13
  • trunk/LayoutTests/platform/mac-mountainlion/tables/mozilla/bugs/bug4527-expected.txt

    r162742 r170257  
    4040              RenderImage {INPUT} at (80,3) size 26x18
    4141            RenderTableCell {TD} at (482,70) size 131x25 [bgcolor=#CCCCCC] [r=1 c=3 rs=1 cs=1]
    42               RenderBlock {INPUT} at (2,5) size 12x13
     42              RenderBlock {INPUT} at (2,6) size 12x12
    4343              RenderImage {IMG} at (16,0) size 40x25
    44               RenderBlock {INPUT} at (58,5) size 12x13
     44              RenderBlock {INPUT} at (58,6) size 12x12
    4545              RenderText {#text} at (72,2) size 4x18
    4646                text run at (72,2) width 4: " "
  • trunk/LayoutTests/platform/mac/css1/box_properties/acid_test-expected.txt

    r170242 r170257  
    2020                RenderInline {FORM} at (0,0) size 0x0
    2121                  RenderText {#text} at (0,0) size 0x0
    22               RenderBlock (anonymous) at (10,20) size 140x40
    23                 RenderBlock {P} at (0,0) size 140x20
    24                   RenderText {#text} at (0,4) size 28x12
    25                     text run at (0,4) width 28: "bang "
    26                   RenderBlock {INPUT} at (30,3) size 12x13 [color=#000000]
     22              RenderBlock (anonymous) at (10,20) size 140x38
     23                RenderBlock {P} at (0,0) size 140x19
     24                  RenderText {#text} at (0,3) size 28x12
     25                    text run at (0,3) width 28: "bang "
     26                  RenderBlock {INPUT} at (30,3) size 12x12 [color=#000000]
    2727                  RenderText {#text} at (0,0) size 0x0
    28                 RenderBlock {P} at (0,20) size 140x20
    29                   RenderText {#text} at (0,4) size 47x12
    30                     text run at (0,4) width 47: "whimper "
    31                   RenderBlock {INPUT} at (49,3) size 12x13 [color=#000000]
     28                RenderBlock {P} at (0,19) size 140x19
     29                  RenderText {#text} at (0,3) size 47x12
     30                    text run at (0,3) width 47: "whimper "
     31                  RenderBlock {INPUT} at (49,3) size 12x12 [color=#000000]
    3232                  RenderText {#text} at (0,0) size 0x0
    33               RenderBlock (anonymous) at (10,60) size 140x0
     33              RenderBlock (anonymous) at (10,58) size 140x0
    3434                RenderInline {FORM} at (0,0) size 0x0
    3535                RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/css2.1/t09-c5526c-display-00-e-expected.txt

    r170242 r170257  
    2020                RenderInline {FORM} at (0,0) size 0x0
    2121                  RenderText {#text} at (0,0) size 0x0
    22               RenderBlock (anonymous) at (10,20) size 140x40
    23                 RenderBlock {P} at (0,0) size 140x20
    24                   RenderText {#text} at (0,4) size 28x12
    25                     text run at (0,4) width 28: "bang "
    26                   RenderBlock {INPUT} at (30,3) size 12x13 [color=#000000]
     22              RenderBlock (anonymous) at (10,20) size 140x38
     23                RenderBlock {P} at (0,0) size 140x19
     24                  RenderText {#text} at (0,3) size 28x12
     25                    text run at (0,3) width 28: "bang "
     26                  RenderBlock {INPUT} at (30,3) size 12x12 [color=#000000]
    2727                  RenderText {#text} at (0,0) size 0x0
    28                 RenderBlock {P} at (0,20) size 140x20
    29                   RenderText {#text} at (0,4) size 47x12
    30                     text run at (0,4) width 47: "whimper "
    31                   RenderBlock {INPUT} at (49,3) size 12x13 [color=#000000]
     28                RenderBlock {P} at (0,19) size 140x19
     29                  RenderText {#text} at (0,3) size 47x12
     30                    text run at (0,3) width 47: "whimper "
     31                  RenderBlock {INPUT} at (49,3) size 12x12 [color=#000000]
    3232                  RenderText {#text} at (0,0) size 0x0
    33               RenderBlock (anonymous) at (10,60) size 140x0
     33              RenderBlock (anonymous) at (10,58) size 140x0
    3434                RenderInline {FORM} at (0,0) size 0x0
    3535                RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/fast/block/basic/011-expected.txt

    r170242 r170257  
    2020                RenderInline {FORM} at (0,0) size 0x0
    2121                  RenderText {#text} at (0,0) size 0x0
    22               RenderBlock (anonymous) at (10,20) size 140x40
    23                 RenderBlock {P} at (0,0) size 140x20
    24                   RenderText {#text} at (0,4) size 28x12
    25                     text run at (0,4) width 28: "bang "
    26                   RenderBlock {INPUT} at (30,3) size 12x13 [color=#000000]
     22              RenderBlock (anonymous) at (10,20) size 140x38
     23                RenderBlock {P} at (0,0) size 140x19
     24                  RenderText {#text} at (0,3) size 28x12
     25                    text run at (0,3) width 28: "bang "
     26                  RenderBlock {INPUT} at (30,3) size 12x12 [color=#000000]
    2727                  RenderText {#text} at (0,0) size 0x0
    28                 RenderBlock {P} at (0,20) size 140x20
    29                   RenderText {#text} at (0,4) size 47x12
    30                     text run at (0,4) width 47: "whimper "
    31                   RenderBlock {INPUT} at (49,3) size 12x13 [color=#000000]
     28                RenderBlock {P} at (0,19) size 140x19
     29                  RenderText {#text} at (0,3) size 47x12
     30                    text run at (0,3) width 47: "whimper "
     31                  RenderBlock {INPUT} at (49,3) size 12x12 [color=#000000]
    3232                  RenderText {#text} at (0,0) size 0x0
    33               RenderBlock (anonymous) at (10,60) size 140x0
     33              RenderBlock (anonymous) at (10,58) size 140x0
    3434                RenderInline {FORM} at (0,0) size 0x0
    3535                RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/fast/block/margin-collapse/103-expected.txt

    r170242 r170257  
    8181                text run at (0,2) width 220: "Your research is primarily focused on:"
    8282            RenderBlock {SPAN} at (325,250) size 180x21 [color=#333333]
    83               RenderBlock {INPUT} at (2,3) size 12x13 [color=#000000]
     83              RenderBlock {INPUT} at (2,4) size 12x12 [color=#000000]
    8484              RenderText {#text} at (16,2) size 32x15
    8585                text run at (16,2) width 32: "Texts"
    8686            RenderBlock {SPAN} at (325,270) size 180x21 [color=#333333]
    87               RenderBlock {INPUT} at (2,3) size 12x13 [color=#000000]
     87              RenderBlock {INPUT} at (2,4) size 12x12 [color=#000000]
    8888              RenderText {#text} at (16,2) size 133x15
    8989                text run at (16,2) width 133: "Performance materials"
    9090            RenderBlock {SPAN} at (325,290) size 180x21 [color=#333333]
    91               RenderBlock {INPUT} at (2,3) size 12x13 [color=#000000]
     91              RenderBlock {INPUT} at (2,4) size 12x12 [color=#000000]
    9292              RenderText {#text} at (16,2) size 21x15
    9393                text run at (16,2) width 21: "n/a"
     
    101101              RenderText {#text} at (0,2) size 19x15
    102102                text run at (0,2) width 19: "Yes"
    103               RenderBlock {INPUT} at (21,3) size 12x13 [color=#000000]
     103              RenderBlock {INPUT} at (21,4) size 12x12 [color=#000000]
    104104              RenderText {#text} at (35,2) size 19x15
    105105                text run at (35,2) width 4: " "
    106106                text run at (39,2) width 15: "No"
    107               RenderBlock {INPUT} at (56,3) size 12x13 [color=#000000]
     107              RenderBlock {INPUT} at (56,4) size 12x12 [color=#000000]
    108108              RenderText {#text} at (0,0) size 0x0
    109109            RenderBlock {P} at (0,394) size 560x21 [color=#333333]
  • trunk/LayoutTests/platform/mac/fast/forms/basic-inputs-expected.txt

    r170242 r170257  
    6161        RenderText {#text} at (1,1) size 7x18
    6262          text run at (1,1) width 7: "a"
    63         RenderBlock {INPUT} at (10,4) size 12x13
     63        RenderBlock {INPUT} at (10,5) size 12x12
    6464        RenderText {#text} at (24,1) size 36x18
    6565          text run at (24,1) width 36: "radio "
    66         RenderBlock {INPUT} at (62,4) size 12x13
     66        RenderBlock {INPUT} at (62,5) size 12x12
    6767        RenderText {#text} at (76,1) size 8x18
    6868          text run at (76,1) width 8: "b"
  • trunk/LayoutTests/platform/mac/fast/forms/box-shadow-override-expected.txt

    r170242 r170257  
    3232        RenderText {#text} at (0,0) size 0x0
    3333      RenderBlock (anonymous) at (0,137) size 784x32
    34         RenderBlock {INPUT} at (2,12) size 12x13
     34        RenderBlock {INPUT} at (2,13) size 12x12
    3535        RenderText {#text} at (16,9) size 4x18
    3636          text run at (16,9) width 4: " "
  • trunk/LayoutTests/platform/mac/fast/forms/form-element-geometry-expected.txt

    r170242 r170257  
    3030                      RenderText at (8,2) size 31x13
    3131                        text run at (8,2) width 31: "menu"
    32             RenderTableCell {TD} at (132,4) size 18x19 [r=0 c=2 rs=1 cs=1]
    33               RenderBlock {DIV} at (1,1) size 16x17 [border: (2px solid #0000FF)]
     32            RenderTableCell {TD} at (132,5) size 18x18 [r=0 c=2 rs=1 cs=1]
     33              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
    3434                RenderInline {FONT} at (0,0) size 12x28
    35                   RenderBlock {INPUT} at (2,2) size 12x13
     35                  RenderBlock {INPUT} at (2,2) size 12x12
    3636            RenderTableCell {TD} at (152,5) size 18x18 [r=0 c=3 rs=1 cs=1]
    3737              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
     
    5353                    RenderText at (8,2) size 31x13
    5454                      text run at (8,2) width 31: "menu"
    55             RenderTableCell {TD} at (132,4) size 18x19 [r=0 c=2 rs=1 cs=1]
    56               RenderBlock {DIV} at (1,1) size 16x17 [border: (2px solid #0000FF)]
    57                 RenderBlock {INPUT} at (2,2) size 12x13
     55            RenderTableCell {TD} at (132,5) size 18x18 [r=0 c=2 rs=1 cs=1]
     56              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
     57                RenderBlock {INPUT} at (2,2) size 12x12
    5858            RenderTableCell {TD} at (152,5) size 18x18 [r=0 c=3 rs=1 cs=1]
    5959              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
     
    7676                      RenderText at (8,2) size 31x13
    7777                        text run at (8,2) width 31: "menu"
    78             RenderTableCell {TD} at (132,4) size 18x19 [r=0 c=2 rs=1 cs=1]
    79               RenderBlock {DIV} at (1,1) size 16x17 [border: (2px solid #0000FF)]
     78            RenderTableCell {TD} at (132,5) size 18x18 [r=0 c=2 rs=1 cs=1]
     79              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
    8080                RenderInline {FONT} at (0,0) size 12x13
    81                   RenderBlock {INPUT} at (2,2) size 12x13
     81                  RenderBlock {INPUT} at (2,2) size 12x12
    8282            RenderTableCell {TD} at (152,5) size 18x18 [r=0 c=3 rs=1 cs=1]
    8383              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
     
    121121          RenderText {#text} at (170,0) size 7x28
    122122            text run at (170,0) width 7: " "
    123           RenderBlock {INPUT} at (178,11) size 13x13
     123          RenderBlock {INPUT} at (178,12) size 13x12
    124124          RenderText {#text} at (192,0) size 7x28
    125125            text run at (192,0) width 7: " "
     
    141141        RenderText {#text} at (152,1) size 5x18
    142142          text run at (152,1) width 5: " "
    143         RenderBlock {INPUT} at (158,4) size 13x13
     143        RenderBlock {INPUT} at (158,5) size 13x12
    144144        RenderText {#text} at (172,1) size 5x18
    145145          text run at (172,1) width 5: " "
     
    162162          RenderText {#text} at (142,5) size 4x13
    163163            text run at (142,5) width 4: " "
    164           RenderBlock {INPUT} at (147,4) size 13x13
     164          RenderBlock {INPUT} at (147,5) size 13x12
    165165          RenderText {#text} at (161,5) size 4x13
    166166            text run at (161,5) width 4: " "
  • trunk/LayoutTests/platform/mac/fast/forms/formmove-expected.txt

    r170242 r170257  
    55    RenderBody {BODY} at (8,8) size 784x584
    66      RenderBlock {FORM} at (0,0) size 784x19
    7         RenderBlock {INPUT} at (2,3) size 12x13
     7        RenderBlock {INPUT} at (2,4) size 12x12
    88        RenderText {#text} at (16,0) size 34x18
    99          text run at (16,0) width 34: "Two "
    10         RenderBlock {INPUT} at (52,3) size 12x13
     10        RenderBlock {INPUT} at (52,4) size 12x12
    1111        RenderText {#text} at (66,0) size 37x18
    1212          text run at (66,0) width 37: "Three"
    1313      RenderBlock {FORM} at (0,35) size 784x19
    14         RenderBlock {INPUT} at (2,3) size 12x13
     14        RenderBlock {INPUT} at (2,4) size 12x12
    1515        RenderText {#text} at (16,0) size 31x18
    1616          text run at (16,0) width 31: "One "
    17         RenderBlock {INPUT} at (49,3) size 12x13
     17        RenderBlock {INPUT} at (49,4) size 12x12
    1818        RenderText {#text} at (63,0) size 34x18
    1919          text run at (63,0) width 34: "Two "
    20         RenderBlock {INPUT} at (99,3) size 12x13
     20        RenderBlock {INPUT} at (99,4) size 12x12
    2121        RenderText {#text} at (113,0) size 41x18
    2222          text run at (113,0) width 41: "Three "
    23         RenderBlock {INPUT} at (156,3) size 12x13
     23        RenderBlock {INPUT} at (156,4) size 12x12
    2424        RenderText {#text} at (170,0) size 27x18
    2525          text run at (170,0) width 27: "One"
  • trunk/LayoutTests/platform/mac/fast/forms/formmove2-expected.txt

    r170242 r170257  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x584
    6       RenderBlock {FORM} at (0,0) size 784x19
    7         RenderBlock {INPUT} at (2,3) size 12x13
    8         RenderBlock {INPUT} at (18,3) size 12x13
    9       RenderBlock (anonymous) at (0,35) size 784x36
     6      RenderBlock {FORM} at (0,0) size 784x18
     7        RenderBlock {INPUT} at (2,3) size 12x12
     8        RenderBlock {INPUT} at (18,3) size 12x12
     9      RenderBlock (anonymous) at (0,34) size 784x36
    1010        RenderText {#text} at (0,0) size 777x36
    1111          text run at (0,0) width 777: "There should be two elements in the first form and one in the second. The count in form one is 2, and the count in form two"
  • trunk/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt

    r170242 r170257  
    4444        RenderText {#text} at (0,105) size 36x18
    4545          text run at (0,105) width 36: "radio "
    46         RenderBlock {INPUT} at (38,108) size 12x13
     46        RenderBlock {INPUT} at (38,109) size 12x12
    4747        RenderText {#text} at (52,105) size 4x18
    4848          text run at (52,105) width 4: " "
  • trunk/LayoutTests/platform/mac/fast/forms/input-value-expected.txt

    r170242 r170257  
    1212          text run at (0,0) width 713: "Results that match Gecko are like WinIE, but with \"before\" for the attribute in the first two rows and the last row."
    1313      RenderBlock {HR} at (0,86) size 784x2 [border: (1px inset #000000)]
    14       RenderBlock {FORM} at (0,96) size 784x366
    15         RenderTable {TABLE} at (0,0) size 761x366
     14      RenderBlock {FORM} at (0,96) size 784x365
     15        RenderTable {TABLE} at (0,0) size 761x365
    1616          RenderTableSection {THEAD} at (0,0) size 761x24
    1717            RenderTableRow {TR} at (0,2) size 761x20
     
    2828                RenderText {#text} at (1,1) size 59x18
    2929                  text run at (1,1) width 59: "attribute"
    30           RenderTableSection {TBODY} at (0,24) size 761x342
     30          RenderTableSection {TBODY} at (0,24) size 761x341
    3131            RenderTableRow {TR} at (0,0) size 761x25
    3232              RenderTableCell {TD} at (2,2) size 385x20 [r=0 c=0 rs=1 cs=1]
     
    103103                RenderText {#text} at (1,1) size 28x18
    104104                  text run at (1,1) width 28: "after"
    105             RenderTableRow {TR} at (0,146) size 761x21
     105            RenderTableRow {TR} at (0,146) size 761x20
    106106              RenderTableCell {TD} at (2,146) size 385x20 [r=6 c=0 rs=1 cs=1]
    107107                RenderText {#text} at (1,1) size 216x18
    108108                  text run at (1,1) width 216: "radio with value property changed"
    109               RenderTableCell {TD} at (389,146) size 243x21 [r=6 c=1 rs=1 cs=1]
    110                 RenderBlock {INPUT} at (3,4) size 12x13
     109              RenderTableCell {TD} at (389,146) size 243x20 [r=6 c=1 rs=1 cs=1]
     110                RenderBlock {INPUT} at (3,4) size 12x12
    111111              RenderTableCell {TD} at (634,146) size 62x20 [r=6 c=2 rs=1 cs=1]
    112112                RenderText {#text} at (1,1) size 28x18
     
    115115                RenderText {#text} at (1,1) size 28x18
    116116                  text run at (1,1) width 28: "after"
    117             RenderTableRow {TR} at (0,169) size 761x25
    118               RenderTableCell {TD} at (2,171) size 385x20 [r=7 c=0 rs=1 cs=1]
     117            RenderTableRow {TR} at (0,168) size 761x25
     118              RenderTableCell {TD} at (2,170) size 385x20 [r=7 c=0 rs=1 cs=1]
    119119                RenderText {#text} at (1,1) size 205x18
    120120                  text run at (1,1) width 205: "text with value attribute changed"
    121               RenderTableCell {TD} at (389,169) size 243x25 [r=7 c=1 rs=1 cs=1]
    122                 RenderTextControl {INPUT} at (3,3) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    123               RenderTableCell {TD} at (634,171) size 62x20 [r=7 c=2 rs=1 cs=1]
    124                 RenderText {#text} at (1,1) size 28x18
    125                   text run at (1,1) width 28: "after"
    126               RenderTableCell {TD} at (698,171) size 61x20 [r=7 c=3 rs=1 cs=1]
    127                 RenderText {#text} at (1,1) size 28x18
    128                   text run at (1,1) width 28: "after"
    129             RenderTableRow {TR} at (0,196) size 761x20
    130               RenderTableCell {TD} at (2,196) size 385x20 [r=8 c=0 rs=1 cs=1]
     121              RenderTableCell {TD} at (389,168) size 243x25 [r=7 c=1 rs=1 cs=1]
     122                RenderTextControl {INPUT} at (3,3) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     123              RenderTableCell {TD} at (634,170) size 62x20 [r=7 c=2 rs=1 cs=1]
     124                RenderText {#text} at (1,1) size 28x18
     125                  text run at (1,1) width 28: "after"
     126              RenderTableCell {TD} at (698,170) size 61x20 [r=7 c=3 rs=1 cs=1]
     127                RenderText {#text} at (1,1) size 28x18
     128                  text run at (1,1) width 28: "after"
     129            RenderTableRow {TR} at (0,195) size 761x20
     130              RenderTableCell {TD} at (2,195) size 385x20 [r=8 c=0 rs=1 cs=1]
    131131                RenderText {#text} at (1,1) size 247x18
    132132                  text run at (1,1) width 247: "check box with value attribute changed"
    133               RenderTableCell {TD} at (389,196) size 243x20 [r=8 c=1 rs=1 cs=1]
    134                 RenderBlock {INPUT} at (3,4) size 12x12
    135               RenderTableCell {TD} at (634,196) size 62x20 [r=8 c=2 rs=1 cs=1]
    136                 RenderText {#text} at (1,1) size 28x18
    137                   text run at (1,1) width 28: "after"
    138               RenderTableCell {TD} at (698,196) size 61x20 [r=8 c=3 rs=1 cs=1]
    139                 RenderText {#text} at (1,1) size 28x18
    140                   text run at (1,1) width 28: "after"
    141             RenderTableRow {TR} at (0,218) size 761x20
    142               RenderTableCell {TD} at (2,218) size 385x20 [r=9 c=0 rs=1 cs=1]
     133              RenderTableCell {TD} at (389,195) size 243x20 [r=8 c=1 rs=1 cs=1]
     134                RenderBlock {INPUT} at (3,4) size 12x12
     135              RenderTableCell {TD} at (634,195) size 62x20 [r=8 c=2 rs=1 cs=1]
     136                RenderText {#text} at (1,1) size 28x18
     137                  text run at (1,1) width 28: "after"
     138              RenderTableCell {TD} at (698,195) size 61x20 [r=8 c=3 rs=1 cs=1]
     139                RenderText {#text} at (1,1) size 28x18
     140                  text run at (1,1) width 28: "after"
     141            RenderTableRow {TR} at (0,217) size 761x20
     142              RenderTableCell {TD} at (2,217) size 385x20 [r=9 c=0 rs=1 cs=1]
    143143                RenderText {#text} at (1,1) size 383x18
    144144                  text run at (1,1) width 383: "text with value property changed, then turned into check box"
    145               RenderTableCell {TD} at (389,218) size 243x20 [r=9 c=1 rs=1 cs=1]
    146                 RenderBlock {INPUT} at (3,4) size 12x12
    147               RenderTableCell {TD} at (634,218) size 62x20 [r=9 c=2 rs=1 cs=1]
    148                 RenderText {#text} at (1,1) size 28x18
    149                   text run at (1,1) width 28: "after"
    150               RenderTableCell {TD} at (698,218) size 61x20 [r=9 c=3 rs=1 cs=1]
    151                 RenderText {#text} at (1,1) size 28x18
    152                   text run at (1,1) width 28: "after"
    153             RenderTableRow {TR} at (0,240) size 761x25
    154               RenderTableCell {TD} at (2,242) size 385x20 [r=10 c=0 rs=1 cs=1]
     145              RenderTableCell {TD} at (389,217) size 243x20 [r=9 c=1 rs=1 cs=1]
     146                RenderBlock {INPUT} at (3,4) size 12x12
     147              RenderTableCell {TD} at (634,217) size 62x20 [r=9 c=2 rs=1 cs=1]
     148                RenderText {#text} at (1,1) size 28x18
     149                  text run at (1,1) width 28: "after"
     150              RenderTableCell {TD} at (698,217) size 61x20 [r=9 c=3 rs=1 cs=1]
     151                RenderText {#text} at (1,1) size 28x18
     152                  text run at (1,1) width 28: "after"
     153            RenderTableRow {TR} at (0,239) size 761x25
     154              RenderTableCell {TD} at (2,241) size 385x20 [r=10 c=0 rs=1 cs=1]
    155155                RenderText {#text} at (1,1) size 383x18
    156156                  text run at (1,1) width 383: "check box with value property changed, then turned into text"
    157               RenderTableCell {TD} at (389,240) size 243x25 [r=10 c=1 rs=1 cs=1]
    158                 RenderTextControl {INPUT} at (3,3) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    159               RenderTableCell {TD} at (634,242) size 62x20 [r=10 c=2 rs=1 cs=1]
    160                 RenderText {#text} at (1,1) size 28x18
    161                   text run at (1,1) width 28: "after"
    162               RenderTableCell {TD} at (698,242) size 61x20 [r=10 c=3 rs=1 cs=1]
    163                 RenderText {#text} at (1,1) size 28x18
    164                   text run at (1,1) width 28: "after"
    165             RenderTableRow {TR} at (0,267) size 761x20
    166               RenderTableCell {TD} at (2,267) size 385x20 [r=11 c=0 rs=1 cs=1]
     157              RenderTableCell {TD} at (389,239) size 243x25 [r=10 c=1 rs=1 cs=1]
     158                RenderTextControl {INPUT} at (3,3) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     159              RenderTableCell {TD} at (634,241) size 62x20 [r=10 c=2 rs=1 cs=1]
     160                RenderText {#text} at (1,1) size 28x18
     161                  text run at (1,1) width 28: "after"
     162              RenderTableCell {TD} at (698,241) size 61x20 [r=10 c=3 rs=1 cs=1]
     163                RenderText {#text} at (1,1) size 28x18
     164                  text run at (1,1) width 28: "after"
     165            RenderTableRow {TR} at (0,266) size 761x20
     166              RenderTableCell {TD} at (2,266) size 385x20 [r=11 c=0 rs=1 cs=1]
    167167                RenderText {#text} at (1,1) size 381x18
    168168                  text run at (1,1) width 381: "text with value attribute changed, then turned into check box"
    169               RenderTableCell {TD} at (389,267) size 243x20 [r=11 c=1 rs=1 cs=1]
    170                 RenderBlock {INPUT} at (3,4) size 12x12
    171               RenderTableCell {TD} at (634,267) size 62x20 [r=11 c=2 rs=1 cs=1]
    172                 RenderText {#text} at (1,1) size 28x18
    173                   text run at (1,1) width 28: "after"
    174               RenderTableCell {TD} at (698,267) size 61x20 [r=11 c=3 rs=1 cs=1]
    175                 RenderText {#text} at (1,1) size 28x18
    176                   text run at (1,1) width 28: "after"
    177             RenderTableRow {TR} at (0,289) size 761x25
    178               RenderTableCell {TD} at (2,291) size 385x20 [r=12 c=0 rs=1 cs=1]
     169              RenderTableCell {TD} at (389,266) size 243x20 [r=11 c=1 rs=1 cs=1]
     170                RenderBlock {INPUT} at (3,4) size 12x12
     171              RenderTableCell {TD} at (634,266) size 62x20 [r=11 c=2 rs=1 cs=1]
     172                RenderText {#text} at (1,1) size 28x18
     173                  text run at (1,1) width 28: "after"
     174              RenderTableCell {TD} at (698,266) size 61x20 [r=11 c=3 rs=1 cs=1]
     175                RenderText {#text} at (1,1) size 28x18
     176                  text run at (1,1) width 28: "after"
     177            RenderTableRow {TR} at (0,288) size 761x25
     178              RenderTableCell {TD} at (2,290) size 385x20 [r=12 c=0 rs=1 cs=1]
    179179                RenderText {#text} at (1,1) size 381x18
    180180                  text run at (1,1) width 381: "check box with value attribute changed, then turned into text"
    181               RenderTableCell {TD} at (389,289) size 243x25 [r=12 c=1 rs=1 cs=1]
    182                 RenderTextControl {INPUT} at (3,3) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    183               RenderTableCell {TD} at (634,291) size 62x20 [r=12 c=2 rs=1 cs=1]
    184                 RenderText {#text} at (1,1) size 28x18
    185                   text run at (1,1) width 28: "after"
    186               RenderTableCell {TD} at (698,291) size 61x20 [r=12 c=3 rs=1 cs=1]
    187                 RenderText {#text} at (1,1) size 28x18
    188                   text run at (1,1) width 28: "after"
    189             RenderTableRow {TR} at (0,316) size 761x24
    190               RenderTableCell {TD} at (2,318) size 385x20 [r=13 c=0 rs=1 cs=1]
     181              RenderTableCell {TD} at (389,288) size 243x25 [r=12 c=1 rs=1 cs=1]
     182                RenderTextControl {INPUT} at (3,3) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     183              RenderTableCell {TD} at (634,290) size 62x20 [r=12 c=2 rs=1 cs=1]
     184                RenderText {#text} at (1,1) size 28x18
     185                  text run at (1,1) width 28: "after"
     186              RenderTableCell {TD} at (698,290) size 61x20 [r=12 c=3 rs=1 cs=1]
     187                RenderText {#text} at (1,1) size 28x18
     188                  text run at (1,1) width 28: "after"
     189            RenderTableRow {TR} at (0,315) size 761x24
     190              RenderTableCell {TD} at (2,317) size 385x20 [r=13 c=0 rs=1 cs=1]
    191191                RenderText {#text} at (1,1) size 204x18
    192192                  text run at (1,1) width 204: "file with value property changed"
    193               RenderTableCell {TD} at (389,316) size 243x24 [r=13 c=1 rs=1 cs=1]
     193              RenderTableCell {TD} at (389,315) size 243x24 [r=13 c=1 rs=1 cs=1]
    194194                RenderFileUploadControl {INPUT} at (3,3) size 237x18 "no file selected"
    195195                  RenderButton {INPUT} at (0,0) size 78x18 [bgcolor=#C0C0C0]
     
    197197                      RenderText at (0,0) size 62x13
    198198                        text run at (0,0) width 62: "Choose File"
    199               RenderTableCell {TD} at (634,327) size 62x2 [r=13 c=2 rs=1 cs=1]
    200               RenderTableCell {TD} at (698,318) size 61x20 [r=13 c=3 rs=1 cs=1]
     199              RenderTableCell {TD} at (634,326) size 62x2 [r=13 c=2 rs=1 cs=1]
     200              RenderTableCell {TD} at (698,317) size 61x20 [r=13 c=3 rs=1 cs=1]
    201201                RenderText {#text} at (1,1) size 40x18
    202202                  text run at (1,1) width 40: "before"
     
    209209    RenderText {#text} at (0,0) size 37x13
    210210      text run at (0,0) width 37: "\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}"
    211 layer at (403,303) size 139x13
     211layer at (403,302) size 139x13
    212212  RenderBlock {DIV} at (3,3) size 140x13
    213213    RenderText {#text} at (0,0) size 25x13
    214214      text run at (0,0) width 25: "after"
    215 layer at (403,374) size 139x13
     215layer at (403,373) size 139x13
    216216  RenderBlock {DIV} at (3,3) size 140x13
    217217    RenderText {#text} at (0,0) size 25x13
    218218      text run at (0,0) width 25: "after"
    219 layer at (403,423) size 139x13
     219layer at (403,422) size 139x13
    220220  RenderBlock {DIV} at (3,3) size 140x13
    221221    RenderText {#text} at (0,0) size 25x13
  • trunk/LayoutTests/platform/mac/fast/inline/positionedLifetime-expected.txt

    r170242 r170257  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x584
    6       RenderBlock {INPUT} at (2,3) size 12x13
     6      RenderBlock {INPUT} at (2,4) size 12x12
    77      RenderText {#text} at (16,0) size 4x18
    88        text run at (16,0) width 4: " "
  • trunk/LayoutTests/platform/mac/fast/replaced/replaced-breaking-expected.txt

    r170242 r170257  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x584
    6       RenderBlock {DIV} at (0,0) size 32x538 [border: (1px solid #FF0000)]
     6      RenderBlock {DIV} at (0,0) size 32x536 [border: (1px solid #FF0000)]
    77        RenderTextControl {INPUT} at (3,3) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    88        RenderTextControl {INPUT} at (3,26) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     
    4444        RenderBlock {INPUT} at (3,376) size 12x12
    4545        RenderText {#text} at (0,0) size 0x0
    46         RenderBlock {INPUT} at (3,394) size 12x13
    47         RenderBlock {INPUT} at (3,413) size 12x13
     46        RenderBlock {INPUT} at (3,394) size 12x12
     47        RenderBlock {INPUT} at (3,412) size 12x12
    4848        RenderText {#text} at (0,0) size 0x0
    49         RenderIFrame {IFRAME} at (1,429) size 27x27 [border: (1px solid #000000)]
     49        RenderIFrame {IFRAME} at (1,427) size 27x27 [border: (1px solid #000000)]
    5050          layer at (0,0) size 25x25
    5151            RenderView at (0,0) size 25x25
     
    5353            RenderBlock {HTML} at (0,0) size 25x25
    5454              RenderBody {BODY} at (8,8) size 9x9
    55         RenderIFrame {IFRAME} at (1,456) size 27x27 [border: (1px solid #000000)]
     55        RenderIFrame {IFRAME} at (1,454) size 27x27 [border: (1px solid #000000)]
    5656          layer at (0,0) size 25x25
    5757            RenderView at (0,0) size 25x25
     
    6060              RenderBody {BODY} at (8,8) size 9x9
    6161        RenderText {#text} at (0,0) size 0x0
    62         RenderEmbeddedObject {EMBED} at (1,483) size 27x27 [border: (1px solid #000000)]
    63         RenderEmbeddedObject {EMBED} at (1,510) size 27x27 [border: (1px solid #000000)]
     62        RenderEmbeddedObject {EMBED} at (1,481) size 27x27 [border: (1px solid #000000)]
     63        RenderEmbeddedObject {EMBED} at (1,508) size 27x27 [border: (1px solid #000000)]
    6464        RenderText {#text} at (0,0) size 0x0
    6565layer at (14,14) size 139x13
  • trunk/LayoutTests/platform/mac/fast/replaced/width100percent-radio-expected.txt

    r170242 r170257  
    77        RenderText {#text} at (0,0) size 309x18
    88          text run at (0,0) width 309: "The following sets of buttons should not overlap."
    9       RenderTable {TABLE} at (0,18) size 784x23
    10         RenderTableSection {TBODY} at (0,0) size 784x23
    11           RenderTableRow {TR} at (0,1) size 784x21
    12             RenderTableCell {TD} at (1,1) size 6x21 [r=0 c=0 rs=1 cs=1]
    13               RenderBlock {INPUT} at (3,4) size 4x13
    14             RenderTableCell {TD} at (8,1) size 6x21 [r=0 c=1 rs=1 cs=1]
    15               RenderBlock {INPUT} at (3,4) size 4x13
    16             RenderTableCell {TD} at (15,1) size 6x21 [r=0 c=2 rs=1 cs=1]
    17               RenderBlock {INPUT} at (3,4) size 4x13
     9      RenderTable {TABLE} at (0,18) size 784x22
     10        RenderTableSection {TBODY} at (0,0) size 784x22
     11          RenderTableRow {TR} at (0,1) size 784x20
     12            RenderTableCell {TD} at (1,1) size 6x20 [r=0 c=0 rs=1 cs=1]
     13              RenderBlock {INPUT} at (3,4) size 4x12
     14            RenderTableCell {TD} at (8,1) size 6x20 [r=0 c=1 rs=1 cs=1]
     15              RenderBlock {INPUT} at (3,4) size 4x12
     16            RenderTableCell {TD} at (15,1) size 6x20 [r=0 c=2 rs=1 cs=1]
     17              RenderBlock {INPUT} at (3,4) size 4x12
    1818            RenderTableCell {TD} at (22,1) size 761x20 [r=0 c=3 rs=1 cs=1]
    1919              RenderText {#text} at (1,1) size 4x18
  • trunk/LayoutTests/platform/mac/http/tests/navigation/javascriptlink-frames-expected.txt

    r170242 r170257  
    4141                RenderTextControl {INPUT} at (336,96) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    4242                RenderBR {BR} at (483,110) size 1x0
    43                 RenderBlock {INPUT} at (2,136) size 12x13
     43                RenderBlock {INPUT} at (2,137) size 12x12
    4444                RenderText {#text} at (16,118) size 73x37
    4545                  text run at (16,118) width 73: " Male"
    4646                RenderBR {BR} at (89,147) size 0x0
    47                 RenderBlock {INPUT} at (2,173) size 12x13
     47                RenderBlock {INPUT} at (2,174) size 12x12
    4848                RenderText {#text} at (16,155) size 102x37
    4949                  text run at (16,155) width 102: " Female"
  • trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug1318-expected.txt

    r170242 r170257  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x584
    6       RenderTable {TABLE} at (0,0) size 784x140
    7         RenderTableSection {TBODY} at (0,0) size 784x140
     6      RenderTable {TABLE} at (0,0) size 784x138
     7        RenderTableSection {TBODY} at (0,0) size 784x138
    88          RenderTableRow {TR} at (0,0) size 784x74
    99            RenderTableCell {TD} at (0,0) size 784x74 [r=0 c=0 rs=1 cs=4]
     
    1818                RenderBR {BR} at (392,55) size 0x17
    1919              RenderText {#text} at (0,0) size 0x0
    20           RenderTableRow {TR} at (0,74) size 784x21
    21             RenderTableCell {TD} at (0,76) size 556x17 [r=1 c=0 rs=1 cs=1]
     20          RenderTableRow {TR} at (0,74) size 784x20
     21            RenderTableCell {TD} at (0,75) size 556x17 [r=1 c=0 rs=1 cs=1]
    2222              RenderInline {FONT} at (0,0) size 140x15
    2323                RenderText {#text} at (415,1) size 140x15
    2424                  text run at (415,1) width 140: "I agree with the program"
    2525              RenderText {#text} at (0,0) size 0x0
    26             RenderTableCell {TD} at (556,74) size 64x21 [r=1 c=1 rs=1 cs=1]
    27               RenderBlock {INPUT} at (3,4) size 12x13
    28           RenderTableRow {TR} at (0,95) size 784x21
    29             RenderTableCell {TD} at (0,97) size 556x17 [r=2 c=0 rs=1 cs=1]
     26            RenderTableCell {TD} at (556,74) size 64x20 [r=1 c=1 rs=1 cs=1]
     27              RenderBlock {INPUT} at (3,4) size 12x12
     28          RenderTableRow {TR} at (0,94) size 784x20
     29            RenderTableCell {TD} at (0,95) size 556x17 [r=2 c=0 rs=1 cs=1]
    3030              RenderInline {FONT} at (0,0) size 153x15
    3131                RenderText {#text} at (402,1) size 153x15
    3232                  text run at (402,1) width 153: "I think vouchers are wrong"
    3333              RenderText {#text} at (0,0) size 0x0
    34             RenderTableCell {TD} at (556,95) size 64x21 [r=2 c=1 rs=1 cs=1]
    35               RenderBlock {INPUT} at (3,4) size 12x13
    36           RenderTableRow {TR} at (0,116) size 784x24
    37             RenderTableCell {TD} at (0,119) size 620x17 [r=3 c=0 rs=1 cs=2]
     34            RenderTableCell {TD} at (556,94) size 64x20 [r=2 c=1 rs=1 cs=1]
     35              RenderBlock {INPUT} at (3,4) size 12x12
     36          RenderTableRow {TR} at (0,114) size 784x24
     37            RenderTableCell {TD} at (0,117) size 620x17 [r=3 c=0 rs=1 cs=2]
    3838              RenderInline {A} at (0,0) size 76x18 [color=#0000EE]
    3939                RenderInline {FONT} at (0,0) size 76x15
     
    4242              RenderInline {FONT} at (0,0) size 0x15
    4343                RenderText {#text} at (0,0) size 0x0
    44             RenderTableCell {TD} at (620,116) size 164x24 [r=3 c=2 rs=1 cs=2]
     44            RenderTableCell {TD} at (620,114) size 164x24 [r=3 c=2 rs=1 cs=2]
    4545              RenderButton {INPUT} at (62,3) size 40x18 [bgcolor=#C0C0C0]
    4646                RenderBlock (anonymous) at (8,2) size 23x13
  • trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug4527-expected.txt

    r170242 r170257  
    4040              RenderImage {INPUT} at (82,3) size 26x18
    4141            RenderTableCell {TD} at (483,70) size 130x25 [bgcolor=#CCCCCC] [r=1 c=3 rs=1 cs=1]
    42               RenderBlock {INPUT} at (2,5) size 12x13
     42              RenderBlock {INPUT} at (2,6) size 12x12
    4343              RenderImage {IMG} at (16,0) size 40x25
    44               RenderBlock {INPUT} at (58,5) size 12x13
     44              RenderBlock {INPUT} at (58,6) size 12x12
    4545              RenderText {#text} at (72,2) size 4x18
    4646                text run at (72,2) width 4: " "
  • trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/captions1-expected.txt

    r170242 r170257  
    1414          RenderText {#text} at (9,3) size 46x18
    1515            text run at (9,3) width 46: "caption"
    16           RenderBlock {INPUT} at (57,6) size 12x13
     16          RenderBlock {INPUT} at (57,7) size 12x12
    1717        RenderTableSection {TBODY} at (10,10) size 70x46
    1818          RenderTableRow {TR} at (0,2) size 70x20
     
    3737          RenderText {#text} at (9,3) size 46x18
    3838            text run at (9,3) width 46: "caption"
    39           RenderBlock {INPUT} at (57,6) size 12x13
     39          RenderBlock {INPUT} at (57,7) size 12x12
    4040          RenderText {#text} at (17,22) size 46x18
    4141            text run at (17,22) width 46: "foo foo"
     
    6262          RenderText {#text} at (38,3) size 46x18
    6363            text run at (38,3) width 46: "caption"
    64           RenderBlock {INPUT} at (86,6) size 12x13
     64          RenderBlock {INPUT} at (86,7) size 12x12
    6565          RenderText {#text} at (3,22) size 142x18
    6666            text run at (3,22) width 142: "very_large_very_large"
     
    109109          RenderText {#text} at (32,3) size 46x18
    110110            text run at (32,3) width 46: "caption"
    111           RenderBlock {INPUT} at (80,6) size 12x13
     111          RenderBlock {INPUT} at (80,7) size 12x12
    112112        RenderTableSection {TBODY} at (10,10) size 116x46
    113113          RenderTableRow {TR} at (0,2) size 116x20
     
    139139          RenderText {#text} at (17,3) size 46x18
    140140            text run at (17,3) width 46: "caption"
    141           RenderBlock {INPUT} at (65,6) size 12x13
     141          RenderBlock {INPUT} at (65,7) size 12x12
    142142        RenderTableSection {TBODY} at (10,34) size 86x44
    143143          RenderTableRow {TR} at (0,0) size 86x20
  • trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/captions2-expected.txt

    r170242 r170257  
    1414          RenderText {#text} at (9,3) size 46x18
    1515            text run at (9,3) width 46: "caption"
    16           RenderBlock {INPUT} at (57,6) size 12x13
     16          RenderBlock {INPUT} at (57,7) size 12x12
    1717        RenderTableSection {TBODY} at (10,37) size 70x46
    1818          RenderTableRow {TR} at (0,2) size 70x20
     
    3737          RenderText {#text} at (9,3) size 46x18
    3838            text run at (9,3) width 46: "caption"
    39           RenderBlock {INPUT} at (57,6) size 12x13
     39          RenderBlock {INPUT} at (57,7) size 12x12
    4040          RenderText {#text} at (17,22) size 46x18
    4141            text run at (17,22) width 46: "foo foo"
     
    6262          RenderText {#text} at (38,3) size 46x18
    6363            text run at (38,3) width 46: "caption"
    64           RenderBlock {INPUT} at (86,6) size 12x13
     64          RenderBlock {INPUT} at (86,7) size 12x12
    6565          RenderText {#text} at (3,22) size 142x18
    6666            text run at (3,22) width 142: "very_large_very_large"
     
    109109          RenderText {#text} at (32,3) size 46x18
    110110            text run at (32,3) width 46: "caption"
    111           RenderBlock {INPUT} at (80,6) size 12x13
     111          RenderBlock {INPUT} at (80,7) size 12x12
    112112        RenderTableSection {TBODY} at (10,37) size 116x46
    113113          RenderTableRow {TR} at (0,2) size 116x20
     
    134134          RenderText {#text} at (17,3) size 46x18
    135135            text run at (17,3) width 46: "caption"
    136           RenderBlock {INPUT} at (65,6) size 12x13
     136          RenderBlock {INPUT} at (65,7) size 12x12
    137137        RenderTableSection {TBODY} at (10,37) size 86x68
    138138          RenderTableRow {TR} at (0,2) size 86x20
  • trunk/Source/WebCore/ChangeLog

    r170256 r170257  
     12014-06-21  Dean Jackson  <dino@apple.com>
     2
     3        [Mac] Margins for new form controls need tweaking
     4        https://bugs.webkit.org/show_bug.cgi?id=134135
     5        <rdar://problem/17262164>
     6
     7        Reviewed by Sam Weinig.
     8
     9        Take 2 of this patch. Only the mac-mountainlion LayoutTest
     10        results are different from the first attempt.
     11
     12        With the newer animated controls in OS X Yosemite, we need
     13        to tweak the fudge-factor margins for positioning. In a recent
     14        patch I added another fudge, which I'm removing with this. I'm
     15        not sure where the older values came from, but I've checked with
     16        the latest AppKit sources and am using the sizes they implement
     17        for the controls.
     18
     19        This will rebaseline a lot of tests, since I've made small tweaks
     20        to the form layout.
     21
     22        * platform/mac/ThemeMac.mm:
     23        (WebCore::checkboxMargins): New margin amounts.
     24        (WebCore::radioSizes): New sizes.
     25        (WebCore::radioMargins): New margin amounts.
     26        (WebCore::paintToggleButton): No need to call the positioning fudge any more.
     27        (WebCore::checkboxOffsets): Deleted.
     28        (WebCore::radioOffsets): Deleted.
     29
    1302014-06-20  Sam Weinig  <sam@webkit.org>
    231
  • trunk/Source/WebCore/platform/mac/ThemeMac.mm

    r170242 r170257  
    283283    static const int margins[3][4] =
    284284    {
    285         // top left right bottom
    286         { 3, 4, 4, 2 },
    287         { 4, 3, 3, 3 },
    288         { 4, 3, 3, 3 },
     285        // top right bottom left
     286        { 2, 2, 2, 2 },
     287        { 2, 1, 2, 1 },
     288        { 0, 0, 1, 0 },
    289289    };
    290290    return margins[controlSize];
     
    301301}
    302302
    303 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
    304 static const std::array<FloatSize, 3>& checkboxOffsets()
    305 {
    306     // This provides the positioning tweak we need to place controls
    307     // at the right location during animation.
    308     static const std::array<FloatSize, 3> sizes = { { FloatSize(0, 2), FloatSize(2, 1.5), FloatSize(3, 3) } };
    309     return sizes;
    310 }
    311 #endif
    312 
    313303// Radio Buttons
    314304
    315305static const std::array<IntSize, 3>& radioSizes()
    316306{
    317     static const std::array<IntSize, 3> sizes = { { IntSize(14, 15), IntSize(12, 13), IntSize(10, 10) } };
     307    static const std::array<IntSize, 3> sizes = { { IntSize(16, 16), IntSize(12, 12), IntSize(10, 10) } };
    318308    return sizes;
    319309}
     
    323313    static const int margins[3][4] =
    324314    {
    325         // top left right bottom
    326         { 2, 2, 4, 2 },
    327         { 3, 2, 3, 2 },
    328         { 1, 0, 2, 0 },
     315        // top right bottom left
     316        { 1, 0, 1, 2 },
     317        { 1, 1, 2, 1 },
     318        { 0, 0, 1, 1 },
    329319    };
    330320    return margins[controlSize];
    331321}
    332 
    333 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
    334 static const std::array<FloatSize, 3>& radioOffsets()
    335 {
    336     // This provides the positioning tweak we need to place controls
    337     // at the right location during animation.
    338     static const std::array<FloatSize, 3> sizes = { { FloatSize(0, 2), FloatSize(1, 2), FloatSize(0, 1) } };
    339     return sizes;
    340 }
    341 #endif
    342322
    343323static LengthSize radioSize(const Font& font, const LengthSize& zoomedSize, float zoomFactor)
     
    455435        context->scale(FloatSize(1, -1));
    456436        context->translate(0, -inflatedRect.height());
    457         FloatSize controlOffsets = buttonType == CheckboxPart ? checkboxOffsets()[controlSize] : radioOffsets()[controlSize];
    458         context->translate(controlOffsets);
    459437        [toggleButtonCell _renderCurrentAnimationFrameInContext:context->platformContext() atLocation:NSMakePoint(0, 0)];
    460438    } else
Note: See TracChangeset for help on using the changeset viewer.