summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.pngbin12359 -> 12337 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.txt24
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt2
4 files changed, 14 insertions, 14 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.checksum
index 9cee2eb..5a9ba10 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.checksum
@@ -1 +1 @@
-27d36d035366da911dbe2cfa756df763 \ No newline at end of file
+4ec7df98c9f952771836d9d8cce2559e \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.png
index 499104b..d40099b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.png
Binary files differ
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 913dd1b..abf04e9 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
@@ -89,23 +89,23 @@ layer at (0,0) size 785x650
RenderBlock {DIV} at (1,1) size 17x17 [border: (2px solid #0000FF)]
RenderInline {FONT} at (0,0) size 13x10
RenderBlock {INPUT} at (2,2) size 13x13
- RenderTable {TABLE} at (0,239) size 580x79
- RenderTableSection {TBODY} at (0,0) size 580x79
- RenderTableRow {TR} at (0,2) size 580x75
+ RenderTable {TABLE} at (0,239) size 584x79
+ RenderTableSection {TBODY} at (0,0) size 584x79
+ RenderTableRow {TR} at (0,2) size 584x75
RenderTableCell {TD} at (2,2) size 101x28 [r=0 c=0 rs=1 cs=1]
RenderBlock {DIV} at (1,1) size 99x26 [border: (2px solid #0000FF)]
RenderTextControl {INPUT} at (2,2) size 95x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderTableCell {TD} at (105,2) size 40x75 [r=0 c=1 rs=1 cs=1]
- RenderBlock {DIV} at (1,1) size 38x73 [border: (2px solid #0000FF)]
- RenderListBox {SELECT} at (2,2) size 34x69 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
- RenderTableCell {TD} at (147,2) size 244x28 [r=0 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (105,2) size 44x75 [r=0 c=1 rs=1 cs=1]
+ RenderBlock {DIV} at (1,1) size 42x73 [border: (2px solid #0000FF)]
+ 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
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 (393,2) size 185x44 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (397,2) size 185x44 [r=0 c=3 rs=1 cs=1]
RenderBlock {DIV} at (1,1) size 183x42 [border: (2px solid #0000FF)]
RenderBlock {H2} at (0,337) size 769x27
RenderText {#text} at (0,0) size 199x26
@@ -194,7 +194,7 @@ layer at (0,0) size 785x650
RenderText {#text} at (0,0) size 0x0
RenderMenuList {SELECT} at (0,6) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 23x18
- RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF]
RenderText {#text} at (25,0) size 6x27
text run at (25,0) width 6: " "
RenderMenuList {SELECT} at (31,6) size 28x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
@@ -211,7 +211,7 @@ layer at (0,0) size 785x650
RenderBlock {DIV} at (0,594) size 769x20
RenderMenuList {SELECT} at (0,0) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 23x18
- RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF]
RenderText {#text} at (25,0) size 4x19
text run at (25,0) width 4: " "
RenderMenuList {SELECT} at (29,0) size 28x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
@@ -230,7 +230,7 @@ layer at (0,0) size 785x650
RenderText {#text} at (0,0) size 0x0
RenderMenuList {SELECT} at (0,0) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 23x18
- RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF]
RenderText {#text} at (25,5) size 3x12
text run at (25,5) width 3: " "
RenderMenuList {SELECT} at (28,0) size 28x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
@@ -248,7 +248,7 @@ layer at (15,255) size 91x16
RenderBlock {DIV} at (2,3) size 91x16
RenderText {#text} at (1,0) size 49x16
text run at (1,0) width 49: "text field"
-layer at (404,253) size 179x36 clip at (405,254) size 177x34
+layer at (408,253) size 179x36 clip at (409,254) size 177x34
RenderTextControl {TEXTAREA} at (2,3) size 179x36 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock {DIV} at (3,3) size 158x16
RenderText {#text} at (0,0) size 64x16
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 26a793f..345b4ad 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -911,7 +911,6 @@ DEFER : LayoutTests/fast/dom/constructors-cached.html = FAIL
// MERGE REGRESSIONS 36102:37604
LINUX : LayoutTests/fast/events/mouse-click-events.html = FAIL
-LayoutTests/fast/forms/form-element-geometry.html = FAIL
// These tests are wrong because of:
// https://bugs.webkit.org/show_bug.cgi?id=24161. This is not
// important for current release.
@@ -926,6 +925,7 @@ DEFER : LayoutTests/fast/forms/textarea-rows-cols.html = FAIL
LINUX WIN : LayoutTests/fast/repaint/overflow-outline-repaint.html = FAIL
WIN : LayoutTests/fast/repaint/overflow-scroll-delete.html = FAIL
// Likely just needs to be baselined.
+LINUX MAC : LayoutTests/fast/forms/form-element-geometry.html = FAIL
LINUX MAC : LayoutTests/fast/replaced/width100percent-textarea.html = FAIL
LINUX : LayoutTests/fast/text/drawBidiText.html = FAIL
LINUX : LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe.html = TIMEOUT PASS