Changeset 176687 in webkit

Timestamp:

Dec 2, 2014, 1:00:07 PM (10 years ago)

Author:

mitz@apple.com

Message:

REGRESSION: Dragging selected text changes the selection
​https://bugs.webkit.org/show_bug.cgi?id=139110

Reviewed by Simon Fraser.

After it sent the UI process the message to start dragging, the Web process handled mouse
move events that had already been in flight, interpreting them as a drag to start a new
selection. This is fixed by ignoring any mouse events received after asking the UI process
to start dragging.

• UIProcess/mac/WebPageProxyMac.mm:

(WebKit::WebPageProxy::setDragImage): Send the new DidStartDrag message back to the Web
process, so that it stops ignoring mouse events.

• WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:

(WebKit::WebDragClient::startDrag): Call the new WebPage::willStartDrag, so that it starts
ignoring mouse events.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::WebPage): Initialize new member variable.
(WebKit::WebPage::mouseEvent): Don’t handle the event if we have asked the UI process to
start dragging.

• WebProcess/WebPage/WebPage.h:

(WebKit::WebPage::willStartDrag): Added. Sets new member variable m_isStartingDrag to true.
(WebKit::WebPage::didStartDrag): Added. Handles the message from the UI process by setting
m_isStartingDrag back to false.

• WebProcess/WebPage/WebPage.messages.in: Added DidStartDrag.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WebPageProxyMac.mm (modified) (1 diff)
• WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebPage.h (modified) (2 diffs)
• WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-12-02  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION: Dragging selected text changes the selection
+        https://bugs.webkit.org/show_bug.cgi?id=139110
+
+        Reviewed by Simon Fraser.
+
+        After it sent the UI process the message to start dragging, the Web process handled mouse
+        move events that had already been in flight, interpreting them as a drag to start a new
+        selection. This is fixed by ignoring any mouse events received after asking the UI process
+        to start dragging.
+
+        * UIProcess/mac/WebPageProxyMac.mm:
+        (WebKit::WebPageProxy::setDragImage): Send the new DidStartDrag message back to the Web
+        process, so that it stops ignoring mouse events.
+
+        * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+        (WebKit::WebDragClient::startDrag): Call the new WebPage::willStartDrag, so that it starts
+        ignoring mouse events.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage): Initialize new member variable.
+        (WebKit::WebPage::mouseEvent): Don’t handle the event if we have asked the UI process to
+        start dragging.
+
+        * WebProcess/WebPage/WebPage.h:
+        (WebKit::WebPage::willStartDrag): Added. Sets new member variable m_isStartingDrag to true.
+        (WebKit::WebPage::didStartDrag): Added. Handles the message from the UI process by setting
+        m_isStartingDrag back to false.
+
+        * WebProcess/WebPage/WebPage.messages.in: Added DidStartDrag.
+
 2014-12-02  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm

@@ -379 +379 @@
 void WebPageProxy::setDragImage(const WebCore::IntPoint& clientPosition, const ShareableBitmap::Handle& dragImageHandle, bool isLinkDrag)
 {
-    RefPtr<ShareableBitmap> dragImage = ShareableBitmap::create(dragImageHandle);
-    if (!dragImage)
-        return;
-    
-    m_pageClient.setDragImage(clientPosition, dragImage.release(), isLinkDrag);
+    if (RefPtr<ShareableBitmap> dragImage = ShareableBitmap::create(dragImageHandle))
+        m_pageClient.setDragImage(clientPosition, dragImage.release(), isLinkDrag);
+
+    process().send(Messages::WebPage::DidStartDrag(), m_pageID);
 }
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm

@@ -81 +81 @@
         return;
 
+    m_page->willStartDrag();
+
     // FIXME: Seems this message should be named StartDrag, not SetDragImage.
     m_page->send(Messages::WebPageProxy::SetDragImage(frame.view()->contentsToWindow(point), handle, linkDrag));

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -291 +291 @@
     , m_canRunModal(parameters.canRunModal)
     , m_isRunningModal(false)
+#if ENABLE(DRAG_SUPPORT)
+    , m_isStartingDrag(false)
+#endif
     , m_cachedMainFrameIsPinnedToLeftSide(true)
     , m_cachedMainFrameIsPinnedToRightSide(true)
@@ -1910 +1913 @@
     m_page->pageThrottler().didReceiveUserInput();
 
+    bool shouldHandleEvent = true;
+
 #if ENABLE(CONTEXT_MENUS)
     // Don't try to handle any pending mouse events if a context menu is showing.
-    if (m_isShowingContextMenu) {
+    if (m_isShowingContextMenu)
+        shouldHandleEvent = false;
+#endif
+#if ENABLE(DRAG_SUPPORT)
+    if (m_isStartingDrag)
+        shouldHandleEvent = false;
+#endif
+
+    if (!shouldHandleEvent) {
         send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(mouseEvent.type()), false));
         return;
     }
-#endif
+
     bool handled = false;
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -696 +696 @@
     void willPerformLoadDragDestinationAction();
     void mayPerformUploadDragDestinationAction();
+
+    void willStartDrag() { ASSERT(!m_isStartingDrag); m_isStartingDrag = true; }
+    void didStartDrag() { ASSERT(m_isStartingDrag); m_isStartingDrag = false; }
 #endif // ENABLE(DRAG_SUPPORT)
 
@@ -1233 +1236 @@
     bool m_canRunModal;
     bool m_isRunningModal;
+
+#if ENABLE(DRAG_SUPPORT)
+    bool m_isStartingDrag;
+#endif
 
     bool m_cachedMainFrameIsPinnedToLeftSide;

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

@@ -230 +230 @@
 #endif
 #if ENABLE(DRAG_SUPPORT)
+    DidStartDrag()
     DragEnded(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t operation)
 #endif