diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 808fff62b3..42942ecdab 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1453 -Changed: yurys@chromium.org Mon 29 Mar 2021 11:54:01 PM PDT +1454 +Changed: yurys@chromium.org Tue 30 Mar 2021 10:39:35 AM PDT diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 765f8e1307..bd2ec3e152 100644 --- a/browser_patches/webkit/UPSTREAM_CONFIG.sh +++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://git.webkit.org/git/WebKit.git" BASE_BRANCH="master" -BASE_REVISION="02e142b67beed2e2f28f143dae68daf23b884a2f" +BASE_REVISION="d29dc972c81e20df92624a0042a521b5a11b1cda" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index e5ab6ca596..38d9cd33fc 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -1,5 +1,5 @@ diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt -index b55e5df5af88d17d8dfefded319daaafc8744666..d2edf525e4a6da8ff4e221f05590d070fbddc412 100644 +index 26d86c8d52446bf5d1472ce5cd0c5a29b75f4bc6..290ff6b8eed4e7239a6ab46f134ad3619597bb7f 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt @@ -1226,22 +1226,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS @@ -1403,10 +1403,10 @@ index 955756ba405f400970610f9a68c7ed42a67cb015..1520c0a1475a90de2795e4ccd8919c1b builder.append(timeZoneName); builder.append(')'); diff --git a/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp b/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp -index a17a9c204925b077c2c3f8ef973a996bcae2719b..bd48bd57ab21ee53136111e83614f35cb854ef4c 100644 +index f52ebb222b34bd6c0d43829b53b9757b9a1fc3b9..da43fa2dd7fc44fcbd551e7d76e0b54f14c8e306 100644 --- a/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp +++ b/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp -@@ -35,6 +35,7 @@ +@@ -36,6 +36,7 @@ #include #include #include @@ -1415,18 +1415,18 @@ index a17a9c204925b077c2c3f8ef973a996bcae2719b..bd48bd57ab21ee53136111e83614f35c #include diff --git a/Source/JavaScriptCore/runtime/JSDateMath.cpp b/Source/JavaScriptCore/runtime/JSDateMath.cpp -index 0df4ba0b078a122e33b8bff707ae808e55284584..7f9ceb68cfbff4dc5ab7fecb644ada5fb12b7dca 100644 +index f0e8dfaeaaf7f432ea328a54a5a5d325f1fdb0b8..c74a0717aca846952c8f4b4042015ac2446b97de 100644 --- a/Source/JavaScriptCore/runtime/JSDateMath.cpp +++ b/Source/JavaScriptCore/runtime/JSDateMath.cpp -@@ -75,6 +75,7 @@ - #include "ExceptionHelpers.h" +@@ -76,6 +76,7 @@ #include "VM.h" #include + #include +#include - // icu::TimeZone and icu::BasicTimeZone features are only available in ICU C++ APIs. - // We use these C++ APIs as an exception. -@@ -284,6 +285,10 @@ double DateCache::parseDate(JSGlobalObject* globalObject, VM& vm, const String& + #if U_ICU_VERSION_MAJOR_NUM >= 68 && USE(APPLE_INTERNAL_SDK) + #define HAVE_ICU_C_TIMEZONE_API 1 +@@ -333,6 +334,10 @@ double DateCache::parseDate(JSGlobalObject* globalObject, VM& vm, const String& // https://tc39.es/ecma402/#sec-defaulttimezone String DateCache::defaultTimeZone() { @@ -1434,20 +1434,24 @@ index 0df4ba0b078a122e33b8bff707ae808e55284584..7f9ceb68cfbff4dc5ab7fecb644ada5f + if (!tz.isEmpty()) + return tz; + - icu::UnicodeString timeZoneID; - icu::UnicodeString canonicalTimeZoneID; - auto& timeZone = *bitwise_cast(timeZoneCache()); -@@ -315,7 +320,9 @@ void DateCache::timeZoneCacheSlow() + #if HAVE(ICU_C_TIMEZONE_API) + auto& timeZone = *timeZoneCache(); + Vector buffer; +@@ -382,6 +387,14 @@ Ref DateCache::cachedDateInstanceData(double millisecondsFromE + void DateCache::timeZoneCacheSlow() { - // Do not use icu::TimeZone::createDefault. ICU internally has a cache for timezone and createDefault returns this cached value. ASSERT(!m_timeZoneCache); -- m_timeZoneCache = std::unique_ptr(bitwise_cast(icu::TimeZone::detectHostTimeZone())); ++ + String override = WTF::timeZoneForAutomation(); -+ auto* timezone = override.isEmpty() ? icu::TimeZone::detectHostTimeZone() : icu::TimeZone::createTimeZone(override.utf8().data()); -+ m_timeZoneCache = std::unique_ptr(bitwise_cast(timezone)); - } - - void DateCache::reset() ++ if (!override.isEmpty()) { ++ auto* timezone = icu::TimeZone::createTimeZone(override.utf8().data()); ++ m_timeZoneCache = std::unique_ptr(bitwise_cast(timezone)); ++ return; ++ } ++ + #if HAVE(ICU_C_TIMEZONE_API) + auto* cache = new OpaqueICUTimeZone; + Vector timeZoneID; diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt index cc007616a999989c8e1c4134bd3888678c0abf03..660501e258342331395c8d861dbb636265770f51 100644 --- a/Source/ThirdParty/libwebrtc/CMakeLists.txt @@ -1475,13 +1479,13 @@ index cc007616a999989c8e1c4134bd3888678c0abf03..660501e258342331395c8d861dbb6362 Source/third_party/opus/src/celt Source/third_party/opus/src/include diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -index f5937960adc8d175179b1cdaf7e24c0c2e11e4e6..0387a2b16a821b0934bddc6324986475b212b209 100644 +index 7c198f241b7447f3c7b2c89755e748ba6ae4e1d7..aa235c5d0bc199eda1cd6e77b5b51b2beb49f925 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -@@ -317,3 +317,23 @@ __ZN6webrtc23RtpTransceiverInterface29SetOfferedRtpHeaderExtensionsEN3rtc9ArrayV - __ZN6webrtc23RtpTransceiverInterface4StopEv +@@ -318,3 +318,23 @@ __ZN6webrtc23RtpTransceiverInterface4StopEv __ZNK6webrtc23RtpTransceiverInterface23HeaderExtensionsToOfferEv __ZNK6webrtc23RtpTransceiverInterface8stoppingEv + __ZNK3rtc9IPAddresseqERKS0_ +__ZN8mkvmuxer11SegmentInfo15set_writing_appEPKc +__ZN8mkvmuxer11SegmentInfo4InitEv +__ZN8mkvmuxer7Segment10OutputCuesEb @@ -1598,10 +1602,10 @@ index ab5df37feaa08defe0af4007afc85b88d9213e64..e2d8887e5e762f3864d05d2e6f2d7358 4131BF2D234B88200028A615 /* rtc_stats_collector.cc in Sources */, 4131C3CE234B98420028A615 /* rtc_stats_report.cc in Sources */, diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -index e432bbaa58f9e7a7104ab10006a321b1e9cf8763..d7d45cb5d5959942112133e97dd295d9f853cb5a 100644 +index d5a1e13f7130f157f2c5121ff38732c900a1c2e7..ab97a9654b134459d9ec43432e9b7d5eea6e2394 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -@@ -999,7 +999,7 @@ InspectorStartsAttached: +@@ -1010,7 +1010,7 @@ InspectorStartsAttached: exposed: [ WebKit ] defaultValue: WebKit: @@ -1611,7 +1615,7 @@ index e432bbaa58f9e7a7104ab10006a321b1e9cf8763..d7d45cb5d5959942112133e97dd295d9 InspectorWindowFrame: type: String diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index ecab6362e00a8c038536174a9330f15e2e7e95b9..4bb650ddd8c5db5bededd9d0b3f9f184e849a525 100644 +index e4f77d492063070d062c89a077747eebab066f44..0cd0f56fef6163ab4cc7820f4575c1f37cc26ebb 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -602,7 +602,7 @@ MaskWebGLStringsEnabled: @@ -1743,10 +1747,10 @@ index 1e128fb9f20b50b6874a88656907bb4c059bc229..d2bae0c62da3b9ae22222241dce9d712 + } // namespace WTF diff --git a/Source/WTF/wtf/DateMath.h b/Source/WTF/wtf/DateMath.h -index 1ac29617a0111e37c0239524ad8860734dd391fc..5eb36b02da455e55018f0b9d236858640be8e282 100644 +index de0b45bd0a88eaba466b6e6c0ad66dc02f525741..81857a2be24fa3ff0a60ebbcd01130969456b31e 100644 --- a/Source/WTF/wtf/DateMath.h +++ b/Source/WTF/wtf/DateMath.h -@@ -384,6 +384,10 @@ inline int dayInMonthFromDayInYear(int dayInYear, bool leapYear) +@@ -388,6 +388,10 @@ inline int dayInMonthFromDayInYear(int dayInYear, bool leapYear) return d - step; } @@ -1758,10 +1762,10 @@ index 1ac29617a0111e37c0239524ad8860734dd391fc..5eb36b02da455e55018f0b9d23685864 WTF_EXPORT_PRIVATE LocalTimeOffset calculateLocalTimeOffset(double utcInMilliseconds, TimeType = UTCTime); diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index ed68188b3ffd457ed958ba0258f0ae6f4847d211..b8b80a159757befa975273aec8a9dff595206af6 100644 +index b8d04434da8f1d1d4ecfc081c7aee6f66ebc9115..8d203e20dce0d89f459fc2d97b218eaea67015ee 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h -@@ -413,7 +413,7 @@ +@@ -405,7 +405,7 @@ #endif #if !defined(ENABLE_ORIENTATION_EVENTS) @@ -1770,7 +1774,7 @@ index ed68188b3ffd457ed958ba0258f0ae6f4847d211..b8b80a159757befa975273aec8a9dff5 #endif #if OS(WINDOWS) -@@ -478,7 +478,7 @@ +@@ -470,7 +470,7 @@ #endif #if !defined(ENABLE_TOUCH_EVENTS) @@ -1780,7 +1784,7 @@ index ed68188b3ffd457ed958ba0258f0ae6f4847d211..b8b80a159757befa975273aec8a9dff5 #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 5fa89ab0580b850b012ef94d6a5385377e698447..5151258b6e3d97efe27ceaa9c51847d1fcc236d2 100644 +index 48085def3bca779b58b35ca71dd2b972d071c769..8a44906d0101dfe1301e7f265ab77225d497fcf1 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -364,7 +364,7 @@ @@ -1793,10 +1797,10 @@ index 5fa89ab0580b850b012ef94d6a5385377e698447..5151258b6e3d97efe27ceaa9c51847d1 #endif diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index 60c217b7348bcda53a6bc4c682cfdea449410bb7..1111e5c74d61726fb7ef179504fb37361fe1e63e 100644 +index 518edf1fd6454388f68e74e7a222b0a71112cb55..138bad055ed72d2cdb9c97328511d6843e68d695 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -774,6 +774,10 @@ JS_BINDING_IDLS := \ +@@ -780,6 +780,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -1807,7 +1811,7 @@ index 60c217b7348bcda53a6bc4c682cfdea449410bb7..1111e5c74d61726fb7ef179504fb3736 $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1299,9 +1303,6 @@ JS_BINDING_IDLS := \ +@@ -1305,9 +1309,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -1818,10 +1822,10 @@ index 60c217b7348bcda53a6bc4c682cfdea449410bb7..1111e5c74d61726fb7ef179504fb3736 vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) diff --git a/Source/WebCore/Modules/geolocation/Geolocation.cpp b/Source/WebCore/Modules/geolocation/Geolocation.cpp -index 7c4ab3976e0480548692c63ea9af7c3ee6af6acd..0d3de6b7a8da3c339cab3743065c8c09b6060b07 100644 +index 07c54b11c7136ec6046a6f247cf2f6d1aaf46b92..d3a8b56f18ffbe14fefc37cab1a28fb68890e258 100644 --- a/Source/WebCore/Modules/geolocation/Geolocation.cpp +++ b/Source/WebCore/Modules/geolocation/Geolocation.cpp -@@ -356,8 +356,9 @@ bool Geolocation::shouldBlockGeolocationRequests() +@@ -354,8 +354,9 @@ bool Geolocation::shouldBlockGeolocationRequests() bool isSecure = SecurityOrigin::isSecure(document()->url()) || document()->isSecureContext(); bool hasMixedContent = !document()->foundMixedContent().isEmpty(); bool isLocalOrigin = securityOrigin()->isLocal(); @@ -1891,7 +1895,7 @@ index 66cec91542b74765a9c1ffbc2f28e1a5085c55e0..9a2a89a09279b3b7102282de6bfc4cc7 _hasSentSpeechStart = true; _delegateCallback(SpeechRecognitionUpdate::create(_identifier, SpeechRecognitionUpdateType::SpeechStart)); diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake -index 884910cfe0bb3199bb6b702d0ab119aabb4d67ec..4228baba27f479e38b82f35ea2a58b0423ca0162 100644 +index 9d4f3bd1ade02a378340961d617aae1c5e0776a3..17b2b6cfb52d94d8104b68b9250883c40f69f975 100644 --- a/Source/WebCore/PlatformWPE.cmake +++ b/Source/WebCore/PlatformWPE.cmake @@ -38,6 +38,7 @@ list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES @@ -1955,10 +1959,10 @@ index ef168b76819216d984b7a2d0f760005fb9d24de8..2d6cf51f3b45191ad84106429d4f108f __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 428f9e1fcbd566fb495a2a713461170495d30fce..ec37b40ee8f5ce32a0d93b6416dfa3854c4a71f3 100644 +index ce13ebb37ecfaa454810c55f9d243c5ecd122733..8d8e3e4d2db8af1f0dfc9c10463ece51b313152b 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5272,6 +5272,14 @@ +@@ -5277,6 +5277,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, ); }; }; @@ -1973,7 +1977,7 @@ index 428f9e1fcbd566fb495a2a713461170495d30fce..ec37b40ee8f5ce32a0d93b6416dfa385 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, ); }; }; -@@ -16645,6 +16653,14 @@ +@@ -16671,6 +16679,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 = ""; }; @@ -1988,7 +1992,7 @@ index 428f9e1fcbd566fb495a2a713461170495d30fce..ec37b40ee8f5ce32a0d93b6416dfa385 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 = ""; }; -@@ -22195,7 +22211,12 @@ +@@ -22230,7 +22246,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2001,7 +2005,7 @@ index 428f9e1fcbd566fb495a2a713461170495d30fce..ec37b40ee8f5ce32a0d93b6416dfa385 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -27680,7 +27701,9 @@ +@@ -27720,7 +27741,9 @@ B2C3D9EC0D006C1D00EF6F26 /* text */, E1EE8B6B2412B2A700E794D6 /* xr */, DFDB912CF8E88A6DA1AD264F /* AbortableTaskQueue.h */, @@ -2011,7 +2015,7 @@ index 428f9e1fcbd566fb495a2a713461170495d30fce..ec37b40ee8f5ce32a0d93b6416dfa385 49AE2D95134EE5F90072920A /* CalculationValue.h */, C330A22113EC196B0000B45B /* ColorChooser.h */, C37CDEBC149EF2030042090D /* ColorChooserClient.h */, -@@ -30218,6 +30241,7 @@ +@@ -30268,6 +30291,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2019,7 +2023,7 @@ index 428f9e1fcbd566fb495a2a713461170495d30fce..ec37b40ee8f5ce32a0d93b6416dfa385 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 86D982F6125C154000AD9E3D /* DocumentTiming.h */, -@@ -31245,6 +31269,7 @@ +@@ -31295,6 +31319,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2027,7 +2031,7 @@ index 428f9e1fcbd566fb495a2a713461170495d30fce..ec37b40ee8f5ce32a0d93b6416dfa385 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -33234,6 +33259,7 @@ +@@ -33288,6 +33313,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2035,7 +2039,7 @@ index 428f9e1fcbd566fb495a2a713461170495d30fce..ec37b40ee8f5ce32a0d93b6416dfa385 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35264,9 +35290,11 @@ +@@ -35319,9 +35345,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2047,7 +2051,7 @@ index 428f9e1fcbd566fb495a2a713461170495d30fce..ec37b40ee8f5ce32a0d93b6416dfa385 B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36230,6 +36258,7 @@ +@@ -36286,6 +36314,7 @@ 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, 4463CF682212FA68001A8577 /* DataDetectorsCoreSoftLink.mm in Sources */, @@ -2055,7 +2059,7 @@ index 428f9e1fcbd566fb495a2a713461170495d30fce..ec37b40ee8f5ce32a0d93b6416dfa385 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36316,6 +36345,7 @@ +@@ -36372,6 +36401,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2063,7 +2067,7 @@ index 428f9e1fcbd566fb495a2a713461170495d30fce..ec37b40ee8f5ce32a0d93b6416dfa385 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36364,6 +36394,7 @@ +@@ -36420,6 +36450,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2071,7 +2075,7 @@ index 428f9e1fcbd566fb495a2a713461170495d30fce..ec37b40ee8f5ce32a0d93b6416dfa385 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -36896,6 +36927,7 @@ +@@ -36952,6 +36983,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2292,10 +2296,10 @@ index 06c84321bb291fb178625f3d783438ee88846f93..1c8a87decc58045ed353b66240a9f2ad return; diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp -index 8728fb72fa042796dc8bdf5c91e8242bd0755f61..2978f9df308f67a3c858f8dd8970a203c790b11d 100644 +index f71a6bacb8eeff2f527421e806d9bf45060a8293..a16cebefbdec92ca94e0b9d97b15dc50615c3667 100644 --- a/Source/WebCore/inspector/InspectorController.cpp +++ b/Source/WebCore/inspector/InspectorController.cpp -@@ -376,8 +376,8 @@ void InspectorController::inspect(Node* node) +@@ -374,8 +374,8 @@ void InspectorController::inspect(Node* node) if (!enabled()) return; @@ -2306,7 +2310,7 @@ index 8728fb72fa042796dc8bdf5c91e8242bd0755f61..2978f9df308f67a3c858f8dd8970a203 ensureDOMAgent().inspect(node); } -@@ -518,4 +518,24 @@ void InspectorController::didComposite(Frame& frame) +@@ -516,4 +516,24 @@ void InspectorController::didComposite(Frame& frame) InspectorInstrumentation::didComposite(frame); } @@ -2355,7 +2359,7 @@ index 784bf482fd68da68e1f38fd5cd6bcedc8971dfda..6cdf012453ff31120adbe5946ce23f07 } // namespace WebCore diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp -index 011391c5fd1210ad60d3ef9fa3370693f9840811..7937599feea1d52edb1285a560ba3864c5b2117d 100644 +index 218ce4b947c42547ec4f9cf9e8517a5dc352c4c4..0b9716df54fd3ddfd2f4ab9de96198cb0e14e8c3 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.cpp +++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp @@ -633,6 +633,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen @@ -2473,7 +2477,7 @@ index 011391c5fd1210ad60d3ef9fa3370693f9840811..7937599feea1d52edb1285a560ba3864 { if (is(context)) diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h -index 8ceaa5dd2289a005bcd7b6391010212434cc3521..97173de571daf9826fc724ea140e43f0a582b952 100644 +index 8f040444bb183d162c60f6fd4752becd9ce6ab99..c4b2e73c7344f94634d8ab40f626fa0dde123bca 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.h +++ b/Source/WebCore/inspector/InspectorInstrumentation.h @@ -31,6 +31,7 @@ @@ -4459,7 +4463,7 @@ index c4e46e872c6a6d02317eb1821552563ffea55cfa..6090375a095cbdf92f23ec9291b043b9 } diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index eab710a27defd8dd5e3eab2272e88a1f336cda2a..3316c44d39225c58afa54f13d4d65fd35337e5da 100644 +index 7b2a0ec585a19ebde96eea7775330817535f7455..ef604a838ff27f76e3bb4d46aa4afcc17224dbed 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h @@ -166,9 +166,13 @@ public: @@ -4477,7 +4481,7 @@ index eab710a27defd8dd5e3eab2272e88a1f336cda2a..3316c44d39225c58afa54f13d4d65fd3 DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index 10952e4c5f636f8269b25e7b4ce18187f11b1eb7..f72b78926c93d629b86d1e85cf9009767e9adb4b 100644 +index d73fca589fc32393f2062fcd2cff95e59a1cfbff..15a44cafe92c13579753e26fb34f40b742ee2012 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -1152,6 +1152,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat @@ -4625,10 +4629,10 @@ index e24fded2225f1c1918f454017566717e20484eab..30e4b7a986418c4b4f6c799b858b6082 void ProgressTracker::incrementProgress(unsigned long identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index 54b7145f6c6533a3fc601ff3537e2445bdb3c7ea..3c5b44bb762619d97b646b95663a90f4925f7d41 100644 +index 9198229e4eda1428e45c0cbcfc8ee4ef76d9321e..ed563ac8974eef74f791958ae43de1659761dadc 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h -@@ -288,7 +288,7 @@ public: +@@ -292,7 +292,7 @@ public: #endif #if ENABLE(ORIENTATION_EVENTS) @@ -4637,8 +4641,21 @@ index 54b7145f6c6533a3fc601ff3537e2445bdb3c7ea..3c5b44bb762619d97b646b95663a90f4 #endif #if ENABLE(INPUT_TYPE_COLOR) +diff --git a/Source/WebCore/page/DiagnosticLoggingDomain.h b/Source/WebCore/page/DiagnosticLoggingDomain.h +index 29b3a030de225f0efc2a6e39c58e2bded20903c0..1cc0be90ff78682233de1879eec3fa8b174b0d1b 100644 +--- a/Source/WebCore/page/DiagnosticLoggingDomain.h ++++ b/Source/WebCore/page/DiagnosticLoggingDomain.h +@@ -25,6 +25,8 @@ + + #pragma once + ++#include ++ + namespace WebCore { + + enum class DiagnosticLoggingDomain : uint8_t { Media }; diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 370eab3b0efb475e4e7c8d255aa8c84d8554dd94..9e98a977166d31e8bc8cd520e4ed2d90f6c54e95 100644 +index c831f82c3561e20bd8554967afe2f3551c5dee3e..435a1741d522a955180a26477358d2f4e8914e2c 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -122,6 +122,7 @@ @@ -4649,7 +4666,7 @@ index 370eab3b0efb475e4e7c8d255aa8c84d8554dd94..9e98a977166d31e8bc8cd520e4ed2d90 #endif #if ENABLE(MAC_GESTURE_EVENTS) -@@ -776,9 +777,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve +@@ -777,9 +778,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve m_mousePressNode = event.targetNode(); m_frame.document()->setFocusNavigationStartingNode(event.targetNode()); @@ -4659,7 +4676,7 @@ index 370eab3b0efb475e4e7c8d255aa8c84d8554dd94..9e98a977166d31e8bc8cd520e4ed2d90 m_mousePressed = true; m_selectionInitiationState = HaveNotStartedSelection; -@@ -817,8 +816,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis +@@ -818,8 +817,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis return targetNode->renderer()->positionForPoint(LayoutPoint(selectionEndPoint), nullptr); } @@ -4668,7 +4685,7 @@ index 370eab3b0efb475e4e7c8d255aa8c84d8554dd94..9e98a977166d31e8bc8cd520e4ed2d90 #if !PLATFORM(IOS_FAMILY) bool EventHandler::supportsSelectionUpdatesOnMouseDrag() const -@@ -840,8 +837,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -841,8 +838,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e Ref protectedFrame(m_frame); @@ -4679,7 +4696,7 @@ index 370eab3b0efb475e4e7c8d255aa8c84d8554dd94..9e98a977166d31e8bc8cd520e4ed2d90 Node* targetNode = event.targetNode(); if (event.event().button() != LeftButton || !targetNode) -@@ -862,7 +861,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -863,7 +862,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e ASSERT(mouseDownMayStartSelect() || m_mouseDownMayStartAutoscroll); #endif @@ -4689,7 +4706,7 @@ index 370eab3b0efb475e4e7c8d255aa8c84d8554dd94..9e98a977166d31e8bc8cd520e4ed2d90 if (m_mouseDownMayStartAutoscroll && !panScrollInProgress()) { m_autoscrollController->startAutoscrollForSelection(renderer); -@@ -879,6 +880,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -880,6 +881,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e return true; } @@ -4698,7 +4715,7 @@ index 370eab3b0efb475e4e7c8d255aa8c84d8554dd94..9e98a977166d31e8bc8cd520e4ed2d90 bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const { // This is a pre-flight check of whether the event might lead to a drag being started. Be careful -@@ -910,6 +913,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const +@@ -911,6 +914,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const return targetElement && page->dragController().draggableElement(&m_frame, targetElement, result.roundedPointInInnerNodeFrame(), state); } @@ -4707,7 +4724,7 @@ index 370eab3b0efb475e4e7c8d255aa8c84d8554dd94..9e98a977166d31e8bc8cd520e4ed2d90 void EventHandler::updateSelectionForMouseDrag() { if (!supportsSelectionUpdatesOnMouseDrag()) -@@ -1004,7 +1009,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul +@@ -1005,7 +1010,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul && newSelection.end().containerNode() && HTMLElement::isImageOverlayText(*newSelection.end().containerNode())) invalidateClick(); } @@ -4715,7 +4732,7 @@ index 370eab3b0efb475e4e7c8d255aa8c84d8554dd94..9e98a977166d31e8bc8cd520e4ed2d90 void EventHandler::lostMouseCapture() { -@@ -1052,9 +1056,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e +@@ -1053,9 +1057,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e // on the selection, the selection goes away. However, if we are // editing, place the caret. if (m_mouseDownWasSingleClickInSelection && m_selectionInitiationState != ExtendedSelection @@ -4725,7 +4742,7 @@ index 370eab3b0efb475e4e7c8d255aa8c84d8554dd94..9e98a977166d31e8bc8cd520e4ed2d90 && m_frame.selection().isRange() && event.event().button() != RightButton) { VisibleSelection newSelection; -@@ -2019,10 +2021,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE +@@ -2020,10 +2022,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mouseEvent.targetNode(), 0, platformMouseEvent, FireMouseOverOut::Yes); @@ -4736,7 +4753,7 @@ index 370eab3b0efb475e4e7c8d255aa8c84d8554dd94..9e98a977166d31e8bc8cd520e4ed2d90 return swallowEvent; } -@@ -4009,7 +4009,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4010,7 +4010,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -4752,7 +4769,7 @@ index 370eab3b0efb475e4e7c8d255aa8c84d8554dd94..9e98a977166d31e8bc8cd520e4ed2d90 auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4365,7 +4372,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4366,7 +4373,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -4762,7 +4779,7 @@ index 370eab3b0efb475e4e7c8d255aa8c84d8554dd94..9e98a977166d31e8bc8cd520e4ed2d90 PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4491,6 +4499,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4492,6 +4500,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -5369,10 +5386,10 @@ index 38fd7b29b53eab484e30963b51c8ae525c5d7a38..3c2f2104e3f364d3d6201e3009a448b4 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 34515ee7a65a42255e20820aea9472591fe20d4c..8629fdd82106ad309e94f3bc70540f9f19834f4a 100644 +index 097ed5c1c053c5393f652373d2815eb330c3deed..118bd5dc913d17c208c08165e791f7d213d69ba7 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -440,6 +440,37 @@ void Page::setOverrideViewportArguments(const Optional& viewp +@@ -439,6 +439,37 @@ void Page::setOverrideViewportArguments(const Optional& viewp document->updateViewportArguments(); } @@ -5411,10 +5428,10 @@ index 34515ee7a65a42255e20820aea9472591fe20d4c..8629fdd82106ad309e94f3bc70540f9f { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index a637fc247a37b844e5c4311fb3e51ada8aa5417f..8a5017ffbf46d48b04833075dc461d52ba326668 100644 +index 02a2ce3e23eb8c848bc2c4f945c257aa0567226e..3e9484ee74f39da20bf9b4a2cb7c876363acb03a 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h -@@ -250,6 +250,9 @@ public: +@@ -251,6 +251,9 @@ public: const Optional& overrideViewportArguments() const { return m_overrideViewportArguments; } WEBCORE_EXPORT void setOverrideViewportArguments(const Optional&); @@ -5424,7 +5441,7 @@ index a637fc247a37b844e5c4311fb3e51ada8aa5417f..8a5017ffbf46d48b04833075dc461d52 static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -296,6 +299,10 @@ public: +@@ -297,6 +300,10 @@ public: DragCaretController& dragCaretController() const { return *m_dragCaretController; } #if ENABLE(DRAG_SUPPORT) DragController& dragController() const { return *m_dragController; } @@ -5457,7 +5474,7 @@ index a637fc247a37b844e5c4311fb3e51ada8aa5417f..8a5017ffbf46d48b04833075dc461d52 #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1128,6 +1143,11 @@ private: +@@ -1127,6 +1142,11 @@ private: #endif Optional m_overrideViewportArguments; @@ -6271,6 +6288,18 @@ index 4a4f6c72b54a2e6c5462aa4366b71b67d82e3582..9b15f8992bc32892e24e27025870c09b #endif #endif +diff --git a/Source/WebCore/platform/RectEdges.h b/Source/WebCore/platform/RectEdges.h +index 883ecae9e15822034f217a5701473853a0b05468..65dfd324ddbf54e74f637f7b3b991a18db805207 100644 +--- a/Source/WebCore/platform/RectEdges.h ++++ b/Source/WebCore/platform/RectEdges.h +@@ -27,6 +27,7 @@ + + #include "WritingMode.h" + #include ++#include + #include + #include + diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h index 7eb7b540282840ab7b5f31fdfa6b2bfd58eb19dc..4937254dc71d6eb0d6213e645b92199af354096e 100644 --- a/Source/WebCore/platform/ScrollableArea.h @@ -8012,7 +8041,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 2846c6f4b3bfa67a9634193c6068384cc1a70f85..b205c8dada31c6aa9857658739caf4f10b8dd124 100644 +index 371d022d7c999151f03df6e4d03240abe1f61543..9a0dd0e753710897a2ab339d26dc995dc63b0aa8 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -74,6 +74,11 @@ @@ -8044,7 +8073,7 @@ index 2846c6f4b3bfa67a9634193c6068384cc1a70f85..b205c8dada31c6aa9857658739caf4f1 void NetworkConnectionToWebProcess::removeStorageAccessForFrame(FrameIdentifier frameID, PageIdentifier pageID) { diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -index 9c529f92cae2c7343477343e45108837c2683a30..e8b1894332b8dfb79ce4f72a70e5eeb915bc1425 100644 +index 2ec7d11ca0ea9402a4ca7a928c73d83b1e6ef2f6..c2830c0dcfd454ca952fd16d75049a442694f318 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h @@ -283,6 +283,8 @@ private: @@ -8057,7 +8086,7 @@ index 9c529f92cae2c7343477343e45108837c2683a30..e8b1894332b8dfb79ce4f72a70e5eeb9 void removeStorageAccessForFrame(WebCore::FrameIdentifier, WebCore::PageIdentifier); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in -index 948bcca43da81435b71fe8d979e80d72e82d7ba7..6c75052815ada2331627f8b453c84f748d4cfe8d 100644 +index a098412a5f3d55fe3848b223f9dffa98c36614c6..d893ae57ee530e5d70b4c79ac16ccbd91e6e2876 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in @@ -64,6 +64,8 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver { @@ -8070,7 +8099,7 @@ index 948bcca43da81435b71fe8d979e80d72e82d7ba7..6c75052815ada2331627f8b453c84f74 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 6afcc1e5a543d74b35f97f42f5f3464ec1c934e8..d668824ad614d5a3115d60bcf53f3093fa452616 100644 +index 9ecabb38ba233eede72c08f1fba9f837205de998..27c03c930e460f0983afb3464ff363e9d2d73632 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -8081,8 +8110,8 @@ index 6afcc1e5a543d74b35f97f42f5f3464ec1c934e8..d668824ad614d5a3115d60bcf53f3093 #include "ArgumentCoders.h" #include "Attachment.h" #include "AuthenticationManager.h" -@@ -557,6 +556,41 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) - #endif +@@ -556,6 +555,41 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) + removeWebIDBServerIfPossible(sessionID); } +void NetworkProcess::getAllCookies(PAL::SessionID sessionID, CompletionHandler&&)>&& completionHandler) @@ -8124,7 +8153,7 @@ index 6afcc1e5a543d74b35f97f42f5f3464ec1c934e8..d668824ad614d5a3115d60bcf53f3093 void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index a7253de7c300b1c00dc838c4efc7bfd4c75f534f..db4360c5844c7350862496dc562b24571a2f780f 100644 +index d024f2ed5af67938466dd82e59102dab11669757..a7dcd29ea6aa7908a077abd2d15e4acb201d0567 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -78,6 +78,7 @@ class SessionID; @@ -8148,7 +8177,7 @@ index a7253de7c300b1c00dc838c4efc7bfd4c75f534f..db4360c5844c7350862496dc562b2457 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 44cda40b91c045f5f1080cb16f90db2dd1cbf7c5..85cfe49b15be5a7fdb42df5bdb8ef717de6ae898 100644 +index 9d1ed88ea04a0f64533148f04248a970a77291eb..9f91c8dda9e6c2712153891fbcf282160d20ade5 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in @@ -79,6 +79,11 @@ messages -> NetworkProcess LegacyReceiver { @@ -8164,7 +8193,7 @@ index 44cda40b91c045f5f1080cb16f90db2dd1cbf7c5..85cfe49b15be5a7fdb42df5bdb8ef717 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 1b612730c141df1d7e181db8d657e89305c2ca4a..f929e70ffd199569f11c5fb3692c4362648032de 100644 +index e392e9617c2178fa43dabfbe784fef523f670f41..7b29c6437cbafe13fe79ce97ee7fa0e29ced4e51 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h @@ -150,6 +150,9 @@ public: @@ -8199,7 +8228,7 @@ index 48c883bfc0fc7d501c8a4a4e7684ccc33e38c14d..20dedbbaf4b1a713c8be41e21425c307 { } diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h -index 9d0d6395089dbbf22e899c93edaf9a1fd7045507..398396996ec4c346852044749e1f87f8be798957 100644 +index 5b558e7e2eb783dbde93b6e9bb31738e1735533f..af0aa404ac89a892a7b6845d47777433d445a327 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h @@ -84,6 +84,8 @@ public: @@ -8209,10 +8238,10 @@ index 9d0d6395089dbbf22e899c93edaf9a1fd7045507..398396996ec4c346852044749e1f87f8 + static void setCookieFromResponse(NetworkSessionCocoa& session, const NetworkLoadParameters&, const URL& mainDocumentURL, const String& setCookieValue); + private: - NetworkDataTaskCocoa(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, WebCore::FrameIdentifier, WebCore::PageIdentifier, WebCore::StoredCredentialsPolicy, WebCore::ContentSniffingPolicy, WebCore::ContentEncodingSniffingPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect, PreconnectOnly, bool dataTaskIsForMainFrameNavigation, bool dataTaskIsForMainResourceNavigationForAnyFrame, Optional, Optional isNavigatingToAppBoundDomain, WebCore::ShouldRelaxThirdPartyCookieBlocking, Optional); + NetworkDataTaskCocoa(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, WebCore::FrameIdentifier, WebCore::PageIdentifier, WebPageProxyIdentifier, WebCore::StoredCredentialsPolicy, WebCore::ContentSniffingPolicy, WebCore::ContentEncodingSniffingPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect, PreconnectOnly, bool dataTaskIsForMainFrameNavigation, bool dataTaskIsForMainResourceNavigationForAnyFrame, Optional, Optional isNavigatingToAppBoundDomain, WebCore::ShouldRelaxThirdPartyCookieBlocking, Optional); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm -index d09ea015b300ba14553b2cf57c7a0cd72c709a80..1ae0c237c06f96f340be5f329e5d9f88604ce42a 100644 +index 339e10d202f3c17197988abb075673f6b4164d45..e140032c2d52e53691761f67562e526379165ad9 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm @@ -41,6 +41,7 @@ @@ -8223,7 +8252,7 @@ index d09ea015b300ba14553b2cf57c7a0cd72c709a80..1ae0c237c06f96f340be5f329e5d9f88 #import #import #import -@@ -711,4 +712,59 @@ void NetworkDataTaskCocoa::setPriority(WebCore::ResourceLoadPriority priority) +@@ -712,4 +713,59 @@ void NetworkDataTaskCocoa::setPriority(WebCore::ResourceLoadPriority priority) m_task.get().priority = toNSURLSessionTaskPriority(priority); } @@ -8284,7 +8313,7 @@ index d09ea015b300ba14553b2cf57c7a0cd72c709a80..1ae0c237c06f96f340be5f329e5d9f88 + } diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 6a2df27054029ed9003459a8acc79feed997c9f1..0dd58f9f7fec99173ea6dc3002c9ffea55fd1944 100644 +index 24a42df311903d8b661b2884f0e06a60c411bf78..2503ff3644cc90916a30f4659b332b4b8ae09903 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm @@ -655,7 +655,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se @@ -8474,7 +8503,7 @@ index a0a2a30b0960e0f091ea9d87190a586a2d9e7f09..53298616f94e1336c8ac928c0d6bf588 if (!error) return true; diff --git a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp -index 6e973f518c176c589e426bd6f466b1a7552828d4..8df1134613da2d817147bc5db3d30f5d29d994fb 100644 +index 06ca252b043959d457814d45886949a85b1a19c1..597e63aca71d213526d953ead357fbc0e0405f8d 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp @@ -113,6 +113,11 @@ static gboolean webSocketAcceptCertificateCallback(GTlsConnection* connection, G @@ -8502,10 +8531,10 @@ index 6e973f518c176c589e426bd6f466b1a7552828d4..8df1134613da2d817147bc5db3d30f5d + g_signal_connect(connection, "accept-certificate", G_CALLBACK(webSocketAcceptCertificateCallbackIgnoreTLSErrors), soupMessage); +} + - std::unique_ptr NetworkSessionSoup::createWebSocketTask(NetworkSocketChannel& channel, const ResourceRequest& request, const String& protocol) + std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPageProxyIdentifier, NetworkSocketChannel& channel, const ResourceRequest& request, const String& protocol) { GRefPtr soupMessage = request.createSoupMessage(blobRegistry()); -@@ -131,14 +145,21 @@ std::unique_ptr NetworkSessionSoup::createWebSocketTask(NetworkSo +@@ -131,14 +145,21 @@ std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPagePr if (request.url().protocolIs("wss")) { #if USE(SOUP2) @@ -8535,7 +8564,7 @@ index 6e973f518c176c589e426bd6f466b1a7552828d4..8df1134613da2d817147bc5db3d30f5d } return makeUnique(channel, request, soupSession(), soupMessage.get(), protocol); diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index f3211103b27b1d7179f03ff1ddac967a08dd8ee4..07639a74d960356511e34636ac670a7294e33aa4 100644 +index 0ac3fd222eac26d1f5e1b00c0b381d678ba0b297..4bff5fef0b5489ca296e41e32de612c6b72d3ee7 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake @@ -459,6 +459,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES @@ -8602,10 +8631,10 @@ index e397c07b7cf7170f4d833997d499b4ac7ffcd898..ba2270f561b90cc54682b77c02c90285 Cairo::Cairo Freetype::Freetype diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake -index 03af565ed1ae39e77e183a4aebd1e64a2e247e0a..7bf35d77e8989d50bfb81b67909b6c828cf50dde 100644 +index a3372fb76ca86c71e4a4bd0206066e175781e47a..06b7ceababb812b1e22f4e1c778a25583a2e96a9 100644 --- a/Source/WebKit/PlatformWin.cmake +++ b/Source/WebKit/PlatformWin.cmake -@@ -65,8 +65,12 @@ list(APPEND WebKit_SOURCES +@@ -66,8 +66,12 @@ list(APPEND WebKit_SOURCES UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp @@ -8618,7 +8647,7 @@ index 03af565ed1ae39e77e183a4aebd1e64a2e247e0a..7bf35d77e8989d50bfb81b67909b6c82 UIProcess/win/WebPageProxyWin.cpp UIProcess/win/WebPopupMenuProxyWin.cpp UIProcess/win/WebProcessPoolWin.cpp -@@ -84,6 +88,7 @@ list(APPEND WebKit_SOURCES +@@ -85,6 +89,7 @@ list(APPEND WebKit_SOURCES WebProcess/Plugins/Netscape/win/PluginProxyWin.cpp WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp @@ -8626,7 +8655,7 @@ index 03af565ed1ae39e77e183a4aebd1e64a2e247e0a..7bf35d77e8989d50bfb81b67909b6c82 WebProcess/WebPage/AcceleratedSurface.cpp -@@ -125,6 +130,63 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES +@@ -126,6 +131,63 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES "${WEBKIT_DIR}/win" ) @@ -8690,7 +8719,7 @@ index 03af565ed1ae39e77e183a4aebd1e64a2e247e0a..7bf35d77e8989d50bfb81b67909b6c82 set(WebKitCommonIncludeDirectories ${WebKit_INCLUDE_DIRECTORIES}) set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) -@@ -177,6 +239,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) +@@ -178,6 +240,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) OpenSSL::SSL mfuuid.lib strmiids.lib @@ -8775,7 +8804,7 @@ index b838fca9702c1432602176bb13ef052db224e82e..d802e555369176e74b37495ae924b04e 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 1d3ab88254346aa11ad9c66f34eaec7279a1229a..6a367927aa0e4c80dfe6ac987d67c8f3867bac4e 100644 +index 9e31297196da1155f0b22c3180a03c830486e372..93e3328c6b4cc58a840fc1263943458d691bac19 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -114,6 +114,10 @@ @@ -9333,7 +9362,7 @@ index 88d53d236cd6d62735f03678a04ca9c198dddacb..b8f8efc57ab00dc5725660c5a8ad56a3 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 7aec158075aa955e475260f4a28ca979f536b853..9a5a2f3387a4f80d201a8ed529f63a54236d464e 100644 +index 3eed4b2a07e0ce960cc391fc1d64d02817830536..add2e313f0208c73eda3718809eeccc1b1d87bc3 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt @@ -287,11 +287,14 @@ Shared/WebsiteData/WebsiteData.cpp @@ -9379,7 +9408,7 @@ index 7aec158075aa955e475260f4a28ca979f536b853..9a5a2f3387a4f80d201a8ed529f63a54 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 20390a7ecd9ab370df29030f8cbaae0c94cba06a..6bf3ade42a403b2c7964b70b806c43f316766f62 100644 +index dd4d2a5076576ba3d4562ecac331b19993c9969f..0f2244cfee91622d4e99e643bc6e0dc0f41e153f 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt @@ -260,6 +260,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm @@ -9393,13 +9422,13 @@ index 20390a7ecd9ab370df29030f8cbaae0c94cba06a..6bf3ade42a403b2c7964b70b806c43f3 @@ -428,6 +429,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm - UIProcess/Inspector/mac/RemoteWebInspectorProxyMac.mm + UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm +UIProcess/Inspector/mac/ScreencastEncoderMac.mm - UIProcess/Inspector/mac/WebInspectorProxyMac.mm + UIProcess/Inspector/mac/WebInspectorUIProxyMac.mm UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm UIProcess/Inspector/mac/WKInspectorViewController.mm diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt -index 42b99cd3cf0ea8fdcaafee68c3872b88540e4df6..42a81dd1af42215abbf3f680d12b9e7a426663eb 100644 +index f8dbd2ab7c2e04f5f9b51da0cf546994cf6c2aac..624cca2b12555a0eff43ee09d3310d18394f6557 100644 --- a/Source/WebKit/SourcesGTK.txt +++ b/Source/WebKit/SourcesGTK.txt @@ -123,6 +123,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify @@ -9484,12 +9513,12 @@ index 7f9767dcf74adeb9da371da0f4fb84987783d131..355c55b8834f371a69a9d3f7164bd4c4 WebProcess/WebPage/AcceleratedSurface.cpp diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp -index 18585f61bb6ecabec39ff0c03b862c65856dca24..21bab039d1f6116ebf9c59bc42a695a45f4701e8 100644 +index d16ed7753fa59fc87ea9402f5ff4872525ed32f6..60a3d2f1e9cbb415ce8196b6a780fb44e8d51e77 100644 --- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp +++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp -@@ -53,6 +53,9 @@ Ref ProcessPoolConfiguration::copy() - copy->m_ignoreSynchronousMessagingTimeoutsForTesting = this->m_ignoreSynchronousMessagingTimeoutsForTesting; +@@ -54,6 +54,9 @@ Ref ProcessPoolConfiguration::copy() copy->m_attrStyleEnabled = this->m_attrStyleEnabled; + copy->m_shouldThrowExceptionForGlobalConstantRedeclaration = this->m_shouldThrowExceptionForGlobalConstantRedeclaration; copy->m_overrideLanguages = this->m_overrideLanguages; +#if PLATFORM(MAC) + copy->m_forceOverlayScrollbars = this->m_forceOverlayScrollbars; @@ -9498,10 +9527,10 @@ index 18585f61bb6ecabec39ff0c03b862c65856dca24..21bab039d1f6116ebf9c59bc42a695a4 copy->m_shouldTakeUIBackgroundAssertion = this->m_shouldTakeUIBackgroundAssertion; copy->m_shouldCaptureDisplayInUIProcess = this->m_shouldCaptureDisplayInUIProcess; diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h -index 64924902f19811792537a15a32ed4d706daf9670..28906745477d89bb0e7c2b9c3f1523d2d76803d6 100644 +index 1f5079c85fdb954cd6a6c7c9cf7019b4d2c16f79..aae828602c4a20024c7267e48ed1cdbc20b98106 100644 --- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h +++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h -@@ -98,6 +98,11 @@ public: +@@ -101,6 +101,11 @@ public: const Vector& overrideLanguages() const { return m_overrideLanguages; } void setOverrideLanguages(Vector&& languages) { m_overrideLanguages = WTFMove(languages); } @@ -9513,9 +9542,9 @@ index 64924902f19811792537a15a32ed4d706daf9670..28906745477d89bb0e7c2b9c3f1523d2 bool alwaysRunsAtBackgroundPriority() const { return m_alwaysRunsAtBackgroundPriority; } void setAlwaysRunsAtBackgroundPriority(bool alwaysRunsAtBackgroundPriority) { m_alwaysRunsAtBackgroundPriority = alwaysRunsAtBackgroundPriority; } -@@ -157,6 +162,9 @@ private: - bool m_ignoreSynchronousMessagingTimeoutsForTesting { false }; +@@ -161,6 +166,9 @@ private: bool m_attrStyleEnabled { false }; + bool m_shouldThrowExceptionForGlobalConstantRedeclaration { true }; Vector m_overrideLanguages; +#if PLATFORM(MAC) + bool m_forceOverlayScrollbars { false }; @@ -9524,7 +9553,7 @@ index 64924902f19811792537a15a32ed4d706daf9670..28906745477d89bb0e7c2b9c3f1523d2 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 7cebe2fabad5b335eb362a327eb344ae82dbe66e..7e02d18aab14356ab7aaaee661502950a0fd12f9 100644 +index 835d255e29e568b8469f50b0dd2b95a8b0e9a070..87effd9f9910e94a876d24640e04deaf8bd06925 100644 --- a/Source/WebKit/UIProcess/API/APIUIClient.h +++ b/Source/WebKit/UIProcess/API/APIUIClient.h @@ -94,6 +94,7 @@ public: @@ -9536,7 +9565,7 @@ index 7cebe2fabad5b335eb362a327eb344ae82dbe66e..7e02d18aab14356ab7aaaee661502950 virtual void setStatusText(WebKit::WebPageProxy*, const WTF::String&) { } virtual void mouseDidMoveOverElement(WebKit::WebPageProxy&, const WebKit::WebHitTestResultData&, OptionSet, Object*) { } diff --git a/Source/WebKit/UIProcess/API/C/WKInspector.cpp b/Source/WebKit/UIProcess/API/C/WKInspector.cpp -index 39327c5c9230591e4f52e4574c416e36687788f0..450033d87fefb743ab7240ce317fae221f91dcf5 100644 +index e1465edd29caf3109c17d44bb3c88aaba98cfbb5..32d569d3240c583334b8b6512407430fd448ae75 100644 --- a/Source/WebKit/UIProcess/API/C/WKInspector.cpp +++ b/Source/WebKit/UIProcess/API/C/WKInspector.cpp @@ -28,6 +28,11 @@ @@ -9549,7 +9578,7 @@ index 39327c5c9230591e4f52e4574c416e36687788f0..450033d87fefb743ab7240ce317fae22 +#endif + #include "WKAPICast.h" - #include "WebInspectorProxy.h" + #include "WebInspectorUIProxy.h" #include "WebPageProxy.h" @@ -130,4 +135,11 @@ void WKInspectorToggleElementSelection(WKInspectorRef inspectorRef) toImpl(inspectorRef)->toggleElementSelection(); @@ -9579,7 +9608,7 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index 036caf973035bfda316dfff5caf651d715121825..8ce59f3904c5bce6ed7abf250e25a190f8fd5f79 100644 +index 43a74ee78a0eff78e038c4a3ca5f6824fc5a9f23..bd7f572af860e5dfecf472d676144dd462429921 100644 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp @@ -1695,6 +1695,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient @@ -9693,7 +9722,7 @@ index 245580d7e15679b82a61c4639850da02d81a4e1e..5fd5c4afbdc167f817b4ae961f446ec4 NS_ASSUME_NONNULL_END diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm -index 542f01171b909bb10c93884d1365fb545c0a9610..4765ede7c0e3665f7b9051592e8f79d7fcc14ff6 100644 +index c3934552a23c0518cedc5aa9b87d4d5c650cd056..67533d044cea2cd39ace2c3fb53505f0ec8d2310 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm @@ -41,6 +41,7 @@ @@ -9883,10 +9912,10 @@ index d74204597c79f50b6a3ecadefbb9cfc50073e60c..c55b1630b1e7812417ddc5d822c8f33e #if ENABLE(INSPECTOR_EXTENSIONS) diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h -index 5f213970acfc0396839a613bb8ee9407bfe8881e..613ae48e76f292fde0749bbbb9a47c9a9011ecd8 100644 +index d4b65177f9fe593510bea64832d4255693be54b3..875a3e26f359023b0d1896e6544e6dd6488d98b7 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h -@@ -62,6 +62,7 @@ WK_CLASS_AVAILABLE(macos(10.10), ios(8.0)) +@@ -65,6 +65,7 @@ WK_CLASS_AVAILABLE(macos(10.10), ios(8.0)) #endif @property (nonatomic) pid_t presentingApplicationPID WK_API_AVAILABLE(macos(10.13), ios(11.0)); @property (nonatomic) BOOL processSwapsOnNavigation WK_API_AVAILABLE(macos(10.14), ios(12.0)); @@ -9895,10 +9924,10 @@ index 5f213970acfc0396839a613bb8ee9407bfe8881e..613ae48e76f292fde0749bbbb9a47c9a @property (nonatomic) BOOL processSwapsOnWindowOpenWithOpener WK_API_AVAILABLE(macos(10.14), ios(12.0)); @property (nonatomic) BOOL prewarmsProcessesAutomatically WK_API_AVAILABLE(macos(10.14.4), ios(12.2)); diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm -index 9e0d790a3d352613e62a7af63e35933de2b0ab56..0e18b0b254e3ee86990d387c2fde374ff3a45fd4 100644 +index 93d0b1ed806ee698bdf51a7022b0cb5eabbaa943..0cf8411ceb0f24ca58140541d1f10925a926fc8e 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm -@@ -235,6 +235,16 @@ +@@ -245,6 +245,16 @@ return _processPoolConfiguration->processSwapsOnNavigation(); } @@ -9916,7 +9945,7 @@ index 9e0d790a3d352613e62a7af63e35933de2b0ab56..0e18b0b254e3ee86990d387c2fde374f { _processPoolConfiguration->setIsAutomaticProcessWarmingEnabled(prewarms); diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm -index 06e2eece712b59250f5390bdc48014b5d7e50b25..58a7bb1eac1a2173ddcf92ce7a9686cafaaa9963 100644 +index c130399cf9f3063f5a2dcc392e19eefd763c153a..3c10bb7e9dc8d9834b90a8d8faaac361f1268504 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm @@ -24,6 +24,7 @@ @@ -10483,7 +10512,7 @@ index 0000000000000000000000000000000000000000..9f1a0173a5641d6f158d815b8f7b9ea6 + +#endif diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -index dd0eb6ab0895a9265cd227ea7cd8458e7dc1bdf3..ba7ae4e211eb26a7688826785c347103809677bb 100644 +index 60e238b37f1de09bce1fd9541a59e1f2890dce11..9a8e739f3c1ce3c35ad3ca852ad5d7c01712459c 100644 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp @@ -2267,6 +2267,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) @@ -10499,7 +10528,7 @@ index dd0eb6ab0895a9265cd227ea7cd8458e7dc1bdf3..ba7ae4e211eb26a7688826785c347103 { ASSERT(webkitWebViewBase->priv->acceleratedBackingStore); diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h -index d09aea45d94fb7367ba88fdf8326dea1209d02ce..dac8f3ec62ace87fc82c997feb950733aa59a996 100644 +index 0b438daa441e0c9b65e6ec04cc4cb705f8443c08..2f60236d1e842384a024f81fb9fecbbb39bf0f45 100644 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h @@ -27,6 +27,7 @@ @@ -10886,7 +10915,7 @@ index 4917c5a1ce61ca32a2a459c31de2cf415231f2cc..7102211b96a9691b28c613c7d19f20ba #import "WKUIDelegate.h" #import "WKWebViewConfigurationPrivate.h" diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h -index 72a45a4c975e36b7eed00d4c9de854038b283f52..432ca4d5996d3350cb51be7baca3210c03a1014e 100644 +index d470d225219c8eb60c5d3a57e08b82b64431ae58..c838e921c2b4a811aaa9b74f708cda08c4a0cc35 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h @@ -92,6 +92,7 @@ private: @@ -10906,7 +10935,7 @@ index 72a45a4c975e36b7eed00d4c9de854038b283f52..432ca4d5996d3350cb51be7baca3210c bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1; diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -index c8abed6145a982a861176491457faf48aa5fe848..a0cc7ee0750c3fd093b53504facbad3d119a11a5 100644 +index 386bb27eded943ea09e43bc2abdbbe0b80004dcc..c1b19a4b432b38139bd8a8a05ad78b9a79b59923 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm @@ -104,6 +104,7 @@ void UIDelegate::setDelegate(id delegate) @@ -11011,10 +11040,10 @@ index a29d173bffa4cbd487ea87ac7a032c698819ef77..0c2a7cbdce5fbd760b4777fdb8818473 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index db009ad282fbc07449b212571076924203af1957..a4a682279b6b3a5be1c31a45dd10eac6eae760f6 100644 +index 7626cb8b2d7db95907d49e2315b9dd50491d2df9..7a61c11852efb8fe03074e1c8ea57e198288033f 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -398,7 +398,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -397,7 +397,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -11023,7 +11052,7 @@ index db009ad282fbc07449b212571076924203af1957..a4a682279b6b3a5be1c31a45dd10eac6 #endif #if PLATFORM(IOS) -@@ -670,8 +670,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -668,8 +668,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -11049,7 +11078,7 @@ index 858544d27d704b3f0238fb988a556d5bd8f0cb94..9814fcea071f0ff0dffd89500a1fcf4b void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 6333e7fb5c334befaff41f403619323737f3b0ae..4a4a1a4fb4796d6b29edbfc3f8ad3a806aec07bd 100644 +index 6d3d129d58c69508521fae295b34aa5bf51a90e4..a2317cdea99204b0f2144aee0ba52da1fe2311a9 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm @@ -4525,6 +4525,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu @@ -15138,7 +15167,7 @@ index 0000000000000000000000000000000000000000..01b8f65e87b4898b1418f47f4d95c401 + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 26eb197a2a5ed25deab4ad75d097c80350ca2fc9..e569aca1fd5f7f336967df35564eb8e76dd2da46 100644 +index 77910abf3c0de684e80b82210bc2104eb84291cc..8063362ccc6fa99cbb12b3f12eb07bf0b645742f 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -239,7 +239,7 @@ @@ -15570,7 +15599,7 @@ index 26eb197a2a5ed25deab4ad75d097c80350ca2fc9..e569aca1fd5f7f336967df35564eb8e7 } break; } -@@ -7365,7 +7537,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7374,7 +7546,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { RELEASE_LOG_ERROR_IF_ALLOWED(Loading, "dispatchProcessDidTerminate: reason=%d", reason); @@ -15582,7 +15611,7 @@ index 26eb197a2a5ed25deab4ad75d097c80350ca2fc9..e569aca1fd5f7f336967df35564eb8e7 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -7733,6 +7908,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -7742,6 +7917,7 @@ static const Vector& mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -15590,7 +15619,7 @@ index 26eb197a2a5ed25deab4ad75d097c80350ca2fc9..e569aca1fd5f7f336967df35564eb8e7 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -7925,6 +8101,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -7934,6 +8110,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -15599,7 +15628,7 @@ index 26eb197a2a5ed25deab4ad75d097c80350ca2fc9..e569aca1fd5f7f336967df35564eb8e7 #if PLATFORM(GTK) parameters.themeName = pageClient().themeName(); #endif -@@ -7997,6 +8175,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8006,6 +8184,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -15614,7 +15643,7 @@ index 26eb197a2a5ed25deab4ad75d097c80350ca2fc9..e569aca1fd5f7f336967df35564eb8e7 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = makeRef(*this), authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8089,6 +8275,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8098,6 +8284,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -15631,7 +15660,7 @@ index 26eb197a2a5ed25deab4ad75d097c80350ca2fc9..e569aca1fd5f7f336967df35564eb8e7 // 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 ff02469c13eaf6d06b63e5f4a105e9df359dd9a3..70470e545329ccc86fb27da66006ea893f308fa1 100644 +index 9d7cbe9fafb3e60f2e93a2a132218f21e5862555..bf4245c01ecba7893cf487d6ed3de65157d1afdc 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -38,6 +38,7 @@ @@ -15753,15 +15782,15 @@ index ff02469c13eaf6d06b63e5f4a105e9df359dd9a3..70470e545329ccc86fb27da66006ea89 #endif #if ENABLE(WEB_CRYPTO) -@@ -2484,6 +2513,7 @@ private: +@@ -2485,6 +2514,7 @@ private: String m_overrideContentSecurityPolicy; - RefPtr m_inspector; + RefPtr m_inspector; + InspectorDialogAgent* m_inspectorDialogAgent { nullptr }; #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2724,6 +2754,20 @@ private: +@@ -2725,6 +2755,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -15782,7 +15811,7 @@ index ff02469c13eaf6d06b63e5f4a105e9df359dd9a3..70470e545329ccc86fb27da66006ea89 #endif PageLoadState m_pageLoadState; -@@ -2929,6 +2973,9 @@ private: +@@ -2930,6 +2974,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -15793,7 +15822,7 @@ index ff02469c13eaf6d06b63e5f4a105e9df359dd9a3..70470e545329ccc86fb27da66006ea89 #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 70a8ac8db5c59c8379d956d9d4523a0bc426e54a..300c749bca0ceaa33475a533d3ba2912eb15d79a 100644 +index 64e91e4dcf7f6ca3fe6ffc0b50942db1852a9429..32761091874b3d70486f736a39c7e569b51fe761 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -15812,7 +15841,7 @@ index 70a8ac8db5c59c8379d956d9d4523a0bc426e54a..300c749bca0ceaa33475a533d3ba2912 PluginScaleFactorDidChange(double zoomFactor) PluginZoomFactorDidChange(double zoomFactor) -@@ -303,10 +305,12 @@ messages -> WebPageProxy { +@@ -304,10 +306,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 @@ -15828,7 +15857,7 @@ index 70a8ac8db5c59c8379d956d9d4523a0bc426e54a..300c749bca0ceaa33475a533d3ba2912 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index c7013662b621aa63c605b39a87f702eee5274efa..6b79029c02e4c3614d668151b31a69be079b6198 100644 +index 5d6d11a40a9f84311186b7e2f2641cf1d99e8430..cb40e04b1ddab907b00964e92c4dd7a4cb0efa13 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp @@ -554,6 +554,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro @@ -15887,10 +15916,10 @@ index 68d66c615eba6e97b0a3c80d434b1b1148b2d07c..973e44b13e737e1fa542f6f17649700e WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index f73297deb692e26bb1f5f6ae810b6e4ec5adbfde..6e00ea7486d98fd2f21bca67c04b2a554f6e46d3 100644 +index 152a2abcd5e35efd83021b3dc68d7588c1cfab6f..9bc6ebca40d48b510b80de8d60a3831d5ed3df95 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2117,6 +2117,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O +@@ -2130,6 +2130,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); } @@ -15909,7 +15938,7 @@ index f73297deb692e26bb1f5f6ae810b6e4ec5adbfde..6e00ea7486d98fd2f21bca67c04b2a55 void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index 83612b0548b99b3e8416b061f97e88c7eb919b3b..a1fb757f6fdc392aaa01e173abced73d7f5a0ee5 100644 +index 8b4d4134142dfec0174158eabbd165c41dcdedc6..2750bbfddc642c3216ce8bd4e3878f5aeeec20a3 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h @@ -92,6 +92,7 @@ enum class CacheModel : uint8_t; @@ -15937,7 +15966,7 @@ index 83612b0548b99b3e8416b061f97e88c7eb919b3b..a1fb757f6fdc392aaa01e173abced73d class WebsiteDataStore : public API::ObjectImpl, public Identified, public CanMakeWeakPtr { public: static Ref defaultDataStore(); -@@ -278,11 +289,13 @@ public: +@@ -280,11 +291,13 @@ public: const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; } #endif @@ -15952,7 +15981,7 @@ index 83612b0548b99b3e8416b061f97e88c7eb919b3b..a1fb757f6fdc392aaa01e173abced73d void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&); const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; } #endif -@@ -335,6 +348,14 @@ public: +@@ -337,6 +350,14 @@ public: static WTF::String defaultJavaScriptConfigurationDirectory(); static bool http3Enabled(); @@ -15967,7 +15996,7 @@ index 83612b0548b99b3e8416b061f97e88c7eb919b3b..a1fb757f6fdc392aaa01e173abced73d void resetQuota(CompletionHandler&&); void setQuotaLoggingEnabled(bool enabled, CompletionHandler&&); -@@ -420,9 +441,11 @@ private: +@@ -422,9 +443,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -15980,7 +16009,7 @@ index 83612b0548b99b3e8416b061f97e88c7eb919b3b..a1fb757f6fdc392aaa01e173abced73d WebCore::SoupNetworkProxySettings m_networkProxySettings; #endif -@@ -447,6 +470,11 @@ private: +@@ -449,6 +472,11 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -17660,10 +17689,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a461444de1f52 100644 +index 7eff4f26e335122b0f6eb59cb8014c11bade0eef..092023f4588f3753ae403dbaac969390681b437a 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1927,6 +1927,18 @@ +@@ -1928,6 +1928,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 */; }; @@ -17682,7 +17711,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 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 */; }; -@@ -1983,6 +1995,9 @@ +@@ -1984,6 +1996,9 @@ E5BEF6822130C48000F31111 /* WebDataListSuggestionsDropdownIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E5BEF6802130C47F00F31111 /* WebDataListSuggestionsDropdownIOS.h */; }; E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -17692,7 +17721,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 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, ); }; }; -@@ -5747,6 +5762,19 @@ +@@ -5750,6 +5765,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 = ""; }; @@ -17712,7 +17741,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 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 = ""; }; -@@ -5859,6 +5887,14 @@ +@@ -5862,6 +5890,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 = ""; }; @@ -17727,7 +17756,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 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 = ""; }; -@@ -5966,6 +6002,7 @@ +@@ -5969,6 +6005,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -17735,7 +17764,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -7782,6 +7819,7 @@ +@@ -7785,6 +7822,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -17743,7 +17772,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -8830,6 +8868,7 @@ +@@ -8834,6 +8872,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -17751,7 +17780,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9262,6 +9301,12 @@ +@@ -9266,6 +9305,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -17764,15 +17793,15 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 ); path = Agents; sourceTree = ""; -@@ -9270,6 +9315,7 @@ +@@ -9274,6 +9319,7 @@ isa = PBXGroup; children = ( - A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorProxyMac.mm */, + A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, + F3970344249BD4CE003E1A22 /* ScreencastEncoderMac.mm */, - 1CA8B935127C774E00576C2B /* WebInspectorProxyMac.mm */, + 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -9756,6 +9802,12 @@ +@@ -9760,6 +9806,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -17785,7 +17814,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10056,6 +10108,7 @@ +@@ -10060,6 +10112,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -17793,7 +17822,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -10654,6 +10707,11 @@ +@@ -10659,6 +10712,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -17805,7 +17834,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -11464,6 +11522,7 @@ +@@ -11470,6 +11528,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -17813,7 +17842,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -11762,6 +11821,7 @@ +@@ -11768,6 +11827,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -17821,7 +17850,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -11777,6 +11837,7 @@ +@@ -11783,6 +11843,7 @@ 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, F40BBB41257FF46E0067463A /* GPUProcessWakeupMessageArguments.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -17829,7 +17858,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -11923,8 +11984,10 @@ +@@ -11929,8 +11990,10 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -17840,7 +17869,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 570DAAC22303730300E8FC04 /* NfcConnection.h in Headers */, 570DAAAE23026F5C00E8FC04 /* NfcService.h in Headers */, 31A2EC5614899C0900810D71 /* NotificationPermissionRequest.h in Headers */, -@@ -12005,6 +12068,7 @@ +@@ -12011,6 +12074,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -17848,7 +17877,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, 1A0C227E2451130A00ED614D /* QuickLookThumbnailingSoftLink.h in Headers */, -@@ -12331,6 +12395,7 @@ +@@ -12337,6 +12401,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -17856,7 +17885,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -12460,6 +12525,7 @@ +@@ -12466,6 +12531,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -17864,7 +17893,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -12514,6 +12580,7 @@ +@@ -12520,6 +12586,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -17872,7 +17901,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -12668,6 +12735,7 @@ +@@ -12674,6 +12741,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -17880,7 +17909,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -13840,6 +13908,7 @@ +@@ -13846,6 +13914,7 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -17888,7 +17917,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 A31F60A525CC7DB900AF14F4 /* IPCSemaphore.cpp in Sources */, 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */, 2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */, -@@ -13858,6 +13927,7 @@ +@@ -13864,6 +13933,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, @@ -17896,7 +17925,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, 2D913443212CF9F000128AFD /* NetscapeBrowserFuncs.cpp in Sources */, 2D913444212CF9F000128AFD /* NetscapePlugin.cpp in Sources */, -@@ -13882,6 +13952,7 @@ +@@ -13888,6 +13958,7 @@ 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */, 2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */, 2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */, @@ -17904,7 +17933,7 @@ index 6e83c5fdcaebe68da9efb2e9a0db909959b211a5..44773699bd45be0ff52341b1e35a4614 2D913447212CF9F000128AFD /* NPRuntimeObjectMap.cpp in Sources */, 2D913448212CF9F000128AFD /* NPRuntimeUtilities.cpp in Sources */, 2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */, -@@ -14185,6 +14256,7 @@ +@@ -14191,6 +14262,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -18057,7 +18086,7 @@ index b23d5b8a9f72696f33a1e0b7778ffbf8ec21049c..1a778a275d7b1a3338328abb91ef70f3 } // namespace WebKit diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index f7ffd79b2583fcf2e3be5e3803b52b314dd59cb0..667c2669ef98f520c0c8058ca9cb1964ff38c4da 100644 +index ec674144b1e16f5f5344ebe0f0298f991b13f83a..6e8c957393bb2f2bf3d6ce5af624d3ae781d1262 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -397,6 +397,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -18270,7 +18299,7 @@ index 0000000000000000000000000000000000000000..9b413bb8150a1633d29b6e2606127c9c + +#endif // ENABLE(DRAG_SUPPORT) diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp -index 974427b3de2805d13d631efe1e47c20923952938..6c91d586eaa69aa57a010a46d491716bf669aa2e 100644 +index 5ecd6e862e3ea392c8ec0db9df28e8b025316942..0856514e25574f153cb0d3da61bd01c2ef840bc5 100644 --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp @@ -36,7 +36,9 @@ @@ -18282,8 +18311,8 @@ index 974427b3de2805d13d631efe1e47c20923952938..6c91d586eaa69aa57a010a46d491716b +#include #include #include - #include -@@ -122,6 +124,16 @@ void DrawingAreaCoordinatedGraphics::scroll(const IntRect& scrollRect, const Int + #include +@@ -123,6 +125,16 @@ void DrawingAreaCoordinatedGraphics::scroll(const IntRect& scrollRect, const Int ASSERT(m_scrollRect.isEmpty()); ASSERT(m_scrollOffset.isEmpty()); ASSERT(m_dirtyRegion.isEmpty()); @@ -18300,7 +18329,7 @@ index 974427b3de2805d13d631efe1e47c20923952938..6c91d586eaa69aa57a010a46d491716b m_layerTreeHost->scrollNonCompositedContents(scrollRect); return; } -@@ -252,6 +264,7 @@ void DrawingAreaCoordinatedGraphics::updatePreferences(const WebPreferencesStore +@@ -253,6 +265,7 @@ void DrawingAreaCoordinatedGraphics::updatePreferences(const WebPreferencesStore settings.setAcceleratedCompositingEnabled(false); } #endif @@ -18308,7 +18337,7 @@ index 974427b3de2805d13d631efe1e47c20923952938..6c91d586eaa69aa57a010a46d491716b settings.setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey())); // Fixed position elements need to be composited and create stacking contexts // in order to be scrolled by the ScrollingCoordinator. -@@ -626,6 +639,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay +@@ -627,6 +640,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay m_scrollOffset = IntSize(); m_displayTimer.stop(); m_isWaitingForDidUpdate = false; @@ -18320,7 +18349,7 @@ index 974427b3de2805d13d631efe1e47c20923952938..6c91d586eaa69aa57a010a46d491716b } void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() -@@ -675,6 +693,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() +@@ -676,6 +694,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() // UI process, we still need to let it know about the new contents, so send an Update message. send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo)); } @@ -18394,7 +18423,7 @@ index 8444a454c603c671a6813a445550b40761e7fd84..c5cc0d6092c500f0f0bf63700ada1e86 #include #include diff --git a/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp b/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp -index ec5e36b5b44a99d49cabdf826b3d148db78b99b7..1b03bd972a5588af4ee67b2d10d56ed444533a64 100644 +index cdba5ae658de5bda9ef87a2b6ebc99a44d33d658..90d718d74188fcb2ae05ba7b1dd741054d061366 100644 --- a/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp +++ b/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp @@ -27,6 +27,7 @@ @@ -18405,9 +18434,9 @@ index ec5e36b5b44a99d49cabdf826b3d148db78b99b7..1b03bd972a5588af4ee67b2d10d56ed4 #include "WebPage.h" #include "WebPageCreationParameters.h" #include "WebProcess.h" -@@ -89,6 +90,13 @@ RefPtr DrawingArea::createDisplayRefreshMonitor( +@@ -82,6 +83,13 @@ void DrawingArea::dispatchAfterEnsuringUpdatedScrollPosition(WTF::Function