8301312: Create implementation of NSAccessibilityButton protocol

Reviewed-by: kcr, arapte

Author: Alexander Zuev

buildSrc/mac.gradle

@@ -184,7 +184,8 @@ MAC.glass.javahInclude = [
     "com/sun/glass/events/**",
     "com/sun/glass/ui/*",
     "com/sun/glass/ui/mac/*"]
-MAC.glass.nativeSource = file("${project("graphics").projectDir}/src/main/native-glass/mac")
+MAC.glass.nativeSource = [file("${project("graphics").projectDir}/src/main/native-glass/mac"),
+        file("${project("graphics").projectDir}/src/main/native-glass/mac/a11y")]
 MAC.glass.compiler = compiler
 MAC.glass.ccFlags = [ccFlags,
     "-DMACOS_MIN_VERSION_MAJOR=$macOSMinVersionMajor",

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, 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
@@ -643,11 +643,14 @@ private static enum MacText {
     /* The native peer associated with the instance */
     private long peer;
 
-    /* Creates a GlassAccessible linked to the caller (GlobalRef) */
-    private native long _createGlassAccessible();
+    /* Creates a native accessible peer linked to the caller (GlobalRef) */
+    private native long _createAccessiblePeer(String forRole);
 
-    /* Releases the GlassAccessible and deletes the GlobalRef */
-    private native void _destroyGlassAccessible(long accessible);
+    /* Releases the native accessible peer and deletes the GlobalRef */
+    private native void _destroyAccessiblePeer(long accessible);
+
+    /* Notify accessible peer about hierarchy change to invalidate parent */
+    private native void _invalidateParent(long accessible);
 
     private static native String getString(long nsString);
     private static native boolean isEqualToString(long nsString1, long nsString);
@@ -665,10 +668,6 @@ private static enum MacText {
     private static final int kAXMenuItemModifierNoCommand    = (1 << 3);
 
     MacAccessible() {
-        this.peer = _createGlassAccessible();
-        if (this.peer == 0L) {
-            throw new RuntimeException("could not create platform accessible");
-        }
     }
 
     @Override
@@ -677,7 +676,7 @@ public void dispose() {
             if (getView() == null) {
                 NSAccessibilityPostNotification(peer, MacNotification.NSAccessibilityUIElementDestroyedNotification.ptr);
             }
-            _destroyGlassAccessible(peer);
+            _destroyAccessiblePeer(peer);
             peer = 0L;
         }
         super.dispose();
@@ -803,20 +802,32 @@ public void sendNotification(AccessibleAttribute notification) {
                 }
                 break;
             case PARENT:
+                if (peer != 0L) {
+                    _invalidateParent(peer);
+                }
                 ignoreInnerText = null;
                 break;
             default:
                 macNotification = MacNotification.NSAccessibilityValueChangedNotification;
         }
         if (macNotification != null) {
             View view = getView();
-            long id = view != null ? view.getNativeView() : peer;
+            long id = view != null ? view.getNativeView() : getNativeAccessible();
             NSAccessibilityPostNotification(id, macNotification.ptr);
         }
     }
 
     @Override
     protected long getNativeAccessible() {
+        if (this.peer == 0L) {
+            AccessibleRole role = (AccessibleRole) getAttribute(ROLE);
+            if (role == null) role = AccessibleRole.NODE;
+            this.peer = _createAccessiblePeer(role.toString());
+            if (this.peer == 0L) {
+                throw new RuntimeException("could not create platform accessible");
+            }
+        }
+
         return peer;
     }
 

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

@@ -520,31 +520,6 @@ id variantToID(JNIEnv *env, jobject variant) {
     jVariantToID = NULL;
 }
 
-/*
- * Class:     com_sun_glass_ui_mac_MacAccessible
- * Method:    _createGlassAccessible
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_com_sun_glass_ui_mac_MacAccessible__1createGlassAccessible
-  (JNIEnv *env, jobject jAccessible)
-{
-    GlassAccessible* accessible = NULL;
-    accessible = [[GlassAccessible alloc] initWithEnv: env accessible: jAccessible];
-    return ptr_to_jlong(accessible);
-}
-
-/*
- * Class:     com_sun_glass_ui_mac_MacAccessible
- * Method:    _destroyGlassAccessible
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_com_sun_glass_ui_mac_MacAccessible__1destroyGlassAccessible
-  (JNIEnv *env, jobject jAccessible, jlong macAccessible)
-{
-    GlassAccessible* accessible = (GlassAccessible*)jlong_to_ptr(macAccessible);
-    [accessible release];
-}
-
 /*
  * Class:     com_sun_glass_ui_mac_MacAccessible
  * Method:    idToMacVariant
@@ -652,18 +627,6 @@ id variantToID(JNIEnv *env, jobject variant) {
     return jVariant;
 }
 
-/*
- * Class:     com_sun_glass_ui_mac_MacAccessible
- * Method:    NSAccessibilityUnignoredAncestor
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_com_sun_glass_ui_mac_MacAccessible_NSAccessibilityUnignoredAncestor
-  (JNIEnv *env, jclass jClass, jlong macAccessible)
-{
-    GlassAccessible* accessible = (GlassAccessible*)jlong_to_ptr(macAccessible);
-    return ptr_to_jlong(NSAccessibilityUnignoredAncestor(accessible));
-}
-
 /*
  * Class:     com_sun_glass_ui_mac_MacAccessible
  * Method:    NSAccessibilityUnignoredChildren

modules/javafx.graphics/src/main/native-glass/mac/a11y/AccessibleBase.h

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#import <Cocoa/Cocoa.h>
+#import <jni.h>
+
+@interface AccessibleBase : NSAccessibilityElement {
+@private
+jobject jAccessible;
+id parent;
+}
+- (id)initWithEnv:(JNIEnv*)env accessible:(jobject)jAccessible;
+- (jobject)getJAccessible;
+- (NSRect)accessibilityFrame;
+- (id)accessibilityParent;
+- (BOOL)isAccessibilityElement;
+- (BOOL)performAccessibleAction:(jlong)actionId;
++ (void) initializeRolesMap;
+@end
+
+jmethodID jAccessibilityAttributeNames;