diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 2e155dd114..950a842bf6 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1617 -Changed: dpino@igalia.com Mon Mar 7 10:27:14 UTC 2022 +1618 +Changed: dpino@igalia.com Thu Mar 17 23:36:05 HKT 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 35814d92e1..3334dace7e 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="fe3b67d303e587d46dd8eb9793327fa965a60aa7" +BASE_REVISION="196fcd71682fd2f6a2319bca077b8e7ff0f0daac" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 12229af4da..09a08249ae 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -1925,13 +1925,13 @@ index be86666961906832f585adb43edeb381ad199222..23b1fd28ee684537fcbcc9c671e2bff8 Source/third_party/opus/src/celt Source/third_party/opus/src/include diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -index 2a57dca5af38edf3e3a0e9a4efef64c8a63e9e6c..5ef0a4e3cb7dd2db50d55d0a7a42b717ed07f339 100644 +index fa280a4a4fd86851ccb31f3c9de76b8ea88958dc..f995e6a5a747d2c10fb29e1fe991b11d3f909241 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -@@ -335,3 +335,23 @@ __ZNK3rtc14RTCCertificate17GetSSLCertificateEv - __ZTVN6webrtc30WrappingAsyncDnsResolverResultE +@@ -336,3 +336,23 @@ __ZTVN6webrtc30WrappingAsyncDnsResolverResultE __ZN6webrtc20pixelBufferFromFrameERKNS_10VideoFrameE - __ZN6webrtc14copyVideoFrameERKNS_10VideoFrameEPh + __ZN6webrtc20copyVideoFrameBufferERNS_16VideoFrameBufferEPh + __ZN6webrtc32createPixelBufferFromFrameBufferERNS_16VideoFrameBufferERKNSt3__18functionIFP10__CVBuffermmNS_10BufferTypeEEEE +__ZN8mkvmuxer11SegmentInfo15set_writing_appEPKc +__ZN8mkvmuxer11SegmentInfo4InitEv +__ZN8mkvmuxer7Segment10OutputCuesEb @@ -2079,7 +2079,7 @@ index 4aa67a3129804da9ff8e6a4494596c4661ff9e16..4fcf5dd448703b5d6a2d738f3cd5c88e type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 93daf84ca7d19e528a8ac600c92940f94da1708c..0d5626f02e3eeed21b2ca8172f4f3df5ae8d41b9 100644 +index d0ee99cf4c39c77045472e089e12ffed746ced7e..65b81de88aa2b362d0d15f40973e3fc172b7c462 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -455,7 +455,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2103,7 +2103,7 @@ index 93daf84ca7d19e528a8ac600c92940f94da1708c..0d5626f02e3eeed21b2ca8172f4f3df5 # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -1331,7 +1331,7 @@ SpeechRecognitionEnabled: +@@ -1332,7 +1332,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2269,7 +2269,7 @@ index 6a0b9d54b5a6b5937b86f226a279cfec928174c4..d57a243e3ca23119a993b3bc78821ce9 #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index 6cccb09159797bcb9ccddd23a8bb7acbee1c0ac0..e8c1e4ab81431360dbfca6233345f657eb307fad 100644 +index 535c8baa2acae35f5fa8922bf858e2ed22536d66..f777081cc9595f0df381447e43ecde931f0091a6 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h @@ -219,7 +219,7 @@ @@ -2294,7 +2294,7 @@ index 3901bfb0f5479064f4e7b67c90621ff26d74b580..5b3615a871d0d7123822394c94d5ce10 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 9fe76c8651d07f2f39f706cdd90882fcd156efa4..5cf44ca8a356d172d69915f81bb3bb3ff8d25d5c 100644 +index e2ef4570b4e1480895a7d9fb5e3dbd49181ea783..a730dea80a09dee033abd0896feb89875ddcbbc5 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -416,7 +416,7 @@ @@ -2420,10 +2420,10 @@ index f8b6c3578e152679a2e72bfd69313f6f4aa783e1..c12f77e371169058b022ca30ca13f2fb set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index aa44f5f53167b9bc0f1423f27bfc24d717ebacfa..26f8b368dfe5967ca382fd2c626a1cdba43765b1 100644 +index f9e0abaf4b922b89372f9ba9725409fbc7b7f85f..e8b3c986ebb45c9905237c32edbb60d8496214c7 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -624,3 +624,9 @@ platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify +@@ -625,3 +625,9 @@ platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify platform/graphics/cocoa/ANGLEUtilitiesCocoa.cpp @no-unify platform/graphics/cocoa/GraphicsContextGLCocoa.mm @no-unify platform/graphics/cv/GraphicsContextGLCVCocoa.cpp @no-unify @@ -2472,10 +2472,10 @@ index c4898d6db6bf06552f602c4b7f0a7267e64e44f4..7cf2e30729671a89c373870c5691d337 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index aa227d598e429d855bb3deeda9b1d47280d6243b..36bb4467f129bbc7f3d21b02946136162ab3c93a 100644 +index eaea38295c9af4416f38a569acc6ce499e001ce6..5ec27a5b4305f92fe544853a6a0a64b3f12a4725 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5510,6 +5510,13 @@ +@@ -5512,6 +5512,13 @@ EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; }; EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; }; EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -2489,7 +2489,7 @@ index aa227d598e429d855bb3deeda9b1d47280d6243b..36bb4467f129bbc7f3d21b0294613616 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, ); }; }; -@@ -17800,6 +17807,14 @@ +@@ -17804,6 +17811,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 = ""; }; @@ -2504,7 +2504,7 @@ index aa227d598e429d855bb3deeda9b1d47280d6243b..36bb4467f129bbc7f3d21b0294613616 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 = ""; }; -@@ -24178,7 +24193,12 @@ +@@ -24185,7 +24200,12 @@ 1AF326770D78B9440068F0C4 /* EditorClient.h */, E36D701E27B71F04006531B7 /* EmptyAttachmentElementClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2517,7 +2517,7 @@ index aa227d598e429d855bb3deeda9b1d47280d6243b..36bb4467f129bbc7f3d21b0294613616 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -30138,6 +30158,8 @@ +@@ -30145,6 +30165,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2526,7 +2526,7 @@ index aa227d598e429d855bb3deeda9b1d47280d6243b..36bb4467f129bbc7f3d21b0294613616 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32459,6 +32481,7 @@ +@@ -32466,6 +32488,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2534,7 +2534,7 @@ index aa227d598e429d855bb3deeda9b1d47280d6243b..36bb4467f129bbc7f3d21b0294613616 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -33470,6 +33493,7 @@ +@@ -33476,6 +33499,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2542,7 +2542,7 @@ index aa227d598e429d855bb3deeda9b1d47280d6243b..36bb4467f129bbc7f3d21b0294613616 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -35605,6 +35629,7 @@ +@@ -35611,6 +35635,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2550,7 +2550,7 @@ index aa227d598e429d855bb3deeda9b1d47280d6243b..36bb4467f129bbc7f3d21b0294613616 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -36716,6 +36741,7 @@ +@@ -36722,6 +36747,7 @@ 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, @@ -2558,7 +2558,7 @@ index aa227d598e429d855bb3deeda9b1d47280d6243b..36bb4467f129bbc7f3d21b0294613616 CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, CD1F9B032700323D00617EB6 /* PlatformVideoMatrixCoefficients.h in Headers */, -@@ -38809,6 +38835,7 @@ +@@ -38817,6 +38843,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2566,7 +2566,7 @@ index aa227d598e429d855bb3deeda9b1d47280d6243b..36bb4467f129bbc7f3d21b0294613616 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -38882,6 +38909,7 @@ +@@ -38890,6 +38917,7 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2574,7 +2574,7 @@ index aa227d598e429d855bb3deeda9b1d47280d6243b..36bb4467f129bbc7f3d21b0294613616 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -38930,6 +38958,7 @@ +@@ -38938,6 +38966,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2582,7 +2582,7 @@ index aa227d598e429d855bb3deeda9b1d47280d6243b..36bb4467f129bbc7f3d21b0294613616 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -39462,6 +39491,7 @@ +@@ -39470,6 +39499,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2875,7 +2875,7 @@ index b978e2e8f8e882bbc7d0f91cad76c382508e9a3f..ba014f922a36f0fa6005b4b0bb0d3b4d #endif // USE(LIBWPE) diff --git a/Source/WebCore/html/FileInputType.cpp b/Source/WebCore/html/FileInputType.cpp -index ea7dfacf62b782559d65e3bfb6b3d0ccdfe2521c..0e06ebd1484a4bc93f10c750487a73545a0eec18 100644 +index a2906d7ce7a65e1ac4ceaf8e6426e1d013469e44..7e9aec8d1acc676e502cfb7c86ed9594843898cf 100644 --- a/Source/WebCore/html/FileInputType.cpp +++ b/Source/WebCore/html/FileInputType.cpp @@ -36,6 +36,7 @@ @@ -5150,7 +5150,7 @@ index 3d5e566dbe0c5ec11d9e8df67fcf0a70988a2f8f..35f38d348513e5c4624ad9efa788ade4 } // namespace WebCore diff --git a/Source/WebCore/inspector/agents/InspectorWorkerAgent.cpp b/Source/WebCore/inspector/agents/InspectorWorkerAgent.cpp -index c13374b161eebbf67860a0009bec14a35c53299f..aed9a5566b52b56cf93d660872b54e20eb9c44f1 100644 +index fe1cc2dbb9863cd4480476d2e21a5a229dc8a0e8..35dd7ca4cabe0d0ec76d44e260870a99becaa128 100644 --- a/Source/WebCore/inspector/agents/InspectorWorkerAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorWorkerAgent.cpp @@ -168,7 +168,11 @@ void InspectorWorkerAgent::connectToWorkerInspectorProxy(WorkerInspectorProxy& p @@ -5362,7 +5362,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 20ddefde4281beac6be973f18534def8a559d1b9..d4ebc9d1b996de907a33a75700971214cb70da48 100644 +index f18db8695b397c1b2a3bd303111deb9e55e49442..df8091ebfb6cace493b23e4b5a04b84cba35f75b 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -1479,8 +1479,6 @@ void DocumentLoader::detachFromFrame() @@ -5393,7 +5393,7 @@ index 0b079f88ff3326ed24d31c8f0c00a654e290494c..d6308c79c13e08503ba0e18dc8ce5bdc DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index b2e7f68b72b7cb8c795d0efbfc1b7a3145fc7ab8..c8575241b5bbb1372cd1118126facabb810bb6bd 100644 +index f8ab45de9af3ee0c03464cf3c988a888a4f4ad85..a5affb040099a492d739ec92e9078f6ab1126388 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -1157,6 +1157,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr stat @@ -7836,10 +7836,10 @@ index a34dc220bbb9a92b40dfb463e8724e81ac745b2c..8ecedd5dae88469366a619b96960598c { switch (val) { diff --git a/Source/WebCore/platform/network/HTTPHeaderMap.cpp b/Source/WebCore/platform/network/HTTPHeaderMap.cpp -index d80c5bd6c03df52ad1139ce434c4a4a533814ea7..41840f4de0952eb93bcde790414431e8e2846c4b 100644 +index bd516cf6c65f2db40518f0cd1d7e97e8f74e3850..01b23390efd116cfb66190d6df773af6418c65b6 100644 --- a/Source/WebCore/platform/network/HTTPHeaderMap.cpp +++ b/Source/WebCore/platform/network/HTTPHeaderMap.cpp -@@ -206,8 +206,11 @@ void HTTPHeaderMap::add(HTTPHeaderName name, const String& value) +@@ -214,8 +214,11 @@ void HTTPHeaderMap::add(HTTPHeaderName name, const String& value) auto index = m_commonHeaders.findIf([&](auto& header) { return header.key == name; }); @@ -8707,7 +8707,7 @@ index 2e90534ffd8da83b7dc54d46fa7def16319bbb43..2493c00d58957751c65c37eb409fa8d6 int innerLineHeight() const override; #endif diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -index 0190d846dbd95e0737aee5c3258af35a979ce736..2644d62aac66e5d4f2d7149621b625503c84f83a 100644 +index dfa6e86eec6490557b23985695ad7a041896fdc6..4afcf765bcba5026e10e2256740e8954c0790ca7 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -83,6 +83,11 @@ @@ -8749,7 +8749,7 @@ index 0190d846dbd95e0737aee5c3258af35a979ce736..2644d62aac66e5d4f2d7149621b62550 void NetworkConnectionToWebProcess::removeStorageAccessForFrame(FrameIdentifier frameID, PageIdentifier pageID) { diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -index 60d56778a64f374f0ae94ad6b09599845df0c37b..786f14b9ba96f36f24cce9884fc7fcff7895734d 100644 +index 239d7eac1da6841cb5d7ffc10710da145e0d069b..71c7a7370521f919245c7bf3e4680b98bc2169ea 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h @@ -307,6 +307,8 @@ private: @@ -8762,7 +8762,7 @@ index 60d56778a64f374f0ae94ad6b09599845df0c37b..786f14b9ba96f36f24cce9884fc7fcff void removeStorageAccessForFrame(WebCore::FrameIdentifier, WebCore::PageIdentifier); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in -index afe6bb19f1178cceff5f96a1d9a92072fa41e761..7e320f485590db99f873d588003bfc503102fca4 100644 +index a5a2fd628c6da1ffb0b048aacfbae06aeef9943f..625cc6b1f23c83bcd26c52a976121c39b968a001 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in @@ -66,6 +66,8 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver { @@ -8775,7 +8775,7 @@ index afe6bb19f1178cceff5f96a1d9a92072fa41e761..7e320f485590db99f873d588003bfc50 RemoveStorageAccessForFrame(WebCore::FrameIdentifier frameID, WebCore::PageIdentifier pageID); LogUserInteraction(WebCore::RegistrableDomain domain) diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp -index f07b046e97aa5fb93cb667b5f74b37589868e7f4..0713150aa3c9b19bb9dc2efd9533d8831f4ec599 100644 +index 6b9ef10bef918579cf4c8193441e7f24001fd6eb..4afd63efa53d78c0611c8ca0c8b2065c100f844b 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -8786,7 +8786,7 @@ index f07b046e97aa5fb93cb667b5f74b37589868e7f4..0713150aa3c9b19bb9dc2efd9533d883 #include "ArgumentCoders.h" #include "Attachment.h" #include "AuthenticationManager.h" -@@ -514,6 +513,41 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) +@@ -513,6 +512,41 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) m_sessionsControlledByAutomation.remove(sessionID); } @@ -8829,7 +8829,7 @@ index f07b046e97aa5fb93cb667b5f74b37589868e7f4..0713150aa3c9b19bb9dc2efd9533d883 void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index 00be71dd339c0b8954a33891763319e25cb7da6b..671ce54c6c64644d94ac01127b04505662ee8683 100644 +index 42ce08bf350cfcba3b5a752293269ae778b9517b..d3a6ab307c8dee70699824d837929631d63595f2 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -37,6 +37,7 @@ @@ -8858,10 +8858,10 @@ index 00be71dd339c0b8954a33891763319e25cb7da6b..671ce54c6c64644d94ac01127b045056 + void setIgnoreCertificateErrors(PAL::SessionID, bool); + #if ENABLE(INTELLIGENT_TRACKING_PREVENTION) - void clearPrevalentResource(PAL::SessionID, const RegistrableDomain&, CompletionHandler&&); - void clearUserInteraction(PAL::SessionID, const RegistrableDomain&, CompletionHandler&&); + void clearPrevalentResource(PAL::SessionID, RegistrableDomain&&, CompletionHandler&&); + void clearUserInteraction(PAL::SessionID, RegistrableDomain&&, CompletionHandler&&); diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in -index 7499257b34140be1b28e7db07201bc0837663d8c..548dca718cca7613d9e0e110bbda9fbcef08a609 100644 +index 781fc4720d4f0217523e170d8ca667266d6df278..be056f687a488e92f3b199eb096f5a6741254fb9 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in @@ -79,6 +79,11 @@ messages -> NetworkProcess LegacyReceiver { @@ -8874,13 +8874,13 @@ index 7499257b34140be1b28e7db07201bc0837663d8c..548dca718cca7613d9e0e110bbda9fbc + SetIgnoreCertificateErrors(PAL::SessionID sessionID, bool ignoreTLSErrors) + #if ENABLE(INTELLIGENT_TRACKING_PREVENTION) - ClearPrevalentResource(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () Async - ClearUserInteraction(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () Async + ClearPrevalentResource(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () + ClearUserInteraction(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () diff --git a/Source/WebKit/NetworkProcess/NetworkSession.h b/Source/WebKit/NetworkProcess/NetworkSession.h -index 9b439a8194e55b7efba08fd9a2887e06b3f0a8ce..87abf347f101acbc0726702e25a4960782c30658 100644 +index fff87e84e0668930e611bc35c24f78f3225487f0..3a266d05a51da35d3369a0c7748e0c19d3101131 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h -@@ -194,6 +194,9 @@ public: +@@ -193,6 +193,9 @@ public: void lowMemoryHandler(WTF::Critical); @@ -8890,7 +8890,7 @@ index 9b439a8194e55b7efba08fd9a2887e06b3f0a8ce..87abf347f101acbc0726702e25a49607 #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -275,6 +278,7 @@ protected: +@@ -274,6 +277,7 @@ protected: bool m_privateClickMeasurementDebugModeEnabled { false }; std::optional m_ephemeralMeasurement; bool m_isRunningEphemeralMeasurementTest { false }; @@ -9299,10 +9299,10 @@ index bc06eb37854c1ec72b30568e95dba6ef60c132a4..7b8fd54b740c828be204d4fedba0286f } return makeUnique(channel, request, soupSession(), soupMessage.get(), protocol); diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index 48d1820ddaf0a725ef8c92cef4a60ab8f0ef5719..d8cbf2188cd65822c7eeb5cf30fc586baa167a4a 100644 +index a624e3e392b42d0aafcdfcd509a6f6d1d09411aa..77897cdf7617423e5d4ef19754b6cebe72f36103 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake -@@ -465,6 +465,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -468,6 +468,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GSTREAMER_PBUTILS_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -9312,7 +9312,7 @@ index 48d1820ddaf0a725ef8c92cef4a60ab8f0ef5719..d8cbf2188cd65822c7eeb5cf30fc586b ) if (USE_WPE_RENDERER) -@@ -518,6 +521,9 @@ if (USE_LIBWEBRTC) +@@ -521,6 +524,9 @@ if (USE_LIBWEBRTC) list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/libwebrtc/Source/" "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc" @@ -9322,7 +9322,7 @@ index 48d1820ddaf0a725ef8c92cef4a60ab8f0ef5719..d8cbf2188cd65822c7eeb5cf30fc586b ) endif () -@@ -532,6 +538,12 @@ if (ENABLE_MEDIA_STREAM) +@@ -535,6 +541,12 @@ if (ENABLE_MEDIA_STREAM) ) endif () @@ -9336,10 +9336,10 @@ index 48d1820ddaf0a725ef8c92cef4a60ab8f0ef5719..d8cbf2188cd65822c7eeb5cf30fc586b set(WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2GTK_INSTALLED_HEADERS}) list(REMOVE_ITEM WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h) diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake -index 529644655e0120d862ee8e886e67ac9f12692037..dc3cf7b3bafe259d44b04a16b6903b3b2b0c4b57 100644 +index a46b305d05301d6a163e1a4f7c9d99fe956e7652..f3a6d8e59bea756311b23bc7cfef35789aca0616 100644 --- a/Source/WebKit/PlatformWPE.cmake +++ b/Source/WebKit/PlatformWPE.cmake -@@ -172,6 +172,7 @@ set(WPE_API_INSTALLED_HEADERS +@@ -177,6 +177,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 @@ -9347,15 +9347,15 @@ index 529644655e0120d862ee8e886e67ac9f12692037..dc3cf7b3bafe259d44b04a16b6903b3b ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPolicyDecision.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitRectangle.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitResponsePolicyDecision.h -@@ -298,6 +299,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES - "${WEBKIT_DIR}/UIProcess/API/wpe" +@@ -304,6 +305,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES "${WEBKIT_DIR}/UIProcess/CoordinatedGraphics" + "${WEBKIT_DIR}/UIProcess/Inspector/glib" "${WEBKIT_DIR}/UIProcess/geoclue" + "${WEBKIT_DIR}/UIProcess/glib" "${WEBKIT_DIR}/UIProcess/gstreamer" "${WEBKIT_DIR}/UIProcess/linux" "${WEBKIT_DIR}/UIProcess/soup" -@@ -320,8 +322,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -326,8 +328,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GIO_UNIX_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -9374,10 +9374,10 @@ index 529644655e0120d862ee8e886e67ac9f12692037..dc3cf7b3bafe259d44b04a16b6903b3b Cairo::Cairo Freetype::Freetype diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake -index ba41cc4b8d3c48e96e80a2fd16abcb8332830baa..8e7da07e95ba71e14db897a0fb73e0c1e78edf40 100644 +index 659345edec10f5cc7b508e4592c44a8f978a1350..59fdb40612afb15588ae55a12bd524c94284098a 100644 --- a/Source/WebKit/PlatformWin.cmake +++ b/Source/WebKit/PlatformWin.cmake -@@ -76,8 +76,12 @@ list(APPEND WebKit_SOURCES +@@ -67,8 +67,12 @@ list(APPEND WebKit_SOURCES UIProcess/wc/DrawingAreaProxyWC.cpp @@ -9390,7 +9390,7 @@ index ba41cc4b8d3c48e96e80a2fd16abcb8332830baa..8e7da07e95ba71e14db897a0fb73e0c1 UIProcess/win/WebPageProxyWin.cpp UIProcess/win/WebPopupMenuProxyWin.cpp UIProcess/win/WebProcessPoolWin.cpp -@@ -95,6 +99,7 @@ list(APPEND WebKit_SOURCES +@@ -86,6 +90,7 @@ list(APPEND WebKit_SOURCES WebProcess/MediaCache/WebMediaKeyStorageManager.cpp WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp @@ -9398,7 +9398,7 @@ index ba41cc4b8d3c48e96e80a2fd16abcb8332830baa..8e7da07e95ba71e14db897a0fb73e0c1 WebProcess/WebPage/AcceleratedSurface.cpp -@@ -149,6 +154,72 @@ list(APPEND WebKit_MESSAGES_IN_FILES +@@ -139,6 +144,72 @@ list(APPEND WebKit_MESSAGES_IN_FILES GPUProcess/graphics/wc/RemoteWCLayerTreeHost ) @@ -9471,7 +9471,7 @@ index ba41cc4b8d3c48e96e80a2fd16abcb8332830baa..8e7da07e95ba71e14db897a0fb73e0c1 set(WebKitCommonIncludeDirectories ${WebKit_INCLUDE_DIRECTORIES}) set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) -@@ -200,6 +271,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) +@@ -198,6 +269,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) OpenSSL::SSL mfuuid.lib strmiids.lib @@ -9491,19 +9491,6 @@ index caf67e1dece5b727e43eba780e70814f8fdb0f63..740150d2589d6e16a516daa3bf6ef899 #include #include #include -diff --git a/Source/WebKit/Shared/ModelIdentifier.h b/Source/WebKit/Shared/ModelIdentifier.h -index 4413ad0aa4238530983eec444617aebeafd464b8..36f72da956dfbdabbedeaef71d83fcdce5995b01 100644 ---- a/Source/WebKit/Shared/ModelIdentifier.h -+++ b/Source/WebKit/Shared/ModelIdentifier.h -@@ -25,6 +25,8 @@ - - #pragma once - -+#import -+ - namespace WebKit { - - #if ENABLE(ARKIT_INLINE_PREVIEW) diff --git a/Source/WebKit/Shared/NativeWebKeyboardEvent.h b/Source/WebKit/Shared/NativeWebKeyboardEvent.h index ee8cac1c980039c4a36de5501ab7f135e710d06b..deae2be9e720ff76186ecea89920dfc39c4f186a 100644 --- a/Source/WebKit/Shared/NativeWebKeyboardEvent.h @@ -10171,10 +10158,10 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 5f6d06c3177e01e4487453793d633a241992f937..d199d30cd9948532aded63e9ccf6d87a73369068 100644 +index bec1a3f134e2dd3923612752a89d881579e20f84..70b02cf6e97779d1f0ca261edc59b2759512c30b 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -405,11 +405,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -402,11 +402,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10189,7 +10176,7 @@ index 5f6d06c3177e01e4487453793d633a241992f937..d199d30cd9948532aded63e9ccf6d87a UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -418,6 +421,7 @@ UIProcess/PageLoadState.cpp +@@ -415,6 +418,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10197,7 +10184,7 @@ index 5f6d06c3177e01e4487453793d633a241992f937..d199d30cd9948532aded63e9ccf6d87a UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -460,6 +464,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -457,6 +461,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10206,7 +10193,7 @@ index 5f6d06c3177e01e4487453793d633a241992f937..d199d30cd9948532aded63e9ccf6d87a UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -583,7 +589,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -580,7 +586,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10219,7 +10206,7 @@ index 5f6d06c3177e01e4487453793d633a241992f937..d199d30cd9948532aded63e9ccf6d87a UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 014384f8e58c5cedd0814cd3f42eb96423d63f34..136d62ae60f45172a0d21ffd7d469f770f4e0763 100644 +index 01be8d7dad9b63b7b7b537205a59c7550c226663..a54bbef4a18ff5db03db49b0d39f06b5a7d8e6f6 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt @@ -276,6 +276,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm @@ -10239,7 +10226,7 @@ index 014384f8e58c5cedd0814cd3f42eb96423d63f34..136d62ae60f45172a0d21ffd7d469f77 UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm UIProcess/Inspector/mac/WKInspectorViewController.mm diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt -index be92a45dd6b805355d2a32d59de702fdbf0a1313..ad525a82f5683990bf37706f1d35a657ab14d431 100644 +index cbc4b5e0a2c06e7cb189972e958ead005d614c5d..b5072730da4b21dac0815ec1f88d3c18a48d4200 100644 --- a/Source/WebKit/SourcesGTK.txt +++ b/Source/WebKit/SourcesGTK.txt @@ -126,6 +126,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify @@ -10250,7 +10237,7 @@ index be92a45dd6b805355d2a32d59de702fdbf0a1313..ad525a82f5683990bf37706f1d35a657 UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify UIProcess/API/glib/WebKitCookieManager.cpp @no-unify UIProcess/API/glib/WebKitCredential.cpp @no-unify -@@ -242,6 +243,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp +@@ -243,6 +244,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp UIProcess/cairo/BackingStoreCairo.cpp @no-unify @@ -10258,7 +10245,7 @@ index be92a45dd6b805355d2a32d59de702fdbf0a1313..ad525a82f5683990bf37706f1d35a657 UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -259,6 +261,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify +@@ -260,6 +262,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify UIProcess/gtk/WebDateTimePickerGtk.cpp UIProcess/gtk/GtkSettingsManager.cpp UIProcess/gtk/HardwareAccelerationManager.cpp @@ -10266,7 +10253,7 @@ index be92a45dd6b805355d2a32d59de702fdbf0a1313..ad525a82f5683990bf37706f1d35a657 UIProcess/gtk/KeyBindingTranslator.cpp UIProcess/gtk/PointerLockManager.cpp @no-unify UIProcess/gtk/PointerLockManagerWayland.cpp @no-unify -@@ -271,6 +274,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify +@@ -272,6 +275,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify UIProcess/gtk/WebColorPickerGtk.cpp UIProcess/gtk/WebContextMenuProxyGtk.cpp UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp @@ -10276,7 +10263,7 @@ index be92a45dd6b805355d2a32d59de702fdbf0a1313..ad525a82f5683990bf37706f1d35a657 UIProcess/gtk/WebPasteboardProxyGtk.cpp UIProcess/gtk/WebPopupMenuProxyGtk.cpp diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt -index eba03c88bc4d94575f7a352c3cf62e77d7369210..b871e2959b60bbda8ee4cc63ee3371d216a4b0d5 100644 +index cc7875e51a261aeaa1fe3f87ac6ca0c1d352eec8..55e867ee9968873accf783f1df9f2a8a3181f0d7 100644 --- a/Source/WebKit/SourcesWPE.txt +++ b/Source/WebKit/SourcesWPE.txt @@ -85,6 +85,7 @@ Shared/glib/ProcessExecutablePathGLib.cpp @@ -10319,7 +10306,7 @@ index eba03c88bc4d94575f7a352c3cf62e77d7369210..b871e2959b60bbda8ee4cc63ee3371d2 UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -224,6 +229,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp +@@ -227,6 +232,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp UIProcess/soup/WebCookieManagerProxySoup.cpp UIProcess/soup/WebProcessPoolSoup.cpp @@ -10331,7 +10318,7 @@ index eba03c88bc4d94575f7a352c3cf62e77d7369210..b871e2959b60bbda8ee4cc63ee3371d2 UIProcess/wpe/WebPageProxyWPE.cpp WebProcess/GPU/media/gstreamer/VideoLayerRemoteGStreamer.cpp -@@ -252,6 +262,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp +@@ -255,6 +265,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp @@ -10436,7 +10423,7 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index 89b1ebfc231f0b722d30118c906a96948c8a8f5f..eb8e6fe6ce611fea0cc7c4cad763a574c89e24eb 100644 +index e254926dc51a49aeba498d7949aafc807a4b7229..5aafdda58937d0ca9913ba6eacbdffd49df2ddf3 100644 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp @@ -1762,6 +1762,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient @@ -10787,18 +10774,6 @@ index 00b250e5d3ee4dbd4537e23fcb1f6e44a454607c..e1701062ef7df02ed7b83ff19c84df0f #import "_WKRemoteWebInspectorViewControllerInternal.h" #if PLATFORM(MAC) -diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewControllerInternal.h b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewControllerInternal.h -index 9eec59454b01ae422c9c14a96a589f41796dfd1d..f4a73d5ced672e6f8bec00ed22e82409fbed0a23 100644 ---- a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewControllerInternal.h -+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewControllerInternal.h -@@ -24,6 +24,7 @@ - */ - - #import "_WKRemoteWebInspectorViewControllerPrivate.h" -+#import - - #if !TARGET_OS_IPHONE - diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h b/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h index 4974e14214e2bb3e982325b885bab33e54f83998..cacdf8c71fab248d38d2faf03f7affdcfed1ef62 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h @@ -12005,19 +11980,6 @@ index 30860712f58b2a8d48cef5da4e6f03345f2921ba..e715496c24529689784ba4d481d23441 using namespace Inspector; -diff --git a/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm b/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm -index 72629294efe8b1071eb3c64013b40c1c71ea06e6..589a71b6b63b16dba0e285ad9843b83ffef338a5 100644 ---- a/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm -+++ b/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm -@@ -25,6 +25,8 @@ - - #import "config.h" - #import "ModelElementController.h" -+#import -+#import - - #if ENABLE(ARKIT_INLINE_PREVIEW) - diff --git a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.h b/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.h index 454c61ffdefecc476d1560c7c43f5b5d345f281d..6de7509037b7683ddd403ee247bdf2845ce4e87a 100644 --- a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.h @@ -12101,7 +12063,7 @@ index 7659b1c9ff0d2f9bc50aee7ed437a759bf6e9200..2c75e4b0fae4584136cf4d649945864f { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index 56a14d8bf36ed44dadbf1e4c4840a5e06414b8e7..d724284a3a3a8ecce9879ae3135118d4c0adc8ca 100644 +index 746cdf1b1dc401953d94372e25415e12ece7e319..9acfbb92d7e0581b5347dcf7926565485f9e9a2b 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -37,6 +37,7 @@ @@ -12180,7 +12142,7 @@ index 56a14d8bf36ed44dadbf1e4c4840a5e06414b8e7..d724284a3a3a8ecce9879ae3135118d4 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index 433934601535a0d46e3e8987b8368423870605c7..b9e9edb344a1fd9dccfd3bdbafbbce49f5a2c714 100644 +index 53a6ba439903cdd9bfa715c700a4dfb327fae71a..bee325ad03a12272b44ef938302380a0146eea0d 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm @@ -402,7 +402,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process @@ -12204,7 +12166,7 @@ index 433934601535a0d46e3e8987b8368423870605c7..b9e9edb344a1fd9dccfd3bdbafbbce49 m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h -index 39c73aa20b1290422c46f51eb04474c2d572bb8e..caca4f28930db37822579b762448a5b7f311de3e 100644 +index f4a6a3391c1d20c74be263a7273f45620bdb2e15..5dba3f40ed7aad87562cd804130e1c45d3c16087 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h @@ -504,6 +504,9 @@ public: @@ -15829,20 +15791,6 @@ index 7a14cfba15c103a2d4fe263fa49d25af3c396ec2..3ee0e154349661632799057c71f1d1f1 PROCESS_INFORMATION processInformation { }; BOOL result = ::CreateProcess(0, commandLine.data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation); -diff --git a/Source/WebKit/UIProcess/ModelElementController.h b/Source/WebKit/UIProcess/ModelElementController.h -index 7dd9e02d8d202103bd681c3e8d01af47fe335c68..aca416b6ca8b61f406a3298b426ae26672728681 100644 ---- a/Source/WebKit/UIProcess/ModelElementController.h -+++ b/Source/WebKit/UIProcess/ModelElementController.h -@@ -30,6 +30,9 @@ - #include "ModelIdentifier.h" - #include - #include -+#include -+#include -+#include - #include - #include - #include diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h index d02bb7cc80f7071a13c7f2b3641bc7baf0bab098..f3027ec3a284fbbe2ef3a1a56f71c10574a98d89 100644 --- a/Source/WebKit/UIProcess/PageClient.h @@ -16171,7 +16119,7 @@ index 0000000000000000000000000000000000000000..6d04f9290135069359ce6bf872654648 + +#endif // ENABLE(REMOTE_INSPECTOR) diff --git a/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp b/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp -index f5a6164e831c968995e332ef0269c0b8c18cf9f2..d69ae8cdca3c77d6325c703e65bd97136587f3bb 100644 +index 88fda8491460b77750d7da3501bea05e0f033079..df5ddb1604b46502750a95a84872024530351072 100644 --- a/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp +++ b/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp @@ -37,6 +37,8 @@ @@ -16182,7 +16130,7 @@ index f5a6164e831c968995e332ef0269c0b8c18cf9f2..d69ae8cdca3c77d6325c703e65bd9713 + namespace WebKit { - Ref SpeechRecognitionRemoteRealtimeMediaSource::create(SpeechRecognitionRemoteRealtimeMediaSourceManager& manager, const WebCore::CaptureDevice& captureDevice) + Ref SpeechRecognitionRemoteRealtimeMediaSource::create(SpeechRecognitionRemoteRealtimeMediaSourceManager& manager, const WebCore::CaptureDevice& captureDevice, WebCore::PageIdentifier pageIdentifier) diff --git a/Source/WebKit/UIProcess/WebAuthentication/Mock/MockLocalConnection.h b/Source/WebKit/UIProcess/WebAuthentication/Mock/MockLocalConnection.h index 684b9616573761123fbcc0d94be29de519ecced6..51ff18323ece0ee15c87d63a1d6fd604377ee968 100644 --- a/Source/WebKit/UIProcess/WebAuthentication/Mock/MockLocalConnection.h @@ -16877,7 +16825,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8dc19f0444 100644 +index 40dbda4f825ab17444068985725890d42710b464..22d0233bcd95d2bbb35e36da644b267cf294a177 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -248,6 +248,9 @@ @@ -16931,7 +16879,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1928,6 +1951,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1931,6 +1954,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -16963,7 +16911,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2118,6 +2166,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2121,6 +2169,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -16989,7 +16937,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2701,6 +2768,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2704,6 +2771,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -16998,7 +16946,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2711,6 +2780,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2714,6 +2783,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -17007,7 +16955,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2726,18 +2797,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2746,6 +2840,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2749,6 +2843,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17077,7 +17025,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2758,8 +2870,18 @@ void WebPageProxy::didStartDrag() +@@ -2761,8 +2873,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17097,7 +17045,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2864,16 +2986,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2867,16 +2989,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17143,7 +17091,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3037,7 +3181,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3040,7 +3184,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17152,7 +17100,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3070,7 +3214,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3073,7 +3217,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17161,7 +17109,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3459,6 +3603,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3462,6 +3606,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17170,7 +17118,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3527,6 +3673,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3530,6 +3676,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, std::variant, Ref>&& navigationActionOrResponse, Ref&& sender, std::optional sandboxExtensionHandle, WillContinueLoadInNewProcess willContinueLoadInNewProcess) { @@ -17178,7 +17126,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4261,6 +4408,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4264,6 +4411,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17190,7 +17138,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4645,6 +4797,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4648,6 +4800,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17198,7 +17146,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4869,6 +5022,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4872,6 +5025,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17207,7 +17155,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d // 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; -@@ -5340,7 +5495,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5343,7 +5498,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) { @@ -17223,7 +17171,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5912,6 +6074,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5915,6 +6077,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa if (originatingPage) openerAppInitiatedState = originatingPage->lastNavigationWasAppInitiated(); @@ -17231,7 +17179,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d auto completionHandler = [this, protectedThis = Ref { *this }, mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement, openerAppInitiatedState = WTFMove(openerAppInitiatedState)] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5958,6 +6121,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5961,6 +6124,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17239,7 +17187,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d } void WebPageProxy::exitFullscreenImmediately() -@@ -6015,6 +6179,10 @@ void WebPageProxy::closePage() +@@ -6018,6 +6182,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17250,7 +17198,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -6051,6 +6219,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -6054,6 +6222,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 { @@ -17259,7 +17207,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -6072,6 +6242,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -6075,6 +6245,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17268,7 +17216,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d 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 { -@@ -6095,6 +6267,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -6098,6 +6270,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17277,7 +17225,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d 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 { -@@ -6222,6 +6396,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6225,6 +6399,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17286,7 +17234,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7473,6 +7649,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7476,6 +7652,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17295,7 +17243,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d } break; } -@@ -7487,10 +7665,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7490,10 +7668,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -17312,7 +17260,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d break; } -@@ -7499,7 +7680,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7502,7 +7683,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()); @@ -17320,7 +17268,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7518,7 +7698,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7521,7 +7701,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); @@ -17328,7 +17276,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7527,6 +7706,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7530,6 +7709,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17336,7 +17284,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d } break; } -@@ -7881,7 +8061,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7884,7 +8064,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -17348,7 +17296,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8213,6 +8396,7 @@ static Span gpuMachServices() +@@ -8216,6 +8399,7 @@ static Span gpuMachServices() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17356,7 +17304,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8403,6 +8587,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8406,6 +8590,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.httpsUpgradeEnabled = preferences().upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false; @@ -17365,7 +17313,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d #if PLATFORM(IOS) // FIXME: This is also being passed over the to WebProcess via the PreferencesStore. parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload(); -@@ -8471,6 +8657,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8474,6 +8660,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17380,7 +17328,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8564,6 +8758,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8567,6 +8761,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17397,7 +17345,7 @@ index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8d // 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 78d54d81df1b58700b1b405eaf57b90a0efcce8b..299da033b6a0fa176e5495b5a61de82ec5f48662 100644 +index 916cdff4b966c1c74fbb90753a56477b44e080b8..bcb334707ee21c9cc8151f9f43fa7f17e3e239ef 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17519,7 +17467,7 @@ index 78d54d81df1b58700b1b405eaf57b90a0efcce8b..299da033b6a0fa176e5495b5a61de82e #endif #if ENABLE(WEB_CRYPTO) -@@ -2688,6 +2717,7 @@ private: +@@ -2684,6 +2713,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17527,7 +17475,7 @@ index 78d54d81df1b58700b1b405eaf57b90a0efcce8b..299da033b6a0fa176e5495b5a61de82e #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2952,6 +2982,20 @@ private: +@@ -2948,6 +2978,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17548,7 +17496,7 @@ index 78d54d81df1b58700b1b405eaf57b90a0efcce8b..299da033b6a0fa176e5495b5a61de82e #endif PageLoadState m_pageLoadState; -@@ -3161,6 +3205,9 @@ private: +@@ -3157,6 +3201,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17559,7 +17507,7 @@ index 78d54d81df1b58700b1b405eaf57b90a0efcce8b..299da033b6a0fa176e5495b5a61de82e #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 207bc21d32a6ffe6b7ef5fdd06e604e20a8aae48..c8529829ca524e849239dfbbe5b0453ece3ba2ff 100644 +index 92a1c3ccb6079b0bbe24e2ff933601edf36aea04..500863a393afefdfb270ae26e8cb81d1b57f8523 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17644,7 +17592,7 @@ index be96b41de2752fc635934163e5b02055afedc299..24570635349635c7e41e5b385cd66c66 { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index 7a80c274d224374208786262fb353dc2e08dea55..931a318a02acfc87c04a88d4b46823346d600515 100644 +index bfc7956c02ee5ace2d557343c507537a85cfd4fc..230d21c78633d1bd47c326d66fd92f4afb3d50e1 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h @@ -145,6 +145,7 @@ public: @@ -17656,10 +17604,10 @@ index 7a80c274d224374208786262fb353dc2e08dea55..931a318a02acfc87c04a88d4b4682334 WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 1da3106b94588cd641d6b0b94ac5a6422df08af7..d0032670eb526ec537a34713d1b9cddff101c901 100644 +index 50c9352b669c5869c7748c399ba21c8b7d590a13..29e31be2e732dc64a89a519929f7eadf1018c8d1 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -1993,6 +1993,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O +@@ -1988,6 +1988,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); } @@ -18755,7 +18703,7 @@ index 31bc0797a1b086b9342e5449e48cf5b3050464eb..450b6acf92b31cb40c404e3a8553e263 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 163f8ad4e8047ee0281730f512e5ec47a065a7b1..f7c174730e3683c85511d0e8fdb1b4d10cf67bdc 100644 +index de3e60150826948ea082232327e3ace5dea9a0f9..8c8bb0c53de3ea6b8538ba367354657ee32c430a 100644 --- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm +++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm @@ -446,6 +446,12 @@ void WebContextMenuProxyMac::getShareMenuItem(CompletionHandler draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6870,6 +6983,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6873,6 +6986,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20875,7 +20823,7 @@ index 09dbae8e31054216fe988f60b9f464ccc7db9f69..e2b919ba3e8c2e38e9920cfba2ec23f2 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index a5ebaec45ba024ad4bf2f2b9e61e2c4d5acedd97..677c1bf984b828aa93a80780603fbd34735574da 100644 +index 1e14752504fad540b9875e5dc722be4d4ce8db77..46096768ca4f5d845460efc720f5149468255703 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -122,6 +122,10 @@ typedef struct _AtkObject AtkObject; @@ -20956,7 +20904,7 @@ index a5ebaec45ba024ad4bf2f2b9e61e2c4d5acedd97..677c1bf984b828aa93a80780603fbd34 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 6f526e49958c26be8d7122700f8b535ac0846300..6ac536da2487ace858e54b401bc4b8412472bd10 100644 +index cff0aa91a0bc2f4afee6ecf14da7d2e111a3a454..1bcda592029d7fe375daeb1a0d637d956421bc40 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -144,6 +144,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -21100,7 +21048,7 @@ index bb512aec34506aa588a736b6dcf6b6f3b669e342..fbcad974ad70113d527f7cac688e47d5 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index e978b9d909badec6449a6531e5c7583ae718c7ac..2f28dd7d50a0262ceeea57a51729902e6d701696 100644 +index 482198739cfda5fce662107c4e27e351d38472dd..c4001e032330587b8eba347f00650a7298a1768e 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -92,6 +92,7 @@ @@ -22064,7 +22012,7 @@ index f6b59db3c0eeb0612f25e85b29495cd990add74d..69df426e74d2f1336a24e744ae25915b list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index fa6b691c74c865f9e1de39b74e3c1bce8458deed..fb493556a77b744e715b1b92ed3c8f7a9b05bfc4 100644 +index 5f02b0ee8c854f36e70ee52693eef80f547ee56f..c79d3b319fa7b23a806678c55643abdf1ecdd19b 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -834,6 +834,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)