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

JDK-8310681: Update WebKit to 616.1 #1180

Closed

Conversation

HimaBinduMeda
Copy link
Contributor

@HimaBinduMeda HimaBinduMeda commented Jul 20, 2023

Updated JavaFX Webkit to GTK WebKit 2.40 (616.1).
Verified the updated version build, sanity tests and stability. No issues have been observed.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jfx.git pull/1180/head:pull/1180
$ git checkout pull/1180

Update a local copy of the PR:
$ git checkout pull/1180
$ git pull https://git.openjdk.org/jfx.git pull/1180/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1180

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/1180.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 20, 2023

👋 Welcome back hmeda! 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 Ready for review label Jul 20, 2023
@kevinrushforth
Copy link
Member

/reviewers 2

@openjdk
Copy link

openjdk bot commented Jul 20, 2023

@kevinrushforth
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

@mlbridge
Copy link

mlbridge bot commented Jul 20, 2023

Webrevs

@kevinrushforth
Copy link
Member

I have two questions. Because of the large number of files, I can't use the "diffs" view to add inline comments, so I will add them as general comments.

@kevinrushforth
Copy link
Member

--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/Element.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/Element.cpp
@@ -2295,8 +2295,11 @@ URL Element::absoluteLinkURL() const

     if (linkAttribute.isEmpty())
         return URL();
-
+#if PLATFORM(JAVA)
+    return document().completeURL(linkAttribute);
+#else
     return document().completeURL(stripLeadingAndTrailingHTMLSpaces(linkAttribute));
+#endif
 }

 #if ENABLE(TOUCH_EVENTS)

Why did we need to make this change? Will there be any problems as a result of our not stripping leading and trailing spaces?

@kevinrushforth
Copy link
Member

--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/FullscreenManager.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/FullscreenManager.cpp
@@ -389,6 +389,132 @@ void FullscreenManager::exitFullscreen(RefPtr<DeferredPromise>&& promise)
     });
 }

+#if PLATFORM(JAVA)
+void FullscreenManager::exitFullscreen()
+{
...
+}
+
+void FullscreenManager::pushFullscreenElementStack(Element& element)
+{
+    m_fullscreenElementStack.append(&element);
+}
+#endif

Is this new code or was it moved / refactored from elsewhere? If new code, what is its purpose, and who is calling it?

@jaybhaskar
Copy link
Member

jaybhaskar commented Jul 21, 2023

Is this new code or was it moved / refactored from elsewhere? If new code, what is its purpose, and who is calling it?

It was taken from last webkit update, as it was giving undefined reference error for current webkit update.

@jaybhaskar
Copy link
Member

jaybhaskar commented Jul 21, 2023

--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/Element.cpp
+++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/Element.cpp
@@ -2295,8 +2295,11 @@ URL Element::absoluteLinkURL() const

     if (linkAttribute.isEmpty())
         return URL();
-
+#if PLATFORM(JAVA)
+    return document().completeURL(linkAttribute);
+#else
     return document().completeURL(stripLeadingAndTrailingHTMLSpaces(linkAttribute));
+#endif
 }

 #if ENABLE(TOUCH_EVENTS)

Why did we need to make this change? Will there be any problems as a result of our not stripping leading and trailing spaces?

The code is taken from the WebKit upstream main. Please find commit link as WebKit/WebKit@ea527fa

@kevinrushforth
Copy link
Member

Oh, I see that now. What led me to ask this question was that there is an alternative implementation in #if PLATFORM(JAVA), which implies that we removed the call to stripLeadingAndTrailingHTMLSpaces and that it is still present in the upstream.

Given that this code block now matches the upstream, the if..else..endif block should simply be replaced with:

    return document().completeURL(linkAttribute);

removing the #if PLATFORM(JAVA) and the entire #else block (including the old call to stripLeadingAndTrailingHTMLSpaces). Otherwise it will be confusing and possibly lead to merge conflicts later.

@kevinrushforth
Copy link
Member

You can include this in the next "cherry-pick" update, if you prefer.

@HimaBinduMeda
Copy link
Contributor Author

