Changeset 248166 in webkit

Timestamp:

Aug 2, 2019 11:49:58 AM (5 years ago)

Author:

Wenson Hsieh

Message:

[macOS 10.15] Image dragged from Safari does not appear in Notes
​https://bugs.webkit.org/show_bug.cgi?id=188490
<rdar://problem/39462717>

Reviewed by Andy Estes.

Source/WebKit:

Removes some logic that clears out the cached promised drag image in the UI process when WebKit is asked to
provide TIFF image data. This prevents the drop destination from asking for promised image data, if anything
else (e.g. the system) also asks the web view to provide the same data. Additionally, this logic didn't
previously guarantee that the promised image would be cleared anyways, since it is dependent on the drop target
actually requesting the promised image in order to perform the cleanup.

In lieu of clearing the promised drag image when it's requested, we instead clear it out upon mainframe
navigation, in PageClientImpl::didCommitLoadForMainFrame.

Test: DragAndDropTests.MultiplePromisedImageDataRequests

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

(WebKit::WebViewImpl::clearPromisedDragImage):
(WebKit::WebViewImpl::pasteboardChangedOwner):
(WebKit::WebViewImpl::provideDataForPasteboard):

Fix the bug by not immediately clearing out the promised drag image.

• UIProcess/mac/PageClientImplMac.mm:

(WebKit::PageClientImpl::didCommitLoadForMainFrame):

Tools:

Add a test to verify that promised image data can be delivered to multiple pasteboards when performing a drop.

• TestWebKitAPI/Tests/mac/DragAndDropTestsMac.mm:

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/Cocoa/WebViewImpl.h (modified) (1 diff)
• Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (modified) (2 diffs)
• Source/WebKit/UIProcess/mac/PageClientImplMac.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/mac/DragAndDropTestsMac.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-02  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [macOS 10.15] Image dragged from Safari does not appear in Notes
+        https://bugs.webkit.org/show_bug.cgi?id=188490
+        <rdar://problem/39462717>
+
+        Reviewed by Andy Estes.
+
+        Removes some logic that clears out the cached promised drag image in the UI process when WebKit is asked to
+        provide TIFF image data. This prevents the drop destination from asking for promised image data, if anything
+        else (e.g. the system) also asks the web view to provide the same data. Additionally, this logic didn't
+        previously guarantee that the promised image would be cleared anyways, since it is dependent on the drop target
+        actually requesting the promised image in order to perform the cleanup.
+
+        In lieu of clearing the promised drag image when it's requested, we instead clear it out upon mainframe
+        navigation, in PageClientImpl::didCommitLoadForMainFrame.
+
+        Test: DragAndDropTests.MultiplePromisedImageDataRequests
+
+        * UIProcess/Cocoa/WebViewImpl.h:
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (WebKit::WebViewImpl::clearPromisedDragImage):
+        (WebKit::WebViewImpl::pasteboardChangedOwner):
+        (WebKit::WebViewImpl::provideDataForPasteboard):
+
+        Fix the bug by not immediately clearing out the promised drag image.
+
+        * UIProcess/mac/PageClientImplMac.mm:
+        (WebKit::PageClientImpl::didCommitLoadForMainFrame):
+
 2019-08-02  Keith Rollin  <krollin@apple.com>
 

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

@@ -603 +603 @@
 
     void takeFocus(WebCore::FocusDirection);
+    void clearPromisedDragImage();
 
 private:

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

@@ -4206 +4206 @@
 }
 
+void WebViewImpl::clearPromisedDragImage()
+{
+    m_promisedImage = nullptr;
+}
+
 void WebViewImpl::pasteboardChangedOwner(NSPasteboard *pasteboard)
 {
-    m_promisedImage = nullptr;
+    clearPromisedDragImage();
     m_promisedFilename = emptyString();
     m_promisedURL = emptyString();
@@ -4215 +4220 @@
 void WebViewImpl::provideDataForPasteboard(NSPasteboard *pasteboard, NSString *type)
 {
-    // FIXME: need to support NSRTFDPboardType
-
-    if ([type isEqual:WebCore::legacyTIFFPasteboardType()] && m_promisedImage) {
+    // FIXME: Need to support NSRTFDPboardType.
+    if ([type isEqual:WebCore::legacyTIFFPasteboardType()] && m_promisedImage)
         [pasteboard setData:(__bridge NSData *)m_promisedImage->tiffRepresentation() forType:WebCore::legacyTIFFPasteboardType()];
-        m_promisedImage = nullptr;
-    }
 }
 

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

@@ -290 +290 @@
     m_impl->updateSupportsArbitraryLayoutModes();
     m_impl->dismissContentRelativeChildWindowsWithAnimation(true);
+    m_impl->clearPromisedDragImage();
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-08-02  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [macOS 10.15] Image dragged from Safari does not appear in Notes
+        https://bugs.webkit.org/show_bug.cgi?id=188490
+        <rdar://problem/39462717>
+
+        Reviewed by Andy Estes.
+
+        Add a test to verify that promised image data can be delivered to multiple pasteboards when performing a drop.
+
+        * TestWebKitAPI/Tests/mac/DragAndDropTestsMac.mm:
+
 2019-08-02  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/mac/DragAndDropTestsMac.mm

@@ -136 +136 @@
 }
 
+TEST(DragAndDropTests, ProvideImageDataForMultiplePasteboards)
+{
+    auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebViewFrame:NSMakeRect(0, 0, 400, 400)]);
+    TestWKWebView *webView = [simulator webView];
+    [webView synchronouslyLoadTestPageNamed:@"image-and-contenteditable"];
+    [simulator runFrom:NSMakePoint(100, 100) to:NSMakePoint(100, 300)];
+
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+    NSPasteboard *dragPasteboard = [NSPasteboard pasteboardWithName:NSDragPboard];
+    NSPasteboard *uniquePasteboard = [NSPasteboard pasteboardWithUniqueName];
+    [webView pasteboard:dragPasteboard provideDataForType:NSTIFFPboardType];
+    [webView pasteboard:uniquePasteboard provideDataForType:NSTIFFPboardType];
+ALLOW_DEPRECATED_DECLARATIONS_END
+
+    NSArray *allowedClasses = @[ NSImage.class ];
+    NSImage *imageFromDragPasteboard = [dragPasteboard readObjectsForClasses:allowedClasses options:nil].firstObject;
+    NSImage *imageFromUniquePasteboard = [uniquePasteboard readObjectsForClasses:allowedClasses options:nil].firstObject;
+
+    EXPECT_EQ(imageFromUniquePasteboard.TIFFRepresentation.length, imageFromDragPasteboard.TIFFRepresentation.length);
+    EXPECT_TRUE(NSEqualSizes(imageFromDragPasteboard.size, imageFromUniquePasteboard.size));
+    EXPECT_FALSE(NSEqualSizes(NSZeroSize, imageFromUniquePasteboard.size));
+}
+
 #endif // ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)