src/macosx/native/sun/awt/LWCToolkit.m

*** 330,367 ****
   * Class:     sun_lwawt_macosx_LWCToolkit
   * Method:    doAWTRunLoop
   * Signature: (JZZ)V
   */
  JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_doAWTRunLoop
! (JNIEnv *env, jclass clz, jlong mediator, jboolean awtMode, jboolean detectDeadlocks)
  {
  AWT_ASSERT_APPKIT_THREAD;
  JNF_COCOA_ENTER(env);
  
      AWTRunLoopObject* mediatorObject = (AWTRunLoopObject*)jlong_to_ptr(mediator);
  
      if (mediatorObject == nil) return;
  
-     if (!sInPerformFromJava || !detectDeadlocks) {
- 
-         NSRunLoop *currentRunLoop = [NSRunLoop currentRunLoop];
-         NSDate *distantFuture = [NSDate distantFuture];
-         NSString *mode = (awtMode) ? [JNFRunLoop javaRunLoopMode] : NSDefaultRunLoopMode;
- 
-         BOOL isRunning = YES;
-         while (isRunning && ![mediatorObject shouldEndRunLoop]) {
              // Don't use acceptInputForMode because that doesn't setup autorelease pools properly
!             isRunning = [currentRunLoop runMode:mode beforeDate:distantFuture];
          }
  
      }
- #ifndef PRODUCT_BUILD
-     if (sInPerformFromJava) {
-         NSLog(@"Apple AWT: Short-circuiting CToolkit.invokeAndWait trampoline deadlock!!!!!");
-         NSLog(@"\tPlease file a bug report with this message and a reproducible test case.");
      }
! #endif
  
      CFRelease(mediatorObject);
  
  JNF_COCOA_EXIT(env);
  }
--- 330,366 ----
   * Class:     sun_lwawt_macosx_LWCToolkit
   * Method:    doAWTRunLoop
   * Signature: (JZZ)V
   */
  JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_doAWTRunLoop
! (JNIEnv *env, jclass clz, jlong mediator, jboolean processEvents)
  {
  AWT_ASSERT_APPKIT_THREAD;
  JNF_COCOA_ENTER(env);
  
      AWTRunLoopObject* mediatorObject = (AWTRunLoopObject*)jlong_to_ptr(mediator);
  
      if (mediatorObject == nil) return;
  
      // Don't use acceptInputForMode because that doesn't setup autorelease pools properly
!     BOOL isRunning = true;
!     while (![mediatorObject shouldEndRunLoop] && isRunning) {
!         isRunning = [[NSRunLoop currentRunLoop] runMode:[JNFRunLoop javaRunLoopMode]
!                                              beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.010]];
!         if (processEvents) {
!             //We do not spin a runloop here as date is nil, so does not matter which mode to use
!             NSEvent *event;
!             if ((event = [NSApp nextEventMatchingMask:NSAnyEventMask
!                                            untilDate:nil
!                                               inMode:NSDefaultRunLoopMode
!                                              dequeue:YES]) != nil) {
!                 [NSApp sendEvent:event];
              }
  
          }
      }
! 
     
      CFRelease(mediatorObject);
  
  JNF_COCOA_EXIT(env);
  }
*** 377,387 ****
  AWT_ASSERT_NOT_APPKIT_THREAD;
  JNF_COCOA_ENTER(env);
  
      AWTRunLoopObject* mediatorObject = (AWTRunLoopObject*)jlong_to_ptr(mediator);
  
!     [ThreadUtilities performOnMainThread:@selector(endRunLoop) onObject:mediatorObject withObject:nil waitUntilDone:NO awtMode:YES];
  
      CFRelease(mediatorObject);
  
  JNF_COCOA_EXIT(env);
  }
--- 376,386 ----
  AWT_ASSERT_NOT_APPKIT_THREAD;
  JNF_COCOA_ENTER(env);
  
      AWTRunLoopObject* mediatorObject = (AWTRunLoopObject*)jlong_to_ptr(mediator);
  
!     [ThreadUtilities performOnMainThread:@selector(endRunLoop) on:mediatorObject withObject:nil waitUntilDone:NO];
  
      CFRelease(mediatorObject);
  
  JNF_COCOA_EXIT(env);
  }
*** 461,493 ****
  (JNIEnv *env, jclass obj, jobject fontToFileMap, jobject fontToFamilyMap, jobject familyToFontListMap, jobject locale)
  {
  
  }
  
- /*
-  * Class:     sun_lwawt_macosx_LWCToolkit
-  * Method:    startNativeNestedEventLoop
-  * Signature: ()V
-  */
- JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_startNativeNestedEventLoop
- (JNIEnv *env, jclass cls)
- {
-     // Simply get the next event in native loop and pass it to execution
-     // We'll be called repeatedly so there's no need to block here
-     NSRunLoop *theRL = [NSRunLoop currentRunLoop];
-     NSApplication * app = [NSApplication sharedApplication];
-     NSEvent * event = [app nextEventMatchingMask: 0xFFFFFFFF untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES];
-     if (event != nil) {
-         [app sendEvent: event];
-     }
- }
  
- /*
-  * Class:     sun_lwawt_macosx_LWCToolkit
-  * Method:    stopNativeNestedEventLoop
-  * Signature: ()V
-  */
- JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_stopNativeNestedEventLoop
- (JNIEnv *env, jclass cls)
- {
- //    At this moment it seems that this method should be no-op
- }
--- 460,465 ----