diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index e3fe0eb929..c75f20be88 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1685 -Changed: dpino@igalia.com Wed Jul 20 06:18:12 PM HKT 2022 +1686 +Changed: dpino@igalia.com Thu Jul 21 16:55:37 HKT 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index f8b571d72c..688a9f3061 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="273d610500568994a594191403c869ffe26098e2" +BASE_REVISION="3da73044142a7040e9d068489499450e86ce0399" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 95c55b7d67..7e25a999ed 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 f4ba2716faef9cb274216129be2fb63693d9e914..693f4608efda4974b8fcd8ce8287132481e6ad18 100644 +index ae098caefcacce6d8cc03d15dd674dbe02f09499..c86552855b4c8b12e3461cd1c6dbf58e47079179 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1356,22 +1356,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1358,22 +1358,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -168,7 +168,7 @@ 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 0080366628c66a5be04024aa560e0d812c27884a..9c325c085feddd42920dce3c71fd60703b670e3f 100644 +index 44dd531c6652015c9cb2573b34c9e28c04d933da..1ef23fa7b9df1b03633510f421a7c388d3067725 100644 --- a/Source/JavaScriptCore/inspector/InjectedScriptSource.js +++ b/Source/JavaScriptCore/inspector/InjectedScriptSource.js @@ -166,7 +166,7 @@ let InjectedScript = class InjectedScript @@ -541,7 +541,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 8de3ac227ca561a647ce78bb610d712378e20352..e999d1ac814a2ad9fbceca25e9fa56cea137e928 100644 +index 6b283d7f5f1804b921a0ffd175ddf5e66eed9fd1..e1a2a96bfed11a3186d59871132b3c7993e8fd4d 100644 --- a/Source/JavaScriptCore/inspector/protocol/DOM.json +++ b/Source/JavaScriptCore/inspector/protocol/DOM.json @@ -80,6 +80,16 @@ @@ -965,12 +965,12 @@ index 0000000000000000000000000000000000000000..b9ab57a2b5739ed997231399b4bd4042 + ] +} diff --git a/Source/JavaScriptCore/inspector/protocol/Network.json b/Source/JavaScriptCore/inspector/protocol/Network.json -index 464e6312ef88000b6987a45479d4d3cda65eb6a5..6114c4bb0d19f532aeea0359fc74a13f00559434 100644 +index 96af27ece2ac200e11c4311b3ca0d9d3b5a048da..3168f7806fcbdabec07acc5e304bae1e3736240a 100644 --- a/Source/JavaScriptCore/inspector/protocol/Network.json +++ b/Source/JavaScriptCore/inspector/protocol/Network.json -@@ -343,6 +343,13 @@ - { "name": "requestId", "$ref": "RequestId", "description": "Identifier for the intercepted Network request to fail." }, - { "name": "errorType", "$ref": "ResourceErrorType", "description": "Deliver error reason for the request failure." } +@@ -352,6 +352,13 @@ + "parameters": [ + { "name": "bytesPerSecondLimit", "type": "integer", "optional": true, "description": "Limits the bytes per second of requests if positive. Removes any limits if zero or not provided." } ] + }, + { @@ -2109,7 +2109,7 @@ 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 7f6f23cf1dfdffdbd3ef9ce7167a9c5a5456977b..d365a4f6379cffd9615b67b2646b0a4a0907edff 100644 +index 00d4aa392bbcc261cd75244c3fd9bb3a122d8719..2a3f3ff0baedf74e919c8ff5ba614ce9d6231a94 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -515,7 +515,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2151,19 +2151,19 @@ index 7f6f23cf1dfdffdbd3ef9ce7167a9c5a5456977b..d365a4f6379cffd9615b67b2646b0a4a type: bool humanReadableName: "GPU Process: WebGL" @@ -1527,7 +1528,7 @@ UseGPUProcessForWebGLEnabled: - defaultValue: + default: false WebKit: "ENABLE(GPU_PROCESS_BY_DEFAULT) && PLATFORM(IOS_FAMILY) && !HAVE(UIKIT_WEBKIT_INTERNALS)": true - "PLATFORM(WIN)": true + "PLATFORM(WIN)": false default: false - - UserGesturePromisePropagationEnabled: + 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 2fbfa9c27c16b4884cd5d9341ccb405acb4c9187..b67bc8c581c2b98ed76d1a255c76d5771080b34c 100644 +index 181185a844ef5140e98b497584aa97bf124b5c96..60eece0ee8ebbe95d8c669c303a4be565e01cec6 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml -@@ -930,6 +930,7 @@ UseCGDisplayListsForDOMRendering: +@@ -942,6 +942,7 @@ UseCGDisplayListsForDOMRendering: WebKit: default: true @@ -2171,7 +2171,7 @@ index 2fbfa9c27c16b4884cd5d9341ccb405acb4c9187..b67bc8c581c2b98ed76d1a255c76d577 UseGPUProcessForCanvasRenderingEnabled: type: bool humanReadableName: "GPU Process: Canvas Rendering" -@@ -940,7 +941,7 @@ UseGPUProcessForCanvasRenderingEnabled: +@@ -952,7 +953,7 @@ UseGPUProcessForCanvasRenderingEnabled: defaultValue: WebKit: "ENABLE(GPU_PROCESS_BY_DEFAULT)": true @@ -2203,7 +2203,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 6cae83fbec34044f7f142c15778f5caa2e8a1fc4..d2c9592ad45e4258e9f20b3fc2f688e3642c0092 100644 +index f2b30930c44473be6bf087fde5fd75b074b190c7..fcdfd21fc73ce584f7976d381d91bae4a7ce9d4e 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h @@ -247,7 +247,7 @@ @@ -2216,10 +2216,10 @@ index 6cae83fbec34044f7f142c15778f5caa2e8a1fc4..d2c9592ad45e4258e9f20b3fc2f688e3 #endif diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index aeb447bf9c3f58bfceb5070450a2d0211769b293..6cd3332f64ae6c1c32a33fddc52dff3576244b40 100644 +index 30078593883c7440a90add36e762555587a69136..27f478a69b045c33b4b293f2c16752581e889ee2 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h -@@ -426,7 +426,7 @@ +@@ -430,7 +430,7 @@ #define HAVE_FOUNDATION_WITH_SAME_SITE_COOKIE_SUPPORT 1 #endif @@ -2272,7 +2272,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 { @@ -2280,7 +2280,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 { @@ -2288,7 +2288,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 { @@ -2296,7 +2296,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 { @@ -2317,10 +2317,10 @@ index 9604d21ceb51ab8d20a337c8dbe52c4059043d2c..86a9eec09c4ac457bdd4567eeab57021 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index 0c77d35ce6fe7ea21a48bb4c900fcd6954aa6112..2494f912e5b5245b6f023a6ec0c3256f5af39c4d 100644 +index 9f051dc8deabe7cfbd69a4210f15514c8227beaa..b59d2059fadb459175ccfd8afd0ece6b8038a652 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -638,3 +638,9 @@ platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify +@@ -639,3 +639,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 @@ -2397,10 +2397,10 @@ index 3351067102d0e96e185ec0e6ac01bf7273346de3..f0642fcebbce63a54f66a1847fc25460 +JSSpeechSynthesisEventInit.cpp +// Playwright: end. diff --git a/Source/WebCore/WebCore.order b/Source/WebCore/WebCore.order -index 82f617e0d496ee71ffc2f2ce4c00ddc0e640f0de..ad47858a0ba283ed44a486dbee29c10a54e97403 100644 +index a5938677622935e2c6ca3ed76c3a12d0eb7e04a7..cea2a0e330cfdf01b172b3f6acc60acbb680776f 100644 --- a/Source/WebCore/WebCore.order +++ b/Source/WebCore/WebCore.order -@@ -3090,7 +3090,6 @@ __ZN7WebCore14DocumentLoader23stopLoadingSubresourcesEv +@@ -3089,7 +3089,6 @@ __ZN7WebCore14DocumentLoader23stopLoadingSubresourcesEv __ZN7WebCore14DocumentLoader18stopLoadingPlugInsEv __ZN7WebCore14DocumentLoader15detachFromFrameEv __ZN7WebCore20ApplicationCacheHost22setDOMApplicationCacheEPNS_19DOMApplicationCacheE @@ -2409,10 +2409,10 @@ index 82f617e0d496ee71ffc2f2ce4c00ddc0e640f0de..ad47858a0ba283ed44a486dbee29c10a __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index b7da6a4966c8fa48229cb893f0c05968e40cb297..fb11134b128e47b3cef2b9e76c43960a8a8e6d3a 100644 +index 1a348c57b486c4014617450e3ef4d4ca5e7b997f..5b1f9c47f582797813dc22e6032a39357f77a531 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5571,6 +5571,13 @@ +@@ -5576,6 +5576,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, ); }; }; @@ -2426,7 +2426,7 @@ index b7da6a4966c8fa48229cb893f0c05968e40cb297..fb11134b128e47b3cef2b9e76c43960a 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, ); }; }; -@@ -18024,6 +18031,14 @@ +@@ -18033,6 +18040,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 = ""; }; @@ -2441,7 +2441,7 @@ index b7da6a4966c8fa48229cb893f0c05968e40cb297..fb11134b128e47b3cef2b9e76c43960a 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 = ""; }; -@@ -24751,6 +24766,11 @@ +@@ -24758,6 +24773,11 @@ BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */, 2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */, 2D4F96F21A1ECC240098BF88 /* TextIndicator.h */, @@ -2453,7 +2453,7 @@ index b7da6a4966c8fa48229cb893f0c05968e40cb297..fb11134b128e47b3cef2b9e76c43960a F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */, F4E1965F21F26E4E00285078 /* UndoItem.cpp */, 2ECDBAD521D8906300F00ECD /* UndoItem.h */, -@@ -30570,6 +30590,8 @@ +@@ -30583,6 +30603,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2462,7 +2462,7 @@ index b7da6a4966c8fa48229cb893f0c05968e40cb297..fb11134b128e47b3cef2b9e76c43960a 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32915,6 +32937,7 @@ +@@ -32928,6 +32950,7 @@ AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, @@ -2470,7 +2470,7 @@ index b7da6a4966c8fa48229cb893f0c05968e40cb297..fb11134b128e47b3cef2b9e76c43960a 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, 7CE7FA591EF882300060C9D6 /* DocumentTouch.h */, A8185F3209765765005826D9 /* DocumentType.cpp */, -@@ -37214,6 +37237,8 @@ +@@ -37229,6 +37252,8 @@ 1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */, 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, @@ -2479,7 +2479,7 @@ index b7da6a4966c8fa48229cb893f0c05968e40cb297..fb11134b128e47b3cef2b9e76c43960a CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, -@@ -38359,6 +38384,7 @@ +@@ -38375,6 +38400,7 @@ 0F54DD081881D5F5003EEDBB /* Touch.h in Headers */, 71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */, 0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */, @@ -2487,7 +2487,7 @@ index b7da6a4966c8fa48229cb893f0c05968e40cb297..fb11134b128e47b3cef2b9e76c43960a 0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */, 070334D71459FFD5008D8D45 /* TrackBase.h in Headers */, BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */, -@@ -39302,6 +39328,7 @@ +@@ -39318,6 +39344,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2495,7 +2495,7 @@ index b7da6a4966c8fa48229cb893f0c05968e40cb297..fb11134b128e47b3cef2b9e76c43960a 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -39378,6 +39405,9 @@ +@@ -39395,6 +39422,9 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2506,7 +2506,7 @@ index b7da6a4966c8fa48229cb893f0c05968e40cb297..fb11134b128e47b3cef2b9e76c43960a 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 1a0e3cec9998259c910ebb8f27a795b60ca1e6c8..577d9a4deef3910595b6af591280d9f56acb7166 100644 +index 143247b3da0e8169dc4e44117b46c2d40f3d6fcd..934b3ecd0223778698b4d4e7af0e67d7fa3798da 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2517,7 +2517,7 @@ index 1a0e3cec9998259c910ebb8f27a795b60ca1e6c8..577d9a4deef3910595b6af591280d9f5 #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3734,9 +3735,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3738,9 +3739,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (roleValue() == AccessibilityRole::ApplicationDialog) return AccessibilityObjectInclusion::IncludeObject; @@ -2535,7 +2535,7 @@ index 1a0e3cec9998259c910ebb8f27a795b60ca1e6c8..577d9a4deef3910595b6af591280d9f5 { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/accessibility/AccessibilityObjectInterface.h b/Source/WebCore/accessibility/AccessibilityObjectInterface.h -index 609f212740dfedc8e3cf50881ef7ebece3f42b40..1b2be343cfd1d2a1581d165693ca554a5810374c 100644 +index f6c025fd4e633bbf6374063a8eb2e224a40ae291..cc0432f13f97cddb35d98174662026d6d8e4f072 100644 --- a/Source/WebCore/accessibility/AccessibilityObjectInterface.h +++ b/Source/WebCore/accessibility/AccessibilityObjectInterface.h @@ -57,7 +57,7 @@ typedef const struct __AXTextMarkerRange* AXTextMarkerRangeRef; @@ -2547,7 +2547,7 @@ index 609f212740dfedc8e3cf50881ef7ebece3f42b40..1b2be343cfd1d2a1581d165693ca554a #endif namespace PAL { -@@ -1553,6 +1553,8 @@ private: +@@ -1559,6 +1559,8 @@ private: COMPtr m_wrapper; #elif USE(ATSPI) RefPtr m_wrapper; @@ -2654,7 +2654,7 @@ index 0000000000000000000000000000000000000000..dd2d8452302999e4a89b0bc18e842645 + +#endif // ENABLE(ACCESSIBILITY) && !USE(ATK) && !USE(ATSPI) diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index d9d5ef0042bf1c55d10961b2303e43e5c84ee92c..73bfe0258ce3aa6ded04d07626d01b18ec7b9ec2 100644 +index 9dd8961100cc0f5bd89fcc4f96e742b065d9657b..39ab8b145c45b526536825407cf66676c99e3586 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h @@ -157,6 +157,8 @@ namespace WebCore { @@ -2909,7 +2909,7 @@ index e060d8178fe501a0c6d47d4affaf4d422d15e358..5064f6ae31464a109b3dad0fc69e1866 #endif // USE(LIBWPE) diff --git a/Source/WebCore/html/FileInputType.cpp b/Source/WebCore/html/FileInputType.cpp -index 007f9ad8e0db8c1cb90993338037f4e64684eb00..2e9505445354f65b84243dac6b31ab6b4215a4e1 100644 +index c43310a5628456dddbdb27d5496c580854d40758..c962f3b962e28ef82baa1bf3da377e26b983ba77 100644 --- a/Source/WebCore/html/FileInputType.cpp +++ b/Source/WebCore/html/FileInputType.cpp @@ -38,6 +38,7 @@ @@ -2920,7 +2920,7 @@ index 007f9ad8e0db8c1cb90993338037f4e64684eb00..2e9505445354f65b84243dac6b31ab6b #include "LocalizedStrings.h" #include "MIMETypeRegistry.h" #include "RenderFileUploadControl.h" -@@ -200,6 +201,11 @@ void FileInputType::handleDOMActivateEvent(Event& event) +@@ -202,6 +203,11 @@ void FileInputType::handleDOMActivateEvent(Event& event) if (input.isDisabledFormControl()) return; @@ -2933,7 +2933,7 @@ index 007f9ad8e0db8c1cb90993338037f4e64684eb00..2e9505445354f65b84243dac6b31ab6b return; diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp -index 23b330d6d57226dd0e3e2d19117520097f6baf7f..45531ee0561e8783f245f05f27cd51c175c52b70 100644 +index 9e4515b7e7f7261f936471b81557ec96697c34e6..3b32377172112fc143b5e719122e8bf648be5b25 100644 --- a/Source/WebCore/inspector/InspectorController.cpp +++ b/Source/WebCore/inspector/InspectorController.cpp @@ -285,6 +285,8 @@ void InspectorController::disconnectFrontend(FrontendChannel& frontendChannel) @@ -3014,7 +3014,7 @@ index 4d5a3859ec6a46d07d45c80a3b5870ee2ef13d36..75eb55a024a6ae3892a4fedc535bf6a6 } // namespace WebCore diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp -index 1dcecd878be6ea8bcfee6765f9d38eec9afa51f5..00a73f00758fb89758732e3d102dc3236ef50ddd 100644 +index b9155185a63701f112db325c20fc1bc1a75688cc..f8c0f4e831998dfbbf30796434deb4e360c11399 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.cpp +++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp @@ -572,6 +572,13 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i @@ -3159,7 +3159,7 @@ index 1dcecd878be6ea8bcfee6765f9d38eec9afa51f5..00a73f00758fb89758732e3d102dc323 { if (is(context)) diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h -index 4b44709392749f24351f86ea97535b5eeee086b9..27cfa7f7ef15c6745e85dea7fb34a405766e57b1 100644 +index 6998406ddd32b9d81839f2fd6c86a690be2857c7..6b91f58798a530a801b3de05208c516f167237cb 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.h +++ b/Source/WebCore/inspector/InspectorInstrumentation.h @@ -31,6 +31,7 @@ @@ -3419,7 +3419,7 @@ index 07103c35e0a9193a010a85cf2ea8017b2ad59212..338d158be5a6f35adc6817dc94d6084b class UserGestureEmulationScope { WTF_MAKE_NONCOPYABLE(UserGestureEmulationScope); diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp -index 19b82d5098da96d66489c84c5309fc7225b8a725..188b193b1cf67f2cd4cf35ad2313de57bd703670 100644 +index f71765fd92ec340a8a34cf280671296e7f855890..6e9c9413018c906e474393a34b7281f190e73be7 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp @@ -62,12 +62,16 @@ @@ -3612,7 +3612,7 @@ index 19b82d5098da96d66489c84c5309fc7225b8a725..188b193b1cf67f2cd4cf35ad2313de57 + } + ScrollAlignment alignment = ScrollAlignment::alignCenterIfNeeded; + alignment.m_enableLegacyHorizontalVisibilityThreshold = false; // Disable RenderLayer minium horizontal scroll threshold. -+ renderer->scrollRectToVisible(absoluteBounds, insideFixed, { SelectionRevealMode::Reveal, alignment, alignment, ShouldAllowCrossOriginScrolling::Yes, ScrollBehavior::Instant }); ++ FrameView::scrollRectToVisible(absoluteBounds, *renderer, insideFixed, { SelectionRevealMode::Reveal, alignment, alignment, ShouldAllowCrossOriginScrolling::Yes, ScrollBehavior::Instant }); + return { }; +} + @@ -3816,7 +3816,7 @@ index 262829afb3c7151464de876368db47bf733e7f2e..fdcc8c44f3d24f13003b3eed3f2af79c void discardBindings(); diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp -index 921a2ea05ea6a21751c4f80f41df48d2a9b21462..c36e22d1c5e6594ba46af90e6dbaf3dbb35bae46 100644 +index 3f095032390bb73cd3d72422b969bcf3cb66f781..97a7ad9612301d5c00943cd2aa5ca475683b1c3a 100644 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp @@ -45,6 +45,7 @@ @@ -3855,7 +3855,7 @@ index 921a2ea05ea6a21751c4f80f41df48d2a9b21462..c36e22d1c5e6594ba46af90e6dbaf3db if (resourceLoader) { auto* metrics = response.deprecatedNetworkLoadMetricsOrNull(); responseObject->setTiming(buildObjectForTiming(metrics ? *metrics : NetworkLoadMetrics::emptyMetrics(), *resourceLoader)); -@@ -950,6 +954,7 @@ void InspectorNetworkAgent::continuePendingResponses() +@@ -954,6 +958,7 @@ void InspectorNetworkAgent::continuePendingResponses() Protocol::ErrorStringOr InspectorNetworkAgent::setExtraHTTPHeaders(Ref&& headers) { @@ -3863,7 +3863,7 @@ index 921a2ea05ea6a21751c4f80f41df48d2a9b21462..c36e22d1c5e6594ba46af90e6dbaf3db for (auto& entry : headers.get()) { auto stringValue = entry.value->asString(); if (!!stringValue) -@@ -1230,6 +1235,9 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptWithRequest(const +@@ -1234,6 +1239,9 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptWithRequest(const return makeUnexpected("Missing pending intercept request for given requestId"_s); auto& loader = *pendingRequest->m_loader; @@ -3873,7 +3873,7 @@ index 921a2ea05ea6a21751c4f80f41df48d2a9b21462..c36e22d1c5e6594ba46af90e6dbaf3db ResourceRequest request = loader.request(); if (!!url) request.setURL(URL({ }, url)); -@@ -1329,14 +1337,23 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithRespons +@@ -1333,14 +1341,23 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithRespons response.setHTTPStatusCode(status); response.setHTTPStatusText(AtomString { statusText }); HTTPHeaderMap explicitHeaders; @@ -3899,9 +3899,9 @@ index 921a2ea05ea6a21751c4f80f41df48d2a9b21462..c36e22d1c5e6594ba46af90e6dbaf3db if (loader->reachedTerminalState()) return; -@@ -1384,6 +1401,12 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithError(c - return { }; - } +@@ -1403,6 +1420,12 @@ Protocol::ErrorStringOr InspectorNetworkAgent::setEmulatedConditions(std:: + + #endif // ENABLE(INSPECTOR_NETWORK_THROTTLING) +Inspector::Protocol::ErrorStringOr InspectorNetworkAgent::setEmulateOfflineState(bool offline) +{ @@ -3913,7 +3913,7 @@ index 921a2ea05ea6a21751c4f80f41df48d2a9b21462..c36e22d1c5e6594ba46af90e6dbaf3db { return startsWithLettersIgnoringASCIICase(mimeType, "text/"_s) diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h -index 7f3f2986e0d48cb9927d2042211e336b94e05253..8fba37e07c7b723cecd1bf74bb28015966cd775c 100644 +index c6ebcc9d7e399a35f71350c9374df0f2107c518b..3bfa03ae7f27d9128fe207c1de1bfea9dbf5e44f 100644 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h @@ -34,6 +34,8 @@ @@ -3925,16 +3925,16 @@ index 7f3f2986e0d48cb9927d2042211e336b94e05253..8fba37e07c7b723cecd1bf74bb280159 #include "WebSocket.h" #include #include -@@ -98,6 +100,7 @@ public: - Inspector::Protocol::ErrorStringOr interceptWithResponse(const Inspector::Protocol::Network::RequestId&, const String& content, bool base64Encoded, const String& mimeType, std::optional&& status, const String& statusText, RefPtr&& headers) final; - Inspector::Protocol::ErrorStringOr interceptRequestWithResponse(const Inspector::Protocol::Network::RequestId&, const String& content, bool base64Encoded, const String& mimeType, int status, const String& statusText, Ref&& headers) final; - Inspector::Protocol::ErrorStringOr interceptRequestWithError(const Inspector::Protocol::Network::RequestId&, Inspector::Protocol::Network::ResourceErrorType) final; +@@ -101,6 +103,7 @@ public: + #if ENABLE(INSPECTOR_NETWORK_THROTTLING) + Inspector::Protocol::ErrorStringOr setEmulatedConditions(std::optional&& bytesPerSecondLimit) final; + #endif + Inspector::Protocol::ErrorStringOr setEmulateOfflineState(bool offline) final; // InspectorInstrumentation void willRecalculateStyle(); diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp -index a6e415a9bf47e0f4c98b9f375b3195df287fe67b..8ed9e64fff1c3745d7968b82974be5f24dca5562 100644 +index a6e415a9bf47e0f4c98b9f375b3195df287fe67b..2dbdbdee399a1f31b1d71024c916834be24f1729 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp @@ -32,20 +32,28 @@ @@ -4422,7 +4422,7 @@ index a6e415a9bf47e0f4c98b9f375b3195df287fe67b..8ed9e64fff1c3745d7968b82974be5f2 Protocol::ErrorStringOr InspectorPageAgent::setScreenSizeOverride(std::optional&& width, std::optional&& height) { if (width.has_value() != height.has_value()) -@@ -1127,6 +1340,630 @@ Protocol::ErrorStringOr InspectorPageAgent::setScreenSizeOverride(std::opt +@@ -1127,6 +1340,632 @@ Protocol::ErrorStringOr InspectorPageAgent::setScreenSizeOverride(std::opt m_inspectedPage.mainFrame().setOverrideScreenSize(FloatSize(width.value_or(0), height.value_or(0))); return { }; } @@ -4706,6 +4706,8 @@ index a6e415a9bf47e0f4c98b9f375b3195df287fe67b..8ed9e64fff1c3745d7968b82974be5f2 + return "StaticText"_s; + case AccessibilityRole::Subscript: + return "Subscript"_s; ++ case AccessibilityRole::Suggestion: ++ return "Suggestion"_s; + case AccessibilityRole::Summary: + return "Summary"_s; + case AccessibilityRole::Superscript: @@ -5465,7 +5467,7 @@ index 21e33e46bdb1af8434527747e3c308cbe53f60f0..c17c4de17f439c04d27caa532771934c protected: static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No); diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp -index 95f8f5c79247c97c1720856e4442626aef1428c7..0f55aa5e738916a0b455ccc3463c368a00fac0e1 100644 +index 76cdfc8422e8bf41f07bc0bc3da895d174ce414b..c01b0073b42937096e6c79233e359c67ef82a3dc 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -1506,8 +1506,6 @@ void DocumentLoader::detachFromFrame() @@ -5496,7 +5498,7 @@ index 4877a8fd398b0100ca3ed29aee9529281c7d19e7..e2e6c1c3ff04cb07c088ae666573008d DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index 2c546e05e080c67f6d51190df244ae1e5832c5d2..783170c3df966a91f48318c58f080d5f0a3fb535 100644 +index d38ad6e902bbdeb11b53778d51bbb77185b41020..7e225f3e466755d030de7c4b7242755f5579f243 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -1173,6 +1173,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr stat @@ -5555,7 +5557,7 @@ index 2c546e05e080c67f6d51190df244ae1e5832c5d2..783170c3df966a91f48318c58f080d5f } void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue) -@@ -3998,9 +4010,6 @@ String FrameLoader::referrer() const +@@ -3999,9 +4011,6 @@ String FrameLoader::referrer() const void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() { @@ -5565,7 +5567,7 @@ index 2c546e05e080c67f6d51190df244ae1e5832c5d2..783170c3df966a91f48318c58f080d5f Vector> worlds; ScriptController::getAllWorlds(worlds); for (auto& world : worlds) -@@ -4009,13 +4018,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() +@@ -4010,13 +4019,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world) { @@ -5632,7 +5634,7 @@ index a2c6d72b5ba0f04a49ca6dc710ef6fa5e0125c33..759b0d34b7db839027063a1b6ce8fb0f void ProgressTracker::incrementProgress(ResourceLoaderIdentifier identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index 88923781352599e1ce9b9621ac490c70d14605dd..dde90e5a9f822797fd9cea1b0cd9e726bbfcee04 100644 +index 331231f5e0e10dbeb74c7827929ac76bf49e2953..f6a9eb480f350a5cd4dbfec5e393f77e3fab1225 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -320,7 +320,7 @@ public: @@ -5674,7 +5676,7 @@ index 58fbc5e15aff1ab5c04952f056d48575c9c68498..2a638ab7da4557ec9be2c5e655f0666d static bool pageAtRuleSupportEnabled() { return shared().m_pageAtRuleSupportEnabled; } diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 411b7ee7ed6ce758d518d877a5bf06c25669fbe5..c8896559737135ed6acc9cb47c769164d4d27fe2 100644 +index 1cfb3665021ce207ea3b52ae970373416f466666..ca6977e66fb7a65a50b8be69fe9b154a2b60e3a9 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -142,6 +142,7 @@ @@ -5772,7 +5774,7 @@ index 411b7ee7ed6ce758d518d877a5bf06c25669fbe5..c8896559737135ed6acc9cb47c769164 return swallowEvent; } -@@ -4145,7 +4145,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4142,7 +4142,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -5788,7 +5790,7 @@ index 411b7ee7ed6ce758d518d877a5bf06c25669fbe5..c8896559737135ed6acc9cb47c769164 auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4597,7 +4604,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4619,7 +4626,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -5798,7 +5800,7 @@ index 411b7ee7ed6ce758d518d877a5bf06c25669fbe5..c8896559737135ed6acc9cb47c769164 PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4724,6 +4732,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4746,6 +4754,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -5809,7 +5811,7 @@ index 411b7ee7ed6ce758d518d877a5bf06c25669fbe5..c8896559737135ed6acc9cb47c769164 m_touchPressed = touches->length() > 0; if (allTouchReleased) diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h -index 61b7fb2da304cd03c5c23828208eedd4f51e643d..c00ea43a8436c67a9d9fbed2987d51e79f576a05 100644 +index 556cab9e978d31d23563fd5d5325bdb2470c2213..a232efeaf334b58301154dd93eb406d89f8995d2 100644 --- a/Source/WebCore/page/EventHandler.h +++ b/Source/WebCore/page/EventHandler.h @@ -136,9 +136,7 @@ public: @@ -5822,9 +5824,9 @@ index 61b7fb2da304cd03c5c23828208eedd4f51e643d..c00ea43a8436c67a9d9fbed2987d51e7 #if ENABLE(PAN_SCROLLING) void didPanScrollStart(); -@@ -391,10 +389,8 @@ private: - bool startKeyboardScrollAnimationOnEnclosingScrollableContainer(KeyboardEvent&, Node*); - bool keyboardScrollRecursively(KeyboardEvent&, Node*); +@@ -394,10 +392,8 @@ private: + bool startKeyboardScrollAnimationOnEnclosingScrollableContainer(ScrollDirection, ScrollGranularity, Node*); + bool focusedScrollableAreaUsesScrollSnap(); -#if ENABLE(DRAG_SUPPORT) bool handleMouseDraggedEvent(const MouseEventWithHitTestResults&, CheckDragHysteresis = ShouldCheckDragHysteresis); @@ -5833,7 +5835,7 @@ index 61b7fb2da304cd03c5c23828208eedd4f51e643d..c00ea43a8436c67a9d9fbed2987d51e7 WEBCORE_EXPORT bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&); -@@ -494,10 +490,8 @@ private: +@@ -497,10 +493,8 @@ private: void defaultTabEventHandler(KeyboardEvent&); void defaultArrowEventHandler(FocusDirection, KeyboardEvent&); @@ -5844,7 +5846,7 @@ index 61b7fb2da304cd03c5c23828208eedd4f51e643d..c00ea43a8436c67a9d9fbed2987d51e7 // The following are called at the beginning of handleMouseUp and handleDrag. // If they return true it indicates that they have consumed the event. -@@ -505,9 +499,10 @@ private: +@@ -508,9 +502,10 @@ private: #if ENABLE(DRAG_SUPPORT) bool eventLoopHandleMouseDragged(const MouseEventWithHitTestResults&); @@ -5856,7 +5858,7 @@ index 61b7fb2da304cd03c5c23828208eedd4f51e643d..c00ea43a8436c67a9d9fbed2987d51e7 enum class SetOrClearLastScrollbar { Clear, Set }; void updateLastScrollbarUnderMouse(Scrollbar*, SetOrClearLastScrollbar); -@@ -599,8 +594,8 @@ private: +@@ -602,8 +597,8 @@ private: Timer m_autoHideCursorTimer; #endif @@ -6407,7 +6409,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 030f4d11ef6cbe42db1c4cf345aedef2cc4a4a88..e8b136d253074ad7e36d4101c790896c320735f0 100644 +index 01f7507611f6d197432a43a5a4fa46d543e2f44b..e5d6f18ce7e1ec95d0def073a7985f18ada98530 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -486,6 +486,37 @@ void Page::setOverrideViewportArguments(const std::optional& @@ -6448,7 +6450,7 @@ index 030f4d11ef6cbe42db1c4cf345aedef2cc4a4a88..e8b136d253074ad7e36d4101c790896c ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -1355,10 +1386,6 @@ void Page::didCommitLoad() +@@ -1365,10 +1396,6 @@ void Page::didCommitLoad() m_isEditableRegionEnabled = false; #endif @@ -6459,7 +6461,7 @@ index 030f4d11ef6cbe42db1c4cf345aedef2cc4a4a88..e8b136d253074ad7e36d4101c790896c resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3412,6 +3439,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3422,6 +3449,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6477,7 +6479,7 @@ index 030f4d11ef6cbe42db1c4cf345aedef2cc4a4a88..e8b136d253074ad7e36d4101c790896c { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 8ec42d3bc9067f3befb954e18896026b51fc54c4..b77c119036bd59091fc9670041f413b0c45e829c 100644 +index 145b6d63b2abaa48f33badd19235b25ccddc7f13..d3a1177c63e7033481d420cd2c168aa0a178c973 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h @@ -282,6 +282,9 @@ public: @@ -6510,7 +6512,7 @@ index 8ec42d3bc9067f3befb954e18896026b51fc54c4..b77c119036bd59091fc9670041f413b0 #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -910,6 +919,11 @@ public: +@@ -912,6 +921,11 @@ public: bool shouldBuildInteractionRegions() const; #endif @@ -6522,7 +6524,7 @@ index 8ec42d3bc9067f3befb954e18896026b51fc54c4..b77c119036bd59091fc9670041f413b0 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -1029,6 +1043,9 @@ private: +@@ -1034,6 +1048,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6532,7 +6534,7 @@ index 8ec42d3bc9067f3befb954e18896026b51fc54c4..b77c119036bd59091fc9670041f413b0 #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1108,6 +1125,7 @@ private: +@@ -1113,6 +1130,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6540,7 +6542,7 @@ index 8ec42d3bc9067f3befb954e18896026b51fc54c4..b77c119036bd59091fc9670041f413b0 #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1285,6 +1303,11 @@ private: +@@ -1290,6 +1308,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6982,10 +6984,10 @@ index 44799e0b2a93cbcf25f4315d62a3d95896c02f3d..29277223448a0936a16f975970ab60d7 #endif diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h -index af3c23adfd34dc6a90916210f12cabe44ccc164f..0e571391b418ab80d487a01238e44c7bee649c6a 100644 +index 15e75c74d437b962dfffcafa9c086491064e1f15..2b4b682b087c645cdfd02997658e07a423bb9c2d 100644 --- a/Source/WebCore/platform/ScrollableArea.h +++ b/Source/WebCore/platform/ScrollableArea.h -@@ -102,7 +102,7 @@ public: +@@ -103,7 +103,7 @@ public: void stopKeyboardScrollAnimation(); #if ENABLE(TOUCH_EVENTS) @@ -7081,7 +7083,7 @@ index 0000000000000000000000000000000000000000..f0c3a183e5bc44bdfa4201e0db2067b4 + +#endif // ENABLE(SPEECH_SYNTHESIS) diff --git a/Source/WebCore/platform/graphics/FontCascade.h b/Source/WebCore/platform/graphics/FontCascade.h -index b9f5a43f03f9708014d5f9fbf043b16357f4878e..58ab030548916e850d9fa1c28f97e5f596bf41bf 100644 +index 560fb1141eea40a5b44036854c8517571bad03ba..e0bb3cf355be513e9908c7817429193579358012 100644 --- a/Source/WebCore/platform/graphics/FontCascade.h +++ b/Source/WebCore/platform/graphics/FontCascade.h @@ -308,7 +308,8 @@ private: @@ -9038,7 +9040,7 @@ index 77597632a0e3f5dbac4ed45312c401496cf2387d..c3861e47242b15234101ca02a83f2766 RemoveStorageAccessForFrame(WebCore::FrameIdentifier frameID, WebCore::PageIdentifier pageID); LogUserInteraction(WebCore::RegistrableDomain domain) diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp -index 3c29aa2cfbe5976a56441edf9771f938f5a88550..6aafe31234922ea526d363c6aada0ec83dde2501 100644 +index ea4c1677a48294e388e2928bd68da32dd5520731..ee36ce3d602408e01b9feb6e4138684444c35dc3 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -529,6 +529,12 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) @@ -9055,7 +9057,7 @@ index 3c29aa2cfbe5976a56441edf9771f938f5a88550..6aafe31234922ea526d363c6aada0ec8 void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index 474442eba3572155ac43f51809c180b037313a91..9f686de939dad5e68d58f1dbb1a4ba1a5c352b4f 100644 +index 933f58c4d5d46fa7e26b6e701248ff18f48fc1db..dd1e22c58e64aef7777d29695c74d8bc4a4614b6 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -36,6 +36,7 @@ @@ -9084,7 +9086,7 @@ index 474442eba3572155ac43f51809c180b037313a91..9f686de939dad5e68d58f1dbb1a4ba1a void clearPrevalentResource(PAL::SessionID, RegistrableDomain&&, CompletionHandler&&); void clearUserInteraction(PAL::SessionID, RegistrableDomain&&, CompletionHandler&&); diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in -index 8d57e5d0f214a419f4fb4364a35c693425a1a578..625df742514d6836d46846c3293f06de82ddb881 100644 +index 907df117b52eb258621a4a1866a3c6b6e2c33d8e..7344f8db2d6a8e229564562641f5637215f75707 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in @@ -77,6 +77,8 @@ messages -> NetworkProcess LegacyReceiver { @@ -9097,7 +9099,7 @@ index 8d57e5d0f214a419f4fb4364a35c693425a1a578..625df742514d6836d46846c3293f06de 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 11b3fc7c4267ef9e412d7d48bb6cfbe70b2bdfeb..af1fb6660696cf9c91d319670d5542727ae3ac18 100644 +index e58961bfa4dd8133eb991531dc5273ada68c4473..af9edd4418e78ddfe7cfa793e27058361f3c45b7 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h @@ -192,6 +192,9 @@ public: @@ -9110,7 +9112,7 @@ index 11b3fc7c4267ef9e412d7d48bb6cfbe70b2bdfeb..af1fb6660696cf9c91d319670d554272 #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -273,6 +276,7 @@ protected: +@@ -277,6 +280,7 @@ protected: bool m_privateClickMeasurementDebugModeEnabled { false }; std::optional m_ephemeralMeasurement; bool m_isRunningEphemeralMeasurementTest { false }; @@ -9122,7 +9124,7 @@ diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/ index 1dc6df3e1145332a0aeb902c0f5d7d5d727593be..230d268489a52391f7d4f336d22311e35c9f8278 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); @@ -10139,10 +10141,10 @@ index 90df093a49c09dc670dfea55077c77d889dd1c1b..6ffd51532e29b941b8dc10f545b7f5b8 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index befdbea94785276dc3c86890ec0f2b6e47ffefd9..2bb6111385bf87b5d120220812587d06bea850b8 100644 +index f1dbfe82ac54b6a21c578290816d38101df99163..d6673c25b881fd879bc5622bba401b7fdbdde37c 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -398,11 +398,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -399,11 +399,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10157,7 +10159,7 @@ index befdbea94785276dc3c86890ec0f2b6e47ffefd9..2bb6111385bf87b5d120220812587d06 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -412,6 +415,7 @@ UIProcess/PageLoadState.cpp +@@ -413,6 +416,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10165,7 +10167,7 @@ index befdbea94785276dc3c86890ec0f2b6e47ffefd9..2bb6111385bf87b5d120220812587d06 UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -453,6 +457,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -454,6 +458,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10174,7 +10176,7 @@ index befdbea94785276dc3c86890ec0f2b6e47ffefd9..2bb6111385bf87b5d120220812587d06 UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -576,7 +582,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -577,7 +583,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10367,35 +10369,6 @@ index 68e80682d1d0c003493e20a63d634aa8e0526a7d..67d6f7f1e370a537e1f539f58d555546 virtual void setStatusText(WebKit::WebPageProxy*, const WTF::String&) { } virtual void mouseDidMoveOverElement(WebKit::WebPageProxy&, const WebKit::WebHitTestResultData&, OptionSet, Object*) { } -diff --git a/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp b/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp -index ea48784147548a7ac6840445f225aef79dc825a4..e245546937667b82375f8bd778e5f41e5c61b818 100644 ---- a/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp -+++ b/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp -@@ -145,17 +145,18 @@ void WKContextConfigurationSetIgnoreSynchronousMessagingTimeoutsForTesting(WKCon - toImpl(configuration)->setIgnoreSynchronousMessagingTimeoutsForTesting(ignore); - } - --WKArrayRef WKContextConfigurationCopyOverrideLanguages(WKContextConfigurationRef) -+/* playwright revert fb205fb */ -+WKArrayRef WKContextConfigurationCopyOverrideLanguages(WKContextConfigurationRef configuration) - { -- // FIXME: Delete this function. -- return toAPI(&API::Array::create().leakRef()); -+ return toAPI(&API::Array::createStringArray(toImpl(configuration)->overrideLanguages()).leakRef()); - } - --void WKContextConfigurationSetOverrideLanguages(WKContextConfigurationRef, WKArrayRef) -+void WKContextConfigurationSetOverrideLanguages(WKContextConfigurationRef configuration, WKArrayRef overrideLanguages) - { -- // Use +[WKWebView _setOverrideLanguagesForTesting:] instead. -- // FIXME: Delete this function. -+ toImpl(configuration)->setOverrideLanguages(toImpl(overrideLanguages)->toStringVector()); - } -+/* end playwright revert fb205fb */ -+ - - bool WKContextConfigurationProcessSwapsOnNavigation(WKContextConfigurationRef configuration) - { diff --git a/Source/WebKit/UIProcess/API/C/WKInspector.cpp b/Source/WebKit/UIProcess/API/C/WKInspector.cpp index e1465edd29caf3109c17d44bb3c88aaba98cfbb5..32d569d3240c583334b8b6512407430fd448ae75 100644 --- a/Source/WebKit/UIProcess/API/C/WKInspector.cpp @@ -10568,7 +10541,7 @@ index 65e8eb74725e8b87f0ee14b1a9be9d25412a7102..958cb747889508a1096f43eeb68f24ce #import #import #import -@@ -234,6 +235,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple +@@ -234,6 +235,11 @@ static WallTime toSystemClockTime(NSDate *date) }); } @@ -10747,7 +10720,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(); } @@ -16779,7 +16752,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0fca057220 100644 +index fdd10e66ee6e02de0143aadb8fc6598e6e69472c..28642ca52c0334ffad4eb93bc7fc913b6b51c65d 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -246,6 +246,9 @@ @@ -16891,7 +16864,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2778,6 +2845,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2789,6 +2856,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -16900,7 +16873,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2788,6 +2857,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2799,6 +2868,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -16909,7 +16882,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2803,18 +2874,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2823,6 +2917,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2834,6 +2928,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -16979,7 +16952,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2835,8 +2947,18 @@ void WebPageProxy::didStartDrag() +@@ -2846,8 +2958,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -16999,7 +16972,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2941,16 +3063,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2952,16 +3074,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17044,7 +17017,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3114,7 +3258,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3125,7 +3269,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17053,7 +17026,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); auto updateTrackingType = [this, location](TrackingType& trackingType, EventTrackingRegions::EventType eventType) { -@@ -3146,7 +3290,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3157,7 +3301,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17062,7 +17035,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3535,6 +3679,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3546,6 +3690,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17071,7 +17044,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f receivedPolicyDecision(policyAction, navigation, navigation->websitePolicies(), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3605,6 +3751,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3616,6 +3762,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) { @@ -17079,7 +17052,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4379,6 +4526,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4390,6 +4537,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17091,7 +17064,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4790,6 +4942,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4801,6 +4953,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17099,7 +17072,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -5015,6 +5168,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -5026,6 +5179,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17108,7 +17081,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f // 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; -@@ -5538,7 +5693,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5549,7 +5704,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) { @@ -17124,7 +17097,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -6128,6 +6290,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -6139,6 +6301,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa if (originatingPage) openerAppInitiatedState = originatingPage->lastNavigationWasAppInitiated(); @@ -17132,7 +17105,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f 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); -@@ -6174,6 +6337,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -6185,6 +6348,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17140,7 +17113,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f } void WebPageProxy::exitFullscreenImmediately() -@@ -6233,6 +6397,10 @@ void WebPageProxy::closePage() +@@ -6244,6 +6408,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17151,7 +17124,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -6269,6 +6437,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -6280,6 +6448,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 { @@ -17160,7 +17133,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -6290,6 +6460,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -6301,6 +6471,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17169,7 +17142,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f 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 { -@@ -6313,6 +6485,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -6324,6 +6496,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17178,7 +17151,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f 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 { -@@ -6440,6 +6614,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6451,6 +6625,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17187,7 +17160,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7719,6 +7895,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7732,6 +7908,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17196,7 +17169,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f } break; } -@@ -7733,10 +7911,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7746,10 +7924,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -17213,7 +17186,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f break; } -@@ -7745,7 +7926,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7758,7 +7939,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()); @@ -17221,7 +17194,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7764,7 +7944,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7777,7 +7957,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); @@ -17229,7 +17202,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7773,6 +7952,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7786,6 +7965,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17237,7 +17210,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f } break; } -@@ -8106,7 +8286,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -8119,7 +8299,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -17249,7 +17222,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8440,6 +8623,7 @@ static Span gpuMachServices() +@@ -8453,6 +8636,7 @@ static Span gpuMachServices() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17257,7 +17230,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8633,6 +8817,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8646,6 +8830,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.httpsUpgradeEnabled = preferences().upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false; @@ -17266,7 +17239,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f #if PLATFORM(IOS) // FIXME: This is also being passed over the to WebProcess via the PreferencesStore. parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload(); -@@ -8705,6 +8891,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8718,6 +8904,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17281,7 +17254,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8798,6 +8992,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8811,6 +9005,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17298,7 +17271,7 @@ index 32040a2b6b9b7e7a2e243023bee6333e4540933b..a5d09ba08b5c30f33ec09857f9555b0f // 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 7dc91fc143fb74699da0fa3afeb382e8fc9e94d9..20bd170fd24735940e7d66bc0176aaadcc73e57e 100644 +index f383973f10976d2e05e646505354cf05432d05c3..3cf26979c68eb40a73710a29c816070454218b06 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17381,7 +17354,7 @@ index 7dc91fc143fb74699da0fa3afeb382e8fc9e94d9..20bd170fd24735940e7d66bc0176aaad RefPtr loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemesButNotAppLinks, API::Object* userData = nullptr); RefPtr loadFile(const String& fileURL, const String& resourceDirectoryURL, bool isAppInitiated = true, API::Object* userData = nullptr); RefPtr loadData(const IPC::DataReference&, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow); -@@ -1226,6 +1246,7 @@ public: +@@ -1228,6 +1248,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17389,7 +17362,7 @@ index 7dc91fc143fb74699da0fa3afeb382e8fc9e94d9..20bd170fd24735940e7d66bc0176aaad void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1315,14 +1336,20 @@ public: +@@ -1317,14 +1338,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17411,7 +17384,7 @@ index 7dc91fc143fb74699da0fa3afeb382e8fc9e94d9..20bd170fd24735940e7d66bc0176aaad #endif void processDidBecomeUnresponsive(); -@@ -1573,6 +1600,8 @@ public: +@@ -1575,6 +1602,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17420,7 +17393,7 @@ index 7dc91fc143fb74699da0fa3afeb382e8fc9e94d9..20bd170fd24735940e7d66bc0176aaad #endif #if ENABLE(WEB_CRYPTO) -@@ -2753,6 +2782,7 @@ private: +@@ -2755,6 +2784,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17428,7 +17401,7 @@ index 7dc91fc143fb74699da0fa3afeb382e8fc9e94d9..20bd170fd24735940e7d66bc0176aaad #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -3022,6 +3052,20 @@ private: +@@ -3024,6 +3054,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17449,7 +17422,7 @@ index 7dc91fc143fb74699da0fa3afeb382e8fc9e94d9..20bd170fd24735940e7d66bc0176aaad #endif PageLoadState m_pageLoadState; -@@ -3234,6 +3278,9 @@ private: +@@ -3238,6 +3282,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17510,7 +17483,7 @@ index a87227253e0f52388407d9c16a62a27cb35059fe..fbfbb6ef783e214707801963f61dc27f } diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index bc71c0ee252375990a89a4982040263942e06813..45f5d2352a6682fdc56dddba0f5cddb5b078f5da 100644 +index 7f9db2b972eef69cbbb7ed9185381bf2a3dcffe5..ab985444d3485303f5226883c7b2e8908455602d 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp @@ -364,17 +364,19 @@ void WebProcessPool::setCustomWebContentServiceBundleIdentifier(const String& cu @@ -17616,10 +17589,10 @@ 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 3d2ce5f9b8f1bc2d297c83b64c8008b454777e5c..85eddc707cceee9c5b201e01ddca15476bd8d759 100644 +index 92327dbecff5a487b81c6edf746b1401e5a3c551..8fc12b835a2a89a7c3e3f43d5e586d27f28b6dea 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2012,6 +2012,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, +@@ -1989,6 +1989,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, networkProcess().websiteDataOriginDirectoryForTesting(m_sessionID, WTFMove(origin), WTFMove(topOrigin), type, WTFMove(completionHandler)); } @@ -17633,7 +17606,7 @@ index 3d2ce5f9b8f1bc2d297c83b64c8008b454777e5c..85eddc707cceee9c5b201e01ddca1547 void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index ddc7ff82dc9cea71c999af037c0e665ebca41d67..8db6875b2882bfabdad2a38421f6b1e48b139993 100644 +index c26b6173f855320f7012cd57b3a0013103fb7ed7..4fefc0a2f084ebf5c88226904a06494627e99ba5 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h @@ -88,6 +88,7 @@ class SecKeyProxyStore; @@ -17667,7 +17640,7 @@ index ddc7ff82dc9cea71c999af037c0e665ebca41d67..8db6875b2882bfabdad2a38421f6b1e4 class WebsiteDataStore : public API::ObjectImpl, public Identified, public CanMakeWeakPtr { public: static Ref defaultDataStore(); -@@ -293,11 +303,13 @@ public: +@@ -294,11 +304,13 @@ public: const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; } #endif @@ -17682,7 +17655,7 @@ index ddc7ff82dc9cea71c999af037c0e665ebca41d67..8db6875b2882bfabdad2a38421f6b1e4 void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&); const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; } void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType); -@@ -361,6 +373,12 @@ public: +@@ -362,6 +374,12 @@ public: static constexpr uint64_t defaultPerOriginQuota() { return 1000 * MB; } static bool defaultShouldUseCustomStoragePaths(); @@ -17695,7 +17668,7 @@ index ddc7ff82dc9cea71c999af037c0e665ebca41d67..8db6875b2882bfabdad2a38421f6b1e4 void resetQuota(CompletionHandler&&); void clearStorage(CompletionHandler&&); #if PLATFORM(IOS_FAMILY) -@@ -458,9 +476,11 @@ private: +@@ -470,9 +488,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -17708,7 +17681,7 @@ index ddc7ff82dc9cea71c999af037c0e665ebca41d67..8db6875b2882bfabdad2a38421f6b1e4 WebCore::SoupNetworkProxySettings m_networkProxySettings; String m_cookiePersistentStoragePath; SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite }; -@@ -488,6 +508,10 @@ private: +@@ -500,6 +520,10 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -19671,7 +19644,7 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f877150d85c62 100644 +index 8cb7e00d736c9c24a2dd6cc0ac815adb28384b8a..7ceb2271b583225010bd99add5bc9e63c7c9d63c 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj @@ -1246,6 +1246,7 @@ @@ -19728,7 +19701,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 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 = ""; }; -@@ -6987,6 +7006,19 @@ +@@ -6989,6 +7008,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 = ""; }; @@ -19748,7 +19721,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 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 = ""; }; -@@ -7116,6 +7148,8 @@ +@@ -7118,6 +7150,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; }; @@ -19757,7 +19730,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 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; }; -@@ -7137,6 +7171,14 @@ +@@ -7139,6 +7173,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 = ""; }; @@ -19772,7 +19745,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 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 = ""; }; -@@ -7271,6 +7313,7 @@ +@@ -7273,6 +7315,7 @@ 52A69BEA286CFFAC00893E8F /* CryptoTokenKit.framework in Frameworks */, 3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */, 3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */, @@ -19780,7 +19753,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, -@@ -9415,6 +9458,7 @@ +@@ -9417,6 +9460,7 @@ 99788ACA1F421DCA00C08000 /* _WKAutomationSessionConfiguration.mm */, 990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */, 990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */, @@ -19788,7 +19761,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 5C4609E222430E4C009943C2 /* _WKContentRuleListAction.h */, 5C4609E322430E4D009943C2 /* _WKContentRuleListAction.mm */, 5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */, -@@ -10506,6 +10550,7 @@ +@@ -10510,6 +10554,7 @@ E34B110C27C46BC6006D2F2E /* libWebCoreTestShim.dylib */, E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */, DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */, @@ -19796,7 +19769,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 57A9FF15252C6AEF006A2040 /* libWTF.a */, 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, -@@ -11041,6 +11086,12 @@ +@@ -11045,6 +11090,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19809,7 +19782,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 ); path = Agents; sourceTree = ""; -@@ -11049,6 +11100,7 @@ +@@ -11053,6 +11104,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19817,7 +19790,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -11592,6 +11644,7 @@ +@@ -11596,6 +11648,7 @@ E1513C65166EABB200149FCB /* AuxiliaryProcessProxy.h */, 46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */, 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */, @@ -19825,7 +19798,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 4659F25E275FF6B200BBB369 /* CaptivePortalModeObserver.h */, 07297F9C1C1711EA003F0735 /* DeviceIdHashSaltStorage.cpp */, 07297F9D1C17BBEA223F0735 /* DeviceIdHashSaltStorage.h */, -@@ -11609,6 +11662,8 @@ +@@ -11613,6 +11666,8 @@ 2DD5A72A1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h */, 839A2F2F1E2067390039057E /* HighPerformanceGraphicsUsageSampler.cpp */, 839A2F301E2067390039057E /* HighPerformanceGraphicsUsageSampler.h */, @@ -19834,7 +19807,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */, 5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */, 31607F3819627002009B87DA /* LegacySessionStateCoding.h */, -@@ -11640,6 +11695,7 @@ +@@ -11644,6 +11699,7 @@ 1A0C227D2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm */, 1AEE57232409F142002005D6 /* QuickLookThumbnailLoader.h */, 1AEE57242409F142002005D6 /* QuickLookThumbnailLoader.mm */, @@ -19842,7 +19815,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */, 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */, 5CA98549210BEB5A0057EB6B /* SafeBrowsingWarning.h */, -@@ -11740,6 +11796,8 @@ +@@ -11744,6 +11800,8 @@ BC7B6204129A0A6700D174A4 /* WebPageGroup.h */, 2D9EA3101A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp */, 2D9EA30E1A96CBFF002D2807 /* WebPageInjectedBundleClient.h */, @@ -19851,7 +19824,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */, BC032DCB10F4389F0058C15A /* WebPageProxy.h */, BCBD38FA125BAB9A00D2C29F /* WebPageProxy.messages.in */, -@@ -11892,6 +11950,7 @@ +@@ -11896,6 +11954,7 @@ BC646C1911DD399F006455B0 /* WKBackForwardListItemRef.h */, BC646C1611DD399F006455B0 /* WKBackForwardListRef.cpp */, BC646C1711DD399F006455B0 /* WKBackForwardListRef.h */, @@ -19859,7 +19832,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 BCB9E24A1120E15C00A137E0 /* WKContext.cpp */, BCB9E2491120E15C00A137E0 /* WKContext.h */, 1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */, -@@ -12475,6 +12534,9 @@ +@@ -12479,6 +12538,9 @@ C18173602058424700DFDA65 /* DisplayLink.h */, 31ABA79C215AF9E000C90E31 /* HighPerformanceGPUManager.h */, 31ABA79D215AF9E000C90E31 /* HighPerformanceGPUManager.mm */, @@ -19869,7 +19842,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */, 0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */, 0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */, -@@ -12501,6 +12563,8 @@ +@@ -12505,6 +12567,8 @@ E568B92120A3AC6A00E3C856 /* WebDataListSuggestionsDropdownMac.mm */, E55CD20124D09F1F0042DB9C /* WebDateTimePickerMac.h */, E55CD20224D09F1F0042DB9C /* WebDateTimePickerMac.mm */, @@ -19878,7 +19851,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 BC857E8512B71EBB00EDEB2E /* WebPageProxyMac.mm */, BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */, BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */, -@@ -13685,6 +13749,7 @@ +@@ -13689,6 +13753,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19886,7 +19859,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -13933,6 +13998,7 @@ +@@ -13937,6 +14002,7 @@ E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */, 4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */, 1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */, @@ -19894,7 +19867,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 BC3065FA1259344E00E71278 /* CacheModel.h in Headers */, 41897ED81F415D8A0016FA42 /* CacheStorageEngine.h in Headers */, 41FABD2A1F4DE001006A6C97 /* CacheStorageEngineCache.h in Headers */, -@@ -14199,7 +14265,11 @@ +@@ -14203,7 +14269,11 @@ 2DD45ADE1E5F8972006C355F /* InputViewUpdateDeferrer.h in Headers */, CE550E152283752200D28791 /* InsertTextOptions.h in Headers */, 9197940523DBC4BB00257892 /* InspectorBrowserAgent.h in Headers */, @@ -19906,7 +19879,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */, 51E9049C27BCB9D400929E7E /* InstallCoordinationSPI.h in Headers */, C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */, -@@ -14417,6 +14487,7 @@ +@@ -14421,6 +14491,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -19914,7 +19887,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -14475,6 +14546,7 @@ +@@ -14479,6 +14550,7 @@ E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */, E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */, 7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */, @@ -19922,7 +19895,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 E4D54D0421F1D72D007E3C36 /* ScrollingTreeFrameScrollingNodeRemoteIOS.h in Headers */, 0F931C1C18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h in Headers */, 0F931C1C18C5711900DBB8D4 /* ScrollingTreeScrollingNodeDelegateIOS.h in Headers */, -@@ -14823,6 +14895,8 @@ +@@ -14827,6 +14899,8 @@ 2D9EA30F1A96CBFF002D2807 /* WebPageInjectedBundleClient.h in Headers */, 9197940823DBC4CB00257892 /* WebPageInspectorAgentBase.h in Headers */, A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */, @@ -19931,7 +19904,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 A543E30C215C8A8D00279CD9 /* WebPageInspectorTarget.h in Headers */, A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, -@@ -16753,6 +16827,8 @@ +@@ -16757,6 +16831,8 @@ 51E9049727BCB3D900929E7E /* ICAppBundle.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -19940,7 +19913,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, 2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */, -@@ -17087,6 +17163,8 @@ +@@ -17091,6 +17167,8 @@ E3816B3D27E2463A005EAFC0 /* WebMockContentFilterManager.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -19950,7 +19923,7 @@ index c9a52ea184317a63834cbd74425c835152b724dc..2e04b3a696cd377300a80e5c016f8771 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 a334e712505f19509dc0b9a4f79fa8213ac4cdfc..8516fdbecb560f9056274736c84ef0d12d4d3dca 100644 +index a9b58676edfe1774b6e40585b1bb77f12fd225cd..e31e74fbe3828006932b05f3d3f3f96f4d385cb9 100644 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp @@ -232,6 +232,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou @@ -19965,7 +19938,7 @@ index a334e712505f19509dc0b9a4f79fa8213ac4cdfc..8516fdbecb560f9056274736c84ef0d1 #if ENABLE(PDFJS) if (tryLoadingUsingPDFJSHandler(resourceLoader, trackingParameters)) return; -@@ -314,7 +319,8 @@ static void addParametersShared(const Frame* frame, NetworkResourceLoadParameter +@@ -324,7 +329,8 @@ static void addParametersShared(const Frame* frame, NetworkResourceLoadParameter } } @@ -19975,7 +19948,7 @@ index a334e712505f19509dc0b9a4f79fa8213ac4cdfc..8516fdbecb560f9056274736c84ef0d1 { auto identifier = resourceLoader.identifier(); ASSERT(identifier); -@@ -330,7 +336,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -340,7 +346,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL RunLoop::main().dispatch([resourceLoader = Ref { resourceLoader }, error = blockedError(request)] { resourceLoader->didFail(error); }); @@ -19984,7 +19957,7 @@ index a334e712505f19509dc0b9a4f79fa8213ac4cdfc..8516fdbecb560f9056274736c84ef0d1 } } -@@ -340,7 +346,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -350,7 +356,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); @@ -19992,7 +19965,7 @@ index a334e712505f19509dc0b9a4f79fa8213ac4cdfc..8516fdbecb560f9056274736c84ef0d1 loadParameters.identifier = identifier; loadParameters.webPageProxyID = trackingParameters.webPageProxyID; loadParameters.webPageID = trackingParameters.pageID; -@@ -425,14 +430,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -435,14 +440,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL if (loadParameters.options.mode != FetchOptions::Mode::Navigate) { ASSERT(loadParameters.sourceOrigin); @@ -20010,7 +19983,7 @@ index a334e712505f19509dc0b9a4f79fa8213ac4cdfc..8516fdbecb560f9056274736c84ef0d1 loadParameters.isMainFrameNavigation = resourceLoader.frame() && resourceLoader.frame()->isMainFrame() && resourceLoader.options().mode == FetchOptions::Mode::Navigate; if (loadParameters.isMainFrameNavigation && document) -@@ -464,6 +466,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -474,6 +476,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials); @@ -20028,7 +20001,7 @@ index a334e712505f19509dc0b9a4f79fa8213ac4cdfc..8516fdbecb560f9056274736c84ef0d1 std::optional existingNetworkResourceLoadIdentifierToResume; if (loadParameters.isMainFrameNavigation) -@@ -478,7 +491,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -488,7 +501,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } auto loader = WebResourceLoader::create(resourceLoader, trackingParameters); @@ -20037,7 +20010,7 @@ index a334e712505f19509dc0b9a4f79fa8213ac4cdfc..8516fdbecb560f9056274736c84ef0d1 } void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader) -@@ -885,7 +898,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier +@@ -895,7 +908,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier bool WebLoaderStrategy::isOnLine() const { @@ -20046,7 +20019,7 @@ index a334e712505f19509dc0b9a4f79fa8213ac4cdfc..8516fdbecb560f9056274736c84ef0d1 } void WebLoaderStrategy::addOnlineStateChangeListener(Function&& listener) -@@ -905,6 +918,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet +@@ -915,6 +928,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet void WebLoaderStrategy::setOnLineState(bool isOnLine) { @@ -20058,7 +20031,7 @@ index a334e712505f19509dc0b9a4f79fa8213ac4cdfc..8516fdbecb560f9056274736c84ef0d1 if (m_isOnLine == isOnLine) return; -@@ -913,6 +931,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) +@@ -923,6 +941,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) listener(isOnLine); } @@ -20138,7 +20111,7 @@ index 54650c8bb0e14d56a40969cd0d602930afb1dd22..9b7e57e07269d2504af30e73ea7e3623 auto permissionHandlers = m_requestsPerOrigin.take(securityOrigin); diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index b7790195195049d57e1997173a9c189eab7265d7..bba22bec053aa1bd6d2443e38a2d140c536ffcfd 100644 +index f2fb81d88d3332ec4680d606a2a99b0c411261f9..3808cdb9fca8d60d76c237255318d2196e4235f9 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -414,6 +414,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -20558,10 +20531,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 e03238a43b669be85d721a509decc56b80fc03e8..35a37c55376bb99f583f06a9cd27fba716cd785f 100644 +index 7838bb60fdea6350c29b5b0bbe0693ae78642aa3..a8c4aecd79c910bc492276d1bc03898b47fde107 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -940,6 +940,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -944,6 +944,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) ProcessCapabilities::setCanUseAcceleratedBuffers(false); } @@ -20571,7 +20544,7 @@ index e03238a43b669be85d721a509decc56b80fc03e8..35a37c55376bb99f583f06a9cd27fba7 updateThrottleState(); } -@@ -1715,6 +1718,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1719,6 +1722,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -20594,7 +20567,7 @@ index e03238a43b669be85d721a509decc56b80fc03e8..35a37c55376bb99f583f06a9cd27fba7 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()); -@@ -1991,17 +2010,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1995,17 +2014,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20613,7 +20586,7 @@ index e03238a43b669be85d721a509decc56b80fc03e8..35a37c55376bb99f583f06a9cd27fba7 // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -2018,20 +2033,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -2022,20 +2037,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20641,7 +20614,7 @@ index e03238a43b669be85d721a509decc56b80fc03e8..35a37c55376bb99f583f06a9cd27fba7 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -2039,7 +2052,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -2043,7 +2056,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20649,7 +20622,7 @@ index e03238a43b669be85d721a509decc56b80fc03e8..35a37c55376bb99f583f06a9cd27fba7 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2324,6 +2336,7 @@ void WebPage::scaleView(double scale) +@@ -2328,6 +2340,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20657,7 +20630,7 @@ index e03238a43b669be85d721a509decc56b80fc03e8..35a37c55376bb99f583f06a9cd27fba7 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2503,17 +2516,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2507,17 +2520,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20676,7 +20649,7 @@ index e03238a43b669be85d721a509decc56b80fc03e8..35a37c55376bb99f583f06a9cd27fba7 } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3427,6 +3436,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3431,6 +3440,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -20781,7 +20754,7 @@ index e03238a43b669be85d721a509decc56b80fc03e8..35a37c55376bb99f583f06a9cd27fba7 #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3503,6 +3610,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3507,6 +3614,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -20793,7 +20766,7 @@ index e03238a43b669be85d721a509decc56b80fc03e8..35a37c55376bb99f583f06a9cd27fba7 void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3743,6 +3855,7 @@ void WebPage::didCompletePageTransition() +@@ -3747,6 +3859,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -20801,7 +20774,7 @@ index e03238a43b669be85d721a509decc56b80fc03e8..35a37c55376bb99f583f06a9cd27fba7 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4601,7 +4714,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4609,7 +4722,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -20810,7 +20783,7 @@ index e03238a43b669be85d721a509decc56b80fc03e8..35a37c55376bb99f583f06a9cd27fba7 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -7023,6 +7136,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -7031,6 +7144,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20954,7 +20927,7 @@ index d2f2f9e9c740a25096c013114257f018f7c3e420..11158855b408fe2876757f1bf1c130e9 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 fdaca3bcda306311602556e63e7fe3581ce60136..2138b53e7f8c9e1b600b9ae9f3ed56521d61c248 100644 +index 39c9d791a5bf414f936eab72bf1e76d6c564ee8b..92d3b94d1e31b57b5d39437441d7edddca217b11 100644 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm @@ -801,21 +801,37 @@ String WebPage::platformUserAgent(const URL&) const @@ -21046,7 +21019,7 @@ index c77ff78cd3cd9627d1ae7b930c81457094645200..88746359159a76b169b7e6dcbee4fb34 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index aa91e10c9f28e11fd8a6416a5cad80355140ef54..6b653a95eb2f59d87ade3dc59103ec7178da3a6a 100644 +index 7c7c67927f8adca07c25b4577a74acf617ef066f..a6d2154628eb07617c6aea939736a026c8b0f5a9 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -92,6 +92,7 @@ @@ -21085,7 +21058,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; } @@ -21098,7 +21071,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) @@ -21107,7 +21080,7 @@ index f57ff1862f7bc2d2e88710c7b43d62b78b1765a0..fdcf7866546515473fe579333184d940 - (NSArray *)_touchEventRegions { -@@ -4080,7 +4080,7 @@ - (NSArray *)_touchEventRegions +@@ -4080,7 +4080,7 @@ IGNORE_WARNINGS_END }).autorelease(); } @@ -21148,7 +21121,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index ddfc5296ed48974ac104e299f6f2ecbeb541870b..19c6d2a254270dfd4d9e0adfeddcf25bc92b1b1a 100644 +index b23e53adb4b366a83240951bb8c64894f4a61048..04258cfbd13cc6ada8b152b4716e11b2a53a436e 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -11,8 +11,13 @@ if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ni @@ -21257,7 +21230,7 @@ index ddfc5296ed48974ac104e299f6f2ecbeb541870b..19c6d2a254270dfd4d9e0adfeddcf25b SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1) diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index 02dc572ae989650889da204aad10dc4a95322893..48ef331aab07749b147370354271bff1177f0bd5 100644 +index 2cdf38d15dccb56c08b3fa2f9c819a7a0190c6c3..4a5bf880adcb1f48001916c7f2f08c6ac48fcd7a 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -9,8 +9,13 @@ if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ni @@ -22104,10 +22077,10 @@ index 0000000000000000000000000000000000000000..3618075f10824beb0bc6cd8070772ab8 +#endif // USE(ATSPI) diff --git a/Tools/WebKitTestRunner/InjectedBundle/empty/AccessibilityUIElementEmpty.cpp b/Tools/WebKitTestRunner/InjectedBundle/empty/AccessibilityUIElementEmpty.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..fb739f862252dcdda61aa08e8e4861f8ba06d76c +index 0000000000000000000000000000000000000000..ffb14d1eeb29fd2cd3f963f8a5ba3f94a6648af0 --- /dev/null +++ b/Tools/WebKitTestRunner/InjectedBundle/empty/AccessibilityUIElementEmpty.cpp -@@ -0,0 +1,1044 @@ +@@ -0,0 +1,1064 @@ +/* + * Copyright (C) 2022 Microsoft Corporation. + * @@ -23149,6 +23122,26 @@ index 0000000000000000000000000000000000000000..fb739f862252dcdda61aa08e8e4861f8 + return nullptr; +} + ++bool AccessibilityUIElement::isInsertion() const ++{ ++ return false; ++} ++ ++bool AccessibilityUIElement::isDeletion() const ++{ ++ return false; ++} ++ ++bool AccessibilityUIElement::isFirstItemInSuggestion() const ++{ ++ return false; ++} ++ ++bool AccessibilityUIElement::isLastItemInSuggestion() const ++{ ++ return false; ++} ++ +} // namespace WTF + +#endif // !USE(ATSPI) && !USE(ATK) @@ -23181,24 +23174,10 @@ index 4f3640a8b93897d69604ee8ba38cd07561720ad2..eafdffd4196008949287344534400b0f InjectedBundle/wpe/InjectedBundleWPE.cpp InjectedBundle/wpe/TestRunnerWPE.cpp diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index c132facfcbb1b3ed9e46229bfb04ff6af32d4d6b..0a14f460b83164bb11ea4e1c1eb6a06d1f8300ba 100644 +index e8e387c158ec25408ac34e483b9e7158dfaa7ffd..415a9062054bcd31c1854d66c50f1c9444234100 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp -@@ -596,6 +596,13 @@ WKRetainPtr TestController::generateContextConfigurat - WKContextConfigurationSetFullySynchronousModeIsAllowedForTesting(configuration.get(), true); - WKContextConfigurationSetIgnoreSynchronousMessagingTimeoutsForTesting(configuration.get(), options.ignoreSynchronousMessagingTimeouts()); - -+ /* playwright revert fb205fb */ -+ auto overrideLanguages = adoptWK(WKMutableArrayCreate()); -+ for (auto& language : options.overrideLanguages()) -+ WKArrayAppendItem(overrideLanguages.get(), toWK(language).get()); -+ WKContextConfigurationSetOverrideLanguages(configuration.get(), overrideLanguages.get()); -+ /* end playwright revert fb205fb */ -+ - if (options.shouldEnableProcessSwapOnNavigation()) { - WKContextConfigurationSetProcessSwapsOnNavigation(configuration.get(), true); - if (options.enableProcessSwapOnWindowOpen()) -@@ -869,6 +876,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) +@@ -874,6 +874,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) 0, // requestStorageAccessConfirm shouldAllowDeviceOrientationAndMotionAccess, runWebAuthenticationPanel, @@ -23206,23 +23185,6 @@ index c132facfcbb1b3ed9e46229bfb04ff6af32d4d6b..0a14f460b83164bb11ea4e1c1eb6a06d decidePolicyForSpeechRecognitionPermissionRequest, decidePolicyForMediaKeySystemPermissionRequest, nullptr, // requestWebAuthenticationNoGesture -diff --git a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm -index 6cfd0d4b3c2f183a623621bbacdff6dc7a3a495c..87aa4f1c0022cf4d3d37e518339116efc0da5d20 100644 ---- a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm -+++ b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm -@@ -205,11 +205,7 @@ void TestController::platformCreateWebView(WKPageConfigurationRef, const TestOpt - [copiedConfiguration _setApplicationManifest:[_WKApplicationManifest applicationManifestFromJSON:text manifestURL:nil documentURL:nil]]; - } - -- auto overrideLanguages = options.overrideLanguages(); -- NSMutableArray *overrideLanguagesForAPI = [NSMutableArray arrayWithCapacity:overrideLanguages.size()]; -- for (auto& language : overrideLanguages) -- [overrideLanguagesForAPI addObject:[NSString stringWithUTF8String:language.c_str()]]; -- [TestRunnerWKWebView _setOverrideLanguagesForTesting:overrideLanguagesForAPI]; -+ /* playwright: removed overrideLanguages block here (playwright revert fb205fb) */ - - m_mainWebView = makeUnique(copiedConfiguration.get(), options); - finishCreatingPlatformWebView(m_mainWebView.get(), options); diff --git a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm index b0a503013185f29feeca47e4313b27e349973c02..ee1f87780a99b2b626b1ada984d6310975076019 100644 --- a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm