Skip to content

Conversation

@prrace
Copy link
Contributor

@prrace prrace commented May 18, 2021

See the bug report for lots of explanation.
The short version (not that short) is that Swing adds a new line char to editable TextComponents
It used to work because harfbuzz asked CoreText which mapped it to an invisible glyph
Now harfbuzz does its own processing of AAT fonts it is different.
Harfbuzz looks up the mapping for this but there is none so it gets a missing glyph.

Solution: Since HB now does AAT processing we can dispense with all the special handling of that case
and core text and just treat AAT fonts like OT fonts.
This means its gets the same mapping we get when not using Layout.

And the test passes on all platforms .. not just macOS ..


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8256372: [macos] Unexpected symbol was displayed on JTextField with Monospaced font

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4097/head:pull/4097
$ git checkout pull/4097

Update a local copy of the PR:
$ git checkout pull/4097
$ git pull https://git.openjdk.java.net/jdk pull/4097/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4097

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4097.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 18, 2021

👋 Welcome back prr! A progress list of the required criteria for merging this PR into master 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 added the rfr Pull request is ready for review label May 18, 2021
@openjdk
Copy link

openjdk bot commented May 18, 2021

@prrace The following labels will be automatically applied to this pull request:

  • 2d
  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added 2d client-libs-dev@openjdk.org build build-dev@openjdk.org labels May 18, 2021
@mlbridge
Copy link

mlbridge bot commented May 18, 2021

Webrevs

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

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

Build changes look ok.

@openjdk
Copy link

openjdk bot commented May 18, 2021

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8256372: [macos] Unexpected symbol was displayed on JTextField with Monospaced font

Reviewed-by: erikj, serb

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 52 new commits pushed to the master branch:

  • 81f39ed: 8261205: AssertionError: Cannot add metadata to an intersection type
  • 7b98400: 8267348: Rewrite gc/epsilon/TestClasses.java to use Metaspace with less classes
  • ca93399: 8267235: [macos_aarch64] InterpreterRuntime::throw_pending_exception messing up LR results in crash
  • b7b6acd: 8267481: Make sure table row has correct number of cells
  • f67847f: 8267396: Avoid recording "pc" in unhandled oops detector for better performance
  • 878d1b3: 8267434: Remove LinkOutput[Impl]
  • fc7f0a3: 8267480: Explicitly problemlist all runtime/os/TestTracePageSizes.java tests on linux-aarch64 to reduce noise
  • 9425d3d: 8261880: Change nested classes in java.base to static nested classes where possible
  • 459abd5: 8267219: Javadoc method summary breaks when {@inheritdoc} from an empty parent
  • aba2265: 8260267: ZGC: Reduce mark stack usage
  • ... and 42 more: https://git.openjdk.java.net/jdk/compare/fadf58043c10e4fd98dfdb35256f5efc6d3cd366...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 18, 2021
@@ -1,1196 +0,0 @@
/*
Copy link
Member

Choose a reason for hiding this comment

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

How we will track these files for the next HB update? Do we need to document it somehow? otherwise, I think it will be added again as a new files.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, they won't. We already pull in only the files we need, not every file, so this is not a precedent.

@prrace
Copy link
Contributor Author

prrace commented May 20, 2021

/integrate

@openjdk openjdk bot closed this May 20, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 20, 2021
@openjdk
Copy link

openjdk bot commented May 20, 2021

@prrace Since your change was applied there have been 52 commits pushed to the master branch:

  • 81f39ed: 8261205: AssertionError: Cannot add metadata to an intersection type
  • 7b98400: 8267348: Rewrite gc/epsilon/TestClasses.java to use Metaspace with less classes
  • ca93399: 8267235: [macos_aarch64] InterpreterRuntime::throw_pending_exception messing up LR results in crash
  • b7b6acd: 8267481: Make sure table row has correct number of cells
  • f67847f: 8267396: Avoid recording "pc" in unhandled oops detector for better performance
  • 878d1b3: 8267434: Remove LinkOutput[Impl]
  • fc7f0a3: 8267480: Explicitly problemlist all runtime/os/TestTracePageSizes.java tests on linux-aarch64 to reduce noise
  • 9425d3d: 8261880: Change nested classes in java.base to static nested classes where possible
  • 459abd5: 8267219: Javadoc method summary breaks when {@inheritdoc} from an empty parent
  • aba2265: 8260267: ZGC: Reduce mark stack usage
  • ... and 42 more: https://git.openjdk.java.net/jdk/compare/fadf58043c10e4fd98dfdb35256f5efc6d3cd366...master

Your commit was automatically rebased without conflicts.

Pushed as commit 005d8a7.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2d client-libs-dev@openjdk.org build build-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants