browser(webkit): roll to ToT 4/22/2020 (#1940)

2020-04-23 10:34:31 -07:00 · 2020-04-23 10:34:31 -07:00 · fa59372248
parent 51ed5c5b4d
commit fa59372248
3 changed files with 68 additions and 80 deletions
--- a/browser_patches/webkit/BUILD_NUMBER
+++ b/browser_patches/webkit/BUILD_NUMBER
@ -1 +1 @@
-1206
+1207
--- a/browser_patches/webkit/UPSTREAM_CONFIG.sh
+++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh
@ -1,3 +1,3 @@
 REMOTE_URL="https://github.com/webkit/webkit"
 BASE_BRANCH="master"
-BASE_REVISION="1cbe0700df266f49b1dcef8c215b4c398ba94420"
+BASE_REVISION="46190f2de4ab3b12e0a807e9af6813e8b793bab8"
--- a/browser_patches/webkit/patches/bootstrap.diff
+++ b/browser_patches/webkit/patches/bootstrap.diff
@ -1411,7 +1411,7 @@ index 955756ba405f400970610f9a68c7ed42a67cb015..1520c0a1475a90de2795e4ccd8919c1b
                 builder.append(timeZoneName);
                 builder.append(')');
 diff --git a/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp b/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp
-index 2d133d63aebc4db87599c80dcbd0f10bf7a89d18..56fa6c7705ee8b644dfd5bee63ceb3c97e7375f3 100644
+index 90e959286a38523566f91113975b1c8175e556f1..31dbdc6f07f5b24ac8a01564f1b2433ea9172d83 100644
 --- a/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp
 +++ b/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp
@@ -38,6 +38,7 @@
@ -1422,7 +1422,7 @@ index 2d133d63aebc4db87599c80dcbd0f10bf7a89d18..56fa6c7705ee8b644dfd5bee63ceb3c9
 #include <wtf/text/StringBuilder.h>
 
 namespace JSC {
-@@ -112,6 +113,10 @@ static ALWAYS_INLINE bool isUTCEquivalent(StringView timeZone)
+@@ -114,6 +115,10 @@ static ALWAYS_INLINE bool isUTCEquivalent(StringView timeZone)
 // https://tc39.es/ecma402/#sec-defaulttimezone
 static String defaultTimeZone()
 {
@ -1570,7 +1570,7 @@ index cfd5d75cfdcaac5b51dae96045903d812c033b8a..9fca8b41989737608274a2cca8fb78be
 WTF_EXPORT_PRIVATE LocalTimeOffset calculateLocalTimeOffset(double utcInMilliseconds, TimeType = UTCTime);
 
 diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h
-index dcf5110f3d35887a9fa2c49e5ae53f644b5f7d79..c8715e484243bda7a0b930c37347b9c494259a74 100644
+index f08df873594f78f04903c7edf8dc4b3c67cfc415..ed4edb1b6c8f5129bd58e457529704ef27f63d19 100644
 --- a/Source/WTF/wtf/PlatformEnable.h
 +++ b/Source/WTF/wtf/PlatformEnable.h
@@ -403,7 +403,7 @@
@ -1583,7 +1583,7 @@ index dcf5110f3d35887a9fa2c49e5ae53f644b5f7d79..c8715e484243bda7a0b930c37347b9c4
 
 #if OS(WINDOWS)
 diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
-index abb74592fb0245fe0e1cf723ed60b7a12b4f26d6..f644400d179d54eb8e5ed64c73f5f92292035fe0 100644
+index 8fbe1ce73c3a6a8a1c971f41e76d71dcbafa1cb1..b1263d2def583d8e8cf777435929993dbccb54ed 100644
 --- a/Source/WTF/wtf/PlatformHave.h
 +++ b/Source/WTF/wtf/PlatformHave.h
@@ -383,7 +383,7 @@
@ -1636,10 +1636,10 @@ index 34f1a72596fb89c8b647fff3348cca3d959c014c..ab6e42c4da2a8a77f66ce532a3a12bb9
 __ZN7WebCore14DocumentLoaderD2Ev
 __ZN7WebCore14DocumentLoader17clearMainResourceEv
 diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
-index 28a00177061501398fcd56dd573287fb0c76c182..cb935a60830fce1f1f3c08121d76d0496ebd09b6 100644
+index 19fc5f6c9696a76f6a732eda7101f872a2f83291..2d7f80c0ffe6be98f3049c046c58379c80847725 100644
 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
 +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
-@@ -5033,6 +5033,14 @@
+@@ -5034,6 +5034,14 @@
 		EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; };
 		EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; };
@ -1654,7 +1654,7 @@ index 28a00177061501398fcd56dd573287fb0c76c182..cb935a60830fce1f1f3c08121d76d049
 		F12171F516A8CED2000053CA /* WebVTTElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F12171F316A8BC63000053CA /* WebVTTElement.cpp */; };
 		F12171F616A8CF0B000053CA /* WebVTTElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F12171F416A8BC63000053CA /* WebVTTElement.h */; };
 		F32BDCD92363AACA0073B6AE /* UserGestureEmulationScope.h in Headers */ = {isa = PBXBuildFile; fileRef = F32BDCD72363AACA0073B6AE /* UserGestureEmulationScope.h */; };
