Title: [258849] branches/safari-609-branch/Source/WebKit
Revision
258849
Author
[email protected]
Date
2020-03-23 09:43:38 -0700 (Mon, 23 Mar 2020)

Log Message

Apply patch. rdar://problem/60555343

    Cherry-pick r258565. rdar://problem/60555343

        2020-03-17  David Kilzer  <[email protected]>

    REGRESSION (r258334): WebPasteboardProxy::setPasteboardBufferForType should allow zero-size buffers
    <https://webkit.org/b/209167>
    <rdar://problem/60516302>

    Reviewed by Geoffrey Garen.

    * UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
    (WebKit::WebPasteboardProxy::setPasteboardBufferForType):
    - Remove check for zero-size buffer to match
      WebPageProxy::dataSelectionForPasteboard().

Modified Paths

Diff

Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (258848 => 258849)


--- branches/safari-609-branch/Source/WebKit/ChangeLog	2020-03-23 16:15:39 UTC (rev 258848)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog	2020-03-23 16:43:38 UTC (rev 258849)
@@ -1,4 +1,4 @@
-2020-03-19  Russell Epstein  <[email protected]>
+b'2020-03-23  Russell Epstein  <[email protected]>\n\n        Apply patch. rdar://problem/60555343\n\n    Cherry-pick r258565. rdar://problem/60555343\n    \n        2020-03-17  David Kilzer  <[email protected]>\n    \n    REGRESSION (r258334): WebPasteboardProxy::setPasteboardBufferForType should allow zero-size buffers\n    <https://webkit.org/b/209167>\n    <rdar://problem/60516302>\n    \n    Reviewed by Geoffrey Garen.\n    \n    * UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:\n    (WebKit::WebPasteboardProxy::setPasteboardBufferForType):\n    - Remove check for zero-size buffer to match\n      WebPageProxy::dataSelectionForPasteboard().\n\n    2020-03-17  David Kilzer  <[email protected]>\n\n            Cherry-pick r258565. rdar://problem/60555343\n\n        2020-03-17  David Kilzer  <[email protected]>\n\n            REGRESSION (r258334): WebPasteboardProxy::setPasteboardBufferForType should allow zero-size buffers\n           
  <https://webkit.org/b/209167>\n            <rdar://problem/60516302>\n\n            Reviewed by Geoffrey Garen.\n\n            * UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:\n            (WebKit::WebPasteboardProxy::setPasteboardBufferForType):\n            - Remove check for zero-size buffer to match\n              WebPageProxy::dataSelectionForPasteboard().\n\n'2020-03-19  Russell Epstein  <[email protected]>
 
         Apply patch. rdar://problem/60633852
 

Modified: branches/safari-609-branch/Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm (258848 => 258849)


--- branches/safari-609-branch/Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm	2020-03-23 16:15:39 UTC (rev 258848)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm	2020-03-23 16:43:38 UTC (rev 258849)
@@ -165,7 +165,7 @@
         return completionHandler(PlatformPasteboard(pasteboardName).setBufferForType(0, pasteboardType));
 
     // SharedMemory::Handle::size() is rounded up to the nearest page.
-    MESSAGE_CHECK(size && size <= handle.size(), completionHandler(0));
+    MESSAGE_CHECK(size <= handle.size(), completionHandler(0));
 
     RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::map(handle, SharedMemory::Protection::ReadOnly);
     auto buffer = SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), static_cast<size_t>(size));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to