From 55b9d14bbded66ead2d0ca87f9e26104f4127094 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Wed, 2 Feb 2022 15:38:55 -0800 Subject: [PATCH] browser(webkit): revert r288284 (#11821) --- browser_patches/webkit/BUILD_NUMBER | 4 +-- browser_patches/webkit/patches/bootstrap.diff | 35 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 4113fbf991..3f73a39efc 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1608 -Changed: yurys@chromium.org Mon Jan 31 13:38:05 PST 2022 +1609 +Changed: yurys@chromium.org Wed 02 Feb 2022 03:31:54 PM PST diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index a66ec92774..437201cec7 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -19227,18 +19227,6 @@ index 0000000000000000000000000000000000000000..5cf8a010e9809e6a95741cdb7c2cbeb4 +} + +} // namespace WebKit -diff --git a/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp b/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp -index a86b34ddaa8f715e1c947b8943cefd92139c4130..69f3521277d317e942bfbdd3f6d14cb71d741307 100644 ---- a/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp -+++ b/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #endif - - namespace WebKit { diff --git a/Source/WebKit/UIProcess/wpe/InspectorTargetProxyWPE.cpp b/Source/WebKit/UIProcess/wpe/InspectorTargetProxyWPE.cpp new file mode 100644 index 0000000000000000000000000000000000000000..7453194ca6f032ba86a4c67f5bf12688ab6ec1be @@ -21307,10 +21295,10 @@ index 04869b0d67226fb9f7951298f32f952c94cb2837..6ceb1dafd51d4f34c2f20f4f44a1dd99 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) else () diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake -index 62b4bc6e91b180abe8ca0f749ce76bf1aba98d4d..89d9e16c7ca6ab3fa2ef7d695825437927755675 100644 +index 62b4bc6e91b180abe8ca0f749ce76bf1aba98d4d..23216d79747d514c53e965618d5bf7ade8beb659 100644 --- a/Source/cmake/OptionsWinCairo.cmake +++ b/Source/cmake/OptionsWinCairo.cmake -@@ -37,15 +37,36 @@ if (OpenJPEG_FOUND) +@@ -37,20 +37,42 @@ if (OpenJPEG_FOUND) endif () find_package(WOFF2 1.0.2 COMPONENTS dec) @@ -21350,6 +21338,25 @@ index 62b4bc6e91b180abe8ca0f749ce76bf1aba98d4d..89d9e16c7ca6ab3fa2ef7d6958254379 set(USE_ANGLE_EGL ON) set(USE_ANGLE_WEBGL ON) + SET_AND_EXPOSE_TO_BUILD(USE_ANGLE ON) + SET_AND_EXPOSE_TO_BUILD(USE_CAIRO ON) ++SET_AND_EXPOSE_TO_BUILD(USE_CF ON) + SET_AND_EXPOSE_TO_BUILD(USE_CURL ON) + SET_AND_EXPOSE_TO_BUILD(USE_GRAPHICS_LAYER_TEXTURE_MAPPER ON) + SET_AND_EXPOSE_TO_BUILD(USE_GRAPHICS_LAYER_WC ON) +@@ -67,11 +89,7 @@ SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE}) + + SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1) + +-# CoreFoundation is required when building WebKitLegacy +-if (ENABLE_WEBKIT_LEGACY) +- SET_AND_EXPOSE_TO_BUILD(USE_CF ON) +- set(COREFOUNDATION_LIBRARY CFlite) +-endif () ++set(COREFOUNDATION_LIBRARY CFlite) + + add_definitions(-DWTF_PLATFORM_WIN_CAIRO=1) + add_definitions(-DNOCRYPT) diff --git a/Tools/MiniBrowser/gtk/BrowserTab.c b/Tools/MiniBrowser/gtk/BrowserTab.c index 1c84f30b2ea96dd0c168918f9d63773b8e2548a3..55603437900a65de7bef70563c9ec0399c5f563c 100644 --- a/Tools/MiniBrowser/gtk/BrowserTab.c