Changeset 226899 in webkit

Timestamp:

Jan 12, 2018 10:49:11 AM (6 years ago)

Author:

Wenson Hsieh

Message:

[WK2] Unify macOS and iOS codepaths in the UI process when starting a drag
​https://bugs.webkit.org/show_bug.cgi?id=181574

Reviewed by Tim Horton.

Rearrange some macOS drag start logic in the UI process so that it uses the same codepaths in WebPageProxy as
iOS. Namely, startDrag should just forward the DragItem and drag image handle along to the appropriate views on
each platform (WKContentView and WebViewImpl).

There should be no change in behavior.

• UIProcess/Cocoa/WebPageProxyCocoa.mm:

Both macOS and iOS now funnel through this method.

• UIProcess/Cocoa/WebViewImpl.h:
• UIProcess/Cocoa/WebViewImpl.mm:

(WebKit::WebViewImpl::startDrag):
(WebKit::WebViewImpl::dragImageForView): Deleted.

Rename dragImageForView to startDrag. Move the call to didStartDrag() here, and call dragCancelled() in the
case where we bailed from starting the drag (due to failing to create a drag image).

• UIProcess/PageClient.h:
• UIProcess/ios/PageClientImplIOS.h:
• UIProcess/ios/PageClientImplIOS.mm:

(WebKit::PageClientImpl::setDragImage): Deleted.

Rename setDragImage to startDrag.

• UIProcess/mac/PageClientImplMac.h:
• UIProcess/mac/PageClientImplMac.mm:

(WebKit::PageClientImpl::startDrag):
(WebKit::PageClientImpl::setDragImage): Deleted.

• UIProcess/mac/WebPageProxyMac.mm:

(WebKit::WebPageProxy::startDrag): Deleted.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WebPageProxyCocoa.mm (modified) (3 diffs)
• UIProcess/Cocoa/WebViewImpl.h (modified) (3 diffs)
• UIProcess/Cocoa/WebViewImpl.mm (modified) (3 diffs)
• UIProcess/PageClient.h (modified) (2 diffs)
• UIProcess/ios/PageClientImplIOS.h (modified) (1 diff)
• UIProcess/ios/PageClientImplIOS.mm (modified) (1 diff)
• UIProcess/mac/PageClientImplMac.h (modified) (2 diffs)
• UIProcess/mac/PageClientImplMac.mm (modified) (2 diffs)
• UIProcess/mac/WebPageProxyMac.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-01-12  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [WK2] Unify macOS and iOS codepaths in the UI process when starting a drag
+        https://bugs.webkit.org/show_bug.cgi?id=181574
+
+        Reviewed by Tim Horton.
+
+        Rearrange some macOS drag start logic in the UI process so that it uses the same codepaths in WebPageProxy as
+        iOS. Namely, startDrag should just forward the DragItem and drag image handle along to the appropriate views on
+        each platform (WKContentView and WebViewImpl).
+
+        There should be no change in behavior.
+
+        * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+
+        Both macOS and iOS now funnel through this method.
+
+        * UIProcess/Cocoa/WebViewImpl.h:
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (WebKit::WebViewImpl::startDrag):
+        (WebKit::WebViewImpl::dragImageForView): Deleted.
+
+        Rename dragImageForView to startDrag. Move the call to didStartDrag() here, and call dragCancelled() in the
+        case where we bailed from starting the drag (due to failing to create a drag image).
+
+        * UIProcess/PageClient.h:
+        * UIProcess/ios/PageClientImplIOS.h:
+        * UIProcess/ios/PageClientImplIOS.mm:
+        (WebKit::PageClientImpl::setDragImage): Deleted.
+
+        Rename setDragImage to startDrag.
+
+        * UIProcess/mac/PageClientImplMac.h:
+        * UIProcess/mac/PageClientImplMac.mm:
+        (WebKit::PageClientImpl::startDrag):
+        (WebKit::PageClientImpl::setDragImage): Deleted.
+        * UIProcess/mac/WebPageProxyMac.mm:
+        (WebKit::WebPageProxy::startDrag): Deleted.
+
 2018-01-12  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm

@@ -104 +104 @@
 }
 
