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
8285881: Update WebKit to 614.1 #109
Conversation
Co-authored-by: Ambarish Rapte <arapte@openjdk.org> Co-authored-by: Kevin Rushforth <kcr@openjdk.org> Co-authored-by: Jay Bhaskar <jbhaskar@openjdk.org> Reviewed-by: kcr, arapte, mstrauss, jvos
👋 Welcome back arapte! A progress list of the required criteria for merging this PR into |
This backport pull request has now been updated with issue from the original commit. |
@kevinrushforth |
@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:
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 no new commits pushed to the ➡️ To integrate this PR with the above commit message to the |
@arapte This pull request will be automatically integrated when it is ready |
/integrate |
Going to push as commit 4bd6877. |
Odd that Skara marked this as clean given that there was a (trivial) merge conflict that had to be resolved. I plan to file a bug against Skara. |
This is almost a clean backport, except a small conflict in a test file
LoadTest.java
.The conflict was because fix for JDK-8253696 is not backported to jfx11u.
A test
testLoadLocalCSS()
was added as part of fix for JDK-8253696, which is not present in jfx11u.No other conflict were observed.
/integrate auto
Progress
Issue
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jfx11u pull/109/head:pull/109
$ git checkout pull/109
Update a local copy of the PR:
$ git checkout pull/109
$ git pull https://git.openjdk.org/jfx11u pull/109/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 109
View PR using the GUI difftool:
$ git pr show -t 109
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jfx11u/pull/109.diff