src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.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,40 ****
  #import "sun_java2d_opengl_CGLGraphicsConfig.h"
  
  #import "CGLGraphicsConfig.h"
  #import "CGLSurfaceData.h"
  #import "ThreadUtilities.h"
  
  #import <stdlib.h>
  #import <string.h>
  #import <ApplicationServices/ApplicationServices.h>
- #import <JavaNativeFoundation/JavaNativeFoundation.h>
  
  #pragma mark -
  #pragma mark "--- Mac OS X specific methods for GL pipeline ---"
  
  /**
--- 26,40 ----
  #import "sun_java2d_opengl_CGLGraphicsConfig.h"
  
  #import "CGLGraphicsConfig.h"
  #import "CGLSurfaceData.h"
  #import "ThreadUtilities.h"
+ #import "JNIUtilities.h"
  
  #import <stdlib.h>
  #import <string.h>
  #import <ApplicationServices/ApplicationServices.h>
  
  #pragma mark -
  #pragma mark "--- Mac OS X specific methods for GL pipeline ---"
  
  /**
*** 192,202 ****
  Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
      (JNIEnv *env, jclass cglgc,
       jint displayID, jint pixfmt, jint swapInterval)
  {
    jlong ret = 0L;
!   JNF_COCOA_ENTER(env);
    NSMutableArray * retArray = [NSMutableArray arrayWithCapacity:3];
    [retArray addObject: [NSNumber numberWithInt: (int)displayID]];
    [retArray addObject: [NSNumber numberWithInt: (int)pixfmt]];
    [retArray addObject: [NSNumber numberWithInt: (int)swapInterval]];
    if ([NSThread isMainThread]) {
--- 192,202 ----
  Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
      (JNIEnv *env, jclass cglgc,
       jint displayID, jint pixfmt, jint swapInterval)
  {
    jlong ret = 0L;
!   JNI_COCOA_ENTER(env);
    NSMutableArray * retArray = [NSMutableArray arrayWithCapacity:3];
    [retArray addObject: [NSNumber numberWithInt: (int)displayID]];
    [retArray addObject: [NSNumber numberWithInt: (int)pixfmt]];
    [retArray addObject: [NSNumber numberWithInt: (int)swapInterval]];
    if ([NSThread isMainThread]) {
*** 204,214 ****
    } else {
        [GraphicsConfigUtil performSelectorOnMainThread: @selector(_getCGLConfigInfo:) withObject: retArray waitUntilDone: YES];
    }
    NSNumber * num = (NSNumber *)[retArray objectAtIndex: 0];
    ret = (jlong)[num longValue];
!   JNF_COCOA_EXIT(env);
    return ret;
  }
  
  
  
--- 204,214 ----
    } else {
        [GraphicsConfigUtil performSelectorOnMainThread: @selector(_getCGLConfigInfo:) withObject: retArray waitUntilDone: YES];
    }
    NSNumber * num = (NSNumber *)[retArray objectAtIndex: 0];
    ret = (jlong)[num longValue];
!   JNI_COCOA_EXIT(env);
    return ret;
  }