-@@ -15617,6 +15625,14 @@
+@@ -15657,6 +15665,14 @@
 		EDEC98020AED7E170059137F /* WebCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCorePrefix.h; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
 		EFB7287B2124C73D005C2558 /* CanvasActivityRecord.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasActivityRecord.cpp; sourceTree = "<group>"; };
 		EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasActivityRecord.h; sourceTree = "<group>"; };
@ -1669,7 +1669,7 @@ index 28a00177061501398fcd56dd573287fb0c76c182..cb935a60830fce1f1f3c08121d76d049
 		F12171F316A8BC63000053CA /* WebVTTElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTElement.cpp; sourceTree = "<group>"; };
 		F12171F416A8BC63000053CA /* WebVTTElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTElement.h; sourceTree = "<group>"; };
 		F32BDCD52363AAC90073B6AE /* UserGestureEmulationScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserGestureEmulationScope.cpp; sourceTree = "<group>"; };
-@@ -20859,7 +20875,12 @@
+@@ -20920,7 +20936,12 @@
 				2D2E34A921A4E191004598B5 /* EditableImageReference.h */,
 				1AF326770D78B9440068F0C4 /* EditorClient.h */,
 				93C09A800B064F00005ABD4D /* EventHandler.cpp */,
@ -1682,7 +1682,7 @@ index 28a00177061501398fcd56dd573287fb0c76c182..cb935a60830fce1f1f3c08121d76d049
 				E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */,
 				E0FEF371B17C53EAC1C1FBEE /* EventSource.h */,
 				E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */,
-@@ -26115,7 +26136,9 @@
+@@ -26178,7 +26199,9 @@
 				B2C3D9EC0D006C1D00EF6F26 /* text */,
 				E1EE8B6B2412B2A700E794D6 /* xr */,
 				DFDB912CF8E88A6DA1AD264F /* AbortableTaskQueue.h */,
@ -1692,7 +1692,7 @@ index 28a00177061501398fcd56dd573287fb0c76c182..cb935a60830fce1f1f3c08121d76d049
 				49AE2D95134EE5F90072920A /* CalculationValue.h */,
 				C330A22113EC196B0000B45B /* ColorChooser.h */,
 				C37CDEBC149EF2030042090D /* ColorChooserClient.h */,
-@@ -28459,6 +28482,7 @@
+@@ -28538,6 +28561,7 @@
 				BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */,
 				AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */,
 				AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */,
@ -1700,7 +1700,7 @@ index 28a00177061501398fcd56dd573287fb0c76c182..cb935a60830fce1f1f3c08121d76d049
 				6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */,
 				6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */,
 				6BDB5DC5227CA0EB00919770 /* DocumentStorageAccess.idl */,
-@@ -29343,6 +29367,7 @@
+@@ -29422,6 +29446,7 @@
 				93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */,
 				29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */,
 				0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */,
@ -1708,7 +1708,7 @@ index 28a00177061501398fcd56dd573287fb0c76c182..cb935a60830fce1f1f3c08121d76d049
 				29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */,
 				69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */,
 				AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */,
-@@ -31206,6 +31231,7 @@
+@@ -31286,6 +31311,7 @@
 				6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */,
 				E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */,
 				81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */,
@ -1716,7 +1716,7 @@ index 28a00177061501398fcd56dd573287fb0c76c182..cb935a60830fce1f1f3c08121d76d049
 				7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */,
 				C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */,
 				C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */,
-@@ -33125,9 +33151,11 @@
+@@ -33205,9 +33231,11 @@
 				A7DBF8DE1276919C006B6008 /* TextCheckingHelper.h in Headers */,
 				B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */,
 				26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */,
@ -1728,7 +1728,7 @@ index 28a00177061501398fcd56dd573287fb0c76c182..cb935a60830fce1f1f3c08121d76d049
 				B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */,
 				B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */,
 				9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */,
