diff options
Diffstat (limited to 'webkit')
14 files changed, 148 insertions, 40 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/file-input-direction-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/file-input-direction-expected.txt index 2c5f582..00b4ea2 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/file-input-direction-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/file-input-direction-expected.txt @@ -20,25 +20,25 @@ layer at (0,0) size 1084x585 RenderTableRow {TR} at (0,26) size 1076x30 RenderTableCell {TH} at (2,40) size 80x2 [r=1 c=0 rs=1 cs=1] RenderTableCell {TD} at (84,26) size 246x30 [border: (1px solid #000000)] [r=1 c=1 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (332,26) size 246x30 [border: (1px solid #000000)] [r=1 c=2 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (580,26) size 246x30 [border: (1px solid #000000)] [r=1 c=3 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (828,26) size 246x30 [border: (1px solid #000000)] [r=1 c=4 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 @@ -48,25 +48,25 @@ layer at (0,0) size 1084x585 RenderText {#text} at (1,1) size 78x19 text run at (1,1) width 78: "direction:ltr" RenderTableCell {TD} at (84,58) size 246x30 [border: (1px solid #000000)] [r=2 c=1 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (332,58) size 246x30 [border: (1px solid #000000)] [r=2 c=2 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (580,58) size 246x30 [border: (1px solid #000000)] [r=2 c=3 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (828,58) size 246x30 [border: (1px solid #000000)] [r=2 c=4 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 @@ -76,25 +76,25 @@ layer at (0,0) size 1084x585 RenderText {#text} at (1,1) size 78x19 text run at (1,1) width 78: "direction:rtl" RenderTableCell {TD} at (84,90) size 246x30 [border: (1px solid #000000)] [r=3 c=1 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (147,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (332,90) size 246x30 [border: (1px solid #000000)] [r=3 c=2 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (147,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (580,90) size 246x30 [border: (1px solid #000000)] [r=3 c=3 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (147,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (828,90) size 246x30 [border: (1px solid #000000)] [r=3 c=4 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (147,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/file-input-disabled-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/file-input-disabled-expected.txt index bd7380a..56ef9b9 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/file-input-disabled-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/file-input-disabled-expected.txt @@ -13,7 +13,7 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,21) size 0x19 RenderText {#text} at (0,44) size 82x19 text run at (0,44) width 82: " Select File: " - RenderFileUploadControl {INPUT} at (84,43) size 238x22 + RenderFileUploadControl {INPUT} at (84,43) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [color=#808080] [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/hidden-input-file-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/hidden-input-file-expected.txt index b198f67..18beb96 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/hidden-input-file-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/hidden-input-file-expected.txt @@ -5,7 +5,7 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderText {#text} at (0,3) size 490x19 text run at (0,3) width 490: "This tests that the whole file input control is hidden when visibility is set to hidden. " - RenderFileUploadControl {INPUT} at (492,2) size 238x22 + RenderFileUploadControl {INPUT} at (492,2) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.txt index c51ea01..59a1a2d 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.txt @@ -27,7 +27,7 @@ layer at (0,0) size 800x600 RenderBR {BR} at (87,68) size 0x0 RenderText {#text} at (0,76) size 21x19 text run at (0,76) width 21: "file " - RenderFileUploadControl {INPUT} at (23,75) size 238x22 + RenderFileUploadControl {INPUT} at (23,75) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-value-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-value-expected.txt index 923cb31..a55d2df 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-value-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-value-expected.txt @@ -191,7 +191,7 @@ layer at (0,0) size 800x600 RenderText {#text} at (1,1) size 191x19 text run at (1,1) width 191: "file with value property changed" RenderTableCell {TD} at (370,350) size 244x28 [r=13 c=1 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (3,3) size 238x22 + RenderFileUploadControl {INPUT} at (3,3) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/forms/file-input-direction-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/forms/file-input-direction-expected.txt new file mode 100644 index 0000000..546b1b6 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/forms/file-input-direction-expected.txt @@ -0,0 +1,101 @@ +layer at (0,0) size 1083x585 + RenderView at (0,0) size 800x585 +layer at (0,0) size 1083x585 + RenderBlock {HTML} at (0,0) size 800x585 + RenderBody {BODY} at (8,8) size 784x569 + RenderTable {TABLE} at (0,0) size 1075x108 + RenderTableSection {TBODY} at (0,0) size 1075x108 + RenderTableRow {TR} at (0,2) size 1075x20 + RenderTableCell {TH} at (2,11) size 83x2 [r=0 c=0 rs=1 cs=1] + RenderTableCell {TH} at (87,11) size 245x2 [r=0 c=1 rs=1 cs=1] + RenderTableCell {TH} at (334,2) size 245x20 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (78,1) size 89x18 + text run at (78,1) width 89: "text-align:left" + RenderTableCell {TH} at (581,2) size 245x20 [r=0 c=3 rs=1 cs=1] + RenderText {#text} at (67,1) size 110x18 + text run at (67,1) width 110: "text-align:center" + RenderTableCell {TH} at (828,2) size 245x20 [r=0 c=4 rs=1 cs=1] + RenderText {#text} at (72,1) size 101x18 + text run at (72,1) width 101: "text-align:right" + RenderTableRow {TR} at (0,24) size 1075x26 + RenderTableCell {TH} at (2,36) size 83x2 [r=1 c=0 rs=1 cs=1] + RenderTableCell {TD} at (87,24) size 245x26 [border: (1px solid #000000)] [r=1 c=1 rs=1 cs=1] + RenderFileUploadControl {INPUT} at (4,4) size 237x18 "No file chosen" + RenderButton {INPUT} at (0,0) size 78x18 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (8,2) size 62x13 + RenderText at (0,0) size 62x13 + text run at (0,0) width 62: "Choose File" + RenderTableCell {TD} at (334,24) size 245x26 [border: (1px solid #000000)] [r=1 c=2 rs=1 cs=1] + RenderFileUploadControl {INPUT} at (4,4) size 237x18 "No file chosen" + RenderButton {INPUT} at (0,0) size 78x18 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (8,2) size 62x13 + RenderText at (0,0) size 62x13 + text run at (0,0) width 62: "Choose File" + RenderTableCell {TD} at (581,24) size 245x26 [border: (1px solid #000000)] [r=1 c=3 rs=1 cs=1] + RenderFileUploadControl {INPUT} at (4,4) size 237x18 "No file chosen" + RenderButton {INPUT} at (0,0) size 78x18 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (8,2) size 62x13 + RenderText at (0,0) size 62x13 + text run at (0,0) width 62: "Choose File" + RenderTableCell {TD} at (828,24) size 245x26 [border: (1px solid #000000)] [r=1 c=4 rs=1 cs=1] + RenderFileUploadControl {INPUT} at (4,4) size 237x18 "No file chosen" + RenderButton {INPUT} at (0,0) size 78x18 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (8,2) size 62x13 + RenderText at (0,0) size 62x13 + text run at (0,0) width 62: "Choose File" + RenderTableRow {TR} at (0,52) size 1075x26 + RenderTableCell {TH} at (2,55) size 83x20 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 81x18 + text run at (1,1) width 81: "direction:ltr" + RenderTableCell {TD} at (87,52) size 245x26 [border: (1px solid #000000)] [r=2 c=1 rs=1 cs=1] + RenderFileUploadControl {INPUT} at (4,4) size 237x18 "No file chosen" + RenderButton {INPUT} at (0,0) size 78x18 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (8,2) size 62x13 + RenderText at (0,0) size 62x13 + text run at (0,0) width 62: "Choose File" + RenderTableCell {TD} at (334,52) size 245x26 [border: (1px solid #000000)] [r=2 c=2 rs=1 cs=1] + RenderFileUploadControl {INPUT} at (4,4) size 237x18 "No file chosen" + RenderButton {INPUT} at (0,0) size 78x18 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (8,2) size 62x13 + RenderText at (0,0) size 62x13 + text run at (0,0) width 62: "Choose File" + RenderTableCell {TD} at (581,52) size 245x26 [border: (1px solid #000000)] [r=2 c=3 rs=1 cs=1] + RenderFileUploadControl {INPUT} at (4,4) size 237x18 "No file chosen" + RenderButton {INPUT} at (0,0) size 78x18 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (8,2) size 62x13 + RenderText at (0,0) size 62x13 + text run at (0,0) width 62: "Choose File" + RenderTableCell {TD} at (828,52) size 245x26 [border: (1px solid #000000)] [r=2 c=4 rs=1 cs=1] + RenderFileUploadControl {INPUT} at (4,4) size 237x18 "No file chosen" + RenderButton {INPUT} at (0,0) size 78x18 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (8,2) size 62x13 + RenderText at (0,0) size 62x13 + text run at (0,0) width 62: "Choose File" + RenderTableRow {TR} at (0,80) size 1075x26 + RenderTableCell {TH} at (2,83) size 83x20 [r=3 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 81x18 + text run at (1,1) width 81: "direction:rtl" + RenderTableCell {TD} at (87,80) size 245x26 [border: (1px solid #000000)] [r=3 c=1 rs=1 cs=1] + RenderFileUploadControl {INPUT} at (4,4) size 237x18 "No file chosen" + RenderButton {INPUT} at (159,0) size 78x18 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (8,2) size 62x13 + RenderText at (0,0) size 62x13 + text run at (0,0) width 62: "Choose File" + RenderTableCell {TD} at (334,80) size 245x26 [border: (1px solid #000000)] [r=3 c=2 rs=1 cs=1] + RenderFileUploadControl {INPUT} at (4,4) size 237x18 "No file chosen" + RenderButton {INPUT} at (159,0) size 78x18 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (8,2) size 62x13 + RenderText at (0,0) size 62x13 + text run at (0,0) width 62: "Choose File" + RenderTableCell {TD} at (581,80) size 245x26 [border: (1px solid #000000)] [r=3 c=3 rs=1 cs=1] + RenderFileUploadControl {INPUT} at (4,4) size 237x18 "No file chosen" + RenderButton {INPUT} at (159,0) size 78x18 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (8,2) size 62x13 + RenderText at (0,0) size 62x13 + text run at (0,0) width 62: "Choose File" + RenderTableCell {TD} at (828,80) size 245x26 [border: (1px solid #000000)] [r=3 c=4 rs=1 cs=1] + RenderFileUploadControl {INPUT} at (4,4) size 237x18 "No file chosen" + RenderButton {INPUT} at (159,0) size 78x18 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (8,2) size 62x13 + RenderText at (0,0) size 62x13 + text run at (0,0) width 62: "Choose File" diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/forms/hidden-input-file-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/forms/hidden-input-file-expected.txt new file mode 100644 index 0000000..fae764c --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/forms/hidden-input-file-expected.txt @@ -0,0 +1,13 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x600 + RenderBlock {HTML} at (0,0) size 800x600 + RenderBody {BODY} at (8,8) size 784x584 + RenderText {#text} at (0,1) size 524x18 + text run at (0,1) width 524: "This tests that the whole file input control is hidden when visibility is set to hidden. " + RenderFileUploadControl {INPUT} at (526,2) size 237x18 "No file chosen" + RenderButton {INPUT} at (0,0) size 78x18 [bgcolor=#C0C0C0] + RenderBlock (anonymous) at (8,2) size 62x13 + RenderText at (0,0) size 62x13 + text run at (0,0) width 62: "Choose File" + RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-direction-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-direction-expected.txt index 2e43370..7afa296 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-direction-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-direction-expected.txt @@ -20,25 +20,25 @@ layer at (0,0) size 1084x585 RenderTableRow {TR} at (0,26) size 1076x30 RenderTableCell {TH} at (2,40) size 80x2 [r=1 c=0 rs=1 cs=1] RenderTableCell {TD} at (84,26) size 246x30 [border: (1px solid #000000)] [r=1 c=1 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (332,26) size 246x30 [border: (1px solid #000000)] [r=1 c=2 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (580,26) size 246x30 [border: (1px solid #000000)] [r=1 c=3 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (828,26) size 246x30 [border: (1px solid #000000)] [r=1 c=4 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 @@ -48,25 +48,25 @@ layer at (0,0) size 1084x585 RenderText {#text} at (1,1) size 78x19 text run at (1,1) width 78: "direction:ltr" RenderTableCell {TD} at (84,58) size 246x30 [border: (1px solid #000000)] [r=2 c=1 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (332,58) size 246x30 [border: (1px solid #000000)] [r=2 c=2 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (580,58) size 246x30 [border: (1px solid #000000)] [r=2 c=3 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (828,58) size 246x30 [border: (1px solid #000000)] [r=2 c=4 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 @@ -76,25 +76,25 @@ layer at (0,0) size 1084x585 RenderText {#text} at (1,1) size 78x19 text run at (1,1) width 78: "direction:rtl" RenderTableCell {TD} at (84,90) size 246x30 [border: (1px solid #000000)] [r=3 c=1 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (147,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (332,90) size 246x30 [border: (1px solid #000000)] [r=3 c=2 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (147,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (580,90) size 246x30 [border: (1px solid #000000)] [r=3 c=3 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (147,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 text run at (3,1) width 69: "Choose File" RenderTableCell {TD} at (828,90) size 246x30 [border: (1px solid #000000)] [r=3 c=4 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (4,4) size 238x22 + RenderFileUploadControl {INPUT} at (4,4) size 238x22 "No file chosen" RenderButton {INPUT} at (147,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-disabled-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-disabled-expected.txt index 1616a16..a337399 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-disabled-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/file-input-disabled-expected.txt @@ -13,7 +13,7 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,21) size 0x19 RenderText {#text} at (0,44) size 82x19 text run at (0,44) width 82: " Select File: " - RenderFileUploadControl {INPUT} at (84,43) size 238x22 + RenderFileUploadControl {INPUT} at (84,43) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [color=#808080] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.txt index f99afce..06ecaec 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.txt @@ -100,7 +100,7 @@ layer at (0,0) size 785x669 RenderListBox {SELECT} at (2,2) size 38x69 [bgcolor=#FFFFFF] [border: (1px inset #808080)] RenderTableCell {TD} at (151,2) size 244x28 [r=0 c=2 rs=1 cs=1] RenderBlock {DIV} at (1,1) size 242x26 [border: (2px solid #0000FF)] - RenderFileUploadControl {INPUT} at (2,2) size 238x22 + RenderFileUploadControl {INPUT} at (2,2) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 @@ -178,7 +178,7 @@ layer at (0,0) size 785x669 RenderTextControl {INPUT} at (28,24) size 95x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)] RenderText {#text} at (125,25) size 4x19 text run at (125,25) width 4: " " - RenderFileUploadControl {INPUT} at (131,24) size 238x22 + RenderFileUploadControl {INPUT} at (131,24) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/hidden-input-file-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/hidden-input-file-expected.txt index 0bf7e74..53ada4b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/hidden-input-file-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/hidden-input-file-expected.txt @@ -5,7 +5,7 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderText {#text} at (0,3) size 490x19 text run at (0,3) width 490: "This tests that the whole file input control is hidden when visibility is set to hidden. " - RenderFileUploadControl {INPUT} at (492,2) size 238x22 + RenderFileUploadControl {INPUT} at (492,2) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt index 22aba9a..a0a0140 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt @@ -27,7 +27,7 @@ layer at (0,0) size 800x600 RenderBR {BR} at (87,68) size 0x0 RenderText {#text} at (0,76) size 21x19 text run at (0,76) width 21: "file " - RenderFileUploadControl {INPUT} at (23,75) size 238x22 + RenderFileUploadControl {INPUT} at (23,75) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-value-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-value-expected.txt index 243260c..bafe804 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-value-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-value-expected.txt @@ -191,7 +191,7 @@ layer at (0,0) size 800x600 RenderText {#text} at (1,1) size 191x19 text run at (1,1) width 191: "file with value property changed" RenderTableCell {TD} at (370,350) size 244x28 [r=13 c=1 rs=1 cs=1] - RenderFileUploadControl {INPUT} at (3,3) size 238x22 + RenderFileUploadControl {INPUT} at (3,3) size 238x22 "No file chosen" RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] RenderBlock (anonymous) at (8,2) size 75x18 RenderText at (3,1) size 69x16 diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index c756e4e..66e2b52 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -3064,8 +3064,6 @@ BUG27553 WIN MAC : LayoutTests/fast/text/atsui-partial-selection.html = IMAGE // WebKit merge 50840:50929 BUG27555 : LayoutTests/accessibility/document-attributes.html = TEXT -BUG27555 : LayoutTests/fast/forms/file-input-direction.html = TEXT -BUG27555 : LayoutTests/fast/forms/hidden-input-file.html = TEXT BUG27555 : LayoutTests/fast/forms/input-file-re-render.html = MISSING TEXT BUG27555 MAC : LayoutTests/fast/css/color-correction-on-box-shadow.html = IMAGE @@ -3075,10 +3073,6 @@ BUG27555 WIN LINUX : LayoutTests/fast/css/color-correction-on-text-shadow.html = BUG27555 MAC : LayoutTests/fast/reflections/opacity-reflection-transform.html = IMAGE BUG27555 WIN LINUX : LayoutTests/fast/reflections/opacity-reflection-transform.html = IMAGE+TEXT -BUG27555 WIN LINUX : LayoutTests/fast/forms/file-input-disabled.html = TEXT -BUG27555 WIN : LayoutTests/fast/forms/form-element-geometry.html = TEXT -BUG27555 WIN LINUX : LayoutTests/fast/forms/input-appearance-height.html = TEXT -BUG27555 LINUX WIN : LayoutTests/fast/forms/input-value.html = TEXT BUG27555 : LayoutTests/media/media-fullscreen-inline.html = TIMEOUT BUG27555 : LayoutTests/media/media-fullscreen-not-in-document.html = TIMEOUT |