[jdk11u-dev] RFR: 8267066: New NSAccessibility peers should return they roles and subroles directly [v3]

Fri Mar 17 18:43:07 UTC 2023

On Fri, 17 Mar 2023 18:08:12 GMT, Autumn Capasso <duke at openjdk.org> wrote:

> > @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 https://github.com/openjdk/jdk11u-dev/commit/dd6421231d05b5e1e70a1bc0c9df613bb55c8947 and [8264304: Create implementation for NSAccessibilityToolbar protocol peer](https://github.com/openjdk/jdk11u-dev/commit/41ad04794edd5e6b00e0beb1604d34edfbc3ff81) are missing.

You should fetch https://github.com/openjdk/jdk11u-dev/commit/1ab869358a9747291465130ca8a476a2f7893d40 and rebase to that commit.

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

-------------

PR: https://git.openjdk.org/jdk11u-dev/pull/1807