You can include this in the next "cherry-pick" update, if you prefer.

You can include this in the next "cherry-pick" update, if you prefer.

Noted. This change would be included as part of next Cherry-pick update

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

Looks good. Testing is green.

@kevinrushforth
Copy link
Member

@johanvos or @tiainen Can one you be the second reviewer?

@yososs
Copy link

yososs commented Jul 23, 2023

I found a change to turn off DFGJIT by default, is this a fix for some problem?

modules/javafx.web/src/main/java/com/sun/webkit/WebPage.java

@johanvos
Copy link
Collaborator

Oh, I see that now. What led me to ask this question was that there is an alternative implementation in #if PLATFORM(JAVA), which implies that we removed the call to stripLeadingAndTrailingHTMLSpaces and that it is still present in the upstream.

Given that this code block now matches the upstream, the if..else..endif block should simply be replaced with:

    return document().completeURL(linkAttribute);

removing the #if PLATFORM(JAVA) and the entire #else block (including the old call to stripLeadingAndTrailingHTMLSpaces). Otherwise it will be confusing and possibly lead to merge conflicts later.

I agree with this. Is there a reason this can't be done in the current PR?

@jaybhaskar
Copy link
Member

I found a change to turn off DFGJIT by default, is this a fix for some problem?

modules/javafx.web/src/main/java/com/sun/webkit/WebPage.java

The Change is required, as it is making issues with complex js code written for a website.

@jaybhaskar
Copy link
Member

absoluteLinkURL

Agree

@jaybhaskar
Copy link
Member

Oh, I see that now. What led me to ask this question was that there is an alternative implementation in #if PLATFORM(JAVA), which implies that we removed the call to stripLeadingAndTrailingHTMLSpaces and that it is still present in the upstream.
Given that this code block now matches the upstream, the if..else..endif block should simply be replaced with:

    return document().completeURL(linkAttribute);

removing the #if PLATFORM(JAVA) and the entire #else block (including the old call to stripLeadingAndTrailingHTMLSpaces). Otherwise it will be confusing and possibly lead to merge conflicts later.

I agree with this. Is there a reason this can't be done in the current PR?

I agree, we will apply the suggestion.

@HimaBinduMeda
Copy link
Contributor Author

Oh, I see that now. What led me to ask this question was that there is an alternative implementation in #if PLATFORM(JAVA), which implies that we removed the call to stripLeadingAndTrailingHTMLSpaces and that it is still present in the upstream.
Given that this code block now matches the upstream, the if..else..endif block should simply be replaced with:

    return document().completeURL(linkAttribute);

removing the #if PLATFORM(JAVA) and the entire #else block (including the old call to stripLeadingAndTrailingHTMLSpaces). Otherwise it will be confusing and possibly lead to merge conflicts later.

I agree with this. Is there a reason this can't be done in the current PR?

Pushed the change.

Copy link
Collaborator

@tiainen tiainen left a comment

Choose a reason for hiding this comment

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

After upgrading our version of python from 3.7 to 3.8 all builds and tests completed successfully.

@openjdk
Copy link

openjdk bot commented Jul 28, 2023

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

8310681: Update WebKit to 616.1

Reviewed-by: kcr, sykora

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

  • b323db2: 8313227: Correct attenuation indicator for removed lights
  • cc57fb5: 8312528: Move Subscription interface from javafx.beans to javafx.util
  • 600cee7: 8285700: [TreeTableView] graphic property of TreeItem is still visible after collapsing tree

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 Ready to be integrated label Jul 28, 2023
@HimaBinduMeda
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jul 28, 2023

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

  • b323db2: 8313227: Correct attenuation indicator for removed lights
  • cc57fb5: 8312528: Move Subscription interface from javafx.beans to javafx.util
  • 600cee7: 8285700: [TreeTableView] graphic property of TreeItem is still visible after collapsing tree

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 28, 2023
@openjdk openjdk bot closed this Jul 28, 2023
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review labels Jul 28, 2023
@openjdk
Copy link

openjdk bot commented Jul 28, 2023

@HimaBinduMeda Pushed as commit 2dc699a.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
6 participants