On Wed, 24 May 2023 14:08:29 GMT, Lukasz Kostyra <lkost...@openjdk.org> wrote:

>> Crashes started happening due to macOS DnD API change from macOS 10.14 
>> onwards. 10.14 incrodues some [DnD 
>> constrains](https://developer.apple.com/documentation/macos-release-notes/appkit-release-notes-for-macos-10_14#Drag-and-Drop)
>>  which our DnD code happened to trigger on some occasions.
>> 
>> Our code used deprecated `dragImage` API which since 10.14 had new 
>> requirement - each NSPasteboard item had to have a corresponding drag image. 
>> Not meeting this constraint raised an exception, which crashed the app. 
>> Since there was no possibility to add more drag images to `dragImage` API 
>> (it only took one NSImage as parameter) the code had to be rewritten - as 
>> such I upgraded it to new DnD API utilizing NSDraggingSession and related 
>> protocols.
>> 
>> One side-effect of new DnD API is that it now modifies NSPasteboard for us - 
>> previous behavior was more "separated" from user code perspective (write 
>> items to pasteboard -> initiate a drag via `dragImage`). Manually updating 
>> NSPasteboard before calling `beginDraggingSessionWithItems` raised another 
>> exception related to NSPasteboard already having DnD-ed elements inside it. 
>> Some system tests, however, relied on that behavior and writing to 
>> NSPasteboard (`MacPasteboardShim.java` used in some tests creates a 
>> `Clipboard.DND` for test purposes). Since this path is in tests I assumed 
>> this behavior should stay and tried to make it as close to working as 
>> possible. Tests (including those using `MacPasteboardShim`) pass after my 
>> changes.
>> 
>> Additionally, added a new manual test based on `DndTest.java` test which 
>> creates two temporary files and allows for testing faulty behavior.
>
> Lukasz Kostyra has updated the pull request incrementally with one additional 
> commit since the last revision:
> 
>   startDrag: move autorelease calls for NSStrings until after init

Looks good. I left one minor styling comment. I'll reapprove if you decide to 
change it.

modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.m line 977:

> 975:             // create an image with contents of URL
> 976:             NSString *fileURL = [[NSString alloc] initWithData:[pbItem 
> dataForType:NSPasteboardTypeFileURL] encoding:NSUTF8StringEncoding];
> 977:             [fileURL autorelease];

Minor: You could do this in a single line, although it is correct as you have 
it.


NSString *fileURL = [[[NSString alloc] initWithData:[pbItem 
dataForType:NSPasteboardTypeFileURL] encoding:NSUTF8StringEncoding] 
autorelease];

-------------

Marked as reviewed by kcr (Lead).

PR Review: https://git.openjdk.org/jfx/pull/1089#pullrequestreview-1442010647
PR Review Comment: https://git.openjdk.org/jfx/pull/1089#discussion_r1204234652

Reply via email to