src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.h

rev 54096 : 8259651: [macOS] Replace JNF_COCOA_ENTER/EXIT macros

@@ -25,10 +25,11 @@
 
 #import "SurfaceData.h"
 #import "BufImgSurfaceData.h"
 #import "AWTFont.h"
 #import <Cocoa/Cocoa.h>
+#import "JNIUtilities.h"
 
 // these flags are not defined on Tiger on PPC, so we need to make them a no-op
 #if !defined(kCGBitmapByteOrder32Host)
 #define kCGBitmapByteOrder32Host 0
 #endif

@@ -148,12 +149,7 @@
 SDRenderType SetUpPaint(JNIEnv *env, QuartzSDOps *qsdo, SDRenderType renderType);
 void CompleteCGContext(JNIEnv *env, QuartzSDOps *qsdo);
 
 NSColor* ByteParametersToNSColor(JNIEnv* env, jint *javaGraphicsStates, NSColor* defColor);
 
-#define JNF_COCOA_RENDERER_EXIT(env) \
-} @catch(NSException *localException) { \
-    qsdo->FinishSurface(env, qsdo); \
-    [JNFException throwToJava:env exception:localException]; \
-} \
-        if (_token) JNFNativeMethodExit(_token); \
-}
+#define JNI_COCOA_RENDERER_EXIT(env) \
+ JNI_COCOA_EXIT_WITH_ACTION(env, qsdo->FinishSurface(env, qsdo))