⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 269122 in webkit


Ignore:
Timestamp:
Oct 28, 2020, 2:04:10 PM (6 years ago)
Author:
Truitt Savell
Message:

Rebase for fast/forms/input-appearance-spinbutton.html on Catalina after changes in r269036
​https://bugs.webkit.org/show_bug.cgi?id=218151

Unreviewed test gardening.

  • platform/mac-catalina/fast/forms/input-appearance-spinbutton-expected.txt:
Location:
trunk/LayoutTests
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r269121 r269122  
     12020-10-28  Truitt Savell  <tsavell@apple.com>
     2
     3        Rebase for fast/forms/input-appearance-spinbutton.html on Catalina after changes in r269036
     4        https://bugs.webkit.org/show_bug.cgi?id=218151
     5
     6        Unreviewed test gardening.
     7
     8        * platform/mac-catalina/fast/forms/input-appearance-spinbutton-expected.txt:
     9
    1102020-10-28  Jer Noble  <jer.noble@apple.com>
    211

  • trunk/LayoutTests/platform/mac-catalina/fast/forms/input-appearance-spinbutton-expected.txt

    r269036 r269122  
    1515                RenderBlock {DIV} at (1,1) size 196x32
    1616                  RenderTextControl {INPUT} at (0,0) size 112x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     17<<<<<<< Updated upstream
    1718                  RenderBR {BR} at (111,2) size 1x18
     19=======
     20                  RenderBR {BR} at (111,-3) size 1x18
     21>>>>>>> Stashed changes
    1822                  RenderTextControl {INPUT} at (0,16) size 112x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    1923                    RenderFlexibleBox {DIV} at (3,0) size 106x16
    … …  
    2125                RenderBlock {DIV} at (1,33) size 196x34
    2226                  RenderTextControl {INPUT} at (0,0) size 124x17 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     27<<<<<<< Updated upstream
    2328                  RenderBR {BR} at (123,3) size 1x18
     29=======
     30                  RenderBR {BR} at (123,-2) size 1x18
     31>>>>>>> Stashed changes
    2432                  RenderTextControl {INPUT} at (0,17) size 124x17 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    2533                    RenderFlexibleBox {DIV} at (3,1) size 118x15
    … …  
    2735                RenderBlock {DIV} at (1,67) size 196x36
    2836                  RenderTextControl {INPUT} at (0,0) size 136x18 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     37<<<<<<< Updated upstream
    2938                  RenderBR {BR} at (135,4) size 1x18
     39=======
     40                  RenderBR {BR} at (135,-1) size 1x18
     41>>>>>>> Stashed changes
    3042                  RenderTextControl {INPUT} at (0,18) size 136x18 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    3143                    RenderFlexibleBox {DIV} at (3,1) size 130x16
    3244                      RenderBlock {DIV} at (0,1) size 117x13
    3345                RenderBlock {DIV} at (1,103) size 196x46
     46<<<<<<< Updated upstream
    3447                  RenderTextControl {INPUT} at (0,2) size 147x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    3548                  RenderBR {BR} at (150,9) size 1x18
    … …  
    5972                  RenderBR {BR} at (195,14) size 1x18
    6073                  RenderTextControl {INPUT} at (0,30) size 192x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     74=======
     75                  RenderTextControl {INPUT} at (2,2) size 147x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     76                  RenderBR {BR} at (150,2) size 1x18
     77                  RenderTextControl {INPUT} at (2,25) size 147x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     78                    RenderFlexibleBox {DIV} at (3,1) size 141x17
     79                      RenderBlock {DIV} at (0,1) size 128x14
     80                RenderBlock {DIV} at (1,149) size 196x50
     81                  RenderTextControl {INPUT} at (2,2) size 159x21 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     82                  RenderBR {BR} at (162,3) size 1x18
     83                  RenderTextControl {INPUT} at (2,27) size 159x21 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     84                    RenderFlexibleBox {DIV} at (3,1) size 153x19
     85                      RenderBlock {DIV} at (0,1) size 140x16
     86                RenderBlock {DIV} at (1,199) size 196x52
     87                  RenderTextControl {INPUT} at (2,2) size 170x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     88                  RenderBR {BR} at (173,4) size 1x18
     89                  RenderTextControl {INPUT} at (2,28) size 170x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     90                    RenderFlexibleBox {DIV} at (3,1) size 164x20
     91                      RenderBlock {DIV} at (0,1) size 149x17
     92                RenderBlock {DIV} at (1,251) size 196x54
     93                  RenderTextControl {INPUT} at (2,2) size 181x23 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     94                  RenderBR {BR} at (184,5) size 1x18
     95                  RenderTextControl {INPUT} at (2,29) size 181x23 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     96                    RenderFlexibleBox {DIV} at (3,1) size 175x21
     97                      RenderBlock {DIV} at (0,2) size 160x17
     98                RenderBlock {DIV} at (1,305) size 196x56
     99                  RenderTextControl {INPUT} at (2,2) size 192x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     100                  RenderBR {BR} at (195,6) size 1x18
     101                  RenderTextControl {INPUT} at (2,30) size 192x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     102>>>>>>> Stashed changes
    61103                    RenderFlexibleBox {DIV} at (3,0) size 186x24
    62104                      RenderBlock {DIV} at (0,2) size 171x19
    63105              RenderTableCell {TD} at (201,2) size 300x524 [r=0 c=1 rs=1 cs=1]
    64106                RenderBlock {DIV} at (1,1) size 297x56
     107<<<<<<< Updated upstream
    65108                  RenderTextControl {INPUT} at (0,2) size 203x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    66109                  RenderBR {BR} at (206,14) size 1x18
    … …  
    108151                  RenderBR {BR} at (296,23) size 1x18
    109152                  RenderTextControl {INPUT} at (0,39) size 293x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     153=======
     154                  RenderTextControl {INPUT} at (2,2) size 203x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     155                  RenderBR {BR} at (206,6) size 1x18
     156                  RenderTextControl {INPUT} at (2,30) size 203x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     157                    RenderFlexibleBox {DIV} at (3,0) size 197x24
     158                      RenderBlock {DIV} at (0,3) size 182x18
     159                RenderBlock {DIV} at (1,57) size 297x60
     160                  RenderTextControl {INPUT} at (2,2) size 214x26 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     161                  RenderBR {BR} at (217,7) size 1x18
     162                  RenderTextControl {INPUT} at (2,32) size 214x26 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     163                    RenderFlexibleBox {DIV} at (3,0) size 208x26
     164                      RenderBlock {DIV} at (0,2) size 193x21
     165                RenderBlock {DIV} at (1,117) size 297x62
     166                  RenderTextControl {INPUT} at (2,2) size 226x27 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     167                  RenderBR {BR} at (229,8) size 1x18
     168                  RenderTextControl {INPUT} at (2,33) size 226x27 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     169                    RenderFlexibleBox {DIV} at (3,0) size 220x27
     170                      RenderBlock {DIV} at (0,3) size 201x21
     171                RenderBlock {DIV} at (1,179) size 297x64
     172                  RenderTextControl {INPUT} at (2,2) size 237x28 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     173                  RenderBR {BR} at (240,9) size 1x18
     174                  RenderTextControl {INPUT} at (2,34) size 237x28 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     175                    RenderFlexibleBox {DIV} at (3,0) size 231x28
     176                      RenderBlock {DIV} at (0,3) size 212x22
     177                RenderBlock {DIV} at (1,243) size 297x66
     178                  RenderTextControl {INPUT} at (2,2) size 257x29 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     179                  RenderBR {BR} at (260,10) size 1x18
     180                  RenderTextControl {INPUT} at (2,35) size 257x29 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     181                    RenderFlexibleBox {DIV} at (3,0) size 251x29
     182                      RenderBlock {DIV} at (0,3) size 232x23
     183                RenderBlock {DIV} at (1,309) size 297x68
     184                  RenderTextControl {INPUT} at (2,2) size 269x30 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     185                  RenderBR {BR} at (272,11) size 1x18
     186                  RenderTextControl {INPUT} at (2,36) size 269x30 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     187                    RenderFlexibleBox {DIV} at (3,0) size 263x30
     188                      RenderBlock {DIV} at (0,3) size 244x24
     189                RenderBlock {DIV} at (1,377) size 297x72
     190                  RenderTextControl {INPUT} at (2,2) size 281x32 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     191                  RenderBR {BR} at (284,12) size 1x18
     192                  RenderTextControl {INPUT} at (2,38) size 281x32 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     193                    RenderFlexibleBox {DIV} at (3,0) size 275x32
     194                      RenderBlock {DIV} at (0,3) size 256x26
     195                RenderBlock {DIV} at (1,449) size 297x74
     196                  RenderTextControl {INPUT} at (2,2) size 293x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     197                  RenderBR {BR} at (296,13) size 1x18
     198                  RenderTextControl {INPUT} at (2,39) size 293x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     199>>>>>>> Stashed changes
    110200                    RenderFlexibleBox {DIV} at (3,0) size 287x33
    111201                      RenderBlock {DIV} at (0,3) size 268x27
    … …  
    122212layer at (14,213) size 116x12
    123213  RenderBlock {DIV} at (0,0) size 117x12
     214<<<<<<< Updated upstream
    124215layer at (14,233) size 141x13
    125216  RenderBlock {DIV} at (3,3) size 141x13
    … …  
    173264  RenderBlock {DIV} at (3,3) size 287x27
    174265layer at (213,535) size 268x27
     266=======
     267layer at (16,233) size 141x13
     268  RenderBlock {DIV} at (3,3) size 141x13
     269layer at (16,256) size 128x13
     270  RenderBlock {DIV} at (0,0) size 128x13
     271layer at (16,279) size 152x15
     272  RenderBlock {DIV} at (3,3) size 153x15
     273layer at (16,304) size 139x15
     274  RenderBlock {DIV} at (0,0) size 140x15
     275layer at (16,329) size 163x16
     276  RenderBlock {DIV} at (3,3) size 164x16
     277layer at (16,355) size 148x16
     278  RenderBlock {DIV} at (0,0) size 149x16
     279layer at (16,381) size 174x17
     280  RenderBlock {DIV} at (3,3) size 175x17
     281layer at (16,408) size 159x17
     282  RenderBlock {DIV} at (0,0) size 160x17
     283layer at (16,435) size 185x18
     284  RenderBlock {DIV} at (3,3) size 186x18
     285layer at (16,463) size 170x18
     286  RenderBlock {DIV} at (0,0) size 171x18
     287layer at (215,50) size 196x18
     288  RenderBlock {DIV} at (3,3) size 197x18
     289layer at (215,78) size 181x18
     290  RenderBlock {DIV} at (0,0) size 182x18
     291layer at (215,106) size 207x20
     292  RenderBlock {DIV} at (3,3) size 208x20
     293layer at (215,136) size 192x20
     294  RenderBlock {DIV} at (0,0) size 193x20
     295layer at (215,166) size 219x21
     296  RenderBlock {DIV} at (3,3) size 220x21
     297layer at (215,197) size 200x21
     298  RenderBlock {DIV} at (0,0) size 201x21
     299layer at (215,228) size 231x22
     300  RenderBlock {DIV} at (3,3) size 231x22
     301layer at (215,260) size 212x22
     302  RenderBlock {DIV} at (0,0) size 212x22
     303layer at (215,292) size 251x23
     304  RenderBlock {DIV} at (3,3) size 251x23
     305layer at (215,325) size 232x23
     306  RenderBlock {DIV} at (0,0) size 232x23
     307layer at (215,358) size 263x24
     308  RenderBlock {DIV} at (3,3) size 263x24
     309layer at (215,392) size 244x24
     310  RenderBlock {DIV} at (0,0) size 244x24
     311layer at (215,426) size 275x26
     312  RenderBlock {DIV} at (3,3) size 275x26
     313layer at (215,462) size 256x26
     314  RenderBlock {DIV} at (0,0) size 256x26
     315layer at (215,498) size 287x27
     316  RenderBlock {DIV} at (3,3) size 287x27
     317layer at (215,535) size 268x27
     318>>>>>>> Stashed changes
    175319  RenderBlock {DIV} at (0,0) size 268x27
    176320layer at (107,143) size 13x15
    … …  
    180324layer at (130,212) size 13x15
    181325  RenderBlock (relative positioned) {DIV} at (116,0) size 14x15
     326<<<<<<< Updated upstream
    182327layer at (142,254) size 13x17
    183328  RenderBlock (relative positioned) {DIV} at (127,0) size 14x17
    … …  
    205350  RenderBlock (relative positioned) {DIV} at (255,-1) size 20x34
    206351layer at (481,531) size 19x35
     352=======
     353layer at (144,254) size 13x17
     354  RenderBlock (relative positioned) {DIV} at (127,0) size 14x17
     355layer at (155,303) size 13x18
     356  RenderBlock (relative positioned) {DIV} at (139,0) size 14x18
     357layer at (164,353) size 15x20
     358  RenderBlock (relative positioned) {DIV} at (148,0) size 16x20
     359layer at (175,406) size 15x21
     360  RenderBlock (relative positioned) {DIV} at (159,0) size 16x21
     361layer at (186,461) size 15x23
     362  RenderBlock (relative positioned) {DIV} at (170,0) size 16x23
     363layer at (397,75) size 15x24
     364  RenderBlock (relative positioned) {DIV} at (181,0) size 16x24
     365layer at (408,133) size 15x26
     366  RenderBlock (relative positioned) {DIV} at (192,0) size 16x26
     367layer at (415,194) size 19x27
     368  RenderBlock (relative positioned) {DIV} at (200,0) size 20x27
     369layer at (427,257) size 19x28
     370  RenderBlock (relative positioned) {DIV} at (211,-1) size 20x30
     371layer at (447,322) size 19x30
     372  RenderBlock (relative positioned) {DIV} at (231,-1) size 20x31
     373layer at (459,388) size 19x32
     374  RenderBlock (relative positioned) {DIV} at (243,-1) size 20x32
     375layer at (471,459) size 19x33
     376  RenderBlock (relative positioned) {DIV} at (255,-1) size 20x34
     377layer at (483,531) size 19x35
     378>>>>>>> Stashed changes
    207379  RenderBlock (relative positioned) {DIV} at (267,-1) size 20x35
Note: See TracChangeset for help on using the changeset viewer.