Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8267066: New NSAccessibility peers should return they roles and subroles directly #1807

Closed
wants to merge 3 commits into from

Conversation

Autumn808
Copy link
Contributor

@Autumn808 Autumn808 commented Mar 16, 2023

This backport is part of the 28 backport Accessibility series JDK-8152350. Tested by building GUI and using the Accessibility components.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8267066: New NSAccessibility peers should return they roles and subroles directly

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/1807/head:pull/1807
$ git checkout pull/1807

Update a local copy of the PR:
$ git checkout pull/1807
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/1807/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1807

View PR using the GUI difftool:
$ git pr show -t 1807

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1807.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 16, 2023

👋 Welcome back Autumn808! A progress list of the required criteria for merging this PR into pr/1806 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport JDK-8267066 8267066: New NSAccessibility peers should return they roles and subroles directly Mar 16, 2023
@openjdk
Copy link

openjdk bot commented Mar 16, 2023

This backport pull request has now been updated with the original issue, but not the original commit. If you have the original commit hash, please update the pull request title with Backport <hash>.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Mar 16, 2023
@mlbridge
Copy link

mlbridge bot commented Mar 16, 2023

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Because 8262981 hasn't yet been backported, this PR adds an updated-to-8267066 version of SliderAccessibilty.h and leaves out the change to a not-yet-existent SliderAccessibility.m. This is imo fine, but note that the eventual 8262981 backport will have to take into account this PR's creation of SliderAccessibility.h.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1806 to master March 16, 2023 21:56
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8267066
git fetch https://git.openjdk.org/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Mar 16, 2023

@Autumn808 this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8267066
git fetch https://git.openjdk.org/jdk11u-dev master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Mar 16, 2023
@openjdk
Copy link

openjdk bot commented Mar 17, 2023

@Autumn808 Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk
Copy link

openjdk bot commented Mar 17, 2023

⚠️ @Autumn808 the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout JDK-8267066
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

@openjdk
Copy link

openjdk bot commented Mar 17, 2023

@Autumn808 This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8267066: New NSAccessibility peers should return they roles and subroles directly

Reviewed-by: phh

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 14 new commits pushed to the master branch:

  • bb2e0d8: 8305528: [11u] Backport of JDK-8259530 breaks build with JDK10 bootstrap VM
  • 3c8c45e: 8259530: Generated docs contain MIT/GPL-licenced works without reproducing the licence
  • 6dedd8a: 8291638: Keep-Alive timeout of 0 should close connection immediately
  • 00b7647: 8275721: Name of UTC timezone in a locale changes depending on previous code
  • 835f2ca: 8291226: Create Test Cases to cover scenarios for JDK-8278067
  • d8993e6: 8291637: HttpClient default keep alive timeout not followed if server sends invalid value
  • e12516d: 8303102: jcmd: ManagementAgent.status truncates the text longer than O_BUFLEN
  • 88434e5: 8227257: javax/swing/JFileChooser/4847375/bug4847375.java fails with AssertionError
  • 75fb8a9: 8301170: perfMemory_windows.cpp add free_security_attr to early returns
  • 386addf: 8215575: C2 crash: assert(get_instanceKlass()->is_loaded()) failed: must be at least loaded
  • ... and 4 more: https://git.openjdk.org/jdk11u-dev/compare/1ab869358a9747291465130ca8a476a2f7893d40...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Mar 17, 2023
@RealCLanger
Copy link
Contributor

@Autumn808, could you rebase it to current master? Meanwhile 8264290 was integrated and changes to e.g. src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/GroupAccessibility.m would look different then, I guess.

@Autumn808
Copy link
Contributor Author

@Autumn808, could you rebase it to current master? Meanwhile 8264290 was integrated and changes to e.g. src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/GroupAccessibility.m would look different then, I guess.

Will do, Thank you

@openjdk
Copy link

openjdk bot commented Mar 17, 2023

@Autumn808 Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@Autumn808
Copy link
Contributor Author

@Autumn808, could you rebase it to current master? Meanwhile 8264290 was integrated and changes to e.g. src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/GroupAccessibility.m would look different then, I guess.

It should be rebased now.

@RealCLanger
Copy link
Contributor

@Autumn808, could you rebase it to current master? Meanwhile 8264290 was integrated and changes to e.g. src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/GroupAccessibility.m would look different then, I guess.

It should be rebased now.

Hm, it isn't. Your branch https://github.com/Autumn808/jdk11u-dev/commits/JDK-8267066 is lacking the latest 8 or so commits. Especially dd64212 and 8264304: Create implementation for NSAccessibilityToolbar protocol peer are missing.

You should fetch 1ab8693 and rebase to that commit.

Anyway, I'm wondering why GitHub does not show a merge conflict here.

@openjdk
Copy link

openjdk bot commented Mar 17, 2023

@Autumn808 Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@RealCLanger
Copy link
Contributor

OK, this looks better now.
However, I'm missing the hunks in the following files, compared to the original change:

src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/GroupAccessibility.h
src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/GroupAccessibility.m

src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/SliderAccessibility.h
src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/SliderAccessibility.m

src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/StaticTextAccessibility.h
src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/StaticTextAccessibility.m

src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/ToolbarAccessibility.h
src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/ToolbarAccessibility.m

Regarding SliderAccessibility, I guess we need to backport the native parts of JDK-8262981 first. For that, would you mind reviewing my PR #1811?

@Autumn808
Copy link
Contributor Author

OK, this looks better now. However, I'm missing the hunks in the following files, compared to the original change:

src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/GroupAccessibility.h src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/GroupAccessibility.m

src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/SliderAccessibility.h src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/SliderAccessibility.m

src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/StaticTextAccessibility.h src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/StaticTextAccessibility.m

src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/ToolbarAccessibility.h src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/ToolbarAccessibility.m

Regarding SliderAccessibility, I guess we need to backport the native parts of JDK-8262981 first. For that, would you mind reviewing my PR #1811?

Will take a look, Thank you

@RealCLanger
Copy link
Contributor

You could make this a dependent PR of #1811 (until that one is in)

@Autumn808 Autumn808 changed the base branch from master to pr/1811 March 17, 2023 20:26
@Autumn808
Copy link
Contributor Author

You could make this a dependent PR of #1811 (until that one is in)

I updated the PR to use 1811. Thank you for working on this and for your help.

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated merge-conflict Pull request has merge conflict with target branch labels Mar 17, 2023
@openjdk
Copy link

openjdk bot commented Apr 3, 2023

⚠️ @Autumn808 This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Apr 3, 2023
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1811 to master April 13, 2023 09:44
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has been closed without being integrated and the target branch of this pull request has been updated as the previous branch was deleted. This means that changes from the parent pull request will start to show up in this pull request. If closing the parent pull request was done in error, it will need to be re-opened and this pull request will need to manually be retargeted again.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Apr 13, 2023
@bridgekeeper
Copy link

bridgekeeper bot commented May 11, 2023

@Autumn808 This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 8, 2023

@Autumn808 This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

@bridgekeeper bridgekeeper bot closed this Jun 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport ready Pull request is ready to be integrated rfr Pull request is ready for review
3 participants