Changeset 243785 in webkit

Timestamp:

Apr 2, 2019, 8:46:37 PM (7 years ago)

Author:

timothy@apple.com

Message:

Cursor count badge reverts to Zero during Drag & Drop of multiple items.
​https://bugs.webkit.org/show_bug.cgi?id=196511

Reviewed by Daniel Bates.

• page/DragController.cpp:

(WebCore::DragController::tryDocumentDrag): Don't set m_numberOfItemsToBeAccepted to
zero when dragging to a non-file input element.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DragController.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-02  Timothy Hatcher  <timothy@apple.com>
+
+        Cursor count badge reverts to Zero during Drag & Drop of multiple items.
+        https://bugs.webkit.org/show_bug.cgi?id=196511
+
+        Reviewed by Daniel Bates.
+
+        * page/DragController.cpp:
+        (WebCore::DragController::tryDocumentDrag): Don't set m_numberOfItemsToBeAccepted to
+        zero when dragging to a non-file input element.
+
 2019-04-02  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/DragController.cpp

@@ -443 +443 @@
         Frame* innerFrame = element->document().frame();
         dragOperation = dragIsMove(innerFrame->selection(), dragData) ? DragOperationMove : DragOperationCopy;
-        m_numberOfItemsToBeAccepted = 0;
 
         unsigned numberOfFiles = dragData.numberOfFiles();
@@ -460 +459 @@
             m_fileInputElementUnderMouse->setCanReceiveDroppedFiles(m_numberOfItemsToBeAccepted);
         } else {
-            // We are not over a file input element. The dragged item(s) will only
-            // be loaded into the view the number of dragged items is 1.
-            m_numberOfItemsToBeAccepted = numberOfFiles != 1 ? 0 : 1;
+            // We are not over a file input element. The dragged item(s) will loaded into the view,
+            // dropped as text paths on other input elements, or handled by script on the page.
+            m_numberOfItemsToBeAccepted = numberOfFiles;
         }