-@@ -34029,6 +34057,7 @@
+@@ -34109,6 +34137,7 @@
 				CDDE02ED18B3ED6D00CF7FF1 /* CDMSessionAVFoundationObjC.mm in Sources */,
 				CDDE02F018B5651300CF7FF1 /* CDMSessionAVStreamSession.mm in Sources */,
 				CDE5959D1BF2757100A1CBE8 /* CDMSessionMediaSourceAVFObjC.mm in Sources */,
@ -1736,7 +1736,7 @@ index 28a00177061501398fcd56dd573287fb0c76c182..cb935a60830fce1f1f3c08121d76d049
 				A14090FB1AA51E1D0091191A /* ContentFilterUnblockHandlerCocoa.mm in Sources */,
 				07AFF4231EFB144900B545B3 /* CoreAudioCaptureSourceIOS.mm in Sources */,
 				46C696CC1E7205FC00597937 /* CPUMonitor.cpp in Sources */,
-@@ -34103,6 +34132,7 @@
+@@ -34183,6 +34212,7 @@
 				51058ADF1D67C229009A538C /* MockGamepad.cpp in Sources */,
 				51058AE11D67C229009A538C /* MockGamepadProvider.cpp in Sources */,
 				CDF2B0121820540600F2B424 /* MockMediaPlayerMediaSource.cpp in Sources */,
@ -1744,7 +1744,7 @@ index 28a00177061501398fcd56dd573287fb0c76c182..cb935a60830fce1f1f3c08121d76d049
 				CDF2B0141820540600F2B424 /* MockMediaSourcePrivate.cpp in Sources */,
 				CDF2B0161820540700F2B424 /* MockSourceBufferPrivate.cpp in Sources */,
 				2D9BF7421DBFDC27007A7D99 /* NavigatorEME.cpp in Sources */,
-@@ -34192,6 +34222,7 @@
+@@ -34272,6 +34302,7 @@
 				538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */,
 				DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */,
 				538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */,
@ -1752,7 +1752,7 @@ index 28a00177061501398fcd56dd573287fb0c76c182..cb935a60830fce1f1f3c08121d76d049
 				DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */,
 				538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */,
 				DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */,
-@@ -34724,6 +34755,7 @@
+@@ -34804,6 +34835,7 @@
 				2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */,
 				2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */,
 				2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */,
@ -4229,7 +4229,7 @@ index cc9d1c1bc0c5ede7c81c1ad1a05d358a4760d074..07af1a43029f6e3d74e43d3b0b26ea40
     DocumentWriter& writer() const { return m_writer; }
 
 diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
-index 1c1835a976f1a42ab4386c0bb504aefa2f5b9784..e4a197e9b68742b6b406e0277cf7b5154b4e2e6d 100644
+index 381f5d3f55b7f35d50d520960c3d5a5170a6f139..43426254b7c7bc53bd741204075376d11712a5eb 100644
 --- a/Source/WebCore/loader/FrameLoader.cpp
 +++ b/Source/WebCore/loader/FrameLoader.cpp
@@ -1186,6 +1186,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat
@ -4240,16 +4240,16 @@ index 1c1835a976f1a42ab4386c0bb504aefa2f5b9784..e4a197e9b68742b6b406e0277cf7b515
 
     m_frame.document()->statePopped(stateObject ? Ref<SerializedScriptValue> { *stateObject } : SerializedScriptValue::nullValue());
     m_client->dispatchDidPopStateWithinPage();
