8231513: JavaFX cause Keystroke Receiving prompt on MacOS 10.15 (Catalina)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -176,6 +176,11 @@ + (void)terminate
 
 - (id)init
 {
+    BOOL useEventTap = YES;
+    if (@available(macOS 10.15, *)) {
+        useEventTap = NO;
+    }
+
     self = [super init];
     if (self != nil)
     {
@@ -185,35 +190,37 @@ - (id)init
         self->touches       = nil;
         self->lastTouchId   = 0;
 
-        //
-        // Notes after fixing RT-23199:
-        //
-        //  Don't use NSMachPort and NSRunLoop to integrate CFMachPortRef
-        //  instance into run loop.
-        //
-        // Ignoring the above "don't"s results into performance degradation
-        // referenced in the bug.
-        //
-
-        self->eventTap = CGEventTapCreate(kCGHIDEventTap,
-                                          kCGHeadInsertEventTap,
-                                          kCGEventTapOptionListenOnly,
-                                          CGEventMaskBit(NSEventTypeGesture),
-                                          listenTouchEvents, nil);
-
-        LOG("TOUCHES: eventTap=%p\n", self->eventTap);
-
-        if (self->eventTap)
-        {   // Create a run loop source.
-            self->runLoopSource = CFMachPortCreateRunLoopSource(
-                                                        kCFAllocatorDefault,
-                                                        self->eventTap, 0);
-
-            LOG("TOUCHES: runLoopSource=%p\n", self->runLoopSource);
-
-            // Add to the current run loop.
-            CFRunLoopAddSource(CFRunLoopGetCurrent(), self->runLoopSource,
-                               kCFRunLoopCommonModes);
+        if (useEventTap) {
+            //
+            // Notes after fixing RT-23199:
+            //
+            //  Don't use NSMachPort and NSRunLoop to integrate CFMachPortRef
+            //  instance into run loop.
+            //
+            // Ignoring the above "don't"s results into performance degradation
+            // referenced in the bug.
+            //
+
+            self->eventTap = CGEventTapCreate(kCGHIDEventTap,
+                                              kCGHeadInsertEventTap,
+                                              kCGEventTapOptionListenOnly,
+                                              CGEventMaskBit(NSEventTypeGesture),
+                                              listenTouchEvents, nil);
+
+            LOG("TOUCHES: eventTap=%p\n", self->eventTap);
+
+            if (self->eventTap)
+            {   // Create a run loop source.
+                self->runLoopSource = CFMachPortCreateRunLoopSource(
+                                                            kCFAllocatorDefault,
+                                                            self->eventTap, 0);
+
+                LOG("TOUCHES: runLoopSource=%p\n", self->runLoopSource);
+
+                // Add to the current run loop.
+                CFRunLoopAddSource(CFRunLoopGetCurrent(), self->runLoopSource,
+                                   kCFRunLoopCommonModes);
+            }
         }
     }
     return self;
@@ -225,29 +232,42 @@ - (id)init
 @implementation GlassTouches (hidden)
 - (void)terminateImpl
 {
-    LOG("TOUCHES: terminateImpl eventTap=%p runLoopSource=%p\n", self->eventTap,
-        self->runLoopSource);
-
-    if (self->runLoopSource)
-    {
-        CFRunLoopRemoveSource(CFRunLoopGetCurrent(), self->runLoopSource,
-                              kCFRunLoopCommonModes);
-        CFRelease(self->runLoopSource);
-        self->runLoopSource = nil;
+    BOOL useEventTap = YES;
+    if (@available(macOS 10.15, *)) {
+        useEventTap = NO;
     }
 
-    if (self->eventTap)
-    {
-        CFRelease(self->eventTap);
-        self->eventTap = nil;
-    }
+    if (useEventTap) {
+        LOG("TOUCHES: terminateImpl eventTap=%p runLoopSource=%p\n", self->eventTap,
+            self->runLoopSource);
+
+        if (self->runLoopSource)
+        {
+            CFRunLoopRemoveSource(CFRunLoopGetCurrent(), self->runLoopSource,
+                                  kCFRunLoopCommonModes);
+            CFRelease(self->runLoopSource);
+            self->runLoopSource = nil;
+        }
 
+        if (self->eventTap)
+        {
+            CFRelease(self->eventTap);
+            self->eventTap = nil;
+        }
+    }
     [self releaseTouches];
 }
 
 - (void)enableTouchInputEventTap
 {
-    CGEventTapEnable(self->eventTap, true);
+    BOOL useEventTap = YES;
+    if (@available(macOS 10.15, *)) {
+        useEventTap = NO;
+    }
+
+    if (useEventTap) {
+        CGEventTapEnable(self->eventTap, true);
+    }
 }
 
 - (void)sendJavaTouchEvent:(NSEvent *)theEvent