Modified: trunk/LayoutTests/platform/mac-catalina/fast/forms/input-appearance-spinbutton-expected.txt (269121 => 269122)
--- trunk/LayoutTests/platform/mac-catalina/fast/forms/input-appearance-spinbutton-expected.txt 2020-10-28 20:42:59 UTC (rev 269121)
+++ trunk/LayoutTests/platform/mac-catalina/fast/forms/input-appearance-spinbutton-expected.txt 2020-10-28 21:04:10 UTC (rev 269122)
@@ -14,23 +14,36 @@
RenderTableCell {TD} at (2,83) size 198x362 [r=0 c=0 rs=1 cs=1]
RenderBlock {DIV} at (1,1) size 196x32
RenderTextControl {INPUT} at (0,0) size 112x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+<<<<<<< Updated upstream
RenderBR {BR} at (111,2) size 1x18
+=======
+ RenderBR {BR} at (111,-3) size 1x18
+>>>>>>> Stashed changes
RenderTextControl {INPUT} at (0,16) size 112x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderFlexibleBox {DIV} at (3,0) size 106x16
RenderBlock {DIV} at (0,2) size 93x11
RenderBlock {DIV} at (1,33) size 196x34
RenderTextControl {INPUT} at (0,0) size 124x17 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+<<<<<<< Updated upstream
RenderBR {BR} at (123,3) size 1x18
+=======
+ RenderBR {BR} at (123,-2) size 1x18
+>>>>>>> Stashed changes
RenderTextControl {INPUT} at (0,17) size 124x17 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderFlexibleBox {DIV} at (3,1) size 118x15
RenderBlock {DIV} at (0,2) size 105x11
RenderBlock {DIV} at (1,67) size 196x36
RenderTextControl {INPUT} at (0,0) size 136x18 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+<<<<<<< Updated upstream
RenderBR {BR} at (135,4) size 1x18
+=======
+ RenderBR {BR} at (135,-1) size 1x18
+>>>>>>> Stashed changes
RenderTextControl {INPUT} at (0,18) size 136x18 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderFlexibleBox {DIV} at (3,1) size 130x16
RenderBlock {DIV} at (0,1) size 117x13
RenderBlock {DIV} at (1,103) size 196x46
+<<<<<<< Updated upstream
RenderTextControl {INPUT} at (0,2) size 147x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderBR {BR} at (150,9) size 1x18
RenderTextControl {INPUT} at (0,25) size 147x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
@@ -58,10 +71,40 @@
RenderTextControl {INPUT} at (0,2) size 192x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderBR {BR} at (195,14) size 1x18
RenderTextControl {INPUT} at (0,30) size 192x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+=======
+ RenderTextControl {INPUT} at (2,2) size 147x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBR {BR} at (150,2) size 1x18
+ RenderTextControl {INPUT} at (2,25) size 147x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,1) size 141x17
+ RenderBlock {DIV} at (0,1) size 128x14
+ RenderBlock {DIV} at (1,149) size 196x50
+ RenderTextControl {INPUT} at (2,2) size 159x21 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBR {BR} at (162,3) size 1x18
+ RenderTextControl {INPUT} at (2,27) size 159x21 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,1) size 153x19
+ RenderBlock {DIV} at (0,1) size 140x16
+ RenderBlock {DIV} at (1,199) size 196x52
+ RenderTextControl {INPUT} at (2,2) size 170x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBR {BR} at (173,4) size 1x18
+ RenderTextControl {INPUT} at (2,28) size 170x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,1) size 164x20
+ RenderBlock {DIV} at (0,1) size 149x17
+ RenderBlock {DIV} at (1,251) size 196x54
+ RenderTextControl {INPUT} at (2,2) size 181x23 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBR {BR} at (184,5) size 1x18
+ RenderTextControl {INPUT} at (2,29) size 181x23 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,1) size 175x21
+ RenderBlock {DIV} at (0,2) size 160x17
+ RenderBlock {DIV} at (1,305) size 196x56
+ RenderTextControl {INPUT} at (2,2) size 192x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBR {BR} at (195,6) size 1x18
+ RenderTextControl {INPUT} at (2,30) size 192x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+>>>>>>> Stashed changes
RenderFlexibleBox {DIV} at (3,0) size 186x24
RenderBlock {DIV} at (0,2) size 171x19
RenderTableCell {TD} at (201,2) size 300x524 [r=0 c=1 rs=1 cs=1]
RenderBlock {DIV} at (1,1) size 297x56
+<<<<<<< Updated upstream
RenderTextControl {INPUT} at (0,2) size 203x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderBR {BR} at (206,14) size 1x18
RenderTextControl {INPUT} at (0,30) size 203x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
@@ -107,6 +150,53 @@
RenderTextControl {INPUT} at (0,2) size 293x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderBR {BR} at (296,23) size 1x18
RenderTextControl {INPUT} at (0,39) size 293x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+=======
+ RenderTextControl {INPUT} at (2,2) size 203x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBR {BR} at (206,6) size 1x18
+ RenderTextControl {INPUT} at (2,30) size 203x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 197x24
+ RenderBlock {DIV} at (0,3) size 182x18
+ RenderBlock {DIV} at (1,57) size 297x60
+ RenderTextControl {INPUT} at (2,2) size 214x26 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBR {BR} at (217,7) size 1x18
+ RenderTextControl {INPUT} at (2,32) size 214x26 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 208x26
+ RenderBlock {DIV} at (0,2) size 193x21
+ RenderBlock {DIV} at (1,117) size 297x62
+ RenderTextControl {INPUT} at (2,2) size 226x27 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBR {BR} at (229,8) size 1x18
+ RenderTextControl {INPUT} at (2,33) size 226x27 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 220x27
+ RenderBlock {DIV} at (0,3) size 201x21
+ RenderBlock {DIV} at (1,179) size 297x64
+ RenderTextControl {INPUT} at (2,2) size 237x28 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBR {BR} at (240,9) size 1x18
+ RenderTextControl {INPUT} at (2,34) size 237x28 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 231x28
+ RenderBlock {DIV} at (0,3) size 212x22
+ RenderBlock {DIV} at (1,243) size 297x66
+ RenderTextControl {INPUT} at (2,2) size 257x29 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBR {BR} at (260,10) size 1x18
+ RenderTextControl {INPUT} at (2,35) size 257x29 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 251x29
+ RenderBlock {DIV} at (0,3) size 232x23
+ RenderBlock {DIV} at (1,309) size 297x68
+ RenderTextControl {INPUT} at (2,2) size 269x30 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBR {BR} at (272,11) size 1x18
+ RenderTextControl {INPUT} at (2,36) size 269x30 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 263x30
+ RenderBlock {DIV} at (0,3) size 244x24
+ RenderBlock {DIV} at (1,377) size 297x72
+ RenderTextControl {INPUT} at (2,2) size 281x32 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBR {BR} at (284,12) size 1x18
+ RenderTextControl {INPUT} at (2,38) size 281x32 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 275x32
+ RenderBlock {DIV} at (0,3) size 256x26
+ RenderBlock {DIV} at (1,449) size 297x74
+ RenderTextControl {INPUT} at (2,2) size 293x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBR {BR} at (296,13) size 1x18
+ RenderTextControl {INPUT} at (2,39) size 293x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+>>>>>>> Stashed changes
RenderFlexibleBox {DIV} at (3,0) size 287x33
RenderBlock {DIV} at (0,3) size 268x27
layer at (14,129) size 106x10
@@ -121,6 +211,7 @@
RenderBlock {DIV} at (3,3) size 130x12
layer at (14,213) size 116x12
RenderBlock {DIV} at (0,0) size 117x12
+<<<<<<< Updated upstream
layer at (14,233) size 141x13
RenderBlock {DIV} at (3,3) size 141x13
layer at (14,256) size 128x13
@@ -172,6 +263,59 @@
layer at (213,498) size 287x27
RenderBlock {DIV} at (3,3) size 287x27
layer at (213,535) size 268x27
+=======
+layer at (16,233) size 141x13
+ RenderBlock {DIV} at (3,3) size 141x13
+layer at (16,256) size 128x13
+ RenderBlock {DIV} at (0,0) size 128x13
+layer at (16,279) size 152x15
+ RenderBlock {DIV} at (3,3) size 153x15
+layer at (16,304) size 139x15
+ RenderBlock {DIV} at (0,0) size 140x15
+layer at (16,329) size 163x16
+ RenderBlock {DIV} at (3,3) size 164x16
+layer at (16,355) size 148x16
+ RenderBlock {DIV} at (0,0) size 149x16
+layer at (16,381) size 174x17
+ RenderBlock {DIV} at (3,3) size 175x17
+layer at (16,408) size 159x17
+ RenderBlock {DIV} at (0,0) size 160x17
+layer at (16,435) size 185x18
+ RenderBlock {DIV} at (3,3) size 186x18
+layer at (16,463) size 170x18
+ RenderBlock {DIV} at (0,0) size 171x18
+layer at (215,50) size 196x18
+ RenderBlock {DIV} at (3,3) size 197x18
+layer at (215,78) size 181x18
+ RenderBlock {DIV} at (0,0) size 182x18
+layer at (215,106) size 207x20
+ RenderBlock {DIV} at (3,3) size 208x20
+layer at (215,136) size 192x20
+ RenderBlock {DIV} at (0,0) size 193x20
+layer at (215,166) size 219x21
+ RenderBlock {DIV} at (3,3) size 220x21
+layer at (215,197) size 200x21
+ RenderBlock {DIV} at (0,0) size 201x21
+layer at (215,228) size 231x22
+ RenderBlock {DIV} at (3,3) size 231x22
+layer at (215,260) size 212x22
+ RenderBlock {DIV} at (0,0) size 212x22
+layer at (215,292) size 251x23
+ RenderBlock {DIV} at (3,3) size 251x23
+layer at (215,325) size 232x23
+ RenderBlock {DIV} at (0,0) size 232x23
+layer at (215,358) size 263x24
+ RenderBlock {DIV} at (3,3) size 263x24
+layer at (215,392) size 244x24
+ RenderBlock {DIV} at (0,0) size 244x24
+layer at (215,426) size 275x26
+ RenderBlock {DIV} at (3,3) size 275x26
+layer at (215,462) size 256x26
+ RenderBlock {DIV} at (0,0) size 256x26
+layer at (215,498) size 287x27
+ RenderBlock {DIV} at (3,3) size 287x27
+layer at (215,535) size 268x27
+>>>>>>> Stashed changes
RenderBlock {DIV} at (0,0) size 268x27
layer at (107,143) size 13x15
RenderBlock (relative positioned) {DIV} at (92,0) size 14x15
@@ -179,6 +323,7 @@
RenderBlock (relative positioned) {DIV} at (104,0) size 14x15
layer at (130,212) size 13x15
RenderBlock (relative positioned) {DIV} at (116,0) size 14x15
+<<<<<<< Updated upstream
layer at (142,254) size 13x17
RenderBlock (relative positioned) {DIV} at (127,0) size 14x17
layer at (153,303) size 13x18
@@ -204,4 +349,31 @@
layer at (469,459) size 19x33
RenderBlock (relative positioned) {DIV} at (255,-1) size 20x34
layer at (481,531) size 19x35
+=======
+layer at (144,254) size 13x17
+ RenderBlock (relative positioned) {DIV} at (127,0) size 14x17
+layer at (155,303) size 13x18
+ RenderBlock (relative positioned) {DIV} at (139,0) size 14x18
+layer at (164,353) size 15x20
+ RenderBlock (relative positioned) {DIV} at (148,0) size 16x20
+layer at (175,406) size 15x21
+ RenderBlock (relative positioned) {DIV} at (159,0) size 16x21
+layer at (186,461) size 15x23
+ RenderBlock (relative positioned) {DIV} at (170,0) size 16x23
+layer at (397,75) size 15x24
+ RenderBlock (relative positioned) {DIV} at (181,0) size 16x24
+layer at (408,133) size 15x26
+ RenderBlock (relative positioned) {DIV} at (192,0) size 16x26
+layer at (415,194) size 19x27
+ RenderBlock (relative positioned) {DIV} at (200,0) size 20x27
+layer at (427,257) size 19x28
+ RenderBlock (relative positioned) {DIV} at (211,-1) size 20x30
+layer at (447,322) size 19x30
+ RenderBlock (relative positioned) {DIV} at (231,-1) size 20x31
+layer at (459,388) size 19x32
+ RenderBlock (relative positioned) {DIV} at (243,-1) size 20x32
+layer at (471,459) size 19x33
+ RenderBlock (relative positioned) {DIV} at (255,-1) size 20x34
+layer at (483,531) size 19x35
+>>>>>>> Stashed changes
RenderBlock (relative positioned) {DIV} at (267,-1) size 20x35
