diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index b246472580..b986f820af 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1651 -Changed: yurys@chromium.org Mon 23 May 2022 11:00:14 AM PDT +1652 +Changed: dpino@igalia.com Thu May 26 09:36:11 UTC 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 627c8834f3..dbb4008417 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="76dea20b140c4f5c7c99c93795f65c12c2bc3586" +BASE_REVISION="0e798281d3ad557900b890a1ffdee2984b05c227" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 265ed06326..0d6a3c4c3a 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -1802,10 +1802,10 @@ index 4157c0a95fa332ac85a295814fda2fb61f3da434..6edd90d2c5fc3b16d19f4d73edacf8b3 +_vpx_codec_version_str +_vpx_codec_vp8_cx diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig -index 38a4ad6f76932fe5ad6a00689fe60c5b8cc5d042..3cab39566912440255fdbfb765e3a5e7acc0491a 100644 +index cc89d13e8e007737e4325392a9d7bb81ea88d566..7a08f298defd4c9dd77354f5b892a03928bbb711 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig -@@ -52,7 +52,7 @@ DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(NORMAL_WEBCORE_FRAMEWORKS +@@ -50,7 +50,7 @@ DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(NORMAL_WEBCORE_FRAMEWORKS DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; @@ -2051,7 +2051,7 @@ index 2383d5b94b869e13a305571add135a730e15d5b1..9399a38171ba2ed87e10f0944138d148 type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 32082f485960ee61e3aa46b7d618228870e6f896..466f96c29ecb7e151d711f5fd7499e8ec83a6857 100644 +index d14f8687510aa4f2a7ec2d0b41055e7cde58031f..e9d07bc57b77ca6acca110a39359e565fc1e4a47 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -479,7 +479,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2102,7 +2102,7 @@ index 32082f485960ee61e3aa46b7d618228870e6f896..466f96c29ecb7e151d711f5fd7499e8e UserGesturePromisePropagationEnabled: diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml -index 8bb2c7270c30b3bfc4bbd65b93985d5e97019ac9..c597c721e5f721ce9f0f131dcb8251e751997518 100644 +index 78b806ade5ac37c3b4b075aa39a3962888a217da..de4f57b6e10141d78ad77ae5cd75474013b29888 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml @@ -919,6 +919,7 @@ UseCGDisplayListsForDOMRendering: @@ -2123,7 +2123,7 @@ index 8bb2c7270c30b3bfc4bbd65b93985d5e97019ac9..c597c721e5f721ce9f0f131dcb8251e7 UseGPUProcessForMediaEnabled: diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index 919f9a02d1a6b11d2d3773be94c2e6c5b63f1ce5..6757f230255a2e947f44ee8a73ce6dd9a2ebb4d5 100644 +index 4867c7ea9d2f6e08c66692e26a8c29641b03297d..6ca27cacb2869d6aeeba4c69ca7bd94f685c1762 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h @@ -420,7 +420,7 @@ @@ -2170,7 +2170,7 @@ index bb01bfeeac63f854fa656ec6b8d262fafc4c9df5..f8376ea8aada69d2e53734ba8fd234c2 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index c250c8e4f41c039182f317cf776efbdb80286af1..91fd78cddfe53b995c14f7fdd917f54b4409bbca 100644 +index 5fa4d36f5d7f6a997c85dbf23f38918b659c7e6c..71958e68e2442c387a9c764f6659cb6bf27ff627 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -414,7 +414,7 @@ @@ -2238,7 +2238,7 @@ diff --git a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm b/So index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d768ace22 100644 --- a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm +++ b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm -@@ -198,6 +198,7 @@ - (void)sendEndIfNeeded +@@ -198,6 +198,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognizer:(SFSpeechRecognizer *)speechRecognizer availabilityDidChange:(BOOL)available { @@ -2246,7 +2246,7 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d ASSERT(isMainThread()); if (available || !_task) -@@ -211,6 +212,7 @@ - (void)speechRecognizer:(SFSpeechRecognizer *)speechRecognizer availabilityDidC +@@ -211,6 +212,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didHypothesizeTranscription:(SFTranscription *)transcription { @@ -2254,7 +2254,7 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d ASSERT(isMainThread()); [self sendSpeechStartIfNeeded]; -@@ -219,6 +221,7 @@ - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didHypothesizeTran +@@ -219,6 +221,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didFinishRecognition:(SFSpeechRecognitionResult *)recognitionResult { @@ -2262,7 +2262,7 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d ASSERT(isMainThread()); [self callbackWithTranscriptions:recognitionResult.transcriptions isFinal:YES]; -@@ -230,6 +233,7 @@ - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didFinishRecogniti +@@ -230,6 +233,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognitionTaskWasCancelled:(SFSpeechRecognitionTask *)task { @@ -2375,10 +2375,10 @@ index c4898d6db6bf06552f602c4b7f0a7267e64e44f4..7cf2e30729671a89c373870c5691d337 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf405aad00 100644 +index ff8a77bde312abf01cdb79e0ffc225b1df757138..77d30b0e110a10d7c7f260d82d35c9f4cecc6351 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5529,6 +5529,13 @@ +@@ -5531,6 +5531,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, ); }; }; @@ -2392,7 +2392,7 @@ index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf 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, ); }; }; -@@ -17865,6 +17872,14 @@ +@@ -17870,6 +17877,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 = ""; }; @@ -2407,7 +2407,7 @@ index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf 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 = ""; }; -@@ -24286,7 +24301,12 @@ +@@ -24293,7 +24308,12 @@ 1AF326770D78B9440068F0C4 /* EditorClient.h */, E36D701E27B71F04006531B7 /* EmptyAttachmentElementClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2420,7 +2420,7 @@ index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -30320,6 +30340,8 @@ +@@ -30328,6 +30348,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2429,7 +2429,7 @@ index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32628,6 +32650,7 @@ +@@ -32636,6 +32658,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2437,7 +2437,7 @@ index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -33637,6 +33660,7 @@ +@@ -33645,6 +33668,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2445,7 +2445,7 @@ index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -35782,6 +35806,7 @@ +@@ -35792,6 +35816,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2453,7 +2453,7 @@ index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -36904,6 +36929,7 @@ +@@ -36915,6 +36940,7 @@ 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, @@ -2461,7 +2461,7 @@ index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, CD1F9B032700323D00617EB6 /* PlatformVideoMatrixCoefficients.h in Headers */, -@@ -38999,6 +39025,7 @@ +@@ -39009,6 +39035,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2469,7 +2469,7 @@ index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -39075,6 +39102,7 @@ +@@ -39085,6 +39112,7 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2477,7 +2477,7 @@ index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -39123,6 +39151,7 @@ +@@ -39133,6 +39161,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2485,7 +2485,7 @@ index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -39655,6 +39684,7 @@ +@@ -39665,6 +39694,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2494,7 +2494,7 @@ index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf 2D8B92F5203D13E1009C868F /* UnifiedSource520.cpp in Sources */, 2D8B92F6203D13E1009C868F /* UnifiedSource521.cpp in Sources */, diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp -index a8108919d8da21dfc741f44a999985695662b771..95e5863a73299d1212e67600ca611d87159b9095 100644 +index e7cd6584978e30c2149784d302af997f3a65c8e3..82f51cd262be3dcf3a5c3f9a97d62269f4d09985 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2680,7 +2680,7 @@ index 01d312c38e8e273099cf8d9b187ac704300f4c34..62570e7024cebae99b9d2eef711e70d8 if (!value) return userPrefersReducedMotion; diff --git a/Source/WebCore/dom/DataTransfer.cpp b/Source/WebCore/dom/DataTransfer.cpp -index 0340d056020c605e40e5c2a8265c855758bca8a1..c06566711f66c192607c2b520d6650066c3270b5 100644 +index 5186d365dfdfb02b1c62f1400f9f15b31afbf4c4..a591245ef7841731bcfd82eb2026607378651496 100644 --- a/Source/WebCore/dom/DataTransfer.cpp +++ b/Source/WebCore/dom/DataTransfer.cpp @@ -496,6 +496,14 @@ Ref DataTransfer::createForDrag(const Document& document) @@ -3354,7 +3354,7 @@ index bde7c16e2e3fbe0b5d3891996e550f99785bb5c1..899b13d1eac5bd7dd35fe82cce1bf796 { return context ? instrumentingAgents(*context) : nullptr; diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp -index 66967959aff451eda20716b8ae9616fb7a915a29..4f8b75e852da5a24570d3a0bc4a6871f19d502fc 100644 +index 9b678ae214c8c8d324d233d9d3e3f351c46f6dc4..5ea4116377851c3824d813f426852ce5b50473bf 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp @@ -62,12 +62,16 @@ @@ -3408,7 +3408,7 @@ index 66967959aff451eda20716b8ae9616fb7a915a29..4f8b75e852da5a24570d3a0bc4a6871f } static bool parseQuad(Ref&& quadArray, FloatQuad* quad) -@@ -417,6 +424,20 @@ Node* InspectorDOMAgent::assertNode(Protocol::ErrorString& errorString, Protocol +@@ -451,6 +458,20 @@ Node* InspectorDOMAgent::assertNode(Protocol::ErrorString& errorString, Protocol return node; } @@ -3429,7 +3429,7 @@ index 66967959aff451eda20716b8ae9616fb7a915a29..4f8b75e852da5a24570d3a0bc4a6871f Document* InspectorDOMAgent::assertDocument(Protocol::ErrorString& errorString, Protocol::DOM::NodeId nodeId) { Node* node = assertNode(errorString, nodeId); -@@ -1408,16 +1429,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::highlightSelector(Ref InspectorDOMAgent::highlightSelector(Ref InspectorDOMAgent::highlightNode(Ref&& highlightInspectorObject, std::optional&& nodeId, const Protocol::Runtime::RemoteObjectId& objectId) { Protocol::ErrorString errorString; @@ -3447,7 +3447,7 @@ index 66967959aff451eda20716b8ae9616fb7a915a29..4f8b75e852da5a24570d3a0bc4a6871f if (!node) return makeUnexpected(errorString); -@@ -1655,15 +1667,136 @@ Protocol::ErrorStringOr InspectorDOMAgent::setInspectedNode(Protocol::DOM: +@@ -1689,15 +1701,136 @@ Protocol::ErrorStringOr InspectorDOMAgent::setInspectedNode(Protocol::DOM: return { }; } @@ -3588,7 +3588,7 @@ index 66967959aff451eda20716b8ae9616fb7a915a29..4f8b75e852da5a24570d3a0bc4a6871f if (!object) return makeUnexpected("Missing injected script for given nodeId"_s); -@@ -2897,7 +3030,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::pushNodeByPath +@@ -2952,7 +3085,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::pushNodeByPath return makeUnexpected("Missing node for given path"_s); } @@ -3597,7 +3597,7 @@ index 66967959aff451eda20716b8ae9616fb7a915a29..4f8b75e852da5a24570d3a0bc4a6871f { Document* document = &node->document(); if (auto* templateHost = document->templateDocumentHost()) -@@ -2906,12 +3039,18 @@ RefPtr InspectorDOMAgent::resolveNode(Node* nod +@@ -2961,12 +3094,18 @@ RefPtr InspectorDOMAgent::resolveNode(Node* nod if (!frame) return nullptr; @@ -3619,7 +3619,7 @@ index 66967959aff451eda20716b8ae9616fb7a915a29..4f8b75e852da5a24570d3a0bc4a6871f } Node* InspectorDOMAgent::scriptValueAsNode(JSC::JSValue value) -@@ -2934,4 +3073,57 @@ Protocol::ErrorStringOr InspectorDOMAgent::setAllowEditingUserAgentShadowT +@@ -2989,4 +3128,57 @@ Protocol::ErrorStringOr InspectorDOMAgent::setAllowEditingUserAgentShadowT return { }; } @@ -3678,7 +3678,7 @@ index 66967959aff451eda20716b8ae9616fb7a915a29..4f8b75e852da5a24570d3a0bc4a6871f + } // namespace WebCore diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.h b/Source/WebCore/inspector/agents/InspectorDOMAgent.h -index c503d5db51b75de57e3b09357f48f60470986da4..79947b44063d85951d2f6314c5cb78a54ab2d46e 100644 +index 262829afb3c7151464de876368db47bf733e7f2e..fdcc8c44f3d24f13003b3eed3f2af79c9746896f 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.h +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.h @@ -57,6 +57,7 @@ namespace WebCore { @@ -3742,7 +3742,7 @@ index c503d5db51b75de57e3b09357f48f60470986da4..79947b44063d85951d2f6314c5cb78a5 private: #if ENABLE(VIDEO) void mediaMetricsTimerFired(); -@@ -245,7 +254,6 @@ private: +@@ -246,7 +255,6 @@ private: void processAccessibilityChildren(AXCoreObject&, JSON::ArrayOf&); Node* nodeForPath(const String& path); @@ -5335,7 +5335,7 @@ index ce453415884b3400185c8f9ebb400b01e7325447..367b38e1cc79da385772cee0dfc27763 } diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index d985eb2ec8f94e3197ef6055c5ae7d1f39f3fbf1..fc02b3e3239c890a25ba099985157ea0f48669d9 100644 +index 50de786a5483597989439209ebd16b5b4e8a2924..59198323a3e72b92e95f73c15a43dc6d8e967765 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h @@ -181,9 +181,13 @@ public: @@ -5353,7 +5353,7 @@ index d985eb2ec8f94e3197ef6055c5ae7d1f39f3fbf1..fc02b3e3239c890a25ba099985157ea0 DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index 9737b7924e0be7de6b92ce374f82c98d40adc8dd..f58147df22978db38efef7a3e9555a3d2c6fed39 100644 +index 2d3e75288eef017f4cab26584d25d65a8b582682..49075624068299bfb700c18629731791251efa41 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -1167,6 +1167,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr stat @@ -5455,7 +5455,7 @@ index 29d2e3f46140aaa51160e6a28562f370e371eb21..676ddc9369050c19454fbf5faffac2b2 virtual bool shouldPerformSecurityChecks() const { return false; } virtual bool havePerformedSecurityChecks(const ResourceResponse&) const { return false; } diff --git a/Source/WebCore/loader/PolicyChecker.cpp b/Source/WebCore/loader/PolicyChecker.cpp -index 24c07a5b19379f2bd9c8532c6e1d99deae5a0045..7e72901d911a1e918b12292a3c2cd72a84941506 100644 +index 61edc972ce354589380535f8c02a39b902d626aa..5eb8f591778112b22205fd910dff18b9ddb46a92 100644 --- a/Source/WebCore/loader/PolicyChecker.cpp +++ b/Source/WebCore/loader/PolicyChecker.cpp @@ -46,6 +46,7 @@ @@ -5502,7 +5502,7 @@ index 4a65cd84e5b3c627f16712427d8059a73c759403..90a6262005694741aaaa59c869d35d5c #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index ac725d46758f9c325a9f84075aba43c0166bb37d..ac7e73d26ac40e498bc75d64e00712d1d42d7fc0 100644 +index 843ab83cea38a97f601dc22f35b284f152049527..b8b276c20bd226b78a2757cbe52a9c2fb6ff19cb 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -142,6 +142,7 @@ @@ -5695,7 +5695,7 @@ index 51d36bd866b1d5f1daea4b02ce86b213eaa44adb..fd3cd3dad309416f41a0a0bcac22c9e5 bool m_mouseDownMayStartDrag { false }; bool m_dragMayStartSelectionInstead { false }; diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp -index edf6ed1889560fd4332592d35d52fab2b6858e1c..2c3083caecd1f4281e970c3c531844ae33e433f0 100644 +index 0d953e1e6242b0d41a8ee54996f7c0be309dca24..b38a18645821fa0e3245a29df4ec6fdcb3ff9909 100644 --- a/Source/WebCore/page/Frame.cpp +++ b/Source/WebCore/page/Frame.cpp @@ -39,6 +39,7 @@ @@ -6235,7 +6235,7 @@ index a782c3be51ca113a52482c5a10583c8fa64724ef..1d82dff81be5c5492efb3bfe77d2f259 if (stateObjectType == StateObjectType::Push) { frame->loader().history().pushState(WTFMove(data), title, fullURL.string()); diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp -index 22737c5d7554d0ba158ef3e1a63fbde11502e72b..6474b73078528345f8e2addcdbca0eb670974d22 100644 +index a26e32a917edb14da910a6538bdfe18bf3bd8df6..be8fabf2eadccdc26c225d992b15855e2a91d83d 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -487,6 +487,37 @@ void Page::setOverrideViewportArguments(const std::optional& @@ -6287,7 +6287,7 @@ index 22737c5d7554d0ba158ef3e1a63fbde11502e72b..6474b73078528345f8e2addcdbca0eb6 resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3406,6 +3433,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3408,6 +3435,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6305,10 +6305,10 @@ index 22737c5d7554d0ba158ef3e1a63fbde11502e72b..6474b73078528345f8e2addcdbca0eb6 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index ccf2e14844c9ad578e4e262a5881167c846fc9d3..a10ad39fc75b52e8484e7562b21ee230e865c0e2 100644 +index be8eb5264eeae6a461856d6c477b3eaeee31569f..833f2e0ef70707680c09a84b692086037fa87572 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h -@@ -279,6 +279,9 @@ public: +@@ -281,6 +281,9 @@ public: const std::optional& overrideViewportArguments() const { return m_overrideViewportArguments; } WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional&); @@ -6318,7 +6318,7 @@ index ccf2e14844c9ad578e4e262a5881167c846fc9d3..a10ad39fc75b52e8484e7562b21ee230 static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -329,6 +332,10 @@ public: +@@ -331,6 +334,10 @@ public: DragCaretController& dragCaretController() const { return *m_dragCaretController; } #if ENABLE(DRAG_SUPPORT) DragController& dragController() const { return *m_dragController; } @@ -6329,7 +6329,7 @@ index ccf2e14844c9ad578e4e262a5881167c846fc9d3..a10ad39fc75b52e8484e7562b21ee230 #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -496,6 +503,8 @@ public: +@@ -498,6 +505,8 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6338,7 +6338,7 @@ index ccf2e14844c9ad578e4e262a5881167c846fc9d3..a10ad39fc75b52e8484e7562b21ee230 #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -903,6 +912,11 @@ public: +@@ -905,6 +914,11 @@ public: bool shouldBuildInteractionRegions() const; #endif @@ -6350,7 +6350,7 @@ index ccf2e14844c9ad578e4e262a5881167c846fc9d3..a10ad39fc75b52e8484e7562b21ee230 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -1019,6 +1033,9 @@ private: +@@ -1021,6 +1035,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6360,7 +6360,7 @@ index ccf2e14844c9ad578e4e262a5881167c846fc9d3..a10ad39fc75b52e8484e7562b21ee230 #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1098,6 +1115,7 @@ private: +@@ -1100,6 +1117,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6368,7 +6368,7 @@ index ccf2e14844c9ad578e4e262a5881167c846fc9d3..a10ad39fc75b52e8484e7562b21ee230 #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1275,6 +1293,11 @@ private: +@@ -1277,6 +1295,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6442,10 +6442,10 @@ index 897d2a009752a4030659a88e8b16382e00ac2316..08bb3344c59a0462668762815473659f #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index da65510492bb4a810124b05cba7e74d485c9cba9..e36002bfa44188306b65b494ad14e2c8db8eb8ac 100644 +index e6f03848b809ec796454e14fc7d6ea45373239ee..563ba04256ea44ba0f109c37c4638a5a59e02890 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h -@@ -175,6 +175,7 @@ public: +@@ -177,6 +177,7 @@ public: void setMouseEventsSimulationEnabled(bool isEnabled) { m_mouseEventsSimulationEnabled = isEnabled; } bool touchEventsEnabled() const; void setTouchEventsEnabled(bool isEnabled) { m_touchEventsEnabled = isEnabled; } @@ -6494,7 +6494,7 @@ index 7ac11c8289347e3a2f3e7316cf9e32932b9544ed..764b2d4fe36ac2e5588bd22595424ac1 } diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -index 2fd52a5b9267aaa29e2760c5cda125ec5af95009..43f07ea81e401764ea34145b1a08b80b7cb7c746 100644 +index d1679136a7ca95a16ca3fa6246c42f0111d940b5..9e49bf67a063987dc4964ca2a1267c649a5e24ff 100644 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp @@ -298,6 +298,8 @@ bool ContentSecurityPolicy::allowContentSecurityPolicySourceStarToMatchAnyProtoc @@ -7891,7 +7891,7 @@ index c4eb67d6f7c334076b32b798dcea40b570681e6f..ce86ab28225aa466350671441294f2ac bool m_detectedDatabaseCorruption { false }; diff --git a/Source/WebCore/platform/network/curl/CurlStream.cpp b/Source/WebCore/platform/network/curl/CurlStream.cpp -index 36658f91dc9d67230b239e497c0000ac62aae981..de09412ef68a0d21e16b3c958254768e8b7eda87 100644 +index 7a7aa8371394ab6a66a66392cef306daeafe6811..44dd345cb40cc887343ce36ff29fb5ffc5a1ed9e 100644 --- a/Source/WebCore/platform/network/curl/CurlStream.cpp +++ b/Source/WebCore/platform/network/curl/CurlStream.cpp @@ -34,7 +34,7 @@ @@ -7971,7 +7971,7 @@ index 0c39c90aac884fca48849388acc1b42bad16d620..dd8e50686c348b46d5ae92fd67a31eb0 void send(CurlStreamID, UniqueArray&&, size_t); diff --git a/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp b/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp -index a3be8be8329320a56fae4205fa9ba9ec38ec8580..ca1d7d1b7bbd8686b0c5458b25e0f82c3ae06c22 100644 +index cacf84fa9eb9c4fddd315f03d014cac7c28b84c1..d20f930485115e7735cb362c57ced87195d5130c 100644 --- a/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp +++ b/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp @@ -118,6 +118,12 @@ void NetworkStorageSession::setCookieAcceptPolicy(CookieAcceptPolicy policy) con @@ -8010,7 +8010,7 @@ index 950cd1b1ac6800212e8192b5cb53e69b34409111..58b1f55543f1bdcfc8e6b19b06633c0c size_t bufferedAmount() final; std::optional platformSendInternal(const uint8_t*, size_t); diff --git a/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp b/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp -index a8f57a72d0eacca7755be84fcaa1c9bf10958c0b..a5d67b8016a86b9184ded0904e317048e0eb9ea1 100644 +index e106d2e9c4bdf2f099c34d61270ab1ab12e1b1bc..d1ffe11e4fc2a0bece55c4a70f4d1eef28c4dadb 100644 --- a/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp +++ b/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp @@ -44,7 +44,7 @@ @@ -8023,7 +8023,7 @@ index a8f57a72d0eacca7755be84fcaa1c9bf10958c0b..a5d67b8016a86b9184ded0904e317048 , m_storageSessionProvider(provider) , m_scheduler(CurlContext::singleton().streamScheduler()) @@ -53,7 +53,7 @@ SocketStreamHandleImpl::SocketStreamHandleImpl(const URL& url, SocketStreamHandl - if (m_url.protocolIs("wss") && DeprecatedGlobalSettings::allowsAnySSLCertificate()) + if (m_url.protocolIs("wss"_s) && DeprecatedGlobalSettings::allowsAnySSLCertificate()) CurlContext::singleton().sslHandle().setIgnoreSSLErrors(true); - m_streamID = m_scheduler.createStream(m_url, *this); @@ -8032,7 +8032,7 @@ index a8f57a72d0eacca7755be84fcaa1c9bf10958c0b..a5d67b8016a86b9184ded0904e317048 SocketStreamHandleImpl::~SocketStreamHandleImpl() diff --git a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp -index 6e0a3dc7ac5adf22f553f81113633a135ae9271c..16e629a1489bede4f3266253c11077b82524e576 100644 +index 7ec08a674d15678dbbb80c755a8df253a9f545be..7b34d110779af23497ed937bbd3dd1800f269d33 100644 --- a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp +++ b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp @@ -410,6 +410,30 @@ void NetworkStorageSession::setCookie(const Cookie& cookie) @@ -8067,7 +8067,7 @@ index 6e0a3dc7ac5adf22f553f81113633a135ae9271c..16e629a1489bede4f3266253c11077b8 { GUniquePtr targetCookie(cookie.toSoupCookie()); diff --git a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp b/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp -index 0031750d39ed8908f44e4c62521291c164e94acd..f2ff5238b83c18bab1cc6736005e1e2b5668ae79 100644 +index fdde3ee4f109b35c5b6766450a5aa3fd56619199..6d960bee81c15d0415c04616bb7715390a9a83e6 100644 --- a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp +++ b/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp @@ -39,6 +39,7 @@ @@ -8624,7 +8624,7 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderTextControl.cpp b/Source/WebCore/rendering/RenderTextControl.cpp -index 1c99a7d1faec752dbfe0aaacfa95f8fca35de446..9be94e70398713a65b1aff134f894463dad625d7 100644 +index fcd984f4ec4646da9cc9920f9447b1ce0e96456d..8fea25dbf3cd74992dd2f3b8907c691f3fe2e6a8 100644 --- a/Source/WebCore/rendering/RenderTextControl.cpp +++ b/Source/WebCore/rendering/RenderTextControl.cpp @@ -212,13 +212,13 @@ void RenderTextControl::layoutExcludedChildren(bool relayoutChildren) @@ -8775,7 +8775,7 @@ index a2629e4edb214b3d26aca78da845c65d0e5aa341..d034f3a57badda1f34729afd712db7cd 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 0c6f2435a3c75cd5112403085ff2b9ee58e0c0fd..12720a7b3a1279a04cde8e322d5e5b67d85ee021 100644 +index b038697a228ad13e4b2183638c123ae9427f364d..26de8d2ed663fa760c5e244c6795bfb4c088ff5d 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -530,6 +530,12 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) @@ -8792,10 +8792,10 @@ index 0c6f2435a3c75cd5112403085ff2b9ee58e0c0fd..12720a7b3a1279a04cde8e322d5e5b67 void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index 4cb9db009a89e6e78ecf955b4792b736c22ba1ba..3458a5b5d4ee873969aaefa0cddd670006542bf6 100644 +index 4e813e3b8cf736553f2ae49ff4d8357eadc3fdd9..e75162d4aa4ad4a45269bec967f992c02f64f302 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h -@@ -37,6 +37,7 @@ +@@ -36,6 +36,7 @@ #include "QuotaIncreaseRequestIdentifier.h" #include "RTCDataChannelRemoteManagerProxy.h" #include "SandboxExtension.h" @@ -8803,7 +8803,7 @@ index 4cb9db009a89e6e78ecf955b4792b736c22ba1ba..3458a5b5d4ee873969aaefa0cddd6700 #include "WebPageProxyIdentifier.h" #include "WebResourceLoadStatisticsStore.h" #include "WebsiteData.h" -@@ -83,6 +84,7 @@ class SessionID; +@@ -82,6 +83,7 @@ class SessionID; namespace WebCore { class CertificateInfo; @@ -8811,7 +8811,7 @@ index 4cb9db009a89e6e78ecf955b4792b736c22ba1ba..3458a5b5d4ee873969aaefa0cddd6700 class CurlProxySettings; class ProtectionSpace; class NetworkStorageSession; -@@ -202,6 +204,8 @@ public: +@@ -201,6 +203,8 @@ public: void addWebsiteDataStore(WebsiteDataStoreParameters&&); @@ -8821,7 +8821,7 @@ index 4cb9db009a89e6e78ecf955b4792b736c22ba1ba..3458a5b5d4ee873969aaefa0cddd6700 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 3206dcb97599ce445a73c9667af7d21c61f7c870..78abd1fa5d52103383ef8765db299d1c544490d7 100644 +index 2657c1ea428958b32428fac55793268bc7724fee..d5144290e0f0ddc92f4c6936763bd18edf45928a 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in @@ -77,6 +77,8 @@ messages -> NetworkProcess LegacyReceiver { @@ -8855,92 +8855,11 @@ index 11b3fc7c4267ef9e412d7d48bb6cfbe70b2bdfeb..af1fb6660696cf9c91d319670d554272 HashSet> m_keptAliveLoads; -diff --git a/Source/WebKit/NetworkProcess/WebStorage/LocalStorageNamespace.cpp b/Source/WebKit/NetworkProcess/WebStorage/LocalStorageNamespace.cpp -index 04c49bb4c914ebd93c7bcc09154e8c1d76e844b3..ace4b6eaa8ff94bdbd9d6aa041233b46f02f4fa1 100644 ---- a/Source/WebKit/NetworkProcess/WebStorage/LocalStorageNamespace.cpp -+++ b/Source/WebKit/NetworkProcess/WebStorage/LocalStorageNamespace.cpp -@@ -29,6 +29,7 @@ - #include "StorageArea.h" - #include "StorageManager.h" - #include -+#include - - namespace WebKit { - -@@ -103,4 +104,11 @@ Vector LocalStorageNamespace::storageAreaIdentifiers() co - return identifiers; - } - -+void LocalStorageNamespace::forEachStorageArea(Function callback) const -+{ -+ ASSERT(!RunLoop::isMain()); -+ for (auto& storageArea : m_storageAreaMap.values()) -+ callback(*storageArea); -+} -+ - } // namespace WebKit -diff --git a/Source/WebKit/NetworkProcess/WebStorage/LocalStorageNamespace.h b/Source/WebKit/NetworkProcess/WebStorage/LocalStorageNamespace.h -index 73c35fc615f88a8d313848a4384875ac7d42505e..eaecae4ba4eda91ed39ecf35d075bc6369eac72b 100644 ---- a/Source/WebKit/NetworkProcess/WebStorage/LocalStorageNamespace.h -+++ b/Source/WebKit/NetworkProcess/WebStorage/LocalStorageNamespace.h -@@ -28,7 +28,7 @@ - #include "StorageAreaIdentifier.h" - #include "StorageNamespaceIdentifier.h" - #include --#include -+#include - #include - #include - -@@ -58,6 +58,8 @@ public: - - Vector storageAreaIdentifiers() const; - -+ void forEachStorageArea(Function) const; -+ - private: - StorageManager& m_storageManager; - unsigned m_quotaInBytes { 0 }; -diff --git a/Source/WebKit/NetworkProcess/WebStorage/StorageArea.cpp b/Source/WebKit/NetworkProcess/WebStorage/StorageArea.cpp -index 0c41ab92e31f49d6a5a949a403728c2aa9d040b1..4c5b378abb10ab1ba93543477e841f4ba1243dee 100644 ---- a/Source/WebKit/NetworkProcess/WebStorage/StorageArea.cpp -+++ b/Source/WebKit/NetworkProcess/WebStorage/StorageArea.cpp -@@ -112,6 +112,18 @@ void StorageArea::setItem(IPC::Connection::UniqueID sourceConnection, StorageAre - dispatchEvents(sourceConnection, storageAreaImplID, key, oldValue, value, urlString); - } - -+void StorageArea::setItems(const HashMap& items, bool& quotaException) { -+ ASSERT(!RunLoop::isMain()); -+ -+ for (const auto& item : items) { -+ String oldValue; -+ if (isEphemeral()) -+ m_sessionStorageMap->setItem(item.key, item.value, oldValue, quotaException); -+ else -+ ensureDatabase().setItem(item.key, item.value, oldValue, quotaException); -+ } -+} -+ - void StorageArea::removeItem(IPC::Connection::UniqueID sourceConnection, StorageAreaImplIdentifier storageAreaImplID, const String& key, const String& urlString) - { - ASSERT(!RunLoop::isMain()); -diff --git a/Source/WebKit/NetworkProcess/WebStorage/StorageArea.h b/Source/WebKit/NetworkProcess/WebStorage/StorageArea.h -index f57a72b6bdc3382469d69adb1b1201c7a9f07a84..c501211b094312ca44f0bf92de5d6ebc6bb843f9 100644 ---- a/Source/WebKit/NetworkProcess/WebStorage/StorageArea.h -+++ b/Source/WebKit/NetworkProcess/WebStorage/StorageArea.h -@@ -64,6 +64,7 @@ public: - void removeItem(IPC::Connection::UniqueID sourceConnection, StorageAreaImplIdentifier, const String& key, const String& urlString); - void clear(IPC::Connection::UniqueID sourceConnection, StorageAreaImplIdentifier, const String& urlString); - -+ void setItems(const HashMap& items, bool& quotaException); - HashMap items() const; - void clear(); - diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm index ba33be375f926e0f5d71a9bb6ca8663f13ba59be..80c781b0e7a39b130311d090d7ccf1c233af1261 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -720,7 +720,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didRece +@@ -720,7 +720,7 @@ void NetworkSessionCocoa::setClientAuditToken(const WebCore::AuthenticationChall if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { sessionCocoa->setClientAuditToken(challenge); @@ -8964,7 +8883,7 @@ index ba33be375f926e0f5d71a9bb6ca8663f13ba59be..80c781b0e7a39b130311d090d7ccf1c2 #if !LOG_DISABLED LOG(NetworkSession, "%llu didReceiveResponse completionHandler (%d)", taskIdentifier, policyAction); diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp -index 2e6fa61594ff12bd7e864ac6edc71849f89e4028..c9c05b19cc1d229b048261751d85d6a59d2c8f55 100644 +index 919935044a5b6b24a5d3f8268a0b876065032550..9cfdab46f921fe8b38d6a10e74cb03355b020090 100644 --- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp +++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp @@ -84,6 +84,8 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas @@ -8994,7 +8913,7 @@ index 2e6fa61594ff12bd7e864ac6edc71849f89e4028..c9c05b19cc1d229b048261751d85d6a5 if (m_state != State::Suspended) { diff --git a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp -index e61d6ab76241aa8834d91d3a02fc9472f068c4ee..38531a742ec079f52d238577ec8426e606a60f4c 100644 +index fb70fe2e30abc45508eac1ff7b6fa5b576c22917..6d6404a9fdacf1f5c5f108b860e0e577856b6bf3 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp @@ -494,6 +494,8 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr&& inputStream) @@ -9016,7 +8935,7 @@ index e61d6ab76241aa8834d91d3a02fc9472f068c4ee..38531a742ec079f52d238577ec8426e6 if (!error) return true; diff --git a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp -index bc06eb37854c1ec72b30568e95dba6ef60c132a4..7b8fd54b740c828be204d4fedba0286fd5be6ace 100644 +index ddb157400854dd30878a15879cd3b8c2c13f436f..9e952998a139b84ccb80f7e756343e4b1a49efcc 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp @@ -109,6 +109,11 @@ static gboolean webSocketAcceptCertificateCallback(GTlsConnection* connection, G @@ -9049,7 +8968,7 @@ index bc06eb37854c1ec72b30568e95dba6ef60c132a4..7b8fd54b740c828be204d4fedba0286f GRefPtr soupMessage = request.createSoupMessage(blobRegistry()); @@ -127,14 +141,21 @@ std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPagePr - if (request.url().protocolIs("wss")) { + if (request.url().protocolIs("wss"_s)) { #if USE(SOUP2) - g_signal_connect(soupMessage.get(), "network-event", G_CALLBACK(webSocketMessageNetworkEventCallback), this); + if (ignoreCertificateErrors()) @@ -9152,10 +9071,10 @@ index 93c194b1e3c2462fee6b8c66ecbb9323c4841350..51e0f52c363ecd4b1d64c78834473ceb Cairo::Cairo Freetype::Freetype diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake -index 93b9f5f8dbdec3555944d13685486937a3f71eb6..f829a7c9b71c66f1dcf76b954dd8346c32e3e466 100644 +index e0093e70915eed9eb74fd48a7f62192e97ceaa9b..81a30f0256a8b8b9bec2cd52894ff2ab3ab60032 100644 --- a/Source/WebKit/PlatformWin.cmake +++ b/Source/WebKit/PlatformWin.cmake -@@ -66,8 +66,12 @@ list(APPEND WebKit_SOURCES +@@ -64,8 +64,12 @@ list(APPEND WebKit_SOURCES UIProcess/wc/DrawingAreaProxyWC.cpp @@ -9168,7 +9087,7 @@ index 93b9f5f8dbdec3555944d13685486937a3f71eb6..f829a7c9b71c66f1dcf76b954dd8346c UIProcess/win/WebPageProxyWin.cpp UIProcess/win/WebPopupMenuProxyWin.cpp UIProcess/win/WebProcessPoolWin.cpp -@@ -85,6 +89,7 @@ list(APPEND WebKit_SOURCES +@@ -83,6 +87,7 @@ list(APPEND WebKit_SOURCES WebProcess/MediaCache/WebMediaKeyStorageManager.cpp WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp @@ -9176,7 +9095,7 @@ index 93b9f5f8dbdec3555944d13685486937a3f71eb6..f829a7c9b71c66f1dcf76b954dd8346c WebProcess/WebPage/AcceleratedSurface.cpp -@@ -138,6 +143,72 @@ list(APPEND WebKit_MESSAGES_IN_FILES +@@ -136,6 +141,72 @@ list(APPEND WebKit_MESSAGES_IN_FILES GPUProcess/graphics/wc/RemoteWCLayerTreeHost ) @@ -9249,7 +9168,7 @@ index 93b9f5f8dbdec3555944d13685486937a3f71eb6..f829a7c9b71c66f1dcf76b954dd8346c set(WebKitCommonIncludeDirectories ${WebKit_INCLUDE_DIRECTORIES}) set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) -@@ -197,6 +268,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) +@@ -195,6 +266,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) OpenSSL::SSL mfuuid.lib strmiids.lib @@ -9348,7 +9267,7 @@ index f2f3979fcac9dfd97d0e0ead600fe35eb8defd40..ac91412e1a96bdf521b1890a66e465dc NSEvent* nativeEvent() const { return m_nativeEvent.get(); } #elif PLATFORM(GTK) diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -index f8ef060699794f04601c5844db52feab1dd1abf0..94068960bf74feff30b11f21e810956b740b4dba 100644 +index d33585ec4c0fecb7f02b3b56f8169d4797e9e2ed..e7f623726a6ddfb2d0ae63c5ac16217c7051f46c 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -122,6 +122,10 @@ @@ -9362,7 +9281,7 @@ index f8ef060699794f04601c5844db52feab1dd1abf0..94068960bf74feff30b11f21e810956b // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1382,6 +1386,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1384,6 +1388,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -9372,7 +9291,7 @@ index f8ef060699794f04601c5844db52feab1dd1abf0..94068960bf74feff30b11f21e810956b } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1410,6 +1417,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1412,6 +1419,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -9385,7 +9304,7 @@ index f8ef060699794f04601c5844db52feab1dd1abf0..94068960bf74feff30b11f21e810956b return true; } -@@ -1423,6 +1436,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1425,6 +1438,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -9397,7 +9316,7 @@ index f8ef060699794f04601c5844db52feab1dd1abf0..94068960bf74feff30b11f21e810956b #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1446,9 +1464,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1448,9 +1466,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -9415,7 +9334,7 @@ index f8ef060699794f04601c5844db52feab1dd1abf0..94068960bf74feff30b11f21e810956b if (!decoder.decode(pasteboardName)) return false; -@@ -1464,8 +1489,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1466,8 +1491,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -9909,10 +9828,10 @@ index 90df093a49c09dc670dfea55077c77d889dd1c1b..6ffd51532e29b941b8dc10f545b7f5b8 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 9479c5d1a7bad442018a6215518b2fca7994ee57..dc72d45c44a1d6b7fdc840a4264e574c37461897 100644 +index 368ed8c2f09a99f6d58555ae1af05ad272b90019..0a8de7f8af0efdaa280dbda7cf6599f4e17e5d57 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -403,11 +403,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -395,11 +395,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -9927,7 +9846,7 @@ index 9479c5d1a7bad442018a6215518b2fca7994ee57..dc72d45c44a1d6b7fdc840a4264e574c UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -416,6 +419,7 @@ UIProcess/PageLoadState.cpp +@@ -408,6 +411,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -9935,7 +9854,7 @@ index 9479c5d1a7bad442018a6215518b2fca7994ee57..dc72d45c44a1d6b7fdc840a4264e574c UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -458,6 +462,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -450,6 +454,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -9944,7 +9863,7 @@ index 9479c5d1a7bad442018a6215518b2fca7994ee57..dc72d45c44a1d6b7fdc840a4264e574c UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -581,7 +587,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -573,7 +579,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -9957,10 +9876,10 @@ index 9479c5d1a7bad442018a6215518b2fca7994ee57..dc72d45c44a1d6b7fdc840a4264e574c UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 46259b4f3771630e5b93646704db44b91ae2564a..ebc3fef44e7d74d28409df8ceb48ec2960c32afa 100644 +index 860996b37535577bee0fdccbeeb026a622c24418..129a4da9b1bbf90ba5b36ce733b4aee4c2c7a54d 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -278,6 +278,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -276,6 +276,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -9968,7 +9887,7 @@ index 46259b4f3771630e5b93646704db44b91ae2564a..ebc3fef44e7d74d28409df8ceb48ec29 UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -456,6 +457,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -454,6 +455,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -10108,7 +10027,7 @@ index a16fe13c08576194ec8c43e9dae62a20566904be..f1bc17b878c3103475fa371e05f53cce 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 c779d045500bb2ac9efe535c2c3c64b64a6e1212..868e2a1164277321fdc18ea25e8f6c73d8d2a6b6 100644 +index 490c7181fe91a9cc050b84a8bf24471db075354b..e4e31e2e06fea50ef760650faada7a46e582fd63 100644 --- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h +++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h @@ -102,6 +102,11 @@ public: @@ -10317,7 +10236,7 @@ index e6f2fcf02b24fa16021c3be83f6116f989610027..bc2ddd59dd037fe3f52f996124b8cd2d #import #import #import -@@ -234,6 +235,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple +@@ -234,6 +235,11 @@ static WallTime toSystemClockTime(NSDate *date) }); } @@ -10493,10 +10412,10 @@ index a4b6d757e066334af98dec218ac52261b9d5ccd8..2c2e3c70b4bb9a4ddcd2ba2afd5af842 @property (nonatomic) BOOL processSwapsOnWindowOpenWithOpener WK_API_AVAILABLE(macos(10.14), ios(12.0)); @property (nonatomic) BOOL processSwapsOnNavigationWithinSameNonHTTPFamilyProtocol WK_API_AVAILABLE(macos(12.0), ios(15.0)); diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm -index cb7445b7fe814feff50a14b8dd25f5a32f70a17d..d6d2b2d5ed41ffda551e47dd14801c0e036a0890 100644 +index 2e235bb880c638a0e74256b6d66cb0244ea0a3f1..3471eebb47e860f7c2071d0e7f2691c9f0a6355d 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm -@@ -257,6 +257,16 @@ - (BOOL)processSwapsOnNavigation +@@ -257,6 +257,16 @@ return _processPoolConfiguration->processSwapsOnNavigation(); } @@ -10767,7 +10686,7 @@ index 64c90f9f25fc44911e819ab94fa973bf0b82a0e4..8d8c739fb903b71f7881801cb41901f2 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 7f7851e154385e2f5cc6b104fabfd596f0ae4621..a70a012dbd1cbea18fbe61debfbe82bb79586b3f 100644 +index 4c428ea9ff63076ad49d0adf5ac206698c0d4ced..6ae9593350f3eb0a45bbedf58c8a188a332d7d27 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp @@ -403,10 +403,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa @@ -11694,7 +11613,7 @@ index 20b08ac2df75f589bbbe29e2f924c92f33cf2242..2aaa37a18eb31ade4ff8d7fb8b85fee6 bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1; diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -index 1942490889b8be84160087c0f388302fbc6e96fd..eaa42475b1d56aa8980abd972df116b5aa72ba44 100644 +index be5ac6eefad0e4b6f3c02bb5c60765dbfb7eb1ff..dfc01d10998ec98d0affd93c4f17653586c1444b 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm @@ -111,6 +111,7 @@ void UIDelegate::setDelegate(id delegate) @@ -11722,7 +11641,7 @@ index 1942490889b8be84160087c0f388302fbc6e96fd..eaa42475b1d56aa8980abd972df116b5 { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index d1553d8c91b7ad8647aa156d7f029398f1a2ebe9..993ad73607b20eb1be890a6199cdbe7312a2f256 100644 +index 24b29521c80bbcfc9d9b6553aac11a7a02faef99..7358db1001a753a3e67fb99af7b46b928e4f66cc 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -37,6 +37,7 @@ @@ -11733,7 +11652,7 @@ index d1553d8c91b7ad8647aa156d7f029398f1a2ebe9..993ad73607b20eb1be890a6199cdbe73 #import "PlaybackSessionManagerProxy.h" #import "QuarantineSPI.h" #import "QuickLookThumbnailLoader.h" -@@ -250,9 +251,66 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting() +@@ -252,9 +253,66 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting() void WebPageProxy::startDrag(const DragItem& dragItem, const ShareableBitmap::Handle& dragImageHandle) { @@ -11801,7 +11720,7 @@ index d1553d8c91b7ad8647aa156d7f029398f1a2ebe9..993ad73607b20eb1be890a6199cdbe73 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index f18a05f0ec81b350502d17471c8754e44f504491..75dce762f6fdffafdd19692fa5d54b90dac3f929 100644 +index c457d9a2b50e270ba2b5256bb9c1ceb2029a916d..67cc79e09e6926b2e8878500b72be36bebf51053 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm @@ -359,7 +359,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process @@ -15825,10 +15744,10 @@ index 8a506c2f4b96185560c8ee198f9af9575152b15a..2e76e28266dfd71061373e8ee4211653 WebPageProxy* page() const { return m_page.get(); } diff --git a/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp b/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp -index a719411abe5895a6a4ce9c28e0576f94251701d6..c4a28fff84fa91754d962e7caf7e71ca07322032 100644 +index 42c66d2b0dcd180258c5b90d13f663de1f893316..e0ccafdecb4e31301c51cdd10f5db6bcfdd026fa 100644 --- a/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp +++ b/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp -@@ -66,10 +66,12 @@ void WebCookieManagerProxy::deleteCookiesForHostnames(PAL::SessionID sessionID, +@@ -67,10 +67,12 @@ void WebCookieManagerProxy::deleteCookiesForHostnames(PAL::SessionID sessionID, m_networkProcess->send(Messages::WebCookieManager::DeleteCookiesForHostnames(sessionID, hostnames), 0); } @@ -16521,7 +16440,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 3deeeaede89b454ee88cb750f237b92ba3946561..c3a181861a11ce9d78e2b26f02ed8805042f0747 100644 +index 0a74e844e0780c2f701f03b09fe6387cb0390ff4..0fbb1e047a52a2e362824dd6a08b83a60266661e 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -247,6 +247,9 @@ @@ -17040,7 +16959,7 @@ index 3deeeaede89b454ee88cb750f237b92ba3946561..c3a181861a11ce9d78e2b26f02ed8805 // 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 3e3bbb22e6de573ce2490d6255c04b825ad46448..978ccc20f6e1ef2c1c503293d7fdfaf4dda6b7ae 100644 +index 7a06458c72ba0a87daed94ffb316b8e58a8dcb3c..da11c29f0c0a634d06755ff17b389e5a81ba6265 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17162,7 +17081,7 @@ index 3e3bbb22e6de573ce2490d6255c04b825ad46448..978ccc20f6e1ef2c1c503293d7fdfaf4 #endif #if ENABLE(WEB_CRYPTO) -@@ -2726,6 +2755,7 @@ private: +@@ -2728,6 +2757,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17170,7 +17089,7 @@ index 3e3bbb22e6de573ce2490d6255c04b825ad46448..978ccc20f6e1ef2c1c503293d7fdfaf4 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2995,6 +3025,20 @@ private: +@@ -2997,6 +3027,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17191,7 +17110,7 @@ index 3e3bbb22e6de573ce2490d6255c04b825ad46448..978ccc20f6e1ef2c1c503293d7fdfaf4 #endif PageLoadState m_pageLoadState; -@@ -3205,6 +3249,9 @@ private: +@@ -3207,6 +3251,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17202,7 +17121,7 @@ index 3e3bbb22e6de573ce2490d6255c04b825ad46448..978ccc20f6e1ef2c1c503293d7fdfaf4 #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 d9ca6d6dbcf65948c6d8ad56ae10f0678d043ce2..c35b74dbdbe4e64e1c54dfcfe817e8a08528961d 100644 +index 5b69c850a57b981ec3156c64264f60c6eba39f88..a179e94dfd9da89d14d0260fcbc4cd1eb5f045df 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17237,7 +17156,7 @@ index d9ca6d6dbcf65948c6d8ad56ae10f0678d043ce2..c35b74dbdbe4e64e1c54dfcfe817e8a0 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 41d83535f3c22dd28b675a0a8627f48faf010e71..e0986f8f7146ff023c14167d351e8ab5922f44d7 100644 +index 582d81e7d79fba2dc7e545d6b61f3e726f872470..2a302375a62e1d6b72c9af3709b0fa1b1ffc8e23 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp @@ -535,6 +535,14 @@ void WebProcessPool::establishRemoteWorkerContextConnectionToNetworkProcess(Remo @@ -17256,7 +17175,7 @@ index 41d83535f3c22dd28b675a0a8627f48faf010e71..e0986f8f7146ff023c14167d351e8ab5 WebProcessProxy* remoteWorkerProcessProxy { nullptr }; diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp -index 9fe8eb6b044af9eb049d6d4e53cd8bbac84f4572..ecb7771c1036fa31ffc7ea506afcec4c1d3e4ebc 100644 +index e3bca858c06e2e4d2f078fcc7c683ffc18a58b3b..b8c2f10c98d150f547eee9249270395c5f08be75 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp @@ -147,6 +147,11 @@ HashMap& WebProcessProxy::allProcesses() @@ -17272,7 +17191,7 @@ index 9fe8eb6b044af9eb049d6d4e53cd8bbac84f4572..ecb7771c1036fa31ffc7ea506afcec4c { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index 2aa8191e96ca3c1a5d8a3fba591aa489e9a49e31..a1c55d31db11eee237c5a558bcaf9b54735c69ca 100644 +index 56789958133037207df23dffd42a5144132e3219..06c9a3d31cf2a08c187087b07f4141d7571b6809 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h @@ -146,6 +146,7 @@ public: @@ -17284,10 +17203,10 @@ index 2aa8191e96ca3c1a5d8a3fba591aa489e9a49e31..a1c55d31db11eee237c5a558bcaf9b54 WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 154a03874cb9830e7c28a09c967f5597bb99352b..66064b55bbda6f37480e6ac0ed3e62e41d5d16d4 100644 +index 6663c05d9108da2fa4bd0a5a414a805cad417038..5b77abace61c8f1e2c7c26df26421c3b2b29a08e 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2032,6 +2032,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, +@@ -2040,6 +2040,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, networkProcess().websiteDataOriginDirectoryForTesting(m_sessionID, WTFMove(origin), WTFMove(topOrigin), type, WTFMove(completionHandler)); } @@ -17301,10 +17220,10 @@ index 154a03874cb9830e7c28a09c967f5597bb99352b..66064b55bbda6f37480e6ac0ed3e62e4 void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index 25168b66cf572db53d9ef07f164df342556dcb0a..ab572b41015b971272341be81820766c4dd617e2 100644 +index 6d5126aef4433fbeba5e7b70a3586e41d933f671..49562cd02dc72290fb1010dea6102d240ecf1fd0 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -@@ -89,6 +89,7 @@ class SecKeyProxyStore; +@@ -88,6 +88,7 @@ class SecKeyProxyStore; class DeviceIdHashSaltStorage; class NetworkProcessProxy; class SOAuthorizationCoordinator; @@ -17312,7 +17231,7 @@ index 25168b66cf572db53d9ef07f164df342556dcb0a..ab572b41015b971272341be81820766c class VirtualAuthenticatorManager; class WebPageProxy; class WebProcessPool; -@@ -98,6 +99,7 @@ enum class CacheModel : uint8_t; +@@ -97,6 +98,7 @@ enum class CacheModel : uint8_t; enum class WebsiteDataFetchOption : uint8_t; enum class WebsiteDataType : uint32_t; @@ -17320,7 +17239,7 @@ index 25168b66cf572db53d9ef07f164df342556dcb0a..ab572b41015b971272341be81820766c struct NetworkProcessConnectionInfo; struct WebsiteDataRecord; struct WebsiteDataStoreParameters; -@@ -108,6 +110,14 @@ enum class StorageAccessStatus : uint8_t; +@@ -107,6 +109,14 @@ enum class StorageAccessStatus : uint8_t; enum class StorageAccessPromptStatus; #endif @@ -17385,7 +17304,7 @@ index 25168b66cf572db53d9ef07f164df342556dcb0a..ab572b41015b971272341be81820766c + DownloadInstrumentation* m_downloadInstrumentation { nullptr }; + #if HAVE(APP_SSO) - UniqueRef m_soAuthorizationCoordinator; + std::unique_ptr m_soAuthorizationCoordinator; #endif diff --git a/Source/WebKit/UIProcess/cairo/BackingStoreCairo.cpp b/Source/WebKit/UIProcess/cairo/BackingStoreCairo.cpp index 0b2fc0019ffa2c05383dc4b4e480b4d380aa9fd5..79773452d246f3bcdf42122a3bf8f67685e45fdc 100644 @@ -19337,10 +19256,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c08fd41a6 100644 +index 1ec0320d114bfdddc23fbcdb7a113dc07aebd7e6..4af0fbc556e46c99f622961b926247499c0cd94b 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1251,6 +1251,7 @@ +@@ -1246,6 +1246,7 @@ 5CABDC8722C40FED001EDE8E /* APIMessageListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CABDC8322C40FA7001EDE8E /* APIMessageListener.h */; }; 5CADDE05215046BD0067D309 /* WKWebProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C74300E21500492004BFA17 /* WKWebProcess.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5CAECB6627465AE400AB78D0 /* UnifiedSource115.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */; }; @@ -19348,7 +19267,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c 5CAF7AA726F93AB00003F19E /* adattributiond.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CAF7AA526F93A950003F19E /* adattributiond.cpp */; }; 5CAFDE452130846300B1F7E1 /* _WKInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE422130843500B1F7E1 /* _WKInspector.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5CAFDE472130846A00B1F7E1 /* _WKInspectorInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE442130843600B1F7E1 /* _WKInspectorInternal.h */; }; -@@ -2228,6 +2229,18 @@ +@@ -2221,6 +2222,18 @@ DF0C5F28252ECB8E00D921DB /* WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F24252ECB8D00D921DB /* WKDownload.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2A252ECB8E00D921DB /* WKDownloadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2B252ED44000D921DB /* WKDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */; }; @@ -19367,7 +19286,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF84CEE4249AA24D009096F6 /* WKPDFHUDView.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF84CEE2249AA21F009096F6 /* WKPDFHUDView.mm */; }; -@@ -2289,6 +2302,8 @@ +@@ -2282,6 +2295,8 @@ E5BEF6822130C48000F31111 /* WebDataListSuggestionsDropdownIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E5BEF6802130C47F00F31111 /* WebDataListSuggestionsDropdownIOS.h */; }; E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; E5CBA76427A318E100DF7858 /* UnifiedSource120.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA75F27A3187800DF7858 /* UnifiedSource120.cpp */; }; @@ -19376,7 +19295,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c E5CBA76527A318E100DF7858 /* UnifiedSource118.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76127A3187900DF7858 /* UnifiedSource118.cpp */; }; E5CBA76627A318E100DF7858 /* UnifiedSource116.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76327A3187B00DF7858 /* UnifiedSource116.cpp */; }; E5CBA76727A318E100DF7858 /* UnifiedSource119.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76027A3187900DF7858 /* UnifiedSource119.cpp */; }; -@@ -2305,6 +2320,9 @@ +@@ -2298,6 +2313,9 @@ EBA8D3B627A5E33F00CB7900 /* MockPushServiceConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = EBA8D3B027A5E33F00CB7900 /* MockPushServiceConnection.mm */; }; EBA8D3B727A5E33F00CB7900 /* PushServiceConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = EBA8D3B127A5E33F00CB7900 /* PushServiceConnection.mm */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -19386,7 +19305,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; F4299507270E234D0032298B /* StreamMessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = F4299506270E234C0032298B /* StreamMessageReceiver.h */; }; F42D634122A0EFDF00D2FB3A /* WebAutocorrectionData.h in Headers */ = {isa = PBXBuildFile; fileRef = F42D633F22A0EFD300D2FB3A /* WebAutocorrectionData.h */; }; -@@ -5303,6 +5321,7 @@ +@@ -5265,6 +5283,7 @@ 5CABDC8522C40FCC001EDE8E /* WKMessageListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMessageListener.h; sourceTree = ""; }; 5CADDE0D2151AA010067D309 /* AuthenticationChallengeDisposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeDisposition.h; sourceTree = ""; }; 5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource115.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource115.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -19394,7 +19313,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c 5CAF7AA426F93A750003F19E /* adattributiond */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = adattributiond; sourceTree = BUILT_PRODUCTS_DIR; }; 5CAF7AA526F93A950003F19E /* adattributiond.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = adattributiond.cpp; sourceTree = ""; }; 5CAF7AA626F93AA50003F19E /* adattributiond.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = adattributiond.xcconfig; sourceTree = ""; }; -@@ -7010,6 +7029,19 @@ +@@ -6966,6 +6985,19 @@ DF0C5F24252ECB8D00D921DB /* WKDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownload.h; sourceTree = ""; }; DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadInternal.h; sourceTree = ""; }; DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadDelegate.h; sourceTree = ""; }; @@ -19414,7 +19333,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHTTPCookieStorePrivate.h; sourceTree = ""; }; DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentWorldPrivate.h; sourceTree = ""; }; DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebWheelEvent.h; sourceTree = ""; }; -@@ -7138,6 +7170,8 @@ +@@ -7094,6 +7126,8 @@ E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKFormColorControl.h; path = ios/forms/WKFormColorControl.h; sourceTree = ""; }; E5CB07DB20E1678F0022C183 /* WKFormColorControl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKFormColorControl.mm; path = ios/forms/WKFormColorControl.mm; sourceTree = ""; }; E5CBA75F27A3187800DF7858 /* UnifiedSource120.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource120.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource120.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -19423,7 +19342,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c E5CBA76027A3187900DF7858 /* UnifiedSource119.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource119.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource119.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; E5CBA76127A3187900DF7858 /* UnifiedSource118.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource118.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource118.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; E5CBA76227A3187900DF7858 /* UnifiedSource117.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource117.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource117.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; -@@ -7159,6 +7193,14 @@ +@@ -7115,6 +7149,14 @@ ECA680D31E6904B500731D20 /* ExtraPrivateSymbolsForTAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtraPrivateSymbolsForTAPI.h; sourceTree = ""; }; ECBFC1DB1E6A4D66000300C7 /* ExtraPublicSymbolsForTAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtraPublicSymbolsForTAPI.h; sourceTree = ""; }; F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = ""; }; @@ -19438,7 +19357,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDragDestinationAction.h; sourceTree = ""; }; F40D1B68220BDC0F00B49A01 /* WebAutocorrectionContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebAutocorrectionContext.h; path = ios/WebAutocorrectionContext.h; sourceTree = ""; }; F41056612130699A0092281D /* APIAttachmentCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = APIAttachmentCocoa.mm; sourceTree = ""; }; -@@ -7295,6 +7337,7 @@ +@@ -7251,6 +7293,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -19446,7 +19365,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -9401,6 +9444,7 @@ +@@ -9356,6 +9399,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -19454,7 +19373,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -10525,6 +10569,7 @@ +@@ -10479,6 +10523,7 @@ E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */, DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */, 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -19462,7 +19381,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, 51F7BB7E274564A100C45A72 /* Security.framework */, -@@ -11051,6 +11096,12 @@ +@@ -11005,6 +11050,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19475,7 +19394,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c ); path = Agents; sourceTree = ""; -@@ -11059,6 +11110,7 @@ +@@ -11013,6 +11064,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19483,7 +19402,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -11601,6 +11653,12 @@ +@@ -11532,6 +11584,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -19496,7 +19415,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -11912,6 +11970,7 @@ +@@ -11843,6 +11901,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -19504,7 +19423,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -12502,6 +12561,11 @@ +@@ -12433,6 +12492,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -19516,7 +19435,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, 07EF07592745A8160066EA04 /* DisplayCaptureSessionManager.h */, -@@ -13721,6 +13785,7 @@ +@@ -13652,6 +13716,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19524,7 +19443,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -14188,6 +14253,7 @@ +@@ -14119,6 +14184,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -19532,7 +19451,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -14202,6 +14268,7 @@ +@@ -14133,6 +14199,7 @@ 2DA944A41884E4F000ED86DB /* GestureTypes.h in Headers */, 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -19540,7 +19459,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -14360,6 +14427,7 @@ +@@ -14288,6 +14355,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -19548,7 +19467,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -14425,6 +14493,7 @@ +@@ -14354,6 +14422,7 @@ 93E05E40282CD560000B69EB /* ProcessStateMonitor.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -19556,7 +19475,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, 517B5F81275E97B6002DC22D /* PushAppBundle.h in Headers */, -@@ -14456,6 +14525,7 @@ +@@ -14385,6 +14454,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -19564,7 +19483,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -14871,6 +14941,7 @@ +@@ -14795,6 +14865,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -19572,7 +19491,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -15052,6 +15123,7 @@ +@@ -14976,6 +15047,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -19580,7 +19499,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -15106,6 +15178,7 @@ +@@ -15030,6 +15102,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -19588,7 +19507,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -15264,6 +15337,7 @@ +@@ -15188,6 +15261,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -19596,7 +19515,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -16814,6 +16888,8 @@ +@@ -16716,6 +16790,8 @@ 51E9049727BCB3D900929E7E /* ICAppBundle.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -19605,7 +19524,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, 2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */, -@@ -17149,6 +17225,8 @@ +@@ -17051,6 +17127,8 @@ E3816B3D27E2463A005EAFC0 /* WebMockContentFilterManager.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -19615,7 +19534,7 @@ index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c BCBD3914125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp in Sources */, 7CE9CE101FA0767A000177DE /* WebPageUpdatePreferences.cpp in Sources */, diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp -index 3803681aa73b7b97072341be579d520b93c6c3ac..69b5e9f5da2d950c02cf79895514bdda44db48e6 100644 +index 70d709b11ae2e39a413c495aacdbcc9657b4f476..c0048cf470dd99507a447fbdeb9ec66c2d13deda 100644 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp @@ -232,6 +232,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou @@ -19702,7 +19621,7 @@ index 3803681aa73b7b97072341be579d520b93c6c3ac..69b5e9f5da2d950c02cf79895514bdda } void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader) -@@ -888,7 +901,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier +@@ -885,7 +898,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier bool WebLoaderStrategy::isOnLine() const { @@ -19711,7 +19630,7 @@ index 3803681aa73b7b97072341be579d520b93c6c3ac..69b5e9f5da2d950c02cf79895514bdda } void WebLoaderStrategy::addOnlineStateChangeListener(Function&& listener) -@@ -908,6 +921,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet +@@ -905,6 +918,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet void WebLoaderStrategy::setOnLineState(bool isOnLine) { @@ -19723,7 +19642,7 @@ index 3803681aa73b7b97072341be579d520b93c6c3ac..69b5e9f5da2d950c02cf79895514bdda if (m_isOnLine == isOnLine) return; -@@ -916,6 +934,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) +@@ -913,6 +931,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) listener(isOnLine); } @@ -19767,7 +19686,7 @@ index cfa563b7d34056c9375d4382ff42d55dab3daa14..baf0bdc4f441721d085ff86bd152a7cc } // namespace WebKit diff --git a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp -index 0b6804754decb67ec52996d7ac0df4eb627d6d57..bc70fec1cef6f3df5927fabb68b9c71d8882e105 100644 +index 55f27e1460de28cfef51bbc37e5d828c7869d80e..25769cf2285b59d199c1901d2730426676a9bd0d 100644 --- a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp +++ b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp @@ -195,9 +195,6 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR @@ -19803,7 +19722,7 @@ index e00c722c2be5d505243d45f46001839d4eb8a977..33c0832cde6c292230397a13e70d90fb auto permissionHandlers = m_requestsPerOrigin.take(securityOrigin); diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index 227a0cf82d4a12fc70bea861d490e3eb7bdc9277..88f5973dc20b4da6119568ad977eba11241aa02c 100644 +index e23555a46142970f11975f554802f07a749913d9..78565bc1289ab742f800c75c7a58d9b93f6471e1 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -415,6 +415,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -19875,7 +19794,7 @@ index 1592d5cdb478aa77c5f4991dc79b11301851c5c0..e91a8e3ef026b34ca57fb2a0a529f51e void WebFrameLoaderClient::didRestoreFromBackForwardCache() diff --git a/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm b/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm -index b14358c2cc29604a50265281c8d215246ed820a3..8bd7365cba12adb5c5a59ea2f3bbc526fbc44ee8 100644 +index a7729bbfa64c74876e25a6924493108d7c0e1e8f..c9fac1c3bc55462570e7e7fceb8df6106eb54ba1 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm +++ b/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm @@ -127,7 +127,8 @@ static WebCore::CachedImage* cachedImage(Element& element) @@ -20237,7 +20156,7 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index 03ba5d5c9cd397e235ff653b62644f61cfb56241..337d6659acafe3b77a5524f318d09c3de2fa0e4f 100644 +index 1ad2fc2225e60d148e7bee0241a1a167c4731881..ce0fc16d413fc294aea32828bf8e87da647a5168 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp @@ -934,6 +934,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) @@ -20489,7 +20408,7 @@ index 03ba5d5c9cd397e235ff653b62644f61cfb56241..337d6659acafe3b77a5524f318d09c3d void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6999,6 +7112,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6994,6 +7107,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20500,7 +20419,7 @@ index 03ba5d5c9cd397e235ff653b62644f61cfb56241..337d6659acafe3b77a5524f318d09c3d return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index ee2a47b0d78053faf0426e8f0f171181eca78227..a3077d5cf7d7f847d120fb707dc955418356f5f8 100644 +index b6d64e5f6c1a97a0c6e0a2476da7193859d9c36c..95944c93a3e78f534bdae0d37c685402da592949 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -117,6 +117,10 @@ @@ -20514,7 +20433,7 @@ index ee2a47b0d78053faf0426e8f0f171181eca78227..a3077d5cf7d7f847d120fb707dc95541 #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -1014,11 +1018,11 @@ public: +@@ -1013,11 +1017,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -20528,7 +20447,7 @@ index ee2a47b0d78053faf0426e8f0f171181eca78227..a3077d5cf7d7f847d120fb707dc95541 void performDragControllerAction(DragControllerAction, const WebCore::DragData&, SandboxExtension::Handle&&, Vector&&); #endif -@@ -1032,6 +1036,9 @@ public: +@@ -1031,6 +1035,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -20538,7 +20457,7 @@ index ee2a47b0d78053faf0426e8f0f171181eca78227..a3077d5cf7d7f847d120fb707dc95541 #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1266,6 +1273,7 @@ public: +@@ -1265,6 +1272,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -20546,7 +20465,7 @@ index ee2a47b0d78053faf0426e8f0f171181eca78227..a3077d5cf7d7f847d120fb707dc95541 void insertNewlineInQuotedContent(); -@@ -1653,6 +1661,7 @@ private: +@@ -1652,6 +1660,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -20554,7 +20473,7 @@ index ee2a47b0d78053faf0426e8f0f171181eca78227..a3077d5cf7d7f847d120fb707dc95541 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1690,6 +1699,7 @@ private: +@@ -1689,6 +1698,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -20562,7 +20481,7 @@ index ee2a47b0d78053faf0426e8f0f171181eca78227..a3077d5cf7d7f847d120fb707dc95541 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1833,9 +1843,7 @@ private: +@@ -1832,9 +1842,7 @@ private: void requestRectForFoundTextRange(const WebFoundTextRange&, CompletionHandler&&); @@ -20572,7 +20491,7 @@ index ee2a47b0d78053faf0426e8f0f171181eca78227..a3077d5cf7d7f847d120fb707dc95541 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2378,6 +2386,7 @@ private: +@@ -2377,6 +2385,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -20581,7 +20500,7 @@ index ee2a47b0d78053faf0426e8f0f171181eca78227..a3077d5cf7d7f847d120fb707dc95541 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index e8fd0c51f2643c4627cb16cbb7d54a1535095378..da18a34c41cbc2ed0d1587d321d19d68aa696729 100644 +index 7a9cc684eac72478eb4acb6250ab4f37103c04a8..7b3e9a300bcb26769008893eb269d53fe8a7c9f0 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -139,6 +139,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -20633,10 +20552,10 @@ index e8fd0c51f2643c4627cb16cbb7d54a1535095378..da18a34c41cbc2ed0d1587d321d19d68 RequestDragStart(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) RequestAdditionalItemsForDragSession(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -index 3dcbe78f4693a89c426cbf6f469f790208d55410..14cb073b4464dcef3a8271da603cd27fdfad5c10 100644 +index 228f8ef1415e5829c706357b188fc7fd860b2137..e3095164374ad48a1c66e533579865e123ada20f 100644 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -@@ -806,21 +806,37 @@ String WebPage::platformUserAgent(const URL&) const +@@ -808,21 +808,37 @@ String WebPage::platformUserAgent(const URL&) const bool WebPage::hoverSupportedByPrimaryPointingDevice() const { @@ -20725,7 +20644,7 @@ index c77ff78cd3cd9627d1ae7b930c81457094645200..88746359159a76b169b7e6dcbee4fb34 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index 2f12cefa501042fd7b7a43261a62390d9b2e39b2..141e72e5f2168a29d7fde4ee89e6cc3f1156a69b 100644 +index 81cbbc08ff732882e867565284f8a65299c0c2c0..617ac7b3248ceb63d7b803d80c3ca2f045ebf184 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -92,6 +92,7 @@ @@ -20764,7 +20683,7 @@ diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegac index 9f9c67523b8fac9025d2cec101adf452631ffc61..737d8dab4f7aa1fe446b2dcfdc32fe83e02a4555 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -@@ -4189,7 +4189,7 @@ - (void)mouseDown:(WebEvent *)event +@@ -4189,7 +4189,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) _private->handlingMouseDownEvent = NO; } @@ -20777,7 +20696,7 @@ diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/ma index 09748e5cf07408ec620bb0a151378dbf6590733d..824b2efbfe7c6821ab0913cc7ebeaf960ea79784 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm -@@ -4043,7 +4043,7 @@ + (void)_doNotStartObservingNetworkReachability +@@ -4043,7 +4043,7 @@ IGNORE_WARNINGS_END } #endif // PLATFORM(IOS_FAMILY) @@ -20786,7 +20705,7 @@ index 09748e5cf07408ec620bb0a151378dbf6590733d..824b2efbfe7c6821ab0913cc7ebeaf96 - (NSArray *)_touchEventRegions { -@@ -4085,7 +4085,7 @@ - (NSArray *)_touchEventRegions +@@ -4085,7 +4085,7 @@ IGNORE_WARNINGS_END }).autorelease(); } @@ -20928,7 +20847,7 @@ index 8dc57e7d0395edee5667eceada38bd3b56668151..e944f55214844cf35e6a80a600a9773c SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1) diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index 9cae317e38d9725896a5c42c4fbbcf09954248a3..257012c2d99cd1b43999ce40b996eb35fc6833ef 100644 +index 7b2389bcee6a781b01debbd2d3d2d3bcf4b2bea6..54f099bb5a89c6c282d1ec58a3261830728c7ffb 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -9,6 +9,8 @@ if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ni @@ -22836,7 +22755,7 @@ index 4f3640a8b93897d69604ee8ba38cd07561720ad2..00b657a8a585d104afc346dc1126fb71 InjectedBundle/wpe/InjectedBundleWPE.cpp InjectedBundle/wpe/TestRunnerWPE.cpp diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index ed6495356fa6ccd4ea2b2ffb9ac4a8d134a90e31..f686947a5b708b517c7e01f81f11c2f4c5b670dc 100644 +index 719d0b06fb681a452f6cda8d575da727a40681b8..ed86e04231b6a92fc8ba047d9a12ead5b0afe77e 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -874,6 +874,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)