summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--third_party/WebKit/LayoutTests/ChangeLog150
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event-expected.txt (renamed from third_party/WebKit/LayoutTests/fast/forms/file-input-change-event-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event.html (renamed from third_party/WebKit/LayoutTests/fast/forms/file-input-change-event.html)4
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/file-input-direction.html (renamed from third_party/WebKit/LayoutTests/fast/forms/file-input-direction.html)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/file-input-disabled.html (renamed from third_party/WebKit/LayoutTests/fast/forms/file-input-disabled.html)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test-expected.txt (renamed from third_party/WebKit/LayoutTests/fast/forms/file-input-hit-test-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test.html (renamed from third_party/WebKit/LayoutTests/fast/forms/file-input-hit-test.html)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset-expected.html (renamed from third_party/WebKit/LayoutTests/fast/forms/file-input-reset-expected.html)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset.html (renamed from third_party/WebKit/LayoutTests/fast/forms/file-input-reset.html)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload-expected.txt (renamed from third_party/WebKit/LayoutTests/fast/forms/get-file-upload-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload.html (renamed from third_party/WebKit/LayoutTests/fast/forms/get-file-upload.html)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file-expected.html3
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file.html3
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload-expected.txt (renamed from third_party/WebKit/LayoutTests/fast/forms/input-file-directory-upload-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload.html (renamed from third_party/WebKit/LayoutTests/fast/forms/input-file-directory-upload.html)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/input-file-label-expected.txt (renamed from third_party/WebKit/LayoutTests/fast/forms/input-file-label-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/input-file-label.html (renamed from third_party/WebKit/LayoutTests/fast/forms/input-file-label.html)4
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture-expected.txt (renamed from third_party/WebKit/LayoutTests/fast/forms/input-file-not-open-without-gesture-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture.html (renamed from third_party/WebKit/LayoutTests/fast/forms/input-file-not-open-without-gesture.html)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/file/input-file-re-render.html (renamed from third_party/WebKit/LayoutTests/fast/forms/input-file-re-render.html)0
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/hidden-input-file.html2
-rw-r--r--third_party/WebKit/LayoutTests/platform/chromium-cg-mac/fast/forms/file/file-input-direction-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/chromium-cg-mac/fast/forms/file-input-direction-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/chromium-cg-mac/fast/forms/hidden-input-file-expected.txt13
-rw-r--r--third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file/file-input-direction-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file-input-direction-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file/file-input-disabled-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file-input-disabled-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file/input-file-re-render-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/input-file-re-render-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/hidden-input-file-expected.txt13
-rw-r--r--third_party/WebKit/LayoutTests/platform/chromium-mac/fast/forms/file/file-input-direction-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/chromium-mac/fast/forms/file-input-direction-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/chromium-mac/fast/forms/hidden-input-file-expected.txt13
-rw-r--r--third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file/file-input-direction-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file-input-direction-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file/file-input-disabled-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file-input-disabled-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file/input-file-re-render-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/input-file-re-render-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/hidden-input-file-expected.txt13
-rw-r--r--third_party/WebKit/LayoutTests/platform/chromium/test_expectations.txt6
-rw-r--r--third_party/WebKit/LayoutTests/platform/gtk/Skipped2
-rw-r--r--third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file/file-input-direction-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file-input-direction-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file/file-input-disabled-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file-input-disabled-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file/input-file-re-render-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/gtk/fast/forms/input-file-re-render-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/gtk/fast/forms/hidden-input-file-expected.txt13
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac-leopard/fast/forms/file/file-input-disabled-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/mac-leopard/fast/forms/file-input-disabled-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac/Skipped2
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac/fast/forms/file/file-input-direction-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/mac/fast/forms/file-input-direction-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac/fast/forms/file/file-input-disabled-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/mac/fast/forms/file-input-disabled-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac/fast/forms/file/input-file-re-render-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-file-re-render-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac/fast/forms/hidden-input-file-expected.txt13
-rw-r--r--third_party/WebKit/LayoutTests/platform/qt/Skipped14
-rw-r--r--third_party/WebKit/LayoutTests/platform/qt/fast/forms/file/file-input-direction-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/qt/fast/forms/file-input-direction-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/qt/fast/forms/file/file-input-disabled-expected.txt (renamed from third_party/WebKit/LayoutTests/platform/qt/fast/forms/file-input-disabled-expected.txt)0
-rw-r--r--third_party/WebKit/LayoutTests/platform/qt/fast/forms/hidden-input-file-expected.txt13
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/Skipped8
50 files changed, 176 insertions, 113 deletions
diff --git a/third_party/WebKit/LayoutTests/ChangeLog b/third_party/WebKit/LayoutTests/ChangeLog
index 104d656..e8497be 100644
--- a/third_party/WebKit/LayoutTests/ChangeLog
+++ b/third_party/WebKit/LayoutTests/ChangeLog
@@ -1,3 +1,153 @@
+2011-10-05 Kent Tamura <tkent@chromium.org>
+
+ Move <input type=file> tests to fast/forms/file/
+ https://bugs.webkit.org/show_bug.cgi?id=69504
+
+ Reviewed by Hajime Morita.
+
+ * fast/forms/file-input-change-event-expected.txt: Removed.
+ * fast/forms/file-input-change-event.html: Removed.
+ * fast/forms/file-input-direction.html: Removed.
+ * fast/forms/file-input-disabled.html: Removed.
+ * fast/forms/file-input-hit-test-expected.txt: Removed.
+ * fast/forms/file-input-hit-test.html: Removed.
+ * fast/forms/file-input-reset-expected.html: Removed.
+ * fast/forms/file-input-reset.html: Removed.
+ * fast/forms/file/file-input-change-event-expected.txt: Copied from LayoutTests/fast/forms/file-input-change-event-expected.txt.
+ * fast/forms/file/file-input-change-event.html: Copied from LayoutTests/fast/forms/file-input-change-event.html.
+ * fast/forms/file/file-input-direction.html: Copied from LayoutTests/fast/forms/file-input-direction.html.
+ * fast/forms/file/file-input-disabled.html: Copied from LayoutTests/fast/forms/file-input-disabled.html.
+ * fast/forms/file/file-input-hit-test-expected.txt: Copied from LayoutTests/fast/forms/file-input-hit-test-expected.txt.
+ * fast/forms/file/file-input-hit-test.html: Copied from LayoutTests/fast/forms/file-input-hit-test.html.
+ * fast/forms/file/file-input-reset-expected.html: Copied from LayoutTests/fast/forms/file-input-reset-expected.html.
+ * fast/forms/file/file-input-reset.html: Copied from LayoutTests/fast/forms/file-input-reset.html.
+ * fast/forms/file/get-file-upload-expected.txt: Copied from LayoutTests/fast/forms/get-file-upload-expected.txt.
+ * fast/forms/file/get-file-upload.html: Copied from LayoutTests/fast/forms/get-file-upload.html.
+ * fast/forms/file/hidden-input-file-expected.html: Copied from LayoutTests/fast/forms/hidden-input-file.html.
+ * fast/forms/file/hidden-input-file.html: Copied from LayoutTests/fast/forms/hidden-input-file.html.
+ * fast/forms/file/input-file-directory-upload-expected.txt: Copied from LayoutTests/fast/forms/input-file-directory-upload-expected.txt.
+ * fast/forms/file/input-file-directory-upload.html: Copied from LayoutTests/fast/forms/input-file-directory-upload.html.
+ * fast/forms/file/input-file-label-expected.txt: Copied from LayoutTests/fast/forms/input-file-label-expected.txt.
+ * fast/forms/file/input-file-label.html: Copied from LayoutTests/fast/forms/input-file-label.html.
+ * fast/forms/file/input-file-not-open-without-gesture-expected.txt: Copied from LayoutTests/fast/forms/input-file-not-open-without-gesture-expected.txt.
+ * fast/forms/file/input-file-not-open-without-gesture.html: Copied from LayoutTests/fast/forms/input-file-not-open-without-gesture.html.
+ * fast/forms/file/input-file-re-render.html: Copied from LayoutTests/fast/forms/input-file-re-render.html.
+ * fast/forms/get-file-upload-expected.txt: Removed.
+ * fast/forms/get-file-upload.html: Removed.
+ * fast/forms/hidden-input-file.html: Removed.
+ * fast/forms/input-file-directory-upload-expected.txt: Removed.
+ * fast/forms/input-file-directory-upload.html: Removed.
+ * fast/forms/input-file-label-expected.txt: Removed.
+ * fast/forms/input-file-label.html: Removed.
+ * fast/forms/input-file-not-open-without-gesture-expected.txt: Removed.
+ * fast/forms/input-file-not-open-without-gesture.html: Removed.
+ * fast/forms/input-file-re-render.html: Removed.
+ * platform/chromium-cg-mac-leopard/fast/forms/file: Added.
+ * platform/chromium-cg-mac-leopard/fast/forms/file-input-direction-expected.png: Removed.
+ * platform/chromium-cg-mac-leopard/fast/forms/file/file-input-direction-expected.png: Copied from LayoutTests/platform/chromium-cg-mac-leopard/fast/forms/file-input-direction-expected.png.
+ * platform/chromium-cg-mac-leopard/fast/forms/file/input-file-re-render-expected.png: Copied from LayoutTests/platform/chromium-cg-mac-leopard/fast/forms/input-file-re-render-expected.png.
+ * platform/chromium-cg-mac-leopard/fast/forms/input-file-re-render-expected.png: Removed.
+ * platform/chromium-cg-mac/fast/forms/file: Added.
+ * platform/chromium-cg-mac/fast/forms/file-input-direction-expected.png: Removed.
+ * platform/chromium-cg-mac/fast/forms/file-input-direction-expected.txt: Removed.
+ * platform/chromium-cg-mac/fast/forms/file-input-disabled-expected.png: Removed.
+ * platform/chromium-cg-mac/fast/forms/file/file-input-direction-expected.png: Copied from LayoutTests/platform/chromium-cg-mac/fast/forms/file-input-direction-expected.png.
+ * platform/chromium-cg-mac/fast/forms/file/file-input-direction-expected.txt: Copied from LayoutTests/platform/chromium-cg-mac/fast/forms/file-input-direction-expected.txt.
+ * platform/chromium-cg-mac/fast/forms/file/file-input-disabled-expected.png: Copied from LayoutTests/platform/chromium-cg-mac/fast/forms/file-input-disabled-expected.png.
+ * platform/chromium-cg-mac/fast/forms/file/input-file-re-render-expected.png: Copied from LayoutTests/platform/chromium-cg-mac/fast/forms/input-file-re-render-expected.png.
+ * platform/chromium-cg-mac/fast/forms/hidden-input-file-expected.txt: Removed.
+ * platform/chromium-cg-mac/fast/forms/input-file-re-render-expected.png: Removed.
+ * platform/chromium-linux/fast/forms/file: Added.
+ * platform/chromium-linux/fast/forms/file-input-direction-expected.png: Removed.
+ * platform/chromium-linux/fast/forms/file-input-direction-expected.txt: Removed.
+ * platform/chromium-linux/fast/forms/file-input-disabled-expected.png: Removed.
+ * platform/chromium-linux/fast/forms/file-input-disabled-expected.txt: Removed.
+ * platform/chromium-linux/fast/forms/file/file-input-direction-expected.png: Copied from LayoutTests/platform/chromium-linux/fast/forms/file-input-direction-expected.png.
+ * platform/chromium-linux/fast/forms/file/file-input-direction-expected.txt: Copied from LayoutTests/platform/chromium-linux/fast/forms/file-input-direction-expected.txt.
+ * platform/chromium-linux/fast/forms/file/file-input-disabled-expected.png: Copied from LayoutTests/platform/chromium-linux/fast/forms/file-input-disabled-expected.png.
+ * platform/chromium-linux/fast/forms/file/file-input-disabled-expected.txt: Copied from LayoutTests/platform/chromium-linux/fast/forms/file-input-disabled-expected.txt.
+ * platform/chromium-linux/fast/forms/file/input-file-re-render-expected.png: Copied from LayoutTests/platform/chromium-linux/fast/forms/input-file-re-render-expected.png.
+ * platform/chromium-linux/fast/forms/file/input-file-re-render-expected.txt: Copied from LayoutTests/platform/chromium-linux/fast/forms/input-file-re-render-expected.txt.
+ * platform/chromium-linux/fast/forms/hidden-input-file-expected.png: Removed.
+ * platform/chromium-linux/fast/forms/hidden-input-file-expected.txt: Removed.
+ * platform/chromium-linux/fast/forms/input-file-re-render-expected.png: Removed.
+ * platform/chromium-linux/fast/forms/input-file-re-render-expected.txt: Removed.
+ * platform/chromium-mac/fast/forms/file: Added.
+ * platform/chromium-mac/fast/forms/file-input-direction-expected.png: Removed.
+ * platform/chromium-mac/fast/forms/file-input-direction-expected.txt: Removed.
+ * platform/chromium-mac/fast/forms/file/file-input-direction-expected.png: Copied from LayoutTests/platform/chromium-mac/fast/forms/file-input-direction-expected.png.
+ * platform/chromium-mac/fast/forms/file/file-input-direction-expected.txt: Copied from LayoutTests/platform/chromium-mac/fast/forms/file-input-direction-expected.txt.
+ * platform/chromium-mac/fast/forms/file/input-file-re-render-expected.png: Copied from LayoutTests/platform/chromium-mac/fast/forms/input-file-re-render-expected.png.
+ * platform/chromium-mac/fast/forms/hidden-input-file-expected.png: Removed.
+ * platform/chromium-mac/fast/forms/hidden-input-file-expected.txt: Removed.
+ * platform/chromium-mac/fast/forms/input-file-re-render-expected.png: Removed.
+ * platform/chromium-win/fast/forms/file: Added.
+ * platform/chromium-win/fast/forms/file-input-direction-expected.png: Removed.
+ * platform/chromium-win/fast/forms/file-input-direction-expected.txt: Removed.
+ * platform/chromium-win/fast/forms/file-input-disabled-expected.png: Removed.
+ * platform/chromium-win/fast/forms/file-input-disabled-expected.txt: Removed.
+ * platform/chromium-win/fast/forms/file/file-input-direction-expected.png: Copied from LayoutTests/platform/chromium-win/fast/forms/file-input-direction-expected.png.
+ * platform/chromium-win/fast/forms/file/file-input-direction-expected.txt: Copied from LayoutTests/platform/chromium-win/fast/forms/file-input-direction-expected.txt.
+ * platform/chromium-win/fast/forms/file/file-input-disabled-expected.png: Copied from LayoutTests/platform/chromium-win/fast/forms/file-input-disabled-expected.png.
+ * platform/chromium-win/fast/forms/file/file-input-disabled-expected.txt: Copied from LayoutTests/platform/chromium-win/fast/forms/file-input-disabled-expected.txt.
+ * platform/chromium-win/fast/forms/file/input-file-re-render-expected.png: Copied from LayoutTests/platform/chromium-win/fast/forms/input-file-re-render-expected.png.
+ * platform/chromium-win/fast/forms/file/input-file-re-render-expected.txt: Copied from LayoutTests/platform/chromium-win/fast/forms/input-file-re-render-expected.txt.
+ * platform/chromium-win/fast/forms/hidden-input-file-expected.png: Removed.
+ * platform/chromium-win/fast/forms/hidden-input-file-expected.txt: Removed.
+ * platform/chromium-win/fast/forms/input-file-re-render-expected.png: Removed.
+ * platform/chromium-win/fast/forms/input-file-re-render-expected.txt: Removed.
+ * platform/chromium/test_expectations.txt:
+ * platform/gtk/Skipped:
+ * platform/gtk/fast/forms/file: Added.
+ * platform/gtk/fast/forms/file-input-direction-expected.png: Removed.
+ * platform/gtk/fast/forms/file-input-direction-expected.txt: Removed.
+ * platform/gtk/fast/forms/file-input-disabled-expected.png: Removed.
+ * platform/gtk/fast/forms/file-input-disabled-expected.txt: Removed.
+ * platform/gtk/fast/forms/file/file-input-direction-expected.png: Copied from LayoutTests/platform/gtk/fast/forms/file-input-direction-expected.png.
+ * platform/gtk/fast/forms/file/file-input-direction-expected.txt: Copied from LayoutTests/platform/gtk/fast/forms/file-input-direction-expected.txt.
+ * platform/gtk/fast/forms/file/file-input-disabled-expected.png: Copied from LayoutTests/platform/gtk/fast/forms/file-input-disabled-expected.png.
+ * platform/gtk/fast/forms/file/file-input-disabled-expected.txt: Copied from LayoutTests/platform/gtk/fast/forms/file-input-disabled-expected.txt.
+ * platform/gtk/fast/forms/file/input-file-re-render-expected.png: Copied from LayoutTests/platform/gtk/fast/forms/input-file-re-render-expected.png.
+ * platform/gtk/fast/forms/file/input-file-re-render-expected.txt: Copied from LayoutTests/platform/gtk/fast/forms/input-file-re-render-expected.txt.
+ * platform/gtk/fast/forms/hidden-input-file-expected.png: Removed.
+ * platform/gtk/fast/forms/hidden-input-file-expected.txt: Removed.
+ * platform/gtk/fast/forms/input-file-re-render-expected.png: Removed.
+ * platform/gtk/fast/forms/input-file-re-render-expected.txt: Removed.
+ * platform/mac-leopard/fast/forms/file: Added.
+ * platform/mac-leopard/fast/forms/file-input-direction-expected.png: Removed.
+ * platform/mac-leopard/fast/forms/file-input-disabled-expected.png: Removed.
+ * platform/mac-leopard/fast/forms/file-input-disabled-expected.txt: Removed.
+ * platform/mac-leopard/fast/forms/file/file-input-direction-expected.png: Copied from LayoutTests/platform/mac-leopard/fast/forms/file-input-direction-expected.png.
+ * platform/mac-leopard/fast/forms/file/file-input-disabled-expected.png: Copied from LayoutTests/platform/mac-leopard/fast/forms/file-input-disabled-expected.png.
+ * platform/mac-leopard/fast/forms/file/file-input-disabled-expected.txt: Copied from LayoutTests/platform/mac-leopard/fast/forms/file-input-disabled-expected.txt.
+ * platform/mac-leopard/fast/forms/file/input-file-re-render-expected.png: Copied from LayoutTests/platform/mac-leopard/fast/forms/input-file-re-render-expected.png.
+ * platform/mac-leopard/fast/forms/hidden-input-file-expected.png: Removed.
+ * platform/mac-leopard/fast/forms/input-file-re-render-expected.png: Removed.
+ * platform/mac/Skipped:
+ * platform/mac/fast/forms/file: Added.
+ * platform/mac/fast/forms/file-input-direction-expected.png: Removed.
+ * platform/mac/fast/forms/file-input-direction-expected.txt: Removed.
+ * platform/mac/fast/forms/file-input-disabled-expected.png: Removed.
+ * platform/mac/fast/forms/file-input-disabled-expected.txt: Removed.
+ * platform/mac/fast/forms/file/file-input-direction-expected.png: Copied from LayoutTests/platform/mac/fast/forms/file-input-direction-expected.png.
+ * platform/mac/fast/forms/file/file-input-direction-expected.txt: Copied from LayoutTests/platform/mac/fast/forms/file-input-direction-expected.txt.
+ * platform/mac/fast/forms/file/file-input-disabled-expected.png: Copied from LayoutTests/platform/mac/fast/forms/file-input-disabled-expected.png.
+ * platform/mac/fast/forms/file/file-input-disabled-expected.txt: Copied from LayoutTests/platform/mac/fast/forms/file-input-disabled-expected.txt.
+ * platform/mac/fast/forms/file/input-file-re-render-expected.png: Copied from LayoutTests/platform/mac/fast/forms/input-file-re-render-expected.png.
+ * platform/mac/fast/forms/file/input-file-re-render-expected.txt: Copied from LayoutTests/platform/mac/fast/forms/input-file-re-render-expected.txt.
+ * platform/mac/fast/forms/hidden-input-file-expected.png: Removed.
+ * platform/mac/fast/forms/hidden-input-file-expected.txt: Removed.
+ * platform/mac/fast/forms/input-file-re-render-expected.png: Removed.
+ * platform/mac/fast/forms/input-file-re-render-expected.txt: Removed.
+ * platform/qt/Skipped:
+ * platform/qt/fast/forms/file: Added.
+ * platform/qt/fast/forms/file-input-direction-expected.txt: Removed.
+ * platform/qt/fast/forms/file-input-disabled-expected.txt: Removed.
+ * platform/qt/fast/forms/file/file-input-direction-expected.txt: Copied from LayoutTests/platform/qt/fast/forms/file-input-direction-expected.txt.
+ * platform/qt/fast/forms/file/file-input-disabled-expected.txt: Copied from LayoutTests/platform/qt/fast/forms/file-input-disabled-expected.txt.
+ * platform/qt/fast/forms/hidden-input-file-expected.txt: Removed.
+ * platform/win/Skipped:
+
2011-10-07 Kent Tamura <tkent@chromium.org>
Test update for r96893.
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-change-event-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event-expected.txt
index b6396025..b6396025 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-change-event-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event-expected.txt
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-change-event.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event.html
index 2b0e1b9..b9599bb 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-change-event.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-change-event.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../js/resources/js-test-pre.js"></script>
</head>
<body>
<input type="file" id="singleFile" name="upfile" onchange="singleFileSelected()" />
@@ -105,6 +105,6 @@ function dragFilesOntoInput(input, files) {
var successfullyParsed = true;
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../js/resources/js-test-post.js"></script>
</body>
</html>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-direction.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-direction.html
index 5b6df85..5b6df85 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-direction.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-direction.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-disabled.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-disabled.html
index 42baaee..42baaee 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-disabled.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-disabled.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-hit-test-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test-expected.txt
index 915a226..915a226 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-hit-test-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test-expected.txt
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-hit-test.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test.html
index 5b9ea13..5b9ea13 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-hit-test.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-hit-test.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-reset-expected.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset-expected.html
index 4eea2bc..4eea2bc 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-reset-expected.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset-expected.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file-input-reset.html b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset.html
index a547850..a547850 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/file-input-reset.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/file-input-reset.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/get-file-upload-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload-expected.txt
index f0ae8b0..f0ae8b0 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/get-file-upload-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload-expected.txt
diff --git a/third_party/WebKit/LayoutTests/fast/forms/get-file-upload.html b/third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload.html
index 83e59cb..83e59cb 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/get-file-upload.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/get-file-upload.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file-expected.html b/third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file-expected.html
new file mode 100644
index 0000000..c50928d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file-expected.html
@@ -0,0 +1,3 @@
+<div style="line-height: 2em;">This tests that the whole file input control is hidden when visibility is set to hidden.</div>
+
+
diff --git a/third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file.html b/third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file.html
new file mode 100644
index 0000000..810b971
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/hidden-input-file.html
@@ -0,0 +1,3 @@
+<div style="line-height: 2em;">This tests that the whole file input control is hidden when visibility is set to hidden.
+<input type="file" style="visibility: hidden"></div>
+
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-directory-upload-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload-expected.txt
index eeb91fa..eeb91fa 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-directory-upload-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload-expected.txt
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-directory-upload.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload.html
index 683ded3..683ded3 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-directory-upload.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-directory-upload.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-label-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-label-expected.txt
index cb40a59..cb40a59 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-label-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-label-expected.txt
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-label.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-label.html
index 0ed99fb..381dc84 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-label.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-label.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../js/resources/js-test-pre.js"></script>
</head>
<body>
<input id="single_file" name="upfile" type="file" />
@@ -44,6 +44,6 @@ if (window.layoutTestController) {
var successfullyParsed = true;
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../js/resources/js-test-post.js"></script>
</body>
</html>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-not-open-without-gesture-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture-expected.txt
index 892e199..892e199 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-not-open-without-gesture-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture-expected.txt
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-not-open-without-gesture.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture.html
index 27cdec2..27cdec2 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-not-open-without-gesture.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-not-open-without-gesture.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/input-file-re-render.html b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-re-render.html
index 24de2b3..24de2b3 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/input-file-re-render.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/file/input-file-re-render.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/hidden-input-file.html b/third_party/WebKit/LayoutTests/fast/forms/hidden-input-file.html
deleted file mode 100644
index b2a6c07..0000000
--- a/third_party/WebKit/LayoutTests/fast/forms/hidden-input-file.html
+++ /dev/null
@@ -1,2 +0,0 @@
-This tests that the whole file input control is hidden when visibility is set to hidden.
-<input type="file" style="visibility: hidden">
diff --git a/third_party/WebKit/LayoutTests/platform/chromium-cg-mac/fast/forms/file-input-direction-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-cg-mac/fast/forms/file/file-input-direction-expected.txt
index fb8fb61..fb8fb61 100644
--- a/third_party/WebKit/LayoutTests/platform/chromium-cg-mac/fast/forms/file-input-direction-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/chromium-cg-mac/fast/forms/file/file-input-direction-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/chromium-cg-mac/fast/forms/hidden-input-file-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-cg-mac/fast/forms/hidden-input-file-expected.txt
deleted file mode 100644
index fae764c..0000000
--- a/third_party/WebKit/LayoutTests/platform/chromium-cg-mac/fast/forms/hidden-input-file-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file-input-direction-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file/file-input-direction-expected.txt
index c7b2d08..c7b2d08 100644
--- a/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file-input-direction-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file/file-input-direction-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file-input-disabled-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file/file-input-disabled-expected.txt
index e2aa740..e2aa740 100644
--- a/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file-input-disabled-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file/file-input-disabled-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/input-file-re-render-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file/input-file-re-render-expected.txt
index f97b8c0..f97b8c0 100644
--- a/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/input-file-re-render-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/file/input-file-re-render-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/hidden-input-file-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/hidden-input-file-expected.txt
deleted file mode 100644
index 693c245..0000000
--- a/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/forms/hidden-input-file-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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,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 "No file chosen"
- RenderButton {INPUT} at (0,0) size 85x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)]
- RenderBlock (anonymous) at (8,3) size 69x16
- RenderText at (0,0) size 69x16
- text run at (0,0) width 69: "Choose File"
- RenderText {#text} at (0,0) size 0x0
diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/fast/forms/file-input-direction-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/fast/forms/file/file-input-direction-expected.txt
index fb8fb61..fb8fb61 100644
--- a/third_party/WebKit/LayoutTests/platform/chromium-mac/fast/forms/file-input-direction-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/fast/forms/file/file-input-direction-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/fast/forms/hidden-input-file-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/fast/forms/hidden-input-file-expected.txt
deleted file mode 100644
index fae764c..0000000
--- a/third_party/WebKit/LayoutTests/platform/chromium-mac/fast/forms/hidden-input-file-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file-input-direction-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file/file-input-direction-expected.txt
index 9a71a68..9a71a68 100644
--- a/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file-input-direction-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file/file-input-direction-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file-input-disabled-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file/file-input-disabled-expected.txt
index 571acdc..571acdc 100644
--- a/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file-input-disabled-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file/file-input-disabled-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/input-file-re-render-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file/input-file-re-render-expected.txt
index dd4ee2f..dd4ee2f 100644
--- a/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/input-file-re-render-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/file/input-file-re-render-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/hidden-input-file-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/hidden-input-file-expected.txt
deleted file mode 100644
index 0f19181..0000000
--- a/third_party/WebKit/LayoutTests/platform/chromium-win/fast/forms/hidden-input-file-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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,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 "No file chosen"
- RenderButton {INPUT} at (0,0) size 85x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (8,3) size 69x16
- RenderText at (0,0) size 69x16
- text run at (0,0) width 69: "Choose File"
- RenderText {#text} at (0,0) size 0x0
diff --git a/third_party/WebKit/LayoutTests/platform/chromium/test_expectations.txt b/third_party/WebKit/LayoutTests/platform/chromium/test_expectations.txt
index 08cfd3d..a0cbd23 100644
--- a/third_party/WebKit/LayoutTests/platform/chromium/test_expectations.txt
+++ b/third_party/WebKit/LayoutTests/platform/chromium/test_expectations.txt
@@ -1144,7 +1144,7 @@ BUGCR23496 MAC : fast/block/basic/011.html = IMAGE
BUGCR23496 MAC : fast/forms/001.html = IMAGE
BUGCR23496 MAC : fast/forms/basic-inputs.html = IMAGE
BUGCR23496 MAC : fast/forms/checkbox-radio-onchange.html = IMAGE
-BUGCR23496 MAC : fast/forms/file-input-disabled.html = IMAGE+TEXT
+BUGCR23496 MAC : fast/forms/file/file-input-disabled.html = IMAGE+TEXT
BUGCR23496 MAC : fast/forms/form-element-geometry.html = IMAGE+TEXT
BUGCR23496 MAC : fast/forms/formmove.html = IMAGE
// Recently became crashy. See http://crbug.com/24721
@@ -2801,7 +2801,7 @@ BUGCR77095 LINUX WIN : fast/block/lineboxcontain/glyphs.html = IMAGE+TEXT
// Has been timing out, initiated at:
// Webkit patches in range [r81976, r81981]
// Chromium patches in range [r79428, r79442]
-BUGCR77468 : fast/forms/input-file-directory-upload.html = TIMEOUT
+BUGCR77468 : fast/forms/file/input-file-directory-upload.html = TIMEOUT
// Temprary bug holding to deal with many changed tests due to
// http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Linux/builds/4837
@@ -3386,7 +3386,7 @@ BUGWK64943 MAC : fast/flexbox/010.html = PASS CRASH IMAGE
BUGWK64946 WIN DEBUG : fast/dom/DeviceOrientation/no-synchronous-events.html = PASS CRASH
-BUGWK64948 WIN DEBUG : fast/forms/input-file-label.html = PASS CRASH
+BUGWK64948 WIN DEBUG : fast/forms/file/input-file-label.html = PASS CRASH
BUGWK64951 : fast/frames/meta-refresh-user-gesture.html = PASS CRASH TIMEOUT
diff --git a/third_party/WebKit/LayoutTests/platform/gtk/Skipped b/third_party/WebKit/LayoutTests/platform/gtk/Skipped
index a7fcaee..254d7ab 100644
--- a/third_party/WebKit/LayoutTests/platform/gtk/Skipped
+++ b/third_party/WebKit/LayoutTests/platform/gtk/Skipped
@@ -1268,7 +1268,7 @@ editing/pasteboard/5761530-1.html
http/tests/loading/preload-slow-loading.php
# Directory upload is not enabled.
-fast/forms/input-file-directory-upload.html
+fast/forms/file/input-file-directory-upload.html
# Need setPrinting. See https://bugs.webkit.org/show_bug.cgi?id=20011
printing/setPrinting.html
diff --git a/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file-input-direction-expected.txt b/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file/file-input-direction-expected.txt
index d3bbedc..d3bbedc 100644
--- a/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file-input-direction-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file/file-input-direction-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file-input-disabled-expected.txt b/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file/file-input-disabled-expected.txt
index a53f105..a53f105 100644
--- a/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file-input-disabled-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file/file-input-disabled-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/input-file-re-render-expected.txt b/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file/input-file-re-render-expected.txt
index 47fd4f3..47fd4f3 100644
--- a/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/input-file-re-render-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/file/input-file-re-render-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/hidden-input-file-expected.txt b/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/hidden-input-file-expected.txt
deleted file mode 100644
index 58eb1fa..0000000
--- a/third_party/WebKit/LayoutTests/platform/gtk/fast/forms/hidden-input-file-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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,0) size 524x19
- text run at (0,0) width 524: "This tests that the whole file input control is hidden when visibility is set to hidden. "
- RenderFileUploadControl {INPUT} at (2,21) size 306x28 "(None)"
- RenderButton {INPUT} at (0,0) size 103x28 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (8,4) size 87x19
- RenderText at (0,0) size 87x19
- text run at (0,0) width 87: "Choose File"
- RenderText {#text} at (0,0) size 0x0
diff --git a/third_party/WebKit/LayoutTests/platform/mac-leopard/fast/forms/file-input-disabled-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-leopard/fast/forms/file/file-input-disabled-expected.txt
index 3f4b449..3f4b449 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-leopard/fast/forms/file-input-disabled-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac-leopard/fast/forms/file/file-input-disabled-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/mac/Skipped b/third_party/WebKit/LayoutTests/platform/mac/Skipped
index 4c14378..313c9de 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/Skipped
+++ b/third_party/WebKit/LayoutTests/platform/mac/Skipped
@@ -224,7 +224,7 @@ fast/dom/MediaStream
fast/images/large-size-image-crash.html
# Directory upload is not enabled.
-fast/forms/input-file-directory-upload.html
+fast/forms/file/input-file-directory-upload.html
# Web Timing is not enabled.
# https://bugs.webkit.org/show_bug.cgi?id=42434
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/file-input-direction-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/file/file-input-direction-expected.txt
index 9a8f7c1..9a8f7c1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/file-input-direction-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/file/file-input-direction-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/file-input-disabled-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/file/file-input-disabled-expected.txt
index c4e2a9e..c4e2a9e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/file-input-disabled-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/file/file-input-disabled-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-file-re-render-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/file/input-file-re-render-expected.txt
index a3c541a..a3c541a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-file-re-render-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/file/input-file-re-render-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/hidden-input-file-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/hidden-input-file-expected.txt
deleted file mode 100644
index 0277d3c..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/hidden-input-file-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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 selected"
- 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/third_party/WebKit/LayoutTests/platform/qt/Skipped b/third_party/WebKit/LayoutTests/platform/qt/Skipped
index 32fcee0..d132505 100644
--- a/third_party/WebKit/LayoutTests/platform/qt/Skipped
+++ b/third_party/WebKit/LayoutTests/platform/qt/Skipped
@@ -91,7 +91,7 @@ fast/speech
fast/dom/MediaStream
# ENABLE(DIRECTORY_UPLOAD) is disabled.
-fast/forms/input-file-directory-upload.html
+fast/forms/file/input-file-directory-upload.html
# ENABLE(INDEXED_DATABASE) is disabled.
storage/indexeddb
@@ -242,7 +242,7 @@ http/tests/misc/drag-not-loaded-image.html
# [Qt] DumpRenderTree needs a beginDragWithFiles implementation
# https://bugs.webkit.org/show_bug.cgi?id=50902
-fast/forms/file-input-change-event.html
+fast/forms/file/file-input-change-event.html
http/tests/local/blob/send-hybrid-blob.html
http/tests/local/blob/send-sliced-data-blob.html
http/tests/local/formdata
@@ -324,8 +324,8 @@ editing/pasteboard/file-input-files-access.html
fast/dom/Window/window-postmessage-clone.html
fast/events/drag-to-navigate.html
fast/events/prevent-drag-to-navigate.html
-fast/forms/get-file-upload.html
-fast/forms/input-file-re-render.html
+fast/forms/file/get-file-upload.html
+fast/forms/file/input-file-re-render.html
fast/events/drag-file-crash.html
http/tests/security/clipboard/clipboard-file-access.html
@@ -1254,10 +1254,10 @@ fast/forms/basic-textareas.html
fast/forms/box-shadow-override.html
fast/forms/button-white-space.html
fast/forms/disabled-select-change-index.html
-fast/forms/file-input-direction.html
-fast/forms/file-input-disabled.html
+fast/forms/file/file-input-direction.html
+fast/forms/file/file-input-disabled.html
+fast/forms/file/hidden-input-file.html
fast/forms/form-element-geometry.html
-fast/forms/hidden-input-file.html
fast/forms/input-appearance-height.html
fast/forms/input-appearance-width.html
fast/forms/input-disabled-color.html
diff --git a/third_party/WebKit/LayoutTests/platform/qt/fast/forms/file-input-direction-expected.txt b/third_party/WebKit/LayoutTests/platform/qt/fast/forms/file/file-input-direction-expected.txt
index 605bf7c..605bf7c 100644
--- a/third_party/WebKit/LayoutTests/platform/qt/fast/forms/file-input-direction-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/qt/fast/forms/file/file-input-direction-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/qt/fast/forms/file-input-disabled-expected.txt b/third_party/WebKit/LayoutTests/platform/qt/fast/forms/file/file-input-disabled-expected.txt
index 7f10be6..7f10be6 100644
--- a/third_party/WebKit/LayoutTests/platform/qt/fast/forms/file-input-disabled-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/qt/fast/forms/file/file-input-disabled-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/qt/fast/forms/hidden-input-file-expected.txt b/third_party/WebKit/LayoutTests/platform/qt/fast/forms/hidden-input-file-expected.txt
deleted file mode 100644
index d566131..0000000
--- a/third_party/WebKit/LayoutTests/platform/qt/fast/forms/hidden-input-file-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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,0) size 517x19
- text run at (0,0) width 517: "This tests that the whole file input control is hidden when visibility is set to hidden. "
- RenderFileUploadControl {INPUT} at (2,21) size 272x28
- RenderButton {INPUT} at (0,0) size 78x28 [bgcolor=#C0C0C0]
- RenderBlock (anonymous) at (6,6) size 66x17
- RenderText at (0,0) size 66x17
- text run at (0,0) width 66: "Choose File"
- RenderText {#text} at (0,0) size 0x0
diff --git a/third_party/WebKit/LayoutTests/platform/win/Skipped b/third_party/WebKit/LayoutTests/platform/win/Skipped
index f6dd063..e575464 100644
--- a/third_party/WebKit/LayoutTests/platform/win/Skipped
+++ b/third_party/WebKit/LayoutTests/platform/win/Skipped
@@ -216,9 +216,9 @@ editing/pasteboard/file-drag-to-editable.html
editing/pasteboard/file-input-files-access.html
fast/events/drag-to-navigate.html
fast/events/prevent-drag-to-navigate.html
-fast/forms/file-input-change-event.html
-fast/forms/get-file-upload.html
-fast/forms/input-file-re-render.html
+fast/forms/file/file-input-change-event.html
+fast/forms/file/get-file-upload.html
+fast/forms/file/input-file-re-render.html
http/tests/security/clipboard/clipboard-file-access.html
fast/events/drag-file-crash.html
fast/dom/Window/window-postmessage-clone.html
@@ -1136,7 +1136,7 @@ userscripts/user-style-all-frames.html
userscripts/user-style-top-frame-only.html
# Directory upload is not enabled.
-fast/forms/input-file-directory-upload.html
+fast/forms/file/input-file-directory-upload.html
# Need setPrinting. See https://bugs.webkit.org/show_bug.cgi?id=20011
printing/setPrinting.html