-#if PLATFORM(IOS) && ENABLE(DRAG_SUPPORT)
+#if ENABLE(DRAG_SUPPORT)
 
 void WebPageProxy::startDrag(const DragItem& dragItem, const ShareableBitmap::Handle& dragImageHandle)
@@ -110 +110 @@
     m_pageClient.startDrag(dragItem, dragImageHandle);
 }
+
+#if PLATFORM(IOS)
 
 void WebPageProxy::setPromisedDataForImage(const String&, const SharedMemory::Handle&, uint64_t, const String&, const String&, const String&, const String&, const String&, const SharedMemory::Handle&, uint64_t)
@@ -126 +128 @@
 }
 
-#endif // PLATFORM(IOS) && ENABLE(DRAG_SUPPORT)
+#endif // PLATFORM(IOS)
+
+#endif // ENABLE(DRAG_SUPPORT)
 
 }

trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h

@@ -34 +34 @@
 #include "WebPageProxy.h"
 #include "_WKOverlayScrollbarStyle.h"
-#include <WebCore/PromisedBlobInfo.h>
 #include <WebCore/TextIndicatorWindow.h>
 #include <WebCore/UserInterfaceLayoutDirection.h>
@@ -109 +108 @@
 
 namespace WebCore {
+struct DragItem;
 struct KeyPressCommand;
 }
@@ -414 +414 @@
     void startWindowDrag();
 
-    void dragImageForView(NSView *, NSImage *, CGPoint clientPoint, bool linkDrag);
+    void startDrag(const WebCore::DragItem&, const ShareableBitmap::Handle& image);
     void setFileAndURLTypes(NSString *filename, NSString *extension, NSString *title, NSString *url, NSString *visibleURL, NSPasteboard *);
     void setPromisedDataForImage(WebCore::Image*, NSString *filename, NSString *extension, NSString *title, NSString *url, NSString *visibleURL, WebCore::SharedBuffer* archiveBuffer, NSString *pasteboardName);

trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm

@@ -74 +74 @@
 #import <WebCore/DictionaryLookup.h>
 #import <WebCore/DragData.h>
+#import <WebCore/DragItem.h>
 #import <WebCore/Editor.h>
 #import <WebCore/KeypressCommand.h>
@@ -3777 +3778 @@
 }
 
-void WebViewImpl::dragImageForView(NSView *view, NSImage *image, CGPoint clientPoint, bool)
-{
+void WebViewImpl::startDrag(const WebCore::DragItem& item, const ShareableBitmap::Handle& dragImageHandle)
+{
+    auto dragImageAsBitmap = ShareableBitmap::create(dragImageHandle);
+    if (!dragImageAsBitmap) {
+        m_page->dragCancelled();
+        return;
+    }
+
+    auto dragCGImage = dragImageAsBitmap->makeCGImage();
+    auto dragNSImage = adoptNS([[NSImage alloc] initWithCGImage:dragCGImage.get() size:dragImageAsBitmap->size()]);
+
+    WebCore::IntSize size([dragNSImage size]);
+    size.scale(1.0 / m_page->deviceScaleFactor());
+    [dragNSImage setSize:size];
+
     // The call below could release the view.
     auto protector = m_view.get();
@@ -3788 +3802 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [view dragImage:image
-                 at:NSPointFromCGPoint(clientPoint)
-             offset:NSZeroSize
-              event:m_lastMouseDownEvent.get()
-         pasteboard:pasteboard
-             source:m_view.getAutoreleased()
-          slideBack:YES];
+    [m_view dragImage:dragNSImage.get() at:NSPointFromCGPoint(item.dragLocationInWindowCoordinates) offset:NSZeroSize event:m_lastMouseDownEvent.get() pasteboard:pasteboard source:m_view.getAutoreleased() slideBack:YES];
 #pragma clang diagnostic pop
+    m_page->didStartDrag();
 }
 

trunk/Source/WebKit/UIProcess/PageClient.h

@@ -173 +173 @@
     virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&) = 0;
     virtual bool executeSavedCommandBySelector(const String& selector) = 0;
-    virtual void setDragImage(const WebCore::IntPoint& clientPosition, Ref<ShareableBitmap>&& dragImage, WebCore::DragSourceAction) = 0;
+    virtual void startDrag(const WebCore::DragItem&, const ShareableBitmap::Handle& image) = 0;
     virtual void updateSecureInputState() = 0;
     virtual void resetSecureInputState() = 0;
