diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 6e3bc8a5fd..ad955de5ce 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1521 -Changed: pavel.feldman@gmail.com Thu 22 Jul 2021 07:09:44 AM PDT +1522 +Changed: dpino@igalia.com Wed Jul 28 18:26:16 UTC 2021 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 1421269939..19a9da897f 100644 --- a/browser_patches/webkit/UPSTREAM_CONFIG.sh +++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://git.webkit.org/git/WebKit.git" BASE_BRANCH="master" -BASE_REVISION="6120aa585d3a5380d49b9ab4eb03fe71423c7809" +BASE_REVISION="176ea7884efcb0e844e193f908b02fe940c28872" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 41f8adbb76..fd7e0829c1 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -1980,7 +1980,7 @@ index d8677555342ee0168223a0bc3ef54603b1a23460..b9ee7198a702cbc0241de3a33b65a694 41323A1D2665288B00B38623 /* packet_sequencer.cc in Sources */, 4131BF2D234B88200028A615 /* rtc_stats_collector.cc in Sources */, diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -index 9b681a741c311ec2246f5b6de5df46e6f713d90c..4039cfad08a83b2fc814a445ccc4b937348d862f 100644 +index 7a6bead41cfa95d415975b5ce63ddd9e00c6f295..a95f0980cd723b21b740ff4dda373e22e2d3ee78 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferences.yaml @@ -1020,7 +1020,7 @@ InspectorStartsAttached: @@ -2011,7 +2011,7 @@ index 9b681a741c311ec2246f5b6de5df46e6f713d90c..4039cfad08a83b2fc814a445ccc4b937 type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index c42ebeba067c15d7f5dc0e90ab3db452e922a4ed..4b31bafde566a1171a8c02c28a23eef0621241bd 100644 +index 4aaf759ab041d9bbd419ab32ba485936cf23fc7f..a13e708f98ef3a4efc4198d10929df1ff4c8ef70 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -635,9 +635,9 @@ MaskWebGLStringsEnabled: @@ -2217,7 +2217,7 @@ index 9bd5fde5bc38355e25bc09d05a045df31efaa259..3f3be653fef9930a7ac8a348c8b9f9a2 if (Systemd_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 57dfced7a146e003584942ac1d7b6d01561ffd25..94d60f4c06bec7706985c011c7c53d30e32e70e3 100644 +index 86f441e80a530a34d5ebd86c568fb97f973cb051..62e2824ef70dcfec8c87bced014271f1676cdbc7 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -391,7 +391,7 @@ @@ -2242,10 +2242,10 @@ index a840a487ff03a3c827455cab67faa8f83d20bfa9..29dd6a14f17295f1611451e6f5386617 if (Systemd_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index 237b0c645bd905b0f8460b9f96dbe076a1b6b59d..7a371cbe17757d61cc062dc1953b763a84ebe91a 100644 +index eba1f1700e125ac8a108c3cd10f5805ba9feedd1..a59d2c9e211a0d2a5c105b232e5fa559292735d1 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -779,6 +779,10 @@ JS_BINDING_IDLS := \ +@@ -780,6 +780,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2256,7 +2256,7 @@ index 237b0c645bd905b0f8460b9f96dbe076a1b6b59d..7a371cbe17757d61cc062dc1953b763a $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1309,9 +1313,6 @@ JS_BINDING_IDLS := \ +@@ -1310,9 +1314,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2416,7 +2416,7 @@ index ef168b76819216d984b7a2d0f760005fb9d24de8..2d6cf51f3b45191ad84106429d4f108f __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index f01b9927e3cc622e9ccc00b11eb2a2cdd03f7537..79de39825a95aa17bb51dc43519a9239615c2d2e 100644 +index 9b6358b1b0f161b66e777a91db4c76dd1f6f6deb..e47522cc1ba59e16a5bc355df672789fb8d66e0b 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -5354,6 +5354,14 @@ @@ -2434,7 +2434,7 @@ index f01b9927e3cc622e9ccc00b11eb2a2cdd03f7537..79de39825a95aa17bb51dc43519a9239 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, ); }; }; -@@ -16868,6 +16876,14 @@ +@@ -16871,6 +16879,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 = ""; }; @@ -2449,7 +2449,7 @@ index f01b9927e3cc622e9ccc00b11eb2a2cdd03f7537..79de39825a95aa17bb51dc43519a9239 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 = ""; }; -@@ -22489,7 +22505,12 @@ +@@ -22492,7 +22508,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2462,7 +2462,7 @@ index f01b9927e3cc622e9ccc00b11eb2a2cdd03f7537..79de39825a95aa17bb51dc43519a9239 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -28203,6 +28224,8 @@ +@@ -28206,6 +28227,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2471,7 +2471,7 @@ index f01b9927e3cc622e9ccc00b11eb2a2cdd03f7537..79de39825a95aa17bb51dc43519a9239 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -30642,6 +30665,7 @@ +@@ -30645,6 +30668,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2479,7 +2479,7 @@ index f01b9927e3cc622e9ccc00b11eb2a2cdd03f7537..79de39825a95aa17bb51dc43519a9239 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -31650,6 +31674,7 @@ +@@ -31656,6 +31680,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2487,7 +2487,7 @@ index f01b9927e3cc622e9ccc00b11eb2a2cdd03f7537..79de39825a95aa17bb51dc43519a9239 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -33690,6 +33715,7 @@ +@@ -33696,6 +33721,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2495,7 +2495,7 @@ index f01b9927e3cc622e9ccc00b11eb2a2cdd03f7537..79de39825a95aa17bb51dc43519a9239 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35755,9 +35781,11 @@ +@@ -35761,9 +35787,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2507,7 +2507,7 @@ index f01b9927e3cc622e9ccc00b11eb2a2cdd03f7537..79de39825a95aa17bb51dc43519a9239 B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36719,6 +36747,7 @@ +@@ -36725,6 +36753,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2515,7 +2515,7 @@ index f01b9927e3cc622e9ccc00b11eb2a2cdd03f7537..79de39825a95aa17bb51dc43519a9239 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36805,6 +36834,7 @@ +@@ -36811,6 +36840,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2523,7 +2523,7 @@ index f01b9927e3cc622e9ccc00b11eb2a2cdd03f7537..79de39825a95aa17bb51dc43519a9239 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36853,6 +36883,7 @@ +@@ -36859,6 +36889,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2531,7 +2531,7 @@ index f01b9927e3cc622e9ccc00b11eb2a2cdd03f7537..79de39825a95aa17bb51dc43519a9239 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -37385,6 +37416,7 @@ +@@ -37391,6 +37422,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -5663,7 +5663,7 @@ index 0dcb47556d04874878656e459c9bac9af64dcfbf..df57e9a47160bfbeb8188d80afd175c7 void ProgressTracker::incrementProgress(unsigned long identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index 4862b6a779dfed8713af405e91dcafed52ee9981..945461edf62df868a1d836d2cf166d4c76e51031 100644 +index 3931498518012bbc719d2e14eecd6ae44cba87ba..606ba8c8ec8639a3fe21a018dead8534da869557 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -308,7 +308,7 @@ public: @@ -5676,7 +5676,7 @@ index 4862b6a779dfed8713af405e91dcafed52ee9981..945461edf62df868a1d836d2cf166d4c #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 05cda6581924a26cf705c98295fd428e4364f73b..60288898598c45f30c81d95f234cd22bf6b296b3 100644 +index eaef0b555afb4949f54991dc47c3de4e23b55a6f..864f17614346ade3c18982ef3be6433f978b72a4 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -126,6 +126,7 @@ @@ -5811,7 +5811,7 @@ index 05cda6581924a26cf705c98295fd428e4364f73b..60288898598c45f30c81d95f234cd22b m_touchPressed = touches->length() > 0; if (allTouchReleased) diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h -index a5af404614e6cf86d0bc5cc65024553032f8bb42..769570c304bce902ac17f130d139224f41bf1503 100644 +index d5caa65b1fe2650c02a90e132b283981529011e5..e24ed229d880b83774db100e9e41453e4909f55c 100644 --- a/Source/WebCore/page/EventHandler.h +++ b/Source/WebCore/page/EventHandler.h @@ -136,9 +136,7 @@ public: @@ -6399,7 +6399,7 @@ index 1b77026f51092001cda86e32480890395b145b2e..6026bc23508016454f331b06c9f071a8 struct SnapshotOptions { diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp -index 0de47d19a0c960079caec536db2a2799e53f7155..bd428f975b4010f3179d6688df775d24a977e670 100644 +index 4dec390678b6b76ceb314a403ca7fde12cce0d01..6f1f2f13c8b5a31820b52cfd44ca768de140c553 100644 --- a/Source/WebCore/page/FrameView.cpp +++ b/Source/WebCore/page/FrameView.cpp @@ -3026,7 +3026,7 @@ void FrameView::setBaseBackgroundColor(const Color& backgroundColor) @@ -9270,7 +9270,7 @@ index 4ebbd90cc645df5f9ddbb860d08aa3eb053c2ff6..3d5d56a5a1b407f27e533c9c71d3e4c4 NetworkDataTaskCocoa(NetworkSession&, NetworkDataTaskClient&, const NetworkLoadParameters&); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm -index d3ff8ebeb67855247f4c2563c8209becc58d8bb1..2b4e99493bbc60b2f1209c114d3d4e9cd53a758d 100644 +index 6870851925288571bd6c763b3e60313d9260e98c..a7462761a3d6ce0a2a74d84b80f3db297c2cd77a 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm @@ -42,6 +42,7 @@ @@ -9281,7 +9281,7 @@ index d3ff8ebeb67855247f4c2563c8209becc58d8bb1..2b4e99493bbc60b2f1209c114d3d4e9c #import #import #import -@@ -740,4 +741,59 @@ void NetworkDataTaskCocoa::checkTAO(const WebCore::ResourceResponse& response) +@@ -743,4 +744,59 @@ void NetworkDataTaskCocoa::checkTAO(const WebCore::ResourceResponse& response) networkLoadMetrics().failsTAOCheck = !passesTimingAllowOriginCheck(response, *origin); } @@ -9342,10 +9342,10 @@ index d3ff8ebeb67855247f4c2563c8209becc58d8bb1..2b4e99493bbc60b2f1209c114d3d4e9c + } diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 535e098e4ead24c7f053a91c26630ed9b0302a4f..dad2f75bba8cd40daa3aea8de2e858ea1237eee1 100644 +index c837ee5aeee86f648a3c766387e2588e49eaf822..115e695d4e3fc6b18bf2eddaa5e1f7b314827ee2 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -703,7 +703,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se +@@ -704,7 +704,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se NegotiatedLegacyTLS negotiatedLegacyTLS = NegotiatedLegacyTLS::No; if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { @@ -9354,7 +9354,7 @@ index 535e098e4ead24c7f053a91c26630ed9b0302a4f..dad2f75bba8cd40daa3aea8de2e858ea return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); #if HAVE(TLS_PROTOCOL_VERSION_T) -@@ -962,6 +962,13 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se +@@ -963,6 +963,13 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics())); @@ -9563,10 +9563,10 @@ index faf19632530172520e9705c9b1ccbe46b57738c3..b6e56166359d91ab00839ff64221c8c3 if (!error) return true; diff --git a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp -index 06ca252b043959d457814d45886949a85b1a19c1..597e63aca71d213526d953ead357fbc0e0405f8d 100644 +index 3a8e5bd6ba097d3d56414b863e332b12f92cd59a..0eacc59cc507d8909879cf5d02f2d346d502b27d 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp -@@ -113,6 +113,11 @@ static gboolean webSocketAcceptCertificateCallback(GTlsConnection* connection, G +@@ -115,6 +115,11 @@ static gboolean webSocketAcceptCertificateCallback(GTlsConnection* connection, G return !session->soupNetworkSession().checkTLSErrors(soupURIToURL(soup_message_get_uri(soupMessage)), certificate, errors); } @@ -9578,7 +9578,7 @@ index 06ca252b043959d457814d45886949a85b1a19c1..597e63aca71d213526d953ead357fbc0 static void webSocketMessageNetworkEventCallback(SoupMessage* soupMessage, GSocketClientEvent event, GIOStream* connection, NetworkSessionSoup* session) { if (event != G_SOCKET_CLIENT_TLS_HANDSHAKING) -@@ -123,6 +128,15 @@ static void webSocketMessageNetworkEventCallback(SoupMessage* soupMessage, GSock +@@ -125,6 +130,15 @@ static void webSocketMessageNetworkEventCallback(SoupMessage* soupMessage, GSock } #endif @@ -9594,7 +9594,7 @@ index 06ca252b043959d457814d45886949a85b1a19c1..597e63aca71d213526d953ead357fbc0 std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPageProxyIdentifier, NetworkSocketChannel& channel, const ResourceRequest& request, const String& protocol) { GRefPtr soupMessage = request.createSoupMessage(blobRegistry()); -@@ -131,14 +145,21 @@ std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPagePr +@@ -133,14 +147,21 @@ std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPagePr if (request.url().protocolIs("wss")) { #if USE(SOUP2) @@ -9624,10 +9624,10 @@ index 06ca252b043959d457814d45886949a85b1a19c1..597e63aca71d213526d953ead357fbc0 } return makeUnique(channel, request, soupSession(), soupMessage.get(), protocol); diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index 8986082af78547fcce4475d05315d3819f914094..dd36140f14413ff911ec096c585673da4d11364f 100644 +index 88f0a606152ff29304c621ffe4e53f66797a8cbf..4fcf4c16c13de179446c03a0a9dd4467907dacaa 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake -@@ -451,6 +451,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -452,6 +452,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GSTREAMER_PBUTILS_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -9637,7 +9637,7 @@ index 8986082af78547fcce4475d05315d3819f914094..dd36140f14413ff911ec096c585673da ) if (USE_WPE_RENDERER) -@@ -504,6 +507,9 @@ if (USE_LIBWEBRTC) +@@ -505,6 +508,9 @@ if (USE_LIBWEBRTC) list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/libwebrtc/Source/" "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc" @@ -9647,7 +9647,7 @@ index 8986082af78547fcce4475d05315d3819f914094..dd36140f14413ff911ec096c585673da ) endif () -@@ -518,6 +524,12 @@ if (ENABLE_MEDIA_STREAM) +@@ -519,6 +525,12 @@ if (ENABLE_MEDIA_STREAM) ) endif () @@ -9661,10 +9661,10 @@ index 8986082af78547fcce4475d05315d3819f914094..dd36140f14413ff911ec096c585673da set(WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2GTK_INSTALLED_HEADERS}) list(REMOVE_ITEM WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitEnumTypes.h) diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake -index e397c07b7cf7170f4d833997d499b4ac7ffcd898..6e20e31688aaf1d49d3efb5aab42c0330f441a9b 100644 +index 86724c67e8871a940a4f93f65cff2548a4c1f327..616ab800c4faa2d6715bc32de8cd384d22d55e8c 100644 --- a/Source/WebKit/PlatformWPE.cmake +++ b/Source/WebKit/PlatformWPE.cmake -@@ -154,6 +154,7 @@ set(WPE_API_INSTALLED_HEADERS +@@ -155,6 +155,7 @@ set(WPE_API_INSTALLED_HEADERS ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitOptionMenuItem.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPermissionRequest.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPlugin.h @@ -9672,7 +9672,7 @@ index e397c07b7cf7170f4d833997d499b4ac7ffcd898..6e20e31688aaf1d49d3efb5aab42c033 ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPolicyDecision.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitRectangle.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitResponsePolicyDecision.h -@@ -278,6 +279,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES +@@ -279,6 +280,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES "${WEBKIT_DIR}/UIProcess/API/wpe" "${WEBKIT_DIR}/UIProcess/CoordinatedGraphics" "${WEBKIT_DIR}/UIProcess/geoclue" @@ -9680,7 +9680,7 @@ index e397c07b7cf7170f4d833997d499b4ac7ffcd898..6e20e31688aaf1d49d3efb5aab42c033 "${WEBKIT_DIR}/UIProcess/gstreamer" "${WEBKIT_DIR}/UIProcess/linux" "${WEBKIT_DIR}/UIProcess/soup" -@@ -300,8 +302,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -301,8 +303,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GIO_UNIX_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -10519,7 +10519,7 @@ index 29f7fe07db66bde30a715b59f71e4f13ba553383..6a256aae5d79c1db984bd25f28879e73 UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm UIProcess/Inspector/mac/WKInspectorViewController.mm diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt -index 95b4ffb769d711b6a485a005f7a3f58172fcf1ad..a3315174dcce192bf6b04cb98f9d83630c3983fc 100644 +index eb59de7ba5bc69f414d2a72038b629d7a7b2ad4d..5ffba950e0592576f408e5e16c9ad02701063e11 100644 --- a/Source/WebKit/SourcesGTK.txt +++ b/Source/WebKit/SourcesGTK.txt @@ -126,6 +126,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify @@ -10530,7 +10530,7 @@ index 95b4ffb769d711b6a485a005f7a3f58172fcf1ad..a3315174dcce192bf6b04cb98f9d8363 UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify UIProcess/API/glib/WebKitCookieManager.cpp @no-unify UIProcess/API/glib/WebKitCredential.cpp @no-unify -@@ -239,6 +240,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp +@@ -240,6 +241,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp UIProcess/cairo/BackingStoreCairo.cpp @no-unify @@ -10538,7 +10538,7 @@ index 95b4ffb769d711b6a485a005f7a3f58172fcf1ad..a3315174dcce192bf6b04cb98f9d8363 UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -256,6 +258,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify +@@ -257,6 +259,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify UIProcess/gtk/WebDateTimePickerGtk.cpp UIProcess/gtk/GtkSettingsManager.cpp UIProcess/gtk/HardwareAccelerationManager.cpp @@ -10546,7 +10546,7 @@ index 95b4ffb769d711b6a485a005f7a3f58172fcf1ad..a3315174dcce192bf6b04cb98f9d8363 UIProcess/gtk/KeyBindingTranslator.cpp UIProcess/gtk/PointerLockManager.cpp @no-unify UIProcess/gtk/PointerLockManagerWayland.cpp @no-unify -@@ -268,6 +271,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify +@@ -269,6 +272,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify UIProcess/gtk/WebColorPickerGtk.cpp UIProcess/gtk/WebContextMenuProxyGtk.cpp UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp @@ -10556,7 +10556,7 @@ index 95b4ffb769d711b6a485a005f7a3f58172fcf1ad..a3315174dcce192bf6b04cb98f9d8363 UIProcess/gtk/WebPasteboardProxyGtk.cpp UIProcess/gtk/WebPopupMenuProxyGtk.cpp diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt -index f8fb1511f2a019a08a896f7cbf45ca470da28185..71283a18036b0d50dc2fa60a6e2e61897211bc8a 100644 +index 2a4f406abb8afb304ee38d62b3a2bf760894cda6..fee65b63f3f1de3fe72f05b1eab524609772675f 100644 --- a/Source/WebKit/SourcesWPE.txt +++ b/Source/WebKit/SourcesWPE.txt @@ -86,6 +86,7 @@ Shared/glib/ProcessExecutablePathGLib.cpp @@ -10575,7 +10575,7 @@ index f8fb1511f2a019a08a896f7cbf45ca470da28185..71283a18036b0d50dc2fa60a6e2e6189 UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify UIProcess/API/glib/WebKitCookieManager.cpp @no-unify UIProcess/API/glib/WebKitCredential.cpp @no-unify -@@ -151,6 +153,7 @@ UIProcess/API/glib/WebKitOptionMenu.cpp @no-unify +@@ -152,6 +154,7 @@ UIProcess/API/glib/WebKitOptionMenu.cpp @no-unify UIProcess/API/glib/WebKitOptionMenuItem.cpp @no-unify UIProcess/API/glib/WebKitPermissionRequest.cpp @no-unify UIProcess/API/glib/WebKitPlugin.cpp @no-unify @@ -10583,7 +10583,7 @@ index f8fb1511f2a019a08a896f7cbf45ca470da28185..71283a18036b0d50dc2fa60a6e2e6189 UIProcess/API/glib/WebKitPolicyDecision.cpp @no-unify UIProcess/API/glib/WebKitPrivate.cpp @no-unify UIProcess/API/glib/WebKitProtocolHandler.cpp @no-unify -@@ -182,6 +185,7 @@ UIProcess/API/wpe/InputMethodFilterWPE.cpp @no-unify +@@ -183,6 +186,7 @@ UIProcess/API/wpe/InputMethodFilterWPE.cpp @no-unify UIProcess/API/wpe/PageClientImpl.cpp @no-unify UIProcess/API/wpe/TouchGestureController.cpp @no-unify UIProcess/API/wpe/WebKitColor.cpp @no-unify @@ -10591,7 +10591,7 @@ index f8fb1511f2a019a08a896f7cbf45ca470da28185..71283a18036b0d50dc2fa60a6e2e6189 UIProcess/API/wpe/WebKitInputMethodContextWPE.cpp @no-unify UIProcess/API/wpe/WebKitPopupMenu.cpp @no-unify UIProcess/API/wpe/WebKitRectangle.cpp @no-unify -@@ -198,6 +202,7 @@ UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +@@ -199,6 +203,7 @@ UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp UIProcess/geoclue/GeoclueGeolocationProvider.cpp @@ -10599,7 +10599,7 @@ index f8fb1511f2a019a08a896f7cbf45ca470da28185..71283a18036b0d50dc2fa60a6e2e6189 UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -220,6 +225,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp +@@ -221,6 +226,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp UIProcess/soup/WebCookieManagerProxySoup.cpp UIProcess/soup/WebProcessPoolSoup.cpp @@ -10611,7 +10611,7 @@ index f8fb1511f2a019a08a896f7cbf45ca470da28185..71283a18036b0d50dc2fa60a6e2e6189 UIProcess/wpe/WebPageProxyWPE.cpp WebProcess/GPU/media/gstreamer/VideoLayerRemoteGStreamer.cpp -@@ -248,6 +258,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp +@@ -249,6 +259,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp @@ -10621,7 +10621,7 @@ index f8fb1511f2a019a08a896f7cbf45ca470da28185..71283a18036b0d50dc2fa60a6e2e6189 WebProcess/WebPage/AcceleratedSurface.cpp diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp -index 95ffe0584caa71911dabce619d8429df55daece0..afd48bd8e3bc1ada31d6b2d1d84097f878bb36f5 100644 +index 8364a0c021217339f119faed9e3a1666f1c3fdd0..9ce2df000ad793467ae71fbdfb62146234b2145a 100644 --- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp +++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp @@ -54,6 +54,9 @@ Ref ProcessPoolConfiguration::copy() @@ -10635,10 +10635,10 @@ index 95ffe0584caa71911dabce619d8429df55daece0..afd48bd8e3bc1ada31d6b2d1d84097f8 copy->m_shouldTakeUIBackgroundAssertion = this->m_shouldTakeUIBackgroundAssertion; copy->m_shouldCaptureDisplayInUIProcess = this->m_shouldCaptureDisplayInUIProcess; diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h -index fa69a4b457ee31cec78765e262b0af13fe40b87d..a0134fe49a4404f0441bfa8e8720273c6cad3835 100644 +index bc05fe15f5eacdac6f25cde2a6a488fb84c3e03c..79a9082771d4af4ad31157fac8ca2e2af69af148 100644 --- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h +++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h -@@ -101,6 +101,11 @@ public: +@@ -102,6 +102,11 @@ public: const Vector& overrideLanguages() const { return m_overrideLanguages; } void setOverrideLanguages(Vector&& languages) { m_overrideLanguages = WTFMove(languages); } @@ -10650,7 +10650,7 @@ index fa69a4b457ee31cec78765e262b0af13fe40b87d..a0134fe49a4404f0441bfa8e8720273c bool alwaysRunsAtBackgroundPriority() const { return m_alwaysRunsAtBackgroundPriority; } void setAlwaysRunsAtBackgroundPriority(bool alwaysRunsAtBackgroundPriority) { m_alwaysRunsAtBackgroundPriority = alwaysRunsAtBackgroundPriority; } -@@ -164,6 +169,9 @@ private: +@@ -170,6 +175,9 @@ private: bool m_attrStyleEnabled { false }; bool m_shouldThrowExceptionForGlobalConstantRedeclaration { true }; Vector m_overrideLanguages; @@ -11278,7 +11278,7 @@ index 0000000000000000000000000000000000000000..e0b1da48465c850f541532ed961d1b77 +WebKit::WebPageProxy* webkitBrowserInspectorCreateNewPageInContext(WebKitWebContext*); +void webkitBrowserInspectorQuitApplication(); diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp -index 0afd97be464ceb609f1c43aa720f3b4c297778bd..0826356fe6d35615e9b2c84647dfe3dadab73eb1 100644 +index 561bbd0182786859e37ed089e3ec6aa118def654..a7afe845dac301f39beb31bd03843be70efca605 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp @@ -98,6 +98,10 @@ private: @@ -11293,10 +11293,10 @@ index 0afd97be464ceb609f1c43aa720f3b4c297778bd..0826356fe6d35615e9b2c84647dfe3da bool canRunBeforeUnloadConfirmPanel() const final { return true; } diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -index 6dd9f20e4ff2bda0184d0645301cef22e47dcf15..7a5f57daa83818b2dfb4bcbcbf5c18c8621a6b25 100644 +index bd2d4d20206f8b86fe4cd1ac90d90b79c348ed9d..b8a366703f04f589c2caa84349f8e77e38e741fb 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -@@ -118,8 +118,8 @@ enum { +@@ -120,8 +120,8 @@ enum { PROP_LOCAL_STORAGE_DIRECTORY, #endif PROP_WEBSITE_DATA_MANAGER, @@ -11306,7 +11306,7 @@ index 6dd9f20e4ff2bda0184d0645301cef22e47dcf15..7a5f57daa83818b2dfb4bcbcbf5c18c8 #if !USE(GTK4) PROP_USE_SYSTEM_APPEARANCE_FOR_SCROLLBARS, #endif -@@ -207,8 +207,8 @@ struct _WebKitWebContextPrivate { +@@ -210,8 +210,8 @@ struct _WebKitWebContextPrivate { RefPtr processPool; bool clientsDetached; @@ -11316,7 +11316,7 @@ index 6dd9f20e4ff2bda0184d0645301cef22e47dcf15..7a5f57daa83818b2dfb4bcbcbf5c18c8 #if !USE(GTK4) bool useSystemAppearanceForScrollbars; #endif -@@ -307,11 +307,9 @@ WEBKIT_DEFINE_TYPE(WebKitWebContext, webkit_web_context, G_TYPE_OBJECT) +@@ -312,11 +312,9 @@ WEBKIT_DEFINE_TYPE(WebKitWebContext, webkit_web_context, G_TYPE_OBJECT) static const char* injectedBundleDirectory() { @@ -11328,7 +11328,7 @@ index 6dd9f20e4ff2bda0184d0645301cef22e47dcf15..7a5f57daa83818b2dfb4bcbcbf5c18c8 #if PLATFORM(GTK) static const char* injectedBundlePath = LIBDIR G_DIR_SEPARATOR_S "webkit2gtk-" WEBKITGTK_API_VERSION_STRING -@@ -336,10 +334,10 @@ static void webkitWebContextGetProperty(GObject* object, guint propID, GValue* v +@@ -341,10 +339,10 @@ static void webkitWebContextGetProperty(GObject* object, guint propID, GValue* v case PROP_WEBSITE_DATA_MANAGER: g_value_set_object(value, webkit_web_context_get_website_data_manager(context)); break; @@ -11340,7 +11340,7 @@ index 6dd9f20e4ff2bda0184d0645301cef22e47dcf15..7a5f57daa83818b2dfb4bcbcbf5c18c8 #if !USE(GTK4) case PROP_USE_SYSTEM_APPEARANCE_FOR_SCROLLBARS: g_value_set_boolean(value, webkit_web_context_get_use_system_appearance_for_scrollbars(context)); -@@ -366,10 +364,10 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa +@@ -371,10 +369,10 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa context->priv->websiteDataManager = manager ? WEBKIT_WEBSITE_DATA_MANAGER(manager) : nullptr; break; } @@ -11352,7 +11352,7 @@ index 6dd9f20e4ff2bda0184d0645301cef22e47dcf15..7a5f57daa83818b2dfb4bcbcbf5c18c8 #if !USE(GTK4) case PROP_USE_SYSTEM_APPEARANCE_FOR_SCROLLBARS: webkit_web_context_set_use_system_appearance_for_scrollbars(context, g_value_get_boolean(value)); -@@ -381,10 +379,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa +@@ -391,10 +389,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa } } @@ -11372,7 +11372,7 @@ index 6dd9f20e4ff2bda0184d0645301cef22e47dcf15..7a5f57daa83818b2dfb4bcbcbf5c18c8 GUniquePtr bundleFilename(g_build_filename(injectedBundleDirectory(), INJECTED_BUNDLE_FILENAME, nullptr)); WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object); -@@ -393,8 +400,8 @@ static void webkitWebContextConstructed(GObject* object) +@@ -403,8 +410,8 @@ static void webkitWebContextConstructed(GObject* object) API::ProcessPoolConfiguration configuration; configuration.setInjectedBundlePath(FileSystem::stringFromFileSystemRepresentation(bundleFilename.get())); configuration.setUsesWebProcessCache(true); @@ -11382,7 +11382,7 @@ index 6dd9f20e4ff2bda0184d0645301cef22e47dcf15..7a5f57daa83818b2dfb4bcbcbf5c18c8 #if !USE(GTK4) configuration.setUseSystemAppearanceForScrollbars(priv->useSystemAppearanceForScrollbars); #endif -@@ -431,6 +438,8 @@ static void webkitWebContextConstructed(GObject* object) +@@ -446,6 +453,8 @@ static void webkitWebContextConstructed(GObject* object) static void webkitWebContextDispose(GObject* object) { @@ -11391,7 +11391,7 @@ index 6dd9f20e4ff2bda0184d0645301cef22e47dcf15..7a5f57daa83818b2dfb4bcbcbf5c18c8 WebKitWebContextPrivate* priv = WEBKIT_WEB_CONTEXT(object)->priv; if (!priv->clientsDetached) { priv->clientsDetached = true; -@@ -499,7 +508,6 @@ static void webkit_web_context_class_init(WebKitWebContextClass* webContextClass +@@ -514,7 +523,6 @@ static void webkit_web_context_class_init(WebKitWebContextClass* webContextClass WEBKIT_TYPE_WEBSITE_DATA_MANAGER, static_cast(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); @@ -11399,7 +11399,7 @@ index 6dd9f20e4ff2bda0184d0645301cef22e47dcf15..7a5f57daa83818b2dfb4bcbcbf5c18c8 /** * WebKitWebContext:process-swap-on-cross-site-navigation-enabled: * -@@ -521,6 +529,7 @@ static void webkit_web_context_class_init(WebKitWebContextClass* webContextClass +@@ -536,6 +544,7 @@ static void webkit_web_context_class_init(WebKitWebContextClass* webContextClass FALSE, static_cast(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); @@ -11417,7 +11417,7 @@ index 78d1578f94793e9e59a3d4d2b33e79ea8530fa04..493cdadac3873508b3efa3048638e73a #endif +int webkitWebContextExistingCount(); diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp -index d93eab93a79bbe3005a510224798ff9956c9ae19..5d4c6b65f2b755ba1ea9d8a1a3e66651cf1c7d88 100644 +index f044d10f7ff4388b5009195ddccf5c5ab49a9477..d622c69f2e617ab34fd327b550fd5985b570e6af 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp @@ -32,6 +32,7 @@ @@ -11452,7 +11452,7 @@ index d93eab93a79bbe3005a510224798ff9956c9ae19..5d4c6b65f2b755ba1ea9d8a1a3e66651 DECIDE_POLICY, PERMISSION_REQUEST, -@@ -445,6 +447,9 @@ void WebKitWebViewClient::handleDownloadRequest(WKWPE::View&, DownloadProxy& dow +@@ -465,6 +467,9 @@ void WebKitWebViewClient::handleDownloadRequest(WKWPE::View&, DownloadProxy& dow void WebKitWebViewClient::frameDisplayed(WKWPE::View&) { @@ -11462,7 +11462,7 @@ index d93eab93a79bbe3005a510224798ff9956c9ae19..5d4c6b65f2b755ba1ea9d8a1a3e66651 { SetForScope inFrameDisplayedGuard(m_webView->priv->inFrameDisplayed, true); for (const auto& callback : m_webView->priv->frameDisplayedCallbacks) { -@@ -475,6 +480,7 @@ void WebKitWebViewClient::didReceiveUserMessage(WKWPE::View&, UserMessage&& mess +@@ -495,6 +500,7 @@ void WebKitWebViewClient::didReceiveUserMessage(WKWPE::View&, UserMessage&& mess { webkitWebViewDidReceiveUserMessage(m_webView, WTFMove(message), WTFMove(completionHandler)); } @@ -11470,7 +11470,7 @@ index d93eab93a79bbe3005a510224798ff9956c9ae19..5d4c6b65f2b755ba1ea9d8a1a3e66651 #endif static gboolean webkitWebViewLoadFail(WebKitWebView* webView, WebKitLoadEvent, const char* failingURI, GError* error) -@@ -526,7 +532,7 @@ static gboolean webkitWebViewDecidePolicy(WebKitWebView*, WebKitPolicyDecision* +@@ -546,7 +552,7 @@ static gboolean webkitWebViewDecidePolicy(WebKitWebView*, WebKitPolicyDecision* static gboolean webkitWebViewPermissionRequest(WebKitWebView*, WebKitPermissionRequest* request) { @@ -11479,7 +11479,7 @@ index d93eab93a79bbe3005a510224798ff9956c9ae19..5d4c6b65f2b755ba1ea9d8a1a3e66651 if (WEBKIT_IS_POINTER_LOCK_PERMISSION_REQUEST(request)) { webkit_permission_request_allow(request); return TRUE; -@@ -1609,6 +1615,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) +@@ -1723,6 +1729,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) G_TYPE_BOOLEAN, 1, WEBKIT_TYPE_SCRIPT_DIALOG); @@ -11495,7 +11495,7 @@ index d93eab93a79bbe3005a510224798ff9956c9ae19..5d4c6b65f2b755ba1ea9d8a1a3e66651 /** * WebKitWebView::decide-policy: * @web_view: the #WebKitWebView on which the signal is emitted -@@ -2441,6 +2456,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const +@@ -2555,6 +2570,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const webkit_script_dialog_unref(webView->priv->currentScriptDialog); } @@ -11520,7 +11520,7 @@ index d93eab93a79bbe3005a510224798ff9956c9ae19..5d4c6b65f2b755ba1ea9d8a1a3e66651 { if (!webView->priv->currentScriptDialog) diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebViewPrivate.h b/Source/WebKit/UIProcess/API/glib/WebKitWebViewPrivate.h -index d7a43204be693f2a7ef86240eaf567fe70052a2c..0e247c48858522e55f65957fd0d1e147cafce092 100644 +index fbab1afe9ca09f5e6a6793f5065f08fc76bfedaf..23f66f4da6229d88271e4b732414088b7cc0397e 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebViewPrivate.h +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebViewPrivate.h @@ -60,6 +60,7 @@ void webkitWebViewRunJavaScriptAlert(WebKitWebView*, const CString& message, Fun @@ -11666,7 +11666,7 @@ index 187df5e92217097766a94ad21ec631273a9764fa..64720ed966eba1578fa0a869561dd7ba + +WebKit::AcceleratedBackingStore* webkitWebViewBaseGetAcceleratedBackingStore(WebKitWebViewBase*); diff --git a/Source/WebKit/UIProcess/API/gtk/webkit2.h b/Source/WebKit/UIProcess/API/gtk/webkit2.h -index ecbe433ed888353b1e6013943b4463835c3582d2..7385877fe664515814fc5c3380a2b7298ff90e1e 100644 +index b7d2741c4b2c1ad4e34a1fab48fec61af1c6102d..eac99e94eec2e093fa3a1f2356f8d75edb2dbd75 100644 --- a/Source/WebKit/UIProcess/API/gtk/webkit2.h +++ b/Source/WebKit/UIProcess/API/gtk/webkit2.h @@ -32,6 +32,7 @@ @@ -12098,10 +12098,10 @@ index e4b92ace1531090ae38a7aec3d3d4febf19aee84..43690f9ef4969a39084501613bfc00a7 + +cairo_surface_t* webkitWebViewBackendTakeScreenshot(WebKitWebViewBackend*); diff --git a/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt b/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt -index 4b66bb95f1326bd83832b68f429c21ef68808f38..14123cde138a053111ecc3aefa1b11a6b7176321 100644 +index 13cfb04f3c47b65b317e98772140b8a5a4816c50..da61698eae23487becfe5822df398837216cffb3 100644 --- a/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt +++ b/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt -@@ -320,6 +320,8 @@ WEBKIT_TYPE_WEB_VIEW_BACKEND +@@ -327,6 +327,8 @@ WEBKIT_TYPE_WEB_VIEW_BACKEND WebKitWebViewBackend webkit_web_view_backend_get_wpe_backend webkit_web_view_backend_new @@ -12111,7 +12111,7 @@ index 4b66bb95f1326bd83832b68f429c21ef68808f38..14123cde138a053111ecc3aefa1b11a6 webkit_web_view_backend_get_type diff --git a/Source/WebKit/UIProcess/API/wpe/webkit.h b/Source/WebKit/UIProcess/API/wpe/webkit.h -index 87929257bf73aba684a380accd8c1bbb394bad87..5d47bce94b6d4b9e54fc1fef794bde7506310e32 100644 +index 5c93d760f734a12f614899545135fdf770164575..220233502be810de49e1090c32b0a4f79ea362ca 100644 --- a/Source/WebKit/UIProcess/API/wpe/webkit.h +++ b/Source/WebKit/UIProcess/API/wpe/webkit.h @@ -32,6 +32,7 @@ @@ -12328,7 +12328,7 @@ index 8d5342e6c0a51ede17dd9b89e1e85b214172118e..cc7d0d8f98282c23d2b5d8531078650a { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index 6d5feb35c35ec077360624ed20e59bb5e74f122c..a3a802aee7f2bb7afa0caa0ec59cdd880190aeb2 100644 +index d89eba2b13471c4a3ce97982ffbf7a7ebbffc9ce..90b07ae3f483d786a6a349ef3a5bf351a43bb367 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -35,6 +35,7 @@ @@ -12445,10 +12445,10 @@ index e8260a59d94cdc938f011c89e81f85402322d999..84db332aa5cdf297f70558a954471343 void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 1a55edbaa879b6d66b7ef0de1f1c45da86e0cc58..3abfa89597e2169a66fe4b6d887a98f6ca31b29c 100644 +index 770113c846e40fd42773ced730563c6fff982a3c..6fc5b9a23395f78c34510470c9fa33f0b0354a45 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -@@ -2612,6 +2612,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() +@@ -2613,6 +2613,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() if (!m_colorSpace) m_colorSpace = [NSColorSpace sRGBColorSpace]; } @@ -12460,7 +12460,7 @@ index 1a55edbaa879b6d66b7ef0de1f1c45da86e0cc58..3abfa89597e2169a66fe4b6d887a98f6 ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4690,6 +4695,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4691,6 +4696,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -17084,7 +17084,7 @@ index 0000000000000000000000000000000000000000..fb4855b939efdd36acd011a41244a579 + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b53a2f46bf 100644 +index 8d41e4523f47f92105259c63060515ef4fc98c33..d2ee126380d814598fc2f2c37408732de7b044a9 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -245,6 +245,9 @@ @@ -17097,9 +17097,9 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 #include #endif -@@ -615,6 +618,10 @@ WebPageProxy::~WebPageProxy() - #if ENABLE(MEDIA_SESSION_COORDINATOR) && HAVE(GROUP_ACTIVITIES) - GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this); +@@ -617,6 +620,10 @@ WebPageProxy::~WebPageProxy() + if (m_preferences->mediaSessionCoordinatorEnabled()) + GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this); #endif + +#if PLATFORM(COCOA) @@ -17108,7 +17108,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 } // FIXME: Should return a const PageClient& and add a separate non-const -@@ -1002,6 +1009,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -1004,6 +1011,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -17116,7 +17116,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 } void WebPageProxy::didAttachToRunningProcess() -@@ -1331,6 +1339,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1333,6 +1341,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -17138,7 +17138,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1861,6 +1884,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1863,6 +1886,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -17170,7 +17170,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2051,6 +2099,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2053,6 +2101,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -17196,7 +17196,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2623,6 +2690,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2625,6 +2692,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -17205,7 +17205,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2633,6 +2702,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2635,6 +2704,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -17214,7 +17214,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2648,18 +2719,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2668,6 +2762,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2670,6 +2764,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17284,7 +17284,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2680,8 +2792,18 @@ void WebPageProxy::didStartDrag() +@@ -2682,8 +2794,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17304,7 +17304,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2786,16 +2908,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2788,16 +2910,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17350,7 +17350,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3015,7 +3159,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3017,7 +3161,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17359,7 +17359,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3048,7 +3192,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3050,7 +3194,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17368,7 +17368,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3437,6 +3581,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3439,6 +3583,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17377,7 +17377,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3503,6 +3649,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3505,6 +3651,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) { @@ -17385,7 +17385,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4241,6 +4388,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4243,6 +4390,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17397,7 +17397,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4574,6 +4726,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4576,6 +4728,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17405,7 +17405,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4796,6 +4949,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4798,6 +4951,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17414,7 +17414,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 // 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; -@@ -5248,7 +5403,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5250,7 +5405,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) { @@ -17430,7 +17430,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5761,6 +5923,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5763,6 +5925,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(); @@ -17438,7 +17438,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 auto completionHandler = [this, protectedThis = makeRef(*this), mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5801,6 +5964,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5803,6 +5966,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17446,7 +17446,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 } void WebPageProxy::exitFullscreenImmediately() -@@ -5836,6 +6000,10 @@ void WebPageProxy::closePage() +@@ -5838,6 +6002,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17457,7 +17457,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5872,6 +6040,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5874,6 +6042,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 { @@ -17466,7 +17466,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -5893,6 +6063,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5895,6 +6065,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17475,7 +17475,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 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 { -@@ -5916,6 +6088,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -5918,6 +6090,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17484,7 +17484,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 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 { -@@ -6076,6 +6250,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6078,6 +6252,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17493,7 +17493,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7283,6 +7459,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7300,6 +7476,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17502,7 +17502,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 } break; } -@@ -7309,7 +7487,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7326,7 +7504,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()); @@ -17510,7 +17510,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7328,7 +7505,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7345,7 +7522,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); @@ -17518,7 +17518,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7337,6 +7513,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7354,6 +7530,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17526,7 +17526,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 } break; } -@@ -7669,7 +7846,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7686,7 +7863,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%d", reason); @@ -17538,7 +17538,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8042,6 +8222,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -8059,6 +8239,7 @@ static const Vector& mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17546,7 +17546,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8234,6 +8415,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8251,6 +8432,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -17555,7 +17555,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 #if PLATFORM(GTK) parameters.gtkSettings = GtkSettingsManager::singleton().settingsState(); #endif -@@ -8310,6 +8493,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8327,6 +8510,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17570,7 +17570,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = makeRef(*this), authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8403,6 +8594,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8420,6 +8611,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17587,7 +17587,7 @@ index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b5 // 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 abfcbea8604ba1558a4e7ec11847c887fc9f580f..1105876eed75aafba3013c5f3c6e00084ddef3b1 100644 +index afd192e2ce2cba86c43d7635b79e7b270fa11f1f..7fc75c905125b98f0f2322ab6c3e8e6c0b8c228c 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -38,6 +38,7 @@ @@ -17700,7 +17700,7 @@ index abfcbea8604ba1558a4e7ec11847c887fc9f580f..1105876eed75aafba3013c5f3c6e0008 #endif void processDidBecomeUnresponsive(); -@@ -1477,6 +1504,8 @@ public: +@@ -1479,6 +1506,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17709,7 +17709,7 @@ index abfcbea8604ba1558a4e7ec11847c887fc9f580f..1105876eed75aafba3013c5f3c6e0008 #endif #if ENABLE(WEB_CRYPTO) -@@ -2575,6 +2604,7 @@ private: +@@ -2578,6 +2607,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17717,7 +17717,7 @@ index abfcbea8604ba1558a4e7ec11847c887fc9f580f..1105876eed75aafba3013c5f3c6e0008 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2827,6 +2857,20 @@ private: +@@ -2830,6 +2860,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17738,7 +17738,7 @@ index abfcbea8604ba1558a4e7ec11847c887fc9f580f..1105876eed75aafba3013c5f3c6e0008 #endif PageLoadState m_pageLoadState; -@@ -3040,6 +3084,9 @@ private: +@@ -3043,6 +3087,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17815,7 +17815,7 @@ index 2eab6bcb89b8b79a7dcf3cdcd49c06d5acd212b3..5db9888b36e24819dc85d15dc787f22b 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 30fa4237cbde8f7c006386f9b573d8ead918d958..01eaa27437987693d6a99091a6814fde189ef90f 100644 +index 31d92c63d7cff130dfa0d40ec340734778888504..1bbba5772ba787b6042923f93804a9a237df3a29 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp @@ -126,6 +126,11 @@ HashMap& WebProcessProxy::allProcesses() @@ -17865,10 +17865,10 @@ index 0a0f23207443289e8ddf0f41d133362006234f93..e00a4b6654eded9fcdfcea455f494547 void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index 30b217a27eb2137577efa291932adf55e2a64d38..a9104d10486accc89b6648c31a4ce5810a55101e 100644 +index c921a8698835f893c7e569c50300fec8e30b81ba..5fb6d3cdc7ff9edd1c09813a8fc312ca12bae7c8 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -@@ -84,6 +84,7 @@ class DeviceIdHashSaltStorage; +@@ -86,6 +86,7 @@ class DeviceIdHashSaltStorage; class NetworkProcessProxy; class SOAuthorizationCoordinator; class WebCertificateInfo; @@ -17876,7 +17876,7 @@ index 30b217a27eb2137577efa291932adf55e2a64d38..a9104d10486accc89b6648c31a4ce581 class WebPageProxy; class WebProcessPool; class WebProcessProxy; -@@ -92,6 +93,7 @@ enum class CacheModel : uint8_t; +@@ -94,6 +95,7 @@ enum class CacheModel : uint8_t; enum class WebsiteDataFetchOption : uint8_t; enum class WebsiteDataType : uint32_t; @@ -17884,7 +17884,7 @@ index 30b217a27eb2137577efa291932adf55e2a64d38..a9104d10486accc89b6648c31a4ce581 struct NetworkProcessConnectionInfo; struct WebsiteDataRecord; struct WebsiteDataStoreParameters; -@@ -106,6 +108,16 @@ enum class StorageAccessPromptStatus; +@@ -108,6 +110,16 @@ enum class StorageAccessPromptStatus; struct PluginModuleInfo; #endif @@ -17901,7 +17901,7 @@ index 30b217a27eb2137577efa291932adf55e2a64d38..a9104d10486accc89b6648c31a4ce581 class WebsiteDataStore : public API::ObjectImpl, public Identified, public CanMakeWeakPtr { public: static Ref defaultDataStore(); -@@ -283,11 +295,13 @@ public: +@@ -285,11 +297,13 @@ public: const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; } #endif @@ -17915,8 +17915,8 @@ index 30b217a27eb2137577efa291932adf55e2a64d38..a9104d10486accc89b6648c31a4ce581 +#if USE(SOUP) void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&); const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; } - #endif -@@ -343,6 +357,14 @@ public: + void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType); +@@ -347,6 +361,14 @@ public: static WTF::String defaultJavaScriptConfigurationDirectory(); static bool http3Enabled(); @@ -17931,7 +17931,7 @@ index 30b217a27eb2137577efa291932adf55e2a64d38..a9104d10486accc89b6648c31a4ce581 void resetQuota(CompletionHandler&&); #if ENABLE(APP_BOUND_DOMAINS) -@@ -429,9 +451,11 @@ private: +@@ -433,9 +455,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -17942,9 +17942,9 @@ index 30b217a27eb2137577efa291932adf55e2a64d38..a9104d10486accc89b6648c31a4ce581 +#endif +#if USE(SOUP) WebCore::SoupNetworkProxySettings m_networkProxySettings; - #endif - -@@ -456,6 +480,11 @@ private: + String m_cookiePersistentStoragePath; + SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite }; +@@ -463,6 +487,11 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -18944,7 +18944,7 @@ index 34e2d00746ebb079719becbe781f5bc6cea1d480..bf496a6327b962f8f40c207c9e2023d2 void getContextMenuItem(const WebContextMenuItemData&, CompletionHandler&&); void getContextMenuFromItems(const Vector&, CompletionHandler&&); diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm -index 3e0090b5875b34887c3aeed45eb3333e3452a413..4293eb5e02a93d7b2feedc47810164b4e6ac5e44 100644 +index 92da53787981efa63eb9efa50d6d2687cac7fa5e..215905493d6aba013318ebc00c049f3ef0862dd8 100644 --- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm +++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm @@ -362,6 +362,12 @@ void WebContextMenuProxyMac::getShareMenuItem(CompletionHandler milestones) -@@ -3247,6 +3256,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3261,6 +3270,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -21026,7 +21026,7 @@ index ba89fc2bd8b78230e4ef6dafb7bee20fa6369f0e..720029672dbbf9e192b3f1f30e5bdfd6 #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3323,6 +3430,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3337,6 +3444,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -21038,7 +21038,7 @@ index ba89fc2bd8b78230e4ef6dafb7bee20fa6369f0e..720029672dbbf9e192b3f1f30e5bdfd6 void WebPage::insertNewlineInQuotedContent() { Frame& frame = m_page->focusController().focusedOrMainFrame(); -@@ -3560,6 +3672,7 @@ void WebPage::didCompletePageTransition() +@@ -3574,6 +3686,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -21046,7 +21046,7 @@ index ba89fc2bd8b78230e4ef6dafb7bee20fa6369f0e..720029672dbbf9e192b3f1f30e5bdfd6 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4300,7 +4413,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4328,7 +4441,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -21055,7 +21055,7 @@ index ba89fc2bd8b78230e4ef6dafb7bee20fa6369f0e..720029672dbbf9e192b3f1f30e5bdfd6 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6635,6 +6748,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6663,6 +6776,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -21066,7 +21066,7 @@ index ba89fc2bd8b78230e4ef6dafb7bee20fa6369f0e..720029672dbbf9e192b3f1f30e5bdfd6 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 0042275f5a6d59616a0ddf0e9be28e48c2c0c1ac..7b94085f6e6fd2d2cae34707975e3cc7c957c6a6 100644 +index 0aae4b01fe5022bf8e7b300508259a72a19010ff..00bad158f41c985befefd63fd5d2ba6b13aabfa0 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -112,6 +112,10 @@ typedef struct _AtkObject AtkObject; @@ -21080,7 +21080,7 @@ index 0042275f5a6d59616a0ddf0e9be28e48c2c0c1ac..7b94085f6e6fd2d2cae34707975e3cc7 #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -966,11 +970,11 @@ public: +@@ -967,11 +971,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -21094,7 +21094,7 @@ index 0042275f5a6d59616a0ddf0e9be28e48c2c0c1ac..7b94085f6e6fd2d2cae34707975e3cc7 void performDragControllerAction(DragControllerAction, const WebCore::DragData&, SandboxExtension::Handle&&, SandboxExtension::HandleArray&&); #endif -@@ -984,6 +988,9 @@ public: +@@ -985,6 +989,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -21104,7 +21104,7 @@ index 0042275f5a6d59616a0ddf0e9be28e48c2c0c1ac..7b94085f6e6fd2d2cae34707975e3cc7 #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1218,6 +1225,7 @@ public: +@@ -1219,6 +1226,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -21112,7 +21112,7 @@ index 0042275f5a6d59616a0ddf0e9be28e48c2c0c1ac..7b94085f6e6fd2d2cae34707975e3cc7 void insertNewlineInQuotedContent(); -@@ -1576,6 +1584,7 @@ private: +@@ -1577,6 +1585,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -21120,7 +21120,7 @@ index 0042275f5a6d59616a0ddf0e9be28e48c2c0c1ac..7b94085f6e6fd2d2cae34707975e3cc7 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1613,6 +1622,7 @@ private: +@@ -1614,6 +1623,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -21128,7 +21128,7 @@ index 0042275f5a6d59616a0ddf0e9be28e48c2c0c1ac..7b94085f6e6fd2d2cae34707975e3cc7 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1735,9 +1745,7 @@ private: +@@ -1737,9 +1747,7 @@ private: void countStringMatches(const String&, OptionSet, uint32_t maxMatchCount); void replaceMatches(const Vector& matchIndices, const String& replacementText, bool selectionOnly, CompletionHandler&&); @@ -21138,7 +21138,7 @@ index 0042275f5a6d59616a0ddf0e9be28e48c2c0c1ac..7b94085f6e6fd2d2cae34707975e3cc7 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2271,6 +2279,7 @@ private: +@@ -2273,6 +2281,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -21147,7 +21147,7 @@ index 0042275f5a6d59616a0ddf0e9be28e48c2c0c1ac..7b94085f6e6fd2d2cae34707975e3cc7 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 22c0b83ca7f5852c150ab9a10fb3fd1ea77336a8..0fe87bcdca0558a0ca71296696689a6ad6b25556 100644 +index d88ef0ebb5baa14d44e0e9c19926b6365efe1095..59768805ec4e90fa23b700ff87f70353cc84bbf2 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 @@ -21166,7 +21166,7 @@ index 22c0b83ca7f5852c150ab9a10fb3fd1ea77336a8..0fe87bcdca0558a0ca71296696689a6a #endif CancelPointer(WebCore::PointerID pointerId, WebCore::IntPoint documentPoint) -@@ -178,6 +180,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -173,6 +175,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType LoadURLInFrame(URL url, String referrer, WebCore::FrameIdentifier frameID) LoadDataInFrame(IPC::DataReference data, String MIMEType, String encodingName, URL baseURL, WebCore::FrameIdentifier frameID) LoadRequest(struct WebKit::LoadParameters loadParameters) @@ -21174,7 +21174,7 @@ index 22c0b83ca7f5852c150ab9a10fb3fd1ea77336a8..0fe87bcdca0558a0ca71296696689a6a LoadRequestWaitingForProcessLaunch(struct WebKit::LoadParameters loadParameters, URL resourceDirectoryURL, WebKit::WebPageProxyIdentifier pageID, bool checkAssumedReadAccessToResourceURL) LoadData(struct WebKit::LoadParameters loadParameters) LoadSimulatedRequestAndResponse(struct WebKit::LoadParameters loadParameters, WebCore::ResourceResponse simulatedResponse) -@@ -317,10 +320,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -312,10 +315,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType AddMIMETypeWithCustomContentProvider(String mimeType) # Drag and drop. @@ -21187,7 +21187,7 @@ index 22c0b83ca7f5852c150ab9a10fb3fd1ea77336a8..0fe87bcdca0558a0ca71296696689a6a PerformDragControllerAction(enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::SandboxExtension::HandleArray sandboxExtensionsForUpload) #endif #if ENABLE(DRAG_SUPPORT) -@@ -329,6 +332,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -324,6 +327,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType DragCancelled() #endif @@ -21327,10 +21327,10 @@ index 8987c3964a9308f2454759de7f8972215a3ae416..bcac0afeb94ed8123d1f9fb0b932c849 SetProcessDPIAware(); return true; diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -index c020b8bba2d0041f3e54e7f18c6a3776833ef049..88ccc0d2354e95feeaef730a5a10f59eb1bbb818 100644 +index e4653412699e26e57a023ab8576cd9c9405f6561..866bc55ebe4ed9afe3397a78d34dee64dcea4243 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -@@ -4236,7 +4236,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) +@@ -4237,7 +4237,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) _private->handlingMouseDownEvent = NO; } @@ -21393,7 +21393,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 3b0ab40da5002a0a74ec4331aa65fb3b4a35f663..e160d294ddb23b6a4c7cc496c51c15026adfc132 100644 +index b7290da447b86358d16978005af222354e71010c..9c04c048476eddf008e4572c42138a16451fcd47 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,8 @@ WEBKIT_OPTION_BEGIN() @@ -21416,7 +21416,7 @@ index 3b0ab40da5002a0a74ec4331aa65fb3b4a35f663..e160d294ddb23b6a4c7cc496c51c1502 include(GStreamerDefinitions) SET_AND_EXPOSE_TO_BUILD(USE_ATK TRUE) -@@ -70,7 +76,7 @@ WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspecti +@@ -64,7 +70,7 @@ WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspecti WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Quartz windowing target." PUBLIC ON) WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ON) WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ON) @@ -21425,16 +21425,16 @@ index 3b0ab40da5002a0a74ec4331aa65fb3b4a35f663..e160d294ddb23b6a4c7cc496c51c1502 WEBKIT_OPTION_DEFINE(USE_GTK4 "Whether to enable usage of GTK4 instead of GTK3." PUBLIC OFF) WEBKIT_OPTION_DEFINE(USE_LCMS "Whether to enable support for image color management using libcms2." PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_LIBHYPHEN "Whether to enable the default automatic hyphenation implementation." PUBLIC ON) -@@ -78,7 +84,7 @@ WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY "Whether to enable the default web notificati +@@ -72,7 +78,7 @@ WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY "Whether to enable the default web notificati WEBKIT_OPTION_DEFINE(USE_LIBSECRET "Whether to enable the persistent credential storage using libsecret." PUBLIC ON) - WEBKIT_OPTION_DEFINE(USE_OPENGL_OR_ES "Whether to use OpenGL or ES." PUBLIC ${USE_OPENGL_OR_ES_DEFAULT}) + WEBKIT_OPTION_DEFINE(USE_OPENGL_OR_ES "Whether to use OpenGL or ES." PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_OPENJPEG "Whether to enable support for JPEG2000 images." PUBLIC ON) -WEBKIT_OPTION_DEFINE(USE_SOUP2 "Whether to enable usage of Soup 2 instead of Soup 3." PUBLIC OFF) +WEBKIT_OPTION_DEFINE(USE_SOUP2 "Whether to enable usage of Soup 2 instead of Soup 3." PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_SYSTEMD "Whether to enable journald logging" PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_WPE_RENDERER "Whether to enable WPE rendering" PUBLIC ON) -@@ -133,7 +139,7 @@ endif () +@@ -127,7 +133,7 @@ endif () # without approval from a GTK reviewer. There must be strong reason to support # changing the value of the option. WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON) @@ -21443,7 +21443,7 @@ index 3b0ab40da5002a0a74ec4331aa65fb3b4a35f663..e160d294ddb23b6a4c7cc496c51c1502 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON) -@@ -163,7 +169,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON) +@@ -157,7 +163,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21451,7 +21451,7 @@ index 3b0ab40da5002a0a74ec4331aa65fb3b4a35f663..e160d294ddb23b6a4c7cc496c51c1502 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) -@@ -180,6 +185,17 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) +@@ -174,6 +179,17 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21626,7 +21626,7 @@ index 512392e6424ea64ff65fffc14df30344ce6cbe99..90b7c9614333868ff8c157f5bd938da9 set(USE_ANGLE_WEBGL ON) diff --git a/Tools/MiniBrowser/gtk/BrowserTab.c b/Tools/MiniBrowser/gtk/BrowserTab.c -index 9b3662b224a6674ac2c25bd29feaa98610781e82..ce2d2f0847b4f0f41e2985c4b5ba4cc69990cb71 100644 +index 1c84f30b2ea96dd0c168918f9d63773b8e2548a3..55603437900a65de7bef70563c9ec0399c5f563c 100644 --- a/Tools/MiniBrowser/gtk/BrowserTab.c +++ b/Tools/MiniBrowser/gtk/BrowserTab.c @@ -161,6 +161,11 @@ static void loadChanged(WebKitWebView *webView, WebKitLoadEvent loadEvent, Brows @@ -21641,7 +21641,7 @@ index 9b3662b224a6674ac2c25bd29feaa98610781e82..ce2d2f0847b4f0f41e2985c4b5ba4cc6 static GtkWidget *createInfoBarQuestionMessage(const char *title, const char *text) { GtkWidget *dialog = gtk_info_bar_new_with_buttons("No", GTK_RESPONSE_NO, "Yes", GTK_RESPONSE_YES, NULL); -@@ -704,6 +709,7 @@ static void browserTabConstructed(GObject *gObject) +@@ -708,6 +713,7 @@ static void browserTabConstructed(GObject *gObject) g_signal_connect(tab->webView, "notify::is-loading", G_CALLBACK(isLoadingChanged), tab); g_signal_connect(tab->webView, "decide-policy", G_CALLBACK(decidePolicy), tab); g_signal_connect(tab->webView, "load-changed", G_CALLBACK(loadChanged), tab); @@ -21649,7 +21649,7 @@ index 9b3662b224a6674ac2c25bd29feaa98610781e82..ce2d2f0847b4f0f41e2985c4b5ba4cc6 g_signal_connect(tab->webView, "load-failed-with-tls-errors", G_CALLBACK(loadFailedWithTLSerrors), tab); g_signal_connect(tab->webView, "permission-request", G_CALLBACK(decidePermissionRequest), tab); g_signal_connect(tab->webView, "run-color-chooser", G_CALLBACK(runColorChooserCallback), tab); -@@ -754,6 +760,9 @@ static char *getInternalURI(const char *uri) +@@ -758,6 +764,9 @@ static char *getInternalURI(const char *uri) if (g_str_has_prefix(uri, "about:") && !g_str_equal(uri, "about:blank")) return g_strconcat(BROWSER_ABOUT_SCHEME, uri + strlen ("about"), NULL); @@ -21660,7 +21660,7 @@ index 9b3662b224a6674ac2c25bd29feaa98610781e82..ce2d2f0847b4f0f41e2985c4b5ba4cc6 } diff --git a/Tools/MiniBrowser/gtk/BrowserWindow.c b/Tools/MiniBrowser/gtk/BrowserWindow.c -index 063e94568490cc72193222987b805e7dfff94fea..76ba6df237dd8c2c2bcf339541751e82d842bf76 100644 +index 29a09ddafe4dbd50f8a2c461a91c63fbeede003a..cfd12b5abc88c7e257af82ff54ea8e258605bb95 100644 --- a/Tools/MiniBrowser/gtk/BrowserWindow.c +++ b/Tools/MiniBrowser/gtk/BrowserWindow.c @@ -70,7 +70,7 @@ struct _BrowserWindowClass { @@ -21689,7 +21689,7 @@ index 063e94568490cc72193222987b805e7dfff94fea..76ba6df237dd8c2c2bcf339541751e82 gtk_window_set_title(GTK_WINDOW(window), privateTitle ? privateTitle : title); g_free(privateTitle); } -@@ -1373,6 +1371,12 @@ static gboolean browserWindowDeleteEvent(GtkWidget *widget, GdkEventAny* event) +@@ -1445,6 +1443,12 @@ static gboolean browserWindowDeleteEvent(GtkWidget *widget, GdkEventAny* event) } #endif @@ -21702,7 +21702,7 @@ index 063e94568490cc72193222987b805e7dfff94fea..76ba6df237dd8c2c2bcf339541751e82 static void browser_window_class_init(BrowserWindowClass *klass) { GObjectClass *gobjectClass = G_OBJECT_CLASS(klass); -@@ -1386,6 +1390,14 @@ static void browser_window_class_init(BrowserWindowClass *klass) +@@ -1458,6 +1462,14 @@ static void browser_window_class_init(BrowserWindowClass *klass) GtkWidgetClass *widgetClass = GTK_WIDGET_CLASS(klass); widgetClass->delete_event = browserWindowDeleteEvent; #endif @@ -22206,34 +22206,30 @@ index 296c902f375b1189f45ee56bb3ffd4d826dd26f6..45d8ca4bdd18e2467b26b0c6998b4dc5 + + } // namespace WTR -diff --git a/Tools/gtk/install-dependencies b/Tools/gtk/install-dependencies -index 46388b47a0f433fbdae3874a958fb2d207916c45..d42933e66178ff007a5008dc807483c4896ea5e1 100755 ---- a/Tools/gtk/install-dependencies -+++ b/Tools/gtk/install-dependencies -@@ -120,6 +120,7 @@ function installDependenciesWithApt { - libhyphen-dev \ - libjpeg-dev \ - libkate-dev \ -+ liblcms2-dev \ - libmount-dev \ - libmpg123-dev \ - libnotify-dev \ -@@ -143,6 +144,7 @@ function installDependenciesWithApt { - libupower-glib-dev \ - libwebp-dev \ - libwoff-dev \ -+ libxcb-glx0-dev \ - libxcomposite-dev \ - libxt-dev \ - libxtst-dev \ -@@ -151,6 +153,7 @@ function installDependenciesWithApt { - nasm \ - ninja-build \ - patch \ -+ patchelf \ - ruby \ - xfonts-utils" +diff --git a/Tools/glib/dependencies/apt b/Tools/glib/dependencies/apt +index 02fa9bff0ab4bd094fd9498b042e06f35c25e7fc..f33f29a9a26d1219aa5780b1860792353a70f4ee 100644 +--- a/Tools/glib/dependencies/apt ++++ b/Tools/glib/dependencies/apt +@@ -34,6 +34,7 @@ PACKAGES=( + libgstreamer-plugins-base1.0-dev + libjpeg-dev + libkate-dev ++ liblcms2-dev + libopenjp2-7-dev + libpng-dev + libseccomp-dev +@@ -44,9 +45,11 @@ PACKAGES=( + libwayland-dev + libwebp-dev + libwoff-dev ++ libxcb-glx0-dev + libxslt1-dev + ninja-build + patch ++ patchelf + ruby + # These are dependencies necessary for running tests. diff --git a/Tools/win/DLLLauncher/DLLLauncherMain.cpp b/Tools/win/DLLLauncher/DLLLauncherMain.cpp index 52605867b9302d1afcc56c5e9b0c54acf0827900..6edf24ab60249241ba2969531ef55f4b495dce9e 100644 --- a/Tools/win/DLLLauncher/DLLLauncherMain.cpp @@ -22307,28 +22303,3 @@ index c09b6f39f894943f11b7a453428fab7d6f6e68fb..bc21acb648562ee0380811599b08f7d2 static cairo_user_data_key_t bufferKey; cairo_surface_set_user_data(m_snapshot, &bufferKey, buffer, -diff --git a/Tools/wpe/install-dependencies b/Tools/wpe/install-dependencies -index 6bc2db3024aa3466200f70d20b425227215b6a43..09774119a487ffc4df80ae6f49dd4f31c4021a70 100755 ---- a/Tools/wpe/install-dependencies -+++ b/Tools/wpe/install-dependencies -@@ -78,6 +78,7 @@ function installDependenciesWithApt { - libjpeg-dev \ - libkate-dev \ - libfile-copy-recursive-perl \ -+ liblcms2-dev \ - libopenjp2-7-dev \ - libpng-dev \ - libseccomp-dev \ -@@ -87,10 +88,12 @@ function installDependenciesWithApt { - libtool \ - libwebp-dev \ - libwoff-dev \ -+ libxcb-glx0-dev \ - libxml2-dev \ - libxslt1-dev \ - ninja-build \ - patch \ -+ patchelf \ - pkg-config \ - ruby \ - zlib1g-dev"