Title: [240749] trunk/Tools
Revision
240749
Author
[email protected]
Date
2019-01-30 18:18:18 -0800 (Wed, 30 Jan 2019)

Log Message

[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:]):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (240748 => 240749)


--- trunk/Tools/ChangeLog	2019-01-31 02:15:06 UTC (rev 240748)
+++ trunk/Tools/ChangeLog	2019-01-31 02:18:18 UTC (rev 240749)
@@ -1,3 +1,28 @@
+2019-01-30  Keith Rollin  <[email protected]>
+
+        [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  Daniel Bates  <[email protected]>
 
         [iOS] Keyups for non-modifier keys identified as "Dead" when not focused in a content-editable element

Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm (240748 => 240749)


--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm	2019-01-31 02:15:06 UTC (rev 240748)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm	2019-01-31 02:18:18 UTC (rev 240749)
@@ -277,7 +277,7 @@
         [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);

Modified: trunk/Tools/TestWebKitAPI/mac/TestDraggingInfo.mm (240748 => 240749)


--- trunk/Tools/TestWebKitAPI/mac/TestDraggingInfo.mm	2019-01-31 02:15:06 UTC (rev 240748)
+++ trunk/Tools/TestWebKitAPI/mac/TestDraggingInfo.mm	2019-01-31 02:18:18 UTC (rev 240749)
@@ -115,7 +115,7 @@
         [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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to