Changeset 267305 in webkit

Timestamp:

Sep 18, 2020, 6:34:43 PM (6 years ago)

Author:

Wenson Hsieh

Message:

[macOS] REGRESSION (r265702): System Services receive 0 bytes when extracting selected content as rich text data
​https://bugs.webkit.org/show_bug.cgi?id=216718
<rdar://problem/69150358>

Reviewed by Tim Horton.

Source/WebKit:

Test: CopyHTML.WriteRichTextSelectionToPasteboard

• UIProcess/mac/WebPageProxyMac.mm:

(WebKit::WebPageProxy::dataSelectionForPasteboard):

After r265702, the IPCHandle received in the UI process was always being converted into a buffer of size 0,
due to using the size local variable (which is no longer set as an outparam of the sync IPC message). Instead,
use ipcHandle.dataSize.

Tools:

Add a new API test to verify that we get non-empty web archive data when using
-writeSelectionToPasteboard:types: to grab selected content as rich text data.

• TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm:

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/mac/WebPageProxyMac.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-18  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [macOS] REGRESSION (r265702): System Services receive 0 bytes when extracting selected content as rich text data
+        https://bugs.webkit.org/show_bug.cgi?id=216718
+        <rdar://problem/69150358>
+
+        Reviewed by Tim Horton.
+
+        Test: CopyHTML.WriteRichTextSelectionToPasteboard
+
+        * UIProcess/mac/WebPageProxyMac.mm:
+        (WebKit::WebPageProxy::dataSelectionForPasteboard):
+
+        After r265702, the `IPCHandle` received in the UI process was always being converted into a buffer of size 0,
+        due to using the `size` local variable (which is no longer set as an outparam of the sync IPC message). Instead,
+        use `ipcHandle.dataSize`.
+
 2020-09-18  Megan Gardner  <megan_gardner@apple.com>
 

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

@@ -257 +257 @@
 
     SharedMemory::IPCHandle ipcHandle;
-    uint64_t size = 0;
     const Seconds messageTimeout(20);
     sendSync(Messages::WebPage::GetDataSelectionForPasteboard(pasteboardType), Messages::WebPage::GetDataSelectionForPasteboard::Reply(ipcHandle), messageTimeout);
@@ -265 +264 @@
     if (!sharedMemoryBuffer)
         return nullptr;
-    return SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), static_cast<size_t>(size));
+    return SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), ipcHandle.dataSize);
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-09-18  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [macOS] REGRESSION (r265702): System Services receive 0 bytes when extracting selected content as rich text data
+        https://bugs.webkit.org/show_bug.cgi?id=216718
+        <rdar://problem/69150358>
+
+        Reviewed by Tim Horton.
+
+        Add a new API test to verify that we get non-empty web archive data when using
+        `-writeSelectionToPasteboard:types:` to grab selected content as rich text data.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm:
+
 2020-09-18  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm

@@ -47 +47 @@
 #if PLATFORM(MAC)
 
+@interface WKWebView () <NSServicesMenuRequestor>
+@end
+
 NSData *readHTMLDataFromPasteboard()
 {
@@ -194 +197 @@
 }
 
+TEST(CopyHTML, WriteRichTextSelectionToPasteboard)
+{
+    auto webView = createWebViewWithCustomPasteboardDataEnabled();
+    [webView synchronouslyLoadHTMLString:@"<strong style='color: rgb(255, 0, 0);'>This is some text to copy.</strong>"];
+    [webView stringByEvaluatingJavaScript:@"getSelection().selectAllChildren(document.body)"];
+
+    auto pasteboard = [NSPasteboard pasteboardWithUniqueName];
+    [webView writeSelectionToPasteboard:pasteboard types:@[ (__bridge NSString *)kUTTypeWebArchive ]];
+
+    EXPECT_GT([pasteboard dataForType:(__bridge NSString *)kUTTypeWebArchive].length, 0U);
+}
+
 #endif // PLATFORM(MAC)