diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index f3295545f3..7440925725 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1530 -Changed: dkolesa@igalia.com Wed Aug 11 01:40:23 AM CEST 2021 +1531 +Changed: dpino@igalia.com Wed Aug 11 09:42:49 UTC 2021 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 2812fadf1d..bc84c526dc 100644 --- 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.git" BASE_BRANCH="main" -BASE_REVISION="34bf3adbed50d366b79d35e3e2e4a2644244226f" +BASE_REVISION="0890748bf91e2d30c0ffb9940d5856061be24ea0" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 77a9d408b0..6ad5f79119 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -2221,10 +2221,10 @@ index 50178dbbf450c56aa133df0aaa553a46ddd1ac7b..955224be3eef1d59ebf0e0fb6bcb98eb #endif diff --git a/Source/WTF/wtf/PlatformGTK.cmake b/Source/WTF/wtf/PlatformGTK.cmake -index 9bd5fde5bc38355e25bc09d05a045df31efaa259..3f3be653fef9930a7ac8a348c8b9f9a281eea363 100644 +index 4a12b5a4393fe2bbe39673e3fa547c9d6976abd7..678b777736019debbd25fcd72fd34f3dd925c459 100644 --- a/Source/WTF/wtf/PlatformGTK.cmake +++ b/Source/WTF/wtf/PlatformGTK.cmake -@@ -73,6 +73,7 @@ list(APPEND WTF_LIBRARIES +@@ -74,6 +74,7 @@ list(APPEND WTF_LIBRARIES ${GLIB_LIBRARIES} Threads::Threads ZLIB::ZLIB @@ -2246,10 +2246,10 @@ index 61f13c2b73dd2e03592c3a97792f936f97dc1f44..ffee291160127e11440772c720f3c8d2 #endif diff --git a/Source/WTF/wtf/PlatformWPE.cmake b/Source/WTF/wtf/PlatformWPE.cmake -index a840a487ff03a3c827455cab67faa8f83d20bfa9..29dd6a14f17295f1611451e6f53866175c8748d8 100644 +index 643ef0fcdf4f3ce4a1f27bc0cc6e179b7143bbd4..f6ee05b80ebc200d0db74fc7e975d96ce0dcd75f 100644 --- a/Source/WTF/wtf/PlatformWPE.cmake +++ b/Source/WTF/wtf/PlatformWPE.cmake -@@ -47,6 +47,7 @@ list(APPEND WTF_LIBRARIES +@@ -48,6 +48,7 @@ list(APPEND WTF_LIBRARIES ${GLIB_LIBRARIES} Threads::Threads ZLIB::ZLIB @@ -2445,7 +2445,7 @@ index ef168b76819216d984b7a2d0f760005fb9d24de8..2d6cf51f3b45191ad84106429d4f108f __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 7be48763a64793b08e4f76fe9d0646c350898050..3fb488810b30445b105d8c5bcb282706d0a5a050 100644 +index 36417114f03ae01392b89d73accaedc7684b0c7a..490e735bcb2fa3e17522bc70d58c7d561b91211a 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -5343,6 +5343,14 @@ @@ -2463,7 +2463,7 @@ index 7be48763a64793b08e4f76fe9d0646c350898050..3fb488810b30445b105d8c5bcb282706 F12171F616A8CF0B000053CA /* WebVTTElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F12171F416A8BC63000053CA /* WebVTTElement.h */; }; F32BDCD92363AACA0073B6AE /* UserGestureEmulationScope.h in Headers */ = {isa = PBXBuildFile; fileRef = F32BDCD72363AACA0073B6AE /* UserGestureEmulationScope.h */; }; F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */ = {isa = PBXBuildFile; fileRef = F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */; settings = {ATTRIBUTES = (Private, ); }; }; -@@ -16471,6 +16479,14 @@ +@@ -16472,6 +16480,14 @@ EDEC98020AED7E170059137F /* WebCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCorePrefix.h; sourceTree = ""; tabWidth = 4; usesTabs = 0; }; EFB7287B2124C73D005C2558 /* CanvasActivityRecord.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasActivityRecord.cpp; sourceTree = ""; }; EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasActivityRecord.h; sourceTree = ""; }; @@ -2478,7 +2478,7 @@ index 7be48763a64793b08e4f76fe9d0646c350898050..3fb488810b30445b105d8c5bcb282706 F12171F316A8BC63000053CA /* WebVTTElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTElement.cpp; sourceTree = ""; }; F12171F416A8BC63000053CA /* WebVTTElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTElement.h; sourceTree = ""; }; F32BDCD52363AAC90073B6AE /* UserGestureEmulationScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserGestureEmulationScope.cpp; sourceTree = ""; }; -@@ -21916,7 +21932,12 @@ +@@ -21917,7 +21933,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2491,7 +2491,7 @@ index 7be48763a64793b08e4f76fe9d0646c350898050..3fb488810b30445b105d8c5bcb282706 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -27635,6 +27656,8 @@ +@@ -27637,6 +27658,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2500,7 +2500,7 @@ index 7be48763a64793b08e4f76fe9d0646c350898050..3fb488810b30445b105d8c5bcb282706 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -29824,6 +29847,7 @@ +@@ -29826,6 +29849,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2508,7 +2508,7 @@ index 7be48763a64793b08e4f76fe9d0646c350898050..3fb488810b30445b105d8c5bcb282706 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -30835,6 +30859,7 @@ +@@ -30837,6 +30861,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2516,7 +2516,7 @@ index 7be48763a64793b08e4f76fe9d0646c350898050..3fb488810b30445b105d8c5bcb282706 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -32866,6 +32891,7 @@ +@@ -32868,6 +32893,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2524,7 +2524,7 @@ index 7be48763a64793b08e4f76fe9d0646c350898050..3fb488810b30445b105d8c5bcb282706 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -34932,9 +34958,11 @@ +@@ -34934,9 +34960,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2536,7 +2536,7 @@ index 7be48763a64793b08e4f76fe9d0646c350898050..3fb488810b30445b105d8c5bcb282706 B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -35892,6 +35920,7 @@ +@@ -35894,6 +35922,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2544,7 +2544,7 @@ index 7be48763a64793b08e4f76fe9d0646c350898050..3fb488810b30445b105d8c5bcb282706 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -35978,6 +36007,7 @@ +@@ -35980,6 +36009,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2552,7 +2552,7 @@ index 7be48763a64793b08e4f76fe9d0646c350898050..3fb488810b30445b105d8c5bcb282706 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36026,6 +36056,7 @@ +@@ -36028,6 +36058,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2560,7 +2560,7 @@ index 7be48763a64793b08e4f76fe9d0646c350898050..3fb488810b30445b105d8c5bcb282706 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -36558,6 +36589,7 @@ +@@ -36560,6 +36591,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -5650,7 +5650,7 @@ index 982691dd2dfe2f65201370a12302b5086703c126..4af72beb3b1405ffac78e89e7fbb2b14 protected: static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No); diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp -index e8901564479748ea469aa9dc937b9ff24f1e9865..10c93913dc905fefc2a28a131b61929b9b5badb9 100644 +index 3e4ff9e04964b16b4280926cf9e03280503c7be0..6138cbf4d1fd72d4c69f02426ccb111a8db0dc49 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -1508,8 +1508,6 @@ void DocumentLoader::detachFromFrame() @@ -5681,7 +5681,7 @@ index d8ff1da3bd6406c5d764876aad49bbd004ac1770..efe4f7d87993dcfbae3734b2cfbf0402 DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index 83983c6a3053bf7c4ee3737bcbcd189101918682..913f9b2e7c87549fae98c717d28439aa3c19315f 100644 +index b07df2ca3873cfb2f5c969141d899b002892e8d2..717151faaab480ca934a5462fed4917a842aab40 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -1158,6 +1158,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat @@ -5761,7 +5761,7 @@ index b018af04d05ce3ac38bb57d8e50a7b063ee51733..6929c01318f509ed560276168d18e011 virtual bool shouldPerformSecurityChecks() const { return false; } virtual bool havePerformedSecurityChecks(const ResourceResponse&) const { return false; } diff --git a/Source/WebCore/loader/PolicyChecker.cpp b/Source/WebCore/loader/PolicyChecker.cpp -index 47147495fb4cf84cd0d2a6b68fc2f310be7c09e0..3d9403cc8609b73d83ec8350730619e15dce952b 100644 +index cd895a9795ca2807f34597c7024709a098af8a32..b70b0616e01d7c21a53f0bae3ba3d6da4b942af7 100644 --- a/Source/WebCore/loader/PolicyChecker.cpp +++ b/Source/WebCore/loader/PolicyChecker.cpp @@ -46,6 +46,7 @@ @@ -5772,9 +5772,9 @@ index 47147495fb4cf84cd0d2a6b68fc2f310be7c09e0..3d9403cc8609b73d83ec8350730619e1 #include "Logging.h" #include "ThreadableBlobRegistry.h" #include -@@ -257,26 +258,32 @@ void FrameLoader::PolicyChecker::checkNewWindowPolicy(NavigationAction&& navigat +@@ -252,26 +253,32 @@ void FrameLoader::PolicyChecker::checkNewWindowPolicy(NavigationAction&& navigat - auto blobURLLifetimeExtension = extendBlobURLLifetimeIfNecessary(request, nullptr); + auto blobURLLifetimeExtension = extendBlobURLLifetimeIfNecessary(request); + InspectorInstrumentation::willCheckNewWindowPolicy(m_frame, request.url()); auto requestIdentifier = PolicyCheckIdentifier::create(); @@ -5842,7 +5842,7 @@ index 3931498518012bbc719d2e14eecd6ae44cba87ba..606ba8c8ec8639a3fe21a018dead8534 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 0fde13312f02f6d0f3896c47ecdc8ceb62694ade..86a91305496410c2009a93b7086f46fd40b2af8a 100644 +index 290f02f363d21c47ab469c2cff914f1eced5f9cc..894db5a94ccacb16d41778ed021453828d56ce99 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -127,6 +127,7 @@ @@ -5940,7 +5940,7 @@ index 0fde13312f02f6d0f3896c47ecdc8ceb62694ade..86a91305496410c2009a93b7086f46fd return swallowEvent; } -@@ -4056,7 +4056,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4073,7 +4073,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -5956,7 +5956,7 @@ index 0fde13312f02f6d0f3896c47ecdc8ceb62694ade..86a91305496410c2009a93b7086f46fd auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4461,7 +4468,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4478,7 +4485,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -5966,7 +5966,7 @@ index 0fde13312f02f6d0f3896c47ecdc8ceb62694ade..86a91305496410c2009a93b7086f46fd PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4588,6 +4596,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4605,6 +4613,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -5977,7 +5977,7 @@ index 0fde13312f02f6d0f3896c47ecdc8ceb62694ade..86a91305496410c2009a93b7086f46fd m_touchPressed = touches->length() > 0; if (allTouchReleased) diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h -index df9d6c7074206ff832fa68d93371283cc8ec3b63..86d0f7dd12956f41e53ecbf53955bf4941f33a52 100644 +index 35ab5d5cb3f97c7b53e6245254e488e19810e59e..ef2137d7341112d0cd58cfd08d2019ab63d67b32 100644 --- a/Source/WebCore/page/EventHandler.h +++ b/Source/WebCore/page/EventHandler.h @@ -136,9 +136,7 @@ public: @@ -5990,7 +5990,7 @@ index df9d6c7074206ff832fa68d93371283cc8ec3b63..86d0f7dd12956f41e53ecbf53955bf49 #if ENABLE(PAN_SCROLLING) void didPanScrollStart(); -@@ -380,10 +378,8 @@ private: +@@ -382,10 +380,8 @@ private: bool startKeyboardScrolling(KeyboardEvent&); void stopKeyboardScrolling(); @@ -6001,7 +6001,7 @@ index df9d6c7074206ff832fa68d93371283cc8ec3b63..86d0f7dd12956f41e53ecbf53955bf49 WEBCORE_EXPORT bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&); -@@ -484,10 +480,8 @@ private: +@@ -486,10 +482,8 @@ private: void defaultTabEventHandler(KeyboardEvent&); void defaultArrowEventHandler(FocusDirection, KeyboardEvent&); @@ -6012,7 +6012,7 @@ index df9d6c7074206ff832fa68d93371283cc8ec3b63..86d0f7dd12956f41e53ecbf53955bf49 // The following are called at the beginning of handleMouseUp and handleDrag. // If they return true it indicates that they have consumed the event. -@@ -495,9 +489,10 @@ private: +@@ -497,9 +491,10 @@ private: #if ENABLE(DRAG_SUPPORT) bool eventLoopHandleMouseDragged(const MouseEventWithHitTestResults&); @@ -6024,7 +6024,7 @@ index df9d6c7074206ff832fa68d93371283cc8ec3b63..86d0f7dd12956f41e53ecbf53955bf49 enum class SetOrClearLastScrollbar { Clear, Set }; void updateLastScrollbarUnderMouse(Scrollbar*, SetOrClearLastScrollbar); -@@ -589,8 +584,8 @@ private: +@@ -591,8 +586,8 @@ private: Timer m_autoHideCursorTimer; #endif @@ -6598,10 +6598,10 @@ index 28d1fc3242174a680711027877d4153923790220..058b5309eed081fcc1e4158f66e80642 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 f778077a290539c1a16b1721bb082ba79950ee1f..8251f8ee42743dca41338dfd9c4f9138cb80a964 100644 +index a3b9fbd389b8fc82dcbbaeacb318d95c6e4b365f..fb968c7040f86f7e5b1b15a328ccc9ca66ac1fed 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -455,6 +455,37 @@ void Page::setOverrideViewportArguments(const std::optional& +@@ -456,6 +456,37 @@ void Page::setOverrideViewportArguments(const std::optional& document->updateViewportArguments(); } @@ -6639,7 +6639,7 @@ index f778077a290539c1a16b1721bb082ba79950ee1f..8251f8ee42743dca41338dfd9c4f9138 ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -1281,11 +1312,6 @@ void Page::didCommitLoad() +@@ -1282,11 +1313,6 @@ void Page::didCommitLoad() #if ENABLE(EDITABLE_REGION) m_isEditableRegionEnabled = false; #endif @@ -6651,7 +6651,7 @@ index f778077a290539c1a16b1721bb082ba79950ee1f..8251f8ee42743dca41338dfd9c4f9138 resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3263,6 +3289,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3264,6 +3290,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -9011,7 +9011,7 @@ index 694008e0451edc5770142a0a6d9eed52b04ded80..ec93869f9486bdf7bd3bb56478c62469 WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, ScrollAlignment::Behavior); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -index 63c2431513b8f71a5d8de96394c14be8d2d3fce5..0199dbb61392764feeae35388c61d517a7c17292 100644 +index ac77e41a4726b93f611bd342e20e4a44a59d4370..d7188f2e9f99725998871f6505bf57b4968c9689 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -76,6 +76,11 @@ @@ -9026,7 +9026,7 @@ index 63c2431513b8f71a5d8de96394c14be8d2d3fce5..0199dbb61392764feeae35388c61d517 #if ENABLE(APPLE_PAY_REMOTE_UI) #include "WebPaymentCoordinatorProxyMessages.h" #endif -@@ -914,6 +919,15 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) +@@ -932,6 +937,15 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) #endif } @@ -9043,10 +9043,10 @@ index 63c2431513b8f71a5d8de96394c14be8d2d3fce5..0199dbb61392764feeae35388c61d517 void NetworkConnectionToWebProcess::removeStorageAccessForFrame(FrameIdentifier frameID, PageIdentifier pageID) { diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -index 1a5444be7b47e5dc121d58f80baadba18d3ccc3c..8ae9c0ba78b0f9d5d27215a207ec7b320e50739e 100644 +index 6a0594ce15618ab327e06ea1f6caa4b8adcc6cd2..92e7df4e616f788f09c7b7973d1bc31b304cf496 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -@@ -283,6 +283,8 @@ private: +@@ -287,6 +287,8 @@ private: void clearPageSpecificData(WebCore::PageIdentifier); @@ -9056,10 +9056,10 @@ index 1a5444be7b47e5dc121d58f80baadba18d3ccc3c..8ae9c0ba78b0f9d5d27215a207ec7b32 void removeStorageAccessForFrame(WebCore::FrameIdentifier, WebCore::PageIdentifier); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in -index 9b32896810619ba19dc5bf437b368a7ca7fa431b..a026b8ae7024f914e78f3f5137bc20314908de2e 100644 +index fa90ff4a6d893598ee0ad09133510ee5ea92e7a7..5807cc207524ffdc72fca1808d784346f5891ced 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in -@@ -64,6 +64,8 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver { +@@ -66,6 +66,8 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver { ClearPageSpecificData(WebCore::PageIdentifier pageID); @@ -9508,10 +9508,10 @@ index 6870851925288571bd6c763b3e60313d9260e98c..a7462761a3d6ce0a2a74d84b80f3db29 + } diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 9e46464051a45b8b2e170e0e927e28cdc8cee95b..2c0b37e7ea5d6bb18a7b35e3e52b84ed8522f2ef 100644 +index 070775bb5d83b629ad326d71fe90ddaca0935ee8..c28114e8be52d3d914f4a6b3a766f261a8aa9cd9 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -704,7 +704,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se +@@ -706,7 +706,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se NegotiatedLegacyTLS negotiatedLegacyTLS = NegotiatedLegacyTLS::No; if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { @@ -9520,7 +9520,7 @@ index 9e46464051a45b8b2e170e0e927e28cdc8cee95b..2c0b37e7ea5d6bb18a7b35e3e52b84ed return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); #if HAVE(TLS_PROTOCOL_VERSION_T) -@@ -963,6 +963,13 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se +@@ -969,6 +969,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics())); @@ -10617,10 +10617,10 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index f3031e792beb453f167d8813e88abecbc2b5cb7b..9b843cf1c0a975258e12f4f1e9d14fd9b4fb464e 100644 +index b692821cb7e902c104ba038a52d4382d9c3ca5f9..653ae248c7502fea6743b18a4e066416b22c5aba 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -293,11 +293,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -294,11 +294,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10635,7 +10635,7 @@ index f3031e792beb453f167d8813e88abecbc2b5cb7b..9b843cf1c0a975258e12f4f1e9d14fd9 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -306,6 +309,7 @@ UIProcess/PageLoadState.cpp +@@ -307,6 +310,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10643,7 +10643,7 @@ index f3031e792beb453f167d8813e88abecbc2b5cb7b..9b843cf1c0a975258e12f4f1e9d14fd9 UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -346,6 +350,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -347,6 +351,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10652,7 +10652,7 @@ index f3031e792beb453f167d8813e88abecbc2b5cb7b..9b843cf1c0a975258e12f4f1e9d14fd9 UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -467,7 +473,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -468,7 +474,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -11844,7 +11844,7 @@ index b7d2741c4b2c1ad4e34a1fab48fec61af1c6102d..eac99e94eec2e093fa3a1f2356f8d75e #include #include diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp -index 9631a3f19d24c29286ab634c0bd65cfbc83f9334..3be670503bda2ea35985fb63a9d8906a85ea69d6 100644 +index 44a423b97769a5e8bc1fd11aae3b428284fe820b..78b9491d7298daa64e3edc3d8335b4c9070f0cdd 100644 --- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp +++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp @@ -32,8 +32,11 @@ @@ -11868,7 +11868,7 @@ index 9631a3f19d24c29286ab634c0bd65cfbc83f9334..3be670503bda2ea35985fb63a9d8906a } void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent&, bool) -@@ -446,4 +449,23 @@ void PageClientImpl::selectionDidChange() +@@ -447,4 +450,23 @@ void PageClientImpl::selectionDidChange() m_view.selectionDidChange(); } @@ -12494,7 +12494,7 @@ index 8d5342e6c0a51ede17dd9b89e1e85b214172118e..cc7d0d8f98282c23d2b5d8531078650a { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index d89eba2b13471c4a3ce97982ffbf7a7ebbffc9ce..90b07ae3f483d786a6a349ef3a5bf351a43bb367 100644 +index c7190f8ff68aafc0d1cfc27016d40f175194248d..f302c5254bc15948abd868d2798c3fcc81490779 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -35,6 +35,7 @@ @@ -12573,10 +12573,10 @@ index d89eba2b13471c4a3ce97982ffbf7a7ebbffc9ce..90b07ae3f483d786a6a349ef3a5bf351 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index 2e6b4c1376192aa6109c4a918f343f4433a2b1c3..2706af99e9a1d4ca8603bbfaf93054690c480f92 100644 +index ea6f754b1d71306a2586dd4691c676a409cd244e..4fea36046fc2f5c64ecace016a0cb6766604bff7 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -408,7 +408,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -409,7 +409,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -12585,7 +12585,7 @@ index 2e6b4c1376192aa6109c4a918f343f4433a2b1c3..2706af99e9a1d4ca8603bbfaf9305469 #endif #if PLATFORM(IOS) -@@ -692,8 +692,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -697,8 +697,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -17250,10 +17250,10 @@ index 0000000000000000000000000000000000000000..fb4855b939efdd36acd011a41244a579 + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7dbdba25a 100644 +index baf562c51983a4e47fddd29284c9890f757d63cc..b5ab89f69bb0fbfcc17ccfc887b9d423f9c853ca 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp -@@ -245,6 +245,9 @@ +@@ -246,6 +246,9 @@ #if PLATFORM(GTK) #include "GtkSettingsManager.h" @@ -17263,7 +17263,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 #include #endif -@@ -617,6 +620,10 @@ WebPageProxy::~WebPageProxy() +@@ -618,6 +621,10 @@ WebPageProxy::~WebPageProxy() if (m_preferences->mediaSessionCoordinatorEnabled()) GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this); #endif @@ -17274,7 +17274,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 } // FIXME: Should return a const PageClient& and add a separate non-const -@@ -1004,6 +1011,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -1005,6 +1012,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -17282,7 +17282,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 } void WebPageProxy::didAttachToRunningProcess() -@@ -1333,6 +1341,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1334,6 +1342,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -17304,7 +17304,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1863,6 +1886,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1864,6 +1887,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -17336,7 +17336,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2053,6 +2101,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2054,6 +2102,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -17362,7 +17362,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2625,6 +2692,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2626,6 +2693,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -17371,7 +17371,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2635,6 +2704,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2636,6 +2705,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -17380,7 +17380,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2650,18 +2721,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2670,6 +2764,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2671,6 +2765,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17450,7 +17450,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2682,8 +2794,18 @@ void WebPageProxy::didStartDrag() +@@ -2683,8 +2795,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17470,7 +17470,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2788,16 +2910,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2789,16 +2911,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17516,7 +17516,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3017,7 +3161,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3018,7 +3162,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17525,7 +17525,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3050,7 +3194,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3051,7 +3195,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17534,7 +17534,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3439,6 +3583,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3440,6 +3584,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17543,7 +17543,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3505,6 +3651,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3506,6 +3652,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, Variant, Ref>&& navigationActionOrResponse, Ref&& sender, std::optional sandboxExtensionHandle, WillContinueLoadInNewProcess willContinueLoadInNewProcess) { @@ -17551,7 +17551,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4243,6 +4390,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4244,6 +4391,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17563,7 +17563,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4576,6 +4728,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4577,6 +4729,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17571,7 +17571,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4798,6 +4951,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4799,6 +4952,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17580,7 +17580,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 // If the provisional page's load fails then we destroy the provisional page. if (m_provisionalPage && m_provisionalPage->mainFrame() == frame && willContinueLoading == WillContinueLoading::No) m_provisionalPage = nullptr; -@@ -5250,7 +5405,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5251,7 +5406,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, NavigationActionData&& navigationActionData, FrameInfoData&& originatingFrameInfo, std::optional originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&& request, IPC::FormDataReference&& requestBody, WebCore::ResourceResponse&& redirectResponse, const UserData& userData, uint64_t listenerID) { @@ -17596,7 +17596,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5763,6 +5925,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5764,6 +5926,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa auto* originatingPage = m_process->webPage(originatingPageID); auto originatingFrameInfo = API::FrameInfo::create(WTFMove(originatingFrameInfoData), originatingPage); auto mainFrameURL = m_mainFrame ? m_mainFrame->url() : URL(); @@ -17604,7 +17604,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 auto completionHandler = [this, protectedThis = makeRef(*this), mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5803,6 +5966,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5804,6 +5967,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17612,7 +17612,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 } void WebPageProxy::exitFullscreenImmediately() -@@ -5838,6 +6002,10 @@ void WebPageProxy::closePage() +@@ -5839,6 +6003,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17623,7 +17623,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5874,6 +6042,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5875,6 +6043,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f } runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { @@ -17632,7 +17632,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -5895,6 +6065,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5896,6 +6066,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17641,7 +17641,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptConfirm(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](bool result) mutable { -@@ -5918,6 +6090,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -5919,6 +6091,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17650,7 +17650,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply), defaultValue](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptPrompt(page, message, defaultValue, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](auto& result) mutable { -@@ -6078,6 +6252,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6079,6 +6253,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17659,7 +17659,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7300,6 +7476,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7301,6 +7477,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17668,7 +17668,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 } break; } -@@ -7326,7 +7504,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7327,7 +7505,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) case WebEvent::RawKeyDown: case WebEvent::Char: { LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s (queue empty %d)", webKeyboardEventTypeString(type), m_keyEventQueue.isEmpty()); @@ -17676,7 +17676,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7345,7 +7522,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7346,7 +7523,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) // The call to doneWithKeyEvent may close this WebPage. // Protect against this being destroyed. Ref protect(*this); @@ -17684,7 +17684,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7354,6 +7530,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7355,6 +7531,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17692,7 +17692,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 } break; } -@@ -7686,7 +7863,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7687,7 +7864,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%d", reason); @@ -17704,7 +17704,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8059,6 +8239,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -8060,6 +8240,7 @@ static const Vector& mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17712,7 +17712,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8251,6 +8432,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8252,6 +8433,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -17721,7 +17721,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 #if PLATFORM(GTK) parameters.gtkSettings = GtkSettingsManager::singleton().settingsState(); #endif -@@ -8327,6 +8510,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8328,6 +8511,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17736,7 +17736,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = makeRef(*this), authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8420,6 +8611,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8421,6 +8612,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17753,7 +17753,7 @@ index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7 // 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 1d80d33cc6cef968c9d61525ac916ae470041e09..34a89fef2395e5c2218cce39df5a7e7b0b128e42 100644 +index 5fe9e3596abd7b942ca229abb37adaf5249bcde0..acbc2729463dd62cbc490e48151f948546c17271 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -38,6 +38,7 @@ @@ -17836,7 +17836,7 @@ index 1d80d33cc6cef968c9d61525ac916ae470041e09..34a89fef2395e5c2218cce39df5a7e7b RefPtr loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemesButNotAppLinks, API::Object* userData = nullptr); RefPtr loadFile(const String& fileURL, const String& resourceDirectoryURL, API::Object* userData = nullptr); RefPtr loadData(const IPC::DataReference&, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow); -@@ -1154,6 +1174,7 @@ public: +@@ -1153,6 +1173,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17844,7 +17844,7 @@ index 1d80d33cc6cef968c9d61525ac916ae470041e09..34a89fef2395e5c2218cce39df5a7e7b void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1228,14 +1249,20 @@ public: +@@ -1227,14 +1248,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17866,7 +17866,7 @@ index 1d80d33cc6cef968c9d61525ac916ae470041e09..34a89fef2395e5c2218cce39df5a7e7b #endif void processDidBecomeUnresponsive(); -@@ -1479,6 +1506,8 @@ public: +@@ -1478,6 +1505,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17875,7 +17875,7 @@ index 1d80d33cc6cef968c9d61525ac916ae470041e09..34a89fef2395e5c2218cce39df5a7e7b #endif #if ENABLE(WEB_CRYPTO) -@@ -2578,6 +2607,7 @@ private: +@@ -2581,6 +2610,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17883,7 +17883,7 @@ index 1d80d33cc6cef968c9d61525ac916ae470041e09..34a89fef2395e5c2218cce39df5a7e7b #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2830,6 +2860,20 @@ private: +@@ -2835,6 +2865,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17904,7 +17904,7 @@ index 1d80d33cc6cef968c9d61525ac916ae470041e09..34a89fef2395e5c2218cce39df5a7e7b #endif PageLoadState m_pageLoadState; -@@ -3043,6 +3087,9 @@ private: +@@ -3048,6 +3092,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17915,7 +17915,7 @@ index 1d80d33cc6cef968c9d61525ac916ae470041e09..34a89fef2395e5c2218cce39df5a7e7b #if PLATFORM(IOS_FAMILY) && ENABLE(DEVICE_ORIENTATION) std::unique_ptr m_webDeviceOrientationUpdateProviderProxy; diff --git a/Source/WebKit/UIProcess/WebPageProxy.messages.in b/Source/WebKit/UIProcess/WebPageProxy.messages.in -index c8c90feae1e330e732f1e3f7d0392c42ce8992d9..1cb9531e84fb14e6d62fb91193ca58e95a1a0c05 100644 +index a0b739536b603f48b6999b274b14e6262d312813..de57cdd358e32c227f5d687d04f8833b320d06fc 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17950,10 +17950,10 @@ index c8c90feae1e330e732f1e3f7d0392c42ce8992d9..1cb9531e84fb14e6d62fb91193ca58e9 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 2eab6bcb89b8b79a7dcf3cdcd49c06d5acd212b3..5db9888b36e24819dc85d15dc787f22b077dacee 100644 +index 693ca65515ca72d41033c4ce6c3099d2b87ae82a..4dc98dbaa93fd8563ec6185b69aea8d31d564dc9 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp -@@ -509,6 +509,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro +@@ -512,6 +512,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro // Arbitrarily choose the first process pool to host the service worker process. auto* processPool = processPools()[0]; @@ -17968,20 +17968,23 @@ index 2eab6bcb89b8b79a7dcf3cdcd49c06d5acd212b3..5db9888b36e24819dc85d15dc787f22b ASSERT(processPool); WebProcessProxy* serviceWorkerProcessProxy { nullptr }; -@@ -751,7 +759,10 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa +@@ -754,8 +762,12 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa #endif parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel(); - parameters.overrideLanguages = configuration().overrideLanguages(); +- LOG_WITH_STREAM(Language, stream << "WebProcessPool is initializing a new web process with overrideLanguages: " << parameters.overrideLanguages); + if (websiteDataStore && websiteDataStore->languagesForAutomation().size()) + parameters.overrideLanguages = websiteDataStore->languagesForAutomation(); -+ else ++ else { + parameters.overrideLanguages = configuration().overrideLanguages(); ++ LOG_WITH_STREAM(Language, stream << "WebProcessPool is initializing a new web process with overrideLanguages: " << parameters.overrideLanguages); ++ } parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument); parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure()); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp -index facc4205dfb826eb283a403a6123cffc368295ad..aa539e811e653e2fa5504b30c75f8e7d7cd5af60 100644 +index 5fac24152504d566a728b242ebae16567932f531..10734f82e85b20042bbd1e4c9eac7a06da308500 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp @@ -126,6 +126,11 @@ HashMap& WebProcessProxy::allProcesses() @@ -20067,10 +20070,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d12797824 100644 +index 6c1dc75da1fde7890a915e3d90dfd399c7333816..d70794e3e9f4b4f19552d609800369598a298cc1 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1958,6 +1958,18 @@ +@@ -1959,6 +1959,18 @@ DF0C5F28252ECB8E00D921DB /* WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F24252ECB8D00D921DB /* WKDownload.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2A252ECB8E00D921DB /* WKDownloadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2B252ED44000D921DB /* WKDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */; }; @@ -20089,7 +20092,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF84CEE4249AA24D009096F6 /* WKPDFHUDView.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF84CEE2249AA21F009096F6 /* WKPDFHUDView.mm */; }; -@@ -2014,6 +2026,9 @@ +@@ -2015,6 +2027,9 @@ E5BEF6822130C48000F31111 /* WebDataListSuggestionsDropdownIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E5BEF6802130C47F00F31111 /* WebDataListSuggestionsDropdownIOS.h */; }; E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -20099,7 +20102,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d F4094CBD2553053D003D73E3 /* DisplayListReaderHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = F4094CBB255304AF003D73E3 /* DisplayListReaderHandle.h */; }; F4094CBE25530540003D73E3 /* DisplayListWriterHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = F4094CB92553047E003D73E3 /* DisplayListWriterHandle.h */; }; F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; -@@ -5874,6 +5889,19 @@ +@@ -5876,6 +5891,19 @@ DF0C5F24252ECB8D00D921DB /* WKDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownload.h; sourceTree = ""; }; DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadInternal.h; sourceTree = ""; }; DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadDelegate.h; sourceTree = ""; }; @@ -20119,7 +20122,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHTTPCookieStorePrivate.h; sourceTree = ""; }; DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentWorldPrivate.h; sourceTree = ""; }; DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebWheelEvent.h; sourceTree = ""; }; -@@ -5992,6 +6020,14 @@ +@@ -5994,6 +6022,14 @@ ECA680D31E6904B500731D20 /* ExtraPrivateSymbolsForTAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtraPrivateSymbolsForTAPI.h; sourceTree = ""; }; ECBFC1DB1E6A4D66000300C7 /* ExtraPublicSymbolsForTAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtraPublicSymbolsForTAPI.h; sourceTree = ""; }; F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = ""; }; @@ -20134,7 +20137,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d F4094CB92553047E003D73E3 /* DisplayListWriterHandle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListWriterHandle.h; sourceTree = ""; }; F4094CBA2553047E003D73E3 /* DisplayListWriterHandle.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DisplayListWriterHandle.cpp; sourceTree = ""; }; F4094CBB255304AF003D73E3 /* DisplayListReaderHandle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListReaderHandle.h; sourceTree = ""; }; -@@ -6109,6 +6145,7 @@ +@@ -6110,6 +6146,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -20142,7 +20145,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -8021,6 +8058,7 @@ +@@ -8022,6 +8059,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -20150,7 +20153,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9087,6 +9125,7 @@ +@@ -9088,6 +9126,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -20158,7 +20161,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9519,6 +9558,12 @@ +@@ -9520,6 +9559,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -20171,7 +20174,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d ); path = Agents; sourceTree = ""; -@@ -9527,6 +9572,7 @@ +@@ -9528,6 +9573,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -20179,7 +20182,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -10021,6 +10067,12 @@ +@@ -10022,6 +10068,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -20192,7 +20195,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10320,6 +10372,7 @@ +@@ -10321,6 +10373,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -20200,7 +20203,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -10913,6 +10966,11 @@ +@@ -10915,6 +10968,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -20212,7 +20215,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -11771,6 +11829,7 @@ +@@ -11765,6 +11823,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -20220,7 +20223,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -12070,6 +12129,7 @@ +@@ -12064,6 +12123,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -20228,7 +20231,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -12085,6 +12145,7 @@ +@@ -12079,6 +12139,7 @@ 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, F40BBB41257FF46E0067463A /* GPUProcessWakeupMessageArguments.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -20236,7 +20239,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -12232,6 +12293,7 @@ +@@ -12226,6 +12287,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -20244,7 +20247,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 5183247C26168C62003F239E /* NetworkURLSchemeHandler.h in Headers */, -@@ -12318,6 +12380,7 @@ +@@ -12312,6 +12374,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -20252,7 +20255,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, -@@ -12339,6 +12402,7 @@ +@@ -12333,6 +12396,7 @@ CDAC20B423FB58F20021DEE3 /* RemoteCDMInstanceProxy.h in Headers */, CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, @@ -20260,7 +20263,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -12657,6 +12721,7 @@ +@@ -12651,6 +12715,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -20268,7 +20271,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -12786,6 +12851,7 @@ +@@ -12780,6 +12845,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -20276,7 +20279,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -12839,6 +12905,7 @@ +@@ -12833,6 +12899,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -20284,7 +20287,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -12995,6 +13062,7 @@ +@@ -12989,6 +13056,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -20292,7 +20295,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -14224,6 +14292,7 @@ +@@ -14218,6 +14286,7 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -20300,7 +20303,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */, 2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */, 2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */, -@@ -14242,6 +14311,7 @@ +@@ -14237,6 +14306,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, @@ -20308,7 +20311,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, 2D913443212CF9F000128AFD /* NetscapeBrowserFuncs.cpp in Sources */, 2D913444212CF9F000128AFD /* NetscapePlugin.cpp in Sources */, -@@ -14266,6 +14336,7 @@ +@@ -14261,6 +14331,7 @@ 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */, 2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */, 2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */, @@ -20316,7 +20319,7 @@ index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d 2D913447212CF9F000128AFD /* NPRuntimeObjectMap.cpp in Sources */, 2D913448212CF9F000128AFD /* NPRuntimeUtilities.cpp in Sources */, 2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */, -@@ -14571,6 +14642,7 @@ +@@ -14566,6 +14637,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -21000,7 +21003,7 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index 4d873e6bb2d08c37a57986b35ead605fd607379b..756d782d3ca490aaea400485fb35a5c4139e6af2 100644 +index 4e4bbcfbbcdaeea0b125f7b0d8e63f0dfe823af7..09af4beabab8801066569ef1b66725d8d60b3223 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp @@ -885,6 +885,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) @@ -21263,7 +21266,7 @@ index 4d873e6bb2d08c37a57986b35ead605fd607379b..756d782d3ca490aaea400485fb35a5c4 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 49a3641190a5810679d9dfbfff37307ed67a06ee..d0425ca065af5922a4eac8f27c1920ef02b7d528 100644 +index 78d830da42d9567cdf95cfa1fe3273302ff3b21c..6834af6c4775baad6123a5494a13ae66db58ae35 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -112,6 +112,10 @@ typedef struct _AtkObject AtkObject; @@ -21344,7 +21347,7 @@ index 49a3641190a5810679d9dfbfff37307ed67a06ee..d0425ca065af5922a4eac8f27c1920ef bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 93e99df600ef73e8947bb85e5aec57e7a2c741f9..ef554ed7091d837ace5ecdc6c24844dd6d70037d 100644 +index f87b459f86f70e60592463bd9e591777f9f02200..c50971d52f4c9c4967e333c544b7ae303fe7cb86 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -133,6 +133,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -21396,10 +21399,10 @@ index 93e99df600ef73e8947bb85e5aec57e7a2c741f9..ef554ed7091d837ace5ecdc6c24844dd RequestDragStart(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) RequestAdditionalItemsForDragSession(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -index 375e5e97370d73edce1afe1dc704a851921427f8..3ce7528d64a3695e6c87b78df3e219b855789fbb 100644 +index f39c829787946bc3929da96b1e931c8bb84eb74b..076cb3e1d9bca37fa0c6becd146e9ed84fbf0926 100644 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -@@ -833,21 +833,37 @@ String WebPage::platformUserAgent(const URL&) const +@@ -835,21 +835,37 @@ String WebPage::platformUserAgent(const URL&) const bool WebPage::hoverSupportedByPrimaryPointingDevice() const { @@ -21488,7 +21491,7 @@ index 0cf4707d44fb20a2cb125aaf9465d1282bf84651..59a6c108a4be8ef05ae01cb594898357 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index 26147dd5cba937e9cfa67780f8a0a9d8a54bb676..9984a062fecd2487d86405b7a52fca07f6f9fdac 100644 +index c9c3aaeed79974732241679c5ffb28516137890a..c5e0b5c5c65bd4839a2fb496dee4aa48ff20bf2c 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -88,6 +88,7 @@ @@ -21537,10 +21540,10 @@ index e4653412699e26e57a023ab8576cd9c9405f6561..866bc55ebe4ed9afe3397a78d34dee64 - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index 0608da5197ddf7ec6925d72b091aabd86cee38df..1fe2cafd88f18cdae5ef0add3ccfba65bb6fa381 100644 +index 976a3deb5779d8b26555ecc2ff246d34b411cc68..57398a5b0abdffca51bb89ba30710ade2c18d7f7 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm -@@ -4032,7 +4032,7 @@ IGNORE_WARNINGS_END +@@ -4035,7 +4035,7 @@ IGNORE_WARNINGS_END } #endif // PLATFORM(IOS_FAMILY) @@ -21549,7 +21552,7 @@ index 0608da5197ddf7ec6925d72b091aabd86cee38df..1fe2cafd88f18cdae5ef0add3ccfba65 - (NSArray *)_touchEventRegions { -@@ -4074,7 +4074,7 @@ IGNORE_WARNINGS_END +@@ -4077,7 +4077,7 @@ IGNORE_WARNINGS_END }).autorelease(); }