Changeset 106301 in webkit

Timestamp:

Jan 30, 2012 4:35:42 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

single-file input elements should refuse multi-file drags
​https://bugs.webkit.org/show_bug.cgi?id=25913

Patch by Rakesh KN <​rakesh.kn@motorola.com> on 2012-01-30
Reviewed by Eric Seidel.

Refuse the multiple file drags onto a single file input element.

Source/WebCore:

No new tests: Covered by existing tests, updated the expected results.

• page/DragController.cpp:

(WebCore::DragController::tryDocumentDrag):
Setting the dragSession.numberOfItemsToBeAccepted to 0 so that drag operation is none if the
file input element under mouse is single input type and number of files dragged onto that
input element are more than 1.

LayoutTests:

• editing/pasteboard/file-input-files-access-expected.txt:

Expected result changed.

• editing/pasteboard/script-tests/file-input-files-access.js:

(runTest):
Removed the 'FIXME' debug and comment as it is not valid after this change.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/file-input-files-access-expected.txt (modified) (1 diff)
• LayoutTests/editing/pasteboard/script-tests/file-input-files-access.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/DragController.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-30  Rakesh KN  <rakesh.kn@motorola.com>
+
+        single-file input elements should refuse multi-file drags
+        https://bugs.webkit.org/show_bug.cgi?id=25913
+
+        Reviewed by Eric Seidel.
+
+        Refuse the multiple file drags onto a single file input element.
+
+        * editing/pasteboard/file-input-files-access-expected.txt:
+        Expected result changed.
+        * editing/pasteboard/script-tests/file-input-files-access.js:
+        (runTest):
+        Removed the 'FIXME' debug and comment as it is not valid after this change.
+
 2012-01-30  Dana Jansens  <danakj@chromium.org>
 

trunk/LayoutTests/editing/pasteboard/file-input-files-access-expected.txt

@@ -23 +23 @@
 FAIL fileInput.value should be . Was C:\fakepath\directory-for-dragging.
 FAIL fileInput.files.length should be 0. Was 1.
-FIXME: Single-file input elements should refuse multi-file drags.  See https://bugs.webkit.org/show_bug.cgi?id=25913
 Dragging two files to a single-file input control:
-FAIL fileInput.value should be . Was C:\fakepath\apple.gif.
-FAIL fileInput.files.length should be 0. Was 1.
+PASS fileInput.value is ""
+PASS fileInput.files.length is 0
 Dragging a file and a directory onto a single-file input control:
-FAIL fileInput.value should be . Was C:\fakepath\apple.gif.
-FAIL fileInput.files.length should be 0. Was 1.
+PASS fileInput.value is ""
+PASS fileInput.files.length is 0
 FIXME:  elements should refuse drags including directories: https://bugs.webkit.org/show_bug.cgi?id=25879.  The page is given File objects corresponding to directories, but form submission will fail.
 Dragging a directory and a file onto a single-file input control:
-FAIL fileInput.value should be . Was C:\fakepath\directory-for-dragging.
-FAIL fileInput.files.length should be 0. Was 1.
+PASS fileInput.value is ""
+PASS fileInput.files.length is 0
 Dragging three files to a multi-file input control:
 PASS fileInput.value is "C:\\fakepath\\apple.gif"

trunk/LayoutTests/editing/pasteboard/script-tests/file-input-files-access.js

@@ -90 +90 @@
     draggingPathsShouldResultInFiles(['resources/directory-for-dragging'], []);
 
-    // FIXME: Current behavior is to take the first file, but I expect that's
-    // confusing to the user.  We should change this to expect drag failure.
-    debug("FIXME: Single-file input elements should refuse multi-file drags.  See https://bugs.webkit.org/show_bug.cgi?id=25913")
     debug("Dragging two files to a single-file input control:")
     draggingPathsShouldResultInFiles(['resources/apple.gif', 'resources/mozilla.gif'], []);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-30  Rakesh KN  <rakesh.kn@motorola.com>
+
+        single-file input elements should refuse multi-file drags
+        https://bugs.webkit.org/show_bug.cgi?id=25913
+
+        Reviewed by Eric Seidel.
+
+        Refuse the multiple file drags onto a single file input element.
+
+        No new tests: Covered by existing tests, updated the expected results.
+
+        * page/DragController.cpp:
+        (WebCore::DragController::tryDocumentDrag):
+        Setting the dragSession.numberOfItemsToBeAccepted to 0 so that drag operation is none if the
+        file input element under mouse is single input type and number of files dragged onto that
+        input element are more than 1.
+
 2012-01-30  Dana Jansens  <danakj@chromium.org>
 

trunk/Source/WebCore/page/DragController.cpp

@@ -360 +360 @@
             else if (m_fileInputElementUnderMouse->multiple())
                 dragSession.numberOfItemsToBeAccepted = numberOfFiles;
+            else if (numberOfFiles > 1)
+                dragSession.numberOfItemsToBeAccepted = 0;
             else
                 dragSession.numberOfItemsToBeAccepted = 1;