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

8259635: Update to 610.2 version of WebKit #382

Closed
wants to merge 2 commits into from

Conversation

@arun-Joseph
Copy link
Member

@arun-Joseph arun-Joseph commented Jan 21, 2021

Update JavaFX WebKit to GTK WebKit 2.30 (610.2)


Progress

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

Issue

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jfx pull/382/head:pull/382
$ git checkout pull/382

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 21, 2021

👋 Welcome back ajoseph! 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 label Jan 21, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 21, 2021

Webrevs

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Jan 21, 2021

/reviewers 3

@openjdk
Copy link

@openjdk openjdk bot commented Jan 21, 2021

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

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Jan 21, 2021

I reviewed all of the changes outside modules/javafx.web/src/main/native/. Most look related to the change to use the Prism Color object instead of an int. I did have a question about one of those changes:

modules/javafx.web/src/main/java/com/sun/webkit/plugin/DefaultPlugin.java
-        g.fillRect(x, y, w, h, 0x11aaffff);
+        g.fillRect(x, y, w, h, new Color(0.33f, 1.0f, 1.0f, 0.1f));

These are not equivalent colors. Is this intentional?

@arun-Joseph
Copy link
Member Author

@arun-Joseph arun-Joseph commented Jan 21, 2021

It should be new Color(2 / 3.0f, 1.0f, 1.0f, 1 / 15.0f). I'll update the PR.

@johanvos
Copy link
Collaborator

@johanvos johanvos commented Jan 21, 2021

Build and tests pass on windows/linux/mac in our CI.

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good. Build + automated tests passed on all three platforms. I ran into one manual test issue related to input events on Linux only. I'll file a follow-on bug for that.

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Jan 21, 2021

I filed JDK-8260257 to track the Linux input event issue.

@guruhb
guruhb approved these changes Jan 23, 2021
Copy link
Collaborator

@guruhb guruhb left a comment

Changes looks good to me. Did a local build on all three Platform and sanity test by loading top 10 websites loaded without any deviation from old build.

@openjdk
Copy link

@openjdk openjdk bot commented Jan 29, 2021

@arun-Joseph 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:

8259635: Update to 610.2 version of WebKit

Reviewed-by: kcr, ghb, 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 1 new commit pushed to the master branch:

  • 6c1a0ca: 8228363: ContextMenu.show with side=TOP does not work the first time in the presence of CSS

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 label Jan 29, 2021
@arun-Joseph
Copy link
Member Author

@arun-Joseph arun-Joseph commented Jan 29, 2021

/integrate

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

@openjdk openjdk bot commented Jan 29, 2021

@arun-Joseph Since your change was applied there has been 1 commit pushed to the master branch:

  • 6c1a0ca: 8228363: ContextMenu.show with side=TOP does not work the first time in the presence of CSS

Your commit was automatically rebased without conflicts.

Pushed as commit b0a404d.

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

@arun-Joseph arun-Joseph deleted the arun-Joseph:8259635 branch Jan 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants