From 64c949f5e8841aab847d98bbd788d7911c7be8f1 Mon Sep 17 00:00:00 2001 From: Diego Pino Date: Tue, 24 May 2022 00:19:25 +0800 Subject: [PATCH] browser(webkit): rebase to 05/20/22 (r294541) (#14319) --- browser_patches/webkit/BUILD_NUMBER | 4 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 868 +++++++----------- 3 files changed, 339 insertions(+), 535 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 98227a598f..c6d6a8dcb3 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1648 -Changed: yurys@chromium.org Fri 20 May 2022 01:56:00 PM PDT +1649 +Changed: dpino@igalia.com Sat May 21 04:27:31 UTC 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index cdde742920..627c8834f3 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="38f99b1251a27027b3eeea66ae7ae4a57b4144f2" +BASE_REVISION="76dea20b140c4f5c7c99c93795f65c12c2bc3586" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 4ec7e8ecc7..5b80eaa683 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -1,8 +1,8 @@ diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt -index a57b1a764b1766b5bac10526eab86d241c51ad89..5487b5054bcd8e2d39b63c9671924f9e2b171307 100644 +index cc949e8304d49f72552cc4f11f5806f9ac8c313f..3b5137abf27276f2506a944f71e9f3bd6d0a7e6d 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1345,22 +1345,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1352,22 +1352,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -31,7 +31,7 @@ index a57b1a764b1766b5bac10526eab86d241c51ad89..5487b5054bcd8e2d39b63c9671924f9e ${JAVASCRIPTCORE_DIR}/inspector/protocol/ServiceWorker.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Target.json diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make -index 667f2c6854f8a1ba13c095f7e154f68e97cbf391..6399b41f2059c96094063c568906128f83d974db 100644 +index 1fb623cd6f6e8d8987f94804544f0d44e5b35f08..98a74d2b1ca19b044f2f75960e1b5134773f3c14 100644 --- a/Source/JavaScriptCore/DerivedSources.make +++ b/Source/JavaScriptCore/DerivedSources.make @@ -291,22 +291,27 @@ INSPECTOR_DOMAINS := \ @@ -168,19 +168,19 @@ index e6b24967273095ae424ac9b3fe5e081ee8999ab7..9f7b72259ab79504b8bfcc24d35abe70 void functionDetails(Protocol::ErrorString&, JSC::JSValue, RefPtr& result); void getPreview(Protocol::ErrorString&, const String& objectId, RefPtr& result); diff --git a/Source/JavaScriptCore/inspector/InjectedScriptSource.js b/Source/JavaScriptCore/inspector/InjectedScriptSource.js -index 48baed6a1b7ffad453379a2f1eb71b8c4925f6c4..40d36f784f46e44dbad908402a71e6b02f499629 100644 +index 0080366628c66a5be04024aa560e0d812c27884a..9c325c085feddd42920dce3c71fd60703b670e3f 100644 --- a/Source/JavaScriptCore/inspector/InjectedScriptSource.js +++ b/Source/JavaScriptCore/inspector/InjectedScriptSource.js -@@ -136,7 +136,7 @@ let InjectedScript = class InjectedScript +@@ -166,7 +166,7 @@ let InjectedScript = class InjectedScript return; } -- if (!(promiseObject instanceof Promise)) { +- if (!(promiseObject instanceof @Promise)) { + if (InjectedScriptHost.internalConstructorName(promiseObject) !== 'Promise') { callback("Object with given id is not a Promise"); return; } -@@ -171,14 +171,16 @@ let InjectedScript = class InjectedScript +@@ -201,14 +201,16 @@ let InjectedScript = class InjectedScript return this._evaluateAndWrap(callFrame.evaluateWithScopeExtension, callFrame, expression, objectGroup, isEvalOnCallFrame, includeCommandLineAPI, returnByValue, generatePreview, saveResult); } @@ -198,13 +198,13 @@ index 48baed6a1b7ffad453379a2f1eb71b8c4925f6c4..40d36f784f46e44dbad908402a71e6b0 + return ; + } - let resolvedArgs = []; + let resolvedArgs = @createArrayWithoutPrototype(); if (args) { -@@ -187,22 +189,37 @@ let InjectedScript = class InjectedScript +@@ -217,22 +219,37 @@ let InjectedScript = class InjectedScript try { resolvedArgs[i] = this._resolveCallArgument(callArgs[i]); } catch (e) { -- return String(e); +- return @String(e); + callback(this._createThrownValue(e, objectGroupName)); + return; } @@ -216,10 +216,10 @@ index 48baed6a1b7ffad453379a2f1eb71b8c4925f6c4..40d36f784f46e44dbad908402a71e6b0 - if (typeof func !== "function") - return "Given expression does not evaluate to a function"; - -- return { -- wasThrown: false, -- result: RemoteObject.create(func.apply(object, resolvedArgs), objectGroupName, returnByValue, generatePreview) -- }; +- return @createObjectWithoutPrototype( +- "wasThrown", false, +- "result", RemoteObject.create(func.@apply(object, resolvedArgs), objectGroupName, returnByValue, generatePreview), +- ); + if (typeof func !== "function") { + callback(this._createThrownValue("Given expression does not evaluate to a function", objectGroupName)); + return; @@ -505,7 +505,7 @@ index e81573fd0fffaaf6fd2af36635c78fcdf8608c69..c8cde6cfcde9612624f12e21bd9fa56b // FrontendChannel FrontendChannel::ConnectionType connectionType() const; diff --git a/Source/JavaScriptCore/inspector/protocol/DOM.json b/Source/JavaScriptCore/inspector/protocol/DOM.json -index b8447e3420fd09df651a6f1e9131473b07bc38ab..717101483796e3cb019f76c5f0560238766b5e33 100644 +index 8de3ac227ca561a647ce78bb610d712378e20352..e999d1ac814a2ad9fbceca25e9fa56cea137e928 100644 --- a/Source/JavaScriptCore/inspector/protocol/DOM.json +++ b/Source/JavaScriptCore/inspector/protocol/DOM.json @@ -80,6 +80,16 @@ @@ -947,10 +947,10 @@ index 2fc4aaf98e06c468a2500cbf7d8676e523cf6327..6d005cd9de8450196a91a8a61cdce619 ], "events": [ diff --git a/Source/JavaScriptCore/inspector/protocol/Page.json b/Source/JavaScriptCore/inspector/protocol/Page.json -index db52479a72d459be23d4d8d080c0ed15ea9fc4c0..658937fdc58425b9a164d9bc368a9e61ed836918 100644 +index 1c97ad011c5ec183a5866bb98319badd5ec9442f..658937fdc58425b9a164d9bc368a9e61ed836918 100644 --- a/Source/JavaScriptCore/inspector/protocol/Page.json +++ b/Source/JavaScriptCore/inspector/protocol/Page.json -@@ -21,13 +21,20 @@ +@@ -21,7 +21,14 @@ "ShowDebugBorders", "ShowRepaintCounter", "WebRTCEncryptionEnabled", @@ -966,13 +966,6 @@ index db52479a72d459be23d4d8d080c0ed15ea9fc4c0..658937fdc58425b9a164d9bc368a9e61 ] }, { - "id": "ResourceType", - "type": "string", -- "enum": ["Document", "StyleSheet", "Image", "Font", "Script", "XHR", "Fetch", "Ping", "Beacon", "WebSocket", "Other"], -+ "enum": ["Document", "StyleSheet", "Image", "Font", "Script", "XHR", "Fetch", "Ping", "Beacon", "WebSocket", "EventSource", "Other"], - "description": "Resource type as it was perceived by the rendering engine." - }, - { @@ -49,6 +56,12 @@ "enum": ["Light", "Dark"], "description": "Page appearance name." @@ -2058,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 fd306fb2912e1305984af8cee12906a687ce2cb6..1c751074c4c39e15cdfa202ba67fa746c77f2a80 100644 +index 32082f485960ee61e3aa46b7d618228870e6f896..466f96c29ecb7e151d711f5fd7499e8ec83a6857 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -479,7 +479,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2107,12 +2100,12 @@ index fd306fb2912e1305984af8cee12906a687ce2cb6..1c751074c4c39e15cdfa202ba67fa746 + "PLATFORM(WIN)": false default: false - UseScreenCaptureKit: + UserGesturePromisePropagationEnabled: diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml -index 519456e0c3a5c2bf61f82bfac4cee40f95195f09..aa9128ddc283a70910a2b66b401df4b09592458b 100644 +index 8bb2c7270c30b3bfc4bbd65b93985d5e97019ac9..c597c721e5f721ce9f0f131dcb8251e751997518 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml -@@ -917,6 +917,7 @@ UseCGDisplayListsForDOMRendering: +@@ -919,6 +919,7 @@ UseCGDisplayListsForDOMRendering: WebKit: default: true @@ -2120,7 +2113,7 @@ index 519456e0c3a5c2bf61f82bfac4cee40f95195f09..aa9128ddc283a70910a2b66b401df4b0 UseGPUProcessForCanvasRenderingEnabled: type: bool humanReadableName: "GPU Process: Canvas Rendering" -@@ -927,7 +928,7 @@ UseGPUProcessForCanvasRenderingEnabled: +@@ -929,7 +930,7 @@ UseGPUProcessForCanvasRenderingEnabled: defaultValue: WebKit: "ENABLE(GPU_PROCESS_BY_DEFAULT)": true @@ -2130,7 +2123,7 @@ index 519456e0c3a5c2bf61f82bfac4cee40f95195f09..aa9128ddc283a70910a2b66b401df4b0 UseGPUProcessForMediaEnabled: diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index a2e03f813369da8d01db2bf1176d3fad827a51a7..782975a40591504fed7fa03dc65d5d1c100f9b0d 100644 +index 919f9a02d1a6b11d2d3773be94c2e6c5b63f1ce5..6757f230255a2e947f44ee8a73ce6dd9a2ebb4d5 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h @@ -420,7 +420,7 @@ @@ -2152,7 +2145,7 @@ index a2e03f813369da8d01db2bf1176d3fad827a51a7..782975a40591504fed7fa03dc65d5d1c #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index b0d2759faf139f416d441b673b19bfe3cbf638da..ec980b87235c594f8ad126d171f59abc62b6cc2b 100644 +index ca3a163a9576abbfa7a8c110cfd0e10570a656b1..a4be1e18d528a2f2b19997b042afe3ee59fd436f 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h @@ -223,7 +223,7 @@ @@ -2177,7 +2170,7 @@ index bb01bfeeac63f854fa656ec6b8d262fafc4c9df5..f8376ea8aada69d2e53734ba8fd234c2 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index b60521f9bd36be4fa86e57a9d78f91b20eca1044..3cd49bae1730389dc7cc8d32b1f3dfc84fe7046b 100644 +index c250c8e4f41c039182f317cf776efbdb80286af1..91fd78cddfe53b995c14f7fdd917f54b4409bbca 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -414,7 +414,7 @@ @@ -2202,7 +2195,7 @@ index 09d4af604a835c7c6be1e43c249565bd1053aff4..0d6112342480454ce41a6b56dd925e1d if (Journald_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index d663c323684d1c0f880fb7cf961fc6fa4216e46c..59352ac981e7b9a8053354badafafa379efef72f 100644 +index b123abf93e2758d21148c101c9d1734d0496f9a4..b0f076df5692925a4f93c67f2dca9bc86e3cdf53 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make @@ -976,6 +976,10 @@ JS_BINDING_IDLS := \ @@ -2245,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 { @@ -2253,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 { @@ -2261,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 { @@ -2269,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 { @@ -2290,10 +2283,10 @@ index 9d021a1a887fb06779b063b525ac985f8f4ba37a..8378753eacb14e9fd34e906111352b58 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index c993c06cd0091e430119b8df484c3efd653e6d6f..01cec35daa428fc35c4289cd088b963f091e1b43 100644 +index daea10b61d1585d8553eddd26014b9e5d1cc1255..fd004eec3d057f1b5ab18b9acdc065a882a19e8a 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -631,3 +631,9 @@ platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify +@@ -632,3 +632,9 @@ platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify platform/graphics/cocoa/ANGLEUtilitiesCocoa.cpp @no-unify platform/graphics/cocoa/GraphicsContextGLCocoa.mm @no-unify platform/graphics/cv/GraphicsContextGLCVCocoa.cpp @no-unify @@ -2382,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 4095346f7abc875dc65a18a7baa63ffe435a3ed4..3942dfe57d7ae5a7a9df158a66cb6b2d529c1bbb 100644 +index dd997cfba140eaf593a120f031aa2b34ce85abc7..cfaa7c02167ab54b6fb5b49f48fe1cbf405aad00 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5527,6 +5527,13 @@ +@@ -5529,6 +5529,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, ); }; }; @@ -2399,7 +2392,7 @@ index 4095346f7abc875dc65a18a7baa63ffe435a3ed4..3942dfe57d7ae5a7a9df158a66cb6b2d 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, ); }; }; -@@ -17857,6 +17864,14 @@ +@@ -17865,6 +17872,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 = ""; }; @@ -2414,7 +2407,7 @@ index 4095346f7abc875dc65a18a7baa63ffe435a3ed4..3942dfe57d7ae5a7a9df158a66cb6b2d 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 = ""; }; -@@ -24274,7 +24289,12 @@ +@@ -24286,7 +24301,12 @@ 1AF326770D78B9440068F0C4 /* EditorClient.h */, E36D701E27B71F04006531B7 /* EmptyAttachmentElementClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2427,7 +2420,7 @@ index 4095346f7abc875dc65a18a7baa63ffe435a3ed4..3942dfe57d7ae5a7a9df158a66cb6b2d E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -30306,6 +30326,8 @@ +@@ -30320,6 +30340,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2436,7 +2429,7 @@ index 4095346f7abc875dc65a18a7baa63ffe435a3ed4..3942dfe57d7ae5a7a9df158a66cb6b2d 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32614,6 +32636,7 @@ +@@ -32628,6 +32650,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2444,7 +2437,7 @@ index 4095346f7abc875dc65a18a7baa63ffe435a3ed4..3942dfe57d7ae5a7a9df158a66cb6b2d 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -33623,6 +33646,7 @@ +@@ -33637,6 +33660,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2452,7 +2445,7 @@ index 4095346f7abc875dc65a18a7baa63ffe435a3ed4..3942dfe57d7ae5a7a9df158a66cb6b2d 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -35767,6 +35791,7 @@ +@@ -35782,6 +35806,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2460,7 +2453,7 @@ index 4095346f7abc875dc65a18a7baa63ffe435a3ed4..3942dfe57d7ae5a7a9df158a66cb6b2d 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -36889,6 +36914,7 @@ +@@ -36904,6 +36929,7 @@ 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, @@ -2468,7 +2461,7 @@ index 4095346f7abc875dc65a18a7baa63ffe435a3ed4..3942dfe57d7ae5a7a9df158a66cb6b2d CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, CD1F9B032700323D00617EB6 /* PlatformVideoMatrixCoefficients.h in Headers */, -@@ -38983,6 +39009,7 @@ +@@ -38999,6 +39025,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2476,7 +2469,7 @@ index 4095346f7abc875dc65a18a7baa63ffe435a3ed4..3942dfe57d7ae5a7a9df158a66cb6b2d 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -39059,6 +39086,7 @@ +@@ -39075,6 +39102,7 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2484,7 +2477,7 @@ index 4095346f7abc875dc65a18a7baa63ffe435a3ed4..3942dfe57d7ae5a7a9df158a66cb6b2d 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -39107,6 +39135,7 @@ +@@ -39123,6 +39151,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2492,7 +2485,7 @@ index 4095346f7abc875dc65a18a7baa63ffe435a3ed4..3942dfe57d7ae5a7a9df158a66cb6b2d DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -39639,6 +39668,7 @@ +@@ -39655,6 +39684,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2501,7 +2494,7 @@ index 4095346f7abc875dc65a18a7baa63ffe435a3ed4..3942dfe57d7ae5a7a9df158a66cb6b2d 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 d74d5f83f286bc526b19f3fd5cc15eea22526769..85f3a3f511a6e71abfa37a70a018c02544a1499d 100644 +index a8108919d8da21dfc741f44a999985695662b771..95e5863a73299d1212e67600ca611d87159b9095 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2530,7 +2523,7 @@ index d74d5f83f286bc526b19f3fd5cc15eea22526769..85f3a3f511a6e71abfa37a70a018c025 { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/accessibility/AccessibilityObjectInterface.h b/Source/WebCore/accessibility/AccessibilityObjectInterface.h -index b8c7eb1ef13d763bca52568e6e7742355ae90aee..5bd867d365c0c82ca0554d2594cee428c2aa68e4 100644 +index fc43cb10a804186f754dc27cd3d1d5884a8dc6f7..047af6938869ccf5fedb19973d67402bcd940901 100644 --- a/Source/WebCore/accessibility/AccessibilityObjectInterface.h +++ b/Source/WebCore/accessibility/AccessibilityObjectInterface.h @@ -57,7 +57,7 @@ typedef const struct __AXTextMarkerRange* AXTextMarkerRangeRef; @@ -2542,7 +2535,7 @@ index b8c7eb1ef13d763bca52568e6e7742355ae90aee..5bd867d365c0c82ca0554d2594cee428 #endif namespace PAL { -@@ -1530,6 +1530,8 @@ private: +@@ -1529,6 +1529,8 @@ private: COMPtr m_wrapper; #elif USE(ATSPI) RefPtr m_wrapper; @@ -2687,10 +2680,10 @@ index 01d312c38e8e273099cf8d9b187ac704300f4c34..62570e7024cebae99b9d2eef711e70d8 if (!value) return userPrefersReducedMotion; diff --git a/Source/WebCore/dom/DataTransfer.cpp b/Source/WebCore/dom/DataTransfer.cpp -index 666bcc79658c9dedf19b29579543c8bcb63690ea..c66d762f37875db11df97d3685fce3d3c1838810 100644 +index 0340d056020c605e40e5c2a8265c855758bca8a1..c06566711f66c192607c2b520d6650066c3270b5 100644 --- a/Source/WebCore/dom/DataTransfer.cpp +++ b/Source/WebCore/dom/DataTransfer.cpp -@@ -495,6 +495,14 @@ Ref DataTransfer::createForDrag(const Document& document) +@@ -496,6 +496,14 @@ Ref DataTransfer::createForDrag(const Document& document) return adoptRef(*new DataTransfer(StoreMode::ReadWrite, Pasteboard::createForDragAndDrop(PagePasteboardContext::create(document.pageID())), Type::DragAndDropData)); } @@ -2732,7 +2725,7 @@ index ea39a33a6250b4d10b20802f98aa9a5d57e63a7b..300a763508d311fd7b34cb3df3cc9308 ] interface DeviceMotionEvent : Event { readonly attribute Acceleration? acceleration; diff --git a/Source/WebCore/dom/DeviceOrientationEvent.idl b/Source/WebCore/dom/DeviceOrientationEvent.idl -index c9e842e2ac134f321d1a400122cbaf72b1551296..a0f89e64b64640d2d4dbc14734868c4d4b03fc6f 100644 +index 9043052540b13d8120fb641de6337af46c3b36ef..a0f89e64b64640d2d4dbc14734868c4d4b03fc6f 100644 --- a/Source/WebCore/dom/DeviceOrientationEvent.idl +++ b/Source/WebCore/dom/DeviceOrientationEvent.idl @@ -25,6 +25,7 @@ @@ -2743,15 +2736,6 @@ index c9e842e2ac134f321d1a400122cbaf72b1551296..a0f89e64b64640d2d4dbc14734868c4d Exposed=Window ] interface DeviceOrientationEvent : Event { readonly attribute unrestricted double? alpha; -@@ -48,7 +49,7 @@ - optional unrestricted double? compassAccuracy = null); - #else - readonly attribute boolean? absolute; -- undefined initDeviceOrientationEvent(optional DOMString type = "", -+ undefined initDeviceOrientationEvent(optional [AtomString] DOMString type = "", - optional boolean bubbles = false, - optional boolean cancelable = false, - optional unrestricted double? alpha = null, diff --git a/Source/WebCore/dom/Document+PointerLock.idl b/Source/WebCore/dom/Document+PointerLock.idl index 898027004b8553cac8130541026af70ffb5ee073..883d6a7df7a164625037cd8cee95c8fe4312b9e8 100644 --- a/Source/WebCore/dom/Document+PointerLock.idl @@ -2886,10 +2870,10 @@ index 7542bab569d49879f0eb460520738b3da37116f6..17c92229cc596bc80a718911b74737d3 #endif diff --git a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp b/Source/WebCore/editing/libwpe/EditorLibWPE.cpp -index 491490579e6b911498449ca829fc9158851ab8d9..725996216e7349784c2c81ba0f619ceda7db7123 100644 +index b8a3148b067373dadfb43975473a18caeb266d51..504172cd327b38ffbd103259e86d374752ee3474 100644 --- a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp +++ b/Source/WebCore/editing/libwpe/EditorLibWPE.cpp -@@ -33,6 +33,7 @@ +@@ -34,6 +34,7 @@ #include "NotImplemented.h" #include "Pasteboard.h" #include "Settings.h" @@ -2897,7 +2881,7 @@ index 491490579e6b911498449ca829fc9158851ab8d9..725996216e7349784c2c81ba0f619ced #include "markup.h" namespace WebCore { -@@ -98,6 +99,14 @@ void Editor::platformPasteFont() +@@ -99,6 +100,14 @@ void Editor::platformPasteFont() { } @@ -3370,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 51898bfaef0a29691adefd26e78fcb61ad4054f2..2c5d16b8cbb63d4204e800dc6ecd755dce8f8f90 100644 +index 66967959aff451eda20716b8ae9616fb7a915a29..4f8b75e852da5a24570d3a0bc4a6871f19d502fc 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp @@ -62,12 +62,16 @@ @@ -3445,7 +3429,7 @@ index 51898bfaef0a29691adefd26e78fcb61ad4054f2..2c5d16b8cbb63d4204e800dc6ecd755d Document* InspectorDOMAgent::assertDocument(Protocol::ErrorString& errorString, Protocol::DOM::NodeId nodeId) { Node* node = assertNode(errorString, nodeId); -@@ -1404,16 +1425,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::highlightSelector(Ref InspectorDOMAgent::highlightSelector(Ref InspectorDOMAgent::highlightNode(Ref&& highlightInspectorObject, std::optional&& nodeId, const Protocol::Runtime::RemoteObjectId& objectId) { Protocol::ErrorString errorString; @@ -3463,7 +3447,7 @@ index 51898bfaef0a29691adefd26e78fcb61ad4054f2..2c5d16b8cbb63d4204e800dc6ecd755d if (!node) return makeUnexpected(errorString); -@@ -1651,15 +1663,136 @@ Protocol::ErrorStringOr InspectorDOMAgent::setInspectedNode(Protocol::DOM: +@@ -1655,15 +1667,136 @@ Protocol::ErrorStringOr InspectorDOMAgent::setInspectedNode(Protocol::DOM: return { }; } @@ -3604,7 +3588,7 @@ index 51898bfaef0a29691adefd26e78fcb61ad4054f2..2c5d16b8cbb63d4204e800dc6ecd755d if (!object) return makeUnexpected("Missing injected script for given nodeId"_s); -@@ -2893,7 +3026,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::pushNodeByPath +@@ -2897,7 +3030,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::pushNodeByPath return makeUnexpected("Missing node for given path"_s); } @@ -3613,7 +3597,7 @@ index 51898bfaef0a29691adefd26e78fcb61ad4054f2..2c5d16b8cbb63d4204e800dc6ecd755d { Document* document = &node->document(); if (auto* templateHost = document->templateDocumentHost()) -@@ -2902,12 +3035,18 @@ RefPtr InspectorDOMAgent::resolveNode(Node* nod +@@ -2906,12 +3039,18 @@ RefPtr InspectorDOMAgent::resolveNode(Node* nod if (!frame) return nullptr; @@ -3635,7 +3619,7 @@ index 51898bfaef0a29691adefd26e78fcb61ad4054f2..2c5d16b8cbb63d4204e800dc6ecd755d } Node* InspectorDOMAgent::scriptValueAsNode(JSC::JSValue value) -@@ -2930,4 +3069,57 @@ Protocol::ErrorStringOr InspectorDOMAgent::setAllowEditingUserAgentShadowT +@@ -2934,4 +3073,57 @@ Protocol::ErrorStringOr InspectorDOMAgent::setAllowEditingUserAgentShadowT return { }; } @@ -3694,7 +3678,7 @@ index 51898bfaef0a29691adefd26e78fcb61ad4054f2..2c5d16b8cbb63d4204e800dc6ecd755d + } // namespace WebCore diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.h b/Source/WebCore/inspector/agents/InspectorDOMAgent.h -index 12dc38a0bb33578e0c468c690b4ae6d77f0cd1e6..8402d34f8099fa040e5ebdefc217b06054733054 100644 +index c503d5db51b75de57e3b09357f48f60470986da4..79947b44063d85951d2f6314c5cb78a54ab2d46e 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.h +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.h @@ -57,6 +57,7 @@ namespace WebCore { @@ -3767,7 +3751,7 @@ index 12dc38a0bb33578e0c468c690b4ae6d77f0cd1e6..8402d34f8099fa040e5ebdefc217b060 void discardBindings(); diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp -index a6601cae918cc76aab630e88c05acc445977169c..1eccb300c50fd774dafab643b545367b51402830 100644 +index a6601cae918cc76aab630e88c05acc445977169c..e1504bd2726889be47c4f5dfd0688743434b5562 100644 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp @@ -45,6 +45,7 @@ @@ -3815,7 +3799,7 @@ index a6601cae918cc76aab630e88c05acc445977169c..1eccb300c50fd774dafab643b545367b - willSendRequest(identifier, loader, request, redirectResponse, resourceTypeForCachedResource(cachedResource)); + InspectorPageAgent::ResourceType resourceType; + if (request.initiatorIdentifier() == initiatorIdentifierForEventSource()) { -+ resourceType = InspectorPageAgent::EventSource; ++ resourceType = InspectorPageAgent::EventSourceResource; + } else { + if (!cachedResource && loader) + cachedResource = InspectorPageAgent::cachedResource(loader->frame(), request.url()); @@ -3925,7 +3909,7 @@ index 1a4779cbc9f388434295a94fd9da566d6ff4e3f7..9703d8b8c30845f750813f9666b0998f // InspectorInstrumentation void willRecalculateStyle(); diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp -index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61301df04a 100644 +index 258429e97b12ddf52aa2d23b1dd541a5ddcf532f..e5be0d69facff68cef5311f4fd2ca4b68aa1c660 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp @@ -32,20 +32,28 @@ @@ -4004,16 +3988,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 static bool decodeBuffer(const uint8_t* buffer, unsigned size, const String& textEncodingName, String* result) { if (buffer) { -@@ -235,6 +257,8 @@ Protocol::Page::ResourceType InspectorPageAgent::resourceTypeJSON(InspectorPageA - return Protocol::Page::ResourceType::Beacon; - case WebSocketResource: - return Protocol::Page::ResourceType::WebSocket; -+ case EventSource: -+ return Protocol::Page::ResourceType::EventSource; - case OtherResource: - return Protocol::Page::ResourceType::Other; - #if ENABLE(APPLICATION_MANIFEST) -@@ -322,6 +346,7 @@ InspectorPageAgent::InspectorPageAgent(PageAgentContext& context, InspectorClien +@@ -326,6 +348,7 @@ InspectorPageAgent::InspectorPageAgent(PageAgentContext& context, InspectorClien , m_frontendDispatcher(makeUnique(context.frontendRouter)) , m_backendDispatcher(Inspector::PageBackendDispatcher::create(context.backendDispatcher, this)) , m_inspectedPage(context.inspectedPage) @@ -4021,7 +3996,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 , m_client(client) , m_overlay(overlay) { -@@ -353,12 +378,20 @@ Protocol::ErrorStringOr InspectorPageAgent::enable() +@@ -357,12 +380,20 @@ Protocol::ErrorStringOr InspectorPageAgent::enable() defaultAppearanceDidChange(m_inspectedPage.defaultUseDarkAppearance()); #endif @@ -4042,7 +4017,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 setShowPaintRects(false); #if !PLATFORM(IOS_FAMILY) -@@ -407,6 +440,22 @@ Protocol::ErrorStringOr InspectorPageAgent::reload(std::optional&& i +@@ -411,6 +442,22 @@ Protocol::ErrorStringOr InspectorPageAgent::reload(std::optional&& i return { }; } @@ -4065,7 +4040,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 Protocol::ErrorStringOr InspectorPageAgent::navigate(const String& url) { Frame& frame = m_inspectedPage.mainFrame(); -@@ -428,6 +477,13 @@ Protocol::ErrorStringOr InspectorPageAgent::overrideUserAgent(const String +@@ -432,6 +479,13 @@ Protocol::ErrorStringOr InspectorPageAgent::overrideUserAgent(const String return { }; } @@ -4079,7 +4054,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 Protocol::ErrorStringOr InspectorPageAgent::overrideSetting(Protocol::Page::Setting setting, std::optional&& value) { auto& inspectedPageSettings = m_inspectedPage.settings(); -@@ -441,6 +497,12 @@ Protocol::ErrorStringOr InspectorPageAgent::overrideSetting(Protocol::Page +@@ -445,6 +499,12 @@ Protocol::ErrorStringOr InspectorPageAgent::overrideSetting(Protocol::Page inspectedPageSettings.setAuthorAndUserStylesEnabledInspectorOverride(value); return { }; @@ -4092,7 +4067,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 case Protocol::Page::Setting::ICECandidateFilteringEnabled: inspectedPageSettings.setICECandidateFilteringEnabledInspectorOverride(value); return { }; -@@ -466,6 +528,36 @@ Protocol::ErrorStringOr InspectorPageAgent::overrideSetting(Protocol::Page +@@ -470,6 +530,36 @@ Protocol::ErrorStringOr InspectorPageAgent::overrideSetting(Protocol::Page inspectedPageSettings.setNeedsSiteSpecificQuirksInspectorOverride(value); return { }; @@ -4129,7 +4104,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 case Protocol::Page::Setting::ScriptEnabled: inspectedPageSettings.setScriptEnabledInspectorOverride(value); return { }; -@@ -478,6 +570,12 @@ Protocol::ErrorStringOr InspectorPageAgent::overrideSetting(Protocol::Page +@@ -482,6 +572,12 @@ Protocol::ErrorStringOr InspectorPageAgent::overrideSetting(Protocol::Page inspectedPageSettings.setShowRepaintCounterInspectorOverride(value); return { }; @@ -4142,7 +4117,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 case Protocol::Page::Setting::WebRTCEncryptionEnabled: inspectedPageSettings.setWebRTCEncryptionEnabledInspectorOverride(value); return { }; -@@ -698,9 +796,13 @@ Protocol::ErrorStringOr> InspectorP +@@ -702,9 +798,13 @@ Protocol::ErrorStringOr> InspectorP return { { content, base64Encoded } }; } @@ -4158,7 +4133,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 return { }; } -@@ -803,15 +905,16 @@ Protocol::ErrorStringOr InspectorPageAgent::setShowPaintRects(bool show) +@@ -807,15 +907,16 @@ Protocol::ErrorStringOr InspectorPageAgent::setShowPaintRects(bool show) return { }; } @@ -4180,7 +4155,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 } void InspectorPageAgent::frameNavigated(Frame& frame) -@@ -819,13 +922,23 @@ void InspectorPageAgent::frameNavigated(Frame& frame) +@@ -823,13 +924,23 @@ void InspectorPageAgent::frameNavigated(Frame& frame) m_frontendDispatcher->frameNavigated(buildObjectForFrame(&frame)); } @@ -4207,7 +4182,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 } Frame* InspectorPageAgent::frameForId(const Protocol::Network::FrameId& frameId) -@@ -837,20 +950,18 @@ String InspectorPageAgent::frameId(Frame* frame) +@@ -841,20 +952,18 @@ String InspectorPageAgent::frameId(Frame* frame) { if (!frame) return emptyString(); @@ -4234,7 +4209,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 } Frame* InspectorPageAgent::assertFrame(Protocol::ErrorString& errorString, const Protocol::Network::FrameId& frameId) -@@ -861,11 +972,6 @@ Frame* InspectorPageAgent::assertFrame(Protocol::ErrorString& errorString, const +@@ -865,11 +974,6 @@ Frame* InspectorPageAgent::assertFrame(Protocol::ErrorString& errorString, const return frame; } @@ -4246,7 +4221,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 void InspectorPageAgent::frameStartedLoading(Frame& frame) { m_frontendDispatcher->frameStartedLoading(frameId(&frame)); -@@ -886,6 +992,12 @@ void InspectorPageAgent::frameClearedScheduledNavigation(Frame& frame) +@@ -890,6 +994,12 @@ void InspectorPageAgent::frameClearedScheduledNavigation(Frame& frame) m_frontendDispatcher->frameClearedScheduledNavigation(frameId(&frame)); } @@ -4259,7 +4234,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT) void InspectorPageAgent::defaultAppearanceDidChange(bool useDarkAppearance) { -@@ -895,13 +1007,22 @@ void InspectorPageAgent::defaultAppearanceDidChange(bool useDarkAppearance) +@@ -899,13 +1009,22 @@ void InspectorPageAgent::defaultAppearanceDidChange(bool useDarkAppearance) void InspectorPageAgent::didClearWindowObjectInWorld(Frame& frame, DOMWrapperWorld& world) { @@ -4285,7 +4260,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 } void InspectorPageAgent::didPaint(RenderObject& renderer, const LayoutRect& rect) -@@ -945,6 +1066,52 @@ void InspectorPageAgent::didRecalculateStyle() +@@ -949,6 +1068,52 @@ void InspectorPageAgent::didRecalculateStyle() m_overlay->update(); } @@ -4338,7 +4313,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 Ref InspectorPageAgent::buildObjectForFrame(Frame* frame) { ASSERT_ARG(frame, frame); -@@ -1058,6 +1225,12 @@ void InspectorPageAgent::applyUserAgentOverride(String& userAgent) +@@ -1062,6 +1227,12 @@ void InspectorPageAgent::applyUserAgentOverride(String& userAgent) userAgent = m_userAgentOverride; } @@ -4351,7 +4326,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 void InspectorPageAgent::applyEmulatedMedia(String& media) { if (!m_emulatedMedia.isEmpty()) -@@ -1081,11 +1254,13 @@ Protocol::ErrorStringOr InspectorPageAgent::snapshotNode(Protocol::DOM:: +@@ -1085,11 +1256,13 @@ Protocol::ErrorStringOr InspectorPageAgent::snapshotNode(Protocol::DOM:: return snapshot->toDataURL("image/png"_s, std::nullopt, PreserveResolution::Yes); } @@ -4366,7 +4341,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 IntRect rectangle(x, y, width, height); auto snapshot = snapshotFrameRect(m_inspectedPage.mainFrame(), rectangle, WTFMove(options)); -@@ -1096,6 +1271,47 @@ Protocol::ErrorStringOr InspectorPageAgent::snapshotRect(int x, int y, i +@@ -1100,6 +1273,47 @@ Protocol::ErrorStringOr InspectorPageAgent::snapshotRect(int x, int y, i return snapshot->toDataURL("image/png"_s, std::nullopt, PreserveResolution::Yes); } @@ -4414,7 +4389,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 #if ENABLE(WEB_ARCHIVE) && USE(CF) Protocol::ErrorStringOr InspectorPageAgent::archive() { -@@ -1108,7 +1324,6 @@ Protocol::ErrorStringOr InspectorPageAgent::archive() +@@ -1112,7 +1326,6 @@ Protocol::ErrorStringOr InspectorPageAgent::archive() } #endif @@ -4422,7 +4397,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 Protocol::ErrorStringOr InspectorPageAgent::setScreenSizeOverride(std::optional&& width, std::optional&& height) { if (width.has_value() != height.has_value()) -@@ -1123,6 +1338,630 @@ Protocol::ErrorStringOr InspectorPageAgent::setScreenSizeOverride(std::opt +@@ -1127,6 +1340,630 @@ Protocol::ErrorStringOr InspectorPageAgent::setScreenSizeOverride(std::opt m_inspectedPage.mainFrame().setOverrideScreenSize(FloatSize(width.value_or(0), height.value_or(0))); return { }; } @@ -5054,7 +5029,7 @@ index af35e0a95ea8149aa54932b09faddbeab52004fc..4fbc97c23240ab8456ee9fdb3d0d7b61 } // namespace WebCore diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.h b/Source/WebCore/inspector/agents/InspectorPageAgent.h -index 73424c2d3b2ad9889a566ff61fd86a50c9914798..d54092922c809dbad6898b871099ca8f1c6a48fb 100644 +index dfd4cdd61f52c9386a215428b07cad1705344f65..2d93349e91582a5e0c0d0e63358d7e1aebc1854c 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.h +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.h @@ -32,19 +32,26 @@ @@ -5084,14 +5059,7 @@ index 73424c2d3b2ad9889a566ff61fd86a50c9914798..d54092922c809dbad6898b871099ca8f class InspectorClient; class InspectorOverlay; class Page; -@@ -69,12 +76,14 @@ public: - PingResource, - BeaconResource, - WebSocketResource, -+ EventSource, - #if ENABLE(APPLICATION_MANIFEST) - ApplicationManifestResource, - #endif +@@ -76,6 +83,7 @@ public: OtherResource, }; @@ -5099,7 +5067,7 @@ index 73424c2d3b2ad9889a566ff61fd86a50c9914798..d54092922c809dbad6898b871099ca8f static bool sharedBufferContent(RefPtr&&, const String& textEncodingName, bool withBase64Encode, String* result); static Vector cachedResourcesForFrame(Frame*); static void resourceContent(Inspector::Protocol::ErrorString&, Frame*, const URL&, String* result, bool* base64Encoded); -@@ -95,15 +104,18 @@ public: +@@ -96,15 +104,18 @@ public: Inspector::Protocol::ErrorStringOr enable(); Inspector::Protocol::ErrorStringOr disable(); Inspector::Protocol::ErrorStringOr reload(std::optional&& ignoreCache, std::optional&& revalidateAllResources); @@ -5119,7 +5087,7 @@ index 73424c2d3b2ad9889a566ff61fd86a50c9914798..d54092922c809dbad6898b871099ca8f Inspector::Protocol::ErrorStringOr>> searchInResource(const Inspector::Protocol::Network::FrameId&, const String& url, const String& query, std::optional&& caseSensitive, std::optional&& isRegex, const Inspector::Protocol::Network::RequestId&); Inspector::Protocol::ErrorStringOr>> searchInResources(const String&, std::optional&& caseSensitive, std::optional&& isRegex); #if !PLATFORM(IOS_FAMILY) -@@ -114,35 +126,55 @@ public: +@@ -115,35 +126,55 @@ public: #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT) Inspector::Protocol::ErrorStringOr setForcedAppearance(std::optional&&); #endif @@ -5181,7 +5149,7 @@ index 73424c2d3b2ad9889a566ff61fd86a50c9914798..d54092922c809dbad6898b871099ca8f Frame* frameForId(const Inspector::Protocol::Network::FrameId&); WEBCORE_EXPORT String frameId(Frame*); -@@ -151,6 +183,7 @@ public: +@@ -152,6 +183,7 @@ public: private: double timestamp(); @@ -5189,7 +5157,7 @@ index 73424c2d3b2ad9889a566ff61fd86a50c9914798..d54092922c809dbad6898b871099ca8f static bool mainResourceContent(Frame*, bool withBase64Encode, String* result); static bool dataContent(const uint8_t* data, unsigned size, const String& textEncodingName, bool withBase64Encode, String* result); -@@ -162,18 +195,20 @@ private: +@@ -163,18 +195,20 @@ private: RefPtr m_backendDispatcher; Page& m_inspectedPage; @@ -5574,7 +5542,7 @@ index 4a65cd84e5b3c627f16712427d8059a73c759403..90a6262005694741aaaa59c869d35d5c #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 0c66410d5c4fbbb9c362743262979f677809d9c8..5e6ad4101343c929146cace065f16f3300751c56 100644 +index ac725d46758f9c325a9f84075aba43c0166bb37d..ac7e73d26ac40e498bc75d64e00712d1d42d7fc0 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -142,6 +142,7 @@ @@ -5767,7 +5735,7 @@ index 51d36bd866b1d5f1daea4b02ce86b213eaa44adb..fd3cd3dad309416f41a0a0bcac22c9e5 bool m_mouseDownMayStartDrag { false }; bool m_dragMayStartSelectionInstead { false }; diff --git a/Source/WebCore/page/EventSource.cpp b/Source/WebCore/page/EventSource.cpp -index f93b14e6f8b327e9d4bc616bb7db0da91b6318d6..95dc17f6e987ad929cea1d78b85fa9a5321c9020 100644 +index 300218f40e04b7b361a1f86c11060aee68898b9d..2117c080ba43d26e32d21cc73039c9597ff17fec 100644 --- a/Source/WebCore/page/EventSource.cpp +++ b/Source/WebCore/page/EventSource.cpp @@ -36,6 +36,7 @@ @@ -5778,16 +5746,8 @@ index f93b14e6f8b327e9d4bc616bb7db0da91b6318d6..95dc17f6e987ad929cea1d78b85fa9a5 #include "MessageEvent.h" #include "ResourceError.h" #include "ResourceRequest.h" -@@ -95,6 +96,7 @@ void EventSource::connect() - ASSERT(!m_requestInFlight); - - ResourceRequest request { m_url }; -+ request.setInitiatorIdentifier(InspectorNetworkAgent::initiatorIdentifierForEventSource()); - request.setHTTPMethod("GET"_s); - request.setHTTPHeaderField(HTTPHeaderName::Accept, "text/event-stream"_s); - request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache"_s); diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp -index bcbeed1691734c108b6385c1f7db11f4946f366d..14f68247f6aa34dd2b795b6f8a4cbb11f58267c0 100644 +index edf6ed1889560fd4332592d35d52fab2b6858e1c..2c3083caecd1f4281e970c3c531844ae33e433f0 100644 --- a/Source/WebCore/page/Frame.cpp +++ b/Source/WebCore/page/Frame.cpp @@ -39,6 +39,7 @@ @@ -5814,7 +5774,7 @@ index bcbeed1691734c108b6385c1f7db11f4946f366d..14f68247f6aa34dd2b795b6f8a4cbb11 } Ref Frame::create(Page* page, HTMLFrameOwnerElement* ownerElement, UniqueRef&& client) -@@ -370,7 +373,7 @@ void Frame::orientationChanged() +@@ -374,7 +377,7 @@ void Frame::orientationChanged() int Frame::orientation() const { if (m_page) @@ -5823,7 +5783,7 @@ index bcbeed1691734c108b6385c1f7db11f4946f366d..14f68247f6aa34dd2b795b6f8a4cbb11 return 0; } #endif // ENABLE(ORIENTATION_EVENTS) -@@ -1167,6 +1170,362 @@ DataDetectionResultsStorage& Frame::dataDetectionResults() +@@ -1171,6 +1174,362 @@ DataDetectionResultsStorage& Frame::dataDetectionResults() #endif @@ -6327,7 +6287,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 7d424802d69e52984a0d7c9d26e1abc9c44ea824..7104d66d8a4746cfcffb2b33c31f684fb88646d8 100644 +index 22737c5d7554d0ba158ef3e1a63fbde11502e72b..6474b73078528345f8e2addcdbca0eb670974d22 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -487,6 +487,37 @@ void Page::setOverrideViewportArguments(const std::optional& @@ -6368,7 +6328,7 @@ index 7d424802d69e52984a0d7c9d26e1abc9c44ea824..7104d66d8a4746cfcffb2b33c31f684f ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -1349,10 +1380,6 @@ void Page::didCommitLoad() +@@ -1356,10 +1387,6 @@ void Page::didCommitLoad() m_isEditableRegionEnabled = false; #endif @@ -6379,7 +6339,7 @@ index 7d424802d69e52984a0d7c9d26e1abc9c44ea824..7104d66d8a4746cfcffb2b33c31f684f resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3415,6 +3442,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3406,6 +3433,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6397,10 +6357,10 @@ index 7d424802d69e52984a0d7c9d26e1abc9c44ea824..7104d66d8a4746cfcffb2b33c31f684f { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 224c299d244a908354514394b245be98bfc2cc98..e2176535919ac269f5b85f71e8bb006d6cef11ae 100644 +index ccf2e14844c9ad578e4e262a5881167c846fc9d3..a10ad39fc75b52e8484e7562b21ee230e865c0e2 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h -@@ -280,6 +280,9 @@ public: +@@ -279,6 +279,9 @@ public: const std::optional& overrideViewportArguments() const { return m_overrideViewportArguments; } WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional&); @@ -6410,7 +6370,7 @@ index 224c299d244a908354514394b245be98bfc2cc98..e2176535919ac269f5b85f71e8bb006d static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -330,6 +333,10 @@ public: +@@ -329,6 +332,10 @@ public: DragCaretController& dragCaretController() const { return *m_dragCaretController; } #if ENABLE(DRAG_SUPPORT) DragController& dragController() const { return *m_dragController; } @@ -6421,7 +6381,7 @@ index 224c299d244a908354514394b245be98bfc2cc98..e2176535919ac269f5b85f71e8bb006d #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -497,6 +504,8 @@ public: +@@ -496,6 +503,8 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6430,9 +6390,9 @@ index 224c299d244a908354514394b245be98bfc2cc98..e2176535919ac269f5b85f71e8bb006d #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -900,6 +909,11 @@ public: - - WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; +@@ -903,6 +912,11 @@ public: + bool shouldBuildInteractionRegions() const; + #endif +#if ENABLE(ORIENTATION_EVENTS) + int orientation() const; @@ -6442,7 +6402,7 @@ index 224c299d244a908354514394b245be98bfc2cc98..e2176535919ac269f5b85f71e8bb006d #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -1018,6 +1032,9 @@ private: +@@ -1019,6 +1033,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6452,7 +6412,7 @@ index 224c299d244a908354514394b245be98bfc2cc98..e2176535919ac269f5b85f71e8bb006d #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1097,6 +1114,7 @@ private: +@@ -1098,6 +1115,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6460,7 +6420,7 @@ index 224c299d244a908354514394b245be98bfc2cc98..e2176535919ac269f5b85f71e8bb006d #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1274,6 +1292,11 @@ private: +@@ -1275,6 +1293,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6534,10 +6494,10 @@ index 897d2a009752a4030659a88e8b16382e00ac2316..08bb3344c59a0462668762815473659f #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index a2a14b6e6ce5162559bda3e3849614b05033c7c8..066c7958311d90f4fc72cd1f019f0631a47e5b2b 100644 +index da65510492bb4a810124b05cba7e74d485c9cba9..e36002bfa44188306b65b494ad14e2c8db8eb8ac 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h -@@ -178,6 +178,7 @@ public: +@@ -175,6 +175,7 @@ public: void setMouseEventsSimulationEnabled(bool isEnabled) { m_mouseEventsSimulationEnabled = isEnabled; } bool touchEventsEnabled() const; void setTouchEventsEnabled(bool isEnabled) { m_touchEventsEnabled = isEnabled; } @@ -6618,10 +6578,10 @@ index 2fd52a5b9267aaa29e2760c5cda125ec5af95009..43f07ea81e401764ea34145b1a08b80b if (const ContentSecurityPolicyDirective* violatedDirective = (policy.get()->*predicate)(std::forward(args)...)) { diff --git a/Source/WebCore/page/wpe/DragControllerWPE.cpp b/Source/WebCore/page/wpe/DragControllerWPE.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..3dedfa855f990643e3e7bbe7754abca4e88a0f1c +index 0000000000000000000000000000000000000000..2549355fc55ca55d2b6917dbfd05999f0e5607b3 --- /dev/null +++ b/Source/WebCore/page/wpe/DragControllerWPE.cpp -@@ -0,0 +1,79 @@ +@@ -0,0 +1,80 @@ +/* + * Copyright (C) 2007-20 Apple Inc. All rights reserved. + * @@ -6656,6 +6616,7 @@ index 0000000000000000000000000000000000000000..3dedfa855f990643e3e7bbe7754abca4 +#include "Editor.h" +#include "Element.h" +#include "Frame.h" ++#include "FrameDestructionObserverInlines.h" +#include "Pasteboard.h" +#include "markup.h" + @@ -6903,10 +6864,10 @@ index 44799e0b2a93cbcf25f4315d62a3d95896c02f3d..29277223448a0936a16f975970ab60d7 #endif diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h -index 2bdc18a1988004fafc237572daf2927291ed8def..e915cabfee73cd0abdc6ce2cc518db2cb5ee4603 100644 +index 0fbd9949f8a8927f1f342cbe33dea685dd482f41..27be181d431d58ef25c3f638178bd78593d7bb61 100644 --- a/Source/WebCore/platform/ScrollableArea.h +++ b/Source/WebCore/platform/ScrollableArea.h -@@ -103,7 +103,7 @@ public: +@@ -102,7 +102,7 @@ public: void stopKeyboardScrollAnimation(); #if ENABLE(TOUCH_EVENTS) @@ -8715,7 +8676,7 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderTextControl.cpp b/Source/WebCore/rendering/RenderTextControl.cpp -index 3dbe8a7687666295e84a7b2b4a226292dffc39e4..d1dea7706b2b582f0d26b0ba70080282bfebc2e3 100644 +index 1c99a7d1faec752dbfe0aaacfa95f8fca35de446..9be94e70398713a65b1aff134f894463dad625d7 100644 --- a/Source/WebCore/rendering/RenderTextControl.cpp +++ b/Source/WebCore/rendering/RenderTextControl.cpp @@ -212,13 +212,13 @@ void RenderTextControl::layoutExcludedChildren(bool relayoutChildren) @@ -8925,10 +8886,10 @@ index 3206dcb97599ce445a73c9667af7d21c61f7c870..78abd1fa5d52103383ef8765db299d1c ClearPrevalentResource(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () ClearUserInteraction(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () diff --git a/Source/WebKit/NetworkProcess/NetworkSession.h b/Source/WebKit/NetworkProcess/NetworkSession.h -index 6cc35141dc21e1fa19b946cfd9d2ffdb67bfb442..6902e2766d28cfe04ea3e39a1d7421f66615bc9a 100644 +index 11b3fc7c4267ef9e412d7d48bb6cfbe70b2bdfeb..af1fb6660696cf9c91d319670d5542727ae3ac18 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h -@@ -194,6 +194,9 @@ public: +@@ -192,6 +192,9 @@ public: void lowMemoryHandler(WTF::Critical); @@ -8938,7 +8899,7 @@ index 6cc35141dc21e1fa19b946cfd9d2ffdb67bfb442..6902e2766d28cfe04ea3e39a1d7421f6 #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -275,6 +278,7 @@ protected: +@@ -273,6 +276,7 @@ protected: bool m_privateClickMeasurementDebugModeEnabled { false }; std::optional m_ephemeralMeasurement; bool m_isRunningEphemeralMeasurementTest { false }; @@ -9028,10 +8989,10 @@ index f57a72b6bdc3382469d69adb1b1201c7a9f07a84..c501211b094312ca44f0bf92de5d6ebc void clear(); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 5623a4e3c11dbfa978ecc63f3b762d85fe16ee29..e7e6f789ffd5b70f50bba7bbc8a04bcdebf7c77e 100644 +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); @@ -9040,7 +9001,7 @@ index 5623a4e3c11dbfa978ecc63f3b762d85fe16ee29..e7e6f789ffd5b70f50bba7bbc8a04bcd return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); NSURLSessionTaskTransactionMetrics *metrics = task._incompleteTaskMetrics.transactionMetrics.lastObject; -@@ -962,6 +962,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END +@@ -964,6 +964,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics())); @@ -9055,32 +9016,18 @@ index 5623a4e3c11dbfa978ecc63f3b762d85fe16ee29..e7e6f789ffd5b70f50bba7bbc8a04bcd #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 94da185e3854a52da6aae316cec352629fd82e92..39c9a8ed183b291b44e0be916e23e2a8ed6e1013 100644 +index 2e6fa61594ff12bd7e864ac6edc71849f89e4028..3d550041a35d617843f0e18b54b7c22337d64709 100644 --- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp +++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp -@@ -26,9 +26,13 @@ - #include "config.h" - #include "NetworkDataTaskCurl.h" - -+#include "APIError.h" - #include "AuthenticationChallengeDisposition.h" - #include "AuthenticationManager.h" -+#include "DataReference.h" -+#include "Download.h" +@@ -33,6 +33,7 @@ + #include "Download.h" + #include "NetworkProcess.h" #include "NetworkSessionCurl.h" +#include "NetworkProcess.h" #include "PrivateRelayed.h" #include #include -@@ -42,6 +46,7 @@ - #include - #include - #include -+#include - - namespace WebKit { - -@@ -79,6 +84,8 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas +@@ -84,6 +85,8 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password()); m_curlRequest->setAuthenticationScheme(ProtectionSpace::AuthenticationScheme::HTTPBasic); } @@ -9089,17 +9036,7 @@ index 94da185e3854a52da6aae316cec352629fd82e92..39c9a8ed183b291b44e0be916e23e2a8 m_curlRequest->start(); } -@@ -108,6 +115,9 @@ void NetworkDataTaskCurl::cancel() - - if (m_curlRequest) - m_curlRequest->cancel(); -+ -+ if (isDownload()) -+ deleteDownloadFile(); - } - - void NetworkDataTaskCurl::invalidateAndCancel() -@@ -152,6 +162,7 @@ void NetworkDataTaskCurl::curlDidReceiveResponse(CurlRequest& request, CurlRespo +@@ -160,6 +163,7 @@ void NetworkDataTaskCurl::curlDidReceiveResponse(CurlRequest& request, CurlRespo m_response = ResourceResponse(receivedResponse); m_response.setCertificateInfo(WTFMove(receivedResponse.certificateInfo)); m_response.setDeprecatedNetworkLoadMetrics(Box::create(WTFMove(receivedResponse.networkLoadMetrics))); @@ -9107,83 +9044,7 @@ index 94da185e3854a52da6aae316cec352629fd82e92..39c9a8ed183b291b44e0be916e23e2a8 handleCookieHeaders(request.resourceRequest(), receivedResponse); -@@ -179,7 +190,12 @@ void NetworkDataTaskCurl::curlDidReceiveData(CurlRequest&, const SharedBuffer& b - Ref protectedThis { *this }; - if (state() == State::Canceling || state() == State::Completed || (!m_client && !isDownload())) - return; -- -+ if (isDownload()) { -+ buffer.forEachSegment([&](auto& segment) { -+ FileSystem::writeToFile(m_downloadDestinationFile, segment.data(), segment.size()); -+ }); -+ return; -+ } - m_client->didReceiveData(buffer); - } - -@@ -188,9 +204,26 @@ void NetworkDataTaskCurl::curlDidComplete(CurlRequest&, NetworkLoadMetrics&& net - if (state() == State::Canceling || state() == State::Completed || (!m_client && !isDownload())) - return; - -+ if (isDownload()) { -+ auto* download = m_session->networkProcess().downloadManager().download(m_pendingDownloadID); -+ ASSERT(download); -+ FileSystem::closeFile(m_downloadDestinationFile); -+ m_downloadDestinationFile = FileSystem::invalidPlatformFileHandle; -+ download->didFinish(); -+ return; -+ } - m_client->didCompleteWithError({ }, WTFMove(networkLoadMetrics)); - } - -+void NetworkDataTaskCurl::deleteDownloadFile() -+{ -+ if (m_downloadDestinationFile != FileSystem::invalidPlatformFileHandle) { -+ FileSystem::closeFile(m_downloadDestinationFile); -+ FileSystem::deleteFile(m_pendingDownloadLocation); -+ m_downloadDestinationFile = FileSystem::invalidPlatformFileHandle; -+ } -+} -+ - void NetworkDataTaskCurl::curlDidFailWithError(CurlRequest& request, ResourceError&& resourceError, CertificateInfo&& certificateInfo) - { - if (state() == State::Canceling || state() == State::Completed || (!m_client && !isDownload())) -@@ -201,6 +234,14 @@ void NetworkDataTaskCurl::curlDidFailWithError(CurlRequest& request, ResourceErr - return; - } - -+ if (isDownload()) { -+ deleteDownloadFile(); -+ auto* download = m_session->networkProcess().downloadManager().download(m_pendingDownloadID); -+ ASSERT(download); -+ download->didFail(resourceError, IPC::DataReference()); -+ return; -+ } -+ - m_client->didCompleteWithError(resourceError); - } - -@@ -238,6 +279,19 @@ void NetworkDataTaskCurl::invokeDidReceiveResponse() - case PolicyAction::Ignore: - invalidateAndCancel(); - break; -+ case PolicyAction::Download: { -+ FileSystem::deleteFile(m_pendingDownloadLocation); -+ auto& downloadManager = m_session->networkProcess().downloadManager(); -+ auto download = makeUnique(downloadManager, m_pendingDownloadID, *this, *m_session, suggestedFilename()); -+ auto* downloadPtr = download.get(); -+ downloadManager.dataTaskBecameDownloadTask(m_pendingDownloadID, WTFMove(download)); -+ m_downloadDestinationFile = FileSystem::openFile(m_pendingDownloadLocation, FileSystem::FileOpenMode::Write); -+ downloadPtr->didCreateDestination(m_pendingDownloadLocation); -+ -+ if (m_curlRequest) -+ m_curlRequest->completeDidReceiveResponse(); -+ break; -+ } - default: - notImplemented(); - break; -@@ -317,6 +371,8 @@ void NetworkDataTaskCurl::willPerformHTTPRedirection() +@@ -386,6 +390,8 @@ void NetworkDataTaskCurl::willPerformHTTPRedirection() m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password()); m_curlRequest->setAuthenticationScheme(ProtectionSpace::AuthenticationScheme::HTTPBasic); } @@ -9193,18 +9054,10 @@ index 94da185e3854a52da6aae316cec352629fd82e92..39c9a8ed183b291b44e0be916e23e2a8 if (m_state != State::Suspended) { diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h -index e55864a95f7bcbc085c46628bff058573573286c..d82268c1877a29e3e9e848185e4df4e7e2324c99 100644 +index 73d76c7702988ea513039ba22b53dfc5c2e20d53..e0c1355c2fba10d8413d7c4bc75af0cfd4c79fe8 100644 --- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h +++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - - namespace WebCore { -@@ -86,13 +87,13 @@ private: +@@ -87,6 +87,7 @@ private: void appendCookieHeader(WebCore::ResourceRequest&); void handleCookieHeaders(const WebCore::ResourceRequest&, const WebCore::CurlResponse&); @@ -9212,25 +9065,8 @@ index e55864a95f7bcbc085c46628bff058573573286c..d82268c1877a29e3e9e848185e4df4e7 bool isThirdPartyRequest(const WebCore::ResourceRequest&); bool shouldBlockCookies(const WebCore::ResourceRequest&); - void blockCookies(); - void unblockCookies(); -- -- String suggestedFilename() const override; -+ void deleteDownloadFile(); - - State m_state { State::Suspended }; - -@@ -104,6 +105,8 @@ private: - WebCore::FrameIdentifier m_frameID; - WebCore::PageIdentifier m_pageID; - -+ FileSystem::PlatformFileHandle m_downloadDestinationFile { FileSystem::invalidPlatformFileHandle }; -+ - bool m_blockingCookies { false }; - - WebCore::ShouldRelaxThirdPartyCookieBlocking m_shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No }; diff --git a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp -index 262442884dfea88ca418786d3a2ec92022d7a99b..7f4a617d2737ed33b7ae04636e8f9e6e05233e8e 100644 +index e61d6ab76241aa8834d91d3a02fc9472f068c4ee..38531a742ec079f52d238577ec8426e606a60f4c 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp @@ -494,6 +494,8 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr&& inputStream) @@ -9251,40 +9087,6 @@ index 262442884dfea88ca418786d3a2ec92022d7a99b..7f4a617d2737ed33b7ae04636e8f9e6e auto error = static_cast(*m_session).soupNetworkSession().checkTLSErrors(url, certificate, tlsErrors); if (!error) return true; -@@ -1218,6 +1222,12 @@ WebCore::AdditionalNetworkLoadMetricsForWebInspector& NetworkDataTaskSoup::addit - return *m_networkLoadMetrics.additionalNetworkLoadMetricsForWebInspector; - } - -+static void headers_size(const char *name, const char *value, gpointer pointer) -+{ -+ int* size = static_cast(pointer); -+ *size += strlen(name) + strlen(value) + 4; -+} -+ - void NetworkDataTaskSoup::didGetHeaders() - { - // We are a bit more conservative with the persistent credential storage than the session store, -@@ -1263,6 +1273,20 @@ void NetworkDataTaskSoup::didGetHeaders() - additionalMetrics.tlsProtocol = tlsProtocolVersionToString(soup_message_get_tls_protocol_version(m_soupMessage.get())); - additionalMetrics.tlsCipher = String::fromUTF8(soup_message_get_tls_ciphersuite_name(m_soupMessage.get())); - additionalMetrics.responseHeaderBytesReceived = soup_message_metrics_get_response_header_bytes_received(metrics); -+#else -+ { -+ auto* requestHeaders = soup_message_get_request_headers(m_soupMessage.get()); -+ int requestHeadersSize = 0; -+ soup_message_headers_foreach(requestHeaders, headers_size, &requestHeadersSize); -+ additionalMetrics.requestHeaderBytesSent = requestHeadersSize; -+ } -+ -+ { -+ auto* responseHeaders = soup_message_get_response_headers(m_soupMessage.get()); -+ int responseHeadersSize = 0; -+ soup_message_headers_foreach(responseHeaders, headers_size, &responseHeadersSize); -+ additionalMetrics.responseHeaderBytesReceived = responseHeadersSize; -+ } - #endif - } - diff --git a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp index bc06eb37854c1ec72b30568e95dba6ef60c132a4..7b8fd54b740c828be204d4fedba0286fd5be6ace 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp @@ -9347,7 +9149,7 @@ index bc06eb37854c1ec72b30568e95dba6ef60c132a4..7b8fd54b740c828be204d4fedba0286f } return makeUnique(channel, request, soupSession(), soupMessage.get(), protocol); diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index 505c95d1310f142dd311d8151468d02ac71a73ed..0038a0608e9fa380ecafc2c236128bbd02213b57 100644 +index 701de727c8ca19283d4da10529f2d50b370d9757..51f0b17a24b3869966ddebdda32cdc539f6863bd 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake @@ -476,6 +476,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES @@ -9384,7 +9186,7 @@ index 505c95d1310f142dd311d8151468d02ac71a73ed..0038a0608e9fa380ecafc2c236128bbd set(WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2GTK_INSTALLED_HEADERS}) list(REMOVE_ITEM WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h) diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake -index 993c21ea9de13862f3f3657d6b5284a21c3fe06e..db498d0def2648088e2e846704155f6eee06fb0e 100644 +index 93c194b1e3c2462fee6b8c66ecbb9323c4841350..51e0f52c363ecd4b1d64c78834473ceb0e6cab30 100644 --- a/Source/WebKit/PlatformWPE.cmake +++ b/Source/WebKit/PlatformWPE.cmake @@ -185,6 +185,7 @@ set(WPE_API_INSTALLED_HEADERS @@ -9395,7 +9197,7 @@ index 993c21ea9de13862f3f3657d6b5284a21c3fe06e..db498d0def2648088e2e846704155f6e ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPolicyDecision.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitRectangle.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitResponsePolicyDecision.h -@@ -312,6 +313,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES +@@ -313,6 +314,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES "${WEBKIT_DIR}/UIProcess/CoordinatedGraphics" "${WEBKIT_DIR}/UIProcess/Inspector/glib" "${WEBKIT_DIR}/UIProcess/geoclue" @@ -9403,7 +9205,7 @@ index 993c21ea9de13862f3f3657d6b5284a21c3fe06e..db498d0def2648088e2e846704155f6e "${WEBKIT_DIR}/UIProcess/gstreamer" "${WEBKIT_DIR}/UIProcess/linux" "${WEBKIT_DIR}/UIProcess/soup" -@@ -333,8 +335,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -334,8 +336,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GIO_UNIX_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -9618,7 +9420,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 de32ea6b21bc0fa2056e2fe1249e4a5a2dac3395..b6a5e84800a4bbf1c18c352fb16607d8be785832 100644 +index f8ef060699794f04601c5844db52feab1dd1abf0..94068960bf74feff30b11f21e810956b740b4dba 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -122,6 +122,10 @@ @@ -9632,7 +9434,7 @@ index de32ea6b21bc0fa2056e2fe1249e4a5a2dac3395..b6a5e84800a4bbf1c18c352fb16607d8 // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1407,6 +1411,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1382,6 +1386,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -9642,7 +9444,7 @@ index de32ea6b21bc0fa2056e2fe1249e4a5a2dac3395..b6a5e84800a4bbf1c18c352fb16607d8 } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1435,6 +1442,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1410,6 +1417,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -9655,7 +9457,7 @@ index de32ea6b21bc0fa2056e2fe1249e4a5a2dac3395..b6a5e84800a4bbf1c18c352fb16607d8 return true; } -@@ -1448,6 +1461,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1423,6 +1436,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -9667,7 +9469,7 @@ index de32ea6b21bc0fa2056e2fe1249e4a5a2dac3395..b6a5e84800a4bbf1c18c352fb16607d8 #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1471,9 +1489,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1446,9 +1464,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -9685,7 +9487,7 @@ index de32ea6b21bc0fa2056e2fe1249e4a5a2dac3395..b6a5e84800a4bbf1c18c352fb16607d8 if (!decoder.decode(pasteboardName)) return false; -@@ -1489,8 +1514,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1464,8 +1489,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -10179,7 +9981,7 @@ index 90df093a49c09dc670dfea55077c77d889dd1c1b..6ffd51532e29b941b8dc10f545b7f5b8 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index ea0c06633a46726d66fb7412196f3410a8392493..40971e5cb36f55e51e566d19b075a69f77a5cb13 100644 +index 9479c5d1a7bad442018a6215518b2fca7994ee57..dc72d45c44a1d6b7fdc840a4264e574c37461897 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt @@ -403,11 +403,14 @@ Shared/XR/XRDeviceProxy.cpp @@ -10227,7 +10029,7 @@ index ea0c06633a46726d66fb7412196f3410a8392493..40971e5cb36f55e51e566d19b075a69f UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 38ad31f71a3ed62e9305348e507f01db8153e206..a2745cc860f71432b6b755ecd2e7ab8abfe2ddf7 100644 +index 46259b4f3771630e5b93646704db44b91ae2564a..ebc3fef44e7d74d28409df8ceb48ec2960c32afa 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt @@ -278,6 +278,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm @@ -10459,7 +10261,7 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index 2d2ca701c9092613f96c7ab102fe2a2f224d8e65..2358414be2644a4157723a8b0f69ba47d78a19d0 100644 +index e4e510ce2a2e56460a23c45d6dda374a75537c4b..010cc5812d7ccb42120876f184b4a2204ca43f85 100644 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp @@ -1762,6 +1762,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient @@ -10587,7 +10389,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) }); } @@ -10766,7 +10568,7 @@ diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/ index cb7445b7fe814feff50a14b8dd25f5a32f70a17d..d6d2b2d5ed41ffda551e47dd14801c0e036a0890 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(); } @@ -11037,10 +10839,10 @@ 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 a158a10e673c754b30f3678e3bad5653c9e2f8de..5f62cef28ef630ac6f958983de363c76785a7b4b 100644 +index 7f7851e154385e2f5cc6b104fabfd596f0ae4621..a70a012dbd1cbea18fbe61debfbe82bb79586b3f 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -@@ -402,10 +402,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa +@@ -403,10 +403,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa } } @@ -11060,7 +10862,7 @@ index a158a10e673c754b30f3678e3bad5653c9e2f8de..5f62cef28ef630ac6f958983de363c76 GUniquePtr bundleFilename(g_build_filename(injectedBundleDirectory(), INJECTED_BUNDLE_FILENAME, nullptr)); WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object); -@@ -458,6 +467,8 @@ static void webkitWebContextConstructed(GObject* object) +@@ -459,6 +468,8 @@ static void webkitWebContextConstructed(GObject* object) static void webkitWebContextDispose(GObject* object) { @@ -11907,7 +11709,7 @@ index 30860712f58b2a8d48cef5da4e6f03345f2921ba..e715496c24529689784ba4d481d23441 using namespace Inspector; diff --git a/Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.mm b/Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.mm -index 94690e2744bf965e63696e31450cbafec077ffc8..74d14d6d5dba79c9dd7f5ae9340a8564977cb14b 100644 +index 9edf4e2ca81f85f4cf8827932964e5fc352af99e..2eb7b0a327f517b7975cc0cab100a3818d44635e 100644 --- a/Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.mm +++ b/Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.mm @@ -36,6 +36,11 @@ @@ -11992,7 +11794,7 @@ index 1942490889b8be84160087c0f388302fbc6e96fd..eaa42475b1d56aa8980abd972df116b5 { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index 33ab3614044ed70e9d5d67dc652281268d6d82e8..ab140f113fee4273c68bfbbd98090ddd030b17b7 100644 +index d1553d8c91b7ad8647aa156d7f029398f1a2ebe9..993ad73607b20eb1be890a6199cdbe7312a2f256 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -37,6 +37,7 @@ @@ -12071,10 +11873,10 @@ index 33ab3614044ed70e9d5d67dc652281268d6d82e8..ab140f113fee4273c68bfbbd98090ddd #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index 176349eb6708e2b7fbd755b9381695d9025b38b3..ce13d5fe73c3980268136ac3fc83a15764c9438e 100644 +index f18a05f0ec81b350502d17471c8754e44f504491..75dce762f6fdffafdd19692fa5d54b90dac3f929 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -389,7 +389,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -359,7 +359,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -12083,7 +11885,7 @@ index 176349eb6708e2b7fbd755b9381695d9025b38b3..ce13d5fe73c3980268136ac3fc83a157 #endif #if PLATFORM(IOS) -@@ -693,8 +693,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -619,8 +619,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -12095,7 +11897,7 @@ index 176349eb6708e2b7fbd755b9381695d9025b38b3..ce13d5fe73c3980268136ac3fc83a157 m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h -index 708df499e23711727b5ae2f39a064f940e4c206c..2ee3cc0c12f1c995045341cc92fbd7cfb489b040 100644 +index a4d0e7c10ffe1cfd50203c996cec083f167ac03f..95cfb310026746a10d36c50bbbcbc40e1a4db37b 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h @@ -507,6 +507,9 @@ public: @@ -12109,10 +11911,10 @@ index 708df499e23711727b5ae2f39a064f940e4c206c..2ee3cc0c12f1c995045341cc92fbd7cf void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index b2942ee998e57776c93244012d73972baf9e22d7..4c71e905c315575c1f67c1226be393d330cae602 100644 +index f8f4a3ffe656dfbc72ee12425deb72adbd024566..03d6d358d6101eb926174c78cbbe18eededd16c1 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -@@ -2775,6 +2775,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() +@@ -2776,6 +2776,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() if (!m_colorSpace) m_colorSpace = [NSColorSpace sRGBColorSpace]; } @@ -12124,7 +11926,7 @@ index b2942ee998e57776c93244012d73972baf9e22d7..4c71e905c315575c1f67c1226be393d3 ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4776,6 +4781,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4777,6 +4782,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -12144,7 +11946,7 @@ index b2942ee998e57776c93244012d73972baf9e22d7..4c71e905c315575c1f67c1226be393d3 { NSWindow *window = [m_view window]; diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -index 8735b17ae6bd1e690d259021fc1933aa69eb54bb..2a9e51ef46b75dd4863f47c6d8fc1827fb76a7a8 100644 +index 32c82b899b301c957c5632c09e0ae321cf64e961..71cabafb96edd24d63f21f7fcc0a841cf8e72deb 100644 --- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp @@ -32,13 +32,16 @@ @@ -12201,8 +12003,8 @@ index 8735b17ae6bd1e690d259021fc1933aa69eb54bb..2a9e51ef46b75dd4863f47c6d8fc1827 void DrawingAreaProxyCoordinatedGraphics::waitForBackingStoreUpdateOnNextPaint() { m_hasReceivedFirstUpdate = true; -@@ -239,6 +258,45 @@ void DrawingAreaProxyCoordinatedGraphics::updateAcceleratedCompositingMode(uint6 - updateAcceleratedCompositingMode(layerTreeContext); +@@ -244,6 +263,45 @@ void DrawingAreaProxyCoordinatedGraphics::targetRefreshRateDidChange(unsigned ra + send(Messages::DrawingArea::TargetRefreshRateDidChange(rate)); } +#if PLATFORM(WIN) @@ -12248,7 +12050,7 @@ index 8735b17ae6bd1e690d259021fc1933aa69eb54bb..2a9e51ef46b75dd4863f47c6d8fc1827 void DrawingAreaProxyCoordinatedGraphics::incorporateUpdate(const UpdateInfo& updateInfo) { diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h -index b23a45ff7d313317d8ba64fb430ebba3b6adef71..8419b69c5e278cf88a3ab6b98c335eddeea44e53 100644 +index f3dfe6614bad532c49995cf7afc5f6818a469ca6..78971e7296e5395079590fdf491b1ba1781b216f 100644 --- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h +++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h @@ -30,6 +30,7 @@ @@ -12270,17 +12072,17 @@ index b23a45ff7d313317d8ba64fb430ebba3b6adef71..8419b69c5e278cf88a3ab6b98c335edd private: // DrawingAreaProxy -@@ -68,6 +73,9 @@ private: - void enterAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext&) override; +@@ -69,6 +74,9 @@ private: void exitAcceleratedCompositingMode(uint64_t backingStoreStateID, const UpdateInfo&) override; void updateAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext&) override; + void targetRefreshRateDidChange(unsigned) override; +#if PLATFORM(WIN) + void didChangeAcceleratedCompositingMode(bool enabled) override; +#endif #if !PLATFORM(WPE) void incorporateUpdate(const UpdateInfo&); -@@ -131,12 +139,18 @@ private: +@@ -132,12 +140,18 @@ private: // For a new Drawing Area don't draw anything until the WebProcess has sent over the first content. bool m_hasReceivedFirstUpdate { false }; @@ -12392,7 +12194,7 @@ index e87f14a1772973db924624671dd40fe919904a5e..711335158c64e743a17e31c082a402eb } // namespace WebKit diff --git a/Source/WebKit/UIProcess/DrawingAreaProxy.h b/Source/WebKit/UIProcess/DrawingAreaProxy.h -index babc553d170fc71d582e26426e8cf903a9e80d33..3ec1d0258344dc5fef94c73bdd3c7d5cbc7652c9 100644 +index 21dd04d3fb314a0a96ccad8191edde3ada5de326..5a2ac57e9bcedd650996161112441d9598c036ee 100644 --- a/Source/WebKit/UIProcess/DrawingAreaProxy.h +++ b/Source/WebKit/UIProcess/DrawingAreaProxy.h @@ -75,6 +75,7 @@ public: @@ -12403,7 +12205,7 @@ index babc553d170fc71d582e26426e8cf903a9e80d33..3ec1d0258344dc5fef94c73bdd3c7d5c #if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER) // The timeout we use when waiting for a DidUpdateGeometry message. -@@ -161,6 +162,9 @@ private: +@@ -162,6 +163,9 @@ private: virtual void update(uint64_t /* backingStoreStateID */, const UpdateInfo&) { } virtual void didUpdateBackingStoreState(uint64_t /* backingStoreStateID */, const UpdateInfo&, const LayerTreeContext&) { } virtual void exitAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const UpdateInfo&) { } @@ -15736,7 +15538,7 @@ index 7a14cfba15c103a2d4fe263fa49d25af3c396ec2..3ee0e154349661632799057c71f1d1f1 BOOL result = ::CreateProcess(0, commandLine.data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation); diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h -index 4f003c79952940053e686493eddeb778f6917104..ca8098ffcd22a8bf4ab7af84d6fd2816bffceb07 100644 +index 195b11a248fb2f2fcd0ee270a1d478caa37c708d..78fbe6d3c4d2b0944c3ef979a52e14bc3da4f625 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h @@ -321,6 +321,11 @@ public: @@ -15752,10 +15554,10 @@ index 4f003c79952940053e686493eddeb778f6917104..ca8098ffcd22a8bf4ab7af84d6fd2816 virtual RefPtr takeViewSnapshot(std::optional&&) = 0; #endif diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -index ed5dfdda478de4116b0fe95306f195ba8451d4fd..72aa9b39747d04f920d9500fa297a6b6ad89c3fe 100644 +index f85e2a653d0dff83a2970b0a05e75459830a5c21..f64097fc38ef2a3630d7625a4a7ea678ed12fdaf 100644 --- a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp +++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -@@ -632,3 +632,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option +@@ -635,3 +635,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option } } // namespace WebKit @@ -16791,7 +16593,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c77031e53ee5 100644 +index 3deeeaede89b454ee88cb750f237b92ba3946561..c3a181861a11ce9d78e2b26f02ed8805042f0747 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -247,6 +247,9 @@ @@ -16815,7 +16617,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 } void WebPageProxy::addAllMessageReceivers() -@@ -1040,6 +1047,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -1041,6 +1048,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -16823,7 +16625,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 } void WebPageProxy::didAttachToRunningProcess() -@@ -1393,6 +1401,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1394,6 +1402,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -16845,7 +16647,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1944,6 +1967,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1945,6 +1968,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -16877,7 +16679,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2134,6 +2182,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2135,6 +2183,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -16903,7 +16705,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2728,6 +2795,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2729,6 +2796,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -16912,7 +16714,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2738,6 +2807,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2739,6 +2808,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -16921,7 +16723,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2753,18 +2824,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2773,6 +2867,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2774,6 +2868,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -16991,7 +16793,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2785,8 +2897,18 @@ void WebPageProxy::didStartDrag() +@@ -2786,8 +2898,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17011,7 +16813,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2891,16 +3013,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2892,16 +3014,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17056,7 +16858,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3064,7 +3208,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3065,7 +3209,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17064,8 +16866,8 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 +#if ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS_FAMILY) for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); - auto updateTrackingType = [this, location](TrackingType& trackingType, EventTrackingRegions::Event event) { -@@ -3096,7 +3240,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent + auto updateTrackingType = [this, location](TrackingType& trackingType, EventTrackingRegions::EventType eventType) { +@@ -3097,7 +3241,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17074,7 +16876,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3485,6 +3629,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3486,6 +3630,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17083,7 +16885,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 receivedPolicyDecision(policyAction, navigation, navigation->websitePolicies(), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3555,6 +3701,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3556,6 +3702,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, std::variant, Ref>&& navigationActionOrResponse, Ref&& sender, WillContinueLoadInNewProcess willContinueLoadInNewProcess, std::optional sandboxExtensionHandle) { @@ -17091,7 +16893,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4329,6 +4476,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4330,6 +4477,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17103,7 +16905,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4723,6 +4875,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4724,6 +4876,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17111,7 +16913,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4948,6 +5101,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4949,6 +5102,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17120,7 +16922,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 // If the provisional page's load fails then we destroy the provisional page. if (m_provisionalPage && m_provisionalPage->mainFrame() == &frame && willContinueLoading == WillContinueLoading::No) m_provisionalPage = nullptr; -@@ -5427,7 +5582,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5428,7 +5583,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, NavigationActionData&& navigationActionData, FrameInfoData&& originatingFrameInfo, std::optional originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&& request, IPC::FormDataReference&& requestBody, WebCore::ResourceResponse&& redirectResponse, const UserData& userData, uint64_t listenerID) { @@ -17136,7 +16938,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -6014,6 +6176,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -6015,6 +6177,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa if (originatingPage) openerAppInitiatedState = originatingPage->lastNavigationWasAppInitiated(); @@ -17144,7 +16946,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 auto completionHandler = [this, protectedThis = Ref { *this }, mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement, openerAppInitiatedState = WTFMove(openerAppInitiatedState)] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -6060,6 +6223,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -6061,6 +6224,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17152,7 +16954,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 } void WebPageProxy::exitFullscreenImmediately() -@@ -6117,6 +6281,10 @@ void WebPageProxy::closePage() +@@ -6118,6 +6282,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17163,7 +16965,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -6153,6 +6321,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -6154,6 +6322,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f } runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { @@ -17172,7 +16974,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -6174,6 +6344,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -6175,6 +6345,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17181,7 +16983,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptConfirm(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](bool result) mutable { -@@ -6197,6 +6369,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -6198,6 +6370,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17190,7 +16992,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply), defaultValue](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptPrompt(page, message, defaultValue, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](auto& result) mutable { -@@ -6324,6 +6498,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6325,6 +6499,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17199,7 +17001,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7588,6 +7764,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7589,6 +7765,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17208,7 +17010,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 } break; } -@@ -7602,10 +7780,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7603,10 +7781,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -17225,7 +17027,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 break; } -@@ -7614,7 +7795,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7615,7 +7796,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) case WebEvent::RawKeyDown: case WebEvent::Char: { LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s (queue empty %d)", webKeyboardEventTypeString(type), m_keyEventQueue.isEmpty()); @@ -17233,7 +17035,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7633,7 +7813,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7634,7 +7814,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) // The call to doneWithKeyEvent may close this WebPage. // Protect against this being destroyed. Ref protect(*this); @@ -17241,7 +17043,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7642,6 +7821,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7643,6 +7822,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17249,7 +17051,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 } break; } -@@ -7975,7 +8155,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7976,7 +8156,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -17261,7 +17063,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8309,6 +8492,7 @@ static Span gpuMachServices() +@@ -8310,6 +8493,7 @@ static Span gpuMachServices() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17269,7 +17071,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8501,6 +8685,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8502,6 +8686,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.httpsUpgradeEnabled = preferences().upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false; @@ -17278,7 +17080,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 #if PLATFORM(IOS) // FIXME: This is also being passed over the to WebProcess via the PreferencesStore. parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload(); -@@ -8573,6 +8759,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8574,6 +8760,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17293,7 +17095,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8666,6 +8860,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8667,6 +8861,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17310,7 +17112,7 @@ index 750ebf891069b4e80fefe05192535a185ec00e95..5443098eb3c049e091019ba1a456c770 // 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 1e53825f781b1dfa0a863e2ca0ab277a083aaae5..4d8c09acf834b5be1f7dc4b8359ea3836cae8504 100644 +index 3e3bbb22e6de573ce2490d6255c04b825ad46448..978ccc20f6e1ef2c1c503293d7fdfaf4dda6b7ae 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17472,7 +17274,7 @@ index 1e53825f781b1dfa0a863e2ca0ab277a083aaae5..4d8c09acf834b5be1f7dc4b8359ea383 #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 45564db93db89311eeb83f8b54f33065f922b95b..134e34e67a94b861613282b0c44d18b61ebba519 100644 +index d9ca6d6dbcf65948c6d8ad56ae10f0678d043ce2..c35b74dbdbe4e64e1c54dfcfe817e8a08528961d 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17507,10 +17309,10 @@ index 45564db93db89311eeb83f8b54f33065f922b95b..134e34e67a94b861613282b0c44d18b6 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 45e356f165b0787c51d164adeaf0c83e961fa7ba..bca1df657efd8fa89b8d3ae34016fd6255000426 100644 +index 41d83535f3c22dd28b675a0a8627f48faf010e71..e0986f8f7146ff023c14167d351e8ab5922f44d7 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp -@@ -554,6 +554,14 @@ void WebProcessPool::establishRemoteWorkerContextConnectionToNetworkProcess(Remo +@@ -535,6 +535,14 @@ void WebProcessPool::establishRemoteWorkerContextConnectionToNetworkProcess(Remo RefPtr requestingProcess = requestingProcessIdentifier ? WebProcessProxy::processForIdentifier(*requestingProcessIdentifier) : nullptr; WebProcessPool* processPool = requestingProcess ? &requestingProcess->processPool() : processPools()[0]; @@ -17526,7 +17328,7 @@ index 45e356f165b0787c51d164adeaf0c83e961fa7ba..bca1df657efd8fa89b8d3ae34016fd62 WebProcessProxy* remoteWorkerProcessProxy { nullptr }; diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp -index d756a3d693f6a43f743e209ed6d0e75c3351dbc1..d2903eb8ea9497eb3fc09ff3b26e024a9bf99d48 100644 +index 9fe8eb6b044af9eb049d6d4e53cd8bbac84f4572..ecb7771c1036fa31ffc7ea506afcec4c1d3e4ebc 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp @@ -147,6 +147,11 @@ HashMap& WebProcessProxy::allProcesses() @@ -17542,7 +17344,7 @@ index d756a3d693f6a43f743e209ed6d0e75c3351dbc1..d2903eb8ea9497eb3fc09ff3b26e024a { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index 4c22dab180e0807540f602f4e7e1807ba2816d9a..237580240a43fed0ab97ccbe3e84a9a9dd589d19 100644 +index 2aa8191e96ca3c1a5d8a3fba591aa489e9a49e31..a1c55d31db11eee237c5a558bcaf9b54735c69ca 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h @@ -146,6 +146,7 @@ public: @@ -17554,10 +17356,10 @@ index 4c22dab180e0807540f602f4e7e1807ba2816d9a..237580240a43fed0ab97ccbe3e84a9a9 WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 16364339abf99533ba2ffc784ef26286e0acac2a..bb1c38cd4d1c1490ea752577037e3004976492e8 100644 +index 154a03874cb9830e7c28a09c967f5597bb99352b..66064b55bbda6f37480e6ac0ed3e62e41d5d16d4 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2039,6 +2039,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, +@@ -2032,6 +2032,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, networkProcess().websiteDataOriginDirectoryForTesting(m_sessionID, WTFMove(origin), WTFMove(topOrigin), type, WTFMove(completionHandler)); } @@ -17571,7 +17373,7 @@ index 16364339abf99533ba2ffc784ef26286e0acac2a..bb1c38cd4d1c1490ea752577037e3004 void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index d9d62230f905b49adceacebf59eba1aadabb7d8d..fe57cf72938ddca93088144a6e6acb06cc167ce8 100644 +index 25168b66cf572db53d9ef07f164df342556dcb0a..ab572b41015b971272341be81820766c4dd617e2 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h @@ -89,6 +89,7 @@ class SecKeyProxyStore; @@ -17605,7 +17407,7 @@ index d9d62230f905b49adceacebf59eba1aadabb7d8d..fe57cf72938ddca93088144a6e6acb06 class WebsiteDataStore : public API::ObjectImpl, public Identified, public CanMakeWeakPtr { public: static Ref defaultDataStore(); -@@ -294,11 +304,13 @@ public: +@@ -295,11 +305,13 @@ public: const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; } #endif @@ -17620,7 +17422,7 @@ index d9d62230f905b49adceacebf59eba1aadabb7d8d..fe57cf72938ddca93088144a6e6acb06 void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&); const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; } void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType); -@@ -362,6 +374,12 @@ public: +@@ -363,6 +375,12 @@ public: static constexpr uint64_t defaultPerOriginQuota() { return 1000 * MB; } static bool defaultShouldUseCustomStoragePaths(); @@ -17633,7 +17435,7 @@ index d9d62230f905b49adceacebf59eba1aadabb7d8d..fe57cf72938ddca93088144a6e6acb06 void resetQuota(CompletionHandler&&); void clearStorage(CompletionHandler&&); -@@ -456,9 +474,11 @@ private: +@@ -457,9 +475,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -17646,7 +17448,7 @@ index d9d62230f905b49adceacebf59eba1aadabb7d8d..fe57cf72938ddca93088144a6e6acb06 WebCore::SoupNetworkProxySettings m_networkProxySettings; String m_cookiePersistentStoragePath; SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite }; -@@ -486,6 +506,10 @@ private: +@@ -487,6 +507,10 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -18282,7 +18084,7 @@ index 0000000000000000000000000000000000000000..d0f9827544994e450e24e3f7a427c35e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -index 386234d354fa37946c3e3a111bf86e94061c25ae..e6e2e2ae4e63059fa0c225c7d21631a64dce7853 100644 +index f31db8d38d19e975216c941d13802bc2b3fb592d..abc38b6ae330112e486c753dce217ab3cf3752fc 100644 --- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm +++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm @@ -439,6 +439,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) @@ -18483,7 +18285,7 @@ index 0000000000000000000000000000000000000000..721826c8c98fc85b68a4f45deaee69c1 + +#endif diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h -index dce154145f4e3eb74b79d20e2ab225938232b2c0..12a7c519419be4c4602756933e4c7640933bb378 100644 +index d5953b04a4c8277264664c36e106fa26a704b44a..42623b410edd37d926d630d09af1b02c90d17964 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.h +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.h @@ -53,6 +53,8 @@ class PageClientImpl final : public PageClientImplCocoa @@ -18517,7 +18319,7 @@ index dce154145f4e3eb74b79d20e2ab225938232b2c0..12a7c519419be4c4602756933e4c7640 void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&) override; void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override; diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm -index f4e3130d9d276985dae32227f03214c87dde97ce..4bb057480cd9a7ee00dd4caff4c028bfbd092798 100644 +index 656a0e89b254d505e4a03f39edb3b8a6b3939832..293aea77bf9c24193a188f943f8c7c7c55207c08 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm @@ -81,6 +81,7 @@ @@ -19607,10 +19409,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238cc11e880c 100644 +index 55039213dbb3268e7074aa4bfaedc5617df8a756..be3c2225ce686e6911f782c51a6a974c08fd41a6 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1272,6 +1272,7 @@ +@@ -1251,6 +1251,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 */; }; @@ -19618,7 +19420,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 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 */; }; -@@ -2248,6 +2249,18 @@ +@@ -2228,6 +2229,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 */; }; @@ -19637,7 +19439,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 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 */; }; -@@ -2309,6 +2322,8 @@ +@@ -2289,6 +2302,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 */; }; @@ -19646,7 +19448,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 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 */; }; -@@ -2325,6 +2340,9 @@ +@@ -2305,6 +2320,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, ); }; }; @@ -19656,7 +19458,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 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 */; }; -@@ -5351,6 +5369,7 @@ +@@ -5303,6 +5321,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; }; @@ -19664,7 +19466,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 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 = ""; }; -@@ -7056,6 +7075,19 @@ +@@ -7010,6 +7029,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 = ""; }; @@ -19684,7 +19486,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 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 = ""; }; -@@ -7184,6 +7216,8 @@ +@@ -7138,6 +7170,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; }; @@ -19693,7 +19495,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 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; }; -@@ -7205,6 +7239,14 @@ +@@ -7159,6 +7193,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 = ""; }; @@ -19708,7 +19510,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 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 = ""; }; -@@ -7350,6 +7392,7 @@ +@@ -7295,6 +7337,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -19716,7 +19518,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -9461,6 +9504,7 @@ +@@ -9401,6 +9444,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -19724,7 +19526,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -10654,6 +10698,7 @@ +@@ -10525,6 +10569,7 @@ E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */, DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */, 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -19732,7 +19534,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, 51F7BB7E274564A100C45A72 /* Security.framework */, -@@ -11186,6 +11231,12 @@ +@@ -11051,6 +11096,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19745,7 +19547,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c ); path = Agents; sourceTree = ""; -@@ -11194,6 +11245,7 @@ +@@ -11059,6 +11110,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19753,7 +19555,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -11737,6 +11789,12 @@ +@@ -11601,6 +11653,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -19766,7 +19568,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -12048,6 +12106,7 @@ +@@ -11912,6 +11970,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -19774,7 +19576,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -12638,6 +12697,11 @@ +@@ -12502,6 +12561,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -19786,7 +19588,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, 07EF07592745A8160066EA04 /* DisplayCaptureSessionManager.h */, -@@ -13857,6 +13921,7 @@ +@@ -13721,6 +13785,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19794,7 +19596,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -14324,6 +14389,7 @@ +@@ -14188,6 +14253,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -19802,7 +19604,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -14338,6 +14404,7 @@ +@@ -14202,6 +14268,7 @@ 2DA944A41884E4F000ED86DB /* GestureTypes.h in Headers */, 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -19810,7 +19612,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -14496,6 +14563,7 @@ +@@ -14360,6 +14427,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -19818,15 +19620,15 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -14562,6 +14630,7 @@ - BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, +@@ -14425,6 +14493,7 @@ + 93E05E40282CD560000B69EB /* ProcessStateMonitor.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, + D71A944C237239FB002C4D9E /* BrowserInspectorPipe.h in Headers */, 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, 517B5F81275E97B6002DC22D /* PushAppBundle.h in Headers */, -@@ -14593,6 +14662,7 @@ +@@ -14456,6 +14525,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -19834,7 +19636,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -15016,6 +15086,7 @@ +@@ -14871,6 +14941,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -19842,7 +19644,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -15197,6 +15268,7 @@ +@@ -15052,6 +15123,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -19850,7 +19652,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -15251,6 +15323,7 @@ +@@ -15106,6 +15178,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -19858,7 +19660,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -15409,6 +15482,7 @@ +@@ -15264,6 +15337,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -19866,7 +19668,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -17025,6 +17099,8 @@ +@@ -16814,6 +16888,8 @@ 51E9049727BCB3D900929E7E /* ICAppBundle.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -19875,7 +19677,7 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, 2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */, -@@ -17364,6 +17440,8 @@ +@@ -17149,6 +17225,8 @@ E3816B3D27E2463A005EAFC0 /* WebMockContentFilterManager.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -19885,10 +19687,10 @@ index 5bdbd683bcc3fdd0d291659f00206cdb3c93308c..428072c59adf33939237143a75d7238c 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 06b627baabe46af8e97db89798a3fa9b4453e90c..f470c6b697b0d9b5a435771c12e471cc2f302945 100644 +index 3803681aa73b7b97072341be579d520b93c6c3ac..69b5e9f5da2d950c02cf79895514bdda44db48e6 100644 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp -@@ -231,6 +231,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou +@@ -232,6 +232,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou } #endif @@ -19900,7 +19702,7 @@ index 06b627baabe46af8e97db89798a3fa9b4453e90c..f470c6b697b0d9b5a435771c12e471cc #if ENABLE(PDFJS) if (tryLoadingUsingPDFJSHandler(resourceLoader, trackingParameters)) return; -@@ -313,7 +318,8 @@ static void addParametersShared(const Frame* frame, NetworkResourceLoadParameter +@@ -314,7 +319,8 @@ static void addParametersShared(const Frame* frame, NetworkResourceLoadParameter } } @@ -19910,7 +19712,7 @@ index 06b627baabe46af8e97db89798a3fa9b4453e90c..f470c6b697b0d9b5a435771c12e471cc { auto identifier = resourceLoader.identifier(); ASSERT(identifier); -@@ -329,7 +335,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -330,7 +336,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL RunLoop::main().dispatch([resourceLoader = Ref { resourceLoader }, error = blockedError(request)] { resourceLoader->didFail(error); }); @@ -19919,7 +19721,7 @@ index 06b627baabe46af8e97db89798a3fa9b4453e90c..f470c6b697b0d9b5a435771c12e471cc } } -@@ -339,7 +345,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -340,7 +346,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be scheduled with the NetworkProcess with priority %d, storedCredentialsPolicy %i", resourceLoader.url().string().latin1().data(), static_cast(resourceLoader.request().priority()), (int)storedCredentialsPolicy); @@ -19927,7 +19729,7 @@ index 06b627baabe46af8e97db89798a3fa9b4453e90c..f470c6b697b0d9b5a435771c12e471cc loadParameters.identifier = identifier; loadParameters.webPageProxyID = trackingParameters.webPageProxyID; loadParameters.webPageID = trackingParameters.pageID; -@@ -424,14 +429,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -425,14 +430,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL if (loadParameters.options.mode != FetchOptions::Mode::Navigate) { ASSERT(loadParameters.sourceOrigin); @@ -19945,7 +19747,7 @@ index 06b627baabe46af8e97db89798a3fa9b4453e90c..f470c6b697b0d9b5a435771c12e471cc loadParameters.isMainFrameNavigation = resourceLoader.frame() && resourceLoader.frame()->isMainFrame() && resourceLoader.options().mode == FetchOptions::Mode::Navigate; if (loadParameters.isMainFrameNavigation && document) -@@ -463,6 +465,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -464,6 +466,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials); @@ -19963,7 +19765,7 @@ index 06b627baabe46af8e97db89798a3fa9b4453e90c..f470c6b697b0d9b5a435771c12e471cc std::optional existingNetworkResourceLoadIdentifierToResume; if (loadParameters.isMainFrameNavigation) -@@ -477,7 +490,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -478,7 +491,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } auto loader = WebResourceLoader::create(resourceLoader, trackingParameters); @@ -19972,7 +19774,7 @@ index 06b627baabe46af8e97db89798a3fa9b4453e90c..f470c6b697b0d9b5a435771c12e471cc } void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader) -@@ -884,7 +897,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier +@@ -888,7 +901,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier bool WebLoaderStrategy::isOnLine() const { @@ -19981,7 +19783,7 @@ index 06b627baabe46af8e97db89798a3fa9b4453e90c..f470c6b697b0d9b5a435771c12e471cc } void WebLoaderStrategy::addOnlineStateChangeListener(Function&& listener) -@@ -904,6 +917,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet +@@ -908,6 +921,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet void WebLoaderStrategy::setOnLineState(bool isOnLine) { @@ -19993,7 +19795,7 @@ index 06b627baabe46af8e97db89798a3fa9b4453e90c..f470c6b697b0d9b5a435771c12e471cc if (m_isOnLine == isOnLine) return; -@@ -912,6 +930,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) +@@ -916,6 +934,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) listener(isOnLine); } @@ -20073,10 +19875,10 @@ 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 87e608eeb4467c0019f3d37fee1f83cb30902454..ac33c55f84ecaf67ac9a1f685d07705367333616 100644 +index 227a0cf82d4a12fc70bea861d490e3eb7bdc9277..88f5973dc20b4da6119568ad977eba11241aa02c 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -@@ -420,6 +420,8 @@ void WebChromeClient::setResizable(bool resizable) +@@ -415,6 +415,8 @@ void WebChromeClient::setResizable(bool resizable) void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) { @@ -20085,7 +19887,7 @@ index 87e608eeb4467c0019f3d37fee1f83cb30902454..ac33c55f84ecaf67ac9a1f685d077053 // Notify the bundle client. m_page.injectedBundleUIClient().willAddMessageToConsole(&m_page, source, level, message, lineNumber, columnNumber, sourceID); } -@@ -850,6 +852,13 @@ std::unique_ptr WebChromeClient::createDateTimeChooser(DateTime +@@ -843,6 +845,13 @@ std::unique_ptr WebChromeClient::createDateTimeChooser(DateTime #endif @@ -20127,10 +19929,10 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index 292c598b6ae8c7673324a2b6abe6210d78f70eca..3fedf4a67113a114ca668c8c6e1d8b602615fbf9 100644 +index 1592d5cdb478aa77c5f4991dc79b11301851c5c0..e91a8e3ef026b34ca57fb2a0a529f51e9b8bfc21 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -@@ -1598,13 +1598,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() +@@ -1612,13 +1612,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() if (webPage->scrollPinningBehavior() != DoNotPin) view->setScrollPinningBehavior(webPage->scrollPinningBehavior()); @@ -20286,7 +20088,7 @@ index 0000000000000000000000000000000000000000..6d1dab390782a6c88d387bc94a36ecf0 + +#endif // ENABLE(DRAG_SUPPORT) diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp -index 8d71c0a95ca8bf1682d9162449fa3f1af5196445..b93439e73e7f0abbdcffb23d234a1c01492945f8 100644 +index 6bc7442b28ed5ee475d603975bee65cf32df39f4..21fb325d26bfe3819c62e9ad181c6c02c0490fb4 100644 --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp @@ -38,6 +38,7 @@ @@ -20322,7 +20124,7 @@ index 8d71c0a95ca8bf1682d9162449fa3f1af5196445..b93439e73e7f0abbdcffb23d234a1c01 settings.setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey())); // Fixed position elements need to be composited and create stacking contexts // in order to be scrolled by the ScrollingCoordinator. -@@ -661,6 +673,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay +@@ -670,6 +682,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay m_scrollOffset = IntSize(); m_displayTimer.stop(); m_isWaitingForDidUpdate = false; @@ -20334,7 +20136,7 @@ index 8d71c0a95ca8bf1682d9162449fa3f1af5196445..b93439e73e7f0abbdcffb23d234a1c01 } void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() -@@ -710,6 +727,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() +@@ -719,6 +736,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() // UI process, we still need to let it know about the new contents, so send an Update message. send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo)); } @@ -20347,7 +20149,7 @@ index 8d71c0a95ca8bf1682d9162449fa3f1af5196445..b93439e73e7f0abbdcffb23d234a1c01 void DrawingAreaCoordinatedGraphics::scheduleDisplay() diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp -index f3304d10f728128652c33426558e4dc4f6b659b5..79dbf60f6db0d45f84f5a4576be6f68aa7797e72 100644 +index 60d596ec08c0b3550a328ae715e180ae3669676b..be272bed2f5cf15d3b5b195ab5e7a90a9b33db34 100644 --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp @@ -183,8 +183,16 @@ void LayerTreeHost::setViewOverlayRootLayer(GraphicsLayer* viewOverlayRootLayer) @@ -20367,7 +20169,7 @@ index f3304d10f728128652c33426558e4dc4f6b659b5..79dbf60f6db0d45f84f5a4576be6f68a m_viewportController.didScroll(rect.location()); if (m_isDiscardable) -@@ -313,6 +321,10 @@ void LayerTreeHost::didChangeViewport() +@@ -318,6 +326,10 @@ void LayerTreeHost::didChangeViewport() if (!view->useFixedLayout()) view->notifyScrollPositionChanged(m_lastScrollPosition); @@ -20379,10 +20181,10 @@ index f3304d10f728128652c33426558e4dc4f6b659b5..79dbf60f6db0d45f84f5a4576be6f68a if (m_lastPageScaleFactor != pageScale) { diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h -index 4f727e418b082eebe86711294bb0f26f9c74d7d1..3e713db9bbd2a2bc78bdc464cfa02ca40d8a708f 100644 +index 293c2e5de26e3612217e7f44ea43dfd589cc657e..659558a1e666cd099800c5291d06acbe5ac101e3 100644 --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h -@@ -104,6 +104,13 @@ public: +@@ -105,6 +105,13 @@ public: void adjustTransientZoom(double, WebCore::FloatPoint); void commitTransientZoom(double, WebCore::FloatPoint); #endif @@ -20423,7 +20225,7 @@ index db2e5d686e6ffff8f5299903c4d42fb3a64607ac..8a4d23bdebe6a7b2f7dea87517de8f0c { if (m_hasRemovedMessageReceiver) diff --git a/Source/WebKit/WebProcess/WebPage/DrawingArea.h b/Source/WebKit/WebProcess/WebPage/DrawingArea.h -index bbd405ae641a84d1979be1f6a8a3ccc5151ca390..0c40a983404eded7b70cf83350fe2e7d743b79ec 100644 +index 3f6b9304dd08fbcc1fba7086163c753f0ad50785..165f22b4c3043cff7c9fbfb70fdc56f141b6bd6c 100644 --- a/Source/WebKit/WebProcess/WebPage/DrawingArea.h +++ b/Source/WebKit/WebProcess/WebPage/DrawingArea.h @@ -148,6 +148,9 @@ public: @@ -20437,18 +20239,18 @@ index bbd405ae641a84d1979be1f6a8a3ccc5151ca390..0c40a983404eded7b70cf83350fe2e7d virtual void adoptLayersFromDrawingArea(DrawingArea&) { } virtual void adoptDisplayRefreshMonitorsFromDrawingArea(DrawingArea&) { } diff --git a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp -index 9aab0800140df2620b360e0bb8c8c904d86977ef..8c89d89035ef097eefa3d177f7b7911889e1646a 100644 +index 1c0857116c24ebfc0fd30360431f97c52e39ab0f..5e608356e81976de094729d6b4b4674acb633675 100644 --- a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp -@@ -37,6 +37,7 @@ - #include +@@ -38,6 +38,7 @@ + #include #include #include +#include #include #include -@@ -255,4 +256,10 @@ void WebCookieJar::deleteCookie(const WebCore::Document& document, const URL& ur +@@ -256,4 +257,10 @@ void WebCookieJar::deleteCookie(const WebCore::Document& document, const URL& ur WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::DeleteCookie(url, cookieName), 0); } @@ -20473,10 +20275,10 @@ index bc78502b18b994a3ffa47b933273ebdb84fafde9..f4c95fcbc0a1d618cc51f748a0df82b7 WebCookieJar(); diff --git a/Source/WebKit/WebProcess/WebPage/WebDocumentLoader.cpp b/Source/WebKit/WebProcess/WebPage/WebDocumentLoader.cpp -index b2d54a627b94583bda3518c4e7c3364481b605a4..d407e32b6a7b8b27925c49391e86d42c9b3dfa8b 100644 +index 16f522fe281f8174b254b0a18626ace238229fd8..86e9489334107fbeb10df041f04eadc4bfb05657 100644 --- a/Source/WebKit/WebProcess/WebPage/WebDocumentLoader.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebDocumentLoader.cpp -@@ -47,6 +47,14 @@ void WebDocumentLoader::detachFromFrame() +@@ -49,6 +49,14 @@ void WebDocumentLoader::detachFromFrame() DocumentLoader::detachFromFrame(); } @@ -20507,10 +20309,10 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index e6077f856628ad606562028aa0e052e4443cd542..4e4f2f3bcbf69ed5208b5f875160fa6169d7c3b0 100644 +index 03ba5d5c9cd397e235ff653b62644f61cfb56241..337d6659acafe3b77a5524f318d09c3de2fa0e4f 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -935,6 +935,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -934,6 +934,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) CFPreferencesGetAppIntegerValue(CFSTR("key"), CFSTR("com.apple.WebKit.WebContent.BlockIOKitInWebContentSandbox"), nullptr); #endif @@ -20520,7 +20322,7 @@ index e6077f856628ad606562028aa0e052e4443cd542..4e4f2f3bcbf69ed5208b5f875160fa61 updateThrottleState(); } -@@ -1700,6 +1703,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1708,6 +1711,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -20543,7 +20345,7 @@ index e6077f856628ad606562028aa0e052e4443cd542..4e4f2f3bcbf69ed5208b5f875160fa61 void WebPage::loadRequest(LoadParameters&& loadParameters) { WEBPAGE_RELEASE_LOG(Loading, "loadRequest: navigationID=%" PRIu64 ", shouldTreatAsContinuingLoad=%u, lastNavigationWasAppInitiated=%d, existingNetworkResourceLoadIdentifierToResume=%" PRIu64, loadParameters.navigationID, static_cast(loadParameters.shouldTreatAsContinuingLoad), loadParameters.request.isAppInitiated(), valueOrDefault(loadParameters.existingNetworkResourceLoadIdentifierToResume).toUInt64()); -@@ -1972,17 +1991,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1980,17 +1999,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20562,7 +20364,7 @@ index e6077f856628ad606562028aa0e052e4443cd542..4e4f2f3bcbf69ed5208b5f875160fa61 // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1999,20 +2014,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -2007,20 +2022,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20590,7 +20392,7 @@ index e6077f856628ad606562028aa0e052e4443cd542..4e4f2f3bcbf69ed5208b5f875160fa61 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -2020,7 +2033,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -2028,7 +2041,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20598,7 +20400,7 @@ index e6077f856628ad606562028aa0e052e4443cd542..4e4f2f3bcbf69ed5208b5f875160fa61 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2312,6 +2324,7 @@ void WebPage::scaleView(double scale) +@@ -2313,6 +2325,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20606,7 +20408,7 @@ index e6077f856628ad606562028aa0e052e4443cd542..4e4f2f3bcbf69ed5208b5f875160fa61 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2491,17 +2504,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2492,17 +2505,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20625,7 +20427,7 @@ index e6077f856628ad606562028aa0e052e4443cd542..4e4f2f3bcbf69ed5208b5f875160fa61 } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3411,6 +3420,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3416,6 +3425,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -20730,7 +20532,7 @@ index e6077f856628ad606562028aa0e052e4443cd542..4e4f2f3bcbf69ed5208b5f875160fa61 #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3487,6 +3594,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3492,6 +3599,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -20742,7 +20544,7 @@ index e6077f856628ad606562028aa0e052e4443cd542..4e4f2f3bcbf69ed5208b5f875160fa61 void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3731,6 +3843,7 @@ void WebPage::didCompletePageTransition() +@@ -3732,6 +3844,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -20750,7 +20552,7 @@ index e6077f856628ad606562028aa0e052e4443cd542..4e4f2f3bcbf69ed5208b5f875160fa61 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4580,7 +4693,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4584,7 +4697,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -20759,7 +20561,7 @@ index e6077f856628ad606562028aa0e052e4443cd542..4e4f2f3bcbf69ed5208b5f875160fa61 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6997,6 +7110,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6999,6 +7112,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20770,10 +20572,10 @@ index e6077f856628ad606562028aa0e052e4443cd542..4e4f2f3bcbf69ed5208b5f875160fa61 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 749b948d7afa04f1172a6c7b1dd2ba32057d60f3..7be08203deeeb55a2d63257cc85db88715bda487 100644 +index ee2a47b0d78053faf0426e8f0f171181eca78227..a3077d5cf7d7f847d120fb707dc955418356f5f8 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h -@@ -118,6 +118,10 @@ +@@ -117,6 +117,10 @@ #include "WebPrintOperationGtk.h" #endif @@ -20816,7 +20618,7 @@ index 749b948d7afa04f1172a6c7b1dd2ba32057d60f3..7be08203deeeb55a2d63257cc85db887 void insertNewlineInQuotedContent(); -@@ -1650,6 +1658,7 @@ private: +@@ -1653,6 +1661,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -20824,7 +20626,7 @@ index 749b948d7afa04f1172a6c7b1dd2ba32057d60f3..7be08203deeeb55a2d63257cc85db887 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1687,6 +1696,7 @@ private: +@@ -1690,6 +1699,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -20832,7 +20634,7 @@ index 749b948d7afa04f1172a6c7b1dd2ba32057d60f3..7be08203deeeb55a2d63257cc85db887 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1830,9 +1840,7 @@ private: +@@ -1833,9 +1843,7 @@ private: void requestRectForFoundTextRange(const WebFoundTextRange&, CompletionHandler&&); @@ -20842,7 +20644,7 @@ index 749b948d7afa04f1172a6c7b1dd2ba32057d60f3..7be08203deeeb55a2d63257cc85db887 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2372,6 +2380,7 @@ private: +@@ -2378,6 +2386,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -20851,7 +20653,7 @@ index 749b948d7afa04f1172a6c7b1dd2ba32057d60f3..7be08203deeeb55a2d63257cc85db887 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 44e71fe79ab0e053ea20fc54f035d7cd0267903b..9ab67330edc471294108f348710aaef426d3ad12 100644 +index e8fd0c51f2643c4627cb16cbb7d54a1535095378..da18a34c41cbc2ed0d1587d321d19d68aa696729 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 @@ -20903,7 +20705,7 @@ index 44e71fe79ab0e053ea20fc54f035d7cd0267903b..9ab67330edc471294108f348710aaef4 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 e39dc6837bf1218dcc474eaf4e8f0741e7116348..6c29a6dc9210efb1f3a98a4c35aeee7d71d3285b 100644 +index 3dcbe78f4693a89c426cbf6f469f790208d55410..14cb073b4464dcef3a8271da603cd27fdfad5c10 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 @@ -20995,7 +20797,7 @@ index c77ff78cd3cd9627d1ae7b930c81457094645200..88746359159a76b169b7e6dcbee4fb34 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index 1ca82b161983f2889c4de7f216fd50ae49795d23..2f1755d8d6d7e1c07a9419bf8746d5c01d8a72ce 100644 +index 2f12cefa501042fd7b7a43261a62390d9b2e39b2..141e72e5f2168a29d7fde4ee89e6cc3f1156a69b 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -92,6 +92,7 @@ @@ -21006,7 +20808,7 @@ index 1ca82b161983f2889c4de7f216fd50ae49795d23..2f1755d8d6d7e1c07a9419bf8746d5c0 #include #include #include -@@ -374,6 +375,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter +@@ -368,6 +369,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter platformInitializeProcess(parameters); updateCPULimit(); @@ -21034,7 +20836,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; } @@ -21044,10 +20846,10 @@ index 9f9c67523b8fac9025d2cec101adf452631ffc61..737d8dab4f7aa1fe446b2dcfdc32fe83 - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index 42f0a9da1fc329d13893d86905f5e6435df35ae2..04b066da6388038d5dcff5c509357b074a0c961b 100644 +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) @@ -21056,7 +20858,7 @@ index 42f0a9da1fc329d13893d86905f5e6435df35ae2..04b066da6388038d5dcff5c509357b07 - (NSArray *)_touchEventRegions { -@@ -4085,7 +4085,7 @@ - (NSArray *)_touchEventRegions +@@ -4085,7 +4085,7 @@ IGNORE_WARNINGS_END }).autorelease(); } @@ -21097,18 +20899,19 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index cf080488b8d0067ade93f5392f18555c7e3d2e18..0155e4d182d3707fc10630d07858f4093cf58924 100644 +index 8dc57e7d0395edee5667eceada38bd3b56668151..e944f55214844cf35e6a80a600a9773cf5d49ef6 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake -@@ -5,6 +5,7 @@ WEBKIT_OPTION_BEGIN() - - SET_PROJECT_VERSION(2 37 0) +@@ -11,6 +11,8 @@ if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ni + message(FATAL_ERROR "Building with Makefiles requires CMake 3.20 or newer. Either enable Ninja by passing -GNinja, or upgrade CMake.") + endif () +set(ENABLE_WEBKIT_LEGACY OFF) - ++ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") -@@ -27,6 +28,10 @@ find_package(EGL) + find_package(Cairo 1.14.0 REQUIRED) +@@ -32,6 +34,10 @@ find_package(EGL) find_package(OpenGL) find_package(OpenGLES2) @@ -21119,7 +20922,7 @@ index cf080488b8d0067ade93f5392f18555c7e3d2e18..0155e4d182d3707fc10630d07858f409 include(GStreamerDefinitions) SET_AND_EXPOSE_TO_BUILD(USE_CAIRO TRUE) -@@ -60,16 +65,16 @@ WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Qua +@@ -65,16 +71,16 @@ WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Qua WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ON) WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PUBLIC OFF) @@ -21139,16 +20942,16 @@ index cf080488b8d0067ade93f5392f18555c7e3d2e18..0155e4d182d3707fc10630d07858f409 WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_WPE_RENDERER "Whether to enable WPE rendering" PUBLIC ON) -@@ -121,7 +126,7 @@ endif () +@@ -124,7 +130,7 @@ endif () # without approval from a GTK reviewer. There must be strong reason to support # changing the value of the option. WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFJS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON) -@@ -154,10 +159,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON) +@@ -158,10 +164,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYER_BASED_SVG_ENGINE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21161,7 +20964,7 @@ index cf080488b8d0067ade93f5392f18555c7e3d2e18..0155e4d182d3707fc10630d07858f409 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) -@@ -165,7 +170,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION P +@@ -169,7 +175,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION P WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21170,7 +20973,7 @@ index cf080488b8d0067ade93f5392f18555c7e3d2e18..0155e4d182d3707fc10630d07858f409 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON) -@@ -173,6 +178,15 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) +@@ -177,6 +183,15 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21186,7 +20989,7 @@ index cf080488b8d0067ade93f5392f18555c7e3d2e18..0155e4d182d3707fc10630d07858f409 include(GStreamerDependencies) # Finalize the value for all options. Do not attempt to use an option before -@@ -273,7 +287,8 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") +@@ -277,7 +292,8 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") set(BUILD_REVISION "tarball") endif () @@ -21197,18 +21000,19 @@ index cf080488b8d0067ade93f5392f18555c7e3d2e18..0155e4d182d3707fc10630d07858f409 SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1) diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index f51b75f1f4d7df78dd7aec630728f78668a9e7a3..152977fb9d47e937456f00c357f0bf26f34f2b1f 100644 +index 9cae317e38d9725896a5c42c4fbbcf09954248a3..257012c2d99cd1b43999ce40b996eb35fc6833ef 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake -@@ -3,6 +3,7 @@ include(VersioningUtils) - - SET_PROJECT_VERSION(2 35 1) +@@ -9,6 +9,8 @@ if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ni + message(FATAL_ERROR "Building with Makefiles requires CMake 3.20 or newer. Either enable Ninja by passing -GNinja, or upgrade CMake.") + endif () +set(ENABLE_WEBKIT_LEGACY OFF) ++ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") find_package(Cairo 1.14.0 REQUIRED) -@@ -55,10 +56,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GPU_PROCESS PRIVATE OFF) +@@ -61,10 +63,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GPU_PROCESS PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYER_BASED_SVG_ENGINE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21221,7 +21025,7 @@ index f51b75f1f4d7df78dd7aec630728f78668a9e7a3..152977fb9d47e937456f00c357f0bf26 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON) -@@ -68,24 +69,42 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${EN +@@ -74,24 +76,42 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${EN WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) @@ -21269,7 +21073,7 @@ index f51b75f1f4d7df78dd7aec630728f78668a9e7a3..152977fb9d47e937456f00c357f0bf26 WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON) # Private options specific to the WPE port. -@@ -291,7 +310,7 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") +@@ -297,7 +317,7 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") endif () SET_AND_EXPOSE_TO_BUILD(HAVE_ACCESSIBILITY ${ENABLE_ACCESSIBILITY}) @@ -21279,7 +21083,7 @@ index f51b75f1f4d7df78dd7aec630728f78668a9e7a3..152977fb9d47e937456f00c357f0bf26 SET_AND_EXPOSE_TO_BUILD(USE_EGL TRUE) SET_AND_EXPOSE_TO_BUILD(USE_GCRYPT TRUE) diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake -index 04869b0d67226fb9f7951298f32f952c94cb2837..dce1628048dec7c861ff9aeeaacb2c62d88431bb 100644 +index 113f0203c76d1e589f086d719bde700c487050e6..f96a2b304b153d74dcafc616271d7b0823eae177 100644 --- a/Source/cmake/OptionsWin.cmake +++ b/Source/cmake/OptionsWin.cmake @@ -7,8 +7,9 @@ add_definitions(-D_WINDOWS -DWINVER=0x601 -D_WIN32_WINNT=0x601) @@ -21313,7 +21117,7 @@ index 04869b0d67226fb9f7951298f32f952c94cb2837..dce1628048dec7c861ff9aeeaacb2c62 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC OFF) -@@ -90,6 +88,16 @@ if (${WTF_PLATFORM_WIN_CAIRO}) +@@ -91,6 +89,16 @@ if (${WTF_PLATFORM_WIN_CAIRO}) # No support planned WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF) @@ -23104,7 +22908,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 d09c6fcae894dbe4a6b19c1f9f0fb55816080a54..deccf0f2457400f1f9f1965d7d88d4e29559658b 100644 +index ed6495356fa6ccd4ea2b2ffb9ac4a8d134a90e31..f686947a5b708b517c7e01f81f11c2f4c5b670dc 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -874,6 +874,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)