-@@ -1366,6 +1367,8 @@ void FrameLoader::loadURL(FrameLoadRequest&& frameLoadRequest, const String& ref
+@@ -1371,6 +1372,8 @@ void FrameLoader::loadURL(FrameLoadRequest&& frameLoadRequest, const String& ref
 
     ASSERT(newLoadType != FrameLoadType::Same);
 
 +    request.setInitiatorIdentifier(frameLoadRequest.resourceRequest().initiatorIdentifier());
 +
-     // The search for a target frame is done earlier in the case of form submission.
-     Frame* targetFrame = isFormSubmission ? nullptr : findFrameForNavigation(effectiveFrameName);
-     if (targetFrame && targetFrame != &m_frame) {
-@@ -1498,6 +1501,7 @@ void FrameLoader::load(FrameLoadRequest&& request)
+     if (!isNavigationAllowed())
+         return;
+ 
+@@ -1497,6 +1500,7 @@ void FrameLoader::load(FrameLoadRequest&& request)
 
 void FrameLoader::loadWithNavigationAction(const ResourceRequest& request, NavigationAction&& action, FrameLoadType type, RefPtr<FormState>&& formState, AllowNavigationToInvalidURL allowNavigationToInvalidURL, const String& downloadAttribute, CompletionHandler<void()>&& completionHandler)
 {
@ -4257,7 +4257,7 @@ index 1c1835a976f1a42ab4386c0bb504aefa2f5b9784..e4a197e9b68742b6b406e0277cf7b515
     FRAMELOADER_RELEASE_LOG_IF_ALLOWED(ResourceLoading, "loadWithNavigationAction: frame load started");
 
     Ref<DocumentLoader> loader = m_client->createDocumentLoader(request, defaultSubstituteDataForURL(request.url()));
-@@ -1602,6 +1606,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
+@@ -1601,6 +1605,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
     const String& httpMethod = loader->request().httpMethod();
 
     if (shouldPerformFragmentNavigation(isFormSubmission, httpMethod, policyChecker().loadType(), newURL)) {
@ -4266,7 +4266,7 @@ index 1c1835a976f1a42ab4386c0bb504aefa2f5b9784..e4a197e9b68742b6b406e0277cf7b515
         RefPtr<DocumentLoader> oldDocumentLoader = m_documentLoader;
         NavigationAction action { *m_frame.document(), loader->request(), InitiatedByMainFrame::Unknown, policyChecker().loadType(), isFormSubmission };
 
-@@ -3143,6 +3149,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error)
+@@ -3144,6 +3150,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error)
     checkCompleted();
     if (m_frame.page())
         checkLoadComplete();
@ -4275,7 +4275,7 @@ index 1c1835a976f1a42ab4386c0bb504aefa2f5b9784..e4a197e9b68742b6b406e0277cf7b515
 }
 
 void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue)
-@@ -3905,9 +3913,6 @@ String FrameLoader::referrer() const
+@@ -3906,9 +3914,6 @@ String FrameLoader::referrer() const
 
 void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
 {
@ -4285,7 +4285,7 @@ index 1c1835a976f1a42ab4386c0bb504aefa2f5b9784..e4a197e9b68742b6b406e0277cf7b515
     Vector<Ref<DOMWrapperWorld>> worlds;
     ScriptController::getAllWorlds(worlds);
     for (auto& world : worlds)
-@@ -3916,13 +3921,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
+@@ -3917,13 +3922,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
 
 void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world)
 {
@ -4399,7 +4399,7 @@ index 758d3c66c34033231459455bb4ee817a1234e3b4..cfbefe5ee8a8e86c82350e5c87a15243
 
 #if ENABLE(INPUT_TYPE_COLOR)
 diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
-index 5c24edc97732f1369da26b597944c3a9188560d0..79c7b66d0a035b40b08a202c70e616627979fbad 100644
+index 148ea390d2763162a6bdcae02ed0a90bc8f99115..c572391304e951e75aaa520f90a9c1038c41119e 100644
 --- a/Source/WebCore/page/EventHandler.cpp
 +++ b/Source/WebCore/page/EventHandler.cpp
@@ -812,9 +812,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve
@ -4624,7 +4624,7 @@ index 9c58b06f4c471130ce4815f11d14cb78f81b49a0..3d624733c36f09518b12095d91e67a2a
     if (stateObjectType == StateObjectType::Push) {
         frame->loader().history().pushState(WTFMove(data), title, fullURL.string());
 diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
-index ff01838a219a23616fb05d3d52d6372779d47efe..b7ca213c774477c30e400b846e7a204704147e0e 100644
+index 74515115a0d51ac1e4be2a72dfb3bc4f29f1e18c..20c7a7488091c91c3e9ead818ee3f7c2c5af0461 100644
 --- a/Source/WebCore/page/Page.cpp
 +++ b/Source/WebCore/page/Page.cpp
@@ -88,6 +88,7 @@
@ -4832,7 +4832,7 @@ index 445c7d78a4a1a8cdb0e08a859d3912e5cc62b6c6..93a8006dd5237018b573b976d0bbe28f
 #if PLATFORM(IOS_FAMILY)
 #include "GraphicsContextGLOpenGLESIOS.h"
 diff --git a/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp b/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
-index 1ecd1fe630bf1fcf2b4fa874c10fc019250e1960..981387245eeeb24bd9f8e4a0af6f81c47082d2d7 100644
+index e7550908313939caa755abd79ff3a47c5cc61b28..907b8d9e0815b6401bd09fffbdd4db012756f22c 100644
 --- a/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
 +++ b/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
@@ -37,8 +37,10 @@
@ -5588,19 +5588,6 @@ index 44737686187a06a92c408ea60b63a48ac8481334..c754a763688b52e7ddd47493296ef9b0
 }
 
 bool PlatformKeyboardEvent::currentCapsLockState()
-diff --git a/Source/WebKit/Configurations/WebKit.xcconfig b/Source/WebKit/Configurations/WebKit.xcconfig
-index c8300ab14a7273942d580acd5de7ec1ff53d3d34..ea757e7e44cfb3cffa5f24083da18c279a128ff8 100644
--- a/Source/WebKit/Configurations/WebKit.xcconfig
-+++ b/Source/WebKit/Configurations/WebKit.xcconfig
-@@ -130,7 +130,7 @@ WK_QUICKLOOK_THUMBNAILING_LDFLAGS_MACOS_SINCE_1015 = -framework QuickLookThumbna
- WK_QUICKLOOK_THUMBNAILING_LDFLAGS_iphoneos = -framework QuickLookThumbnailing;
- WK_QUICKLOOK_THUMBNAILING_LDFLAGS_iphonesimulator = -framework QuickLookThumbnailing;
- 
-FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework IOSurface -framework WebKitLegacy -framework QuickLookThumbnailing -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_ASSERTION_SERVICES_LDFLAGS) $(WK_RUNNINGBOARD_SERVICES_LDFLAGS) $(WK_AUTHKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS) $(WK_QUICKLOOK_THUMBNAILING_LDFLAGS);
-+FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework IOSurface -framework WebKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_ASSERTION_SERVICES_LDFLAGS) $(WK_RUNNINGBOARD_SERVICES_LDFLAGS) $(WK_AUTHKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS) $(WK_QUICKLOOK_THUMBNAILING_LDFLAGS);
- 
- // Prevent C++ standard library basic_stringstream, operator new, delete and their related exception types from being exported as weak symbols.
- UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED1Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol -Wl,__ZTVNSt3__117bad_function_callE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE16_NS_13basic_ostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE;
 diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
 index f62e98610dd2e74efcf0c899475e6d095b8f916b..e0a7d93c6700869adc7ba612f07fe3cf77e221af 100644
 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
