Attachment 360653 Details for Bug 194059 – Patch

[patch] Patch

bug-194059-20190130170902.patch (text/plain), 3.23 KB, created by Keith Rollin on 2019-01-30 17:09:02 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2019-01-30 17:09:02 PST

Size: 3.23 KB

patch

obsolete

>Subversion Revision: 240722
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 4eaf961b3dac508ebee8940bed711ce2f456cf7b..16e63db67bf56f6b426286e7ddbcc74b38376dbf 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,28 @@
>+2019-01-30  Keith Rollin  <krollin@apple.com>
>+
>+        [NSDragItem init] is unavailable
>+        https://bugs.webkit.org/show_bug.cgi?id=194059
>+        <rdar://problem/47685715>
>+
>+        Reviewed by Wenson Hsieh.
>+
>+        [NSDragItem init] is marked as NS_UNAVAILABLE. This affects
>+        DumpRenderTree and TestWebKitAPI, which both try to create an
>+        NSDragItem in a manner that invokes this method. Address this by using
>+        -initWithPasteboardWriter instead.
>+
>+        Note that the parameter passed to initWithPasteboardWriter is likely
>+        incorrect. In both cases, the object passed does not conform to
>+        NSPasteboardWriting. However, with this fix, we're no worse off than
>+        before, and can now perform builds with newer compilers and SDKs until
>+        a real fix can be crafted. That work is tracked in
>+        https://bugs.webkit.org/show_bug.cgi?id=194060
>+
>+        * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
>+        (-[DumpRenderTreeDraggingInfo enumerateDraggingItemsWithOptions:forView:classes:searchOptions:usingBlock:]):
>+        * TestWebKitAPI/mac/TestDraggingInfo.mm:
>+        (-[TestDraggingInfo enumerateDraggingItemsWithOptions:forView:classes:searchOptions:usingBlock:]):
>+
> 2019-01-30  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Expand tests coverage.
>diff --git a/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm b/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm
>index 88973d80fc60499ef35f8c6de9a8d424c3dc392f..6bf764eaef8a5988beea4bddf4804747831faeb8 100644
>--- a/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm
>+++ b/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm
>@@ -277,7 +277,7 @@ - (void)enumerateDraggingItemsWithOptions:(NSEnumerationOptions)enumOptions forV
>         [receiver setDraggingSource:draggingSource];
>         [allFilePromiseReceivers() addObject:receiver.get()];
> 
>-        auto item = adoptNS([NSDraggingItem new]);
>+        auto item = adoptNS([[NSDraggingItem alloc] initWithPasteboardWriter:(id <NSPasteboardWriting>)receiver.get()]); // FIXME: <https://webkit.org/b/194060> Pass an object of the right type.
>         [item setItem:receiver.get()];
> 
>         block(item.get(), 0, &stop);
>diff --git a/Tools/TestWebKitAPI/mac/TestDraggingInfo.mm b/Tools/TestWebKitAPI/mac/TestDraggingInfo.mm
>index fba1c92fa659e0976c03e288198155260992f99e..3fffccf2b0c03c60a64257378a4f3b5ebb27f893 100644
>--- a/Tools/TestWebKitAPI/mac/TestDraggingInfo.mm
>+++ b/Tools/TestWebKitAPI/mac/TestDraggingInfo.mm
>@@ -115,7 +115,7 @@ - (void)enumerateDraggingItemsWithOptions:(NSDraggingItemEnumerationOptions)enum
>         [receiver setDraggingSource:_source.get().get()];
>         [_filePromiseReceivers addObject:receiver.get()];
> 
>-        auto item = adoptNS([NSDraggingItem new]);
>+        auto item = adoptNS([[NSDraggingItem alloc] initWithPasteboardWriter:(id <NSPasteboardWriting>)receiver.get()]); // FIXME: <https://webkit.org/b/194060> Pass an object of the right type.
>         [item setItem:receiver.get()];
> 
>         block(item.get(), 0, &stop);

Actions: View | Formatted Diff | Diff

Attachments on bug 194059: 360639 | 360653