diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 96bab08b58..802db7ebeb 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1572 -Changed: yurys@chromium.org Wed, Nov 3, 2021 10:07:22 PM +1573 +Changed: dpino@igalia.com Thu Nov 4 11:53:07 UTC 2021 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index aa46690f00..4135b9ace9 100644 --- a/browser_patches/webkit/UPSTREAM_CONFIG.sh +++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://github.com/WebKit/WebKit.git" BASE_BRANCH="main" -BASE_REVISION="a0ed1f83d00448c17e651ca331847a0a6808353d" +BASE_REVISION="e9cefe1562bd987dd79f6d241cc92f1a9be0fc5c" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index deac7a6a47..38184e1993 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 e77083a4648e05fb3b254062425c0f428ce5e822..43015ba90c4e9a71782ea6c29d77bbba33c0261d 100644 +index a5ded62074a8522f1d55c7226ee90d02043c8251..6edaf1ef307dedfb354c91ffe5b83281890acb09 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1350,22 +1350,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1352,22 +1352,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -31,10 +31,10 @@ index e77083a4648e05fb3b254062425c0f428ce5e822..43015ba90c4e9a71782ea6c29d77bbba ${JAVASCRIPTCORE_DIR}/inspector/protocol/ServiceWorker.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Target.json diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make -index 9a639237f8b29d6cfe88c6cbc21d6a92c5b73392..31ddbaf5198fa561441aebf0b9c468f0e6615c02 100644 +index 4ecae3f05981398cbf63a4679ee8dfcfeb4686fa..567535749077bfd9aefc7c58d699eb8741b7da4c 100644 --- a/Source/JavaScriptCore/DerivedSources.make +++ b/Source/JavaScriptCore/DerivedSources.make -@@ -284,22 +284,27 @@ INSPECTOR_DOMAINS := \ +@@ -286,22 +286,27 @@ INSPECTOR_DOMAINS := \ $(JavaScriptCore)/inspector/protocol/CSS.json \ $(JavaScriptCore)/inspector/protocol/Canvas.json \ $(JavaScriptCore)/inspector/protocol/Console.json \ @@ -1783,7 +1783,7 @@ index ac300f435286a4cee2aec52a2c6dc90967780140..1cf1ad75c6a08bdc92f089bd80909305 #include diff --git a/Source/JavaScriptCore/runtime/JSDateMath.cpp b/Source/JavaScriptCore/runtime/JSDateMath.cpp -index dae9b3a9bc92fbafd4e30194b4d1a8d83dbd2cff..63cd8218c3cce5991121391ef0890e6e15e4037e 100644 +index 5219f8f7242b86f940e82823584e61fe2ba49e61..51bd401528326fc8fea07ed052d0f561411a254f 100644 --- a/Source/JavaScriptCore/runtime/JSDateMath.cpp +++ b/Source/JavaScriptCore/runtime/JSDateMath.cpp @@ -76,6 +76,7 @@ @@ -1794,7 +1794,7 @@ index dae9b3a9bc92fbafd4e30194b4d1a8d83dbd2cff..63cd8218c3cce5991121391ef0890e6e #if U_ICU_VERSION_MAJOR_NUM >= 69 || (U_ICU_VERSION_MAJOR_NUM == 68 && USE(APPLE_INTERNAL_SDK)) #define HAVE_ICU_C_TIMEZONE_API 1 -@@ -334,6 +335,10 @@ double DateCache::parseDate(JSGlobalObject* globalObject, VM& vm, const String& +@@ -329,6 +330,10 @@ double DateCache::parseDate(JSGlobalObject* globalObject, VM& vm, const String& // https://tc39.es/ecma402/#sec-defaulttimezone String DateCache::defaultTimeZone() { @@ -1805,7 +1805,7 @@ index dae9b3a9bc92fbafd4e30194b4d1a8d83dbd2cff..63cd8218c3cce5991121391ef0890e6e #if HAVE(ICU_C_TIMEZONE_API) return timeZoneCache()->m_canonicalTimeZoneID; #else -@@ -368,12 +373,20 @@ Ref DateCache::cachedDateInstanceData(double millisecondsFromE +@@ -363,12 +368,20 @@ Ref DateCache::cachedDateInstanceData(double millisecondsFromE void DateCache::timeZoneCacheSlow() { ASSERT(!m_timeZoneCache); @@ -1827,7 +1827,7 @@ index dae9b3a9bc92fbafd4e30194b4d1a8d83dbd2cff..63cd8218c3cce5991121391ef0890e6e if (U_SUCCESS(status)) { Vector canonicalBuffer; auto status = callBufferProducingFunction(ucal_getCanonicalTimeZoneID, timeZoneID.data(), timeZoneID.size(), canonicalBuffer, nullptr); -@@ -390,6 +403,11 @@ void DateCache::timeZoneCacheSlow() +@@ -385,6 +398,11 @@ void DateCache::timeZoneCacheSlow() ucal_setGregorianChange(cache->m_calendar.get(), minECMAScriptTime, &status); // Ignore "unsupported" error. m_timeZoneCache = std::unique_ptr(cache); #else @@ -2058,7 +2058,7 @@ index 6d7d92a46012278c77a624e3cda462008d9bb123..353103e6e7500e237e185451cff227b6 type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 848da780c8b2c71e50542a66afddf5973a279c6c..642e715265971685257fffefc288ca97203cc981 100644 +index 46771902375dbe93cb30b40bbcdd3bc346f94fed..285266df0108903bef0fbfea48797a061232ea94 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -432,7 +432,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2082,6 +2082,15 @@ index 848da780c8b2c71e50542a66afddf5973a279c6c..642e715265971685257fffefc288ca97 # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: +@@ -875,7 +875,7 @@ MediaSessionPlaylistEnabled: + type: bool + humanReadableName: "Experimental MediaSession playlist API" + humanReadableDescription: "Enable experimental MediaSession playlist API" +- condition: ENABLE(MEDIA_SESSION_PLAYLIST) ++ condition: ENABLE(MEDIA_SESSION_COORDINATOR) && ENABLE(MEDIA_SESSION_PLAYLIST) + defaultValue: + WebKitLegacy: + default: false @@ -1239,7 +1239,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false @@ -2211,11 +2220,11 @@ index ebd69a4c76cd7acb0a233be552071158ca2171ca..2ee388e94a56d3de9c9fb2506d2ddead + } // namespace WTF diff --git a/Source/WTF/wtf/DateMath.h b/Source/WTF/wtf/DateMath.h -index de0b45bd0a88eaba466b6e6c0ad66dc02f525741..81857a2be24fa3ff0a60ebbcd01130969456b31e 100644 +index 7bb27e9976fb14e06fa4ee48553617fca06d8d7b..79ac2c9e778c1efca4f588edd4271bf8d25b1aa6 100644 --- a/Source/WTF/wtf/DateMath.h +++ b/Source/WTF/wtf/DateMath.h -@@ -388,6 +388,10 @@ inline int dayInMonthFromDayInYear(int dayInYear, bool leapYear) - return d - step; +@@ -393,6 +393,10 @@ inline double timeToMS(double hour, double min, double sec, double ms) + return (((hour * WTF::minutesPerHour + min) * WTF::secondsPerMinute + sec) * WTF::msPerSecond + ms); } +WTF_EXPORT_PRIVATE bool setTimeZoneForAutomation(const String& timeZone); @@ -2226,10 +2235,10 @@ index de0b45bd0a88eaba466b6e6c0ad66dc02f525741..81857a2be24fa3ff0a60ebbcd0113096 WTF_EXPORT_PRIVATE LocalTimeOffset calculateLocalTimeOffset(double utcInMilliseconds, TimeType = UTCTime); diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index 22a6f5b4d7399800773514c0f0a44a270a6072f7..a00692f511b1b9619de145cd8f728cf090d6cdfb 100644 +index a886c66c77e58920dfb49f3100926b737f05b1df..c6c64461781cbf7c0efef6418181395252175d58 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h -@@ -412,7 +412,7 @@ +@@ -408,7 +408,7 @@ #endif #if !defined(ENABLE_ORIENTATION_EVENTS) @@ -2238,7 +2247,7 @@ index 22a6f5b4d7399800773514c0f0a44a270a6072f7..a00692f511b1b9619de145cd8f728cf0 #endif #if OS(WINDOWS) -@@ -473,7 +473,7 @@ +@@ -469,7 +469,7 @@ #endif #if !defined(ENABLE_TOUCH_EVENTS) @@ -2248,7 +2257,7 @@ index 22a6f5b4d7399800773514c0f0a44a270a6072f7..a00692f511b1b9619de145cd8f728cf0 #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index d1db2221b26a6ecf7d8bb8c900985e9a17763905..186d426c86d993656d86300e1c81addea9da91d5 100644 +index d25318c3448aa20c91413e35e8702f8f04dd0a58..137541549505b553aff2f5e219e03c21872e9f3a 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h @@ -220,7 +220,7 @@ @@ -2273,7 +2282,7 @@ index 3901bfb0f5479064f4e7b67c90621ff26d74b580..5b3615a871d0d7123822394c94d5ce10 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 123f583962dfa60c7bea06b86ea320d2f3c59af5..c29f608804079359d8ca8791e5865bddc5b3eb29 100644 +index c14aede53677dbf23b23de856e8ef8226434aa1c..fdc1810b2b303adf25287ce18fa70549bd877845 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -384,7 +384,7 @@ @@ -2298,10 +2307,10 @@ index f8bedf1af5d20d9c93a96af565e416bfb0df6faa..a072e5e130822d3658cbab453aef8d16 if (Journald_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index d924abe9a77f779dc2256e93efd332004f55698e..eaf736e8c5502a5787353b49060f7bb9cdd4f679 100644 +index f23c6dffb45b19f8cf066a53f2557b2abb4b3359..11d5405a2bde0d2766cfbb18653eeddafc65feac 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -793,6 +793,10 @@ JS_BINDING_IDLS := \ +@@ -797,6 +797,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2312,7 +2321,7 @@ index d924abe9a77f779dc2256e93efd332004f55698e..eaf736e8c5502a5787353b49060f7bb9 $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1333,9 +1337,6 @@ JS_BINDING_IDLS := \ +@@ -1337,9 +1341,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2322,21 +2331,6 @@ index d924abe9a77f779dc2256e93efd332004f55698e..eaf736e8c5502a5787353b49060f7bb9 # vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) -diff --git a/Source/WebCore/Modules/async-clipboard/ClipboardItemBindingsDataSource.cpp b/Source/WebCore/Modules/async-clipboard/ClipboardItemBindingsDataSource.cpp -index 92e0d107e25a20bf8e107faa2787bff4009bd508..d0746da2da209e02325b5fa214dbee64bf9c9078 100644 ---- a/Source/WebCore/Modules/async-clipboard/ClipboardItemBindingsDataSource.cpp -+++ b/Source/WebCore/Modules/async-clipboard/ClipboardItemBindingsDataSource.cpp -@@ -139,7 +139,9 @@ void ClipboardItemBindingsDataSource::collectDataForWriting(Clipboard& destinati - }); - - auto promise = typeAndItem.value; -- promise->whenSettled([this, protectedItem = Ref { m_item }, destination = m_writingDestination, promise, type, weakItemTypeLoader = WeakPtr { itemTypeLoader }] () mutable { -+ /* hack: gcc 8.4 will segfault if the WeakPtr is instantiated within the lambda captures */ -+ auto wl = WeakPtr { itemTypeLoader }; -+ promise->whenSettled([this, protectedItem = Ref { m_item }, destination = m_writingDestination, promise, type, weakItemTypeLoader = WTFMove(wl)] () mutable { - if (!weakItemTypeLoader) - return; - diff --git a/Source/WebCore/Modules/geolocation/Geolocation.cpp b/Source/WebCore/Modules/geolocation/Geolocation.cpp index e272ecdef2a7d066a121ec366a9906d4b8db14c7..f922d861134d44958c58e6332fb3d029da150921 100644 --- a/Source/WebCore/Modules/geolocation/Geolocation.cpp @@ -2352,18 +2346,6 @@ index e272ecdef2a7d066a121ec366a9906d4b8db14c7..f922d861134d44958c58e6332fb3d029 return false; } -diff --git a/Source/WebCore/Modules/notifications/Notification.idl b/Source/WebCore/Modules/notifications/Notification.idl -index 9cb784861fc5439c3594b144649a43641cbcda70..d191134c15f30757c3cd35ab1b033a1c2b80d80e 100644 ---- a/Source/WebCore/Modules/notifications/Notification.idl -+++ b/Source/WebCore/Modules/notifications/Notification.idl -@@ -34,6 +34,7 @@ - [ - Conditional=NOTIFICATIONS, - ActiveDOMObject, -+ EnabledBySetting=NotificationsEnabled, - ExportMacro=WEBCORE_EXPORT, - Exposed=Window - ] interface Notification : EventTarget { diff --git a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm index f1b96958057d2fe6044d2c7b259db6c5ceb44efe..29e51dad380285fb16bd32ef04efde2ac4ed6479 100644 --- a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm @@ -2426,10 +2408,10 @@ index 9f4daefcd385d534149f0a5a6ce0e8016e25638f..37f64495ec9b316bbf0a5e3212917d43 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index 0ce584be6270f1c5754324e51dba895899c7b4dc..098ad0423f08a66c181d829d81c4808e710de218 100644 +index 92545a5cf28a80031f086e029ec9b65ec90ba5b0..d84541d6cd51c9d4ef368872283cff66e343ed3e 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -605,3 +605,9 @@ platform/graphics/angle/ANGLEUtilities.cpp @no-unify +@@ -603,3 +603,9 @@ platform/graphics/angle/ANGLEUtilities.cpp @no-unify platform/graphics/angle/ExtensionsGLANGLE.cpp @no-unify platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify platform/graphics/angle/TemporaryANGLESetting.cpp @no-unify @@ -2491,10 +2473,10 @@ index 9f85e4986c53a1cc8d63b3394d3f7295832af387..1228fda7c688c5b24cecaf07e21437d3 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369edf19a5cd 100644 +index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9e8367a16 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5421,6 +5421,14 @@ +@@ -5408,6 +5408,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, ); }; }; @@ -2509,7 +2491,7 @@ index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369e 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, ); }; }; -@@ -16891,6 +16899,14 @@ +@@ -16862,6 +16870,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 = ""; }; @@ -2524,7 +2506,7 @@ index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369e 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 = ""; }; -@@ -22555,7 +22571,12 @@ +@@ -22502,7 +22518,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2537,7 +2519,7 @@ index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369e E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -28389,6 +28410,8 @@ +@@ -28336,6 +28357,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2546,7 +2528,7 @@ index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369e 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -30647,6 +30670,7 @@ +@@ -30594,6 +30617,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2554,7 +2536,7 @@ index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369e 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -31660,6 +31684,7 @@ +@@ -31607,6 +31631,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2562,7 +2544,7 @@ index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369e 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -33757,6 +33782,7 @@ +@@ -33701,6 +33726,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2570,7 +2552,7 @@ index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369e 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35887,9 +35913,11 @@ +@@ -35820,9 +35846,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2582,7 +2564,7 @@ index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369e B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36848,6 +36876,7 @@ +@@ -36783,6 +36811,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2590,7 +2572,7 @@ index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369e 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36918,6 +36947,7 @@ +@@ -36852,6 +36881,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2598,7 +2580,7 @@ index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369e 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36966,6 +36996,7 @@ +@@ -36900,6 +36930,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2606,7 +2588,7 @@ index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369e DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -37498,6 +37529,7 @@ +@@ -37432,6 +37463,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2615,7 +2597,7 @@ index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369e 2D8B92F5203D13E1009C868F /* UnifiedSource520.cpp in Sources */, 2D8B92F6203D13E1009C868F /* UnifiedSource521.cpp in Sources */, diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp -index 132efbcffc44a1c73b8c0617be03f366e22aa054..b8539b49b93ac0accbed9ec191b38919a1c733b2 100644 +index c8233c8b74be208f09ea0df9458d097f541a2440..5ca880d8850bb985b267cbc74130aa318236a2ca 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -60,6 +60,7 @@ @@ -2646,7 +2628,7 @@ index 132efbcffc44a1c73b8c0617be03f366e22aa054..b8539b49b93ac0accbed9ec191b38919 { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index e0a6217399110431bc005c3365ad12bfd84841e4..872a2bad956f50fe83629ab14e8d699d826c4bc8 100644 +index dbfedf3082137571888c9f350310529e1f2fb324..896847275f5b9f1af723a56149f99439c9e3e222 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h @@ -109,6 +109,8 @@ namespace WebCore { @@ -2658,14 +2640,6 @@ index e0a6217399110431bc005c3365ad12bfd84841e4..872a2bad956f50fe83629ab14e8d699d macro(DocumentTimeline) \ macro(EnterPictureInPictureEvent) \ macro(ExtendableEvent) \ -@@ -181,6 +183,7 @@ namespace WebCore { - macro(NavigatorMediaDevices) \ - macro(NavigatorPermissions) \ - macro(NavigatorUserMedia) \ -+ macro(Notification) \ - macro(OfflineAudioContext) \ - macro(OffscreenCanvas) \ - macro(OffscreenCanvasRenderingContext2D) \ diff --git a/Source/WebCore/css/MediaQueryEvaluator.cpp b/Source/WebCore/css/MediaQueryEvaluator.cpp index 856ec46ac0f8f6079bf3668823734749d242dda7..1dd61f7227c3887a8780b0fed2e2f1324ce6a015 100644 --- a/Source/WebCore/css/MediaQueryEvaluator.cpp @@ -3900,7 +3874,7 @@ index 8f6fbcc293aebf8b9d5c945d2829a1527b74bc7f..22a97f735adb973b0aef74e54a897d15 // InspectorInstrumentation void willRecalculateStyle(); diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp -index c894067585eb1e3dc79276d9d0e4f7562c84d801..02546967114fb5051df8c584971a12a7bad86619 100644 +index 3dafe6437df1210405fefbf375785fecd5eac472..4c3870ebcd370ceb13772c5be967548732073804 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp @@ -32,20 +32,28 @@ @@ -3916,7 +3890,7 @@ index c894067585eb1e3dc79276d9d0e4f7562c84d801..02546967114fb5051df8c584971a12a7 #include "CookieJar.h" +#include "CustomHeaderFields.h" #include "DOMWrapperWorld.h" - #include "Document.h" + #include "DocumentInlines.h" #include "DocumentLoader.h" +#include "Editor.h" #include "ElementInlines.h" @@ -5376,10 +5350,10 @@ index 16edb3bc689b8e2dde17597b642b706c1343e1f5..f363b2ca2410f22cff8d6ad908a88527 private: diff --git a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -index 44c85f83d3d2140a0b28dec23e21d7b3b9522897..f23c08520e67b7a17bcd50c3b4a9c57180f05d00 100644 +index 8d4446b3e412e139de6515a83cebd1c3ede0b3be..6356070544f9e334400b4ad316b5d1ecae9ac415 100644 --- a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp +++ b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -@@ -269,7 +269,7 @@ void LineLayout::updateFormattingRootGeometryAndInvalidate() +@@ -277,7 +277,7 @@ void LineLayout::updateFormattingRootGeometryAndInvalidate() auto updateGeometry = [&](auto& root) { root.setContentBoxWidth(flow.contentLogicalWidth()); @@ -5442,10 +5416,10 @@ index 4fbfd7120199d27cfa87bdd596737106bce08db0..4f769e266eb4d33ca9c8fa553a4d763a DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index e5a6cc301a99cd9040b03ab37a55c962b09684cd..aa292c1e1b8142895c01e4d9d797ac16b0b504e4 100644 +index 95ef5ca85ce06d1bc82c7f5ee7d55dc77ec48b0e..e1f813ba74d91949bbbc52223f4a0fc0f6b14499 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp -@@ -1168,6 +1168,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat +@@ -1154,6 +1154,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat } m_client->dispatchDidNavigateWithinPage(); @@ -5453,15 +5427,15 @@ index e5a6cc301a99cd9040b03ab37a55c962b09684cd..aa292c1e1b8142895c01e4d9d797ac16 m_frame.document()->statePopped(stateObject ? Ref { *stateObject } : SerializedScriptValue::nullValue()); m_client->dispatchDidPopStateWithinPage(); -@@ -1494,6 +1495,7 @@ void FrameLoader::load(FrameLoadRequest&& request) +@@ -1481,6 +1482,7 @@ void FrameLoader::load(FrameLoadRequest&& request) void FrameLoader::loadWithNavigationAction(const ResourceRequest& request, NavigationAction&& action, FrameLoadType type, RefPtr&& formState, AllowNavigationToInvalidURL allowNavigationToInvalidURL, CompletionHandler&& completionHandler) { + InspectorInstrumentation::frameScheduledNavigation(m_frame, Seconds(0)); FRAMELOADER_RELEASE_LOG(ResourceLoading, "loadWithNavigationAction: frame load started"); - Ref loader = m_client->createDocumentLoader(request, defaultSubstituteDataForURL(request.url())); -@@ -1597,6 +1599,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t + if (request.url().protocolIsJavaScript()) { +@@ -1590,6 +1592,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t const String& httpMethod = loader->request().httpMethod(); if (shouldPerformFragmentNavigation(isFormSubmission, httpMethod, policyChecker().loadType(), newURL)) { @@ -5470,7 +5444,7 @@ index e5a6cc301a99cd9040b03ab37a55c962b09684cd..aa292c1e1b8142895c01e4d9d797ac16 RefPtr oldDocumentLoader = m_documentLoader; NavigationAction action { *m_frame.document(), loader->request(), InitiatedByMainFrame::Unknown, policyChecker().loadType(), isFormSubmission }; -@@ -2799,12 +2803,17 @@ String FrameLoader::userAgent(const URL& url) const +@@ -2792,12 +2796,17 @@ String FrameLoader::userAgent(const URL& url) const String FrameLoader::navigatorPlatform() const { @@ -5490,7 +5464,7 @@ index e5a6cc301a99cd9040b03ab37a55c962b09684cd..aa292c1e1b8142895c01e4d9d797ac16 } void FrameLoader::dispatchOnloadEvents() -@@ -3201,6 +3210,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) +@@ -3195,6 +3204,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) checkCompleted(); if (m_frame.page()) checkLoadComplete(); @@ -5499,7 +5473,7 @@ index e5a6cc301a99cd9040b03ab37a55c962b09684cd..aa292c1e1b8142895c01e4d9d797ac16 } void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue) -@@ -3963,9 +3974,6 @@ String FrameLoader::referrer() const +@@ -3962,9 +3973,6 @@ String FrameLoader::referrer() const void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() { @@ -5509,7 +5483,7 @@ index e5a6cc301a99cd9040b03ab37a55c962b09684cd..aa292c1e1b8142895c01e4d9d797ac16 Vector> worlds; ScriptController::getAllWorlds(worlds); for (auto& world : worlds) -@@ -3974,13 +3982,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() +@@ -3973,13 +3981,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world) { @@ -5530,10 +5504,10 @@ index e5a6cc301a99cd9040b03ab37a55c962b09684cd..aa292c1e1b8142895c01e4d9d797ac16 InspectorInstrumentation::didClearWindowObjectInWorld(m_frame, world); } diff --git a/Source/WebCore/loader/LoaderStrategy.h b/Source/WebCore/loader/LoaderStrategy.h -index b0cb56ec017e9c7f176bf57c2f8f28ac01aa13b8..e8a6802b8c7f2f9e77672a39a4b12df27ce30165 100644 +index aef668bd63ed5fcd45e61e9d1f107cfb6aef264b..16bf309b93be78f4a0e8ee89e5a6afcfa755530a 100644 --- a/Source/WebCore/loader/LoaderStrategy.h +++ b/Source/WebCore/loader/LoaderStrategy.h -@@ -85,6 +85,7 @@ public: +@@ -86,6 +86,7 @@ public: virtual bool isOnLine() const = 0; virtual void addOnlineStateChangeListener(Function&&) = 0; @@ -5836,7 +5810,7 @@ index 602631bb7cd10860b1a3121043c97d8efe44761d..867320c576201d35124a186ac60c2927 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 7e8ac05240a5e103c854c0c4573ddb2c5b7d7a2a..b32e7f4ab896e9ed5027d23a58eeadfdb1551b25 100644 +index 82a763f82760181f46bb8f341fe7818e36c165d4..16dd60a9bc541525ebca7b550d1d2d2ca1516c97 100644 --- a/Source/WebCore/page/Frame.cpp +++ b/Source/WebCore/page/Frame.cpp @@ -39,6 +39,7 @@ @@ -5855,7 +5829,7 @@ index 7e8ac05240a5e103c854c0c4573ddb2c5b7d7a2a..b32e7f4ab896e9ed5027d23a58eeadfd #include "NodeTraversal.h" #include "Page.h" #include "ProcessWarming.h" -@@ -192,6 +194,7 @@ Frame::Frame(Page& page, HTMLFrameOwnerElement* ownerElement, UniqueRefinit(); @@ -5863,7 +5837,7 @@ index 7e8ac05240a5e103c854c0c4573ddb2c5b7d7a2a..b32e7f4ab896e9ed5027d23a58eeadfd } Ref Frame::create(Page* page, HTMLFrameOwnerElement* ownerElement, UniqueRef&& client) -@@ -377,7 +380,7 @@ void Frame::orientationChanged() +@@ -376,7 +379,7 @@ void Frame::orientationChanged() int Frame::orientation() const { if (m_page) @@ -5872,7 +5846,7 @@ index 7e8ac05240a5e103c854c0c4573ddb2c5b7d7a2a..b32e7f4ab896e9ed5027d23a58eeadfd return 0; } #endif // ENABLE(ORIENTATION_EVENTS) -@@ -1170,6 +1173,362 @@ DataDetectionResultsStorage& Frame::dataDetectionResults() +@@ -1169,6 +1172,362 @@ DataDetectionResultsStorage& Frame::dataDetectionResults() #endif @@ -6366,10 +6340,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 194f6d99e9aeef787313671598d1762a2c6568cf..6a217f3cede76a154743a81b96b7da04b96430d4 100644 +index 8146cb59fcb71c710e6f722ac6d5ce559f649337..ea2ff713c741b5049d419fe21921d28bad04937a 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -466,6 +466,37 @@ void Page::setOverrideViewportArguments(const std::optional& +@@ -463,6 +463,37 @@ void Page::setOverrideViewportArguments(const std::optional& document->updateViewportArguments(); } @@ -6407,7 +6381,7 @@ index 194f6d99e9aeef787313671598d1762a2c6568cf..6a217f3cede76a154743a81b96b7da04 ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -1294,10 +1325,6 @@ void Page::didCommitLoad() +@@ -1299,10 +1330,6 @@ void Page::didCommitLoad() m_isEditableRegionEnabled = false; #endif @@ -6418,7 +6392,7 @@ index 194f6d99e9aeef787313671598d1762a2c6568cf..6a217f3cede76a154743a81b96b7da04 resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3301,6 +3328,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3306,6 +3333,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6436,7 +6410,7 @@ index 194f6d99e9aeef787313671598d1762a2c6568cf..6a217f3cede76a154743a81b96b7da04 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 53f61377ac4dbbd95292a266b17fda291701e757..784c138d8fd28c0dbe89019c32f005c2dc6a5e73 100644 +index 2637a29dbf54b38f9cd628ceef81e2ed7a30a05b..aaf09725c7f88082f2ec797f6b4389a0f7771e6d 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h @@ -266,6 +266,9 @@ public: @@ -6460,7 +6434,7 @@ index 53f61377ac4dbbd95292a266b17fda291701e757..784c138d8fd28c0dbe89019c32f005c2 #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -476,6 +483,8 @@ public: +@@ -478,6 +485,8 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6469,7 +6443,7 @@ index 53f61377ac4dbbd95292a266b17fda291701e757..784c138d8fd28c0dbe89019c32f005c2 #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -860,6 +869,11 @@ public: +@@ -862,6 +871,11 @@ public: WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; @@ -6481,7 +6455,7 @@ index 53f61377ac4dbbd95292a266b17fda291701e757..784c138d8fd28c0dbe89019c32f005c2 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -950,6 +964,9 @@ private: +@@ -952,6 +966,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6491,7 +6465,7 @@ index 53f61377ac4dbbd95292a266b17fda291701e757..784c138d8fd28c0dbe89019c32f005c2 #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1029,6 +1046,7 @@ private: +@@ -1031,6 +1048,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6499,7 +6473,7 @@ index 53f61377ac4dbbd95292a266b17fda291701e757..784c138d8fd28c0dbe89019c32f005c2 #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1194,6 +1212,11 @@ private: +@@ -1196,6 +1214,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6573,10 +6547,10 @@ index f90b8e6de036986779294cbb03c753ffcaf71801..af9672ae6605c341f2cbda8559e5441c #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index 3fdc945e785d4a3738b96b008528ee63c424b2d3..592e49b9b6d161c34f2e9810331a4d6e32567f4b 100644 +index 71adc0493b13f707bef23f07aaeb0cbcdf1be1f4..c32cb7c50727c298ae27774bf530e4d61b6c94e1 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h -@@ -202,6 +202,7 @@ public: +@@ -196,6 +196,7 @@ public: void setMouseEventsSimulationEnabled(bool isEnabled) { m_mouseEventsSimulationEnabled = isEnabled; } bool touchEventsEnabled() const; void setTouchEventsEnabled(bool isEnabled) { m_touchEventsEnabled = isEnabled; } @@ -6955,7 +6929,7 @@ index d47d193e8bee85c2d2a35e218decdd84b7212dc1..a1cd2f3b8f025436b596d1b1081357d9 #endif diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h -index fe42c4ec6eba4f048f94fef590493690be53565a..4511ff4d65de37a66f77314bf5dd034d72e7aa1d 100644 +index 9bc30cd29bda92c0b6a10f35bab2b69e1d7cddf1..e5e08abaf3c5277935d5ac199c7da75cc156e5e5 100644 --- a/Source/WebCore/platform/ScrollableArea.h +++ b/Source/WebCore/platform/ScrollableArea.h @@ -103,7 +103,7 @@ public: @@ -8811,10 +8785,10 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp -index 0c26696299174bd6fd89c62b1a02296fa89e4bd9..aa23506fbd5880c39039688913105df08c2a2dc0 100644 +index 14a5119206b7e609957c91b3b747f4bb51b3d7a0..5710f65d8c7bd4d423def14247bb1a9e54924ec5 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp -@@ -2603,7 +2603,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay +@@ -2607,7 +2607,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(); @@ -8870,7 +8844,7 @@ 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 a613e0eed69c7373fbba5fc85ae9418ba57e7f72..05bee42b49bb3840dc0e7758bb4ef8dfd1f83be9 100644 +index 9f72d8dc62b90b7e64437c5870e7944d81460630..54c56855f86077bdb984527f61774dfb121bcbf1 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -76,6 +76,11 @@ @@ -8885,7 +8859,7 @@ index a613e0eed69c7373fbba5fc85ae9418ba57e7f72..05bee42b49bb3840dc0e7758bb4ef8df #if ENABLE(APPLE_PAY_REMOTE_UI) #include "WebPaymentCoordinatorProxyMessages.h" #endif -@@ -951,6 +956,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) +@@ -964,6 +969,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) #endif } @@ -8901,10 +8875,10 @@ index a613e0eed69c7373fbba5fc85ae9418ba57e7f72..05bee42b49bb3840dc0e7758bb4ef8df void NetworkConnectionToWebProcess::removeStorageAccessForFrame(FrameIdentifier frameID, PageIdentifier pageID) { diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -index af424f40e9265e6a2251dc3098fdf0495aca88f5..c257a4c994dcb0f6c4d9eaed74a8b1689d702736 100644 +index d1bbfdb0090a8fcf8c8fa8d1e0a6d55bc2bf956f..2e72b6aed762434d14c0e4b76dbcf142df6c89d2 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -@@ -288,6 +288,8 @@ private: +@@ -289,6 +289,8 @@ private: void clearPageSpecificData(WebCore::PageIdentifier); @@ -8927,7 +8901,7 @@ index daeba5d84582c506391b2eca143710d23a17de12..cd68dd1d1b7e7d952040e6546a66fbbb 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 d38e9a60c99bfbe4db4edb232bcd586efabaeebc..646c3bbf1803b2669482953bf47e957b3727f4cf 100644 +index be00066ba03350ce965795c58bafa412bc495907..7cc58fc49c933597f012c4c35bd63b6a21fd25a3 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -8998,19 +8972,8 @@ index d38e9a60c99bfbe4db4edb232bcd586efabaeebc..646c3bbf1803b2669482953bf47e957b #if ENABLE(INTELLIGENT_TRACKING_PREVENTION) void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { -@@ -1940,7 +1992,9 @@ void NetworkProcess::deleteAndRestrictWebsiteDataForRegistrableDomains(PAL::Sess - - if (websiteDataTypes.contains(WebsiteDataType::DiskCache)) { - forEachNetworkSession([sessionID, fetchOptions, &domainsToDeleteAllNonCookieWebsiteDataFor, &callbackAggregator](auto& session) { -- fetchDiskCacheEntries(session.cache(), sessionID, fetchOptions, [domainsToDeleteAllNonCookieWebsiteDataFor, callbackAggregator, session = WeakPtr { session }](auto entries) mutable { -+ /* hack: gcc 8.4 will segfault if the WeakPtr is instantiated within the lambda captures */ -+ auto ws = WeakPtr { session }; -+ fetchDiskCacheEntries(session.cache(), sessionID, fetchOptions, [domainsToDeleteAllNonCookieWebsiteDataFor, callbackAggregator, session = WTFMove(ws)](auto entries) mutable { - if (!session) - return; - diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index e02cbdf780318dbd2fa0b208c8602866dfbca23f..3e33da081d06f4b2199156a34eba62b072764770 100644 +index 57799ac04368746487dd2536a195951e5c08d760..4b7d77358ab101e63a7c7585d40d1cdee53498b1 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -35,6 +35,7 @@ @@ -9045,7 +9008,7 @@ index e02cbdf780318dbd2fa0b208c8602866dfbca23f..3e33da081d06f4b2199156a34eba62b0 void clearPrevalentResource(PAL::SessionID, const RegistrableDomain&, CompletionHandler&&); void clearUserInteraction(PAL::SessionID, const RegistrableDomain&, CompletionHandler&&); diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in -index c0661ec5746af36f36ce03edef02dce66890a758..b45a8c263b424b1d4714d14241f5afcd9c3a01cf 100644 +index 32ab3840b66a7c78d53a35459120dddb2cf4e9bc..6172373ae7c1bbf968d748a2148b8b0dde2cfacd 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in @@ -77,6 +77,14 @@ messages -> NetworkProcess LegacyReceiver { @@ -9064,7 +9027,7 @@ index c0661ec5746af36f36ce03edef02dce66890a758..b45a8c263b424b1d4714d14241f5afcd 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 fe4db050370f4a426135a8f43ffef4b55c0ca45a..d1846620059353ad1ec5f0fc96a3624de75f92f9 100644 +index 3dddf4b3288d3b2741ea3aefd98d13f784c1eb74..ccb9aeb5461f40129ae26cf0da3f60dcff6703a6 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h @@ -169,6 +169,9 @@ public: @@ -9077,7 +9040,7 @@ index fe4db050370f4a426135a8f43ffef4b55c0ca45a..d1846620059353ad1ec5f0fc96a3624d #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -221,6 +224,7 @@ protected: +@@ -225,6 +228,7 @@ protected: bool m_privateClickMeasurementDebugModeEnabled { false }; std::optional m_ephemeralMeasurement; bool m_isRunningEphemeralMeasurementTest { false }; @@ -9609,10 +9572,10 @@ index 9873026a091fdf2974be1a1e734e6f5b30a7d7c5..17f2905841f190ab2e18862c5df477c4 } return makeUnique(channel, request, soupSession(), soupMessage.get(), protocol); diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index 88c560cc9f62ce5c5e9cdef9d470de47fad45ae4..c3f101ee43d6f665d5b092a38d99719911354ad3 100644 +index 141705a204e028c18c442a0d9429431ae8881faf..2d9af691b23215442389e8330256b4220e14de26 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake -@@ -464,6 +464,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -465,6 +465,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GSTREAMER_PBUTILS_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -9622,7 +9585,7 @@ index 88c560cc9f62ce5c5e9cdef9d470de47fad45ae4..c3f101ee43d6f665d5b092a38d997199 ) if (USE_WPE_RENDERER) -@@ -517,6 +520,9 @@ if (USE_LIBWEBRTC) +@@ -518,6 +521,9 @@ if (USE_LIBWEBRTC) list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/libwebrtc/Source/" "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc" @@ -9632,7 +9595,7 @@ index 88c560cc9f62ce5c5e9cdef9d470de47fad45ae4..c3f101ee43d6f665d5b092a38d997199 ) endif () -@@ -531,6 +537,12 @@ if (ENABLE_MEDIA_STREAM) +@@ -532,6 +538,12 @@ if (ENABLE_MEDIA_STREAM) ) endif () @@ -9646,7 +9609,7 @@ index 88c560cc9f62ce5c5e9cdef9d470de47fad45ae4..c3f101ee43d6f665d5b092a38d997199 set(WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2GTK_INSTALLED_HEADERS}) list(REMOVE_ITEM WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitEnumTypes.h) diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake -index 87765f9418e07ec856895a2f1771af6838f3811a..88f64247ada0075c0fc8a669beee7b2f754f9288 100644 +index 87fa6e1bd9e5f8dbdef854021f7d8579591629b5..a0e9545900928f005110e83ef1248fa1235a64fa 100644 --- a/Source/WebKit/PlatformWPE.cmake +++ b/Source/WebKit/PlatformWPE.cmake @@ -166,6 +166,7 @@ set(WPE_API_INSTALLED_HEADERS @@ -9657,7 +9620,7 @@ index 87765f9418e07ec856895a2f1771af6838f3811a..88f64247ada0075c0fc8a669beee7b2f ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPolicyDecision.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitRectangle.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitResponsePolicyDecision.h -@@ -291,6 +292,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES +@@ -292,6 +293,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES "${WEBKIT_DIR}/UIProcess/API/wpe" "${WEBKIT_DIR}/UIProcess/CoordinatedGraphics" "${WEBKIT_DIR}/UIProcess/geoclue" @@ -9665,7 +9628,7 @@ index 87765f9418e07ec856895a2f1771af6838f3811a..88f64247ada0075c0fc8a669beee7b2f "${WEBKIT_DIR}/UIProcess/gstreamer" "${WEBKIT_DIR}/UIProcess/linux" "${WEBKIT_DIR}/UIProcess/soup" -@@ -313,8 +315,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -314,8 +316,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GIO_UNIX_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -9684,12 +9647,12 @@ index 87765f9418e07ec856895a2f1771af6838f3811a..88f64247ada0075c0fc8a669beee7b2f Cairo::Cairo Freetype::Freetype diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake -index 01565d550697b25367bb36971d6fe5ec33f712f0..98fb300309de1c0567912158f23ab39e7c0e21d5 100644 +index 9bea022e3891a56368f3f1cd02d79e265170d194..4ed61a3efe288c12f61bd3a795dd38e716614e31 100644 --- a/Source/WebKit/PlatformWin.cmake +++ b/Source/WebKit/PlatformWin.cmake -@@ -69,8 +69,12 @@ list(APPEND WebKit_SOURCES +@@ -75,8 +75,12 @@ list(APPEND WebKit_SOURCES - UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp + UIProcess/wc/DrawingAreaProxyWC.cpp + UIProcess/win/InspectorTargetProxyWin.cpp + UIProcess/win/InspectorPlaywrightAgentClientWin.cpp @@ -9700,16 +9663,16 @@ index 01565d550697b25367bb36971d6fe5ec33f712f0..98fb300309de1c0567912158f23ab39e UIProcess/win/WebPageProxyWin.cpp UIProcess/win/WebPopupMenuProxyWin.cpp UIProcess/win/WebProcessPoolWin.cpp -@@ -88,6 +92,7 @@ list(APPEND WebKit_SOURCES - WebProcess/Plugins/Netscape/win/PluginProxyWin.cpp +@@ -93,6 +97,7 @@ list(APPEND WebKit_SOURCES + WebProcess/MediaCache/WebMediaKeyStorageManager.cpp WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp + WebProcess/WebCoreSupport/win/WebDragClientWin.cpp WebProcess/WebPage/AcceleratedSurface.cpp -@@ -129,6 +134,72 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES - "${WEBKIT_DIR}/win" +@@ -148,6 +153,72 @@ list(APPEND WebKit_MESSAGES_IN_FILES + WebProcess/GPU/graphics/wc/RemoteWCLayerTreeHostProxy ) +# Playwright begin @@ -9781,7 +9744,7 @@ index 01565d550697b25367bb36971d6fe5ec33f712f0..98fb300309de1c0567912158f23ab39e set(WebKitCommonIncludeDirectories ${WebKit_INCLUDE_DIRECTORIES}) set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) -@@ -181,6 +252,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) +@@ -200,6 +271,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) OpenSSL::SSL mfuuid.lib strmiids.lib @@ -9880,7 +9843,7 @@ index f2f3979fcac9dfd97d0e0ead600fe35eb8defd40..ac91412e1a96bdf521b1890a66e465dc NSEvent* nativeEvent() const { return m_nativeEvent.get(); } #elif PLATFORM(GTK) diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -index 51c7a372047bca0fdb625d2591eced9132e9db6e..4fe13df08b5788f4dc92c158297cc164f3374ba6 100644 +index 2bb58ffb74287265ccc3855744fad5dd01e2c953..a0d65b6248b4e4c460e32d41b3027e83f376baa2 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -119,6 +119,10 @@ @@ -9894,7 +9857,7 @@ index 51c7a372047bca0fdb625d2591eced9132e9db6e..4fe13df08b5788f4dc92c158297cc164 // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1377,6 +1381,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1375,6 +1379,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -9904,7 +9867,7 @@ index 51c7a372047bca0fdb625d2591eced9132e9db6e..4fe13df08b5788f4dc92c158297cc164 } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1405,6 +1412,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1403,6 +1410,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -9917,7 +9880,7 @@ index 51c7a372047bca0fdb625d2591eced9132e9db6e..4fe13df08b5788f4dc92c158297cc164 return true; } -@@ -1418,6 +1431,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1416,6 +1429,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -9929,7 +9892,7 @@ index 51c7a372047bca0fdb625d2591eced9132e9db6e..4fe13df08b5788f4dc92c158297cc164 #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1441,9 +1459,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1439,9 +1457,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -9947,7 +9910,7 @@ index 51c7a372047bca0fdb625d2591eced9132e9db6e..4fe13df08b5788f4dc92c158297cc164 if (!decoder.decode(pasteboardName)) return false; -@@ -1459,8 +1484,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1457,8 +1482,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -10441,10 +10404,10 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 1427e7e3bbcf11e9ee21d9bf878ba1c42c731640..aebe86316fdd0df7c1e5642408ddc133fb4017c1 100644 +index 0acff5c6805478b3da28033024f58e767c3f2166..61d4b1ff72bd88d69a3b10ce3bef623be5670278 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -316,11 +316,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -299,11 +299,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10459,7 +10422,7 @@ index 1427e7e3bbcf11e9ee21d9bf878ba1c42c731640..aebe86316fdd0df7c1e5642408ddc133 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -329,6 +332,7 @@ UIProcess/PageLoadState.cpp +@@ -312,6 +315,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10467,7 +10430,7 @@ index 1427e7e3bbcf11e9ee21d9bf878ba1c42c731640..aebe86316fdd0df7c1e5642408ddc133 UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -369,6 +373,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -352,6 +356,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10476,7 +10439,7 @@ index 1427e7e3bbcf11e9ee21d9bf878ba1c42c731640..aebe86316fdd0df7c1e5642408ddc133 UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -490,7 +496,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -473,7 +479,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10489,10 +10452,10 @@ index 1427e7e3bbcf11e9ee21d9bf878ba1c42c731640..aebe86316fdd0df7c1e5642408ddc133 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 73df95c80850f191b9b698243ca20ca74652c946..38edadbedb22bab118be1faf719159ac3e28da16 100644 +index 0cbe37ffa70fa7cb56def0982dba0e3f4bf98d2a..3a00a803ab7030b812d3ee5261d137fdafac4006 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -279,6 +279,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -269,6 +269,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -10500,7 +10463,7 @@ index 73df95c80850f191b9b698243ca20ca74652c946..38edadbedb22bab118be1faf719159ac UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -451,6 +452,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -441,6 +442,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -10509,7 +10472,7 @@ index 73df95c80850f191b9b698243ca20ca74652c946..38edadbedb22bab118be1faf719159ac UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm UIProcess/Inspector/mac/WKInspectorViewController.mm diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt -index 5c954eef9ae1b2f94ef008b2a38af8894b0c9ac5..8cff85356bf3f8b5c2cd4a9246a487831c78883d 100644 +index f21246f00c18f2381fcee7317f9649f1b661e342..dc2fe29b9dcf0cf9726a38797806dd886e603e2a 100644 --- a/Source/WebKit/SourcesGTK.txt +++ b/Source/WebKit/SourcesGTK.txt @@ -127,6 +127,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify @@ -10520,7 +10483,7 @@ index 5c954eef9ae1b2f94ef008b2a38af8894b0c9ac5..8cff85356bf3f8b5c2cd4a9246a48783 UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify UIProcess/API/glib/WebKitCookieManager.cpp @no-unify UIProcess/API/glib/WebKitCredential.cpp @no-unify -@@ -241,6 +242,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp +@@ -242,6 +243,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp UIProcess/cairo/BackingStoreCairo.cpp @no-unify @@ -10528,7 +10491,7 @@ index 5c954eef9ae1b2f94ef008b2a38af8894b0c9ac5..8cff85356bf3f8b5c2cd4a9246a48783 UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -258,6 +260,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify +@@ -259,6 +261,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify UIProcess/gtk/WebDateTimePickerGtk.cpp UIProcess/gtk/GtkSettingsManager.cpp UIProcess/gtk/HardwareAccelerationManager.cpp @@ -10536,7 +10499,7 @@ index 5c954eef9ae1b2f94ef008b2a38af8894b0c9ac5..8cff85356bf3f8b5c2cd4a9246a48783 UIProcess/gtk/KeyBindingTranslator.cpp UIProcess/gtk/PointerLockManager.cpp @no-unify UIProcess/gtk/PointerLockManagerWayland.cpp @no-unify -@@ -270,6 +273,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify +@@ -271,6 +274,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify UIProcess/gtk/WebColorPickerGtk.cpp UIProcess/gtk/WebContextMenuProxyGtk.cpp UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp @@ -10546,7 +10509,7 @@ index 5c954eef9ae1b2f94ef008b2a38af8894b0c9ac5..8cff85356bf3f8b5c2cd4a9246a48783 UIProcess/gtk/WebPasteboardProxyGtk.cpp UIProcess/gtk/WebPopupMenuProxyGtk.cpp diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt -index 8a1c30f32f3b9350a306bef530ecb3340c1f29c7..6c2ac1bbe2a770c6c8dafbe4ee5a2f04a30e7af4 100644 +index 94419dd86f079c5c53e68ce8e79b915505a87ab0..076d3c33ccbdd2894239375a308df5bd61c59242 100644 --- a/Source/WebKit/SourcesWPE.txt +++ b/Source/WebKit/SourcesWPE.txt @@ -86,6 +86,7 @@ Shared/glib/ProcessExecutablePathGLib.cpp @@ -10573,7 +10536,7 @@ index 8a1c30f32f3b9350a306bef530ecb3340c1f29c7..6c2ac1bbe2a770c6c8dafbe4ee5a2f04 UIProcess/API/glib/WebKitPolicyDecision.cpp @no-unify UIProcess/API/glib/WebKitPrivate.cpp @no-unify UIProcess/API/glib/WebKitProtocolHandler.cpp @no-unify -@@ -185,6 +188,7 @@ UIProcess/API/wpe/InputMethodFilterWPE.cpp @no-unify +@@ -186,6 +189,7 @@ UIProcess/API/wpe/InputMethodFilterWPE.cpp @no-unify UIProcess/API/wpe/PageClientImpl.cpp @no-unify UIProcess/API/wpe/TouchGestureController.cpp @no-unify UIProcess/API/wpe/WebKitColor.cpp @no-unify @@ -10581,7 +10544,7 @@ index 8a1c30f32f3b9350a306bef530ecb3340c1f29c7..6c2ac1bbe2a770c6c8dafbe4ee5a2f04 UIProcess/API/wpe/WebKitInputMethodContextWPE.cpp @no-unify UIProcess/API/wpe/WebKitPopupMenu.cpp @no-unify UIProcess/API/wpe/WebKitRectangle.cpp @no-unify -@@ -201,6 +205,7 @@ UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +@@ -202,6 +206,7 @@ UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp UIProcess/geoclue/GeoclueGeolocationProvider.cpp @@ -10589,7 +10552,7 @@ index 8a1c30f32f3b9350a306bef530ecb3340c1f29c7..6c2ac1bbe2a770c6c8dafbe4ee5a2f04 UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -223,6 +228,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp +@@ -224,6 +229,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp UIProcess/soup/WebCookieManagerProxySoup.cpp UIProcess/soup/WebProcessPoolSoup.cpp @@ -10601,7 +10564,7 @@ index 8a1c30f32f3b9350a306bef530ecb3340c1f29c7..6c2ac1bbe2a770c6c8dafbe4ee5a2f04 UIProcess/wpe/WebPageProxyWPE.cpp WebProcess/GPU/media/gstreamer/VideoLayerRemoteGStreamer.cpp -@@ -251,6 +261,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp +@@ -252,6 +262,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp @@ -10651,7 +10614,7 @@ index bc05fe15f5eacdac6f25cde2a6a488fb84c3e03c..79a9082771d4af4ad31157fac8ca2e2a bool m_shouldTakeUIBackgroundAssertion { true }; bool m_shouldCaptureDisplayInUIProcess { DEFAULT_CAPTURE_DISPLAY_IN_UI_PROCESS }; diff --git a/Source/WebKit/UIProcess/API/APIUIClient.h b/Source/WebKit/UIProcess/API/APIUIClient.h -index 549102eb5feeab009bf9477532d4f9d501ea8e5b..a0cd676d3a736e70ff5513626bd34ba02f45e2d2 100644 +index 658cebc3c285aa6d898269950bebdfdcfb1c97cf..13442f93d7996ca63237304c4fe352c271ce9647 100644 --- a/Source/WebKit/UIProcess/API/APIUIClient.h +++ b/Source/WebKit/UIProcess/API/APIUIClient.h @@ -94,6 +94,7 @@ public: @@ -10662,18 +10625,6 @@ index 549102eb5feeab009bf9477532d4f9d501ea8e5b..a0cd676d3a736e70ff5513626bd34ba0 virtual void setStatusText(WebKit::WebPageProxy*, const WTF::String&) { } virtual void mouseDidMoveOverElement(WebKit::WebPageProxy&, const WebKit::WebHitTestResultData&, OptionSet, Object*) { } -diff --git a/Source/WebKit/UIProcess/API/APIWebAuthenticationAssertionResponse.cpp b/Source/WebKit/UIProcess/API/APIWebAuthenticationAssertionResponse.cpp -index eeebd9bd05f563ab4b5634ff4afb6dd87cc4a0b3..79ef88b25d636f2cf1536f0e3af295f8f08a0fcd 100644 ---- a/Source/WebKit/UIProcess/API/APIWebAuthenticationAssertionResponse.cpp -+++ b/Source/WebKit/UIProcess/API/APIWebAuthenticationAssertionResponse.cpp -@@ -29,6 +29,7 @@ - #if ENABLE(WEB_AUTHN) - - #include "APIData.h" -+#include - - namespace API { - using namespace WebCore; diff --git a/Source/WebKit/UIProcess/API/C/WKInspector.cpp b/Source/WebKit/UIProcess/API/C/WKInspector.cpp index e1465edd29caf3109c17d44bb3c88aaba98cfbb5..32d569d3240c583334b8b6512407430fd448ae75 100644 --- a/Source/WebKit/UIProcess/API/C/WKInspector.cpp @@ -10718,10 +10669,10 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index a8da7fd485a4764996447f6282a79f20a487921e..afc6b251a6a3012f31c7f2f9c10da835b699b54a 100644 +index 67a7605ff5ea9dfe9d19bea1b564eb2c1d1e576d..0fbc4a5bfe9b36b252d370f478396d229bd915c1 100644 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp -@@ -1776,6 +1776,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient +@@ -1775,6 +1775,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient completionHandler(String()); } @@ -10735,7 +10686,7 @@ index a8da7fd485a4764996447f6282a79f20a487921e..afc6b251a6a3012f31c7f2f9c10da835 void setStatusText(WebPageProxy* page, const String& text) final { if (!m_client.setStatusText) -@@ -1836,6 +1843,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient +@@ -1804,6 +1811,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient { if (!m_client.didNotHandleKeyEvent) return; @@ -10819,10 +10770,10 @@ index afa925f36c29db9c23921298dead9cce737500d6..42d396342acdb6d39830f611df0ee40e NS_ASSUME_NONNULL_END diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm -index 9ba69f7d06a5d66bb1aaf8d7471b0455afeffbcc..879becf9c90f302fdebc2287d2a346449db2590d 100644 +index e2b0736464b166dd920cf355171fb3a56370a384..cb1e7f05cf4ac1ff7ca167aa6e3336b4f44ca79b 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm -@@ -42,6 +42,7 @@ +@@ -44,6 +44,7 @@ #import "_WKResourceLoadStatisticsThirdPartyInternal.h" #import "_WKWebsiteDataStoreConfigurationInternal.h" #import "_WKWebsiteDataStoreDelegate.h" @@ -10830,7 +10781,7 @@ index 9ba69f7d06a5d66bb1aaf8d7471b0455afeffbcc..879becf9c90f302fdebc2287d2a34644 #import #import #import -@@ -203,6 +204,11 @@ static WallTime toSystemClockTime(NSDate *date) +@@ -205,6 +206,11 @@ static WallTime toSystemClockTime(NSDate *date) }); } @@ -11668,7 +11619,7 @@ index 187df5e92217097766a94ad21ec631273a9764fa..64720ed966eba1578fa0a869561dd7ba + +WebKit::AcceleratedBackingStore* webkitWebViewBaseGetAcceleratedBackingStore(WebKitWebViewBase*); diff --git a/Source/WebKit/UIProcess/API/gtk/webkit2.h b/Source/WebKit/UIProcess/API/gtk/webkit2.h -index b7d2741c4b2c1ad4e34a1fab48fec61af1c6102d..eac99e94eec2e093fa3a1f2356f8d75edb2dbd75 100644 +index 5cd9524252a97d4ea64dfeb22e5a47b55f36c887..45da62b4ffe54d5cfd680dd40cabd6f45bc993a6 100644 --- a/Source/WebKit/UIProcess/API/gtk/webkit2.h +++ b/Source/WebKit/UIProcess/API/gtk/webkit2.h @@ -32,6 +32,7 @@ @@ -12100,7 +12051,7 @@ index e4b92ace1531090ae38a7aec3d3d4febf19aee84..43690f9ef4969a39084501613bfc00a7 + +cairo_surface_t* webkitWebViewBackendTakeScreenshot(WebKitWebViewBackend*); diff --git a/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt b/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt -index b8b08d2f91f2564cef7da0b8ecedc8a112d5be90..8a4ee769eb7dd7323a76c1c5c3412e317c4b02db 100644 +index 0a9cf24c738d2cc0575f00d73ddce7c0b46bbda7..a7e0e35e4f8a20aefb9e6cabf48d2d110ce3475e 100644 --- a/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt +++ b/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt @@ -327,6 +327,8 @@ WEBKIT_TYPE_WEB_VIEW_BACKEND @@ -12113,7 +12064,7 @@ index b8b08d2f91f2564cef7da0b8ecedc8a112d5be90..8a4ee769eb7dd7323a76c1c5c3412e31 webkit_web_view_backend_get_type diff --git a/Source/WebKit/UIProcess/API/wpe/webkit.h b/Source/WebKit/UIProcess/API/wpe/webkit.h -index 5c93d760f734a12f614899545135fdf770164575..220233502be810de49e1090c32b0a4f79ea362ca 100644 +index c2221efc00618c2ec4d20a88c59840767bd52ff5..71f1cd7e07c705a7c830ff5c4f7d7f981bb363f2 100644 --- a/Source/WebKit/UIProcess/API/wpe/webkit.h +++ b/Source/WebKit/UIProcess/API/wpe/webkit.h @@ -32,6 +32,7 @@ @@ -12248,7 +12199,7 @@ index 0000000000000000000000000000000000000000..cd66887de171cda7d15a8e4dc6dbff63 + +#endif // ENABLE(REMOTE_INSPECTOR) diff --git a/Source/WebKit/UIProcess/Cocoa/AutomationClient.mm b/Source/WebKit/UIProcess/Cocoa/AutomationClient.mm -index 02dadcc4c813ad82c718f16a583616e03e35a195..5211c6b38efaf2a62eb556ec060cd9caa5e5d40e 100644 +index 30860712f58b2a8d48cef5da4e6f03345f2921ba..e715496c24529689784ba4d481d23441ab68cf1e 100644 --- a/Source/WebKit/UIProcess/Cocoa/AutomationClient.mm +++ b/Source/WebKit/UIProcess/Cocoa/AutomationClient.mm @@ -35,6 +35,7 @@ @@ -12282,10 +12233,10 @@ index 454c61ffdefecc476d1560c7c43f5b5d345f281d..6de7509037b7683ddd403ee247bdf284 class PopUpSOAuthorizationSession final : public SOAuthorizationSession { public: diff --git a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SubFrameSOAuthorizationSession.h b/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SubFrameSOAuthorizationSession.h -index 24479b46826f7a1626f0e581764746d330e3a1c2..a844efd35224414b1de612644fc352b198db48e8 100644 +index 8a95a3f8036bb0c664954c23ba3ecf72058ae711..dd10e28e2499cd84be2d072dc7567050ca1e3001 100644 --- a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SubFrameSOAuthorizationSession.h +++ b/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SubFrameSOAuthorizationSession.h -@@ -31,6 +31,7 @@ +@@ -32,6 +32,7 @@ #include "NavigationSOAuthorizationSession.h" #include #include @@ -12294,7 +12245,7 @@ index 24479b46826f7a1626f0e581764746d330e3a1c2..a844efd35224414b1de612644fc352b1 namespace WebKit { diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h -index e679695a3fe1a0aef28dd5af0248d6906f341987..7a8898483f4a22d668a54c56a840fed98a4c4a3e 100644 +index 5cbca77a100f408ba56545be9b099fbe888476d9..e7eeb441460b23cf7e98b78ed9f05a80609cd4e5 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h @@ -94,6 +94,7 @@ private: @@ -12305,7 +12256,7 @@ index e679695a3fe1a0aef28dd5af0248d6906f341987..7a8898483f4a22d668a54c56a840fed9 void presentStorageAccessConfirmDialog(const WTF::String& requestingDomain, const WTF::String& currentDomain, CompletionHandler&&); void requestStorageAccessConfirm(WebPageProxy&, WebFrameProxy*, const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, CompletionHandler&&) final; void decidePolicyForGeolocationPermissionRequest(WebPageProxy&, WebFrameProxy&, const FrameInfoData&, Function&) final; -@@ -187,6 +188,7 @@ private: +@@ -186,6 +187,7 @@ private: bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler : 1; @@ -12314,7 +12265,7 @@ index e679695a3fe1a0aef28dd5af0248d6906f341987..7a8898483f4a22d668a54c56a840fed9 bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1; diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -index 6d0daa53ca5007107390503d280995a4cd876b65..15997edba7b6ff5f6b97bd27047dfcd9ca03b72d 100644 +index a004a15db9711927e2587c61b17a7c193cb0e8e2..1d373e6efa8c34a1cecef318deca1197f038fa1f 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm @@ -109,6 +109,7 @@ void UIDelegate::setDelegate(id delegate) @@ -12421,10 +12372,10 @@ index 915b7f4c648e2fe0198efd15b55ff451181ad6f7..994a1eb25362a259f33e9307833f66d1 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index b1215fc9b22424bd852e3cca6cf1fbf6121be678..d39050a9b959de92873de8dfc2196531c8e40383 100644 +index 11f053f1b537ea64fc241e60a3de970619c01d8f..b74a97669692fd9800cabd4db26290f3b7ff267e 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -455,7 +455,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -447,7 +447,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -12433,7 +12384,7 @@ index b1215fc9b22424bd852e3cca6cf1fbf6121be678..d39050a9b959de92873de8dfc2196531 #endif #if PLATFORM(IOS) -@@ -766,8 +766,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -758,8 +758,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -12445,10 +12396,10 @@ index b1215fc9b22424bd852e3cca6cf1fbf6121be678..d39050a9b959de92873de8dfc2196531 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 1c574458ef308c1a05541bd6add2bda50400d260..babdf3eb59c550c6c4b215bc2c078dade4cf4e57 100644 +index b77d4c07cb073200974bd30a34c77f80e2893de0..b51a9edf02f5f494bce898c6ddd148c01b355f65 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h -@@ -514,6 +514,9 @@ public: +@@ -511,6 +511,9 @@ public: void provideDataForPasteboard(NSPasteboard *, NSString *type); NSArray *namesOfPromisedFilesDroppedAtDestination(NSURL *dropDestination); @@ -12459,7 +12410,7 @@ index 1c574458ef308c1a05541bd6add2bda50400d260..babdf3eb59c550c6c4b215bc2c078dad void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index bbd2599d9eaf354312eca1cfba1362c138369a85..c33385e23437a7d15b32b14ebfc272e2686f299f 100644 +index 09ad398bcab6d42f408a7fb8f48628f2c10b41b5..c5a75af9c79b3ca3b183eb45f19db15b567c2ea3 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm @@ -2615,6 +2615,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() @@ -12474,7 +12425,7 @@ index bbd2599d9eaf354312eca1cfba1362c138369a85..c33385e23437a7d15b32b14ebfc272e2 ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4688,6 +4693,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4625,6 +4630,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -16129,10 +16080,10 @@ index 7a14cfba15c103a2d4fe263fa49d25af3c396ec2..3ee0e154349661632799057c71f1d1f1 BOOL result = ::CreateProcess(0, commandLine.data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation); diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h -index 9e7df1841ae9f59908477cdda1adc510586796e0..8303055373dcfbff8c598c5c00bb8a5bf3dc3ee6 100644 +index 5e2ec75599c56aca546bad2a5c63dee1a0a6732f..9fccdf89503e1a089fe20e00077d066068c3293b 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h -@@ -324,6 +324,11 @@ public: +@@ -323,6 +323,11 @@ public: virtual void selectionDidChange() = 0; #endif @@ -17176,10 +17127,10 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43c8fcdbdc 100644 +index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4f0aa347b 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp -@@ -247,6 +247,9 @@ +@@ -245,6 +245,9 @@ #if PLATFORM(GTK) #include "GtkSettingsManager.h" @@ -17189,7 +17140,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 #include #endif -@@ -620,6 +623,10 @@ WebPageProxy::~WebPageProxy() +@@ -618,6 +621,10 @@ WebPageProxy::~WebPageProxy() if (m_preferences->mediaSessionCoordinatorEnabled()) GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this); #endif @@ -17200,7 +17151,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 } void WebPageProxy::addAllMessageReceivers() -@@ -1018,6 +1025,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -1016,6 +1023,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -17208,7 +17159,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 } void WebPageProxy::didAttachToRunningProcess() -@@ -1371,6 +1379,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1369,6 +1377,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -17230,7 +17181,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1922,6 +1945,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1917,6 +1940,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -17262,7 +17213,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2112,6 +2160,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2107,6 +2155,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -17288,7 +17239,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2684,6 +2751,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2679,6 +2746,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -17297,7 +17248,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2694,6 +2763,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2689,6 +2758,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -17306,7 +17257,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2709,18 +2780,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2729,6 +2823,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2724,6 +2818,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17376,7 +17327,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2741,8 +2853,18 @@ void WebPageProxy::didStartDrag() +@@ -2736,8 +2848,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17396,7 +17347,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2847,16 +2969,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2842,16 +2964,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17442,7 +17393,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3075,7 +3219,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3001,7 +3145,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17451,7 +17402,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3108,7 +3252,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3034,7 +3178,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17460,7 +17411,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3497,6 +3641,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3423,6 +3567,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17469,7 +17420,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3563,6 +3709,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3489,6 +3635,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, std::variant, Ref>&& navigationActionOrResponse, Ref&& sender, std::optional sandboxExtensionHandle, WillContinueLoadInNewProcess willContinueLoadInNewProcess) { @@ -17477,7 +17428,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4285,6 +4432,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4209,6 +4356,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17489,7 +17440,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4618,6 +4770,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4542,6 +4694,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17497,7 +17448,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4842,6 +4995,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4766,6 +4919,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17506,7 +17457,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 // 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; -@@ -5310,7 +5465,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5234,7 +5389,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) { @@ -17522,7 +17473,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5847,6 +6009,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5771,6 +5933,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(); @@ -17530,7 +17481,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 auto completionHandler = [this, protectedThis = Ref { *this }, mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5890,6 +6053,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5814,6 +5977,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17538,7 +17489,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 } void WebPageProxy::exitFullscreenImmediately() -@@ -5925,6 +6089,10 @@ void WebPageProxy::closePage() +@@ -5849,6 +6013,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17549,7 +17500,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5961,6 +6129,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5885,6 +6053,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 { @@ -17558,7 +17509,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -5982,6 +6152,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5906,6 +6076,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17567,7 +17518,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 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 { -@@ -6005,6 +6177,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -5929,6 +6101,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17576,7 +17527,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 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 { -@@ -6165,6 +6339,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6056,6 +6230,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17585,7 +17536,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7397,6 +7573,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7288,6 +7464,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17594,7 +17545,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 } break; } -@@ -7411,10 +7589,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7302,10 +7480,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -17611,7 +17562,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 break; } -@@ -7423,7 +7604,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7314,7 +7495,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()); @@ -17619,7 +17570,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7442,7 +7622,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7333,7 +7513,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); @@ -17627,7 +17578,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7451,6 +7630,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7342,6 +7521,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17635,7 +17586,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 } break; } -@@ -7805,7 +7985,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7696,7 +7876,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -17647,7 +17598,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8186,6 +8369,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -8077,6 +8260,7 @@ static const Vector& mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17655,7 +17606,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8381,6 +8565,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8272,6 +8456,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -17664,7 +17615,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 #if PLATFORM(GTK) parameters.gtkSettings = GtkSettingsManager::singleton().settingsState(); #endif -@@ -8461,6 +8647,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8352,6 +8538,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17679,7 +17630,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8554,6 +8748,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8445,6 +8639,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17696,7 +17647,7 @@ index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43 // 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 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1d8e5b1f0 100644 +index 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db4f4298c0 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17707,7 +17658,7 @@ index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1 #include "LayerTreeContext.h" #include "MediaKeySystemPermissionRequestManagerProxy.h" #include "MediaPlaybackState.h" -@@ -148,8 +149,11 @@ +@@ -147,8 +148,11 @@ #include "EndowmentStateTracker.h" #endif @@ -17719,7 +17670,7 @@ index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1 #endif #if ENABLE(TOUCH_EVENTS) -@@ -170,6 +174,14 @@ +@@ -169,6 +173,14 @@ #include "ArgumentCodersGtk.h" #endif @@ -17734,7 +17685,7 @@ index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1 #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY) #include #include -@@ -249,6 +261,7 @@ class AuthenticationChallenge; +@@ -248,6 +260,7 @@ class AuthenticationChallenge; class CertificateInfo; class Cursor; class DragData; @@ -17742,7 +17693,7 @@ index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1 class FloatRect; class FontAttributeChanges; class FontChanges; -@@ -256,7 +269,6 @@ class GraphicsLayer; +@@ -255,7 +268,6 @@ class GraphicsLayer; class IntSize; class ProtectionSpace; class RunLoopObserver; @@ -17750,7 +17701,7 @@ index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1 class SharedBuffer; class SpeechRecognitionRequest; class TextIndicator; -@@ -536,6 +548,8 @@ public: +@@ -535,6 +547,8 @@ public: void setControlledByAutomation(bool); WebPageInspectorController& inspectorController() { return *m_inspectorController; } @@ -17759,7 +17710,7 @@ index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1 #if PLATFORM(IOS_FAMILY) void showInspectorIndication(); -@@ -620,6 +634,11 @@ public: +@@ -619,6 +633,11 @@ public: void setPageLoadStateObserver(std::unique_ptr&&); @@ -17771,15 +17722,15 @@ index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1 void initializeWebPage(); void setDrawingArea(std::unique_ptr&&); -@@ -647,6 +666,7 @@ public: +@@ -646,6 +665,7 @@ public: void closePage(); void addPlatformLoadParameters(WebProcessProxy&, LoadParameters&); + RefPtr loadRequestForInspector(WebCore::ResourceRequest&&, WebFrameProxy*); 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 loadFile(const String& fileURL, const String& resourceDirectoryURL, bool isAppInitiated = true, API::Object* userData = nullptr); RefPtr loadData(const IPC::DataReference&, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow); -@@ -1168,6 +1188,7 @@ public: +@@ -1167,6 +1187,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17787,7 +17738,7 @@ index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1 void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1242,14 +1263,20 @@ public: +@@ -1241,14 +1262,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17809,7 +17760,7 @@ index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1 #endif void processDidBecomeUnresponsive(); -@@ -1493,6 +1520,8 @@ public: +@@ -1492,6 +1519,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17818,7 +17769,7 @@ index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1 #endif #if ENABLE(WEB_CRYPTO) -@@ -2617,6 +2646,7 @@ private: +@@ -2603,6 +2632,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17826,7 +17777,7 @@ index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2877,6 +2907,20 @@ private: +@@ -2863,6 +2893,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17847,7 +17798,7 @@ index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1 #endif PageLoadState m_pageLoadState; -@@ -3089,6 +3133,9 @@ private: +@@ -3075,6 +3119,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17858,7 +17809,7 @@ index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1 #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 f5705a06115a22e8e3076bc5f95bc9dc1be7c46a..6e10bc4717252db7bf44ed2d20950254a5bcf293 100644 +index 56e8a1dce818c6390ca0622e3b44a5c1ed10ef11..c6e13c604a3f2b452dad680c0bcea0327abcd1c6 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17867,9 +17818,9 @@ index f5705a06115a22e8e3076bc5f95bc9dc1be7c46a..6e10bc4717252db7bf44ed2d20950254 MouseDidMoveOverElement(struct WebKit::WebHitTestResultData hitTestResultData, uint32_t modifiers, WebKit::UserData userData) + LogToStderr(String text) - #if ENABLE(NETSCAPE_PLUGIN_API) - UnavailablePluginButtonClicked(uint32_t pluginUnavailabilityReason, String mimeType, String pluginURLString, String pluginspageAttributeURLString, String frameURLString, String pageURLString) -@@ -181,6 +182,7 @@ messages -> WebPageProxy { + #if ENABLE(WEBGL) + WebGLPolicyForURL(URL url) -> (enum:uint8_t WebCore::WebGLLoadPolicy loadPolicy) Synchronous +@@ -174,6 +175,7 @@ messages -> WebPageProxy { #endif PageScaleFactorDidChange(double scaleFactor) @@ -17877,7 +17828,7 @@ index f5705a06115a22e8e3076bc5f95bc9dc1be7c46a..6e10bc4717252db7bf44ed2d20950254 PluginScaleFactorDidChange(double zoomFactor) PluginZoomFactorDidChange(double zoomFactor) -@@ -309,10 +311,12 @@ messages -> WebPageProxy { +@@ -302,10 +304,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 @@ -17893,10 +17844,10 @@ index f5705a06115a22e8e3076bc5f95bc9dc1be7c46a..6e10bc4717252db7bf44ed2d20950254 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index b65e086d88eacfebb3433d7dd1268a191dcbdd0a..b2037fe0bc09ae6aa502051e19d8bb7ef15d6d6b 100644 +index 4920e6c6aac7c45a2d9df43da48e231811962fac..6fe07f2663d028f6b39ac0014af47bc0434cd4c5 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp -@@ -512,6 +512,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro +@@ -513,6 +513,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro // Arbitrarily choose the first process pool to host the service worker process. auto* processPool = processPools()[0]; @@ -17911,7 +17862,7 @@ index b65e086d88eacfebb3433d7dd1268a191dcbdd0a..b2037fe0bc09ae6aa502051e19d8bb7e ASSERT(processPool); WebProcessProxy* serviceWorkerProcessProxy { nullptr }; -@@ -778,8 +786,12 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa +@@ -781,8 +789,12 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa #endif parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel(); @@ -17927,10 +17878,10 @@ index b65e086d88eacfebb3433d7dd1268a191dcbdd0a..b2037fe0bc09ae6aa502051e19d8bb7e parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument); parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure()); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp -index 5c5966eccb9e8a2ca02c1a289e1b81820d73d92c..9dc817102fa7146c15a8ce7355dba9d84dfdfa60 100644 +index 94817608c808a6be09cec44ec0ca08955f609535..f6ea11207499ef863670eb2afd7ec76261158532 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp -@@ -145,6 +145,11 @@ HashMap& WebProcessProxy::allProcesses() +@@ -143,6 +143,11 @@ HashMap& WebProcessProxy::allProcesses() return map; } @@ -17943,10 +17894,10 @@ index 5c5966eccb9e8a2ca02c1a289e1b81820d73d92c..9dc817102fa7146c15a8ce7355dba9d8 { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index 139517bdb24b54c48edfbbeb013de929a5f14ef6..91c6db9cb4d8ad4375c39a4c2409664c37497d70 100644 +index 194005878066a308d30ba5c909b558953d9a4673..ee3fbe022402c06a76e291510ecad091196ed914 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h -@@ -142,6 +142,7 @@ public: +@@ -141,6 +141,7 @@ public: ~WebProcessProxy(); static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, const Function&); @@ -17955,10 +17906,10 @@ index 139517bdb24b54c48edfbbeb013de929a5f14ef6..91c6db9cb4d8ad4375c39a4c2409664c WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index fffca2266fe7015a6c039b2937aa648891b3cd46..a74df874c619a92a696e57fe078c86f9a6b5b9a5 100644 +index 3bd48bb5f30e93ecf80d3f783adb2b8397490b2a..177fe48b54804dc107547b19d5767a82d9bf2e0a 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2220,6 +2220,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O +@@ -2021,6 +2021,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); } @@ -17977,7 +17928,7 @@ index fffca2266fe7015a6c039b2937aa648891b3cd46..a74df874c619a92a696e57fe078c86f9 void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index 42ee676ccda4ab14b5a4289ee1a571d12edc5feb..317cbdaf23103b1e7b55a9cc310d2d99f2b73312 100644 +index 15046be5b5e40ff1b785ec54cb4b5e41c0b5c70b..0df6d710ab4501ee5d0f704dd2c635f14328e5ef 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h @@ -87,6 +87,7 @@ class SecKeyProxyStore; @@ -17996,12 +17947,10 @@ index 42ee676ccda4ab14b5a4289ee1a571d12edc5feb..317cbdaf23103b1e7b55a9cc310d2d99 struct NetworkProcessConnectionInfo; struct WebsiteDataRecord; struct WebsiteDataStoreParameters; -@@ -109,6 +111,16 @@ enum class StorageAccessPromptStatus; - struct PluginModuleInfo; +@@ -105,6 +107,14 @@ enum class StorageAccessStatus : uint8_t; + enum class StorageAccessPromptStatus; #endif -+class WebsiteDataStore; -+ +class DownloadInstrumentation { +public: + virtual void downloadCreated(const String& uuid, const WebCore::ResourceRequest&, const FrameInfoData& frameInfoData, WebPageProxy* page, RefPtr download) = 0; @@ -18013,7 +17962,7 @@ index 42ee676ccda4ab14b5a4289ee1a571d12edc5feb..317cbdaf23103b1e7b55a9cc310d2d99 class WebsiteDataStore : public API::ObjectImpl, public Identified, public CanMakeWeakPtr { public: static Ref defaultDataStore(); -@@ -291,11 +303,13 @@ public: +@@ -287,11 +297,13 @@ public: const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; } #endif @@ -18028,7 +17977,7 @@ index 42ee676ccda4ab14b5a4289ee1a571d12edc5feb..317cbdaf23103b1e7b55a9cc310d2d99 void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&); const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; } void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType); -@@ -354,6 +368,14 @@ public: +@@ -350,6 +362,14 @@ public: static WTF::String defaultJavaScriptConfigurationDirectory(); static bool http3Enabled(); @@ -18043,7 +17992,7 @@ index 42ee676ccda4ab14b5a4289ee1a571d12edc5feb..317cbdaf23103b1e7b55a9cc310d2d99 void resetQuota(CompletionHandler&&); void clearStorage(CompletionHandler&&); -@@ -441,9 +463,11 @@ private: +@@ -433,9 +453,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -18056,7 +18005,7 @@ index 42ee676ccda4ab14b5a4289ee1a571d12edc5feb..317cbdaf23103b1e7b55a9cc310d2d99 WebCore::SoupNetworkProxySettings m_networkProxySettings; String m_cookiePersistentStoragePath; SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite }; -@@ -471,6 +495,11 @@ private: +@@ -463,6 +485,11 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -18889,7 +18838,7 @@ index 0000000000000000000000000000000000000000..721826c8c98fc85b68a4f45deaee69c1 + +#endif diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h -index d37c28feb1a57edfb4a8f4d898342d196c7a8802..c64611d78fe184acd76f38ad316473622676bae3 100644 +index 38a4302af88a015139c22c88681e79f4673a1d18..a74921fcc3bc1b34b79ca64a924c654cf34a38fa 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.h +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.h @@ -53,6 +53,8 @@ class PageClientImpl final : public PageClientImplCocoa @@ -18911,7 +18860,7 @@ index d37c28feb1a57edfb4a8f4d898342d196c7a8802..c64611d78fe184acd76f38ad31647362 RefPtr takeViewSnapshot(std::optional&&) override; void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) override; #if ENABLE(MAC_GESTURE_EVENTS) -@@ -219,6 +224,10 @@ private: +@@ -218,6 +223,10 @@ private: void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) override; #endif @@ -18923,7 +18872,7 @@ index d37c28feb1a57edfb4a8f4d898342d196c7a8802..c64611d78fe184acd76f38ad31647362 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 ab73994899c547ce184b9961aa257ce1ba9bfcd5..e93c0888772b08e4a44690363e90f1c5dcd9dade 100644 +index d433a6dd2b2f84c4d9b41b987ed331cca501039a..ea35548d02a5ee01031e202eb6810eca6ec4cf64 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm @@ -81,6 +81,7 @@ @@ -19019,7 +18968,7 @@ index ab73994899c547ce184b9961aa257ce1ba9bfcd5..e93c0888772b08e4a44690363e90f1c5 RefPtr PageClientImpl::takeViewSnapshot(std::optional&&) { return m_impl->takeViewSnapshot(); -@@ -803,6 +831,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR +@@ -798,6 +826,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR #endif // ENABLE(FULLSCREEN_API) @@ -19033,7 +18982,7 @@ index ab73994899c547ce184b9961aa257ce1ba9bfcd5..e93c0888772b08e4a44690363e90f1c5 void PageClientImpl::navigationGestureDidBegin() { m_impl->dismissContentRelativeChildWindowsWithAnimation(true); -@@ -980,6 +1015,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c +@@ -975,6 +1010,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c bool PageClientImpl::windowIsFrontWindowUnderMouse(const NativeWebMouseEvent& event) { @@ -20013,10 +19962,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf58e2a458e 100644 +index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129bc81d853 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1998,6 +1998,18 @@ +@@ -1900,6 +1900,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 */; }; @@ -20035,7 +19984,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 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 */; }; -@@ -2055,6 +2067,9 @@ +@@ -1956,6 +1968,9 @@ E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; E5DEFA6826F8F42600AB68DB /* PhotosUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E5DEFA6726F8F42600AB68DB /* PhotosUISPI.h */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -20045,7 +19994,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 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, ); }; }; -@@ -6056,6 +6071,19 @@ +@@ -5779,6 +5794,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 = ""; }; @@ -20065,7 +20014,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 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 = ""; }; -@@ -6176,6 +6204,14 @@ +@@ -5898,6 +5926,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 = ""; }; @@ -20080,7 +20029,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 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 = ""; }; -@@ -6315,6 +6351,7 @@ +@@ -6030,6 +6066,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -20088,7 +20037,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -8247,6 +8284,7 @@ +@@ -7790,6 +7827,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -20096,7 +20045,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9351,6 +9389,7 @@ +@@ -8894,6 +8932,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -20104,7 +20053,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9859,6 +9898,12 @@ +@@ -9377,6 +9416,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -20117,7 +20066,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 ); path = Agents; sourceTree = ""; -@@ -9867,6 +9912,7 @@ +@@ -9385,6 +9430,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -20125,7 +20074,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -10388,6 +10434,12 @@ +@@ -9906,6 +9952,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -20138,7 +20087,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10690,6 +10742,7 @@ +@@ -10207,6 +10259,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -20146,7 +20095,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -11289,6 +11342,11 @@ +@@ -10780,6 +10833,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -20158,7 +20107,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -12164,6 +12222,7 @@ +@@ -11632,6 +11690,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -20166,7 +20115,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -12469,6 +12528,7 @@ +@@ -11937,6 +11996,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -20174,7 +20123,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -12485,6 +12545,7 @@ +@@ -11953,6 +12013,7 @@ 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, F40BBB41257FF46E0067463A /* GPUProcessWakeupMessageArguments.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -20182,7 +20131,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -12633,6 +12694,7 @@ +@@ -12095,6 +12156,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -20190,7 +20139,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -12729,6 +12791,7 @@ +@@ -12160,6 +12222,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -20198,7 +20147,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, -@@ -12751,6 +12814,7 @@ +@@ -12182,6 +12245,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -20206,7 +20155,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -13075,6 +13139,7 @@ +@@ -12504,6 +12568,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -20214,7 +20163,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -13207,6 +13272,7 @@ +@@ -12636,6 +12701,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -20222,7 +20171,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -13260,6 +13326,7 @@ +@@ -12689,6 +12755,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -20230,7 +20179,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -13416,6 +13483,7 @@ +@@ -12845,6 +12912,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -20238,31 +20187,24 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -14755,6 +14823,7 @@ +@@ -14110,6 +14178,8 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, ++ D7EB04E72372A73B00F744CE /* InspectorPlaywrightAgentClientMac.mm in Sources */, + D79902B2236E9404005D6F7E /* InspectorTargetProxyMac.mm in Sources */, 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */, - 2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */, - 2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */, -@@ -14774,6 +14843,7 @@ + C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, + C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, +@@ -14127,6 +14197,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, + D79902B1236E9404005D6F7E /* WebPageInspectorEmulationAgentMac.mm in Sources */, 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, - 2D913443212CF9F000128AFD /* NetscapeBrowserFuncs.cpp in Sources */, - 2D913444212CF9F000128AFD /* NetscapePlugin.cpp in Sources */, -@@ -14801,6 +14871,7 @@ - 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */, - 2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */, - 2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */, -+ D7EB04E72372A73B00F744CE /* InspectorPlaywrightAgentClientMac.mm in Sources */, - 2D913447212CF9F000128AFD /* NPRuntimeObjectMap.cpp in Sources */, - 2D913448212CF9F000128AFD /* NPRuntimeUtilities.cpp in Sources */, - 2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */, -@@ -15108,6 +15179,7 @@ + C1C1B30F2540F50D00D9100B /* NetworkConnectionToWebProcessMac.mm in Sources */, + 51DD9F2816367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp in Sources */, +@@ -14431,6 +14502,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20271,7 +20213,7 @@ index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf5 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 cd2796d2917459eaa95f90cbd78528dcf1e8032d..1e96da2372557fd1e6b9f2d3675c62cdc5c0b8b4 100644 +index d671d0581071148b42e607ab598486e90a7035e0..64c50006752e596ad0e17e107c9ea4645ca9a820 100644 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp @@ -232,6 +232,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou @@ -20349,7 +20291,7 @@ index cd2796d2917459eaa95f90cbd78528dcf1e8032d..1e96da2372557fd1e6b9f2d3675c62cd } void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader) -@@ -845,7 +858,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier +@@ -848,7 +861,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier bool WebLoaderStrategy::isOnLine() const { @@ -20358,7 +20300,7 @@ index cd2796d2917459eaa95f90cbd78528dcf1e8032d..1e96da2372557fd1e6b9f2d3675c62cd } void WebLoaderStrategy::addOnlineStateChangeListener(Function&& listener) -@@ -865,6 +878,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet +@@ -868,6 +881,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet void WebLoaderStrategy::setOnLineState(bool isOnLine) { @@ -20370,7 +20312,7 @@ index cd2796d2917459eaa95f90cbd78528dcf1e8032d..1e96da2372557fd1e6b9f2d3675c62cd if (m_isOnLine == isOnLine) return; -@@ -873,6 +891,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) +@@ -876,6 +894,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) listener(isOnLine); } @@ -20384,7 +20326,7 @@ index cd2796d2917459eaa95f90cbd78528dcf1e8032d..1e96da2372557fd1e6b9f2d3675c62cd { WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::SetCaptureExtraNetworkLoadMetricsEnabled(enabled), 0); diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h -index 405c73430e21012b1e1ac788965cbc9767762368..f315eec6fe4f2405883178165db3a8ea42e5bf82 100644 +index 2290d987c36f68245b08fb2b86319d4d5a68e4a3..f22b3a7c855918b11582dd1ea9be00b2def665c9 100644 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h @@ -41,6 +41,7 @@ struct FetchOptions; @@ -20437,7 +20379,7 @@ index 259449423855fed3aaaab414819f8951a3b8b7ff..6ba9678f50190492ef5140d0793582a8 } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index e3796bab64ba4ee20566223d7983dca4ff0958d6..e21230056318cdbe2a26709d2e4abfcc70fa4874 100644 +index 0c8da665770bd473aeaabab3f16af60160b2750f..064cec74ddedea795f2ebf6d9d921cf7d0209562 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -403,6 +403,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -20449,7 +20391,7 @@ index e3796bab64ba4ee20566223d7983dca4ff0958d6..e21230056318cdbe2a26709d2e4abfcc // Notify the bundle client. m_page.injectedBundleUIClient().willAddMessageToConsole(&m_page, source, level, message, lineNumber, columnNumber, sourceID); } -@@ -841,6 +843,13 @@ std::unique_ptr WebChromeClient::createDateTimeChooser(DateTime +@@ -826,6 +828,13 @@ std::unique_ptr WebChromeClient::createDateTimeChooser(DateTime #endif @@ -20491,7 +20433,7 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index 769b7df7d4d2254e71f7129f6775bcbf1acb7f2d..e884b379903b0858398d68a392b6e616af97ecda 100644 +index e48a68dff1efeda9ba9239c2aef2fb9d47d1f317..6ca275cb733c05a06c838a62c2747232c0ff59fd 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp @@ -1574,13 +1574,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() @@ -20761,7 +20703,7 @@ index 4f727e418b082eebe86711294bb0f26f9c74d7d1..3e713db9bbd2a2bc78bdc464cfa02ca4 #if USE(COORDINATED_GRAPHICS) void layerFlushTimerFired(); diff --git a/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp b/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp -index a534407d0366761acace9d8849b8fcac2be35efe..2a6ef9a83096fc6e815095438c02bdca62b435f5 100644 +index d1d2db8c0f1dcb033753b9f45ff86984a7890093..0e619b2541577790c3eb9ea3ec6c1100c03bb24b 100644 --- a/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp +++ b/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp @@ -27,6 +27,7 @@ @@ -20772,7 +20714,7 @@ index a534407d0366761acace9d8849b8fcac2be35efe..2a6ef9a83096fc6e815095438c02bdca #include "WebPage.h" #include "WebPageCreationParameters.h" #include "WebProcess.h" -@@ -82,6 +83,13 @@ void DrawingArea::dispatchAfterEnsuringUpdatedScrollPosition(WTF::FunctionsetCanUseCredentialStorage(parameters.canUseCredentialStorage); @@ -20884,7 +20826,7 @@ index 44ac8919e6a8b02c46a83e5fbf6ed71ff7585ff8..56da5a99ae7999f34c4e4d0ea5ebac23 updateThrottleState(); } -@@ -1702,6 +1705,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1664,6 +1667,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -20907,7 +20849,7 @@ index 44ac8919e6a8b02c46a83e5fbf6ed71ff7585ff8..56da5a99ae7999f34c4e4d0ea5ebac23 void WebPage::loadRequest(LoadParameters&& loadParameters) { setLastNavigationWasAppInitiated(loadParameters.request.isAppInitiated()); -@@ -1955,17 +1974,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1920,17 +1939,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20926,7 +20868,7 @@ index 44ac8919e6a8b02c46a83e5fbf6ed71ff7585ff8..56da5a99ae7999f34c4e4d0ea5ebac23 // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1982,20 +1997,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1947,20 +1962,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20954,7 +20896,7 @@ index 44ac8919e6a8b02c46a83e5fbf6ed71ff7585ff8..56da5a99ae7999f34c4e4d0ea5ebac23 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -2003,7 +2016,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1968,7 +1981,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20962,7 +20904,7 @@ index 44ac8919e6a8b02c46a83e5fbf6ed71ff7585ff8..56da5a99ae7999f34c4e4d0ea5ebac23 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2298,6 +2310,7 @@ void WebPage::scaleView(double scale) +@@ -2263,6 +2275,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20970,7 +20912,7 @@ index 44ac8919e6a8b02c46a83e5fbf6ed71ff7585ff8..56da5a99ae7999f34c4e4d0ea5ebac23 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2402,17 +2415,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2367,17 +2380,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20989,7 +20931,7 @@ index 44ac8919e6a8b02c46a83e5fbf6ed71ff7585ff8..56da5a99ae7999f34c4e4d0ea5ebac23 } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3299,6 +3308,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3264,6 +3273,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -21094,7 +21036,7 @@ index 44ac8919e6a8b02c46a83e5fbf6ed71ff7585ff8..56da5a99ae7999f34c4e4d0ea5ebac23 #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3375,6 +3482,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3340,6 +3447,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -21106,7 +21048,7 @@ index 44ac8919e6a8b02c46a83e5fbf6ed71ff7585ff8..56da5a99ae7999f34c4e4d0ea5ebac23 void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3613,6 +3725,7 @@ void WebPage::didCompletePageTransition() +@@ -3578,6 +3690,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -21114,7 +21056,7 @@ index 44ac8919e6a8b02c46a83e5fbf6ed71ff7585ff8..56da5a99ae7999f34c4e4d0ea5ebac23 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4414,7 +4527,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4375,7 +4488,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -21123,7 +21065,7 @@ index 44ac8919e6a8b02c46a83e5fbf6ed71ff7585ff8..56da5a99ae7999f34c4e4d0ea5ebac23 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6740,6 +6853,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6685,6 +6798,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -21134,7 +21076,7 @@ index 44ac8919e6a8b02c46a83e5fbf6ed71ff7585ff8..56da5a99ae7999f34c4e4d0ea5ebac23 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index cb8faaf6e51784652629c00a2187cfd2c27f44ca..3e24f84fcb8012fa45153e61199dec71698944eb 100644 +index a3d70f541247005a929213bed4061973658300d3..ef12c2e1469ee969737b6cc294e5b887a0be9164 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -121,6 +121,10 @@ typedef struct _AtkObject AtkObject; @@ -21359,10 +21301,10 @@ index 0cf4707d44fb20a2cb125aaf9465d1282bf84651..59a6c108a4be8ef05ae01cb594898357 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index b4802ecb937023e0e33a2435e8aaf0fc125b0598..220a8ab75026ed6d94f06fef33a3b0424874ebd0 100644 +index d8629e872914f0781c6c412c72549a28bbae70d0..d254fc0544fabfcc4937675e27a0bc1f116b93df 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp -@@ -89,6 +89,7 @@ +@@ -88,6 +88,7 @@ #include "WebsiteData.h" #include "WebsiteDataStoreParameters.h" #include "WebsiteDataType.h" @@ -21370,7 +21312,7 @@ index b4802ecb937023e0e33a2435e8aaf0fc125b0598..220a8ab75026ed6d94f06fef33a3b042 #include #include #include -@@ -353,6 +354,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter +@@ -349,6 +350,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter platformInitializeProcess(parameters); updateCPULimit(); @@ -21395,10 +21337,10 @@ index 8987c3964a9308f2454759de7f8972215a3ae416..bcac0afeb94ed8123d1f9fb0b932c849 SetProcessDPIAware(); return true; diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -index c1765cfb4e665c8ea7875c7acd45e49e1a531826..3e00256787f89479e48a261e27597d06958d9b9f 100644 +index 838e413381a8075a3d62459455267a5bbb55a991..e179a07490cc8fd579f219ff7ebb0ed5684e1353 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -@@ -4213,7 +4213,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) +@@ -4168,7 +4168,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) _private->handlingMouseDownEvent = NO; } @@ -21408,7 +21350,7 @@ index c1765cfb4e665c8ea7875c7acd45e49e1a531826..3e00256787f89479e48a261e27597d06 - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index 96ab44b302f6349a2e301fd204a711127fedfc98..ceb3283b0d0ff7c16c6155983176cf7727ebf3ad 100644 +index aba10413cd8789b7da33ac963cb80e31022e386e..667f66a761298491c5f843fd26e16f0aa1d9df16 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm @@ -4040,7 +4040,7 @@ IGNORE_WARNINGS_END @@ -21461,7 +21403,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index bddfb7a51e8af377eb8de05ba62508ef31d44893..5a0b78948e7ff7ec5507ee810f7674cefbb8c69a 100644 +index bddfb7a51e8af377eb8de05ba62508ef31d44893..50cab168ad65cd728a86ddf473b0c915f36c1b29 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,7 @@ WEBKIT_OPTION_BEGIN() @@ -21510,11 +21452,13 @@ index bddfb7a51e8af377eb8de05ba62508ef31d44893..5a0b78948e7ff7ec5507ee810f7674ce WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON) -@@ -152,7 +157,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE +@@ -151,8 +156,8 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) +-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) ++WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE OFF) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON) @@ -21537,7 +21481,7 @@ index bddfb7a51e8af377eb8de05ba62508ef31d44893..5a0b78948e7ff7ec5507ee810f7674ce # 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 6fd7aaf40eccec7d5014e289a6355f2798d1324c..36d215e7393853b3fbf05e579e083d83316ba6a5 100644 +index 6fd7aaf40eccec7d5014e289a6355f2798d1324c..a0bfa778441052a7d251d1c15b14326849a1e694 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) @@ -21548,11 +21492,13 @@ index 6fd7aaf40eccec7d5014e289a6355f2798d1324c..36d215e7393853b3fbf05e579e083d83 set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") find_package(Cairo 1.14.0 REQUIRED) -@@ -54,7 +55,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE +@@ -53,8 +54,8 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GPU_PROCESS PRIVATE OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) +-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) ++WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE OFF) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) @@ -21650,7 +21596,7 @@ index fb99a1e511986a6a0ea6a593d0c5a225bcc26fe3..5c31cd3f0529c81d932b3adc092ea8c1 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) else () diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake -index eb40b4c66dd8b0a8458cf2a6a5441619fe031e7c..f2a2470d9012cc8b5bc08aef9ab1756ae5d0363b 100644 +index 97abdc08c51291601d74cd2804f2dfbe9b78848d..8c9bcca9f39ec6f6cd7b00805e21f09245270dd6 100644 --- a/Source/cmake/OptionsWinCairo.cmake +++ b/Source/cmake/OptionsWinCairo.cmake @@ -27,15 +27,36 @@ if (OpenJPEG_FOUND) @@ -22207,7 +22153,7 @@ index b0f26645ea360cc7e55afbfbe2ceb4e5791a0fb7..e5401df8302bb7b1950d1c92caf9ae58 list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index 8135aaf71c61da2a39256badf7e53cd247362940..378aee5702e60a26a49e098d7cb0f3e1a1d6f04d 100644 +index b090bbd31ff486d19d379ac40828df3edd0b2df6..ed0b92061bdb14d321787a7aa1153a15b4a9035b 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -805,6 +805,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)