@ -5731,7 +5718,7 @@ index d1fa427d82884fc43569d1bf0df7d728921502fc..30450ab01cddfcd406e46ac8e08ac50a
 }
 
 diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
-index 61dde07541e0b3359cada3e901e3e064435a312b..e4a101bd062629d2b1edcd94a9a964fada300632 100644
+index fa463903a34e1a01791148a4b75535609804bf55..11e746242c0e0c73f1c4d96474418491e0d384a0 100644
 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
 +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
@@ -655,7 +655,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se
@ -5907,7 +5894,7 @@ index 407361f036e79891767d807fbb63c9044b260a70..24773d8f349d441e2b6b1981baa5af17
 }
 
 diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake
-index 700ff0a480d6a5461cd7a7df75053b57f0571480..b4f338ec821582f2355272f58a1f538523cc49d0 100644
+index 43e93e3b07f6415502016a9dfc8bf7ed0fe2f28b..53c93935afa5214082671e5f0bf67ae25e7dcc55 100644
 --- a/Source/WebKit/PlatformWPE.cmake
 +++ b/Source/WebKit/PlatformWPE.cmake
@@ -254,6 +254,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES
@ -6011,10 +5998,10 @@ index 0fa557e9faa34ba81a7a4f7da5e32f30cbfad5d2..4f06afeb895fb1231d87e4304a4b588c
     NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
 #elif PLATFORM(GTK)
 diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp
-index aed8bdcc561063d5f8063e29dd79a8ab08f32c9e..8c0dc5c93bb27b1a8fc0a29e11383f7e05a021a5 100644
+index 92bb2046a2f7b32b21b9a95a75f3a8bb2c33d8ec..5298fe0bedf764b8fd9f5afc8cdd97ff787a1a67 100644
 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp
 +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp
