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 #3

Closed

Conversation

kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Sep 13, 2021

Clean backport to jfx17u. This has been tested on all platforms along with other pending fixes in the test-kcr-17.0.1 branch.


Progress

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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3

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

Using diff file

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

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

bridgekeeper bot commented Sep 13, 2021

👋 Welcome back kcr! 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 changed the title Backport 948df32448b71c4d6c10ccc4c125170dc68b0786 8268849: Update to 612.1 version of WebKit Sep 13, 2021
@openjdk
Copy link

openjdk bot commented Sep 13, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Sep 13, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 13, 2021

Webrevs

@kevinrushforth
Copy link
Member Author

For some reason, Skara didn't mark this as clean, so it needs a (sanity) review.

@arapte Can you review?

@arapte
Copy link
Member

arapte commented Sep 15, 2021

If we compare modules/javafx.web/src/main/native/Source of this repo with that of mainline webkit update revision. There are only differences of copyright year. jfx17 files have 2021 in copyright year.

@openjdk
Copy link

openjdk bot commented Sep 15, 2021

@kevinrushforth 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

Reviewed-by: arapte

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

  • 62355c9: 8273324: IllegalArgumentException: fromIndex(0) > toIndex(-1) after clear and select TableCell
  • ff4a625: 8273138: BidirectionalBinding fails to observe changes of invalid properties
  • 3c6596b: 8268718: [macos] Video stops, but audio continues to play when stopTime is reached
  • d7c612f: 8273279: Change JavaFX release version in jfx17u to 17.0.1
  • d0f52c4: 8273280: Update README.md and CONTRIBUTING.md for jfx17u

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 Sep 15, 2021
@kevinrushforth
Copy link
Member Author

Thanks for the review and the sanity check.

There are only differences of copyright year. jfx17 files have 2021 in copyright year.

Right. The copyright updates in the jfx:master branch were done subsequent to this. Once I have backported the remaining two webkit fixes, the HEAD of jfx17u:master and jfx:master should be identical for the native webkit sources.

@kevinrushforth
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 15, 2021

Going to push as commit 092c20b.
Since your change was applied there have been 5 commits pushed to the master branch:

  • 62355c9: 8273324: IllegalArgumentException: fromIndex(0) > toIndex(-1) after clear and select TableCell
  • ff4a625: 8273138: BidirectionalBinding fails to observe changes of invalid properties
  • 3c6596b: 8268718: [macos] Video stops, but audio continues to play when stopTime is reached
  • d7c612f: 8273279: Change JavaFX release version in jfx17u to 17.0.1
  • d0f52c4: 8273280: Update README.md and CONTRIBUTING.md for jfx17u

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 15, 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 Sep 15, 2021
@openjdk
Copy link

openjdk bot commented Sep 15, 2021

@kevinrushforth Pushed as commit 092c20b.

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

@kevinrushforth kevinrushforth deleted the 8268849-webkit-612.1 branch September 15, 2021 21:19
abhinayagarwal pushed a commit to abhinayagarwal/jfx17u that referenced this pull request Jan 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants