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

Closed

Conversation

kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Aug 17, 2021

Nearly clean backport of third-party update to WebKit 612.1. There was one minor conflict in one unit test file due to difference in context.

As an FYI, I tested this patch in my test-kcr-11.0.13 branch, which has the aggregate set of patches for the following bugs: JDK-8211308, JDK-8268915, JDK-8269147, JDK-8269131, JDK-8268849, JDK-8270479, JDK-8272329.


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/jfx11u pull/34/head:pull/34
$ git checkout pull/34

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 34

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

Using diff file

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

Co-authored-by: Arun Joseph <ajoseph@openjdk.org>
Reviewed-by: kcr, jvos
@kevinrushforth kevinrushforth requested a review from johanvos Aug 17, 2021
@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented Aug 17, 2021

Reviewers: @arapte @johanvos

/reviewers 2

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 17, 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 Aug 17, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 17, 2021

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

@openjdk openjdk bot added the backport label Aug 17, 2021
@openjdk openjdk bot added the rfr label Aug 17, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 17, 2021

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

@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 17, 2021

Webrevs

@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented Aug 17, 2021

There are two follow-on issues that depend on this one, each of which has a Draft PR out for review: PR #35 and PR #36. As soon as this PR is ready, I will update those two PRs with the latest master (including the commit for this PR) and make them rfr. Since they are clean backports, I will then integrate them right after that.

arapte
arapte approved these changes Aug 18, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 18, 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: jvos, 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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Aug 18, 2021
@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented Aug 18, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Aug 18, 2021

Going to push as commit 929b9c2.
Since your change was applied there have been 3 commits pushed to the master branch:

  • f930bc5: 8269131: Update libxml2 to version 2.9.12
  • 49ff8f6: 8269147: Update GStreamer to version 1.18.4
  • ebc5926: 8268915: WebKit build fails with Xcode 12.5

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Aug 18, 2021

@kevinrushforth Pushed as commit 929b9c2.

💡 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 Aug 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated
3 participants