-@@ -1491,6 +1491,9 @@ void ArgumentCoder<WindowFeatures>::encode(Encoder& encoder, const WindowFeature
+@@ -1494,6 +1494,9 @@ void ArgumentCoder<WindowFeatures>::encode(Encoder& encoder, const WindowFeature
     encoder << windowFeatures.resizable;
     encoder << windowFeatures.fullscreen;
     encoder << windowFeatures.dialog;
@ -6024,7 +6011,7 @@ index aed8bdcc561063d5f8063e29dd79a8ab08f32c9e..8c0dc5c93bb27b1a8fc0a29e11383f7e
 }
 
 bool ArgumentCoder<WindowFeatures>::decode(Decoder& decoder, WindowFeatures& windowFeatures)
-@@ -1519,6 +1522,12 @@ bool ArgumentCoder<WindowFeatures>::decode(Decoder& decoder, WindowFeatures& win
+@@ -1522,6 +1525,12 @@ bool ArgumentCoder<WindowFeatures>::decode(Decoder& decoder, WindowFeatures& win
         return false;
     if (!decoder.decode(windowFeatures.dialog))
         return false;
@ -6596,7 +6583,7 @@ index 1d2febfba8833912f72216aa53c8c20090ee2d8b..1b2c3d84b15b12f1a187c0b7622db43c
 
 #ifdef __cplusplus
 diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm b/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
-index f5eacee0e8ce3b3149345410f9a261d527e39118..8c96b246e25d2fe28fdac1fca3b867115f81b2f7 100644
+index 42d456a21cb96bc34c8cc5997a1b317f94b295ff..5e9428e61bcc24196a396fc5702dcc7a08e45133 100644
 --- a/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
 +++ b/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
@@ -47,6 +47,7 @@
@ -6678,7 +6665,7 @@ index 726c4972aa0b32e0dc602e0ab2d71f6ae8ef93ae..c67f408797724cb6d68ed441c0ef1ccc
 
 NS_ASSUME_NONNULL_END
 diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
-index a48e1b62026b77132df4f799027b77c56a91cfca..2bc058614f4c3773f54606522aaa1cbce43da80e 100644
+index 73c98a34625d8f5552414384e3ce6b8db840e8d8..998ce353c5ad1951a33aff0b4871152d216037ee 100644
 --- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
 +++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
@@ -44,6 +44,7 @@
@ -6841,10 +6828,10 @@ index df2b919c9ba18cc9cc0471a4334eb85c45e3820e..b5a73c8d6863217da0edb97688d17a7d
 @property (nonatomic) BOOL processSwapsOnWindowOpenWithOpener WK_API_AVAILABLE(macos(10.14), ios(12.0));
 @property (nonatomic) BOOL prewarmsProcessesAutomatically WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
 diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
-index ad365bcb1f51adb06e76261633e185d8c15caed0..c19a436525c109a7eac0fc625fbfe04c2149514a 100644
+index c43d4271e5f5c35e33d69141d472291ca7ad203e..996f81ba8e177f9d6107007afa63ed5fc4ac0d66 100644
 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
 +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
-@@ -233,6 +233,16 @@
+@@ -231,6 +231,16 @@
     return _processPoolConfiguration->processSwapsOnNavigation();
 }
 
@ -8176,10 +8163,10 @@ index a0ccbe0663c3c126437704bcc8f91b4724ccca9f..5d52ca9048562410c686c6fb30a0fae6
 
 } // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/DrawingAreaProxy.h b/Source/WebKit/UIProcess/DrawingAreaProxy.h
-index 2b1e58f70430660cf9e3a45e5ac020e7a812bbbe..43b5820404f1ff7d547d7aa03233f9c8662fdb00 100644
+index b0a8571679d66bbde1f380a114797b88ab1f44f8..4a292af7ad56c6d22a0cd3f0d71e71b488a2f343 100644
 --- a/Source/WebKit/UIProcess/DrawingAreaProxy.h
 +++ b/Source/WebKit/UIProcess/DrawingAreaProxy.h
-@@ -72,6 +72,7 @@ public:
+@@ -75,6 +75,7 @@ public:
 
     const WebCore::IntSize& size() const { return m_size; }
     bool setSize(const WebCore::IntSize&, const WebCore::IntSize& scrollOffset = { });
@ -9711,10 +9698,10 @@ index 7a14cfba15c103a2d4fe263fa49d25af3c396ec2..3ee0e154349661632799057c71f1d1f1
 
 diff --git a/Source/WebKit/UIProcess/RemoteInspectorPipe.cpp b/Source/WebKit/UIProcess/RemoteInspectorPipe.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..45d8dc48601548951dc5c5ecd68958dbd47c89db
+index 0000000000000000000000000000000000000000..e842999cf436a92f5279642a4edccd10ede7b3e2
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/RemoteInspectorPipe.cpp
-@@ -0,0 +1,220 @@
+@@ -0,0 +1,221 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@ -9854,9 +9841,11 @@ index 0000000000000000000000000000000000000000..45d8dc48601548951dc5c5ecd68958db
 +};
 +
 +RemoteInspectorPipe::RemoteInspectorPipe(BrowserInspectorController& browserInspectorController)
