Index: Source/core/page/DragController.cpp |
diff --git a/Source/core/page/DragController.cpp b/Source/core/page/DragController.cpp |
index 9922972e925b2faf9ce06daf72a423bef758ea09..bc4eb153004acc128c1832636c02f526c1a3f00f 100644 |
--- a/Source/core/page/DragController.cpp |
+++ b/Source/core/page/DragController.cpp |
@@ -54,6 +54,7 @@ |
#include "core/html/HTMLFormElement.h" |
#include "core/html/HTMLInputElement.h" |
#include "core/html/HTMLPlugInElement.h" |
+#include "core/html/forms/FileInputType.h" |
tkent
2014/11/17 05:21:37
Please do not include FileInputType.h here. *Inpu
hirono
2014/11/17 05:59:25
Done.
|
#include "core/loader/FrameLoadRequest.h" |
#include "core/loader/FrameLoader.h" |
#include "core/page/DragClient.h" |
@@ -385,16 +386,18 @@ bool DragController::tryDocumentDrag(DragData* dragData, DragDestinationAction a |
dragSession.mouseIsOverFileInput = m_fileInputElementUnderMouse; |
dragSession.numberOfItemsToBeAccepted = 0; |
- unsigned numberOfFiles = dragData->numberOfFiles(); |
+ Vector<String> paths; |
+ FileInputType::getAcceptableDropFileNames(*dragData, &paths); |
+ const unsigned numberOfFiles = paths.size(); |
if (m_fileInputElementUnderMouse) { |
if (m_fileInputElementUnderMouse->isDisabledFormControl()) |
dragSession.numberOfItemsToBeAccepted = 0; |
else if (m_fileInputElementUnderMouse->multiple()) |
dragSession.numberOfItemsToBeAccepted = numberOfFiles; |
- else if (numberOfFiles > 1) |
- dragSession.numberOfItemsToBeAccepted = 0; |
- else |
+ else if (numberOfFiles == 1) |
dragSession.numberOfItemsToBeAccepted = 1; |
+ else |
+ dragSession.numberOfItemsToBeAccepted = 0; |
if (!dragSession.numberOfItemsToBeAccepted) |
dragSession.operation = DragOperationNone; |