From 99363ae28e9ce1cde08c1a98e5bf854f01bf6496 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Wed, 21 Jul 2021 18:35:50 +0200 Subject: [PATCH] browser(webkit): roll to 07/21/21 (#7772) 3-way diff: https://github.com/q66/WebKit/commit/b8114e12a0977d1ba8717eaf0ed053dd333f9606 test suites were ran and come out the same as pre-rebase --- browser_patches/webkit/BUILD_NUMBER | 4 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 471 +++++++++--------- 3 files changed, 240 insertions(+), 237 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 68a3000e6e..77ba4c95fe 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1516 -Changed: joel.einbinder@gmail.com Thu Jul 15 11:03:43 CDT 2021 +1517 +Changed: dkolesa@igalia.com Wed Jul 21 17:35:38 CEST 2021 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index f66a908ad7..1421269939 100644 --- a/browser_patches/webkit/UPSTREAM_CONFIG.sh +++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://git.webkit.org/git/WebKit.git" BASE_BRANCH="master" -BASE_REVISION="bf8523d11fc7a9fd8cbcc6f85dd31df3ceb2b138" +BASE_REVISION="6120aa585d3a5380d49b9ab4eb03fe71423c7809" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index ce9932ddba..ff0fa1ebb1 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 873792881735b3f81ceb2fae6fcee4696781b44f..70efec93324024c107cd6af545dc39aeef233db5 100644 +index 9877e0c75c0e2c1a7c6fa0ef20033f250289ea10..213be9f1db6528c10b9cefd1c9ac0aae887146a8 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1243,22 +1243,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1244,22 +1244,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -1731,7 +1731,7 @@ index 2729df9dd4d15e19b7b2019ca94dd7647c5a6706..a7fdc92d594a7930ca029f162cc385bb #include diff --git a/Source/JavaScriptCore/runtime/JSDateMath.cpp b/Source/JavaScriptCore/runtime/JSDateMath.cpp -index ea0bfb0d7a5a64c1570da5333199f99b552a5ff6..2ebe8c6c5ac4343e0b373ccc271e86a4080a98dc 100644 +index dae9b3a9bc92fbafd4e30194b4d1a8d83dbd2cff..63cd8218c3cce5991121391ef0890e6e15e4037e 100644 --- a/Source/JavaScriptCore/runtime/JSDateMath.cpp +++ b/Source/JavaScriptCore/runtime/JSDateMath.cpp @@ -76,6 +76,7 @@ @@ -1742,7 +1742,7 @@ index ea0bfb0d7a5a64c1570da5333199f99b552a5ff6..2ebe8c6c5ac4343e0b373ccc271e86a4 #if U_ICU_VERSION_MAJOR_NUM >= 69 || (U_ICU_VERSION_MAJOR_NUM == 68 && USE(APPLE_INTERNAL_SDK)) #define HAVE_ICU_C_TIMEZONE_API 1 -@@ -333,6 +334,10 @@ double DateCache::parseDate(JSGlobalObject* globalObject, VM& vm, const String& +@@ -334,6 +335,10 @@ double DateCache::parseDate(JSGlobalObject* globalObject, VM& vm, const String& // https://tc39.es/ecma402/#sec-defaulttimezone String DateCache::defaultTimeZone() { @@ -1751,9 +1751,9 @@ index ea0bfb0d7a5a64c1570da5333199f99b552a5ff6..2ebe8c6c5ac4343e0b373ccc271e86a4 + return tz; + #if HAVE(ICU_C_TIMEZONE_API) - auto& timeZone = *timeZoneCache(); - Vector buffer; -@@ -382,16 +387,29 @@ Ref DateCache::cachedDateInstanceData(double millisecondsFromE + return timeZoneCache()->m_canonicalTimeZoneID; + #else +@@ -368,12 +373,20 @@ Ref DateCache::cachedDateInstanceData(double millisecondsFromE void DateCache::timeZoneCacheSlow() { ASSERT(!m_timeZoneCache); @@ -1761,19 +1761,21 @@ index ea0bfb0d7a5a64c1570da5333199f99b552a5ff6..2ebe8c6c5ac4343e0b373ccc271e86a4 + String override = WTF::timeZoneForAutomation(); #if HAVE(ICU_C_TIMEZONE_API) auto* cache = new OpaqueICUTimeZone; -+ // ucal_open checks that the status is success, so it has to be initialized here. + + String canonical; + UErrorCode status = U_ZERO_ERROR; Vector timeZoneID; - auto status = callBufferProducingFunction(ucal_getHostTimeZone, timeZoneID); -- ASSERT_UNUSED(status, U_SUCCESS(status)); + if (override.isEmpty()) { + status = callBufferProducingFunction(ucal_getHostTimeZone, timeZoneID); + ASSERT_UNUSED(status, U_SUCCESS(status)); + } else { + timeZoneID = override.charactersWithoutNullTermination(); + } - cache->m_calendar = std::unique_ptr>(ucal_open(timeZoneID.data(), timeZoneID.size(), "", UCAL_DEFAULT, &status)); - ASSERT_UNUSED(status, U_SUCCESS(status)); + if (U_SUCCESS(status)) { + Vector canonicalBuffer; + auto status = callBufferProducingFunction(ucal_getCanonicalTimeZoneID, timeZoneID.data(), timeZoneID.size(), canonicalBuffer, nullptr); +@@ -390,6 +403,11 @@ void DateCache::timeZoneCacheSlow() ucal_setGregorianChange(cache->m_calendar.get(), minECMAScriptTime, &status); // Ignore "unsupported" error. m_timeZoneCache = std::unique_ptr(cache); #else @@ -1949,10 +1951,10 @@ index 9b681a741c311ec2246f5b6de5df46e6f713d90c..1e3c9c43e2c7ef31e364ca056bf107e5 InspectorWindowFrame: type: String diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 9ecb7a3d6b39ca23ddd3258326a1fdc2f016ce30..743a455ad64684fd9fc35e4cd92056a9ba744e52 100644 +index c42ebeba067c15d7f5dc0e90ab3db452e922a4ed..4b31bafde566a1171a8c02c28a23eef0621241bd 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -@@ -622,9 +622,9 @@ MaskWebGLStringsEnabled: +@@ -635,9 +635,9 @@ MaskWebGLStringsEnabled: WebKitLegacy: default: true WebKit: @@ -1964,7 +1966,7 @@ index 9ecb7a3d6b39ca23ddd3258326a1fdc2f016ce30..743a455ad64684fd9fc35e4cd92056a9 # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -964,7 +964,7 @@ SpeechRecognitionEnabled: +@@ -977,7 +977,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2155,14 +2157,14 @@ index 9bd5fde5bc38355e25bc09d05a045df31efaa259..3f3be653fef9930a7ac8a348c8b9f9a2 if (Systemd_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 31e768e7e0ff681de8ba1b23e368f061e072a4fa..382649c414898b829fea1779f9fa6b38a993944a 100644 +index 57dfced7a146e003584942ac1d7b6d01561ffd25..94d60f4c06bec7706985c011c7c53d30e32e70e3 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -391,7 +391,7 @@ #define HAVE_NSHTTPCOOKIESTORAGE__INITWITHIDENTIFIER_WITH_INACCURATE_NULLABILITY 1 #endif --#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(MACCATALYST) +-#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(MACCATALYST) || PLATFORM(GTK) || PLATFORM(WPE) +#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(MACCATALYST) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN) #define HAVE_OS_DARK_MODE_SUPPORT 1 #endif @@ -2180,10 +2182,10 @@ index a840a487ff03a3c827455cab67faa8f83d20bfa9..29dd6a14f17295f1611451e6f5386617 if (Systemd_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index 6c1bb60d7681b205d1dc66409daf932c3ac51ff9..06d3d504a41e848781038fb01b4d99dd17848899 100644 +index 237b0c645bd905b0f8460b9f96dbe076a1b6b59d..7a371cbe17757d61cc062dc1953b763a84ebe91a 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -778,6 +778,10 @@ JS_BINDING_IDLS := \ +@@ -779,6 +779,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2194,7 +2196,7 @@ index 6c1bb60d7681b205d1dc66409daf932c3ac51ff9..06d3d504a41e848781038fb01b4d99dd $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1307,9 +1311,6 @@ JS_BINDING_IDLS := \ +@@ -1309,9 +1313,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2278,7 +2280,7 @@ index 66cec91542b74765a9c1ffbc2f28e1a5085c55e0..9a2a89a09279b3b7102282de6bfc4cc7 _hasSentSpeechStart = true; _delegateCallback(SpeechRecognitionUpdate::create(_identifier, SpeechRecognitionUpdateType::SpeechStart)); diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake -index 9d4f3bd1ade02a378340961d617aae1c5e0776a3..17b2b6cfb52d94d8104b68b9250883c40f69f975 100644 +index bc13d564edaaece26c488b4d7a6f68e8568df467..0a49521abb26a98a39db2ec91b81d1d9f09736db 100644 --- a/Source/WebCore/PlatformWPE.cmake +++ b/Source/WebCore/PlatformWPE.cmake @@ -38,6 +38,7 @@ list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES @@ -2288,7 +2290,7 @@ index 9d4f3bd1ade02a378340961d617aae1c5e0776a3..17b2b6cfb52d94d8104b68b9250883c4 + platform/wpe/SelectionData.h ) - list(APPEND WebCore_USER_AGENT_STYLE_SHEETS + set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt index 682dbcc06ceae7d76c1e0e9a66abf427e1ccb49b..9548501875df91a2901d01cfcdf9c4c43170c026 100644 --- a/Source/WebCore/SourcesCocoa.txt @@ -2342,10 +2344,10 @@ index ef168b76819216d984b7a2d0f760005fb9d24de8..2d6cf51f3b45191ad84106429d4f108f __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 4a1d78654768bc284fd67d7466d89acbd60cce98..63e0cd23e6a8c82c5a7b2d80b2614d5c3a924b6b 100644 +index f01b9927e3cc622e9ccc00b11eb2a2cdd03f7537..79de39825a95aa17bb51dc43519a9239615c2d2e 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5349,6 +5349,14 @@ +@@ -5354,6 +5354,14 @@ 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, ); }; }; @@ -2360,7 +2362,7 @@ index 4a1d78654768bc284fd67d7466d89acbd60cce98..63e0cd23e6a8c82c5a7b2d80b2614d5c 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, ); }; }; -@@ -16854,6 +16862,14 @@ +@@ -16868,6 +16876,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 = ""; }; @@ -2375,7 +2377,7 @@ index 4a1d78654768bc284fd67d7466d89acbd60cce98..63e0cd23e6a8c82c5a7b2d80b2614d5c 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 = ""; }; -@@ -22474,7 +22490,12 @@ +@@ -22489,7 +22505,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2388,7 +2390,7 @@ index 4a1d78654768bc284fd67d7466d89acbd60cce98..63e0cd23e6a8c82c5a7b2d80b2614d5c E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -28185,6 +28206,8 @@ +@@ -28203,6 +28224,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2397,7 +2399,7 @@ index 4a1d78654768bc284fd67d7466d89acbd60cce98..63e0cd23e6a8c82c5a7b2d80b2614d5c 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -30619,6 +30642,7 @@ +@@ -30642,6 +30665,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2405,7 +2407,7 @@ index 4a1d78654768bc284fd67d7466d89acbd60cce98..63e0cd23e6a8c82c5a7b2d80b2614d5c 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -31627,6 +31651,7 @@ +@@ -31650,6 +31674,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2413,7 +2415,7 @@ index 4a1d78654768bc284fd67d7466d89acbd60cce98..63e0cd23e6a8c82c5a7b2d80b2614d5c 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -33663,6 +33688,7 @@ +@@ -33690,6 +33715,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2421,7 +2423,7 @@ index 4a1d78654768bc284fd67d7466d89acbd60cce98..63e0cd23e6a8c82c5a7b2d80b2614d5c 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35727,9 +35753,11 @@ +@@ -35755,9 +35781,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2433,7 +2435,7 @@ index 4a1d78654768bc284fd67d7466d89acbd60cce98..63e0cd23e6a8c82c5a7b2d80b2614d5c B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36691,6 +36719,7 @@ +@@ -36719,6 +36747,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2441,7 +2443,7 @@ index 4a1d78654768bc284fd67d7466d89acbd60cce98..63e0cd23e6a8c82c5a7b2d80b2614d5c 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36777,6 +36806,7 @@ +@@ -36805,6 +36834,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2449,7 +2451,7 @@ index 4a1d78654768bc284fd67d7466d89acbd60cce98..63e0cd23e6a8c82c5a7b2d80b2614d5c 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36825,6 +36855,7 @@ +@@ -36853,6 +36883,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2457,7 +2459,7 @@ index 4a1d78654768bc284fd67d7466d89acbd60cce98..63e0cd23e6a8c82c5a7b2d80b2614d5c DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -37357,6 +37388,7 @@ +@@ -37385,6 +37416,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2497,10 +2499,10 @@ index 220b4a87f39b5df253e859126502fb3aa181c97c..bd5b0d39f09b21ef8ef4b3996e6f3ee0 { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index b50c654427bbd629e00456bb63732099b96c5f6f..0c829c5da76bd24d152b5593387569d09e64494d 100644 +index 0b5f8ee23e93b84f1aa673e69482ee1f67c7f046..a2b616187210fcdf21eeb4aa4172bb626bc74cca 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -@@ -88,6 +88,8 @@ namespace WebCore { +@@ -89,6 +89,8 @@ namespace WebCore { macro(Database) \ macro(DataTransferItem) \ macro(DataTransferItemList) \ @@ -5290,7 +5292,7 @@ index 16edb3bc689b8e2dde17597b642b706c1343e1f5..f363b2ca2410f22cff8d6ad908a88527 private: diff --git a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -index 7f9397a2aa7b8e611886c5bfa23019a578c1f354..18617fb37245d7087825fe3c94feda94b117a320 100644 +index 48120b7b79b9f8175335e7f018aebaab61bd0cc8..764c67292a938da0b763bb149013a39ad2230e5f 100644 --- a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp +++ b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp @@ -250,7 +250,7 @@ void LineLayout::prepareLayoutState() @@ -5356,7 +5358,7 @@ index 39eb06299e570c4759aecf0ef0971824eb505624..2f23d3e02f50ef08a761c783409979d7 DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index 854c13ee4ae01e6c2b83c5111b480318913ae0c5..26dd26904988564d57a9f3f86b5e7d9768513092 100644 +index bec297934002bb0e89e5f4b38c59281969b0f0af..0cb95e8dbc403bf72bc044c9daf1d5e525bc8650 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -1153,6 +1153,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat @@ -5504,10 +5506,10 @@ index 0dcb47556d04874878656e459c9bac9af64dcfbf..df57e9a47160bfbeb8188d80afd175c7 void ProgressTracker::incrementProgress(unsigned long identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index a8968c944e4a1abacc8c2fd03b971fd3b3f8e72c..2775d7b9e6794293935bb621b4b6154c5118641d 100644 +index 4862b6a779dfed8713af405e91dcafed52ee9981..945461edf62df868a1d836d2cf166d4c76e51031 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h -@@ -306,7 +306,7 @@ public: +@@ -308,7 +308,7 @@ public: #endif #if ENABLE(ORIENTATION_EVENTS) @@ -5730,7 +5732,7 @@ index 7b77e407ee5d08ab3784d0899cfa33f0177f0648..0060ebfb1128cc5eb28baa5ecf4538a2 request.setHTTPHeaderField(HTTPHeaderName::Accept, "text/event-stream"); request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache"); diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp -index 7054acc90214eb817bd784298ce77f76d32c5dee..658520b15acdd632aa01576fea1f49df3aa722f7 100644 +index 7054acc90214eb817bd784298ce77f76d32c5dee..9d351c8950842f5c6a7e3871ee6b6f5174a69f2a 100644 --- a/Source/WebCore/page/Frame.cpp +++ b/Source/WebCore/page/Frame.cpp @@ -39,6 +39,7 @@ @@ -6108,7 +6110,7 @@ index 7054acc90214eb817bd784298ce77f76d32c5dee..658520b15acdd632aa01576fea1f49df + + auto& style = renderer->style(); + -+ if (renderer->hasOverflowClip() ++ if (renderer->hasNonVisibleOverflow() + && (style.overflowY() == Overflow::Auto || style.overflowY() == Overflow::Scroll + || style.overflowX() == Overflow::Auto || style.overflowX() == Overflow::Scroll)) { + scrollingAncestor = node; @@ -6236,7 +6238,7 @@ index 1b77026f51092001cda86e32480890395b145b2e..6026bc23508016454f331b06c9f071a8 struct SnapshotOptions { diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp -index a7e9f33ea6effcda12ab56bb8618c8eb5e2cda60..fab672e5ae8559348059e360dfc0614ff4813d4a 100644 +index 0de47d19a0c960079caec536db2a2799e53f7155..bd428f975b4010f3179d6688df775d24a977e670 100644 --- a/Source/WebCore/page/FrameView.cpp +++ b/Source/WebCore/page/FrameView.cpp @@ -3026,7 +3026,7 @@ void FrameView::setBaseBackgroundColor(const Color& backgroundColor) @@ -6245,9 +6247,9 @@ index a7e9f33ea6effcda12ab56bb8618c8eb5e2cda60..fab672e5ae8559348059e360dfc0614f { -#if HAVE(OS_DARK_MODE_SUPPORT) +#if HAVE(OS_DARK_MODE_SUPPORT) && (defined(WTF_PLATFORM_MAC) && WTF_PLATFORM_MAC) || (defined(WTF_PLATFORM_IOS_FAMILY) && WTF_PLATFORM_IOS_FAMILY) - Color baseBackgroundColor = backgroundColor.value_or(RenderTheme::singleton().systemColor(CSSValueAppleSystemControlBackground, styleColorOptions())); + #if PLATFORM(COCOA) + static const auto cssValueControlBackground = CSSValueAppleSystemControlBackground; #else - Color baseBackgroundColor = backgroundColor.value_or(Color::white); diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp index 28d1fc3242174a680711027877d4153923790220..058b5309eed081fcc1e4158f66e806421dcc9d56 100644 --- a/Source/WebCore/page/History.cpp @@ -6269,10 +6271,10 @@ index 28d1fc3242174a680711027877d4153923790220..058b5309eed081fcc1e4158f66e80642 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 ed9d8140eb704b12f32a87a28d85265543fbfa92..4028cad398fe50c1c771e1b386e08d5829d73892 100644 +index f778077a290539c1a16b1721bb082ba79950ee1f..8251f8ee42743dca41338dfd9c4f9138cb80a964 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -453,6 +453,37 @@ void Page::setOverrideViewportArguments(const std::optional& +@@ -455,6 +455,37 @@ void Page::setOverrideViewportArguments(const std::optional& document->updateViewportArguments(); } @@ -6310,7 +6312,7 @@ index ed9d8140eb704b12f32a87a28d85265543fbfa92..4028cad398fe50c1c771e1b386e08d58 ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -1274,11 +1305,6 @@ void Page::didCommitLoad() +@@ -1281,11 +1312,6 @@ void Page::didCommitLoad() #if ENABLE(EDITABLE_REGION) m_isEditableRegionEnabled = false; #endif @@ -6322,7 +6324,7 @@ index ed9d8140eb704b12f32a87a28d85265543fbfa92..4028cad398fe50c1c771e1b386e08d58 resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3256,6 +3282,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3263,6 +3289,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6340,10 +6342,10 @@ index ed9d8140eb704b12f32a87a28d85265543fbfa92..4028cad398fe50c1c771e1b386e08d58 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 7b390cbac69380642210d75d4492838361481713..a1648323af19b106c6ed9bf5f442c19e42e292d6 100644 +index 7dab09a21dcb300f5e9eae73cf4c5096f9d92ddf..fd9d68b8beeed480ca65f004ef9ef46c877dd71c 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h -@@ -256,6 +256,9 @@ public: +@@ -258,6 +258,9 @@ public: const std::optional& overrideViewportArguments() const { return m_overrideViewportArguments; } WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional&); @@ -6353,7 +6355,7 @@ index 7b390cbac69380642210d75d4492838361481713..a1648323af19b106c6ed9bf5f442c19e static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -303,6 +306,10 @@ public: +@@ -308,6 +311,10 @@ public: DragCaretController& dragCaretController() const { return *m_dragCaretController; } #if ENABLE(DRAG_SUPPORT) DragController& dragController() const { return *m_dragController; } @@ -6364,7 +6366,7 @@ index 7b390cbac69380642210d75d4492838361481713..a1648323af19b106c6ed9bf5f442c19e #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -461,6 +468,8 @@ public: +@@ -466,6 +473,8 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6373,7 +6375,7 @@ index 7b390cbac69380642210d75d4492838361481713..a1648323af19b106c6ed9bf5f442c19e #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -837,6 +846,11 @@ public: +@@ -842,6 +851,11 @@ public: WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; @@ -6385,7 +6387,7 @@ index 7b390cbac69380642210d75d4492838361481713..a1648323af19b106c6ed9bf5f442c19e #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -922,6 +936,9 @@ private: +@@ -927,6 +941,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6395,7 +6397,7 @@ index 7b390cbac69380642210d75d4492838361481713..a1648323af19b106c6ed9bf5f442c19e #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1001,6 +1018,7 @@ private: +@@ -1006,6 +1023,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6403,7 +6405,7 @@ index 7b390cbac69380642210d75d4492838361481713..a1648323af19b106c6ed9bf5f442c19e #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1161,6 +1179,11 @@ private: +@@ -1167,6 +1185,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6460,10 +6462,10 @@ index 49548142f6db6b245cf6ba234272615028aad1ae..ff1ed0ea25ff4f036763c5f381803cc3 #endif bool hasAnyElement() const { diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.cpp b/Source/WebCore/page/RuntimeEnabledFeatures.cpp -index 6b2bc1bdb38be0543f20d51d200944b3f547f6a9..68a1773c0f578ecf8d5d7aa15ec1d34d9ad7a0a2 100644 +index 40c2ebaa2f7acad478c9e5abe2e49b1f4b585202..ba7edc32330d314c0e4ad1c9422a356b72dd9452 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.cpp +++ b/Source/WebCore/page/RuntimeEnabledFeatures.cpp -@@ -56,7 +56,11 @@ RuntimeEnabledFeatures& RuntimeEnabledFeatures::sharedFeatures() +@@ -57,7 +57,11 @@ RuntimeEnabledFeatures& RuntimeEnabledFeatures::sharedFeatures() #if ENABLE(TOUCH_EVENTS) bool RuntimeEnabledFeatures::touchEventsEnabled() const { @@ -6477,7 +6479,7 @@ index 6b2bc1bdb38be0543f20d51d200944b3f547f6a9..68a1773c0f578ecf8d5d7aa15ec1d34d #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index e16cb5d15762186550f95baaa2fb4ee8ca36d6ce..4a73cc01fb8a51bfb6818343dbbfbd989cda6647 100644 +index a0d3cea79d7e0ae0748240dd22eee2d5575044a6..d58ef313d23be11420fb069ef5add8be1bb8aacc 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h @@ -202,6 +202,7 @@ public: @@ -6573,7 +6575,7 @@ index fc85fffa9b20cf5d3a2cff89b7d38ecf84aa0ff6..1070a1973d0ea23c6781df4269fc4349 for (auto& policy : m_policies) { if (const ContentSecurityPolicyDirective* violatedDirective = (policy.get()->*predicate)(std::forward(args)...)) { diff --git a/Source/WebCore/page/ios/FrameIOS.mm b/Source/WebCore/page/ios/FrameIOS.mm -index 12cc7336ae87b6d9d8ea83cf543d029914eaf1db..b97227e21bf9e7166980c20d2efdc24ea28058a2 100644 +index a4999e21fa2d912dc32ee39a7d1d32eefa2083c7..b97227e21bf9e7166980c20d2efdc24ea28058a2 100644 --- a/Source/WebCore/page/ios/FrameIOS.mm +++ b/Source/WebCore/page/ios/FrameIOS.mm @@ -226,354 +226,6 @@ CGRect Frame::renderRectForPoint(CGPoint point, bool* isReplaced, float* fontSiz @@ -6914,7 +6916,7 @@ index 12cc7336ae87b6d9d8ea83cf543d029914eaf1db..b97227e21bf9e7166980c20d2efdc24e - - auto& style = renderer->style(); - -- if (renderer->hasOverflowClip() +- if (renderer->hasNonVisibleOverflow() - && (style.overflowY() == Overflow::Auto || style.overflowY() == Overflow::Scroll - || style.overflowX() == Overflow::Auto || style.overflowX() == Overflow::Scroll)) { - scrollingAncestor = node; @@ -8977,10 +8979,10 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp -index 161c262f05e26e89808f90d90ff210d1f6199063..59d90ad0dd32b7a0948c3f6ed15c9ce16a9ae655 100644 +index 8fc625d60894c8060e0bc846c178eaabf1300dee..0b625147b00f8585b0c7c34dcd19cd41712d29ea 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp -@@ -2560,7 +2560,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay +@@ -2565,7 +2565,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay ScrollAlignment::Behavior scrollX; LayoutRect exposeRectX(exposeRect.x(), visibleRect.y(), exposeRect.width(), visibleRect.height()); LayoutUnit intersectWidth = intersection(visibleRect, exposeRectX).width(); @@ -8990,7 +8992,7 @@ index 161c262f05e26e89808f90d90ff210d1f6199063..59d90ad0dd32b7a0948c3f6ed15c9ce1 // If the rectangle is partially visible, but over a certain threshold, // then treat it as fully visible to avoid unnecessary horizontal scrolling diff --git a/Source/WebCore/rendering/RenderTextControl.cpp b/Source/WebCore/rendering/RenderTextControl.cpp -index 242aca3a06b91574a748b13ecefa80c6172b9c59..4dcd61750471013be4455b0270a8a21a7b489d47 100644 +index 0f281a057cf65180e4be869906e82c6b17b8020c..3c2bed5a8f01a8b486db6336dde6b38139c2cefa 100644 --- a/Source/WebCore/rendering/RenderTextControl.cpp +++ b/Source/WebCore/rendering/RenderTextControl.cpp @@ -207,13 +207,13 @@ void RenderTextControl::layoutExcludedChildren(bool relayoutChildren) @@ -9001,7 +9003,7 @@ index 242aca3a06b91574a748b13ecefa80c6172b9c59..4dcd61750471013be4455b0270a8a21a bool RenderTextControl::canScroll() const { auto innerText = innerTextElement(); - return innerText && innerText->renderer() && innerText->renderer()->hasOverflowClip(); + return innerText && innerText->renderer() && innerText->renderer()->hasNonVisibleOverflow(); } +#if PLATFORM(IOS_FAMILY) @@ -9036,10 +9038,10 @@ index 694008e0451edc5770142a0a6d9eed52b04ded80..ec93869f9486bdf7bd3bb56478c62469 WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, ScrollAlignment::Behavior); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -index 14fc0e0634d2d91505d6ff1eb78153ff15bbc891..5dacbd695125d26aa0acd36cb32e9e2a02721789 100644 +index 5fae58964efcb32c85c2e3f6483f09d22f8def8d..bd6653c4fda816076594936543be88c9486b03bc 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -@@ -74,6 +74,11 @@ +@@ -75,6 +75,11 @@ #include #include @@ -9051,7 +9053,7 @@ index 14fc0e0634d2d91505d6ff1eb78153ff15bbc891..5dacbd695125d26aa0acd36cb32e9e2a #if ENABLE(APPLE_PAY_REMOTE_UI) #include "WebPaymentCoordinatorProxyMessages.h" #endif -@@ -903,6 +908,15 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) +@@ -913,6 +918,15 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) #endif } @@ -9094,7 +9096,7 @@ index 9b32896810619ba19dc5bf437b368a7ca7fa431b..a026b8ae7024f914e78f3f5137bc2031 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 aea2faa58a1581f00bf56bceeed177b44a436096..58a9e01eaa818d684cc230962a4d6f49a567eb62 100644 +index 4360502d106179f6728959cce32cf6076d119073..6f2c4d6cbb52443983a6d10ea21f0e1552151a92 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -9166,7 +9168,7 @@ index aea2faa58a1581f00bf56bceeed177b44a436096..58a9e01eaa818d684cc230962a4d6f49 void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index 7948097aa3dc386a2fd41fad623b3cecdf8d7e4a..364575825d4adb9e9147d770207297601865cc18 100644 +index f06dad4729bdfbea753ff8c93aa3e75a9ad88b03..5b78bd56ee80c5173e52097709838b642fa0ddd2 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -35,6 +35,7 @@ @@ -9220,10 +9222,10 @@ index e05f2e320584737b347fab21bf6a2e6979a8c8ce..ffb950331439ac81cf408a51897d3df1 ClearPrevalentResource(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () Async ClearUserInteraction(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () Async diff --git a/Source/WebKit/NetworkProcess/NetworkSession.h b/Source/WebKit/NetworkProcess/NetworkSession.h -index c38dec1a13c5111ad4552457bc7f80e0901a28e7..594f95903b7b97e2970807f807a397591bddd345 100644 +index 0dcfb27cc2fa85d24fb3b520a751591ee30120e7..3d644dba5f6b6d389d2fd94b64939208372a8cfb 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h -@@ -154,6 +154,9 @@ public: +@@ -156,6 +156,9 @@ public: bool isStaleWhileRevalidateEnabled() const { return m_isStaleWhileRevalidateEnabled; } @@ -9233,7 +9235,7 @@ index c38dec1a13c5111ad4552457bc7f80e0901a28e7..594f95903b7b97e2970807f807a39759 #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -202,6 +205,7 @@ protected: +@@ -204,6 +207,7 @@ protected: #endif bool m_isStaleWhileRevalidateEnabled { false }; std::unique_ptr m_privateClickMeasurement; @@ -9372,10 +9374,10 @@ index 0d6e7aedff68227bf7dc8ab7184abc6fd3321c54..67b616d818aa42f8cae33f0535c888cd void deleteLocalStorageEntriesForOrigins(const Vector&); Vector getLocalStorageOriginDetailsCrossThreadCopy() const; diff --git a/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.cpp b/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.cpp -index 982621afbfed2dda9dcc62a37430658c373944f3..f51f1858bf3f063ccc6a0af1ec1a55a34954b89e 100644 +index 36abea5050b84b18c922715669b7923a08dcadff..17e53c74c465b5c4487793f53765590909c32c60 100644 --- a/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.cpp +++ b/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.cpp -@@ -272,6 +272,50 @@ void StorageManagerSet::getLocalStorageOrigins(PAL::SessionID sessionID, GetOrig +@@ -263,6 +263,50 @@ void StorageManagerSet::getLocalStorageOrigins(PAL::SessionID sessionID, GetOrig }); } @@ -9427,7 +9429,7 @@ index 982621afbfed2dda9dcc62a37430658c373944f3..f51f1858bf3f063ccc6a0af1ec1a55a3 { ASSERT(RunLoop::isMain()); diff --git a/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.h b/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.h -index 6945f2b199202a77413bef711a59510a700d18b3..d7e84ca85e18163a02407f383339df4ff95984e5 100644 +index 079aadc115052815898a5c7cbdba1525275bc09b..be57247f7a03346f963f5d8adecb36a6b06ff6ab 100644 --- a/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.h +++ b/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.h @@ -45,6 +45,7 @@ using ConnectToStorageAreaCallback = CompletionHandlernetworkLoadMetrics())); @@ -9815,10 +9817,10 @@ index 06ca252b043959d457814d45886949a85b1a19c1..597e63aca71d213526d953ead357fbc0 } return makeUnique(channel, request, soupSession(), soupMessage.get(), protocol); diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index d679785ca3bd58b2ed2ce08765eb55701bf5e723..14de9b9f902d7d131f44d0aedcf7ed751e55e7ca 100644 +index 8986082af78547fcce4475d05315d3819f914094..dd36140f14413ff911ec096c585673da4d11364f 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake -@@ -450,6 +450,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -451,6 +451,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GSTREAMER_PBUTILS_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -9828,7 +9830,7 @@ index d679785ca3bd58b2ed2ce08765eb55701bf5e723..14de9b9f902d7d131f44d0aedcf7ed75 ) if (USE_WPE_RENDERER) -@@ -503,6 +506,9 @@ if (USE_LIBWEBRTC) +@@ -504,6 +507,9 @@ if (USE_LIBWEBRTC) list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/libwebrtc/Source/" "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc" @@ -9838,7 +9840,7 @@ index d679785ca3bd58b2ed2ce08765eb55701bf5e723..14de9b9f902d7d131f44d0aedcf7ed75 ) endif () -@@ -517,6 +523,12 @@ if (ENABLE_MEDIA_STREAM) +@@ -518,6 +524,12 @@ if (ENABLE_MEDIA_STREAM) ) endif () @@ -10293,7 +10295,7 @@ index 3dbe10d49b4de34636900efe31fb57e7e60e341c..1457cbaad0bf5c3b17902fd8c2f243a2 const WebCore::IntPoint& globalPosition() const { return m_globalPosition; } float deltaX() const { return m_deltaX; } diff --git a/Source/WebKit/Shared/WebPageCreationParameters.cpp b/Source/WebKit/Shared/WebPageCreationParameters.cpp -index 2baef06cacab3e515e7046d517a5356bf03c3c30..ffd8d0943845f727d96c6631e9d4a3ea4cf790ee 100644 +index 565fdb6ba99243c58a2e24b62fc7b7925e077dc2..d463893d69a2ca4c0c35b6ab108e6f570be272e0 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.cpp +++ b/Source/WebKit/Shared/WebPageCreationParameters.cpp @@ -156,6 +156,8 @@ void WebPageCreationParameters::encode(IPC::Encoder& encoder) const @@ -10318,17 +10320,17 @@ index 2baef06cacab3e515e7046d517a5356bf03c3c30..ffd8d0943845f727d96c6631e9d4a3ea return std::nullopt; diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h -index 6517892212c2399e1aac36ea6b6fc3b152fd589d..05d3087309da83166943fde7ee12296cb7b3c866 100644 +index f2b84137df4491d1a756ae058e3f59863edaa313..3de509d513e0c32fc54509a5a47eb28dcff7c83d 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.h +++ b/Source/WebKit/Shared/WebPageCreationParameters.h -@@ -247,6 +247,8 @@ struct WebPageCreationParameters { +@@ -251,6 +251,8 @@ struct WebPageCreationParameters { WebCore::ShouldRelaxThirdPartyCookieBlocking shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No }; + bool shouldPauseInInspectorWhenShown { false }; + #if PLATFORM(GTK) - String themeName; + GtkSettingsState gtkSettings; #endif diff --git a/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp b/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp index c204637774ee803eac42a34cde79aa556f143b82..345f5b08179e3dd239725bed06e48b46bc718336 100644 @@ -10634,10 +10636,10 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index afd5a20f6eb79fef2fd2419e142b55a3acd9d00a..6f4fa9bb8658b0563ee921ef022bd657d3d02204 100644 +index f3031e792beb453f167d8813e88abecbc2b5cb7b..9b843cf1c0a975258e12f4f1e9d14fd9b4fb464e 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -292,11 +292,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -293,11 +293,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10652,7 +10654,7 @@ index afd5a20f6eb79fef2fd2419e142b55a3acd9d00a..6f4fa9bb8658b0563ee921ef022bd657 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -305,6 +308,7 @@ UIProcess/PageLoadState.cpp +@@ -306,6 +309,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10660,7 +10662,7 @@ index afd5a20f6eb79fef2fd2419e142b55a3acd9d00a..6f4fa9bb8658b0563ee921ef022bd657 UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -345,6 +349,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -346,6 +350,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10669,7 +10671,7 @@ index afd5a20f6eb79fef2fd2419e142b55a3acd9d00a..6f4fa9bb8658b0563ee921ef022bd657 UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -466,7 +472,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -467,7 +473,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10682,10 +10684,10 @@ index afd5a20f6eb79fef2fd2419e142b55a3acd9d00a..6f4fa9bb8658b0563ee921ef022bd657 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index c449bc5d99febc2c7712def84b8e21e864277dc5..c20873bc38fb1a0cef1a120e28a4488c8fa789cc 100644 +index 29f7fe07db66bde30a715b59f71e4f13ba553383..6a256aae5d79c1db984bd25f28879e7326627819 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -267,6 +267,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -268,6 +268,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -10693,7 +10695,7 @@ index c449bc5d99febc2c7712def84b8e21e864277dc5..c20873bc38fb1a0cef1a120e28a4488c UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -439,6 +440,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -440,6 +441,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -10702,10 +10704,10 @@ index c449bc5d99febc2c7712def84b8e21e864277dc5..c20873bc38fb1a0cef1a120e28a4488c UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm UIProcess/Inspector/mac/WKInspectorViewController.mm diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt -index a4391be7b637fd96d880cb06838b6deb5db552b6..3f7d5e6c9debc1cf1155da11bad14fc5c3b01dc8 100644 +index 95b4ffb769d711b6a485a005f7a3f58172fcf1ad..a3315174dcce192bf6b04cb98f9d83630c3983fc 100644 --- a/Source/WebKit/SourcesGTK.txt +++ b/Source/WebKit/SourcesGTK.txt -@@ -125,6 +125,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify +@@ -126,6 +126,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify UIProcess/API/glib/WebKitBackForwardList.cpp @no-unify UIProcess/API/glib/WebKitBackForwardListItem.cpp @no-unify @@ -10713,7 +10715,7 @@ index a4391be7b637fd96d880cb06838b6deb5db552b6..3f7d5e6c9debc1cf1155da11bad14fc5 UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify UIProcess/API/glib/WebKitCookieManager.cpp @no-unify UIProcess/API/glib/WebKitCredential.cpp @no-unify -@@ -238,6 +239,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp +@@ -239,6 +240,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp UIProcess/cairo/BackingStoreCairo.cpp @no-unify @@ -10721,15 +10723,15 @@ index a4391be7b637fd96d880cb06838b6deb5db552b6..3f7d5e6c9debc1cf1155da11bad14fc5 UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -254,6 +256,7 @@ UIProcess/gtk/ClipboardGtk3.cpp @no-unify - UIProcess/gtk/ClipboardGtk4.cpp @no-unify +@@ -256,6 +258,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify UIProcess/gtk/WebDateTimePickerGtk.cpp + UIProcess/gtk/GtkSettingsManager.cpp UIProcess/gtk/HardwareAccelerationManager.cpp +UIProcess/gtk/InspectorTargetProxyGtk.cpp UIProcess/gtk/KeyBindingTranslator.cpp UIProcess/gtk/PointerLockManager.cpp @no-unify UIProcess/gtk/PointerLockManagerWayland.cpp @no-unify -@@ -266,6 +269,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify +@@ -268,6 +271,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify UIProcess/gtk/WebColorPickerGtk.cpp UIProcess/gtk/WebContextMenuProxyGtk.cpp UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp @@ -11681,10 +11683,10 @@ index d7a43204be693f2a7ef86240eaf567fe70052a2c..0e247c48858522e55f65957fd0d1e147 bool webkitWebViewIsScriptDialogRunning(WebKitWebView*, WebKitScriptDialog*); String webkitWebViewGetCurrentScriptDialogMessage(WebKitWebView*); diff --git a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp -index 20e88d38140b9e9f2d3bda417d07a0ce2645e598..00877780de472a23184febc9f18ed1076c5cff4b 100644 +index 9f05f513ab2f15471ce095cafd15b9c26ec73863..a50d42ca5502f2ae7a73e199dc55068a37cac81c 100644 --- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp +++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp -@@ -245,6 +245,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool +@@ -250,6 +250,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool { if (wasEventHandled || event.type() != WebEvent::Type::KeyDown || !event.nativeEvent()) return; @@ -11781,10 +11783,10 @@ index 0000000000000000000000000000000000000000..9f1a0173a5641d6f158d815b8f7b9ea6 + +#endif diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -index a3d2057a83c538999c93d34aec113e0ff8550ec0..5e5c92ac489b65d630fd43409e6fe8531e976c9e 100644 +index c4a9833e28bb50d1f875aa1c5ad057cee01d281a..77592ad35ea7065dfbf276588ad3a87acb3c0ac0 100644 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -@@ -2506,6 +2506,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) +@@ -2471,6 +2471,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) #endif } @@ -12487,7 +12489,7 @@ index 2e6b4c1376192aa6109c4a918f343f4433a2b1c3..2706af99e9a1d4ca8603bbfaf9305469 m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h -index 82e3828037b064f5bd36b7dd536c60a0a2933aa0..074a542e01e838e244ea82f0f559056e52d221b1 100644 +index e8260a59d94cdc938f011c89e81f85402322d999..84db332aa5cdf297f70558a95447134385ac72ad 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h @@ -513,6 +513,9 @@ public: @@ -12501,10 +12503,10 @@ index 82e3828037b064f5bd36b7dd536c60a0a2933aa0..074a542e01e838e244ea82f0f559056e void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 5fbeba4f16e31677eb1dfeda2096387fc64da6cc..89ca92c286e92e2fc82224e694f8606b5f1338bc 100644 +index 1a55edbaa879b6d66b7ef0de1f1c45da86e0cc58..3abfa89597e2169a66fe4b6d887a98f6ca31b29c 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -@@ -2607,6 +2607,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() +@@ -2612,6 +2612,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() if (!m_colorSpace) m_colorSpace = [NSColorSpace sRGBColorSpace]; } @@ -12516,7 +12518,7 @@ index 5fbeba4f16e31677eb1dfeda2096387fc64da6cc..89ca92c286e92e2fc82224e694f8606b ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4685,6 +4690,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4690,6 +4695,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -16138,7 +16140,7 @@ index 7a14cfba15c103a2d4fe263fa49d25af3c396ec2..3ee0e154349661632799057c71f1d1f1 BOOL result = ::CreateProcess(0, commandLine.data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation); diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h -index 08cc289039924d337489368f36c505cc68896745..ac9688f8bdb31e0011ab6830695f81bb477a24d3 100644 +index 8d5189ec8c29e8a1684312df31125a1df8402a11..9e4c1a9af992b5811f9978a109344740931d1e93 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h @@ -319,6 +319,11 @@ public: @@ -16154,10 +16156,10 @@ index 08cc289039924d337489368f36c505cc68896745..ac9688f8bdb31e0011ab6830695f81bb virtual RefPtr takeViewSnapshot(std::optional&&) = 0; #endif diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -index c97552f4e63b5923c6cb1c9043dfb2b2c5cf23c6..16b9f932794144ca2ecf48a63f9a9cfc04be39ab 100644 +index c654cb8c1221af811f6b0a73b3e1df9435b2b76d..651d4458ef7aff835600fcf317887e74abc458aa 100644 --- a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp +++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -@@ -598,3 +598,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option +@@ -612,3 +612,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option } } // namespace WebKit @@ -17140,19 +17142,20 @@ index 0000000000000000000000000000000000000000..fb4855b939efdd36acd011a41244a579 + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d0330d9d508 100644 +index f7437602287336fbff74873ea049779451f30cea..232c065ff70fbbd91b9c18c80cecc8b53a2f46bf 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp -@@ -243,7 +243,7 @@ - #include "ViewSnapshotStore.h" - #endif +@@ -245,6 +245,9 @@ --#if PLATFORM(GTK) + #if PLATFORM(GTK) + #include "GtkSettingsManager.h" ++#endif ++ +#if PLATFORM(GTK) || PLATFORM(WPE) #include #endif -@@ -614,6 +614,10 @@ WebPageProxy::~WebPageProxy() +@@ -615,6 +618,10 @@ WebPageProxy::~WebPageProxy() #if ENABLE(MEDIA_SESSION_COORDINATOR) && HAVE(GROUP_ACTIVITIES) GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this); #endif @@ -17163,7 +17166,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 } // FIXME: Should return a const PageClient& and add a separate non-const -@@ -996,6 +1000,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -1002,6 +1009,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -17171,7 +17174,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 } void WebPageProxy::didAttachToRunningProcess() -@@ -1325,6 +1330,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1331,6 +1339,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -17193,7 +17196,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1855,6 +1875,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1861,6 +1884,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -17225,7 +17228,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2045,6 +2090,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2051,6 +2099,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -17251,7 +17254,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2617,6 +2681,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2623,6 +2690,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -17260,7 +17263,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2627,6 +2693,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2633,6 +2702,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -17269,7 +17272,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2642,18 +2710,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2662,6 +2753,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2668,6 +2762,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17339,7 +17342,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2674,8 +2783,18 @@ void WebPageProxy::didStartDrag() +@@ -2680,8 +2792,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17359,7 +17362,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2780,16 +2899,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2786,16 +2908,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17405,7 +17408,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3009,7 +3150,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3015,7 +3159,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17414,7 +17417,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3042,7 +3183,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3048,7 +3192,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17423,7 +17426,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3425,6 +3566,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3437,6 +3581,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17432,7 +17435,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3491,6 +3634,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3503,6 +3649,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, Variant, Ref>&& navigationActionOrResponse, Ref&& sender, std::optional sandboxExtensionHandle, WillContinueLoadInNewProcess willContinueLoadInNewProcess) { @@ -17440,7 +17443,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4229,6 +4373,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4241,6 +4388,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17452,7 +17455,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4562,6 +4711,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4574,6 +4726,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17460,7 +17463,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4784,6 +4934,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4796,6 +4949,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17469,7 +17472,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 // 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; -@@ -5236,7 +5388,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5248,7 +5403,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) { @@ -17485,7 +17488,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5749,6 +5908,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5761,6 +5923,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa auto* originatingPage = m_process->webPage(originatingPageID); auto originatingFrameInfo = API::FrameInfo::create(WTFMove(originatingFrameInfoData), originatingPage); auto mainFrameURL = m_mainFrame ? m_mainFrame->url() : URL(); @@ -17493,7 +17496,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 auto completionHandler = [this, protectedThis = makeRef(*this), mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5789,6 +5949,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5801,6 +5964,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17501,7 +17504,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 } void WebPageProxy::exitFullscreenImmediately() -@@ -5824,6 +5985,10 @@ void WebPageProxy::closePage() +@@ -5836,6 +6000,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17512,7 +17515,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5860,6 +6025,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5872,6 +6040,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 { @@ -17521,7 +17524,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -5881,6 +6048,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5893,6 +6063,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17530,7 +17533,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 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 { -@@ -5904,6 +6073,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -5916,6 +6088,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17539,7 +17542,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 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 { -@@ -6064,6 +6235,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6076,6 +6250,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17548,7 +17551,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7271,6 +7444,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7283,6 +7459,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17557,7 +17560,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 } break; } -@@ -7297,7 +7472,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7309,7 +7487,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()); @@ -17565,7 +17568,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7316,7 +7490,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7328,7 +7505,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); @@ -17573,7 +17576,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7325,6 +7498,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7337,6 +7513,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17581,7 +17584,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 } break; } -@@ -7655,7 +7829,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7669,7 +7846,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%d", reason); @@ -17593,7 +17596,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8028,6 +8205,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -8042,6 +8222,7 @@ static const Vector& mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17601,16 +17604,16 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8220,6 +8398,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8234,6 +8415,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; + parameters.shouldPauseInInspectorWhenShown = m_inspectorController->shouldPauseLoading(); + #if PLATFORM(GTK) - parameters.themeName = pageClient().themeName(); + parameters.gtkSettings = GtkSettingsManager::singleton().settingsState(); #endif -@@ -8296,6 +8476,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8310,6 +8493,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17625,7 +17628,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = makeRef(*this), authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8389,6 +8577,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8403,6 +8594,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17642,7 +17645,7 @@ index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d03 // 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 1dde2aa0ad646355e2906c6e3ffb08008d527365..f1bd5a0584135396b4e44dd1a131e3e23b6c5acb 100644 +index abfcbea8604ba1558a4e7ec11847c887fc9f580f..1105876eed75aafba3013c5f3c6e00084ddef3b1 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -38,6 +38,7 @@ @@ -17725,7 +17728,7 @@ index 1dde2aa0ad646355e2906c6e3ffb08008d527365..f1bd5a0584135396b4e44dd1a131e3e2 RefPtr loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemesButNotAppLinks, API::Object* userData = nullptr); RefPtr loadFile(const String& fileURL, const String& resourceDirectoryURL, 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); -@@ -1152,6 +1172,7 @@ public: +@@ -1154,6 +1174,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17733,7 +17736,7 @@ index 1dde2aa0ad646355e2906c6e3ffb08008d527365..f1bd5a0584135396b4e44dd1a131e3e2 void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1226,14 +1247,20 @@ public: +@@ -1228,14 +1249,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17755,7 +17758,7 @@ index 1dde2aa0ad646355e2906c6e3ffb08008d527365..f1bd5a0584135396b4e44dd1a131e3e2 #endif void processDidBecomeUnresponsive(); -@@ -1475,6 +1502,8 @@ public: +@@ -1477,6 +1504,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17764,7 +17767,7 @@ index 1dde2aa0ad646355e2906c6e3ffb08008d527365..f1bd5a0584135396b4e44dd1a131e3e2 #endif #if ENABLE(WEB_CRYPTO) -@@ -2567,6 +2596,7 @@ private: +@@ -2575,6 +2604,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17772,7 +17775,7 @@ index 1dde2aa0ad646355e2906c6e3ffb08008d527365..f1bd5a0584135396b4e44dd1a131e3e2 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2819,6 +2849,20 @@ private: +@@ -2827,6 +2857,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17793,7 +17796,7 @@ index 1dde2aa0ad646355e2906c6e3ffb08008d527365..f1bd5a0584135396b4e44dd1a131e3e2 #endif PageLoadState m_pageLoadState; -@@ -3032,6 +3076,9 @@ private: +@@ -3040,6 +3084,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17804,7 +17807,7 @@ index 1dde2aa0ad646355e2906c6e3ffb08008d527365..f1bd5a0584135396b4e44dd1a131e3e2 #if PLATFORM(IOS_FAMILY) && ENABLE(DEVICE_ORIENTATION) std::unique_ptr m_webDeviceOrientationUpdateProviderProxy; diff --git a/Source/WebKit/UIProcess/WebPageProxy.messages.in b/Source/WebKit/UIProcess/WebPageProxy.messages.in -index db5b56ef235209ea1739469a9116140e2976d96e..3a0c71d0d38c37daefa3a18b5c12f8ba08f946d8 100644 +index c8c90feae1e330e732f1e3f7d0392c42ce8992d9..1cb9531e84fb14e6d62fb91193ca58e95a1a0c05 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17823,7 +17826,7 @@ index db5b56ef235209ea1739469a9116140e2976d96e..3a0c71d0d38c37daefa3a18b5c12f8ba PluginScaleFactorDidChange(double zoomFactor) PluginZoomFactorDidChange(double zoomFactor) -@@ -311,10 +313,12 @@ messages -> WebPageProxy { +@@ -309,10 +311,12 @@ messages -> WebPageProxy { StartDrag(struct WebCore::DragItem dragItem, WebKit::ShareableBitmap::Handle dragImage) SetPromisedDataForImage(String pasteboardName, WebKit::SharedMemory::IPCHandle imageHandle, String filename, String extension, String title, String url, String visibleURL, WebKit::SharedMemory::IPCHandle archiveHandle, String originIdentifier) #endif @@ -17898,10 +17901,10 @@ index 790d76594ec5fc5f43aefb3e224a492d4658e536..33f5868d33e897318f4828edf4c3a2fa WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index dc443ad5ac9163a662477c2af08e74383201619d..af7722bb9ec218845ce9b15d7c6551dbf4f9e8cb 100644 +index 0a0f23207443289e8ddf0f41d133362006234f93..e00a4b6654eded9fcdfcea455f49454757095d6c 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2127,6 +2127,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O +@@ -2128,6 +2128,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); } @@ -18631,7 +18634,7 @@ index 0000000000000000000000000000000000000000..d0f9827544994e450e24e3f7a427c35e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -index fb7112c81fe3a514f7d872b3185748d8c7617ec3..f924351e98068eccdcd48f462f86cd66a530d79b 100644 +index 1bd33065f10c170d066ccb7a6f6a5c5e863188df..d090e7bed26596e2ed71a7751fec6dc4ecaefffb 100644 --- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm +++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm @@ -442,6 +442,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) @@ -18832,7 +18835,7 @@ index 0000000000000000000000000000000000000000..721826c8c98fc85b68a4f45deaee69c1 + +#endif diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h -index 6c5c4e39c61483dae90e692cc78669dab749e5da..3a559999da9fa8c7765f3bff63eab63fee1df8b8 100644 +index eafdd47a28fba8c3e90208afd423e2b0122724dd..7c7ed49eefe88be44089d5a2d641e2245047fa93 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.h +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.h @@ -53,6 +53,8 @@ class PageClientImpl final : public PageClientImplCocoa @@ -18866,7 +18869,7 @@ index 6c5c4e39c61483dae90e692cc78669dab749e5da..3a559999da9fa8c7765f3bff63eab63f void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&) override; void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override; diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm -index 8b74b4545d897a999294f815c7c1f67b38fd3c2c..b58607377d21a7593c7b890321f81ab53e167688 100644 +index 26a098b9aae3da922922aa89c989233909c61196..29e06313c2d826e171204e5bebfb397b2d69513c 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm @@ -81,6 +81,7 @@ @@ -18976,7 +18979,7 @@ index 8b74b4545d897a999294f815c7c1f67b38fd3c2c..b58607377d21a7593c7b890321f81ab5 void PageClientImpl::navigationGestureDidBegin() { m_impl->dismissContentRelativeChildWindowsWithAnimation(true); -@@ -974,6 +1009,9 @@ void PageClientImpl::didRestoreScrollPosition() +@@ -980,6 +1015,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c bool PageClientImpl::windowIsFrontWindowUnderMouse(const NativeWebMouseEvent& event) { @@ -19708,10 +19711,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c979244a84d 100644 +index 224606cc5e15d1808f5593236159934d971b2f9b..87c242c45a77779393ab63622e6aa9767fa4a53a 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1956,6 +1956,18 @@ +@@ -1958,6 +1958,18 @@ DF0C5F28252ECB8E00D921DB /* WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F24252ECB8D00D921DB /* WKDownload.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2A252ECB8E00D921DB /* WKDownloadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2B252ED44000D921DB /* WKDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */; }; @@ -19730,7 +19733,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF84CEE4249AA24D009096F6 /* WKPDFHUDView.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF84CEE2249AA21F009096F6 /* WKPDFHUDView.mm */; }; -@@ -2012,6 +2024,9 @@ +@@ -2014,6 +2026,9 @@ E5BEF6822130C48000F31111 /* WebDataListSuggestionsDropdownIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E5BEF6802130C47F00F31111 /* WebDataListSuggestionsDropdownIOS.h */; }; E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -19740,7 +19743,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 F4094CBD2553053D003D73E3 /* DisplayListReaderHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = F4094CBB255304AF003D73E3 /* DisplayListReaderHandle.h */; }; F4094CBE25530540003D73E3 /* DisplayListWriterHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = F4094CB92553047E003D73E3 /* DisplayListWriterHandle.h */; }; F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; -@@ -5864,6 +5879,19 @@ +@@ -5872,6 +5887,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 = ""; }; @@ -19760,7 +19763,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 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 = ""; }; -@@ -5982,6 +6010,14 @@ +@@ -5990,6 +6018,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 = ""; }; @@ -19775,7 +19778,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 F4094CB92553047E003D73E3 /* DisplayListWriterHandle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListWriterHandle.h; sourceTree = ""; }; F4094CBA2553047E003D73E3 /* DisplayListWriterHandle.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DisplayListWriterHandle.cpp; sourceTree = ""; }; F4094CBB255304AF003D73E3 /* DisplayListReaderHandle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListReaderHandle.h; sourceTree = ""; }; -@@ -6097,6 +6133,7 @@ +@@ -6107,6 +6143,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -19783,7 +19786,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -8007,6 +8044,7 @@ +@@ -8017,6 +8054,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -19791,7 +19794,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9067,6 +9105,7 @@ +@@ -9081,6 +9119,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -19799,7 +19802,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9499,6 +9538,12 @@ +@@ -9513,6 +9552,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19812,7 +19815,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 ); path = Agents; sourceTree = ""; -@@ -9507,6 +9552,7 @@ +@@ -9521,6 +9566,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19820,7 +19823,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -9999,6 +10045,12 @@ +@@ -10015,6 +10061,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -19833,7 +19836,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10298,6 +10350,7 @@ +@@ -10314,6 +10366,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -19841,7 +19844,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -10893,6 +10946,11 @@ +@@ -10909,6 +10962,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -19853,7 +19856,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -11743,6 +11801,7 @@ +@@ -11767,6 +11825,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19861,7 +19864,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -12042,6 +12101,7 @@ +@@ -12066,6 +12125,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -19869,7 +19872,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -12057,6 +12117,7 @@ +@@ -12081,6 +12141,7 @@ 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, F40BBB41257FF46E0067463A /* GPUProcessWakeupMessageArguments.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -19877,7 +19880,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -12203,6 +12264,7 @@ +@@ -12228,6 +12289,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -19885,7 +19888,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 5183247C26168C62003F239E /* NetworkURLSchemeHandler.h in Headers */, -@@ -12289,6 +12351,7 @@ +@@ -12314,6 +12376,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -19893,7 +19896,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, -@@ -12310,6 +12373,7 @@ +@@ -12335,6 +12398,7 @@ CDAC20B423FB58F20021DEE3 /* RemoteCDMInstanceProxy.h in Headers */, CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, @@ -19901,7 +19904,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -12626,6 +12690,7 @@ +@@ -12653,6 +12717,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -19909,7 +19912,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -12755,6 +12820,7 @@ +@@ -12782,6 +12847,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -19917,7 +19920,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -12808,6 +12874,7 @@ +@@ -12835,6 +12901,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -19925,7 +19928,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -12964,6 +13031,7 @@ +@@ -12991,6 +13058,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -19933,7 +19936,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -14193,6 +14261,7 @@ +@@ -14220,6 +14288,7 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -19941,7 +19944,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */, 2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */, 2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */, -@@ -14211,6 +14280,7 @@ +@@ -14238,6 +14307,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, @@ -19949,7 +19952,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, 2D913443212CF9F000128AFD /* NetscapeBrowserFuncs.cpp in Sources */, 2D913444212CF9F000128AFD /* NetscapePlugin.cpp in Sources */, -@@ -14235,6 +14305,7 @@ +@@ -14262,6 +14332,7 @@ 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */, 2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */, 2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */, @@ -19957,7 +19960,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 2D913447212CF9F000128AFD /* NPRuntimeObjectMap.cpp in Sources */, 2D913448212CF9F000128AFD /* NPRuntimeUtilities.cpp in Sources */, 2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */, -@@ -14540,6 +14611,7 @@ +@@ -14567,6 +14638,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -19966,7 +19969,7 @@ index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c97 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 60e6a2b480fcad110f3dae84b05495653576f7e4..4ba4e31dd942d9f775deabfd150bad146a8a0dd3 100644 +index 23970cba4679d67dd5cc8262b9a6e69489a9e197..203b7d282b77bb76e4cfb7443c9df725a496499a 100644 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp @@ -231,6 +231,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou @@ -20044,7 +20047,7 @@ index 60e6a2b480fcad110f3dae84b05495653576f7e4..4ba4e31dd942d9f775deabfd150bad14 } void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader) -@@ -813,7 +826,7 @@ void WebLoaderStrategy::didFinishPreconnection(uint64_t preconnectionIdentifier, +@@ -819,7 +832,7 @@ void WebLoaderStrategy::didFinishPreconnection(uint64_t preconnectionIdentifier, bool WebLoaderStrategy::isOnLine() const { @@ -20053,7 +20056,7 @@ index 60e6a2b480fcad110f3dae84b05495653576f7e4..4ba4e31dd942d9f775deabfd150bad14 } void WebLoaderStrategy::addOnlineStateChangeListener(Function&& listener) -@@ -833,6 +846,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet +@@ -839,6 +852,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet void WebLoaderStrategy::setOnLineState(bool isOnLine) { @@ -20065,7 +20068,7 @@ index 60e6a2b480fcad110f3dae84b05495653576f7e4..4ba4e31dd942d9f775deabfd150bad14 if (m_isOnLine == isOnLine) return; -@@ -841,6 +859,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) +@@ -847,6 +865,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) listener(isOnLine); } @@ -20138,7 +20141,7 @@ index ecd4052eac038028255a786236e1969853afa1d8..2adc87a59c12d15c651909e67670ac35 if (m_coreLoader) didFailResourceLoad(error); diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index 30776a00db074f2d197d27a00089292b58807857..b1376717bd22b4f0e9348efce59c378ecef65f84 100644 +index b49b4347fda6c775aa25b62a4c37cb9a444625a3..0669b22a682890515c57db2b7abead659a31e163 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -398,6 +398,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -20150,7 +20153,7 @@ index 30776a00db074f2d197d27a00089292b58807857..b1376717bd22b4f0e9348efce59c378e // Notify the bundle client. m_page.injectedBundleUIClient().willAddMessageToConsole(&m_page, source, level, message, lineNumber, columnNumber, sourceID); } -@@ -831,6 +833,13 @@ std::unique_ptr WebChromeClient::createDateTimeChooser(DateTime +@@ -836,6 +838,13 @@ std::unique_ptr WebChromeClient::createDateTimeChooser(DateTime #endif @@ -20610,10 +20613,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 cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b341d7b351 100644 +index ba89fc2bd8b78230e4ef6dafb7bee20fa6369f0e..720029672dbbf9e192b3f1f30e5bdfd6c66b462b 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -882,6 +882,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -885,6 +885,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) m_page->setCanUseCredentialStorage(parameters.canUseCredentialStorage); @@ -20623,7 +20626,7 @@ index cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b3 updateThrottleState(); } -@@ -1668,6 +1671,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1681,6 +1684,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -20646,7 +20649,7 @@ index cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b3 void WebPage::loadRequest(LoadParameters&& loadParameters) { setLastNavigationWasAppInitiated(loadParameters.request.isAppInitiated()); -@@ -1909,17 +1928,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1922,17 +1941,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20665,7 +20668,7 @@ index cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b3 // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1936,20 +1951,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1949,20 +1964,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20693,7 +20696,7 @@ index cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b3 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1957,7 +1970,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1970,7 +1983,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20701,7 +20704,7 @@ index cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b3 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2252,6 +2264,7 @@ void WebPage::scaleView(double scale) +@@ -2265,6 +2277,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20709,7 +20712,7 @@ index cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b3 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2356,17 +2369,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2369,17 +2382,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20728,7 +20731,7 @@ index cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b3 } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3234,6 +3243,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3247,6 +3256,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -20833,7 +20836,7 @@ index cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b3 #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3310,6 +3417,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3323,6 +3430,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -20845,7 +20848,7 @@ index cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b3 void WebPage::insertNewlineInQuotedContent() { Frame& frame = m_page->focusController().focusedOrMainFrame(); -@@ -3547,6 +3659,7 @@ void WebPage::didCompletePageTransition() +@@ -3560,6 +3672,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -20853,7 +20856,7 @@ index cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b3 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4287,7 +4400,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4300,7 +4413,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -20862,7 +20865,7 @@ index cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b3 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6609,6 +6722,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6635,6 +6748,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20873,7 +20876,7 @@ index cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b3 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 362335fdd78518a28e2fb7649839e32010c92db3..3211c0944eacf358046e7d641f103b220f801cc3 100644 +index 0042275f5a6d59616a0ddf0e9be28e48c2c0c1ac..7b94085f6e6fd2d2cae34707975e3cc7c957c6a6 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -112,6 +112,10 @@ typedef struct _AtkObject AtkObject; @@ -20887,7 +20890,7 @@ index 362335fdd78518a28e2fb7649839e32010c92db3..3211c0944eacf358046e7d641f103b22 #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -965,11 +969,11 @@ public: +@@ -966,11 +970,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -20901,7 +20904,7 @@ index 362335fdd78518a28e2fb7649839e32010c92db3..3211c0944eacf358046e7d641f103b22 void performDragControllerAction(DragControllerAction, const WebCore::DragData&, SandboxExtension::Handle&&, SandboxExtension::HandleArray&&); #endif -@@ -983,6 +987,9 @@ public: +@@ -984,6 +988,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -20911,7 +20914,7 @@ index 362335fdd78518a28e2fb7649839e32010c92db3..3211c0944eacf358046e7d641f103b22 #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1215,6 +1222,7 @@ public: +@@ -1218,6 +1225,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -20919,7 +20922,7 @@ index 362335fdd78518a28e2fb7649839e32010c92db3..3211c0944eacf358046e7d641f103b22 void insertNewlineInQuotedContent(); -@@ -1573,6 +1581,7 @@ private: +@@ -1576,6 +1584,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -20927,7 +20930,7 @@ index 362335fdd78518a28e2fb7649839e32010c92db3..3211c0944eacf358046e7d641f103b22 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1610,6 +1619,7 @@ private: +@@ -1613,6 +1622,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -20935,7 +20938,7 @@ index 362335fdd78518a28e2fb7649839e32010c92db3..3211c0944eacf358046e7d641f103b22 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1732,9 +1742,7 @@ private: +@@ -1735,9 +1745,7 @@ private: void countStringMatches(const String&, OptionSet, uint32_t maxMatchCount); void replaceMatches(const Vector& matchIndices, const String& replacementText, bool selectionOnly, CompletionHandler&&); @@ -20945,7 +20948,7 @@ index 362335fdd78518a28e2fb7649839e32010c92db3..3211c0944eacf358046e7d641f103b22 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2260,6 +2268,7 @@ private: +@@ -2271,6 +2279,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -20954,7 +20957,7 @@ index 362335fdd78518a28e2fb7649839e32010c92db3..3211c0944eacf358046e7d641f103b22 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 1ceda7a7bcab2d80ae4c269b0fc0e7edb3151dd5..927bda0f8baa32cac68d55ea3ca249e44737bd0d 100644 +index 22c0b83ca7f5852c150ab9a10fb3fd1ea77336a8..0fe87bcdca0558a0ca71296696689a6ad6b25556 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -133,6 +133,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -21098,10 +21101,10 @@ index 8e9454597bb23b22c506f929020fc3c37ffaa71a..9730e673e85da143a3acdda03fb9fa3f } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index 87cc422a592dbb6c547219189a57857da94d1260..8fe6007994a9d22c417309737c60a8bda0c6cea5 100644 +index 26147dd5cba937e9cfa67780f8a0a9d8a54bb676..9984a062fecd2487d86405b7a52fca07f6f9fdac 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp -@@ -87,6 +87,7 @@ +@@ -88,6 +88,7 @@ #include "WebsiteData.h" #include "WebsiteDataStoreParameters.h" #include "WebsiteDataType.h" @@ -21109,7 +21112,7 @@ index 87cc422a592dbb6c547219189a57857da94d1260..8fe6007994a9d22c417309737c60a8bd #include #include #include -@@ -343,6 +344,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter +@@ -345,6 +346,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter platformInitializeProcess(parameters); updateCPULimit(); @@ -21147,10 +21150,10 @@ index c020b8bba2d0041f3e54e7f18c6a3776833ef049..88ccc0d2354e95feeaef730a5a10f59e - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index 8a4ec8910ca2f4104e4b59b22f1081200f280f9b..ef1933c8030f40d9deed891fcef31a93ad037c7d 100644 +index 0608da5197ddf7ec6925d72b091aabd86cee38df..1fe2cafd88f18cdae5ef0add3ccfba65bb6fa381 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm -@@ -4027,7 +4027,7 @@ IGNORE_WARNINGS_END +@@ -4032,7 +4032,7 @@ IGNORE_WARNINGS_END } #endif // PLATFORM(IOS_FAMILY) @@ -21159,7 +21162,7 @@ index 8a4ec8910ca2f4104e4b59b22f1081200f280f9b..ef1933c8030f40d9deed891fcef31a93 - (NSArray *)_touchEventRegions { -@@ -4069,7 +4069,7 @@ IGNORE_WARNINGS_END +@@ -4074,7 +4074,7 @@ IGNORE_WARNINGS_END }).autorelease(); } @@ -21200,7 +21203,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index f3b1c1289c418436b6fa3a53be5058b3d4416ca5..84105378dc29c257e953d7d41fe76afb216f3abf 100644 +index 3b0ab40da5002a0a74ec4331aa65fb3b4a35f663..46e31d5c67cb8780be7b01f41983aa2526a4a6ee 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,8 @@ WEBKIT_OPTION_BEGIN() @@ -21276,7 +21279,7 @@ index f3b1c1289c418436b6fa3a53be5058b3d4416ca5..84105378dc29c257e953d7d41fe76afb # Finalize the value for all options. Do not attempt to use an option before diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index 76bf511f145a18684f1d7fe12e7a71766c00cef0..34a0f57040b32b5b380f5afa6e65b093c101d89b 100644 +index 4469f0aee0f55a362108454928dd50bc7425390c..5c2acec84ebdae5631c7478c103521a109ffbefd 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) @@ -21287,7 +21290,7 @@ index 76bf511f145a18684f1d7fe12e7a71766c00cef0..34a0f57040b32b5b380f5afa6e65b093 set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") find_package(Cairo 1.14.0 REQUIRED) -@@ -50,7 +51,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_TYPED_OM PRIVATE ${ENABLE_EXPERIMENT +@@ -51,7 +52,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DARK_MODE_CSS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GPU_PROCESS PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21295,7 +21298,7 @@ index 76bf511f145a18684f1d7fe12e7a71766c00cef0..34a0f57040b32b5b380f5afa6e65b093 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON) -@@ -67,15 +67,28 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE OFF) +@@ -68,15 +68,28 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBXR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})