Skip to content

Commit

Permalink
8274381: missing CAccessibility definitions in JNI code
Browse files Browse the repository at this point in the history
Reviewed-by: pbansal, ant, kizune
  • Loading branch information
savoptik authored and Anton Tarasov committed Sep 28, 2021
1 parent 79865cd commit be40373
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@

NSSize getAxComponentSize(JNIEnv *env, jobject axComponent, jobject component)
{
GET_CACCESSIBILITY_CLASS_RETURN(NSZeroSize);
DECLARE_CLASS_RETURN(jc_Dimension, "java/awt/Dimension", NSZeroSize);
DECLARE_FIELD_RETURN(jf_width, jc_Dimension, "width", "I", NSZeroSize);
DECLARE_FIELD_RETURN(jf_height, jc_Dimension, "height", "I", NSZeroSize);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1081,6 +1081,7 @@ - (id)accessibilityHitTest:(NSPoint)point
{
JNIEnv* env = [ThreadUtilities getJNIEnv];

GET_CACCESSIBILITY_CLASS_RETURN(nil);
DECLARE_CLASS_RETURN(jc_Container, "java/awt/Container", nil);
DECLARE_STATIC_METHOD_RETURN(jm_accessibilityHitTest, sjc_CAccessibility, "accessibilityHitTest",
"(Ljava/awt/Container;FF)Ljavax/accessibility/Accessible;", nil);
Expand Down

9 comments on commit be40373

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@savoptik
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

backport 17u

@savoptik
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport 17u

@openjdk
Copy link

@openjdk openjdk bot commented on be40373 Sep 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@savoptik only OpenJDK contributors can use the /backport command

@forantar
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport 17u

@openjdk
Copy link

@openjdk openjdk bot commented on be40373 Sep 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@forantar the target repository 17u is not a valid target for backports.
List of valid target repositories: openjdk/jdk11u, openjdk/jdk11u-dev, openjdk/jdk12u, openjdk/jdk13u, openjdk/jdk13u-dev, openjdk/jdk14u, openjdk/jdk15u, openjdk/jdk15u-dev, openjdk/jdk16u, openjdk/jdk17u.
Supplying the organization/group prefix is optional.

@forantar
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u

@openjdk
Copy link

@openjdk openjdk bot commented on be40373 Sep 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@forantar could not automatically backport be403737 to Optional[openjdk/jdk17u] due to conflicts in the following files:

  • src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m

To manually resolve these conflicts run the following commands in your personal fork of Optional[openjdk/jdk17u]:

$ git checkout -b forantar-backport-be403737
$ git fetch --no-tags https://git.openjdk.java.net/jdk be4037374520917d5a0ed54eebb3d5d6d100d429
$ git cherry-pick --no-commit be4037374520917d5a0ed54eebb3d5d6d100d429
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport be4037374520917d5a0ed54eebb3d5d6d100d429'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the Optional[openjdk/jdk17u] with the title Backport be4037374520917d5a0ed54eebb3d5d6d100d429.

@forantar
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

backport PR: openjdk/jdk17u#120

Please sign in to comment.