Skip to content

Commit 5855d52

Browse files
prraceprrace
committed
8259651: [macOS] Replace JNF_COCOA_ENTER/EXIT macros
Reviewed-by: serb
1 parent 360c722 commit 5855d52

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+583
-544
lines changed

‎src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#import "java_awt_event_KeyEvent.h"
2828
#import "LWCToolkit.h"
2929

30-
#import "jni_util.h"
30+
#import "JNIUtilities.h"
3131

3232
#import <JavaNativeFoundation/JavaNativeFoundation.h>
3333
#import <sys/time.h>
@@ -668,11 +668,11 @@ jlong UTC(NSEvent *event) {
668668
{
669669
jint jmodifiers = 0;
670670

671-
JNF_COCOA_ENTER(env);
671+
JNI_COCOA_ENTER(env);
672672

673673
jmodifiers = GetJavaMouseModifiers(modifierFlags);
674674

675-
JNF_COCOA_EXIT(env);
675+
JNI_COCOA_EXIT(env);
676676

677677
return jmodifiers;
678678
}
@@ -688,7 +688,7 @@ jlong UTC(NSEvent *event) {
688688
{
689689
BOOL postsTyped = NO;
690690

691-
JNF_COCOA_ENTER(env);
691+
JNI_COCOA_ENTER(env);
692692

693693
jboolean copy = JNI_FALSE;
694694
jint *data = (*env)->GetIntArrayElements(env, inData, &copy);
@@ -716,7 +716,7 @@ jlong UTC(NSEvent *event) {
716716

717717
(*env)->ReleaseIntArrayElements(env, inData, data, 0);
718718

719-
JNF_COCOA_EXIT(env);
719+
JNI_COCOA_EXIT(env);
720720

721721
return postsTyped;
722722
}
@@ -730,7 +730,7 @@ jlong UTC(NSEvent *event) {
730730
Java_sun_lwawt_macosx_NSEvent_nsKeyModifiersToJavaKeyInfo
731731
(JNIEnv *env, jclass cls, jintArray inData, jintArray outData)
732732
{
733-
JNF_COCOA_ENTER(env);
733+
JNI_COCOA_ENTER(env);
734734

735735
jboolean copy = JNI_FALSE;
736736
jint *data = (*env)->GetIntArrayElements(env, inData, &copy);
@@ -757,7 +757,7 @@ jlong UTC(NSEvent *event) {
757757

758758
(*env)->ReleaseIntArrayElements(env, inData, data, 0);
759759

760-
JNF_COCOA_EXIT(env);
760+
JNI_COCOA_EXIT(env);
761761
}
762762

763763
/*
@@ -771,11 +771,11 @@ jlong UTC(NSEvent *event) {
771771
{
772772
jchar javaChar = 0;
773773

774-
JNF_COCOA_ENTER(env);
774+
JNI_COCOA_ENTER(env);
775775

776776
javaChar = NsCharToJavaChar(nsChar, modifierFlags, spaceKeyTyped);
777777

778-
JNF_COCOA_EXIT(env);
778+
JNI_COCOA_EXIT(env);
779779

780780
return javaChar;
781781
}

‎src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.m

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#import "AWTSurfaceLayers.h"
2727
#import "ThreadUtilities.h"
2828
#import "LWCToolkit.h"
29+
#import "JNIUtilities.h"
2930

3031
#import <JavaNativeFoundation/JavaNativeFoundation.h>
3132
#import <QuartzCore/CATransaction.h>
@@ -101,15 +102,15 @@ - (void) setBounds:(CGRect)rect {
101102
{
102103
__block AWTSurfaceLayers *surfaceLayers = nil;
103104

104-
JNF_COCOA_ENTER(env);
105+
JNI_COCOA_ENTER(env);
105106

106107
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){
107108

108109
CALayer *windowLayer = jlong_to_ptr(windowLayerPtr);
109110
surfaceLayers = [[AWTSurfaceLayers alloc] initWithWindowLayer: windowLayer];
110111
}];
111112

112-
JNF_COCOA_EXIT(env);
113+
JNI_COCOA_EXIT(env);
113114

114115
return ptr_to_jlong(surfaceLayers);
115116
}
@@ -122,7 +123,7 @@ - (void) setBounds:(CGRect)rect {
122123
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformComponent_nativeSetBounds
123124
(JNIEnv *env, jclass clazz, jlong surfaceLayersPtr, jint x, jint y, jint width, jint height)
124125
{
125-
JNF_COCOA_ENTER(env);
126+
JNI_COCOA_ENTER(env);
126127

127128
AWTSurfaceLayers *surfaceLayers = OBJC(surfaceLayersPtr);
128129

@@ -132,5 +133,5 @@ - (void) setBounds:(CGRect)rect {
132133
[surfaceLayers setBounds: rect];
133134
}];
134135

135-
JNF_COCOA_EXIT(env);
136+
JNI_COCOA_EXIT(env);
136137
}

‎src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,7 @@ - (void)abandonInput
14041404
{
14051405
__block AWTView *newView = nil;
14061406

1407-
JNF_COCOA_ENTER(env);
1407+
JNI_COCOA_ENTER(env);
14081408

14091409
NSRect rect = NSMakeRect(originX, originY, width, height);
14101410
jobject cPlatformView = (*env)->NewWeakGlobalRef(env, obj);
@@ -1417,7 +1417,7 @@ - (void)abandonInput
14171417
windowLayer:windowLayer];
14181418
}];
14191419

1420-
JNF_COCOA_EXIT(env);
1420+
JNI_COCOA_EXIT(env);
14211421

14221422
return ptr_to_jlong(newView);
14231423
}
@@ -1432,7 +1432,7 @@ - (void)abandonInput
14321432
Java_sun_lwawt_macosx_CPlatformView_nativeSetAutoResizable
14331433
(JNIEnv *env, jclass cls, jlong viewPtr, jboolean toResize)
14341434
{
1435-
JNF_COCOA_ENTER(env);
1435+
JNI_COCOA_ENTER(env);
14361436

14371437
NSView *view = (NSView *)jlong_to_ptr(viewPtr);
14381438

@@ -1449,7 +1449,7 @@ - (void)abandonInput
14491449
}
14501450

14511451
}];
1452-
JNF_COCOA_EXIT(env);
1452+
JNI_COCOA_EXIT(env);
14531453
}
14541454

14551455
/*
@@ -1464,15 +1464,15 @@ - (void)abandonInput
14641464
{
14651465
__block jint ret; //CGDirectDisplayID
14661466

1467-
JNF_COCOA_ENTER(env);
1467+
JNI_COCOA_ENTER(env);
14681468

14691469
NSView *view = (NSView *)jlong_to_ptr(viewPtr);
14701470
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){
14711471
NSWindow *window = [view window];
14721472
ret = (jint)[[AWTWindow getNSWindowDisplayID_AppKitThread: window] intValue];
14731473
}];
14741474

1475-
JNF_COCOA_EXIT(env);
1475+
JNI_COCOA_EXIT(env);
14761476

14771477
return ret;
14781478
}
@@ -1489,7 +1489,7 @@ - (void)abandonInput
14891489
{
14901490
jobject jRect = NULL;
14911491

1492-
JNF_COCOA_ENTER(env);
1492+
JNI_COCOA_ENTER(env);
14931493

14941494
__block NSRect rect = NSZeroRect;
14951495

@@ -1505,7 +1505,7 @@ - (void)abandonInput
15051505
}];
15061506
jRect = NSToJavaRect(env, rect);
15071507

1508-
JNF_COCOA_EXIT(env);
1508+
JNI_COCOA_EXIT(env);
15091509

15101510
return jRect;
15111511
}
@@ -1521,7 +1521,7 @@ - (void)abandonInput
15211521
{
15221522
__block jboolean underMouse = JNI_FALSE;
15231523

1524-
JNF_COCOA_ENTER(env);
1524+
JNI_COCOA_ENTER(env);
15251525

15261526
NSView *nsView = OBJC(viewPtr);
15271527
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){
@@ -1530,7 +1530,7 @@ - (void)abandonInput
15301530
underMouse = [nsView hitTest:ptViewCoords] != nil;
15311531
}];
15321532

1533-
JNF_COCOA_EXIT(env);
1533+
JNI_COCOA_EXIT(env);
15341534

15351535
return underMouse;
15361536
}

0 commit comments

Comments
 (0)