diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index d26b9efc5f..e4c6fd0714 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1693 -Changed: yurys@chromium.org Fri 29 Jul 2022 08:45:00 AM PDT +1694 +Changed: dpino@igalia.com Mon Aug 1 11:47:45 CEST 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 0ebb718569..2c6213cc40 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="a39b520b8e0ca63489db7a45fe19181a33fac903" +BASE_REVISION="65e2837a04b395fb0ba10e33a1bb4565ceed2995" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 0f4128dafe..7dabf87033 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 ae098caefcacce6d8cc03d15dd674dbe02f09499..c86552855b4c8b12e3461cd1c6dbf58e47079179 100644 +index f777a49444dc3b2065b18d8ee25e62d68aa10d7c..190c731d96640838be47036736704efd3279108f 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1358,22 +1358,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1357,22 +1357,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 ae098caefcacce6d8cc03d15dd674dbe02f09499..c86552855b4c8b12e3461cd1c6dbf58e ${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 0fd5ff880ac1add676c385722decd3a74468d78d..03eae0d873add089da986df79b762ebdd2acc8f4 100644 +index 92652ba9bcd53553ab52166b633a4f0d6263d324..da5c253e67adb8edec7df6af84fa65743972b63c 100644 --- a/Source/JavaScriptCore/DerivedSources.make +++ b/Source/JavaScriptCore/DerivedSources.make @@ -290,22 +290,27 @@ INSPECTOR_DOMAINS := \ @@ -168,10 +168,10 @@ 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 44dd531c6652015c9cb2573b34c9e28c04d933da..1ef23fa7b9df1b03633510f421a7c388d3067725 100644 +index 9f2623d75b9825639b0cc664c3b4d64a6615fedb..ecc1f6fe0cf2e005e8740a2f652ce88dd199dcca 100644 --- a/Source/JavaScriptCore/inspector/InjectedScriptSource.js +++ b/Source/JavaScriptCore/inspector/InjectedScriptSource.js -@@ -166,7 +166,7 @@ let InjectedScript = class InjectedScript +@@ -167,7 +167,7 @@ let InjectedScript = class InjectedScript return; } @@ -180,7 +180,7 @@ index 44dd531c6652015c9cb2573b34c9e28c04d933da..1ef23fa7b9df1b03633510f421a7c388 callback("Object with given id is not a Promise"); return; } -@@ -201,14 +201,16 @@ let InjectedScript = class InjectedScript +@@ -202,14 +202,16 @@ let InjectedScript = class InjectedScript return this._evaluateAndWrap(callFrame.evaluateWithScopeExtension, callFrame, expression, objectGroup, isEvalOnCallFrame, includeCommandLineAPI, returnByValue, generatePreview, saveResult); } @@ -200,7 +200,7 @@ index 44dd531c6652015c9cb2573b34c9e28c04d933da..1ef23fa7b9df1b03633510f421a7c388 let resolvedArgs = @createArrayWithoutPrototype(); if (args) { -@@ -217,22 +219,37 @@ let InjectedScript = class InjectedScript +@@ -218,22 +220,37 @@ let InjectedScript = class InjectedScript try { resolvedArgs[i] = this._resolveCallArgument(callArgs[i]); } catch (e) { @@ -2110,10 +2110,10 @@ index 704adf1bb71721cebd3e20341e3e625511bfd0dd..9bb4573b65d2c6f80661687f3e446786 type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index db27dac69df414bd93b2ec4701b43fe4cc10e87c..283365f2fd815b2a6f774a3febd155d3f9c4905e 100644 +index 2f1830cf87a7d8037663957a2e0fbd97e83d9c06..b26803e0a22e94afc3ad5a00b847de21e3796e14 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -@@ -515,7 +515,7 @@ CrossOriginOpenerPolicyEnabled: +@@ -527,7 +527,7 @@ CrossOriginOpenerPolicyEnabled: WebKitLegacy: default: false WebKit: @@ -2161,10 +2161,10 @@ index db27dac69df414bd93b2ec4701b43fe4cc10e87c..283365f2fd815b2a6f774a3febd155d3 WebCore: "ENABLE(GPU_PROCESS_BY_DEFAULT) && PLATFORM(IOS_FAMILY) && !HAVE(UIKIT_WEBKIT_INTERNALS)": true diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml -index 12a15c9a4ccee5f9425a9e392e4190eba97f18a4..7b9bdf016a8fad3c2bd9ade218f57dd47a52399b 100644 +index 71a623915926f9b51788947059fe8f317ce58949..2161a101c29dcb8d4a0963ea8f2a46b6fc68db2e 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml -@@ -955,6 +955,7 @@ UseCGDisplayListsForDOMRendering: +@@ -966,6 +966,7 @@ UseCGDisplayListsForDOMRendering: WebKit: default: true @@ -2172,7 +2172,7 @@ index 12a15c9a4ccee5f9425a9e392e4190eba97f18a4..7b9bdf016a8fad3c2bd9ade218f57dd4 UseGPUProcessForCanvasRenderingEnabled: type: bool humanReadableName: "GPU Process: Canvas Rendering" -@@ -965,7 +966,7 @@ UseGPUProcessForCanvasRenderingEnabled: +@@ -976,7 +977,7 @@ UseGPUProcessForCanvasRenderingEnabled: defaultValue: WebKit: "ENABLE(GPU_PROCESS_BY_DEFAULT)": true @@ -2204,7 +2204,7 @@ index 1db561ba6e2db93225956abb259db78e0c024351..b86aaa95fca156ef7d58023c396d54e1 #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index f2b30930c44473be6bf087fde5fd75b074b190c7..fcdfd21fc73ce584f7976d381d91bae4a7ce9d4e 100644 +index 96d97d096e493526bd825bd8707fa39de7f0a759..d9af0c3914845bf5d3052124ce352c5936f7ca96 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h @@ -247,7 +247,7 @@ @@ -2217,7 +2217,7 @@ index f2b30930c44473be6bf087fde5fd75b074b190c7..fcdfd21fc73ce584f7976d381d91bae4 #endif diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 30078593883c7440a90add36e762555587a69136..19e9495403f77f1866e92f1560d1033895c33536 100644 +index e5124e271efb51906dc93ad6513aa72c28321292..86f91f6a7e0893f83df2c6ff5900583b9fc4b301 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -430,7 +430,7 @@ @@ -2229,7 +2229,7 @@ index 30078593883c7440a90add36e762555587a69136..19e9495403f77f1866e92f1560d10338 #define HAVE_OS_DARK_MODE_SUPPORT 1 #endif -@@ -1310,7 +1310,8 @@ +@@ -1304,7 +1304,8 @@ #endif #if PLATFORM(MAC) @@ -2283,7 +2283,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 { @@ -2291,7 +2291,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 { @@ -2299,7 +2299,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 { @@ -2307,7 +2307,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 { @@ -2420,7 +2420,7 @@ index a5938677622935e2c6ca3ed76c3a12d0eb7e04a7..cea2a0e330cfdf01b172b3f6acc60acb __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 5a39f7f0fe507148e7a97584ca69dd5df5224dfc..35bfb77b3d214f87d969896eb943da088152f854 100644 +index 0aa1ca706841d7ec62aa1aa9b834d68673020c68..781057e521c3be3b070f7fe6c55d6e75b4a9bea2 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -5577,6 +5577,13 @@ @@ -2437,7 +2437,7 @@ index 5a39f7f0fe507148e7a97584ca69dd5df5224dfc..35bfb77b3d214f87d969896eb943da08 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, ); }; }; -@@ -18036,6 +18043,14 @@ +@@ -18037,6 +18044,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 = ""; }; @@ -2452,7 +2452,7 @@ index 5a39f7f0fe507148e7a97584ca69dd5df5224dfc..35bfb77b3d214f87d969896eb943da08 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 = ""; }; -@@ -24761,6 +24776,11 @@ +@@ -24762,6 +24777,11 @@ BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */, 2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */, 2D4F96F21A1ECC240098BF88 /* TextIndicator.h */, @@ -2464,7 +2464,7 @@ index 5a39f7f0fe507148e7a97584ca69dd5df5224dfc..35bfb77b3d214f87d969896eb943da08 F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */, F4E1965F21F26E4E00285078 /* UndoItem.cpp */, 2ECDBAD521D8906300F00ECD /* UndoItem.h */, -@@ -30588,6 +30608,8 @@ +@@ -30590,6 +30610,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2473,7 +2473,7 @@ index 5a39f7f0fe507148e7a97584ca69dd5df5224dfc..35bfb77b3d214f87d969896eb943da08 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32933,6 +32955,7 @@ +@@ -32935,6 +32957,7 @@ AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, @@ -2481,7 +2481,7 @@ index 5a39f7f0fe507148e7a97584ca69dd5df5224dfc..35bfb77b3d214f87d969896eb943da08 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, 7CE7FA591EF882300060C9D6 /* DocumentTouch.h */, A8185F3209765765005826D9 /* DocumentType.cpp */, -@@ -37235,6 +37258,8 @@ +@@ -37238,6 +37261,8 @@ 1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */, 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, @@ -2490,7 +2490,7 @@ index 5a39f7f0fe507148e7a97584ca69dd5df5224dfc..35bfb77b3d214f87d969896eb943da08 CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, -@@ -38381,6 +38406,7 @@ +@@ -38384,6 +38409,7 @@ 0F54DD081881D5F5003EEDBB /* Touch.h in Headers */, 71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */, 0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */, @@ -2498,7 +2498,7 @@ index 5a39f7f0fe507148e7a97584ca69dd5df5224dfc..35bfb77b3d214f87d969896eb943da08 0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */, 070334D71459FFD5008D8D45 /* TrackBase.h in Headers */, BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */, -@@ -39324,6 +39350,7 @@ +@@ -39327,6 +39353,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2506,7 +2506,7 @@ index 5a39f7f0fe507148e7a97584ca69dd5df5224dfc..35bfb77b3d214f87d969896eb943da08 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -39401,6 +39428,9 @@ +@@ -39404,6 +39431,9 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2517,7 +2517,7 @@ index 5a39f7f0fe507148e7a97584ca69dd5df5224dfc..35bfb77b3d214f87d969896eb943da08 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp -index cddcfa52787cfd56815aa6e24127332032e5c41f..5ebb2a233483c0cff84a170b3879c7bb4d35f80e 100644 +index fef2076253c6e059114860dc04b208f53bc3df42..ec5cc2c3cf55fb178b9e5259fb487f80c5b23456 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2528,7 +2528,7 @@ index cddcfa52787cfd56815aa6e24127332032e5c41f..5ebb2a233483c0cff84a170b3879c7bb #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3726,9 +3727,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3762,9 +3763,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (roleValue() == AccessibilityRole::ApplicationDialog) return AccessibilityObjectInclusion::IncludeObject; @@ -2943,6 +2943,20 @@ index c43310a5628456dddbdb27d5496c580854d40758..c962f3b962e28ef82baa1bf3da377e26 if (!UserGestureIndicator::processingUserGesture()) return; +diff --git a/Source/WebCore/html/LinkRelAttribute.h b/Source/WebCore/html/LinkRelAttribute.h +index dce5e6890eaa8a123506c0920ac2bc1f4f1bdf0d..929df7f7b77d1a7421e80f76a899658dffa6edb8 100644 +--- a/Source/WebCore/html/LinkRelAttribute.h ++++ b/Source/WebCore/html/LinkRelAttribute.h +@@ -73,4 +73,9 @@ inline bool operator==(const LinkRelAttribute& left, const LinkRelAttribute& rig + ; + } + ++inline bool operator!=(const LinkRelAttribute& left, const LinkRelAttribute& right) ++{ ++ return !(left == right); ++} ++ + } diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp index 9e4515b7e7f7261f936471b81557ec96697c34e6..3b32377172112fc143b5e719122e8bf648be5b25 100644 --- a/Source/WebCore/inspector/InspectorController.cpp @@ -3025,7 +3039,7 @@ index 4d5a3859ec6a46d07d45c80a3b5870ee2ef13d36..75eb55a024a6ae3892a4fedc535bf6a6 } // namespace WebCore diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp -index b9155185a63701f112db325c20fc1bc1a75688cc..f8c0f4e831998dfbbf30796434deb4e360c11399 100644 +index 3fe459d4ee185f9c1ab157c61d651fe2ed6ebedf..82ec00871a74db0fc0cb898c77aab32fb0407fc0 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.cpp +++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp @@ -572,6 +572,13 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i @@ -3170,7 +3184,7 @@ index b9155185a63701f112db325c20fc1bc1a75688cc..f8c0f4e831998dfbbf30796434deb4e3 { if (is(context)) diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h -index 6998406ddd32b9d81839f2fd6c86a690be2857c7..6b91f58798a530a801b3de05208c516f167237cb 100644 +index 9ef49586f5125ac3670007e6c09733fdd1e303ba..ccc8d93cc7a53fe7e13a80bc6ce0c218ebc99e69 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.h +++ b/Source/WebCore/inspector/InspectorInstrumentation.h @@ -31,6 +31,7 @@ @@ -5264,7 +5278,7 @@ index fe1cc2dbb9863cd4480476d2e21a5a229dc8a0e8..35dd7ca4cabe0d0ec76d44e260870a99 void InspectorWorkerAgent::disconnectFromWorkerInspectorProxy(WorkerInspectorProxy& proxy) diff --git a/Source/WebCore/inspector/agents/page/PageDebuggerAgent.cpp b/Source/WebCore/inspector/agents/page/PageDebuggerAgent.cpp -index 31ca79d6410560456c89a5be62560fc33e082cee..4a1e4dbc2ff3c13761014ae614ebf4b7199dbdcd 100644 +index 6f4e9972a701f81facda14feffa905135f473916..c26d72c6e502ba19076fd5355f0af64a7bdb75f8 100644 --- a/Source/WebCore/inspector/agents/page/PageDebuggerAgent.cpp +++ b/Source/WebCore/inspector/agents/page/PageDebuggerAgent.cpp @@ -38,6 +38,7 @@ @@ -6446,7 +6460,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 01f7507611f6d197432a43a5a4fa46d543e2f44b..e5d6f18ce7e1ec95d0def073a7985f18ada98530 100644 +index 271bb6a513cc60d6bba38d7bf19c1bc5a5e19252..ac1055c156cec06cbdb655b7c35590fcaf045500 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -486,6 +486,37 @@ void Page::setOverrideViewportArguments(const std::optional& @@ -6487,7 +6501,7 @@ index 01f7507611f6d197432a43a5a4fa46d543e2f44b..e5d6f18ce7e1ec95d0def073a7985f18 ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -1365,10 +1396,6 @@ void Page::didCommitLoad() +@@ -1366,10 +1397,6 @@ void Page::didCommitLoad() m_isEditableRegionEnabled = false; #endif @@ -6498,7 +6512,7 @@ index 01f7507611f6d197432a43a5a4fa46d543e2f44b..e5d6f18ce7e1ec95d0def073a7985f18 resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3422,6 +3449,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3423,6 +3450,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -9158,10 +9172,10 @@ index e58961bfa4dd8133eb991531dc5273ada68c4473..af9edd4418e78ddfe7cfa793e2705836 HashSet> m_keptAliveLoads; diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 1dc6df3e1145332a0aeb902c0f5d7d5d727593be..230d268489a52391f7d4f336d22311e35c9f8278 100644 +index d8eeb6c27a92134728ffada573a1f140e303c727..9ddddb0796cc00d7eea060b11919711446a39586 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); @@ -10226,10 +10240,10 @@ index f1dbfe82ac54b6a21c578290816d38101df99163..d6673c25b881fd879bc5622bba401b7f UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 962fbd29e20660a0e07b872bb94708c6bc11472b..b4c695ba9a3577c725077146b82929192f443389 100644 +index 301152947b0142d898f184c78d832dcf73259a6c..43816baf94beeecad4c1e93a00fdd63a467e81be 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -279,6 +279,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -281,6 +281,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -10237,7 +10251,7 @@ index 962fbd29e20660a0e07b872bb94708c6bc11472b..b4c695ba9a3577c725077146b8292919 UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -456,6 +457,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -458,6 +459,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -10578,7 +10592,7 @@ index 42efb8882044e4a3272d6cdccff47c33ee6fcfb7..ac503cd703c81f89fc04bcb2954b2d17 #import #import #import -@@ -234,6 +235,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple +@@ -234,6 +235,11 @@ static WallTime toSystemClockTime(NSDate *date) }); } @@ -10757,7 +10771,7 @@ diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/ index 2e235bb880c638a0e74256b6d66cb0244ea0a3f1..3471eebb47e860f7c2071d0e7f2691c9f0a6355d 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm -@@ -257,6 +257,16 @@ - (BOOL)processSwapsOnNavigation +@@ -257,6 +257,16 @@ return _processPoolConfiguration->processSwapsOnNavigation(); } @@ -10775,7 +10789,7 @@ index 2e235bb880c638a0e74256b6d66cb0244ea0a3f1..3471eebb47e860f7c2071d0e7f2691c9 { _processPoolConfiguration->setIsAutomaticProcessWarmingEnabled(prewarms); diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm -index 37fc2ad398dfb9a821b381308e901d194dfea05a..17bd960aa28eec80ed78878a76f32a45d238ab04 100644 +index 0907a865f5fbffcf5003f10de84584df32c6c251..c1340569e9023aa867f379cbeafea7752e178188 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm @@ -24,6 +24,7 @@ @@ -11070,7 +11084,7 @@ index 78d1578f94793e9e59a3d4d2b33e79ea8530fa04..493cdadac3873508b3efa3048638e73a #endif +int webkitWebContextExistingCount(); diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp -index b3f5f45aeb30c1019dfa6470edd6e8cecb717ba8..ebfb314c82bdc1ef844870a7b5d0d6071db0dd81 100644 +index 59496a874f7b4541429bbe1e2ffeed755f5d8fe5..b0f421fa3d590ba890ddc4219aded0403dee759e 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp @@ -32,6 +32,7 @@ @@ -11132,7 +11146,7 @@ index b3f5f45aeb30c1019dfa6470edd6e8cecb717ba8..ebfb314c82bdc1ef844870a7b5d0d607 if (WEBKIT_IS_POINTER_LOCK_PERMISSION_REQUEST(request)) { webkit_permission_request_allow(request); return TRUE; -@@ -1784,6 +1790,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) +@@ -1849,6 +1855,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) G_TYPE_BOOLEAN, 1, WEBKIT_TYPE_SCRIPT_DIALOG); @@ -11148,7 +11162,7 @@ index b3f5f45aeb30c1019dfa6470edd6e8cecb717ba8..ebfb314c82bdc1ef844870a7b5d0d607 /** * WebKitWebView::decide-policy: * @web_view: the #WebKitWebView on which the signal is emitted -@@ -2616,6 +2631,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const +@@ -2692,6 +2707,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const webkit_script_dialog_unref(webView->priv->currentScriptDialog); } @@ -12114,7 +12128,7 @@ index 2859ca0b2f7df0c162e4060cd0d60a7829c9f048..81af89730d8033481728f657f6fbdcb9 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index e79b26bc8e2f8945c2e32856422fae39bc5387e5..394e58332bca97b7b219b04a3a7f91177db137a1 100644 +index 6029a621d06c859016f11064b1cd6d4e27e05d89..5000a7444fd57eae17237bb937ad6453b9ce20d3 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm @@ -366,7 +366,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process @@ -12126,7 +12140,7 @@ index e79b26bc8e2f8945c2e32856422fae39bc5387e5..394e58332bca97b7b219b04a3a7f9117 #endif #if PLATFORM(IOS) && HAVE(AGX_COMPILER_SERVICE) -@@ -631,8 +631,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -634,8 +634,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -12138,10 +12152,10 @@ index e79b26bc8e2f8945c2e32856422fae39bc5387e5..394e58332bca97b7b219b04a3a7f9117 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 1234f6f1344764cdb086ba6b9d05680d23dff34b..a04ecc1d18e5787624af5a86637064484881c3ff 100644 +index e59ceef97131b7d5d1f60e8c0b192b4866aa49cd..ce4e17e0500f25768b51484ce167a5a3fa3465f1 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h -@@ -507,6 +507,9 @@ public: +@@ -509,6 +509,9 @@ public: void provideDataForPasteboard(NSPasteboard *, NSString *type); NSArray *namesOfPromisedFilesDroppedAtDestination(NSURL *dropDestination); @@ -12152,7 +12166,7 @@ index 1234f6f1344764cdb086ba6b9d05680d23dff34b..a04ecc1d18e5787624af5a8663706448 void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 39e4da5d1a7b4e817726ba45ae7595a31d8547ec..795afed10b3a059daa1b1525ce5f6a8e9924e574 100644 +index f653e7a68678330a7e7012b021f3123296caa4c1..82973b44b3216987c93839249a398ae12463caed 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm @@ -2783,6 +2783,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() @@ -15786,10 +15800,10 @@ 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 ffc917d8bcabc32cd5db24fcc454d743b59763dc..e6d36eaf5bca4f19de66fe5640102037d8637c0d 100644 +index a94688670995d1e2f7834cef64735a9b9f62c233..560b8b99955d185c9e42d597459bcdff873b6ccc 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h -@@ -321,6 +321,11 @@ public: +@@ -323,6 +323,11 @@ public: virtual void selectionDidChange() = 0; #endif @@ -16801,7 +16815,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7940fd9de 100644 +index 87ef19599fd80bc81064c00c52b9ddd82c301186..2d70cfbeaee28ef98cf43fbe6da0cea5ce16c77b 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -246,6 +246,9 @@ @@ -16887,7 +16901,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2156,6 +2204,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2158,6 +2206,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -16913,7 +16927,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2789,6 +2856,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2791,6 +2858,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -16922,7 +16936,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2799,6 +2868,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2801,6 +2870,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -16931,7 +16945,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2814,18 +2885,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2834,6 +2928,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2836,6 +2930,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17001,7 +17015,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2846,8 +2958,18 @@ void WebPageProxy::didStartDrag() +@@ -2848,8 +2960,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17021,7 +17035,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2952,16 +3074,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2954,16 +3076,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17066,7 +17080,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3125,7 +3269,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3127,7 +3271,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17075,7 +17089,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); auto updateTrackingType = [this, location](TrackingType& trackingType, EventTrackingRegions::EventType eventType) { -@@ -3157,7 +3301,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3159,7 +3303,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17084,7 +17098,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3546,6 +3690,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3547,6 +3691,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17093,7 +17107,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 receivedPolicyDecision(policyAction, navigation, navigation->websitePolicies(), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3616,6 +3762,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3617,6 +3763,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) { @@ -17101,7 +17115,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4390,6 +4537,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4391,6 +4538,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17113,7 +17127,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4801,6 +4953,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4802,6 +4954,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17121,7 +17135,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -5026,6 +5179,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -5027,6 +5180,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17130,7 +17144,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 // 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; -@@ -5549,7 +5704,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5550,7 +5705,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) { @@ -17146,7 +17160,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -6139,6 +6301,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -6140,6 +6302,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa if (originatingPage) openerAppInitiatedState = originatingPage->lastNavigationWasAppInitiated(); @@ -17154,7 +17168,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 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); -@@ -6185,6 +6348,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -6186,6 +6349,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17162,7 +17176,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 } void WebPageProxy::exitFullscreenImmediately() -@@ -6244,6 +6408,10 @@ void WebPageProxy::closePage() +@@ -6245,6 +6409,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17173,7 +17187,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -6280,6 +6448,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -6281,6 +6449,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 { @@ -17182,7 +17196,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -6301,6 +6471,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -6302,6 +6472,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17191,7 +17205,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 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 { -@@ -6324,6 +6496,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -6325,6 +6497,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17200,7 +17214,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 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 { -@@ -6451,6 +6625,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6452,6 +6626,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17209,7 +17223,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7732,6 +7908,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7733,6 +7909,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17218,7 +17232,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 } break; } -@@ -7746,10 +7924,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7747,10 +7925,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -17235,7 +17249,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 break; } -@@ -7758,7 +7939,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7759,7 +7940,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()); @@ -17243,7 +17257,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7777,7 +7957,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7778,7 +7958,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); @@ -17251,7 +17265,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7786,6 +7965,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7787,6 +7966,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17259,7 +17273,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 } break; } -@@ -8119,7 +8299,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -8120,7 +8300,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -17271,7 +17285,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8453,6 +8636,7 @@ static Span gpuMachServices() +@@ -8454,6 +8637,7 @@ static Span gpuMachServices() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17279,7 +17293,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8646,6 +8830,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8647,6 +8831,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.httpsUpgradeEnabled = preferences().upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false; @@ -17288,7 +17302,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 #if PLATFORM(IOS) // FIXME: This is also being passed over the to WebProcess via the PreferencesStore. parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload(); -@@ -8718,6 +8904,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8719,6 +8905,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17303,7 +17317,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8811,6 +9005,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8812,6 +9006,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17320,7 +17334,7 @@ index 2b65ecbed7cda95f3c8cd0149a1441672e7c1d67..300400530d1d8e74c136a555eb2818d7 // 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 f383973f10976d2e05e646505354cf05432d05c3..3cf26979c68eb40a73710a29c816070454218b06 100644 +index 4b5d30cf64ca8817bb82832103475012b4822740..8ef013ccca5aae1d6cb8c2c848d158535fca9c0b 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17442,7 +17456,7 @@ index f383973f10976d2e05e646505354cf05432d05c3..3cf26979c68eb40a73710a29c8160704 #endif #if ENABLE(WEB_CRYPTO) -@@ -2755,6 +2784,7 @@ private: +@@ -2756,6 +2785,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17450,7 +17464,7 @@ index f383973f10976d2e05e646505354cf05432d05c3..3cf26979c68eb40a73710a29c8160704 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -3024,6 +3054,20 @@ private: +@@ -3026,6 +3056,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17471,7 +17485,7 @@ index f383973f10976d2e05e646505354cf05432d05c3..3cf26979c68eb40a73710a29c8160704 #endif PageLoadState m_pageLoadState; -@@ -3238,6 +3282,9 @@ private: +@@ -3240,6 +3284,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17638,7 +17652,7 @@ index abffeea475cd298870eb3f3c385e9b411c88113a..7b4fa6254fd2a384645c574a3df3f51e WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 3ea29f309ced19371d15096cd2d83ec5ca9f338e..f113e22cfcfcc14e8800d548c064ff9651756cbd 100644 +index eeb1c0f9e6712de6b3ccd191db6ce06c793b8c98..3af592fd17cd45b536431e28c1890a5fca79e7fe 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp @@ -1994,6 +1994,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, @@ -17655,10 +17669,10 @@ index 3ea29f309ced19371d15096cd2d83ec5ca9f338e..f113e22cfcfcc14e8800d548c064ff96 void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index 13a793bad1b3bde715ded5adb18bb98d8d141d4f..8bd94c4a9f1607a0346ce8d0c8c48cc0045b1213 100644 +index 0973a59b6e4e93c3876fe75ca9615bb8b17e4518..5cfcea47cddfadfc2e85bbc94e7665ddf6f31a8e 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -@@ -88,6 +88,7 @@ class SecKeyProxyStore; +@@ -89,6 +89,7 @@ class SecKeyProxyStore; class DeviceIdHashSaltStorage; class NetworkProcessProxy; class SOAuthorizationCoordinator; @@ -17666,7 +17680,7 @@ index 13a793bad1b3bde715ded5adb18bb98d8d141d4f..8bd94c4a9f1607a0346ce8d0c8c48cc0 class VirtualAuthenticatorManager; class WebPageProxy; class WebProcessPool; -@@ -97,6 +98,7 @@ enum class CacheModel : uint8_t; +@@ -98,6 +99,7 @@ enum class CacheModel : uint8_t; enum class WebsiteDataFetchOption : uint8_t; enum class WebsiteDataType : uint32_t; @@ -17674,7 +17688,7 @@ index 13a793bad1b3bde715ded5adb18bb98d8d141d4f..8bd94c4a9f1607a0346ce8d0c8c48cc0 struct NetworkProcessConnectionInfo; struct WebsiteDataRecord; struct WebsiteDataStoreParameters; -@@ -107,6 +109,14 @@ enum class StorageAccessStatus : uint8_t; +@@ -108,6 +110,14 @@ enum class StorageAccessStatus : uint8_t; enum class StorageAccessPromptStatus; #endif @@ -17689,7 +17703,7 @@ index 13a793bad1b3bde715ded5adb18bb98d8d141d4f..8bd94c4a9f1607a0346ce8d0c8c48cc0 class WebsiteDataStore : public API::ObjectImpl, public Identified, public CanMakeWeakPtr { public: static Ref defaultDataStore(); -@@ -295,11 +305,13 @@ public: +@@ -297,11 +307,13 @@ public: const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; } #endif @@ -17704,7 +17718,7 @@ index 13a793bad1b3bde715ded5adb18bb98d8d141d4f..8bd94c4a9f1607a0346ce8d0c8c48cc0 void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&); const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; } void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType); -@@ -363,6 +375,12 @@ public: +@@ -364,6 +376,12 @@ public: static constexpr uint64_t defaultPerOriginQuota() { return 1000 * MB; } static bool defaultShouldUseCustomStoragePaths(); @@ -17717,7 +17731,7 @@ index 13a793bad1b3bde715ded5adb18bb98d8d141d4f..8bd94c4a9f1607a0346ce8d0c8c48cc0 void resetQuota(CompletionHandler&&); void clearStorage(CompletionHandler&&); #if PLATFORM(IOS_FAMILY) -@@ -471,9 +489,11 @@ private: +@@ -472,9 +490,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -17730,7 +17744,7 @@ index 13a793bad1b3bde715ded5adb18bb98d8d141d4f..8bd94c4a9f1607a0346ce8d0c8c48cc0 WebCore::SoupNetworkProxySettings m_networkProxySettings; String m_cookiePersistentStoragePath; SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite }; -@@ -501,6 +521,10 @@ private: +@@ -502,6 +522,10 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -18366,7 +18380,7 @@ index 0000000000000000000000000000000000000000..d0f9827544994e450e24e3f7a427c35e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -index 1c1273786a388abdb30ba898915440b2106f333c..ba360fd6f530e4a5a693fa1b4f14808f451dc55b 100644 +index ce1a53586efb645a194646a615687eb727f5898b..e38ca201fa91daa21f7f33babbe37136dbff7ce2 100644 --- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm +++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm @@ -438,6 +438,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) @@ -19693,10 +19707,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63c7c9d63c 100644 +index d36b51a12d9da9435201f90ff1a977a0be047c57..bb2e9f64d40449ee06daf5c2052b8e27b7a84d96 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1246,6 +1246,7 @@ +@@ -1247,6 +1247,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 */; }; @@ -19742,7 +19756,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 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 */; }; -@@ -5274,6 +5292,7 @@ +@@ -5276,6 +5294,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; }; @@ -19750,7 +19764,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 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 = ""; }; -@@ -6989,6 +7008,19 @@ +@@ -6991,6 +7010,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 = ""; }; @@ -19770,7 +19784,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 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 = ""; }; -@@ -7118,6 +7150,8 @@ +@@ -7120,6 +7152,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; }; @@ -19779,7 +19793,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 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; }; -@@ -7139,6 +7173,14 @@ +@@ -7141,6 +7175,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 = ""; }; @@ -19794,7 +19808,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 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 = ""; }; -@@ -7273,6 +7315,7 @@ +@@ -7275,6 +7317,7 @@ 52A69BEA286CFFAC00893E8F /* CryptoTokenKit.framework in Frameworks */, 3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */, 3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */, @@ -19802,7 +19816,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, -@@ -9417,6 +9460,7 @@ +@@ -9421,6 +9464,7 @@ 99788ACA1F421DCA00C08000 /* _WKAutomationSessionConfiguration.mm */, 990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */, 990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */, @@ -19810,7 +19824,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 5C4609E222430E4C009943C2 /* _WKContentRuleListAction.h */, 5C4609E322430E4D009943C2 /* _WKContentRuleListAction.mm */, 5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */, -@@ -10510,6 +10554,7 @@ +@@ -10514,6 +10558,7 @@ E34B110C27C46BC6006D2F2E /* libWebCoreTestShim.dylib */, E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */, DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */, @@ -19818,7 +19832,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 57A9FF15252C6AEF006A2040 /* libWTF.a */, 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, -@@ -11045,6 +11090,12 @@ +@@ -11049,6 +11094,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19831,7 +19845,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 ); path = Agents; sourceTree = ""; -@@ -11053,6 +11104,7 @@ +@@ -11057,6 +11108,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19839,7 +19853,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -11596,6 +11648,7 @@ +@@ -11600,6 +11652,7 @@ E1513C65166EABB200149FCB /* AuxiliaryProcessProxy.h */, 46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */, 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */, @@ -19847,7 +19861,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 4659F25E275FF6B200BBB369 /* CaptivePortalModeObserver.h */, 07297F9C1C1711EA003F0735 /* DeviceIdHashSaltStorage.cpp */, 07297F9D1C17BBEA223F0735 /* DeviceIdHashSaltStorage.h */, -@@ -11613,6 +11666,8 @@ +@@ -11617,6 +11670,8 @@ 2DD5A72A1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h */, 839A2F2F1E2067390039057E /* HighPerformanceGraphicsUsageSampler.cpp */, 839A2F301E2067390039057E /* HighPerformanceGraphicsUsageSampler.h */, @@ -19856,7 +19870,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */, 5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */, 31607F3819627002009B87DA /* LegacySessionStateCoding.h */, -@@ -11644,6 +11699,7 @@ +@@ -11648,6 +11703,7 @@ 1A0C227D2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm */, 1AEE57232409F142002005D6 /* QuickLookThumbnailLoader.h */, 1AEE57242409F142002005D6 /* QuickLookThumbnailLoader.mm */, @@ -19864,7 +19878,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */, 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */, 5CA98549210BEB5A0057EB6B /* SafeBrowsingWarning.h */, -@@ -11744,6 +11800,8 @@ +@@ -11748,6 +11804,8 @@ BC7B6204129A0A6700D174A4 /* WebPageGroup.h */, 2D9EA3101A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp */, 2D9EA30E1A96CBFF002D2807 /* WebPageInjectedBundleClient.h */, @@ -19873,7 +19887,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */, BC032DCB10F4389F0058C15A /* WebPageProxy.h */, BCBD38FA125BAB9A00D2C29F /* WebPageProxy.messages.in */, -@@ -11896,6 +11954,7 @@ +@@ -11900,6 +11958,7 @@ BC646C1911DD399F006455B0 /* WKBackForwardListItemRef.h */, BC646C1611DD399F006455B0 /* WKBackForwardListRef.cpp */, BC646C1711DD399F006455B0 /* WKBackForwardListRef.h */, @@ -19881,7 +19895,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 BCB9E24A1120E15C00A137E0 /* WKContext.cpp */, BCB9E2491120E15C00A137E0 /* WKContext.h */, 1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */, -@@ -12479,6 +12538,9 @@ +@@ -12483,6 +12542,9 @@ C18173602058424700DFDA65 /* DisplayLink.h */, 31ABA79C215AF9E000C90E31 /* HighPerformanceGPUManager.h */, 31ABA79D215AF9E000C90E31 /* HighPerformanceGPUManager.mm */, @@ -19891,7 +19905,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */, 0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */, 0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */, -@@ -12505,6 +12567,8 @@ +@@ -12509,6 +12571,8 @@ E568B92120A3AC6A00E3C856 /* WebDataListSuggestionsDropdownMac.mm */, E55CD20124D09F1F0042DB9C /* WebDateTimePickerMac.h */, E55CD20224D09F1F0042DB9C /* WebDateTimePickerMac.mm */, @@ -19900,7 +19914,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 BC857E8512B71EBB00EDEB2E /* WebPageProxyMac.mm */, BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */, BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */, -@@ -13689,6 +13753,7 @@ +@@ -13693,6 +13757,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19908,7 +19922,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -13937,6 +14002,7 @@ +@@ -13941,6 +14006,7 @@ E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */, 4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */, 1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */, @@ -19916,7 +19930,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 BC3065FA1259344E00E71278 /* CacheModel.h in Headers */, 41897ED81F415D8A0016FA42 /* CacheStorageEngine.h in Headers */, 41FABD2A1F4DE001006A6C97 /* CacheStorageEngineCache.h in Headers */, -@@ -14203,7 +14269,11 @@ +@@ -14208,7 +14274,11 @@ 2DD45ADE1E5F8972006C355F /* InputViewUpdateDeferrer.h in Headers */, CE550E152283752200D28791 /* InsertTextOptions.h in Headers */, 9197940523DBC4BB00257892 /* InspectorBrowserAgent.h in Headers */, @@ -19928,7 +19942,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */, 51E9049C27BCB9D400929E7E /* InstallCoordinationSPI.h in Headers */, C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */, -@@ -14421,6 +14491,7 @@ +@@ -14426,6 +14496,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -19936,7 +19950,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -14479,6 +14550,7 @@ +@@ -14484,6 +14555,7 @@ E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */, E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */, 7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */, @@ -19944,7 +19958,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 E4D54D0421F1D72D007E3C36 /* ScrollingTreeFrameScrollingNodeRemoteIOS.h in Headers */, 0F931C1C18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h in Headers */, 0F931C1C18C5711900DBB8D4 /* ScrollingTreeScrollingNodeDelegateIOS.h in Headers */, -@@ -14827,6 +14899,8 @@ +@@ -14832,6 +14904,8 @@ 2D9EA30F1A96CBFF002D2807 /* WebPageInjectedBundleClient.h in Headers */, 9197940823DBC4CB00257892 /* WebPageInspectorAgentBase.h in Headers */, A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */, @@ -19953,7 +19967,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 A543E30C215C8A8D00279CD9 /* WebPageInspectorTarget.h in Headers */, A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, -@@ -16757,6 +16831,8 @@ +@@ -16761,6 +16835,8 @@ 51E9049727BCB3D900929E7E /* ICAppBundle.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -19962,7 +19976,7 @@ index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63 C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, 2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */, -@@ -17091,6 +17167,8 @@ +@@ -17095,6 +17171,8 @@ E3816B3D27E2463A005EAFC0 /* WebMockContentFilterManager.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20580,7 +20594,7 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index 7838bb60fdea6350c29b5b0bbe0693ae78642aa3..a8c4aecd79c910bc492276d1bc03898b47fde107 100644 +index 624de3b3fa39f0cdac0727b40cc6e59c5150a83f..cff329cfb75466a7bdd651cd5bf48965e3913a18 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp @@ -944,6 +944,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) @@ -20698,7 +20712,7 @@ index 7838bb60fdea6350c29b5b0bbe0693ae78642aa3..a8c4aecd79c910bc492276d1bc03898b } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3431,6 +3440,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3406,6 +3415,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -20803,7 +20817,7 @@ index 7838bb60fdea6350c29b5b0bbe0693ae78642aa3..a8c4aecd79c910bc492276d1bc03898b #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3507,6 +3614,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3482,6 +3589,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -20815,7 +20829,7 @@ index 7838bb60fdea6350c29b5b0bbe0693ae78642aa3..a8c4aecd79c910bc492276d1bc03898b void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3747,6 +3859,7 @@ void WebPage::didCompletePageTransition() +@@ -3722,6 +3834,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -20823,7 +20837,7 @@ index 7838bb60fdea6350c29b5b0bbe0693ae78642aa3..a8c4aecd79c910bc492276d1bc03898b } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4609,7 +4722,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4590,7 +4703,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -20832,7 +20846,7 @@ index 7838bb60fdea6350c29b5b0bbe0693ae78642aa3..a8c4aecd79c910bc492276d1bc03898b void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -7031,6 +7144,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -7012,6 +7125,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20843,7 +20857,7 @@ index 7838bb60fdea6350c29b5b0bbe0693ae78642aa3..a8c4aecd79c910bc492276d1bc03898b return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index da33af918ffb06141abb610c2c84f6d313cc055c..f7067c1ad58e6d7e1d132283fef7303d26cbd41b 100644 +index 60a526cbc8ca0fbeb5eb8a1d13a0c30afbad9792..393ec7215dee38605e44fcec51c9b27d49f25766 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -117,6 +117,10 @@ @@ -20857,7 +20871,7 @@ index da33af918ffb06141abb610c2c84f6d313cc055c..f7067c1ad58e6d7e1d132283fef7303d #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -1014,11 +1018,11 @@ public: +@@ -1015,11 +1019,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -20871,7 +20885,7 @@ index da33af918ffb06141abb610c2c84f6d313cc055c..f7067c1ad58e6d7e1d132283fef7303d void performDragControllerAction(DragControllerAction, const WebCore::DragData&, SandboxExtension::Handle&&, Vector&&); #endif -@@ -1032,6 +1036,9 @@ public: +@@ -1033,6 +1037,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -20881,7 +20895,7 @@ index da33af918ffb06141abb610c2c84f6d313cc055c..f7067c1ad58e6d7e1d132283fef7303d #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1266,6 +1273,7 @@ public: +@@ -1267,6 +1274,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -20889,7 +20903,7 @@ index da33af918ffb06141abb610c2c84f6d313cc055c..f7067c1ad58e6d7e1d132283fef7303d void insertNewlineInQuotedContent(); -@@ -1656,6 +1664,7 @@ private: +@@ -1657,6 +1665,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -20897,7 +20911,7 @@ index da33af918ffb06141abb610c2c84f6d313cc055c..f7067c1ad58e6d7e1d132283fef7303d void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1693,6 +1702,7 @@ private: +@@ -1694,6 +1703,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -20905,7 +20919,7 @@ index da33af918ffb06141abb610c2c84f6d313cc055c..f7067c1ad58e6d7e1d132283fef7303d #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1838,9 +1848,7 @@ private: +@@ -1839,9 +1849,7 @@ private: void addLayerForFindOverlay(CompletionHandler&&); void removeLayerForFindOverlay(CompletionHandler&&); @@ -20915,7 +20929,7 @@ index da33af918ffb06141abb610c2c84f6d313cc055c..f7067c1ad58e6d7e1d132283fef7303d void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2383,6 +2391,7 @@ private: +@@ -2380,6 +2388,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -20924,7 +20938,7 @@ index da33af918ffb06141abb610c2c84f6d313cc055c..f7067c1ad58e6d7e1d132283fef7303d bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index d2f2f9e9c740a25096c013114257f018f7c3e420..11158855b408fe2876757f1bf1c130e96d7fc301 100644 +index d39310111ef403bbcb47029d622dc6f089d5b38d..c8a0ecc17ea0e82b173012f01583aae26921b315 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 @@ -20935,7 +20949,7 @@ index d2f2f9e9c740a25096c013114257f018f7c3e420..11158855b408fe2876757f1bf1c130e9 #if ENABLE(REMOTE_INSPECTOR) SetIndicating(bool indicating); -@@ -150,6 +151,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -149,6 +150,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType #endif #if !ENABLE(IOS_TOUCH_EVENTS) && ENABLE(TOUCH_EVENTS) TouchEvent(WebKit::WebTouchEvent event) @@ -20943,7 +20957,7 @@ index d2f2f9e9c740a25096c013114257f018f7c3e420..11158855b408fe2876757f1bf1c130e9 #endif CancelPointer(WebCore::PointerID pointerId, WebCore::IntPoint documentPoint) -@@ -179,6 +181,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -178,6 +180,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType LoadURLInFrame(URL url, String referrer, WebCore::FrameIdentifier frameID) LoadDataInFrame(IPC::DataReference data, String MIMEType, String encodingName, URL baseURL, WebCore::FrameIdentifier frameID) LoadRequest(struct WebKit::LoadParameters loadParameters) @@ -20951,7 +20965,7 @@ index d2f2f9e9c740a25096c013114257f018f7c3e420..11158855b408fe2876757f1bf1c130e9 LoadRequestWaitingForProcessLaunch(struct WebKit::LoadParameters loadParameters, URL resourceDirectoryURL, WebKit::WebPageProxyIdentifier pageID, bool checkAssumedReadAccessToResourceURL) LoadData(struct WebKit::LoadParameters loadParameters) LoadSimulatedRequestAndResponse(struct WebKit::LoadParameters loadParameters, WebCore::ResourceResponse simulatedResponse) -@@ -345,10 +348,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -344,10 +347,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType AddMIMETypeWithCustomContentProvider(String mimeType) # Drag and drop. @@ -20964,7 +20978,7 @@ index d2f2f9e9c740a25096c013114257f018f7c3e420..11158855b408fe2876757f1bf1c130e9 PerformDragControllerAction(enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData, WebKit::SandboxExtension::Handle sandboxExtensionHandle, Vector sandboxExtensionsForUpload) #endif #if ENABLE(DRAG_SUPPORT) -@@ -357,6 +360,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -356,6 +359,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType DragCancelled() #endif @@ -21107,7 +21121,7 @@ diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegac index 81093dca5a3f4cf8fa7a71551b9d7b11d7513d9e..0e62bc13f72397239c80bfbc3a272286d1fcb39f 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -@@ -4205,7 +4205,7 @@ - (void)mouseDown:(WebEvent *)event +@@ -4205,7 +4205,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) _private->handlingMouseDownEvent = NO; } @@ -21120,7 +21134,7 @@ diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/ma index f57ff1862f7bc2d2e88710c7b43d62b78b1765a0..fdcf7866546515473fe579333184d9400d1f6bb6 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm -@@ -4038,7 +4038,7 @@ + (void)_doNotStartObservingNetworkReachability +@@ -4038,7 +4038,7 @@ IGNORE_WARNINGS_END } #endif // PLATFORM(IOS_FAMILY) @@ -21129,7 +21143,7 @@ index f57ff1862f7bc2d2e88710c7b43d62b78b1765a0..fdcf7866546515473fe579333184d940 - (NSArray *)_touchEventRegions { -@@ -4080,7 +4080,7 @@ - (NSArray *)_touchEventRegions +@@ -4080,7 +4080,7 @@ IGNORE_WARNINGS_END }).autorelease(); } @@ -21376,7 +21390,7 @@ index 2cdf38d15dccb56c08b3fa2f9c819a7a0190c6c3..4a5bf880adcb1f48001916c7f2f08c6a 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 dfc46c968213532914e88e1c65e3f3852f29c2a1..4ae88adbba3f5b37d009aabaaf89652ee1f9d88a 100644 +index 3b6d4a7eaa531c9e26e8ebd907a4b846d04bece9..72d3a1e7fd2a2c5427139869644b95956f936260 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) @@ -21390,8 +21404,8 @@ index dfc46c968213532914e88e1c65e3f3852f29c2a1..4ae88adbba3f5b37d009aabaaf89652e set(ENABLE_WEBKIT OFF) endif () -@@ -26,11 +27,9 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_BOX_DECORATION_BREAK PUBLIC ON) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON) +@@ -25,11 +26,9 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CHANNEL_MESSAGING PUBLIC ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_BOX_DECORATION_BREAK PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PUBLIC OFF) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PUBLIC OFF) @@ -21402,7 +21416,7 @@ index dfc46c968213532914e88e1c65e3f3852f29c2a1..4ae88adbba3f5b37d009aabaaf89652e WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PUBLIC OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PUBLIC OFF) -@@ -46,7 +45,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PUBLIC ON) +@@ -45,7 +44,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PUBLIC OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STATISTICS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PUBLIC ON) @@ -21410,7 +21424,7 @@ index dfc46c968213532914e88e1c65e3f3852f29c2a1..4ae88adbba3f5b37d009aabaaf89652e 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}) +@@ -89,6 +87,16 @@ if (${WTF_PLATFORM_WIN_CAIRO}) # No support planned WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF) @@ -22022,10 +22036,10 @@ index ef4407cfc114e602d98ed81724da504f453e258f..448dd483715162baba484f756fbcc1d7 + add_subdirectory(Playwright/win) endif () diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit -index a57650013a47b4c8beaa9cfeefb7cd3728ddfbe7..34fe866ba2308ae8cf4db2b303a9e336e02fc6d4 100755 +index ed6c15ce06c25ef12b165552bd665c5108d209dc..267612eb7239cfa91f0c675ec18d097599e95de8 100755 --- a/Tools/Scripts/build-webkit +++ b/Tools/Scripts/build-webkit -@@ -263,7 +263,7 @@ if (isAppleCocoaWebKit()) { +@@ -261,7 +261,7 @@ if (isAppleCocoaWebKit()) { push @projects, ("Source/WebKit"); if (!isEmbeddedWebKit()) { @@ -23664,12 +23678,12 @@ index 8660306662de6faabab78662034958811e3e4a67..979c470d97950007ad990564eba18de9 -diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme -index 0a7672a9d18fead0f7c0b451683835beff4f94a1..87ccc0e4fcb4a386165392fe8df6acade41b755e 100644 ---- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme -+++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme -@@ -188,6 +188,20 @@ - ReferencedContainer = "container:Tools/MiniBrowser/MiniBrowser.xcodeproj"> +diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/Everything up to WebKit + Tools.xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/Everything up to WebKit + Tools.xcscheme +index 1e41cbcb9a7faa6757cdf62027a236b1449c9d5f..3fbcb4663cad440849307e2f9ecfde2518db0f6e 100644 +--- a/WebKit.xcworkspace/xcshareddata/xcschemes/Everything up to WebKit + Tools.xcscheme ++++ b/WebKit.xcworkspace/xcshareddata/xcschemes/Everything up to WebKit + Tools.xcscheme +@@ -202,6 +202,20 @@ + ReferencedContainer = "container:Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj"> +