-+    : m_remoteFrontendChannel(makeUnique<RemoteFrontendChannel>())
-+    , m_browserInspectorController(browserInspectorController)
+    : m_browserInspectorController(browserInspectorController)
 +{
+    // Initialize main loop before creating WorkQueue
+    WTF::RunLoop::initializeMainRunLoop();
+    m_remoteFrontendChannel = makeUnique<RemoteFrontendChannel>();
 +    start();
 +}
 +
@ -9867,7 +9856,6 @@ index 0000000000000000000000000000000000000000..45d8dc48601548951dc5c5ecd68958db
 +
 +bool RemoteInspectorPipe::start()
 +{
-+    WTF::RunLoop::initializeMainRunLoop();
 +    if (m_receiverThread)
 +        return true;
 +
@ -10626,7 +10614,7 @@ index 0000000000000000000000000000000000000000..76290475097e756e3d932d22be4d8c79
 +
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
-index 5a65309b507785a5f890fe977f24afc18a7a64df..07c9c1681cafa131d43ef240c1f192e5ee3ee275 100644
+index 8e1b867c5672a1ea5ef34785d1c0665e21ea1a6a..51ccb99049ebfe6679df33bd01edf7bf35681c0c 100644
 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp
 +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
@@ -946,6 +946,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason)
@ -10876,7 +10864,7 @@ index 5a65309b507785a5f890fe977f24afc18a7a64df..07c9c1681cafa131d43ef240c1f192e5
     if (m_loaderClient)
         handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this);
     else
