stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8153871: [macosx] Low-level error on OS X 10.11 with DnD in Swing

Browse Source 
Reviewed-by: azvegint
This commit is contained in:
Sergey Bylokhov 2017-08-10 15:17:40 -07:00
parent 3357f6846c
commit a1c9682716
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.m
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -432,12 +432,11 @@ static BOOL sNeedsEnter;
NSWindow* window = [fView window]; NSWindow* window = [fView window];
NSInteger windowNumber = [window windowNumber]; NSInteger windowNumber = [window windowNumber];
NSGraphicsContext* graphicsContext = [NSGraphicsContext graphicsContextWithWindow:window];
// Convert mouse coordinates to NS: // Convert mouse coordinates to NS:
NSPoint eventLocation = [fView convertPoint:NSMakePoint(fDragPos.x, fDragPos.y) toView:nil]; NSPoint eventLocation = [fView convertPoint:NSMakePoint(fDragPos.x, fDragPos.y) toView:nil];
eventLocation.y = [[fView window] frame].size.height - eventLocation.y; eventLocation.y = [[fView window] frame].size.height - eventLocation.y;
// Convert fTriggerEventTimeStamp to NS - AWTEvent.h defines UTC(nsEvent) as ((jlong)[event timestamp] * 1000): // Convert fTriggerEventTimeStamp to NS - AWTEvent.h defines UTC(nsEvent) as ((jlong)[event timestamp] * 1000):
NSTimeInterval timeStamp = fTriggerEventTimeStamp / 1000; NSTimeInterval timeStamp = fTriggerEventTimeStamp / 1000;
@ -452,14 +451,16 @@ static BOOL sNeedsEnter;
} }
// Convert fModifiers (extModifiers) to NS: // Convert fModifiers (extModifiers) to NS:
NSUInteger modifiers = JavaModifiersToNsKeyModifiers(fModifiers, TRUE); NSUInteger modifiers = JavaModifiersToNsKeyModifiers(fModifiers, TRUE);
// Just a dummy value ... // Just a dummy value ...
NSInteger eventNumber = 0; NSInteger eventNumber = 0;
// NSEvent.context is deprecated and unused
NSGraphicsContext* unusedPassNil = nil;
// Make a native autoreleased dragging event: // Make a native autoreleased dragging event:
NSEvent* dragEvent = [NSEvent mouseEventWithType:mouseButtons location:eventLocation NSEvent* dragEvent = [NSEvent mouseEventWithType:mouseButtons location:eventLocation
modifierFlags:modifiers timestamp:timeStamp windowNumber:windowNumber context:graphicsContext modifierFlags:modifiers timestamp:timeStamp windowNumber:windowNumber context:unusedPassNil
eventNumber:eventNumber clickCount:fClickCount pressure:pressure]; eventNumber:eventNumber clickCount:fClickCount pressure:pressure];
return dragEvent; return dragEvent;

2
jdk/test/javax/swing/dnd/8139050/NativeErrorsInTableDnD.java
View File

@ -39,7 +39,7 @@ import static javax.swing.UIManager.getInstalledLookAndFeels;
/** /**
* @test * @test
* @bug 8139050 * @bug 8139050 8153871
* @library ../../../../lib/testlibrary * @library ../../../../lib/testlibrary
* @build ExtendedRobot * @build ExtendedRobot
* @run main/othervm/timeout=360 -Xcheck:jni NativeErrorsInTableDnD * @run main/othervm/timeout=360 -Xcheck:jni NativeErrorsInTableDnD