src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzRenderer.m

rev 54096 : 8259651: [macOS] Replace JNF_COCOA_ENTER/EXIT macros
rev 54098 : 8260616: Removing remaining JNF dependencies in the java.desktop module
8259729: Missed JNFInstanceOf -> IsInstanceOf conversion

@@ -26,11 +26,10 @@
 #import "java_awt_image_BufferedImage.h"
 #import "java_awt_geom_PathIterator.h"
 #import "sun_java2d_OSXSurfaceData.h"
 
 #import <stdio.h>
-#import <JavaNativeFoundation/JavaNativeFoundation.h>
 
 #import "ImageSurfaceData.h"
 
 
 //#define DEBUG 1

@@ -634,19 +633,19 @@
 JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doLine
 (JNIEnv *env, jobject jthis, jobject jsurfacedata, jfloat x1, jfloat y1, jfloat x2, jfloat y2)
 {
 PRINT("Java_sun_java2d_CRenderer_doLine")
     QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
     SDRenderType renderType = SD_Stroke;
     qsdo->BeginSurface(env, qsdo, renderType);
     if (qsdo->cgRef != NULL)
     {
         doLine(qsdo, x1, y1, x2, y2);
     }
     qsdo->FinishSurface(env, qsdo);
-JNF_COCOA_RENDERER_EXIT(env);
+JNI_COCOA_RENDERER_EXIT(env);
 }
 
 /*
  * Class:     sun_java2d_CRenderer
  * Method:    doRect

@@ -655,19 +654,19 @@
 JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doRect
 (JNIEnv *env, jobject jthis, jobject jsurfacedata, jfloat x, jfloat y, jfloat w, jfloat h, jboolean isfill)
 {
 PRINT("Java_sun_java2d_CRenderer_doRect")
     QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
     SDRenderType renderType    = (isfill? SD_Fill : SD_Stroke);
     qsdo->BeginSurface(env, qsdo, renderType);
     if (qsdo->cgRef != NULL)
     {
         doRect(qsdo, x, y, w, h, isfill);
     }
     qsdo->FinishSurface(env, qsdo);
-JNF_COCOA_RENDERER_EXIT(env);
+JNI_COCOA_RENDERER_EXIT(env);
 }
 
 /*
  * Class:     sun_java2d_CRenderer
  * Method:    doRoundRect

@@ -676,19 +675,19 @@
 JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doRoundRect
 (JNIEnv *env, jobject jthis, jobject jsurfacedata, jfloat x, jfloat y, jfloat w, jfloat h, jfloat arcWidth, jfloat arcHeight, jboolean isfill)
 {
 PRINT("Java_sun_java2d_CRenderer_doRoundRect")
     QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
     SDRenderType renderType    = (isfill? SD_Fill : SD_Stroke);
     qsdo->BeginSurface(env, qsdo, renderType);
     if (qsdo->cgRef != NULL)
     {
         doRoundRect(qsdo, x, y, w, h, arcWidth, arcHeight, isfill);
     }
     qsdo->FinishSurface(env, qsdo);
-JNF_COCOA_RENDERER_EXIT(env);
+JNI_COCOA_RENDERER_EXIT(env);
 }
 
 /*
  * Class:     sun_java2d_CRenderer
  * Method:    doOval

@@ -697,19 +696,19 @@
 JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doOval
 (JNIEnv *env, jobject jthis, jobject jsurfacedata, jfloat x, jfloat y, jfloat w, jfloat h, jboolean isfill)
 {
 PRINT("Java_sun_java2d_CRenderer_doOval")
     QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
     SDRenderType renderType    = (isfill? SD_Fill : SD_Stroke);
     qsdo->BeginSurface(env, qsdo, renderType);
     if (qsdo->cgRef != NULL)
     {
         doOval(qsdo, x, y, w, h, isfill);
     }
     qsdo->FinishSurface(env, qsdo);
-JNF_COCOA_RENDERER_EXIT(env);
+JNI_COCOA_RENDERER_EXIT(env);
 }
 
 /*
  * Class:     sun_java2d_CRenderer
  * Method:    doArc

@@ -718,19 +717,19 @@
 JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doArc
 (JNIEnv *env, jobject jthis, jobject jsurfacedata, jfloat x, jfloat y, jfloat w, jfloat h, jfloat angleStart, jfloat angleExtent, jint arcType, jboolean isfill)
 {
 PRINT("Java_sun_java2d_CRenderer_doArc")
     QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
     SDRenderType renderType    = (isfill? SD_Fill : SD_Stroke);
     qsdo->BeginSurface(env, qsdo, renderType);
     if (qsdo->cgRef != NULL)
     {
         doArc(qsdo, x, y, w, h, angleStart, angleExtent, arcType, isfill);
     }
     qsdo->FinishSurface(env, qsdo);
-JNF_COCOA_RENDERER_EXIT(env);
+JNI_COCOA_RENDERER_EXIT(env);
 }
 
 /*
  * Class:     sun_java2d_CRenderer
  * Method:    doPoly

@@ -739,20 +738,20 @@
 JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doPoly
 (JNIEnv *env, jobject jthis, jobject jsurfacedata, jintArray xpointsarray, jintArray ypointsarray, jint npoints, jboolean ispolygon, jboolean isfill)
 {
 PRINT("Java_sun_java2d_CRenderer_doPoly")
     QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
     BOOL eoFill = YES; // polys are WIND_EVEN_ODD by definition
     SDRenderType renderType    = (isfill? (eoFill ? SD_EOFill : SD_Fill) : SD_Stroke);
     qsdo->BeginSurface(env, qsdo, renderType);
     if (qsdo->cgRef != NULL)
     {
         doPoly(env, qsdo, xpointsarray, ypointsarray, npoints, ispolygon, isfill);
     }
     qsdo->FinishSurface(env, qsdo);
-JNF_COCOA_RENDERER_EXIT(env);
+JNI_COCOA_RENDERER_EXIT(env);
 }
 
 /*
  * Class:     sun_java2d_CRenderer
  * Method:    doShape

@@ -761,22 +760,22 @@
 JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doShape
 (JNIEnv *env, jobject jthis, jobject jsurfacedata, jint length, jobject jFloatCoordinates, jobject jIntTypes, jint windingRule, jboolean isfill, jboolean shouldApplyOffset)
 {
 PRINT("Java_sun_java2d_CRenderer_doShape")
     QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
     BOOL eoFill = (windingRule == java_awt_geom_PathIterator_WIND_EVEN_ODD);
     SDRenderType renderType    = (isfill? (eoFill ? SD_EOFill : SD_Fill) : SD_Stroke);
     qsdo->BeginSurface(env, qsdo, renderType);
     if (qsdo->cgRef != NULL)
     {
         jfloat *coordinates = (jfloat*)((*env)->GetDirectBufferAddress(env, jFloatCoordinates));
         jint *types = (jint*)((*env)->GetDirectBufferAddress(env, jIntTypes));
         doShape(qsdo, types, coordinates, length, isfill, shouldApplyOffset);
     }
     qsdo->FinishSurface(env, qsdo);
-JNF_COCOA_RENDERER_EXIT(env);
+JNI_COCOA_RENDERER_EXIT(env);
 }
 
 #define invalidContext(c) \
     ((c) == NULL /* || (c)->identifer != CGContextIdentifier */)
 

@@ -788,14 +787,14 @@
 JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doImage
 (JNIEnv *env, jobject jthis, jobject jsurfacedata, jobject imageSurfaceData, jboolean fliph, jboolean flipv, jint w, jint h, jint sx, jint sy, jint sw, jint sh, jint dx, jint dy, jint dw, jint dh)
 {
 PRINT("Java_sun_java2d_CRenderer_doImage")
     QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
     qsdo->BeginSurface(env, qsdo, SD_Image);
     if (qsdo->cgRef != NULL)
     {
         doImage(env, qsdo, imageSurfaceData, fliph, flipv, w, h, sx, sy, sw, sh, dx, dy, dw, dh);
     }
     qsdo->FinishSurface(env, qsdo);
-JNF_COCOA_RENDERER_EXIT(env);
+JNI_COCOA_RENDERER_EXIT(env);
 }