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

8268849: Update to 612.1 version of WebKit #560

Closed
wants to merge 4 commits into from

Conversation

arapte
Copy link
Member

@arapte arapte commented Jul 1, 2021

Update JavaFX WebKit to GTK WebKit 2.32 (612.1).
There are two separate commits:

  1. commit : includes only native changes
  2. commit : includes non native changes

This is change is targeted for JavaFX 18, shall be integrated after fork.

/reviewers 2
/contributor add arun-Joseph


Progress

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

Issue

Reviewers

Contributors

  • Arun Joseph <ajoseph@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 560

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 1, 2021

👋 Welcome back arapte! 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
Copy link

@openjdk openjdk bot commented Jul 1, 2021

@arapte
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

@arapte arapte changed the title [WIP] 8268849: Update to 612.1 version of WebKit 8268849: Update to 612.1 version of WebKit Jul 1, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 1, 2021

@arapte Could not parse arun-Joseph as a valid contributor.
Syntax: /contributor (add|remove) [@user | openjdk-user | Full Name <email@address>]. For example:

  • /contributor add @openjdk-bot
  • /contributor add duke
  • /contributor add J. Duke <duke@openjdk.org>

@openjdk openjdk bot added the rfr label Jul 1, 2021
@arapte
Copy link
Member Author

@arapte arapte commented Jul 1, 2021

/contributor add ajoseph

@openjdk
Copy link

@openjdk openjdk bot commented Jul 1, 2021

@arapte
Contributor Arun Joseph <ajoseph@openjdk.org> successfully added.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 1, 2021

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

The WebKit 612.1 update looks good. I did a full build and test on all three platforms, including lots of manual testing with HelloWebView. No problems found.

I left a couple minor test comments, but they can be handled as follow-up P4 test bugs.

NOTE: this cannot be integrated until after the jfx17 fork next Thursday (scheduled for 16:00 UTC).

//
// check the title update
//
Copy link
Member

@kevinrushforth kevinrushforth Jul 1, 2021

Choose a reason for hiding this comment

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

Since this uses a listener to read the title property, why did this check need to be removed? We might want to file a P4 test bug to look into adding it back in. To that end, do you think it is better to comment this block of code out rather than delete it?

Copy link
Member Author

@arapte arapte Jul 6, 2021

Choose a reason for hiding this comment

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

I have reverted this change and commented the test and created JDK-8269912 to investigate test.

if (currentUrl == "about:blank") {
assertNull("WebEngine.title should be null", web.getTitle());
} else {
assertNotNull("WebEngine.title should be set", web.getTitle());
Copy link
Member

@kevinrushforth kevinrushforth Jul 1, 2021

Choose a reason for hiding this comment

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

Similar to the comment I made in HistoryTest, is it worth filing a P4 test bug to look at converting this to use a listener? If so, then leaving this in, but commented out might be a good idea.

Copy link
Member Author

@arapte arapte Jul 6, 2021

Choose a reason for hiding this comment

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

I have reverted this change and commented the code and created JDK-8269912 to investigate test.

@kevinrushforth kevinrushforth self-requested a review Jul 6, 2021
Copy link
Member

@kevinrushforth kevinrushforth left a comment

Updated test changes look good.

Copy link
Collaborator

@johanvos johanvos left a comment

Works with the required toolchains

@openjdk
Copy link

@openjdk openjdk bot commented Jul 14, 2021

@arapte 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:

8268849: Update to 612.1 version of WebKit

Co-authored-by: Arun Joseph <ajoseph@openjdk.org>
Reviewed-by: kcr, jvos

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

  • a34928f: 8269968: [REDO] Bump minimum version of macOS for x64 to 10.12
  • 00b353e: 8269967: JavaFX should fail fast on macOS below minimum version
  • 0c98d96: 8268718: [macos] Video stops, but audio continues to play when stopTime is reached
  • 787506f: 8269597: Change JavaFX release version to 18
  • 386f6d7: 8223717: javafx printing: Support Specifying Print to File in the API
  • 6fe427f: 8266743: Crash on macOS 10.11 due to ignored @available 10.12 check
  • 52c076c: 8269131: Update libxml2 to version 2.9.12
  • 47c2ec3: 8187229: Tree/TableCell: cancel event must return correct editing location
  • 0e7cf62: 8185447: The special high-contrast mode of JavaFX Controls in Japanese environment do not work.
  • 6403d67: 8231558: [macos] Platform.exit causes assertion error on macOS 10.15 or later
  • ... and 3 more: https://git.openjdk.java.net/jfx/compare/a1be1d591c0bf0bc118ffb8a4d1c4c8cc236b689...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 label Jul 14, 2021
@arapte
Copy link
Member Author

@arapte arapte commented Jul 14, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jul 14, 2021

Going to push as commit 948df32.
Since your change was applied there have been 13 commits pushed to the master branch:

  • a34928f: 8269968: [REDO] Bump minimum version of macOS for x64 to 10.12
  • 00b353e: 8269967: JavaFX should fail fast on macOS below minimum version
  • 0c98d96: 8268718: [macos] Video stops, but audio continues to play when stopTime is reached
  • 787506f: 8269597: Change JavaFX release version to 18
  • 386f6d7: 8223717: javafx printing: Support Specifying Print to File in the API
  • 6fe427f: 8266743: Crash on macOS 10.11 due to ignored @available 10.12 check
  • 52c076c: 8269131: Update libxml2 to version 2.9.12
  • 47c2ec3: 8187229: Tree/TableCell: cancel event must return correct editing location
  • 0e7cf62: 8185447: The special high-contrast mode of JavaFX Controls in Japanese environment do not work.
  • 6403d67: 8231558: [macos] Platform.exit causes assertion error on macOS 10.15 or later
  • ... and 3 more: https://git.openjdk.java.net/jfx/compare/a1be1d591c0bf0bc118ffb8a4d1c4c8cc236b689...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 14, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jul 14, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 14, 2021

@arapte Pushed as commit 948df32.

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

@arapte arapte deleted the webkit_upgrade_612.1 branch May 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated
3 participants