-@@ -7706,6 +7793,7 @@ void WebPageProxy::resetStateAfterProcessExited(ProcessTerminationReason termina
+@@ -7708,6 +7795,7 @@ void WebPageProxy::resetStateAfterProcessExited(ProcessTerminationReason termina
 
 WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr<API::WebsitePolicies>&& websitePolicies)
 {
@ -10884,7 +10872,7 @@ index 5a65309b507785a5f890fe977f24afc18a7a64df..07c9c1681cafa131d43ef240c1f192e5
     WebPageCreationParameters parameters;
 
     parameters.processDisplayName = configuration().processDisplayName();
-@@ -7849,6 +7937,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
+@@ -7851,6 +7939,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
     parameters.shouldCaptureDisplayInUIProcess = m_process->processPool().configuration().shouldCaptureDisplayInUIProcess();
     parameters.limitsNavigationsToAppBoundDomains = m_limitsNavigationsToAppBoundDomains;
 
@ -10893,7 +10881,7 @@ index 5a65309b507785a5f890fe977f24afc18a7a64df..07c9c1681cafa131d43ef240c1f192e5
 #if PLATFORM(GTK)
     parameters.themeName = pageClient().themeName();
 #endif
-@@ -7920,6 +8010,14 @@ void WebPageProxy::gamepadActivity(const Vector<GamepadData>& gamepadDatas, bool
+@@ -7922,6 +8012,14 @@ void WebPageProxy::gamepadActivity(const Vector<GamepadData>& gamepadDatas, bool
 
 void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref<AuthenticationChallengeProxy>&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS)
 {
@ -10908,7 +10896,7 @@ index 5a65309b507785a5f890fe977f24afc18a7a64df..07c9c1681cafa131d43ef240c1f192e5
     if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) {
         m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = makeRef(*this), authenticationChallenge = authenticationChallenge.copyRef()] (bool shouldAllowLegacyTLS) {
             if (shouldAllowLegacyTLS)
-@@ -8005,7 +8103,8 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge
+@@ -8002,7 +8100,8 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge
     MESSAGE_CHECK(m_process, frame);
 
     // FIXME: Geolocation should probably be using toString() as its string representation instead of databaseIdentifier().
@ -10918,7 +10906,7 @@ index 5a65309b507785a5f890fe977f24afc18a7a64df..07c9c1681cafa131d43ef240c1f192e5
     auto request = m_geolocationPermissionRequestManager.createRequest(geolocationID);
     Function<void(bool)> completionHandler = [request = WTFMove(request)](bool allowed) {
         if (allowed)
-@@ -8014,6 +8113,14 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge
+@@ -8011,6 +8110,14 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge
             request->deny();
     };
 
@ -10934,7 +10922,7 @@ index 5a65309b507785a5f890fe977f24afc18a7a64df..07c9c1681cafa131d43ef240c1f192e5
     // and make it one UIClient call that calls the completionHandler with false
     // if there is no delegate instead of returning the completionHandler
 diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
-index bf8c468ad84ec2396f0a54ee64d01dcce9d73a44..fe224d4fb732837826a76d86ccbabdbc53d92f98 100644
+index 5bff341f5d7feeefd96e9d25e56db9f8a89a0b4a..0cd563ff088914ec1162d1dce5e2d84153dbcc8e 100644
 --- a/Source/WebKit/UIProcess/WebPageProxy.h
 +++ b/Source/WebKit/UIProcess/WebPageProxy.h
@@ -37,6 +37,7 @@
@ -10982,7 +10970,7 @@ index bf8c468ad84ec2396f0a54ee64d01dcce9d73a44..fe224d4fb732837826a76d86ccbabdbc
     void pluginScaleFactorDidChange(double);
     void pluginZoomFactorDidChange(double);
 
-@@ -2370,6 +2380,7 @@ private:
+@@ -2369,6 +2379,7 @@ private:
     String m_overrideContentSecurityPolicy;
 
     RefPtr<WebInspectorProxy> m_inspector;
@ -10990,7 +10978,7 @@ index bf8c468ad84ec2396f0a54ee64d01dcce9d73a44..fe224d4fb732837826a76d86ccbabdbc
 
 #if ENABLE(FULLSCREEN_API)
     std::unique_ptr<WebFullScreenManagerProxy> m_fullScreenManager;
-@@ -2796,6 +2807,9 @@ private:
+@@ -2795,6 +2806,9 @@ private:
         RefPtr<API::Object> messageBody;
     };
     Vector<InjectedBundleMessage> m_pendingInjectedBundleMessages;
@ -13210,10 +13198,10 @@ index eb1e2b6e4549458cb168d3fad9ba055561ac524f..bc04476246930e784f79f72cb0ba99aa
 
 void WebProcess::initializeConnection(IPC::Connection* connection)
 diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
-index 520ea5664af287569a855c74b81cea54c7e8e202..7019876781827c93f87904c9685a2fe0513001ee 100644
+index ac6b7138b8897c389253e2524504d340e0669b7a..32e631851146eef139b9f1cf95e7ff30bb5aa9b7 100644
 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
 +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
-@@ -4246,7 +4246,7 @@ static BOOL currentScrollIsBlit(NSView *clipView)
+@@ -4240,7 +4240,7 @@ static BOOL currentScrollIsBlit(NSView *clipView)
     _private->handlingMouseDownEvent = NO;
 }
 
@ -13223,29 +13211,29 @@ index 520ea5664af287569a855c74b81cea54c7e8e202..7019876781827c93f87904c9685a2fe0
 - (void)touch:(WebEvent *)event
 {
 diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
-index f02744e20184184b9942dd6d6141f869f05b51b2..3b182bca8324e64cfad8ced302e6f9a5fa1867b7 100644
+index db990ef6acac4398b244dbf22dc03634eda1598d..d49f89d22afc44f0b208e694d3701a289fa4933c 100644
 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm
 +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
-@@ -4356,7 +4356,7 @@ IGNORE_WARNINGS_END
+@@ -4352,7 +4352,7 @@ IGNORE_WARNINGS_END
 }
 #endif // PLATFORM(IOS_FAMILY)
 
 -#if ENABLE(TOUCH_EVENTS)
 +#if ENABLE(IOS_TOUCH_EVENTS)
+ 
 - (NSArray *)_touchEventRegions
 {
-     auto* frame = [self _mainCoreFrame];
-@@ -4402,7 +4402,7 @@ IGNORE_WARNINGS_END
- 
-     return eventRegionArray;
+@@ -4394,7 +4394,7 @@ IGNORE_WARNINGS_END
+     }).autorelease();
 }
+ 
 -#endif // ENABLE(TOUCH_EVENTS)
 +#endif // ENABLE(IOS_TOUCH_EVENTS)
 
 // For backwards compatibility with the WebBackForwardList API, we honor both
 // a per-WebView and a per-preferences setting for whether to use the back/forward cache.
 diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 6546753da896c5c4852eb63629f594ddfac1521d..fee8367fd35304d26b172f31d53464b4f9033185 100644
+index 95fc606050d293c25c685e419e453d7e8727c76b..bb44d6102476a2225e395d2e6940d8590dda5ddf 100644
 --- a/Source/cmake/OptionsGTK.cmake
 +++ b/Source/cmake/OptionsGTK.cmake
@@ -5,6 +5,7 @@ WEBKIT_OPTION_BEGIN()
@ -13256,7 +13244,7 @@ index 6546753da896c5c4852eb63629f594ddfac1521d..fee8367fd35304d26b172f31d53464b4
 
 if (USE_GTK4)
     set(WEBKITGTK_API_VERSION 5.0)
-@@ -191,6 +192,13 @@ if (USE_GTK4)
+@@ -190,6 +191,13 @@ if (USE_GTK4)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF)
 endif ()