8343398: Add reducedData preference

modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java

@@ -103,8 +103,12 @@ private static void finishKeepAliveThread() {
 
     private Menu appleMenu;
 
-    native void _runLoop(ClassLoader classLoader, Runnable launchable,
-                         boolean isTaskbarApplication);
+    private long delegateHandle;
+
+    native long _initDelegate(ClassLoader classLoader, Runnable launchable, boolean isTaskbarApplication);
+
+    native void _runLoop(long delegate);
+
     @Override
     protected void runLoop(final Runnable launchable) {
         // For normal (not embedded) taskbar applications the masOS activation
@@ -128,7 +132,8 @@ protected void runLoop(final Runnable launchable) {
         startKeepAliveThread();
 
         ClassLoader classLoader = MacApplication.class.getClassLoader();
-        _runLoop(classLoader, wrappedRunnable, isTaskbarApplication);
+        delegateHandle = _initDelegate(classLoader, wrappedRunnable, isTaskbarApplication);
+        _runLoop(delegateHandle);
     }
 
     private final CountDownLatch reactivationLatch = new CountDownLatch(1);
@@ -154,10 +159,10 @@ void waitForReactivation() {
         eventLoop.enter();
     }
 
-    native private void _finishTerminating();
+    native private void _finishTerminating(long delegateHandle);
     @Override
     protected void finishTerminating() {
-        _finishTerminating();
+        _finishTerminating(delegateHandle);
         finishKeepAliveThread();
 
         super.finishTerminating();
@@ -420,8 +425,12 @@ public String getDataDirectory() {
 
     private native String _getApplicationClassName();
 
+    private native Map<String, Object> _getPlatformPreferences(long delegateHandle);
+
     @Override
-    public native Map<String, Object> getPlatformPreferences();
+    public Map<String, Object> getPlatformPreferences() {
+        return _getPlatformPreferences(delegateHandle);
+    }
 
     @Override
     public Map<String, PreferenceMapping<?, ?>> getPlatformKeyMappings() {

modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m

@@ -952,30 +952,47 @@ + (BOOL)syncRenderingDisabled {
 
 /*
  * Class:     com_sun_glass_ui_mac_MacApplication
- * Method:    _runLoop
- * Signature: (Ljava/lang/ClassLoader;Ljava/lang/Runnable;Z)V
+ * Method:    _initDelegate
+ * Signature: (Ljava/lang/ClassLoader;Ljava/lang/Runnable;Z)J
  */
-JNIEXPORT void JNICALL Java_com_sun_glass_ui_mac_MacApplication__1runLoop
+JNIEXPORT jlong JNICALL Java_com_sun_glass_ui_mac_MacApplication__1initDelegate
 (JNIEnv *env, jobject japplication, jobject classLoader,
  jobject jlaunchable, jboolean isTaskbarApplication)
 {
-    LOG("Java_com_sun_glass_ui_mac_MacApplication__1runLoop");
+    LOG("Java_com_sun_glass_ui_mac_MacApplication__1initDelegate");
 
-    NSAutoreleasePool *glasspool = [[NSAutoreleasePool alloc] init];
+    if ([NSThread isMainThread] == YES)
     {
-        if ([NSThread isMainThread] == YES)
-        {
-            //            fprintf(stderr, "\nWARNING: Glass was started on 1st thread and will block this thread.\nYou most likely do not want to do this - please remove \"-XstartOnFirstThread\" from VM arguments.\n\n");
-        }
-        else
+        //            fprintf(stderr, "\nWARNING: Glass was started on 1st thread and will block this thread.\nYou most likely do not want to do this - please remove \"-XstartOnFirstThread\" from VM arguments.\n\n");
+    }
+    else
+    {
+        if ([[NSThread currentThread] name] == nil)
         {
-            if ([[NSThread currentThread] name] == nil)
-            {
-                [[NSThread currentThread] setName:@"Main Java Thread"];
-            }
+            [[NSThread currentThread] setName:@"Main Java Thread"];
         }
+    }
+
+    return (jlong)[[GlassApplication alloc] initWithEnv:env
+                                            application:japplication
+                                            launchable:jlaunchable
+                                            taskbarApplication:isTaskbarApplication
+                                            classLoader:classLoader];
+}
 
-        GlassApplication *glass = [[GlassApplication alloc] initWithEnv:env application:japplication launchable:jlaunchable taskbarApplication:isTaskbarApplication classLoader:classLoader];
+/*
+ * Class:     com_sun_glass_ui_mac_MacApplication
+ * Method:    _runLoop
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_sun_glass_ui_mac_MacApplication__1runLoop
+(JNIEnv *env, jobject japplication, jlong appDelegate)
+{
+    LOG("Java_com_sun_glass_ui_mac_MacApplication__1runLoop");
+
+    NSAutoreleasePool *glasspool = [[NSAutoreleasePool alloc] init];
+    {
+        GlassApplication* glass = (GlassApplication*)appDelegate;
         if ([NSThread isMainThread] == YES) {
             [glass runLoop: glass];
         } else {
@@ -998,13 +1015,17 @@ + (BOOL)syncRenderingDisabled {
 /*
  * Class:     com_sun_glass_ui_mac_MacApplication
  * Method:    _finishTerminating
- * Signature: ()V
+ * Signature: (J)V
  */
 JNIEXPORT void JNICALL Java_com_sun_glass_ui_mac_MacApplication__1finishTerminating
-(JNIEnv *env, jobject japplication)
+(JNIEnv *env, jobject japplication, jlong appDelegate)
 {
     LOG("Java_com_sun_glass_ui_mac_MacApplication__1finishTerminating");
 
+    if (appDelegate) {
+        [(GlassApplication*)appDelegate release];
+    }
+
     if (isEmbedded) {
         return;
     }
@@ -1262,11 +1283,12 @@ + (BOOL)syncRenderingDisabled {
 /*
  * Class:     com_sun_glass_ui_mac_MacApplication
  * Method:    getPlatformPreferences
- * Signature: ()Ljava/util/Map;
+ * Signature: (J)Ljava/util/Map;
  */
-JNIEXPORT jobject JNICALL Java_com_sun_glass_ui_mac_MacApplication_getPlatformPreferences
-(JNIEnv *env, jobject self)
+JNIEXPORT jobject JNICALL Java_com_sun_glass_ui_mac_MacApplication__1getPlatformPreferences
+(JNIEnv *env, jobject self, jlong appDelegate)
 {
-    GlassApplication* app = (GlassApplication*)[NSApp delegate];
-    return [app getPlatformPreferences];
+    return appDelegate
+        ? [(GlassApplication*)appDelegate getPlatformPreferences]
+        : nil;
 }