JDK-8214119 : Update to 607.1 version of WebKit
  • Type: Bug
  • Component: javafx
  • Sub-Component: web
  • Affected Version: openjfx12
  • Priority: P2
  • Status: Resolved
  • Resolution: Fixed
  • Submitted: 2018-11-20
  • Updated: 2020-06-04
  • Resolved: 2018-12-21
The Version table provides details related to the release that this issue/RFE will be addressed.

Unresolved : Release in which this issue/RFE will be addressed.
Resolved: Release in which this issue/RFE has been resolved.
Fixed : Release in which this issue/RFE has been fixed. The release containing this fix may be available for download as an Early Access Release or a General Availability Release.

To download the current JDK release, click here.
JDK 8 Other
8u211Fixed openjdk8u212Fixed
Related Reports
Relates :  
Relates :  
Relates :  
This will update the JavaFX WebKit to the GTK WebKit 2.22.x[1].

[1] https://trac.webkit.org/wiki/WebKitGTK/2.22.x
+1 for 8u backport

+1 on the 8u backport.

[~kcr] [~mbilla], Please review the following 8u-bp changeset, http://cr.openjdk.java.net/~arajkumar/8214119/8u-bp/607.1.8u.changeset.gz It also contains changeset from JDK-8211399.

Changeset: ab4db0272524 Author: arajkumar Date: 2018-12-21 19:17 +0530 URL: http://hg.openjdk.java.net/openjfx/jfx-dev/rt/rev/ab4db0272524 8214119: Update to 607.1 version of WebKit Reviewed-by: kcr, mbilla


The additional patch looks fine. +1

[~kcr], [~mbilla], On top of this, I would like to add one more change which I recently did to resolve 32-bit Windows build on 8u-dev patch. This fix is based on https://bugs.webkit.org/show_bug.cgi?id=185989. Please take a look. diff -r 6447be2b0640 -r ee9ea4cf4dbd modules/javafx.web/src/main/native/Source/cmake/OptionsJava.cmake --- a/modules/javafx.web/src/main/native/Source/cmake/OptionsJava.cmake Wed Dec 19 15:30:19 2018 +0530 +++ b/modules/javafx.web/src/main/native/Source/cmake/OptionsJava.cmake Thu Dec 20 17:04:20 2018 +0530 @@ -119,6 +119,10 @@ if (WIN32) # FIXME: Port bmalloc to Windows. https://bugs.webkit.org/show_bug.cgi?id=143310 WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PRIVATE ON) + # Disable 32-bit JIT on Windows. https://bugs.webkit.org/show_bug.cgi?id=185989 + if (${WTF_CPU_X86}) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PUBLIC OFF) + endif () endif ()

This patch works for me on linux, after applying https://github.com/javafxports/openjdk-jfx/pull/314 (required after updating gcc/libc). Hence, I think we merge that one first?

Please review the following patch which merges GTK WebKit 2.22(607.1) into jfx-dev: http://cr.openjdk.java.net/~arajkumar/8214119/webrev Above link has a webrev and a changeset file, 1. rt-non-native-webkit ��� Contains changes other than "modules/javafx.web/src/main/native", it will be useful _only_ for review, don���t apply the patch from it. 2. rt.changeset.gz ��� Actual changeset file in compressed format which contains all the changes from ���rt��� directory(including WebKit native changes), uncompress before using it(gunzip rt.changeset.gz) and do the following steps., $ hg clone http://hg.openjdk.java.net/openjfx/jfx-dev/rt $ cd rt $ hg import --no-commit rt.changeset #(from rt.changset.gz) This changeset requires the following versions of toolchains to build properly, * MSVC- 2017-15.5.5 or higher on Windows * GCC 7.3.0 or higher on Linux * Xcode 9.4 or higher on MacOS

The following files are modified by this patch, but still have an earlier copyright year than 2018: modules/javafx.web/src/main/native/Source/WTF/wtf/java/JavaEnv.cpp modules/javafx.web/src/main/native/Source/WebCore/bindings/java/JavaDOMUtils.cpp modules/javafx.web/src/main/native/Source/WebCore/bindings/java/JavaEventListener.cpp modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/BufferImageJava.h modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/FontPlatformDataJava.cpp modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/NativeImageJava.cpp modules/javafx.web/src/main/native/Source/WebCore/platform/java/ContextMenuClientJava.cpp modules/javafx.web/src/main/native/Source/WebCore/platform/java/PopupMenuJava.cpp modules/javafx.web/src/main/native/Source/WebCore/platform/java/RenderThemeJava.h modules/javafx.web/src/main/native/Source/WebCore/platform/java/WidgetJava.cpp modules/javafx.web/src/main/native/Source/WebCore/platform/network/java/ResourceRequest.h modules/javafx.web/src/main/native/Source/WebCore/platform/network/java/SocketStreamHandleImplJava.cpp modules/javafx.web/src/main/native/Tools/DumpRenderTree/java/EventSender.cpp If you end up needing to push after tomorrow, then please update the copyright year to 2018 for the above files (no need for a new webrev). Sanity testing looks good. +1