@@ -376 +376 @@
     virtual void didHandleStartDataInteractionRequest(bool started) = 0;
     virtual void didHandleAdditionalDragItemsRequest(bool added) = 0;
-    virtual void startDrag(const WebCore::DragItem&, const ShareableBitmap::Handle& image) = 0;
     virtual void didConcludeEditDataInteraction(std::optional<WebCore::TextIndicatorData>) = 0;
     virtual void didChangeDataInteractionCaretRect(const WebCore::IntRect& previousCaretRect, const WebCore::IntRect& caretRect) = 0;

trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h

@@ -83 +83 @@
     void accessibilityWebProcessTokenReceived(const IPC::DataReference&) override;
     bool executeSavedCommandBySelector(const String& selector) override;
-    void setDragImage(const WebCore::IntPoint& clientPosition, Ref<ShareableBitmap>&& dragImage, WebCore::DragSourceAction) override;
     void updateSecureInputState() override;
     void resetSecureInputState() override;

trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm

@@ -364 +364 @@
 }
 
-void PageClientImpl::setDragImage(const IntPoint&, Ref<ShareableBitmap>&&, DragSourceAction)
-{
-    notImplemented();
-}
-
 void PageClientImpl::selectionDidChange()
 {

trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.h

@@ -38 +38 @@
 namespace WebCore {
 class AlternativeTextUIController;
+struct DragItem;
 struct PromisedBlobInfo;
 }
@@ -96 +97 @@
     void executeUndoRedo(WebPageProxy::UndoOrRedo) override;
     bool executeSavedCommandBySelector(const String& selector) override;
-    void setDragImage(const WebCore::IntPoint& clientPosition, Ref<ShareableBitmap>&& dragImage, WebCore::DragSourceAction) override;
+    void startDrag(const WebCore::DragItem&, const ShareableBitmap::Handle& image) override;
     void setPromisedDataForImage(const String& pasteboardName, Ref<WebCore::SharedBuffer>&& imageBuffer, const String& filename, const String& extension, const String& title,
         const String& url, const String& visibleUrl, RefPtr<WebCore::SharedBuffer>&& archiveBuffer) override;

trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm

@@ -60 +60 @@
 #import <WebCore/Cursor.h>
 #import <WebCore/DictionaryLookup.h>
+#import <WebCore/DragItem.h>
 #import <WebCore/FloatRect.h>
 #import <WebCore/GraphicsContext.h>
@@ -348 +349 @@
 }
 
-void PageClientImpl::setDragImage(const IntPoint& clientPosition, Ref<ShareableBitmap>&& dragImage, DragSourceAction action)
-{
-    RetainPtr<CGImageRef> dragCGImage = dragImage->makeCGImage();
-    RetainPtr<NSImage> dragNSImage = adoptNS([[NSImage alloc] initWithCGImage:dragCGImage.get() size:dragImage->size()]);
-    IntSize size([dragNSImage size]);
-    size.scale(1.0 / m_impl->page().deviceScaleFactor());
-    [dragNSImage setSize:size];
-
-    m_impl->dragImageForView(m_view, dragNSImage.get(), clientPosition, action == DragSourceActionLink);
+void PageClientImpl::startDrag(const WebCore::DragItem& item, const ShareableBitmap::Handle& image)
+{
+    m_impl->startDrag(item, image);
 }
 

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

@@ -267 +267 @@
 
 #if ENABLE(DRAG_SUPPORT)
-void WebPageProxy::startDrag(const DragItem& dragItem, const ShareableBitmap::Handle& dragImageHandle)
-{
-    if (auto dragImage = ShareableBitmap::create(dragImageHandle))
-        m_pageClient.setDragImage(dragItem.dragLocationInWindowCoordinates, dragImage.releaseNonNull(), static_cast<DragSourceAction>(dragItem.sourceAction));
-
-    didStartDrag();
-}
 
 void WebPageProxy::setPromisedDataForImage(const String& pasteboardName, const SharedMemory::Handle& imageHandle, uint64_t imageSize, const String& filename, const String& extension,