From cd0074fa41c977c83a58d0527bae43ba81f64a23 Mon Sep 17 00:00:00 2001 From: Diego Pino Date: Mon, 7 Mar 2022 18:39:09 +0800 Subject: [PATCH] browser(webkit): rebase to 03/04/22 (r290853) (#12551) --- browser_patches/webkit/BUILD_NUMBER | 4 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 846 +++++++++--------- 3 files changed, 422 insertions(+), 430 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index b864168452..2e155dd114 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1616 -Changed: yurys@chromium.org Fri 04 Mar 2022 02:50:28 PM PST +1617 +Changed: dpino@igalia.com Mon Mar 7 10:27:14 UTC 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index a3a2296d38..35814d92e1 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="451bf64e063dd32029b7a49a4b5e86b6a8bf46a9" +BASE_REVISION="fe3b67d303e587d46dd8eb9793327fa965a60aa7" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 5cf3ca6109..12229af4da 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 c04ef548ccd98cf93f1b9dc87521b850ecfa807d..c7313837c1ea29f93cb5e0ec315948e50b84511a 100644 +index 74e23df54de6fc8840423325e48101d63e87c681..b21a6bf6bd8671bf4c9ff27eca527689a0a9d618 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1339,22 +1339,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1346,22 +1346,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 c04ef548ccd98cf93f1b9dc87521b850ecfa807d..c7313837c1ea29f93cb5e0ec315948e5 ${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 7fda76a3caac37aed8e9f668b25ec10ace4c423b..3ccbe85d836b154fd670236ea6141a06f872a000 100644 +index 0f48ad56c9fc6d5a81f4bec94e4d8e9825ce1c81..950e03340d28e116e67abeb54e540b131f34298c 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 \ @@ -248,7 +248,7 @@ index 48baed6a1b7ffad453379a2f1eb71b8c4925f6c4..40d36f784f46e44dbad908402a71e6b0 } diff --git a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp -index 82129b2f5439fbf59f6e8ab3c20a27f3b287a9fc..db1ce92dfdb35b9765ef743989959e0e396545a1 100644 +index 1088a6a8f2965e17e52d7ba1d1142b9ed697ad3f..a928811c56eaac0ea5a9a350093cb69e7b3ad59d 100644 --- a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp +++ b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp @@ -101,7 +101,7 @@ void BackendDispatcher::registerDispatcherForDomain(const String& domain, Supple @@ -269,7 +269,7 @@ index 82129b2f5439fbf59f6e8ab3c20a27f3b287a9fc..db1ce92dfdb35b9765ef743989959e0e + { // We could be called re-entrantly from a nested run loop, so restore the previous id. - SetForScope> scopedRequestId(m_currentRequestId, requestId); + SetForScope scopedRequestId(m_currentRequestId, requestId); diff --git a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h index 37c4f9833d4981b47bcd8debd4a79109254641a2..1c82cc9783618234bef7024d91821ce509912526 100644 --- a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h @@ -502,7 +502,7 @@ index e81573fd0fffaaf6fd2af36635c78fcdf8608c69..4169e227b5fb5a3a7fb51396c4679100 // FrontendChannel FrontendChannel::ConnectionType connectionType() const; diff --git a/Source/JavaScriptCore/inspector/protocol/DOM.json b/Source/JavaScriptCore/inspector/protocol/DOM.json -index d792b799277c6c5f00cc4fc17c7488ab7c4c25ca..df833fa57c490c4147d9acc0d0c0b12cd29c68a1 100644 +index b8447e3420fd09df651a6f1e9131473b07bc38ab..36def64e91c93729e13781d137e65d3fb3203faa 100644 --- a/Source/JavaScriptCore/inspector/protocol/DOM.json +++ b/Source/JavaScriptCore/inspector/protocol/DOM.json @@ -80,6 +80,16 @@ @@ -539,7 +539,7 @@ index d792b799277c6c5f00cc4fc17c7488ab7c4c25ca..df833fa57c490c4147d9acc0d0c0b12c } ], "commands": [ -@@ -558,7 +578,9 @@ +@@ -559,7 +579,9 @@ "description": "Resolves JavaScript node object for given node id.", "targetTypes": ["page"], "parameters": [ @@ -550,7 +550,7 @@ index d792b799277c6c5f00cc4fc17c7488ab7c4c25ca..df833fa57c490c4147d9acc0d0c0b12c { "name": "objectGroup", "type": "string", "optional": true, "description": "Symbolic group name that can be used to release multiple objects." } ], "returns": [ -@@ -625,6 +647,45 @@ +@@ -626,6 +648,45 @@ "parameters": [ { "name": "allow", "type": "boolean" } ] @@ -1776,7 +1776,7 @@ index c2d49da98a660bc62b04afe19c578f2592fd4bb9..f27c12db93e099a2dea9ffeb57be72a0 #include diff --git a/Source/JavaScriptCore/runtime/JSDateMath.cpp b/Source/JavaScriptCore/runtime/JSDateMath.cpp -index 5219f8f7242b86f940e82823584e61fe2ba49e61..51bd401528326fc8fea07ed052d0f561411a254f 100644 +index fc6fd38ecb392e9d5ea54d5702578562289434fb..6d4be8e5288a5a3307d7803246dcc16b69c8f9ea 100644 --- a/Source/JavaScriptCore/runtime/JSDateMath.cpp +++ b/Source/JavaScriptCore/runtime/JSDateMath.cpp @@ -76,6 +76,7 @@ @@ -1787,7 +1787,7 @@ index 5219f8f7242b86f940e82823584e61fe2ba49e61..51bd401528326fc8fea07ed052d0f561 #if U_ICU_VERSION_MAJOR_NUM >= 69 || (U_ICU_VERSION_MAJOR_NUM == 68 && USE(APPLE_INTERNAL_SDK)) #define HAVE_ICU_C_TIMEZONE_API 1 -@@ -329,6 +330,10 @@ double DateCache::parseDate(JSGlobalObject* globalObject, VM& vm, const String& +@@ -332,6 +333,10 @@ double DateCache::parseDate(JSGlobalObject* globalObject, VM& vm, const String& // https://tc39.es/ecma402/#sec-defaulttimezone String DateCache::defaultTimeZone() { @@ -1798,7 +1798,7 @@ index 5219f8f7242b86f940e82823584e61fe2ba49e61..51bd401528326fc8fea07ed052d0f561 #if HAVE(ICU_C_TIMEZONE_API) return timeZoneCache()->m_canonicalTimeZoneID; #else -@@ -363,12 +368,20 @@ Ref DateCache::cachedDateInstanceData(double millisecondsFromE +@@ -383,12 +388,20 @@ Ref DateCache::cachedDateInstanceData(double millisecondsFromE void DateCache::timeZoneCacheSlow() { ASSERT(!m_timeZoneCache); @@ -1820,7 +1820,7 @@ index 5219f8f7242b86f940e82823584e61fe2ba49e61..51bd401528326fc8fea07ed052d0f561 if (U_SUCCESS(status)) { Vector canonicalBuffer; auto status = callBufferProducingFunction(ucal_getCanonicalTimeZoneID, timeZoneID.data(), timeZoneID.size(), canonicalBuffer, nullptr); -@@ -385,6 +398,11 @@ void DateCache::timeZoneCacheSlow() +@@ -405,6 +418,11 @@ void DateCache::timeZoneCacheSlow() ucal_setGregorianChange(cache->m_calendar.get(), minECMAScriptTime, &status); // Ignore "unsupported" error. m_timeZoneCache = std::unique_ptr(cache); #else @@ -1953,10 +1953,10 @@ index 2a57dca5af38edf3e3a0e9a4efef64c8a63e9e6c..5ef0a4e3cb7dd2db50d55d0a7a42b717 +_vpx_codec_version_str +_vpx_codec_vp8_cx diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig -index 2c5897d1cf8a80dbaebab948950497bb16646e58..200c3a18485c79f0bc85233ab6f0b10152b26e13 100644 +index 9e4e9d694a47a3a25859688e431437b3ec7841a5..71d64cc3da4dfb098ed8fc96840216b5588e4c5b 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig -@@ -46,7 +46,7 @@ DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(NORMAL_WEBCORE_FRAMEWORKS +@@ -50,7 +50,7 @@ DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(NORMAL_WEBCORE_FRAMEWORKS DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; @@ -1966,7 +1966,7 @@ index 2c5897d1cf8a80dbaebab948950497bb16646e58..200c3a18485c79f0bc85233ab6f0b101 PUBLIC_HEADERS_FOLDER_PREFIX = /usr/local/include; INSTALL_PUBLIC_HEADER_PREFIX = $(INSTALL_PATH_PREFIX)$(PUBLIC_HEADERS_FOLDER_PREFIX); diff --git a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj -index 447a02d3cd2802e028ec16d549654a06adcaaae5..bf576a79f103fe43e375df9be49e0f6ea19f0e14 100644 +index 6afa6ab4b7011c9f97eb08afb798e77d53b9fa0c..b1f1d096635de5b3e240dabfd6d7b7490115a2f1 100644 --- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj +++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj @@ -3870,6 +3870,9 @@ @@ -2014,7 +2014,7 @@ index 447a02d3cd2802e028ec16d549654a06adcaaae5..bf576a79f103fe43e375df9be49e0f6e FB39D06E1200ED9200088E69 = { isa = PBXGroup; children = ( -@@ -17494,7 +17511,7 @@ +@@ -17496,7 +17513,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -2023,7 +2023,7 @@ index 447a02d3cd2802e028ec16d549654a06adcaaae5..bf576a79f103fe43e375df9be49e0f6e }; 5CD286461E6E154E0094FDC8 /* Check for Weak VTables and Externals */ = { isa = PBXShellScriptBuildPhase; -@@ -18658,6 +18675,7 @@ +@@ -18697,6 +18714,7 @@ 419C82F51FE20EB50040C30F /* audio_encoder_opus.cc in Sources */, 419C82F31FE20EB50040C30F /* audio_encoder_opus_config.cc in Sources */, 4140B8201E4E3383007409E6 /* audio_encoder_pcm.cc in Sources */, @@ -2031,7 +2031,7 @@ index 447a02d3cd2802e028ec16d549654a06adcaaae5..bf576a79f103fe43e375df9be49e0f6e 5CDD8FFE1E43CE3A00621E92 /* audio_encoder_pcm16b.cc in Sources */, 5CD285461E6A61D20094FDC8 /* audio_format.cc in Sources */, 41DDB26F212679D200296D47 /* audio_format_to_string.cc in Sources */, -@@ -19104,6 +19122,7 @@ +@@ -19143,6 +19161,7 @@ 417953DB216983910028266B /* metrics.cc in Sources */, 5CDD865E1E43B8B500621E92 /* min_max_operations.c in Sources */, 4189395B242A71F5007FDC41 /* min_video_bitrate_experiment.cc in Sources */, @@ -2039,7 +2039,7 @@ index 447a02d3cd2802e028ec16d549654a06adcaaae5..bf576a79f103fe43e375df9be49e0f6e 4131C387234B957D0028A615 /* moving_average.cc in Sources */, 41FCBB1521B1F7AA00A5DF27 /* moving_average.cc in Sources */, 5CD286101E6A64C90094FDC8 /* moving_max.cc in Sources */, -@@ -19334,6 +19353,7 @@ +@@ -19373,6 +19392,7 @@ 4131C53B234C8B190028A615 /* rtc_event_rtp_packet_outgoing.cc in Sources */, 4131C552234C8B190028A615 /* rtc_event_video_receive_stream_config.cc in Sources */, 4131C554234C8B190028A615 /* rtc_event_video_send_stream_config.cc in Sources */, @@ -2047,35 +2047,6 @@ index 447a02d3cd2802e028ec16d549654a06adcaaae5..bf576a79f103fe43e375df9be49e0f6e 4131C3CF234B98420028A615 /* rtc_stats.cc in Sources */, 41323A1D2665288B00B38623 /* packet_sequencer.cc in Sources */, 4131BF2D234B88200028A615 /* rtc_stats_collector.cc in Sources */, -diff --git a/Source/WTF/Scripts/GeneratePreferences.rb b/Source/WTF/Scripts/GeneratePreferences.rb -index de0f2268b178cd2672408d21ab18659d093208e1..4555f317b5b0158d9ce53c492f7a53384a90e109 100644 ---- a/Source/WTF/Scripts/GeneratePreferences.rb -+++ b/Source/WTF/Scripts/GeneratePreferences.rb -@@ -228,11 +228,23 @@ class Preferences - result - end - -+ def createTemplate(templateString) -+ # Newer versions of ruby deprecate and/or drop passing non-keyword -+ # arguments for trim_mode and friends, so we need to call the constructor -+ # differently depending on what it expects. This solution is suggested by -+ # rubocop's Lint/ErbNewArguments. -+ if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ -+ ERB.new(templateString, trim_mode:"-") -+ else -+ ERB.new(templateString, nil, "-") -+ end -+ end -+ - def renderTemplate(templateFile, outputDirectory) - resultFile = File.join(outputDirectory, File.basename(templateFile, ".erb")) - tempResultFile = resultFile + ".tmp" - -- output = ERB.new(File.read(templateFile), trim_mode:"-").result(binding) -+ output = createTemplate(File.read(templateFile)).result(binding) - File.open(tempResultFile, "w+") do |f| - f.write(output) - end diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml index 4aa67a3129804da9ff8e6a4494596c4661ff9e16..4fcf5dd448703b5d6a2d738f3cd5c88e4a0de6ac 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml @@ -2108,7 +2079,7 @@ index 4aa67a3129804da9ff8e6a4494596c4661ff9e16..4fcf5dd448703b5d6a2d738f3cd5c88e type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 2d2c2b39d66e2fc9f78bdba450d988e2626e378c..527a08d54847a48f5ff48c15c2e7c512872fc4c4 100644 +index 93daf84ca7d19e528a8ac600c92940f94da1708c..0d5626f02e3eeed21b2ca8172f4f3df5ae8d41b9 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -455,7 +455,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2132,7 +2103,7 @@ index 2d2c2b39d66e2fc9f78bdba450d988e2626e378c..527a08d54847a48f5ff48c15c2e7c512 # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -1316,7 +1316,7 @@ SpeechRecognitionEnabled: +@@ -1331,7 +1331,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2276,7 +2247,7 @@ index 07ddf3854633cb5e4ca9679359c048f13395e4ab..a0be72ba35e7afa09e8ea5976ebf600b WTF_EXPORT_PRIVATE LocalTimeOffset calculateLocalTimeOffset(double utcInMilliseconds, TimeType = UTCTime); diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index f541ff99b9453c2dbef4ed3a28453e7c84986897..3f4841caee0df98920dcab3a19fd9561c7d62164 100644 +index 6a0b9d54b5a6b5937b86f226a279cfec928174c4..d57a243e3ca23119a993b3bc78821ce9e1653740 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h @@ -416,7 +416,7 @@ @@ -2298,10 +2269,10 @@ index f541ff99b9453c2dbef4ed3a28453e7c84986897..3f4841caee0df98920dcab3a19fd9561 #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index 057e661a95cf144a01fafb058aa3f213df7c7b99..2268fc8e2a28356918a3189c5c990c1767afd758 100644 +index 6cccb09159797bcb9ccddd23a8bb7acbee1c0ac0..e8c1e4ab81431360dbfca6233345f657eb307fad 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h -@@ -215,7 +215,7 @@ +@@ -219,7 +219,7 @@ #define ENABLE_DATA_DETECTION 1 #endif @@ -2323,7 +2294,7 @@ index 3901bfb0f5479064f4e7b67c90621ff26d74b580..5b3615a871d0d7123822394c94d5ce10 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 222a7e703bc838107be922439cda1c68039ee026..175ea58c7f83d4da80e9fc466dd9c14b392dd86e 100644 +index 9fe76c8651d07f2f39f706cdd90882fcd156efa4..5cf44ca8a356d172d69915f81bb3bb3ff8d25d5c 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -416,7 +416,7 @@ @@ -2388,10 +2359,10 @@ index cd372f43691add4d7df0c9e52570eaffd2934037..55ee984ef83a06ba7cc47b0d3beee254 } diff --git a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm -index f1b96958057d2fe6044d2c7b259db6c5ceb44efe..29e51dad380285fb16bd32ef04efde2ac4ed6479 100644 +index b6229908e74ac02799d7742b14329fd33dc476a9..97324f0e5420e14ebbce05f5f88d7d55269941a6 100644 --- a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm +++ b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm -@@ -202,6 +202,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -200,6 +200,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognizer:(SFSpeechRecognizer *)speechRecognizer availabilityDidChange:(BOOL)available { @@ -2399,7 +2370,7 @@ index f1b96958057d2fe6044d2c7b259db6c5ceb44efe..29e51dad380285fb16bd32ef04efde2a ASSERT(isMainThread()); if (available || !_task) -@@ -215,6 +216,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -213,6 +214,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didHypothesizeTranscription:(SFTranscription *)transcription { @@ -2407,7 +2378,7 @@ index f1b96958057d2fe6044d2c7b259db6c5ceb44efe..29e51dad380285fb16bd32ef04efde2a ASSERT(isMainThread()); [self sendSpeechStartIfNeeded]; -@@ -223,6 +225,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -221,6 +223,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didFinishRecognition:(SFSpeechRecognitionResult *)recognitionResult { @@ -2415,7 +2386,7 @@ index f1b96958057d2fe6044d2c7b259db6c5ceb44efe..29e51dad380285fb16bd32ef04efde2a ASSERT(isMainThread()); [self callbackWithTranscriptions:recognitionResult.transcriptions isFinal:YES]; -@@ -234,6 +237,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -232,6 +235,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognitionTaskWasCancelled:(SFSpeechRecognitionTask *)task { @@ -2424,7 +2395,7 @@ index f1b96958057d2fe6044d2c7b259db6c5ceb44efe..29e51dad380285fb16bd32ef04efde2a [self sendSpeechEndIfNeeded]; diff --git a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTaskMock.mm b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTaskMock.mm -index bc5c6219b5dadc3b1cdc590d65c897b7250b1e21..37d07ef4f59ad450077d90d451cf512005f360f4 100644 +index c72759b767aa9587d737ea4029a3167f8c97f2e8..00008893eb30af407cc325baa9bc4ba73068f331 100644 --- a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTaskMock.mm +++ b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTaskMock.mm @@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN @@ -2437,7 +2408,7 @@ index bc5c6219b5dadc3b1cdc590d65c897b7250b1e21..37d07ef4f59ad450077d90d451cf5120 _hasSentSpeechStart = true; _delegateCallback(SpeechRecognitionUpdate::create(_identifier, SpeechRecognitionUpdateType::SpeechStart)); diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake -index 03e96a72e1e763255646a96303fad389577ec116..ca2be7461da997b6eb25b3ab64b54bd2cdf870d9 100644 +index f8b6c3578e152679a2e72bfd69313f6f4aa783e1..c12f77e371169058b022ca30ca13f2fbc9c54c01 100644 --- a/Source/WebCore/PlatformWPE.cmake +++ b/Source/WebCore/PlatformWPE.cmake @@ -49,6 +49,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS @@ -2449,10 +2420,10 @@ index 03e96a72e1e763255646a96303fad389577ec116..ca2be7461da997b6eb25b3ab64b54bd2 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index 5d250a80abd2f987481a55f10065d01c150c1d7a..798b8a75bb4973662eb60029a66c338951a2701f 100644 +index aa44f5f53167b9bc0f1423f27bfc24d717ebacfa..26f8b368dfe5967ca382fd2c626a1cdba43765b1 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -620,3 +620,9 @@ platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify +@@ -624,3 +624,9 @@ platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify platform/graphics/cocoa/ANGLEUtilitiesCocoa.cpp @no-unify platform/graphics/cocoa/GraphicsContextGLCocoa.mm @no-unify platform/graphics/cv/GraphicsContextGLCVCocoa.cpp @no-unify @@ -2501,10 +2472,10 @@ index c4898d6db6bf06552f602c4b7f0a7267e64e44f4..7cf2e30729671a89c373870c5691d337 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index e0e241e71250c15a57ff4ec4777acc4d2985e10c..81b206baa71f10c26e02865abcec4396a1f827ca 100644 +index aa227d598e429d855bb3deeda9b1d47280d6243b..36bb4467f129bbc7f3d21b02946136162ab3c93a 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5503,6 +5503,13 @@ +@@ -5510,6 +5510,13 @@ EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; }; EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; }; EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -2518,7 +2489,7 @@ index e0e241e71250c15a57ff4ec4777acc4d2985e10c..81b206baa71f10c26e02865abcec4396 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, ); }; }; -@@ -17780,6 +17787,14 @@ +@@ -17800,6 +17807,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 = ""; }; @@ -2533,7 +2504,7 @@ index e0e241e71250c15a57ff4ec4777acc4d2985e10c..81b206baa71f10c26e02865abcec4396 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 = ""; }; -@@ -24139,7 +24154,12 @@ +@@ -24178,7 +24193,12 @@ 1AF326770D78B9440068F0C4 /* EditorClient.h */, E36D701E27B71F04006531B7 /* EmptyAttachmentElementClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2546,7 +2517,7 @@ index e0e241e71250c15a57ff4ec4777acc4d2985e10c..81b206baa71f10c26e02865abcec4396 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -30093,6 +30113,8 @@ +@@ -30138,6 +30158,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2555,7 +2526,7 @@ index e0e241e71250c15a57ff4ec4777acc4d2985e10c..81b206baa71f10c26e02865abcec4396 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32414,6 +32436,7 @@ +@@ -32459,6 +32481,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2563,7 +2534,7 @@ index e0e241e71250c15a57ff4ec4777acc4d2985e10c..81b206baa71f10c26e02865abcec4396 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -33427,6 +33450,7 @@ +@@ -33470,6 +33493,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2571,7 +2542,7 @@ index e0e241e71250c15a57ff4ec4777acc4d2985e10c..81b206baa71f10c26e02865abcec4396 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -35559,6 +35583,7 @@ +@@ -35605,6 +35629,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2579,7 +2550,7 @@ index e0e241e71250c15a57ff4ec4777acc4d2985e10c..81b206baa71f10c26e02865abcec4396 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -36669,6 +36694,7 @@ +@@ -36716,6 +36741,7 @@ 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, @@ -2587,7 +2558,7 @@ index e0e241e71250c15a57ff4ec4777acc4d2985e10c..81b206baa71f10c26e02865abcec4396 CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, CD1F9B032700323D00617EB6 /* PlatformVideoMatrixCoefficients.h in Headers */, -@@ -38738,6 +38764,7 @@ +@@ -38809,6 +38835,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2595,7 +2566,7 @@ index e0e241e71250c15a57ff4ec4777acc4d2985e10c..81b206baa71f10c26e02865abcec4396 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -38811,6 +38838,7 @@ +@@ -38882,6 +38909,7 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2603,7 +2574,7 @@ index e0e241e71250c15a57ff4ec4777acc4d2985e10c..81b206baa71f10c26e02865abcec4396 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -38859,6 +38887,7 @@ +@@ -38930,6 +38958,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2611,7 +2582,7 @@ index e0e241e71250c15a57ff4ec4777acc4d2985e10c..81b206baa71f10c26e02865abcec4396 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -39391,6 +39420,7 @@ +@@ -39462,6 +39491,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2620,7 +2591,7 @@ index e0e241e71250c15a57ff4ec4777acc4d2985e10c..81b206baa71f10c26e02865abcec4396 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 82770a7f2d66f781b8c7363ce970aab548e89a3b..f36ae22439c760208eba7a7ea06c0df5f5f325c9 100644 +index 50509d6026dfacde3822a2dc6f76528a1dcf02ec..b0eedb83ddd98d560700a1573742aeb2e2e0af3d 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2706,7 +2677,7 @@ index 86ab889bc0ea15a547357fb64dff9f10b862dc54..ec5f9a66c29431a1bbf24c4013e45042 { auto dataTransfer = adoptRef(*new DataTransfer(StoreMode::ReadWrite, makeUnique(), Type::DragAndDropData)); diff --git a/Source/WebCore/dom/DataTransfer.h b/Source/WebCore/dom/DataTransfer.h -index b084ee416512652220e43a6d4bcccaff7c666d5a..b250f3d0161817efef7e2634a16713b0a0f1fa71 100644 +index 4b1b54ddc37426c51614e594c3a99b3862929b65..be102d9d6369e36540e342d35febf16e7aa9927b 100644 --- a/Source/WebCore/dom/DataTransfer.h +++ b/Source/WebCore/dom/DataTransfer.h @@ -90,6 +90,9 @@ public: @@ -2904,7 +2875,7 @@ index b978e2e8f8e882bbc7d0f91cad76c382508e9a3f..ba014f922a36f0fa6005b4b0bb0d3b4d #endif // USE(LIBWPE) diff --git a/Source/WebCore/html/FileInputType.cpp b/Source/WebCore/html/FileInputType.cpp -index e838e5c874bfad826e2718a71de811a461cefa0f..4eabdbdececba530547da17448e3baa2d273712c 100644 +index ea7dfacf62b782559d65e3bfb6b3d0ccdfe2521c..0e06ebd1484a4bc93f10c750487a73545a0eec18 100644 --- a/Source/WebCore/html/FileInputType.cpp +++ b/Source/WebCore/html/FileInputType.cpp @@ -36,6 +36,7 @@ @@ -2991,7 +2962,7 @@ index 4d5a3859ec6a46d07d45c80a3b5870ee2ef13d36..75eb55a024a6ae3892a4fedc535bf6a6 } // namespace WebCore diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp -index f96f40cf38395152ec33c48c7a0c4723dfa0c573..d89d2e4bd9e8b4ed3e17e6b73f25062ef2cc99b7 100644 +index 4d049dcb9b6e46543029030b9f4d51db3249464d..e28bf1ee2e164e471e378b56a5c03cba36f29cfb 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.cpp +++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp @@ -572,6 +572,13 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i @@ -3123,7 +3094,7 @@ index f96f40cf38395152ec33c48c7a0c4723dfa0c573..d89d2e4bd9e8b4ed3e17e6b73f25062e { if (is(context)) diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h -index b61f6a0dcab296bbacbc125caac03586e9c197f0..f2e12e0ac0bdeab14414d3c77ec64dd041f9a5e3 100644 +index 51badf49a6ce08975d655efa01cca9cd877e8f6b..ea4240cf72670cedfbd8b38d4d01367600085530 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.h +++ b/Source/WebCore/inspector/InspectorInstrumentation.h @@ -31,6 +31,7 @@ @@ -3343,7 +3314,7 @@ index b61f6a0dcab296bbacbc125caac03586e9c197f0..f2e12e0ac0bdeab14414d3c77ec64dd0 { return context ? instrumentingAgents(*context) : nullptr; diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp -index 7e7fd5297be20aef7be63be14c064bda556b13b0..6c0688bf138480342336c1788d31ca7731f857cb 100644 +index 0e186bcea701c6631985df40bc9a9b1e8784f0af..69a5fe6821b1fe7cfc502bbc93059df9f74b7463 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp @@ -62,12 +62,16 @@ @@ -3436,7 +3407,7 @@ index 7e7fd5297be20aef7be63be14c064bda556b13b0..6c0688bf138480342336c1788d31ca77 if (!node) return makeUnexpected(errorString); -@@ -1683,15 +1695,136 @@ Protocol::ErrorStringOr InspectorDOMAgent::setInspectedNode(Protocol::DOM: +@@ -1684,15 +1696,136 @@ Protocol::ErrorStringOr InspectorDOMAgent::setInspectedNode(Protocol::DOM: return { }; } @@ -3577,7 +3548,7 @@ index 7e7fd5297be20aef7be63be14c064bda556b13b0..6c0688bf138480342336c1788d31ca77 if (!object) return makeUnexpected("Missing injected script for given nodeId"_s); -@@ -2946,7 +3079,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::pushNodeByPath +@@ -2947,7 +3080,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::pushNodeByPath return makeUnexpected("Missing node for given path"_s); } @@ -3586,7 +3557,7 @@ index 7e7fd5297be20aef7be63be14c064bda556b13b0..6c0688bf138480342336c1788d31ca77 { Document* document = &node->document(); if (auto* templateHost = document->templateDocumentHost()) -@@ -2955,12 +3088,18 @@ RefPtr InspectorDOMAgent::resolveNode(Node* nod +@@ -2956,12 +3089,18 @@ RefPtr InspectorDOMAgent::resolveNode(Node* nod if (!frame) return nullptr; @@ -3608,7 +3579,7 @@ index 7e7fd5297be20aef7be63be14c064bda556b13b0..6c0688bf138480342336c1788d31ca77 } Node* InspectorDOMAgent::scriptValueAsNode(JSC::JSValue value) -@@ -2983,4 +3122,42 @@ Protocol::ErrorStringOr InspectorDOMAgent::setAllowEditingUserAgentShadowT +@@ -2984,4 +3123,42 @@ Protocol::ErrorStringOr InspectorDOMAgent::setAllowEditingUserAgentShadowT return { }; } @@ -3652,7 +3623,7 @@ index 7e7fd5297be20aef7be63be14c064bda556b13b0..6c0688bf138480342336c1788d31ca77 + } // namespace WebCore diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.h b/Source/WebCore/inspector/agents/InspectorDOMAgent.h -index 4b9c75185845d54e51236125afe212cde82468ba..6d0877ae8d0ae9bf7861cce4e78464b120e40e7a 100644 +index 2d073147ff54937b4ea0ce3f8ea3af61ad9761c4..e1f6eaf09510e6b1876fd1173d62b387675e147e 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.h +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.h @@ -57,6 +57,7 @@ namespace WebCore { @@ -3725,7 +3696,7 @@ index 4b9c75185845d54e51236125afe212cde82468ba..6d0877ae8d0ae9bf7861cce4e78464b1 void discardBindings(); diff --git a/Source/WebCore/inspector/agents/InspectorDOMStorageAgent.h b/Source/WebCore/inspector/agents/InspectorDOMStorageAgent.h -index 3386cb879f1178c1b9635775c9a0e864f5b94c52..d2350182f5f061855e8ca172779ad60ee73b39fb 100644 +index e0cd2af16589ce137c79fa896a55ee461b77a318..4381b9ff1d1d62dd9b0ffddde303e7eaef0ee217 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMStorageAgent.h +++ b/Source/WebCore/inspector/agents/InspectorDOMStorageAgent.h @@ -40,6 +40,7 @@ class DOMStorageFrontendDispatcher; @@ -3889,7 +3860,7 @@ index 72f423ff61277eef4bd356328c46d3bd9131ff65..ede5b6605b1e661b9d5d73e02fe6ae4c // InspectorInstrumentation void willRecalculateStyle(); diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp -index a4ffd1361cdde5ab7d973cd00d19a910ae9ed29f..80d24823328eb8377327ce5c828a3556a3c60087 100644 +index cb12cc694e2fabbfcc57b9843cc50726099e42ab..8035fa57c8398ea8a60aacaf111d99a4591fd619 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp @@ -32,20 +32,28 @@ @@ -4243,9 +4214,9 @@ index a4ffd1361cdde5ab7d973cd00d19a910ae9ed29f..80d24823328eb8377327ce5c828a3556 + if (!m_worldNameToBootstrapScript.contains(worldName)) return; -- frame.script().evaluateIgnoringException(ScriptSourceCode(m_bootstrapScript, URL { URL(), "web-inspector://bootstrap.js"_s })); +- frame.script().evaluateIgnoringException(ScriptSourceCode(m_bootstrapScript, URL { "web-inspector://bootstrap.js"_str })); + String bootstrapScript = m_worldNameToBootstrapScript.get(worldName); -+ frame.script().evaluateInWorldIgnoringException(ScriptSourceCode(bootstrapScript, URL { URL(), "web-inspector://bootstrap.js"_s }), world); ++ frame.script().evaluateInWorldIgnoringException(ScriptSourceCode(bootstrapScript, URL { "web-inspector://bootstrap.js"_str }), world); } void InspectorPageAgent::didPaint(RenderObject& renderer, const LayoutRect& rect) @@ -5391,10 +5362,10 @@ index 982691dd2dfe2f65201370a12302b5086703c126..4af72beb3b1405ffac78e89e7fbb2b14 protected: static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No); diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp -index ec50de90dded074604dd187ae9de61126a6ad124..95e7a6ab741361be7c27806a147624442cc084a5 100644 +index 20ddefde4281beac6be973f18534def8a559d1b9..d4ebc9d1b996de907a33a75700971214cb70da48 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp -@@ -1471,8 +1471,6 @@ void DocumentLoader::detachFromFrame() +@@ -1479,8 +1479,6 @@ void DocumentLoader::detachFromFrame() if (!m_frame) return; @@ -5404,7 +5375,7 @@ index ec50de90dded074604dd187ae9de61126a6ad124..95e7a6ab741361be7c27806a14762444 } diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index c2bea6f6a69b836472c0aff7a0d7070396ba6c2b..80af07d2f4327a400c85b65b640bcfa2ab2f430a 100644 +index 0b079f88ff3326ed24d31c8f0c00a654e290494c..d6308c79c13e08503ba0e18dc8ce5bdc1b89fced 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h @@ -179,9 +179,13 @@ public: @@ -5422,10 +5393,10 @@ index c2bea6f6a69b836472c0aff7a0d7070396ba6c2b..80af07d2f4327a400c85b65b640bcfa2 DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index fa27a3004fe662d5a0084a822acfa19002854961..368f3378c19adfafc8031920bd9d111a43ec222a 100644 +index b2e7f68b72b7cb8c795d0efbfc1b7a3145fc7ab8..c8575241b5bbb1372cd1118126facabb810bb6bd 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp -@@ -1154,6 +1154,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr stat +@@ -1157,6 +1157,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr stat } m_client->dispatchDidNavigateWithinPage(); @@ -5433,7 +5404,7 @@ index fa27a3004fe662d5a0084a822acfa19002854961..368f3378c19adfafc8031920bd9d111a m_frame.document()->statePopped(stateObject ? stateObject.releaseNonNull() : SerializedScriptValue::nullValue()); m_client->dispatchDidPopStateWithinPage(); -@@ -1590,6 +1591,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t +@@ -1593,6 +1594,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t const String& httpMethod = loader->request().httpMethod(); if (shouldPerformFragmentNavigation(isFormSubmission, httpMethod, policyChecker().loadType(), newURL)) { @@ -5442,7 +5413,7 @@ index fa27a3004fe662d5a0084a822acfa19002854961..368f3378c19adfafc8031920bd9d111a RefPtr oldDocumentLoader = m_documentLoader; NavigationAction action { *m_frame.document(), loader->request(), InitiatedByMainFrame::Unknown, policyChecker().loadType(), isFormSubmission }; -@@ -1619,7 +1622,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t +@@ -1622,7 +1625,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t } RELEASE_ASSERT(!isBackForwardLoadType(policyChecker().loadType()) || history().provisionalItem()); @@ -5452,7 +5423,7 @@ index fa27a3004fe662d5a0084a822acfa19002854961..368f3378c19adfafc8031920bd9d111a continueLoadAfterNavigationPolicy(request, formState.get(), navigationPolicyDecision, allowNavigationToInvalidURL); completionHandler(); }, PolicyDecisionMode::Asynchronous); -@@ -2788,12 +2793,17 @@ String FrameLoader::userAgent(const URL& url) const +@@ -2790,12 +2795,17 @@ String FrameLoader::userAgent(const URL& url) const String FrameLoader::navigatorPlatform() const { @@ -5472,7 +5443,7 @@ index fa27a3004fe662d5a0084a822acfa19002854961..368f3378c19adfafc8031920bd9d111a } void FrameLoader::dispatchOnloadEvents() -@@ -3199,6 +3209,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) +@@ -3201,6 +3211,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) checkCompleted(); if (m_frame.page()) checkLoadComplete(); @@ -5481,7 +5452,7 @@ index fa27a3004fe662d5a0084a822acfa19002854961..368f3378c19adfafc8031920bd9d111a } void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue) -@@ -3966,9 +3978,6 @@ String FrameLoader::referrer() const +@@ -3968,9 +3980,6 @@ String FrameLoader::referrer() const void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() { @@ -5491,7 +5462,7 @@ index fa27a3004fe662d5a0084a822acfa19002854961..368f3378c19adfafc8031920bd9d111a Vector> worlds; ScriptController::getAllWorlds(worlds); for (auto& world : worlds) -@@ -3977,13 +3986,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() +@@ -3979,13 +3988,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world) { @@ -5524,7 +5495,7 @@ index 29d2e3f46140aaa51160e6a28562f370e371eb21..676ddc9369050c19454fbf5faffac2b2 virtual bool shouldPerformSecurityChecks() const { return false; } virtual bool havePerformedSecurityChecks(const ResourceResponse&) const { return false; } diff --git a/Source/WebCore/loader/PolicyChecker.cpp b/Source/WebCore/loader/PolicyChecker.cpp -index b24f1d47d4fb0515b3d30cf4f8628970f7e40fd1..64e4bb3281f5d8ae464448e1af410111ee5e6710 100644 +index 42a09fe461a14e30421fbbfb2842524d8aa5f0e4..5ae129fda0c296b0bf106306de98f39bf96b6fc2 100644 --- a/Source/WebCore/loader/PolicyChecker.cpp +++ b/Source/WebCore/loader/PolicyChecker.cpp @@ -46,6 +46,7 @@ @@ -5558,10 +5529,10 @@ index a2c6d72b5ba0f04a49ca6dc710ef6fa5e0125c33..759b0d34b7db839027063a1b6ce8fb0f void ProgressTracker::incrementProgress(ResourceLoaderIdentifier identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index 4419ed5553051938b75800bdeebd4f6b4473078c..b4db731a48c091604b1b1e938232a387b677d7c6 100644 +index c1f81dddc87add596a0a9a3b46ec8f2f2bd98fa5..1ae543793c1a5d063e064d134448f55fdcc6fb96 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h -@@ -316,7 +316,7 @@ public: +@@ -318,7 +318,7 @@ public: #endif #if ENABLE(ORIENTATION_EVENTS) @@ -5571,7 +5542,7 @@ index 4419ed5553051938b75800bdeebd4f6b4473078c..b4db731a48c091604b1b1e938232a387 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 31557da5da54268eb27ef0dddff56f7430e0233b..ba6fda84aa4754afc3b3560ea715029edfc39166 100644 +index 7d2e5689e4f932dbd13b457e31957d15806dbd0e..15e520c3fb2c0980a5248f8864050239c1ed731a 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -141,6 +141,7 @@ @@ -5764,7 +5735,7 @@ index de408bfdd161f86de51d9b528a9d27452a76b82a..d9b2374b0f7abf2789729fcc805c6505 bool m_mouseDownMayStartDrag { false }; bool m_dragMayStartSelectionInstead { false }; diff --git a/Source/WebCore/page/EventSource.cpp b/Source/WebCore/page/EventSource.cpp -index 8cc8df1ac26cd347924d76bdbfec92af910e1369..5df20918a9b9e0b89f8b4747f2e615c144358377 100644 +index 10cdacd0e6c907df43cc8ce520dad17eea9a8087..e6b54ba8f5177046cf07bc0e2650a2bcc2b7c8a5 100644 --- a/Source/WebCore/page/EventSource.cpp +++ b/Source/WebCore/page/EventSource.cpp @@ -36,6 +36,7 @@ @@ -5784,7 +5755,7 @@ index 8cc8df1ac26cd347924d76bdbfec92af910e1369..5df20918a9b9e0b89f8b4747f2e615c1 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 e6b789d2809ec8a167d90bf34e9700555fc8d8cd..d28cef9e655926c145d3552d7ac6f2583d725016 100644 +index 9faf8adf69b5cc55c2b3afa7aa61ce2bdc0a047f..d28cd6b5b6ad4f1be78a51e218f2627ba57b92bc 100644 --- a/Source/WebCore/page/Frame.cpp +++ b/Source/WebCore/page/Frame.cpp @@ -39,6 +39,7 @@ @@ -6294,7 +6265,7 @@ index 1b77026f51092001cda86e32480890395b145b2e..6026bc23508016454f331b06c9f071a8 struct SnapshotOptions { diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp -index f1da2c85a008476ff08832f3a0b8e7c405bb9764..d27abce0760ec3dea146cbcaef3d493906e5e53b 100644 +index d78a7c4fed8f3d5222cc9effe412f43e48754428..56d76693da9925ec476a3a12ae177223b9d2a774 100644 --- a/Source/WebCore/page/History.cpp +++ b/Source/WebCore/page/History.cpp @@ -33,6 +33,7 @@ @@ -6504,7 +6475,7 @@ index 45435f77e4bc790aa60bdebc27ea69b9ba889c30..65ae0b7b220d7736a42981ff18798a2e #endif bool hasAnyElement() const { diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.cpp b/Source/WebCore/page/RuntimeEnabledFeatures.cpp -index 04fff21a26adbc73d8b74dbf55acc8e9824f35da..cd7346fe3b4701724431bc1617e13d2e6f775151 100644 +index 897d2a009752a4030659a88e8b16382e00ac2316..08bb3344c59a0462668762815473659ff005d363 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.cpp +++ b/Source/WebCore/page/RuntimeEnabledFeatures.cpp @@ -61,7 +61,11 @@ RuntimeEnabledFeatures& RuntimeEnabledFeatures::sharedFeatures() @@ -6521,10 +6492,10 @@ index 04fff21a26adbc73d8b74dbf55acc8e9824f35da..cd7346fe3b4701724431bc1617e13d2e #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index 3fe51fd1e4360b0fd17b6d86da410faa131359b6..8c464be4352a3aa901af54d5cad1e7ece4a5a2d4 100644 +index 68b7a23d83a3c4effc41e811bd7c3518b4b22d4b..a15562111a57f4b95721fb4951d51e21e8298928 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h -@@ -188,6 +188,7 @@ public: +@@ -181,6 +181,7 @@ public: void setMouseEventsSimulationEnabled(bool isEnabled) { m_mouseEventsSimulationEnabled = isEnabled; } bool touchEventsEnabled() const; void setTouchEventsEnabled(bool isEnabled) { m_touchEventsEnabled = isEnabled; } @@ -6573,7 +6544,7 @@ index 7ac11c8289347e3a2f3e7316cf9e32932b9544ed..764b2d4fe36ac2e5588bd22595424ac1 } diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -index 52f620122b85c7503e7da6a6835bf375614967f4..9f2182a286d14d16615dbeb97b2755bf0e7c3380 100644 +index 16274e94af10c8d38540e9c8351921c70b8f8d7f..47cd540248b84b1f4890fa6999e4614cfc1f42d4 100644 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp @@ -300,6 +300,8 @@ bool ContentSecurityPolicy::protocolMatchesSelf(const URL& url) const @@ -8217,7 +8188,7 @@ index aae6c99dd052985a43718846b68536454050c234..7e2e5d0c1de90f1454f7fdb71a40ab71 bool PlatformKeyboardEvent::currentCapsLockState() diff --git a/Source/WebCore/platform/win/PasteboardWin.cpp b/Source/WebCore/platform/win/PasteboardWin.cpp -index 85f96d85d2b372cfc2171a83411d528692073cd4..3350eb913cfb24273030bd8cf86a124c6851db01 100644 +index 0b25ff6c38c8634f37eea2afd024a8d42a4f42c5..d5b66f6d55ff9efe60c6466a95ea44141b9a5b96 100644 --- a/Source/WebCore/platform/win/PasteboardWin.cpp +++ b/Source/WebCore/platform/win/PasteboardWin.cpp @@ -1130,7 +1130,21 @@ void Pasteboard::writeCustomData(const Vector& data) @@ -8736,7 +8707,7 @@ index 2e90534ffd8da83b7dc54d46fa7def16319bbb43..2493c00d58957751c65c37eb409fa8d6 int innerLineHeight() const override; #endif diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -index 40a7e2aea4a1bcf9fdf7eb32b33266b0bd6a551f..c7ce89d3063e1115eefae48c5df41c2cdb695038 100644 +index 0190d846dbd95e0737aee5c3258af35a979ce736..2644d62aac66e5d4f2d7149621b625503c84f83a 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -83,6 +83,11 @@ @@ -8751,7 +8722,7 @@ index 40a7e2aea4a1bcf9fdf7eb32b33266b0bd6a551f..c7ce89d3063e1115eefae48c5df41c2c #if ENABLE(APPLE_PAY_REMOTE_UI) #include "WebPaymentCoordinatorProxyMessages.h" #endif -@@ -488,6 +493,10 @@ void NetworkConnectionToWebProcess::createSocketStream(URL&& url, String cachePa +@@ -484,6 +489,10 @@ void NetworkConnectionToWebProcess::createSocketStream(URL&& url, String cachePa if (auto* session = networkSession()) acceptInsecureCertificates = session->shouldAcceptInsecureCertificatesForWebSockets(); #endif @@ -8762,7 +8733,7 @@ index 40a7e2aea4a1bcf9fdf7eb32b33266b0bd6a551f..c7ce89d3063e1115eefae48c5df41c2c m_networkSocketStreams.add(identifier, NetworkSocketStream::create(m_networkProcess.get(), WTFMove(url), m_sessionID, cachePartition, identifier, m_connection, WTFMove(token), acceptInsecureCertificates)); } -@@ -1036,6 +1045,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) +@@ -1028,6 +1037,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) #endif } @@ -8778,10 +8749,10 @@ index 40a7e2aea4a1bcf9fdf7eb32b33266b0bd6a551f..c7ce89d3063e1115eefae48c5df41c2c void NetworkConnectionToWebProcess::removeStorageAccessForFrame(FrameIdentifier frameID, PageIdentifier pageID) { diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -index d0aa4ef74520a2ca0b551b469e86ea7668b678e7..c42b9217d166efc789d194fe5ec848398767bb7c 100644 +index 60d56778a64f374f0ae94ad6b09599845df0c37b..786f14b9ba96f36f24cce9884fc7fcff7895734d 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -@@ -305,6 +305,8 @@ private: +@@ -307,6 +307,8 @@ private: void clearPageSpecificData(WebCore::PageIdentifier); @@ -8791,7 +8762,7 @@ index d0aa4ef74520a2ca0b551b469e86ea7668b678e7..c42b9217d166efc789d194fe5ec84839 void removeStorageAccessForFrame(WebCore::FrameIdentifier, WebCore::PageIdentifier); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in -index b97ca3479b4d9d5579a7e7e55a691a60dd8866bc..9cf3a813e7822b1c9be379fac7e5a4d868a7a936 100644 +index afe6bb19f1178cceff5f96a1d9a92072fa41e761..7e320f485590db99f873d588003bfc503102fca4 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in @@ -66,6 +66,8 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver { @@ -8804,7 +8775,7 @@ index b97ca3479b4d9d5579a7e7e55a691a60dd8866bc..9cf3a813e7822b1c9be379fac7e5a4d8 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 f4f8a4c4f4af96af68942c5c6c9892ff7e1993f1..e1df7fb44889f1282829c4a49743e4208688afc5 100644 +index f07b046e97aa5fb93cb667b5f74b37589868e7f4..0713150aa3c9b19bb9dc2efd9533d8831f4ec599 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -8815,7 +8786,7 @@ index f4f8a4c4f4af96af68942c5c6c9892ff7e1993f1..e1df7fb44889f1282829c4a49743e420 #include "ArgumentCoders.h" #include "Attachment.h" #include "AuthenticationManager.h" -@@ -532,6 +531,41 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) +@@ -514,6 +513,41 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) m_sessionsControlledByAutomation.remove(sessionID); } @@ -8858,10 +8829,10 @@ index f4f8a4c4f4af96af68942c5c6c9892ff7e1993f1..e1df7fb44889f1282829c4a49743e420 void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index 0f8533ed13dd26277a6dd52ab6dabe20c3e08805..460cad5f9a89c82eb3921dbd3e87000bb79da404 100644 +index 00be71dd339c0b8954a33891763319e25cb7da6b..671ce54c6c64644d94ac01127b04505662ee8683 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h -@@ -36,6 +36,7 @@ +@@ -37,6 +37,7 @@ #include "QuotaIncreaseRequestIdentifier.h" #include "RTCDataChannelRemoteManagerProxy.h" #include "SandboxExtension.h" @@ -8869,7 +8840,7 @@ index 0f8533ed13dd26277a6dd52ab6dabe20c3e08805..460cad5f9a89c82eb3921dbd3e87000b #include "WebPageProxyIdentifier.h" #include "WebResourceLoadStatisticsStore.h" #include "WebsiteData.h" -@@ -80,6 +81,7 @@ class SessionID; +@@ -81,6 +82,7 @@ class SessionID; namespace WebCore { class CertificateInfo; @@ -8877,7 +8848,7 @@ index 0f8533ed13dd26277a6dd52ab6dabe20c3e08805..460cad5f9a89c82eb3921dbd3e87000b class CurlProxySettings; class ProtectionSpace; class NetworkStorageSession; -@@ -202,6 +204,11 @@ public: +@@ -200,6 +202,11 @@ public: void addWebsiteDataStore(WebsiteDataStoreParameters&&); @@ -8890,10 +8861,10 @@ index 0f8533ed13dd26277a6dd52ab6dabe20c3e08805..460cad5f9a89c82eb3921dbd3e87000b 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 631e2b6073c019213068c2096b827b279dbc7de0..242797845981dab94c3425e910d84cedacd7466c 100644 +index 7499257b34140be1b28e7db07201bc0837663d8c..548dca718cca7613d9e0e110bbda9fbcef08a609 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in -@@ -78,6 +78,11 @@ messages -> NetworkProcess LegacyReceiver { +@@ -79,6 +79,11 @@ messages -> NetworkProcess LegacyReceiver { PreconnectTo(PAL::SessionID sessionID, WebKit::WebPageProxyIdentifier webPageProxyID, WebCore::PageIdentifier webPageID, URL url, String userAgent, enum:uint8_t WebCore::StoredCredentialsPolicy storedCredentialsPolicy, enum:bool std::optional isNavigatingToAppBoundDomain, enum:bool WebKit::LastNavigationWasAppInitiated lastNavigationWasAppInitiated); @@ -8906,10 +8877,10 @@ index 631e2b6073c019213068c2096b827b279dbc7de0..242797845981dab94c3425e910d84ced 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 85c7cbd69034d9cba7f445da9de475a1d7b35118..f5a50c9773902bd9e376ebd07df5889699b7c63e 100644 +index 9b439a8194e55b7efba08fd9a2887e06b3f0a8ce..87abf347f101acbc0726702e25a4960782c30658 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h -@@ -193,6 +193,9 @@ public: +@@ -194,6 +194,9 @@ public: void lowMemoryHandler(WTF::Critical); @@ -8919,7 +8890,7 @@ index 85c7cbd69034d9cba7f445da9de475a1d7b35118..f5a50c9773902bd9e376ebd07df58896 #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -277,6 +280,7 @@ protected: +@@ -275,6 +278,7 @@ protected: bool m_privateClickMeasurementDebugModeEnabled { false }; std::optional m_ephemeralMeasurement; bool m_isRunningEphemeralMeasurementTest { false }; @@ -9009,10 +8980,10 @@ index f57a72b6bdc3382469d69adb1b1201c7a9f07a84..c501211b094312ca44f0bf92de5d6ebc void clear(); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 9eaa83feae195de9c06c5e418ddc1b83080f864e..25aadcc715b351a366700bb91d5d3bab142d6c55 100644 +index f121d5ef899c06b712b3f2855a930fda62379972..aa910e95a1a7126435cfe2d96d63a46840ffc14e 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -718,7 +718,7 @@ void NetworkSessionCocoa::setClientAuditToken(const WebCore::AuthenticationChall +@@ -719,7 +719,7 @@ void NetworkSessionCocoa::setClientAuditToken(const WebCore::AuthenticationChall if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { sessionCocoa->setClientAuditToken(challenge); @@ -9021,7 +8992,7 @@ index 9eaa83feae195de9c06c5e418ddc1b83080f864e..25aadcc715b351a366700bb91d5d3bab return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); NSURLSessionTaskTransactionMetrics *metrics = task._incompleteTaskMetrics.transactionMetrics.lastObject; -@@ -956,6 +956,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END +@@ -957,6 +957,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics())); @@ -9267,7 +9238,7 @@ index 66e4895549a3aec8d1df994d25fdcda4ed2d7e66..b69f2b4fc68f483b4272704be56ef958 } diff --git a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp -index 7f1469d820cf1d1f12b50cecc577bd5414643a65..dd90505286a9e126b0c8ceacc2ed8c0af8059d01 100644 +index bc06eb37854c1ec72b30568e95dba6ef60c132a4..7b8fd54b740c828be204d4fedba0286fd5be6ace 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp @@ -109,6 +109,11 @@ static gboolean webSocketAcceptCertificateCallback(GTlsConnection* connection, G @@ -9295,7 +9266,7 @@ index 7f1469d820cf1d1f12b50cecc577bd5414643a65..dd90505286a9e126b0c8ceacc2ed8c0a + g_signal_connect(connection, "accept-certificate", G_CALLBACK(webSocketAcceptCertificateCallbackIgnoreTLSErrors), soupMessage); +} + - std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPageProxyIdentifier, NetworkSocketChannel& channel, const ResourceRequest& request, const String& protocol, const ClientOrigin&) + std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPageProxyIdentifier, NetworkSocketChannel& channel, const ResourceRequest& request, const String& protocol, const ClientOrigin&, bool) { GRefPtr soupMessage = request.createSoupMessage(blobRegistry()); @@ -127,14 +141,21 @@ std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPagePr @@ -9328,7 +9299,7 @@ index 7f1469d820cf1d1f12b50cecc577bd5414643a65..dd90505286a9e126b0c8ceacc2ed8c0a } return makeUnique(channel, request, soupSession(), soupMessage.get(), protocol); diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index 826e2db522c2a7b3b895e8735aeb47b2c38e299f..da3f72fb1ff59978fae76d8578677d58fd3246c8 100644 +index 48d1820ddaf0a725ef8c92cef4a60ab8f0ef5719..d8cbf2188cd65822c7eeb5cf30fc586baa167a4a 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake @@ -465,6 +465,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES @@ -9403,7 +9374,7 @@ index 529644655e0120d862ee8e886e67ac9f12692037..dc3cf7b3bafe259d44b04a16b6903b3b Cairo::Cairo Freetype::Freetype diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake -index 24bd842672aa8101d1c1eb6db4335f1e5f0b840d..52e9e574d103d5e831d022affe24601bfed27203 100644 +index ba41cc4b8d3c48e96e80a2fd16abcb8332830baa..8e7da07e95ba71e14db897a0fb73e0c1e78edf40 100644 --- a/Source/WebKit/PlatformWin.cmake +++ b/Source/WebKit/PlatformWin.cmake @@ -76,8 +76,12 @@ list(APPEND WebKit_SOURCES @@ -9500,7 +9471,7 @@ index 24bd842672aa8101d1c1eb6db4335f1e5f0b840d..52e9e574d103d5e831d022affe24601b set(WebKitCommonIncludeDirectories ${WebKit_INCLUDE_DIRECTORIES}) set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) -@@ -201,6 +272,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) +@@ -200,6 +271,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) OpenSSL::SSL mfuuid.lib strmiids.lib @@ -9508,19 +9479,6 @@ index 24bd842672aa8101d1c1eb6db4335f1e5f0b840d..52e9e574d103d5e831d022affe24601b ) endif () -diff --git a/Source/WebKit/Scripts/generate-unified-sources.sh b/Source/WebKit/Scripts/generate-unified-sources.sh -index defd969315770cf57bcb6aee427af4cb6ccbbbf0..4e305bbdbb9196444461d468efb666e4a98d5546 100755 ---- a/Source/WebKit/Scripts/generate-unified-sources.sh -+++ b/Source/WebKit/Scripts/generate-unified-sources.sh -@@ -14,7 +14,7 @@ if [ -z "${BUILD_SCRIPTS_DIR}" ]; then - fi - fi - --UnifiedSourceCppFileCount=120 -+UnifiedSourceCppFileCount=122 - UnifiedSourceMmFileCount=80 - - if [ $# -eq 0 ]; then diff --git a/Source/WebKit/Shared/API/c/wpe/WebKit.h b/Source/WebKit/Shared/API/c/wpe/WebKit.h index caf67e1dece5b727e43eba780e70814f8fdb0f63..740150d2589d6e16a516daa3bf6ef899ac538c99 100644 --- a/Source/WebKit/Shared/API/c/wpe/WebKit.h @@ -9533,6 +9491,19 @@ index caf67e1dece5b727e43eba780e70814f8fdb0f63..740150d2589d6e16a516daa3bf6ef899 #include #include #include +diff --git a/Source/WebKit/Shared/ModelIdentifier.h b/Source/WebKit/Shared/ModelIdentifier.h +index 4413ad0aa4238530983eec444617aebeafd464b8..36f72da956dfbdabbedeaef71d83fcdce5995b01 100644 +--- a/Source/WebKit/Shared/ModelIdentifier.h ++++ b/Source/WebKit/Shared/ModelIdentifier.h +@@ -25,6 +25,8 @@ + + #pragma once + ++#import ++ + namespace WebKit { + + #if ENABLE(ARKIT_INLINE_PREVIEW) diff --git a/Source/WebKit/Shared/NativeWebKeyboardEvent.h b/Source/WebKit/Shared/NativeWebKeyboardEvent.h index ee8cac1c980039c4a36de5501ab7f135e710d06b..deae2be9e720ff76186ecea89920dfc39c4f186a 100644 --- a/Source/WebKit/Shared/NativeWebKeyboardEvent.h @@ -9612,10 +9583,10 @@ 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 9987b1a84768f273863dc0b1a5539153c4981783..4587d56e8e194cde51ad2a8d31d573e424a0ae46 100644 +index e60ebe2affa2fce1a1cce374f7bf888f40ebdb78..6f94d940c98137e1d14c0b5d5faf2e4dfcd0989d 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -@@ -117,6 +117,10 @@ +@@ -121,6 +121,10 @@ #include #endif @@ -9626,7 +9597,7 @@ index 9987b1a84768f273863dc0b1a5539153c4981783..4587d56e8e194cde51ad2a8d31d573e4 // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1402,6 +1406,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1406,6 +1410,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -9636,7 +9607,7 @@ index 9987b1a84768f273863dc0b1a5539153c4981783..4587d56e8e194cde51ad2a8d31d573e4 } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1430,6 +1437,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1434,6 +1441,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -9649,7 +9620,7 @@ index 9987b1a84768f273863dc0b1a5539153c4981783..4587d56e8e194cde51ad2a8d31d573e4 return true; } -@@ -1443,6 +1456,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1447,6 +1460,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -9661,7 +9632,7 @@ index 9987b1a84768f273863dc0b1a5539153c4981783..4587d56e8e194cde51ad2a8d31d573e4 #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1466,9 +1484,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1470,9 +1488,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -9679,7 +9650,7 @@ index 9987b1a84768f273863dc0b1a5539153c4981783..4587d56e8e194cde51ad2a8d31d573e4 if (!decoder.decode(pasteboardName)) return false; -@@ -1484,8 +1509,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1488,8 +1513,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -9832,10 +9803,10 @@ index cf2adc382b3f59890c43a54b6c28bab2c4a965c6..998e96ec8c997bd1b51434c77e73e942 const WebCore::IntPoint& globalPosition() const { return m_globalPosition; } float deltaX() const { return m_deltaX; } diff --git a/Source/WebKit/Shared/WebPageCreationParameters.cpp b/Source/WebKit/Shared/WebPageCreationParameters.cpp -index 3e62edd10a1f1f20bf9a77c5cb5afc14f87680a2..e41d25ac6f9eb7b67a49363bada74b9a27f64e1a 100644 +index ec439d06714e6de5b94e21fb9ce8ee239c9622fa..7bfaa40d9b05973ffd820f545db5e6f425da77c8 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.cpp +++ b/Source/WebKit/Shared/WebPageCreationParameters.cpp -@@ -157,6 +157,8 @@ void WebPageCreationParameters::encode(IPC::Encoder& encoder) const +@@ -154,6 +154,8 @@ void WebPageCreationParameters::encode(IPC::Encoder& encoder) const encoder << crossOriginAccessControlCheckEnabled; encoder << processDisplayName; @@ -9844,7 +9815,7 @@ index 3e62edd10a1f1f20bf9a77c5cb5afc14f87680a2..e41d25ac6f9eb7b67a49363bada74b9a encoder << shouldCaptureAudioInUIProcess; encoder << shouldCaptureAudioInGPUProcess; encoder << shouldCaptureVideoInUIProcess; -@@ -540,7 +542,10 @@ std::optional WebPageCreationParameters::decode(IPC:: +@@ -524,7 +526,10 @@ std::optional WebPageCreationParameters::decode(IPC:: if (!processDisplayName) return std::nullopt; parameters.processDisplayName = WTFMove(*processDisplayName); @@ -9857,10 +9828,10 @@ index 3e62edd10a1f1f20bf9a77c5cb5afc14f87680a2..e41d25ac6f9eb7b67a49363bada74b9a return std::nullopt; diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h -index e78a3141450f96a739a72d787b9a68fa179a65b2..395515b256593af0121fc36241a2b28005fdfd77 100644 +index cb741693db30a7502b489c8397cef6c739feda91..276471905c38eba40c841240789dbf77b1792174 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.h +++ b/Source/WebKit/Shared/WebPageCreationParameters.h -@@ -252,6 +252,8 @@ struct WebPageCreationParameters { +@@ -251,6 +251,8 @@ struct WebPageCreationParameters { bool httpsUpgradeEnabled { true }; @@ -9870,7 +9841,7 @@ index e78a3141450f96a739a72d787b9a68fa179a65b2..395515b256593af0121fc36241a2b280 bool allowsDeprecatedSynchronousXMLHttpRequestDuringUnload { false }; #endif diff --git a/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp b/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp -index 5b817212dbd05d73172a72ca6cb5df979b7663c1..f6bd6c9e1f8ea5b5214ef05b422cd804d761ecb0 100644 +index d4e9bef48c5ddd2795b2c00f77dbfe2ba1b1dbad..7d08a48ca354962598dbca62bc52e8fa672add04 100644 --- a/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp +++ b/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp @@ -161,7 +161,9 @@ bool defaultOfflineWebApplicationCacheEnabled() @@ -9884,15 +9855,18 @@ index 5b817212dbd05d73172a72ca6cb5df979b7663c1..f6bd6c9e1f8ea5b5214ef05b422cd804 bool defaultValue = true; #else bool defaultValue = false; -@@ -189,7 +191,7 @@ bool defaultUseGPUProcessForMediaEnabled() +@@ -188,9 +190,10 @@ bool defaultUseGPUProcessForMediaEnabled() + bool defaultUseGPUProcessForWebGLEnabled() { - #if PLATFORM(WIN) -- bool defaultValue = true; -+ bool defaultValue = false; // Playwright: force disable on Windows +-#if (ENABLE(GPU_PROCESS_BY_DEFAULT) && PLATFORM(IOS_FAMILY)) || PLATFORM(WIN) ++#if (ENABLE(GPU_PROCESS_BY_DEFAULT) && PLATFORM(IOS_FAMILY)) + bool defaultValue = true; #else ++ // Playwright: force disable on Windows and other platforms. bool defaultValue = false; #endif + return isFeatureFlagEnabled("gpu_process_webgl", defaultValue); diff --git a/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp b/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp index c204637774ee803eac42a34cde79aa556f143b82..345f5b08179e3dd239725bed06e48b46bc718336 100644 --- a/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp @@ -10197,10 +10171,10 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index f781336e5ec82320fa055ffa73f9101dc88d6481..efa35477ab6b2990437c126a43f572778202299e 100644 +index 5f6d06c3177e01e4487453793d633a241992f937..d199d30cd9948532aded63e9ccf6d87a73369068 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -404,11 +404,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -405,11 +405,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10215,7 +10189,7 @@ index f781336e5ec82320fa055ffa73f9101dc88d6481..efa35477ab6b2990437c126a43f57277 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -417,6 +420,7 @@ UIProcess/PageLoadState.cpp +@@ -418,6 +421,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10223,7 +10197,7 @@ index f781336e5ec82320fa055ffa73f9101dc88d6481..efa35477ab6b2990437c126a43f57277 UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -458,6 +462,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -460,6 +464,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10232,7 +10206,7 @@ index f781336e5ec82320fa055ffa73f9101dc88d6481..efa35477ab6b2990437c126a43f57277 UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -580,7 +586,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -583,7 +589,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10245,7 +10219,7 @@ index f781336e5ec82320fa055ffa73f9101dc88d6481..efa35477ab6b2990437c126a43f57277 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 39fea91ce561758160ad9218989453e583ed6461..e2d87dc8d11e00e983006ac60309231e64ceac01 100644 +index 014384f8e58c5cedd0814cd3f42eb96423d63f34..136d62ae60f45172a0d21ffd7d469f770f4e0763 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt @@ -276,6 +276,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm @@ -10256,7 +10230,7 @@ index 39fea91ce561758160ad9218989453e583ed6461..e2d87dc8d11e00e983006ac60309231e UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -452,6 +453,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -454,6 +455,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -10265,10 +10239,10 @@ index 39fea91ce561758160ad9218989453e583ed6461..e2d87dc8d11e00e983006ac60309231e UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm UIProcess/Inspector/mac/WKInspectorViewController.mm diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt -index 7e7408e5afc02c82ee694ce5374cce6c9c8fc388..d23104efb3909171b569ceda32a8ad6460bc3bff 100644 +index be92a45dd6b805355d2a32d59de702fdbf0a1313..ad525a82f5683990bf37706f1d35a657ab14d431 100644 --- a/Source/WebKit/SourcesGTK.txt +++ b/Source/WebKit/SourcesGTK.txt -@@ -127,6 +127,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify +@@ -126,6 +126,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify UIProcess/API/glib/WebKitBackForwardList.cpp @no-unify UIProcess/API/glib/WebKitBackForwardListItem.cpp @no-unify @@ -10276,7 +10250,7 @@ index 7e7408e5afc02c82ee694ce5374cce6c9c8fc388..d23104efb3909171b569ceda32a8ad64 UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify UIProcess/API/glib/WebKitCookieManager.cpp @no-unify UIProcess/API/glib/WebKitCredential.cpp @no-unify -@@ -243,6 +244,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp +@@ -242,6 +243,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp UIProcess/cairo/BackingStoreCairo.cpp @no-unify @@ -10284,7 +10258,7 @@ index 7e7408e5afc02c82ee694ce5374cce6c9c8fc388..d23104efb3909171b569ceda32a8ad64 UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -260,6 +262,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 @@ -10292,7 +10266,7 @@ index 7e7408e5afc02c82ee694ce5374cce6c9c8fc388..d23104efb3909171b569ceda32a8ad64 UIProcess/gtk/KeyBindingTranslator.cpp UIProcess/gtk/PointerLockManager.cpp @no-unify UIProcess/gtk/PointerLockManagerWayland.cpp @no-unify -@@ -272,6 +275,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 @@ -10302,10 +10276,10 @@ index 7e7408e5afc02c82ee694ce5374cce6c9c8fc388..d23104efb3909171b569ceda32a8ad64 UIProcess/gtk/WebPasteboardProxyGtk.cpp UIProcess/gtk/WebPopupMenuProxyGtk.cpp diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt -index 97fedd4409cebcb04fb9559edbf71ba76428a1cd..62411a320864521bb58009c62c6bc272b45f5bd2 100644 +index eba03c88bc4d94575f7a352c3cf62e77d7369210..b871e2959b60bbda8ee4cc63ee3371d216a4b0d5 100644 --- a/Source/WebKit/SourcesWPE.txt +++ b/Source/WebKit/SourcesWPE.txt -@@ -86,6 +86,7 @@ Shared/glib/ProcessExecutablePathGLib.cpp +@@ -85,6 +85,7 @@ Shared/glib/ProcessExecutablePathGLib.cpp Shared/glib/UserMessage.cpp Shared/glib/WebContextMenuItemGlib.cpp @@ -10313,7 +10287,7 @@ index 97fedd4409cebcb04fb9559edbf71ba76428a1cd..62411a320864521bb58009c62c6bc272 Shared/libwpe/NativeWebKeyboardEventLibWPE.cpp Shared/libwpe/NativeWebMouseEventLibWPE.cpp Shared/libwpe/NativeWebTouchEventLibWPE.cpp -@@ -120,6 +121,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify +@@ -119,6 +120,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify UIProcess/API/glib/WebKitBackForwardList.cpp @no-unify UIProcess/API/glib/WebKitBackForwardListItem.cpp @no-unify @@ -10321,7 +10295,7 @@ index 97fedd4409cebcb04fb9559edbf71ba76428a1cd..62411a320864521bb58009c62c6bc272 UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify UIProcess/API/glib/WebKitCookieManager.cpp @no-unify UIProcess/API/glib/WebKitCredential.cpp @no-unify -@@ -154,6 +156,7 @@ UIProcess/API/glib/WebKitOptionMenu.cpp @no-unify +@@ -153,6 +155,7 @@ UIProcess/API/glib/WebKitOptionMenu.cpp @no-unify UIProcess/API/glib/WebKitOptionMenuItem.cpp @no-unify UIProcess/API/glib/WebKitPermissionRequest.cpp @no-unify UIProcess/API/glib/WebKitPlugin.cpp @no-unify @@ -10329,7 +10303,7 @@ index 97fedd4409cebcb04fb9559edbf71ba76428a1cd..62411a320864521bb58009c62c6bc272 UIProcess/API/glib/WebKitPolicyDecision.cpp @no-unify UIProcess/API/glib/WebKitPrivate.cpp @no-unify UIProcess/API/glib/WebKitProtocolHandler.cpp @no-unify -@@ -186,6 +189,7 @@ UIProcess/API/wpe/InputMethodFilterWPE.cpp @no-unify +@@ -185,6 +188,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 @@ -10337,7 +10311,7 @@ index 97fedd4409cebcb04fb9559edbf71ba76428a1cd..62411a320864521bb58009c62c6bc272 UIProcess/API/wpe/WebKitInputMethodContextWPE.cpp @no-unify UIProcess/API/wpe/WebKitPopupMenu.cpp @no-unify UIProcess/API/wpe/WebKitRectangle.cpp @no-unify -@@ -202,6 +206,7 @@ UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +@@ -201,6 +205,7 @@ UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp UIProcess/geoclue/GeoclueGeolocationProvider.cpp @@ -10345,7 +10319,7 @@ index 97fedd4409cebcb04fb9559edbf71ba76428a1cd..62411a320864521bb58009c62c6bc272 UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -225,6 +230,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp +@@ -224,6 +229,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp UIProcess/soup/WebCookieManagerProxySoup.cpp UIProcess/soup/WebProcessPoolSoup.cpp @@ -10357,7 +10331,7 @@ index 97fedd4409cebcb04fb9559edbf71ba76428a1cd..62411a320864521bb58009c62c6bc272 UIProcess/wpe/WebPageProxyWPE.cpp WebProcess/GPU/media/gstreamer/VideoLayerRemoteGStreamer.cpp -@@ -253,6 +263,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp +@@ -252,6 +262,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp @@ -10366,18 +10340,6 @@ index 97fedd4409cebcb04fb9559edbf71ba76428a1cd..62411a320864521bb58009c62c6bc272 WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp WebProcess/WebPage/AcceleratedSurface.cpp -diff --git a/Source/WebKit/UIProcess/API/APIInspectorExtensionClient.h b/Source/WebKit/UIProcess/API/APIInspectorExtensionClient.h -index 2feef6082a064576e7843ad62646417301dbb4d7..eecfb781fc2236e0cf3c016879204ec32322ce42 100644 ---- a/Source/WebKit/UIProcess/API/APIInspectorExtensionClient.h -+++ b/Source/WebKit/UIProcess/API/APIInspectorExtensionClient.h -@@ -26,6 +26,7 @@ - #pragma once - - #include "InspectorExtensionTypes.h" -+#include - #include - - namespace API { diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp index cfd9c3981337c7dd02c623ce8ba686ea36bbffb9..27148d775f97804de9d7a88d57ba1dd5f60c8e16 100644 --- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp @@ -10474,7 +10436,7 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index 2818bd67c98c16e7bff889654b81577a211d4ed0..3d3eebaeaac6f221eb704d4768b3fdabb117b03c 100644 +index 89b1ebfc231f0b722d30118c906a96948c8a8f5f..eb8e6fe6ce611fea0cc7c4cad763a574c89e24eb 100644 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp @@ -1762,6 +1762,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient @@ -10501,7 +10463,7 @@ index 2818bd67c98c16e7bff889654b81577a211d4ed0..3d3eebaeaac6f221eb704d4768b3fdab } diff --git a/Source/WebKit/UIProcess/API/C/WKPageUIClient.h b/Source/WebKit/UIProcess/API/C/WKPageUIClient.h -index e33187477d3d6e7614b8918d467b30847f943864..bb33c08642896ead0f8b0c43a3c773a47fc676bf 100644 +index 63323ea918dcddf512dadfff52dd5e60326e6ab8..63acaadcdb0d4a80b543db2728f3657cd4ed6f5f 100644 --- a/Source/WebKit/UIProcess/API/C/WKPageUIClient.h +++ b/Source/WebKit/UIProcess/API/C/WKPageUIClient.h @@ -90,6 +90,7 @@ typedef void (*WKPageRunBeforeUnloadConfirmPanelCallback)(WKPageRef page, WKStri @@ -10591,7 +10553,7 @@ 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 eaa2ad6214464293cc947ff2a152e5e96bf05f3b..7845d8b4f770164beea06e1fa5d01db628a47d95 100644 +index 8eeed2c825bc2d7bea83123472b7022e9ba512c0..083f5260ea1740302e6af4b28a6b135880fbec9b 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm @@ -46,6 +46,7 @@ @@ -10825,6 +10787,18 @@ index 00b250e5d3ee4dbd4537e23fcb1f6e44a454607c..e1701062ef7df02ed7b83ff19c84df0f #import "_WKRemoteWebInspectorViewControllerInternal.h" #if PLATFORM(MAC) +diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewControllerInternal.h b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewControllerInternal.h +index 9eec59454b01ae422c9c14a96a589f41796dfd1d..f4a73d5ced672e6f8bec00ed22e82409fbed0a23 100644 +--- a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewControllerInternal.h ++++ b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewControllerInternal.h +@@ -24,6 +24,7 @@ + */ + + #import "_WKRemoteWebInspectorViewControllerPrivate.h" ++#import + + #if !TARGET_OS_IPHONE + diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h b/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h index 4974e14214e2bb3e982325b885bab33e54f83998..cacdf8c71fab248d38d2faf03f7affdcfed1ef62 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h @@ -11067,7 +11041,7 @@ index 64c90f9f25fc44911e819ab94fa973bf0b82a0e4..8d8c739fb903b71f7881801cb41901f2 bool canRunBeforeUnloadConfirmPanel() const final { return true; } diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -index 1b128a4c6825de9f93550725c5195f4ab0443548..eb6114654dc8961140693f9bbbdcc87d33901a6e 100644 +index ab4368bf976bd0dedc0457907de3c86bd9da1af7..01725af1ca0ccfe38663c4f180939e70877b5ffd 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp @@ -121,8 +121,8 @@ enum { @@ -11191,7 +11165,7 @@ index 78d1578f94793e9e59a3d4d2b33e79ea8530fa04..493cdadac3873508b3efa3048638e73a #endif +int webkitWebContextExistingCount(); diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp -index 1ec86a3f16a097bf843dbdacf8d8ebd62d8175a4..457307ae7e9a5a9f4f56bbde07dc12482ff815a3 100644 +index ba4b5455d460dcca64ab4a1b7d41eff6bf62431e..1ce0bf34f94889537e04d261b4942d19ea5a8ced 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp @@ -32,6 +32,7 @@ @@ -11234,7 +11208,7 @@ index 1ec86a3f16a097bf843dbdacf8d8ebd62d8175a4..457307ae7e9a5a9f4f56bbde07dc1248 + getPage(m_webView).inspectorController().didPaint(surface.get()); + { - SetForScope inFrameDisplayedGuard(m_webView->priv->inFrameDisplayed, true); + SetForScope inFrameDisplayedGuard(m_webView->priv->inFrameDisplayed, true); for (const auto& callback : m_webView->priv->frameDisplayedCallbacks) { @@ -495,6 +500,7 @@ void WebKitWebViewClient::didReceiveUserMessage(WKWPE::View&, UserMessage&& mess { @@ -11306,7 +11280,7 @@ index fbab1afe9ca09f5e6a6793f5065f08fc76bfedaf..23f66f4da6229d88271e4b732414088b bool webkitWebViewIsScriptDialogRunning(WebKitWebView*, WebKitScriptDialog*); String webkitWebViewGetCurrentScriptDialogMessage(WebKitWebView*); diff --git a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp -index d5eedea3871979915da9ebde80356c15f480bb8e..01a43ba7662f9cea3fa56e23959ceb7c9cf17be4 100644 +index 0d43178565055539ed8c2f88dedae97ba455bc42..f687eafa80270bebe13297e482ae48ebbd7534c9 100644 --- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp +++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp @@ -251,6 +251,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool @@ -11406,7 +11380,7 @@ index 0000000000000000000000000000000000000000..9f1a0173a5641d6f158d815b8f7b9ea6 + +#endif diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -index 6b30da8eabc0991f45431a841bfddb633742e41d..68ff180c3fd0a82c5cd9e996f9d50cdc550e5aaf 100644 +index 3ffcbd7c123ddb4e60f5cbce432f87b956987074..ab2a2e4d2a89c43263daa29f93cedc29523b6100 100644 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp @@ -2548,6 +2548,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) @@ -11422,7 +11396,7 @@ index 6b30da8eabc0991f45431a841bfddb633742e41d..68ff180c3fd0a82c5cd9e996f9d50cdc { ASSERT(webkitWebViewBase->priv->acceleratedBackingStore); diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h -index 1a8c90c316415387dd599807c1f698374927fa52..f7aa9156f409fcaf2b8eb47121a61660f7d5d5cf 100644 +index b60e10c4fb1c6c867579b58661a6e3f017ba81b0..3f8ec4479449e9cc1e3b2503ba2e3e352e329d84 100644 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h @@ -27,6 +27,7 @@ @@ -12031,6 +12005,19 @@ index 30860712f58b2a8d48cef5da4e6f03345f2921ba..e715496c24529689784ba4d481d23441 using namespace Inspector; +diff --git a/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm b/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm +index 72629294efe8b1071eb3c64013b40c1c71ea06e6..589a71b6b63b16dba0e285ad9843b83ffef338a5 100644 +--- a/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm ++++ b/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm +@@ -25,6 +25,8 @@ + + #import "config.h" + #import "ModelElementController.h" ++#import ++#import + + #if ENABLE(ARKIT_INLINE_PREVIEW) + diff --git a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.h b/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.h index 454c61ffdefecc476d1560c7c43f5b5d345f281d..6de7509037b7683ddd403ee247bdf2845ce4e87a 100644 --- a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.h @@ -12086,7 +12073,7 @@ index c02db482965c5e8d3fc40d90869c9e8f80ad301e..ce046a3949e2b3fe6a106af133b3dbc2 bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1; diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -index 849d81134ff8d89a4c475e64f8b80eb6ae088529..c6055f2ecf1638e57cdd967a037586e651573179 100644 +index 7659b1c9ff0d2f9bc50aee7ed437a759bf6e9200..2c75e4b0fae4584136cf4d649945864f077ec4cd 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm @@ -111,6 +111,7 @@ void UIDelegate::setDelegate(id delegate) @@ -12114,7 +12101,7 @@ index 849d81134ff8d89a4c475e64f8b80eb6ae088529..c6055f2ecf1638e57cdd967a037586e6 { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index 39a8c87a13f91d6ea89b07684e02c4aa5857f21d..bed6cdfdc84a33780b6aa2f447a0b16155755746 100644 +index 56a14d8bf36ed44dadbf1e4c4840a5e06414b8e7..d724284a3a3a8ecce9879ae3135118d4c0adc8ca 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -37,6 +37,7 @@ @@ -12125,7 +12112,7 @@ index 39a8c87a13f91d6ea89b07684e02c4aa5857f21d..bed6cdfdc84a33780b6aa2f447a0b161 #import "PlaybackSessionManagerProxy.h" #import "QuarantineSPI.h" #import "QuickLookThumbnailLoader.h" -@@ -244,9 +245,66 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting() +@@ -248,9 +249,66 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting() void WebPageProxy::startDrag(const DragItem& dragItem, const ShareableBitmap::Handle& dragImageHandle) { @@ -12193,10 +12180,10 @@ index 39a8c87a13f91d6ea89b07684e02c4aa5857f21d..bed6cdfdc84a33780b6aa2f447a0b161 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index 5696da38988527c7ae693b8fc71d6bb5f4ae8604..7446c2d0618a1e981898e60376a3393c38a29d44 100644 +index 433934601535a0d46e3e8987b8368423870605c7..b9e9edb344a1fd9dccfd3bdbafbbce49f5a2c714 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 +@@ -402,7 +402,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -12205,7 +12192,7 @@ index 5696da38988527c7ae693b8fc71d6bb5f4ae8604..7446c2d0618a1e981898e60376a3393c #endif #if PLATFORM(IOS) -@@ -696,8 +696,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -704,8 +704,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -12217,10 +12204,10 @@ index 5696da38988527c7ae693b8fc71d6bb5f4ae8604..7446c2d0618a1e981898e60376a3393c 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 d64a7dba42d94db24efa8f60ae499a76423d85e9..4364cae8ec64acde543be9c8ec18175fa21f1692 100644 +index 39c73aa20b1290422c46f51eb04474c2d572bb8e..caca4f28930db37822579b762448a5b7f311de3e 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h -@@ -503,6 +503,9 @@ public: +@@ -504,6 +504,9 @@ public: void provideDataForPasteboard(NSPasteboard *, NSString *type); NSArray *namesOfPromisedFilesDroppedAtDestination(NSURL *dropDestination); @@ -12231,10 +12218,10 @@ index d64a7dba42d94db24efa8f60ae499a76423d85e9..4364cae8ec64acde543be9c8ec18175f void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 83137953bd98b8092bb5a5ca373bf7ee15057990..4d0e1e398d6b18bc24e92f7e3e83e4610083107a 100644 +index 727abb26ced4a1e27b33bec8964f1407430ced7a..9206844bbe962282a66b0bd89310b20f7d129b95 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -@@ -2644,6 +2644,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() +@@ -2682,6 +2682,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() if (!m_colorSpace) m_colorSpace = [NSColorSpace sRGBColorSpace]; } @@ -12246,7 +12233,7 @@ index 83137953bd98b8092bb5a5ca373bf7ee15057990..4d0e1e398d6b18bc24e92f7e3e83e461 ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4625,6 +4630,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4666,6 +4671,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -15842,8 +15829,22 @@ index 7a14cfba15c103a2d4fe263fa49d25af3c396ec2..3ee0e154349661632799057c71f1d1f1 PROCESS_INFORMATION processInformation { }; BOOL result = ::CreateProcess(0, commandLine.data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation); +diff --git a/Source/WebKit/UIProcess/ModelElementController.h b/Source/WebKit/UIProcess/ModelElementController.h +index 7dd9e02d8d202103bd681c3e8d01af47fe335c68..aca416b6ca8b61f406a3298b426ae26672728681 100644 +--- a/Source/WebKit/UIProcess/ModelElementController.h ++++ b/Source/WebKit/UIProcess/ModelElementController.h +@@ -30,6 +30,9 @@ + #include "ModelIdentifier.h" + #include + #include ++#include ++#include ++#include + #include + #include + #include diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h -index b2cbc5eb75a38e1019faf6cb2b4773de00540cf2..42448dd4e04cf497a6cf1aceaa82ae0e6d3b30cb 100644 +index d02bb7cc80f7071a13c7f2b3641bc7baf0bab098..f3027ec3a284fbbe2ef3a1a56f71c10574a98d89 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h @@ -325,6 +325,11 @@ public: @@ -15859,10 +15860,10 @@ index b2cbc5eb75a38e1019faf6cb2b4773de00540cf2..42448dd4e04cf497a6cf1aceaa82ae0e virtual RefPtr takeViewSnapshot(std::optional&&) = 0; #endif diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -index 63454a9e28f95f2621fef1cd7c5701edb69523ea..790175f6d65867c8074a47d1e42a9678b8c4ee33 100644 +index 62b85b7263f2a8124444f0fe25cb220220427c8a..dca1d4d6d695f57a610dcbe80463c0234f6823be 100644 --- a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp +++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -@@ -644,3 +644,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option +@@ -629,3 +629,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option } } // namespace WebKit @@ -16876,7 +16877,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641ce545e91 100644 +index 2fddb84952d0889a88254e477bff2320b60f01dc..a944e08b974baaf057a0b3ce55ae8b8dc19f0444 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -248,6 +248,9 @@ @@ -16889,7 +16890,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 #include #endif -@@ -622,6 +625,10 @@ WebPageProxy::~WebPageProxy() +@@ -626,6 +629,10 @@ WebPageProxy::~WebPageProxy() if (m_preferences->mediaSessionCoordinatorEnabled()) GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this); #endif @@ -16900,7 +16901,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 } void WebPageProxy::addAllMessageReceivers() -@@ -1023,6 +1030,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -1027,6 +1034,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -16908,7 +16909,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 } void WebPageProxy::didAttachToRunningProcess() -@@ -1376,6 +1384,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1380,6 +1388,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -16930,7 +16931,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1924,6 +1947,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1928,6 +1951,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -16962,7 +16963,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2114,6 +2162,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2118,6 +2166,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -16988,7 +16989,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2697,6 +2764,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2701,6 +2768,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -16997,7 +16998,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2707,6 +2776,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2711,6 +2780,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -17006,7 +17007,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2722,18 +2793,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask, const ShareableBitmap::Handle& dragImageHandle) + void WebPageProxy::startDrag(SelectionData&& selectionData, OptionSet dragOperationMask, const ShareableBitmap::Handle& dragImageHandle, IntPoint&& dragImageHotspot) { - RefPtr dragImage = !dragImageHandle.isNull() ? ShareableBitmap::create(dragImageHandle) : nullptr; -- pageClient().startDrag(WTFMove(selectionData), dragOperationMask, WTFMove(dragImage)); +- pageClient().startDrag(WTFMove(selectionData), dragOperationMask, WTFMove(dragImage), WTFMove(dragImageHotspot)); + if (m_interceptDrags) { + m_dragSelectionData = WTFMove(selectionData); + m_dragSourceOperationMask = dragOperationMask; + } else { +#if PLATFORM(GTK) + RefPtr dragImage = !dragImageHandle.isNull() ? ShareableBitmap::create(dragImageHandle) : nullptr; -+ pageClient().startDrag(WTFMove(selectionData), dragOperationMask, WTFMove(dragImage)); ++ pageClient().startDrag(WTFMove(selectionData), dragOperationMask, WTFMove(dragImage), WTFMove(dragImageHotspot)); +#endif + } + @@ -17051,7 +17052,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet dragOperationMask) { if (!hasRunningProcess()) -@@ -2742,6 +2836,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2746,6 +2840,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17076,7 +17077,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2754,8 +2866,18 @@ void WebPageProxy::didStartDrag() +@@ -2758,8 +2870,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17096,7 +17097,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2860,16 +2982,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2864,16 +2986,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17142,7 +17143,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3033,7 +3177,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3037,7 +3181,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17151,7 +17152,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3066,7 +3210,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3070,7 +3214,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17160,7 +17161,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3455,6 +3599,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3459,6 +3603,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17169,7 +17170,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3523,6 +3669,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3527,6 +3673,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) { @@ -17177,7 +17178,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4257,6 +4404,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4261,6 +4408,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17189,7 +17190,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4636,6 +4788,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4645,6 +4797,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17197,7 +17198,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4860,6 +5013,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4869,6 +5022,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17206,7 +17207,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 // 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; -@@ -5331,7 +5486,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5340,7 +5495,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) { @@ -17222,7 +17223,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5900,6 +6062,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5912,6 +6074,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa if (originatingPage) openerAppInitiatedState = originatingPage->lastNavigationWasAppInitiated(); @@ -17230,7 +17231,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 auto completionHandler = [this, protectedThis = Ref { *this }, mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement, openerAppInitiatedState = WTFMove(openerAppInitiatedState)] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5946,6 +6109,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5958,6 +6121,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17238,7 +17239,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 } void WebPageProxy::exitFullscreenImmediately() -@@ -6003,6 +6167,10 @@ void WebPageProxy::closePage() +@@ -6015,6 +6179,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17249,7 +17250,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -6039,6 +6207,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -6051,6 +6219,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 { @@ -17258,7 +17259,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -6060,6 +6230,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -6072,6 +6242,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17267,7 +17268,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 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 { -@@ -6083,6 +6255,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -6095,6 +6267,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17276,7 +17277,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 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 { -@@ -6210,6 +6384,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6222,6 +6396,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17285,7 +17286,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7456,6 +7632,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7473,6 +7649,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17294,7 +17295,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 } break; } -@@ -7470,10 +7648,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7487,10 +7665,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -17311,7 +17312,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 break; } -@@ -7482,7 +7663,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7499,7 +7680,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()); @@ -17319,7 +17320,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7501,7 +7681,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7518,7 +7698,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); @@ -17327,7 +17328,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7510,6 +7689,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7527,6 +7706,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17335,7 +17336,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 } break; } -@@ -7864,7 +8044,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7881,7 +8061,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -17347,7 +17348,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8246,6 +8429,7 @@ static Span mediaRelatedIOKitClasses() +@@ -8213,6 +8396,7 @@ static Span gpuMachServices() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17355,7 +17356,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8446,6 +8630,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8403,6 +8587,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.httpsUpgradeEnabled = preferences().upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false; @@ -17364,7 +17365,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 #if PLATFORM(IOS) // FIXME: This is also being passed over the to WebProcess via the PreferencesStore. parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload(); -@@ -8514,6 +8700,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8471,6 +8657,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17379,7 +17380,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8607,6 +8801,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8564,6 +8758,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17396,7 +17397,7 @@ index a72463b85b7afba35fdd8767ba7ab535ff6c1e4a..a9ebfe82c4f735e8f3ba598f4e82f641 // 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 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f405b0334 100644 +index 78d54d81df1b58700b1b405eaf57b90a0efcce8b..299da033b6a0fa176e5495b5a61de82ec5f48662 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17434,7 +17435,7 @@ index 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY) #include #include -@@ -248,6 +260,7 @@ class AuthenticationChallenge; +@@ -249,6 +261,7 @@ class AuthenticationChallenge; class CertificateInfo; class Cursor; class DragData; @@ -17442,7 +17443,7 @@ index 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f class FloatRect; class FontAttributeChanges; class FontChanges; -@@ -255,7 +268,6 @@ class GraphicsLayer; +@@ -256,7 +269,6 @@ class GraphicsLayer; class IntSize; class ProtectionSpace; class RunLoopObserver; @@ -17450,7 +17451,7 @@ index 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f class SharedBuffer; class SpeechRecognitionRequest; class TextIndicator; -@@ -545,6 +557,8 @@ public: +@@ -546,6 +558,8 @@ public: void setControlledByAutomation(bool); WebPageInspectorController& inspectorController() { return *m_inspectorController; } @@ -17459,7 +17460,7 @@ index 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f #if PLATFORM(IOS_FAMILY) void showInspectorIndication(); -@@ -650,6 +664,11 @@ public: +@@ -651,6 +665,11 @@ public: void setPageLoadStateObserver(std::unique_ptr&&); @@ -17471,7 +17472,7 @@ index 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f void initializeWebPage(); void setDrawingArea(std::unique_ptr&&); -@@ -677,6 +696,7 @@ public: +@@ -678,6 +697,7 @@ public: void closePage(); void addPlatformLoadParameters(WebProcessProxy&, LoadParameters&); @@ -17479,7 +17480,7 @@ index 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f RefPtr loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemesButNotAppLinks, API::Object* userData = nullptr); RefPtr loadFile(const String& fileURL, const String& resourceDirectoryURL, bool isAppInitiated = true, API::Object* userData = nullptr); RefPtr loadData(const IPC::DataReference&, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow); -@@ -1196,6 +1216,7 @@ public: +@@ -1197,6 +1217,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17487,7 +17488,7 @@ index 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1281,14 +1302,20 @@ public: +@@ -1283,14 +1304,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17501,7 +17502,7 @@ index 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f #endif -#if PLATFORM(GTK) +#if PLATFORM(GTK) || PLATFORM(WPE) - void startDrag(WebCore::SelectionData&&, OptionSet, const ShareableBitmap::Handle& dragImage); + void startDrag(WebCore::SelectionData&&, OptionSet, const ShareableBitmap::Handle& dragImage, WebCore::IntPoint&& dragImageHotspot); #endif +#if PLATFORM(WIN) + void startDrag(WebCore::DragDataMap&& dragDataMap); @@ -17509,7 +17510,7 @@ index 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f #endif void processDidBecomeUnresponsive(); -@@ -1535,6 +1562,8 @@ public: +@@ -1541,6 +1568,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17518,7 +17519,7 @@ index 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f #endif #if ENABLE(WEB_CRYPTO) -@@ -2681,6 +2710,7 @@ private: +@@ -2688,6 +2717,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17526,7 +17527,7 @@ index 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2945,6 +2975,20 @@ private: +@@ -2952,6 +2982,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17547,7 +17548,7 @@ index 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f #endif PageLoadState m_pageLoadState; -@@ -3154,6 +3198,9 @@ private: +@@ -3161,6 +3205,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17558,7 +17559,7 @@ index 8febab4b5149af21ab8be8488b5b399c3eb1c10f..1a2d2d95db6c1c7aedce51a0591ecc7f #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 47a4fd09044b0f0f63686c4c01fa4a1952abe93c..3196e99839aa9c78894cdf695aacb329aec1a77a 100644 +index 207bc21d32a6ffe6b7ef5fdd06e604e20a8aae48..c8529829ca524e849239dfbbe5b0453ece3ba2ff 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17583,7 +17584,7 @@ index 47a4fd09044b0f0f63686c4c01fa4a1952abe93c..3196e99839aa9c78894cdf695aacb329 #endif -#if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT) +#if (PLATFORM(GTK) || PLATFORM(WPE)) && ENABLE(DRAG_SUPPORT) - StartDrag(WebCore::SelectionData selectionData, OptionSet dragOperationMask, WebKit::ShareableBitmap::Handle dragImage) + StartDrag(WebCore::SelectionData selectionData, OptionSet dragOperationMask, WebKit::ShareableBitmap::Handle dragImage, WebCore::IntPoint dragImageHotspot) #endif - +#if PLATFORM(WIN) && ENABLE(DRAG_SUPPORT) @@ -17593,13 +17594,13 @@ index 47a4fd09044b0f0f63686c4c01fa4a1952abe93c..3196e99839aa9c78894cdf695aacb329 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index fa1742cf32da99527323dfc7c8bf0a79063041fe..7154d2235be8b7aab6fae2a0e29f7945ba384ab4 100644 +index f153458805ec95479284d5b6bce34875882e897b..d7e9135341d8150f1b1726540b6d5892e3e0feb2 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp -@@ -536,6 +536,14 @@ void WebProcessPool::establishServiceWorkerContextConnectionToNetworkProcess(Reg +@@ -539,6 +539,14 @@ void WebProcessPool::establishRemoteWorkerContextConnectionToNetworkProcess(Remo - // Arbitrarily choose the first process pool to host the service worker process. - auto* processPool = processPools()[0]; + RefPtr requestingProcess = requestingProcessIdentifier ? WebProcessProxy::processForIdentifier(*requestingProcessIdentifier) : nullptr; + WebProcessPool* processPool = requestingProcess ? &requestingProcess->processPool() : processPools()[0]; + // Playwright begin + for (auto& process : websiteDataStore->processes()) { + if (process.processPoolIfExists()) { @@ -17610,8 +17611,8 @@ index fa1742cf32da99527323dfc7c8bf0a79063041fe..7154d2235be8b7aab6fae2a0e29f7945 + // Playwright end ASSERT(processPool); - WebProcessProxy* serviceWorkerProcessProxy { nullptr }; -@@ -859,8 +867,12 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa + WebProcessProxy* remoteWorkerProcessProxy { nullptr }; +@@ -817,8 +825,12 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa #endif parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel(); @@ -17627,10 +17628,10 @@ index fa1742cf32da99527323dfc7c8bf0a79063041fe..7154d2235be8b7aab6fae2a0e29f7945 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 b12860df510bc4e3dfbb7e3fc920b5d042b84321..6224fedca93ef7820165161fcdc25d4833f010af 100644 +index be96b41de2752fc635934163e5b02055afedc299..24570635349635c7e41e5b385cd66c662f766865 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp -@@ -146,6 +146,11 @@ HashMap& WebProcessProxy::allProcesses() +@@ -147,6 +147,11 @@ HashMap& WebProcessProxy::allProcesses() return map; } @@ -17643,10 +17644,10 @@ index b12860df510bc4e3dfbb7e3fc920b5d042b84321..6224fedca93ef7820165161fcdc25d48 { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index 25ac75c5fbf877a0901d935f47deb77773857eee..8bb6e9b2e5d26a75ebb13b147d29bb6c765ffe97 100644 +index 7a80c274d224374208786262fb353dc2e08dea55..931a318a02acfc87c04a88d4b46823346d600515 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h -@@ -144,6 +144,7 @@ public: +@@ -145,6 +145,7 @@ public: ~WebProcessProxy(); static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, const Function&); @@ -17655,10 +17656,10 @@ index 25ac75c5fbf877a0901d935f47deb77773857eee..8bb6e9b2e5d26a75ebb13b147d29bb6c WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index b36d9a74b9a175a0816b7a2e14f139db5ef56e6d..179812ce588d218a553121a2bba9776719e44d24 100644 +index 1da3106b94588cd641d6b0b94ac5a6422df08af7..d0032670eb526ec537a34713d1b9cddff101c901 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -1979,6 +1979,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O +@@ -1993,6 +1993,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); } @@ -17677,7 +17678,7 @@ index b36d9a74b9a175a0816b7a2e14f139db5ef56e6d..179812ce588d218a553121a2bba97767 void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index 46af0ef59ebca120bcce8be9e2a4e3882c5bd504..50324d159a0309e7b1ece3460d9442198042b904 100644 +index b129abf3775f5c3a876bffdf332eac1c8e8c24a1..72a8214023987dd5520ee56216284aa9973cd89f 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h @@ -89,6 +89,7 @@ class SecKeyProxyStore; @@ -17711,7 +17712,7 @@ index 46af0ef59ebca120bcce8be9e2a4e3882c5bd504..50324d159a0309e7b1ece3460d944219 class WebsiteDataStore : public API::ObjectImpl, public Identified, public CanMakeWeakPtr { public: static Ref defaultDataStore(); -@@ -287,11 +297,13 @@ public: +@@ -288,11 +298,13 @@ public: const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; } #endif @@ -17726,9 +17727,9 @@ index 46af0ef59ebca120bcce8be9e2a4e3882c5bd504..50324d159a0309e7b1ece3460d944219 void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&); const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; } void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType); -@@ -353,6 +365,14 @@ public: - static bool http3Enabled(); +@@ -355,6 +367,14 @@ public: static constexpr uint64_t defaultPerOriginQuota() { return 1000 * MB; } + static bool defaultShouldUseCustomStoragePaths(); + void setLanguagesForAutomation(Vector&&); + Vector& languagesForAutomation() { return m_languagesForAutomation; }; @@ -17741,7 +17742,7 @@ index 46af0ef59ebca120bcce8be9e2a4e3882c5bd504..50324d159a0309e7b1ece3460d944219 void resetQuota(CompletionHandler&&); void clearStorage(CompletionHandler&&); -@@ -441,9 +461,11 @@ private: +@@ -443,9 +463,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -17754,7 +17755,7 @@ index 46af0ef59ebca120bcce8be9e2a4e3882c5bd504..50324d159a0309e7b1ece3460d944219 WebCore::SoupNetworkProxySettings m_networkProxySettings; String m_cookiePersistentStoragePath; SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite }; -@@ -471,6 +493,11 @@ private: +@@ -473,6 +495,11 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -18187,7 +18188,7 @@ index 0000000000000000000000000000000000000000..8a86cc348bc210b71bb463dcb3057f57 + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp b/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp -index 40ebef5dc078f5933056a63c498bd6f8e7f1d857..82a1500bbe3e1fe24d2d0806e46b67f58bfe8067 100644 +index ce0b10ec8d07762bb1b19ff1eb05fc17de129c2c..275ab45bc83e9ab3011023ec3cf999472e8ab8b0 100644 --- a/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp +++ b/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp @@ -34,6 +34,8 @@ @@ -18621,7 +18622,7 @@ index 20b314393a8d97220e74bd476d9025b23acf3851..54db7181a6f175161b6fe17510209669 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 756184af6cd9946a5f947df90dd9e6bfb44e0e56..8f55df003e3bc7c19eafdbb966ae669d3a2341ac 100644 +index 27980b07e3fdf55bcbc55566f4be84978dff20f3..f97b0c299a715ddbb3e2c72893c2283cc82b644d 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm @@ -81,6 +81,7 @@ @@ -18717,7 +18718,7 @@ index 756184af6cd9946a5f947df90dd9e6bfb44e0e56..8f55df003e3bc7c19eafdbb966ae669d RefPtr PageClientImpl::takeViewSnapshot(std::optional&&) { return m_impl->takeViewSnapshot(); -@@ -793,6 +821,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR +@@ -792,6 +820,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR #endif // ENABLE(FULLSCREEN_API) @@ -18731,7 +18732,7 @@ index 756184af6cd9946a5f947df90dd9e6bfb44e0e56..8f55df003e3bc7c19eafdbb966ae669d void PageClientImpl::navigationGestureDidBegin() { m_impl->dismissContentRelativeChildWindowsWithAnimation(true); -@@ -970,6 +1005,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c +@@ -969,6 +1004,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c bool PageClientImpl::windowIsFrontWindowUnderMouse(const NativeWebMouseEvent& event) { @@ -18754,10 +18755,10 @@ index 31bc0797a1b086b9342e5449e48cf5b3050464eb..450b6acf92b31cb40c404e3a8553e263 void getContextMenuItem(const WebContextMenuItemData&, CompletionHandler&&); void getContextMenuFromItems(const Vector&, CompletionHandler&&); diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm -index 82977b7c656d8e5c620f3eff25f2af1812cea90f..fc24b06d1767b2ae5b968513412132b241b0c5b9 100644 +index 163f8ad4e8047ee0281730f512e5ec47a065a7b1..f7c174730e3683c85511d0e8fdb1b4d10cf67bdc 100644 --- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm +++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm -@@ -440,6 +440,12 @@ void WebContextMenuProxyMac::getShareMenuItem(CompletionHandlerdidReceiveResponse(inspectorResponse, [this, protectedThis = WTFMove(protectedThis), interceptedRequestIdentifier, policyDecisionCompletionHandler = WTFMove(policyDecisionCompletionHandler), overrideData = WTFMove(overrideData)]() mutable { @@ -20185,7 +20155,7 @@ index 4a00f228cd50f85c03f997f047c69ce520e9f177..59f5fc400aa1658d2531a509050b2e2a if (!m_coreLoader || !m_coreLoader->identifier()) { m_interceptController.continueResponse(interceptedRequestIdentifier); return; -@@ -211,6 +208,8 @@ void WebResourceLoader::didReceiveResponse(const ResourceResponse& response, Pri +@@ -212,6 +209,8 @@ void WebResourceLoader::didReceiveResponse(const ResourceResponse& response, Pri } }); }); @@ -20208,7 +20178,7 @@ index e00c722c2be5d505243d45f46001839d4eb8a977..33c0832cde6c292230397a13e70d90fb auto permissionHandlers = m_requestsPerOrigin.take(securityOrigin); diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index c5f403a6d44d554b6be794d16903ddc87c622a77..3cbed199847600c9a8d1e0e35c3882bfdd157552 100644 +index 05e3f3f1b8d4ccda25fd7b457525e23c5c281f23..6a91b5bf2849807719c2b476eda87dd144454342 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -417,6 +417,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -20262,10 +20232,10 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index 3b8ac36d0ae9d174cfa666b4bfc415a830da70eb..1193c9f748839bbe1c13d8094a7a78fe0bcedff1 100644 +index 916b69a9b42d2fca903ce99c6cbc3911887bfa91..a4c4e0839282994762378fd7897dc57f09f9a125 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -@@ -1576,13 +1576,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() +@@ -1582,13 +1582,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() if (webPage->scrollPinningBehavior() != DoNotPin) view->setScrollPinningBehavior(webPage->scrollPinningBehavior()); @@ -20359,7 +20329,7 @@ index 0000000000000000000000000000000000000000..2606914d22e85affd9b2f71c361c9db3 +#endif // ENABLE(DRAG_SUPPORT) diff --git a/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebDragClientWPE.cpp b/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebDragClientWPE.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..9b413bb8150a1633d29b6e2606127c9c1d02442b +index 0000000000000000000000000000000000000000..6d1dab390782a6c88d387bc94a36ecf07397902f --- /dev/null +++ b/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebDragClientWPE.cpp @@ -0,0 +1,57 @@ @@ -20414,7 +20384,7 @@ index 0000000000000000000000000000000000000000..9b413bb8150a1633d29b6e2606127c9c + m_page->willStartDrag(); + + ShareableBitmap::Handle handle; -+ m_page->send(Messages::WebPageProxy::StartDrag(dataTransfer.pasteboard().selectionData(), dataTransfer.sourceOperationMask(), handle)); ++ m_page->send(Messages::WebPageProxy::StartDrag(dataTransfer.pasteboard().selectionData(), dataTransfer.sourceOperationMask(), handle, dataTransfer.dragLocation())); +} + +}; // namespace WebKit. @@ -20642,10 +20612,10 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index 34987bde64fdff090832c37542b93513a61adccb..44f02bf329828b3d527b9adf1a059616afa47f30 100644 +index 09dbae8e31054216fe988f60b9f464ccc7db9f69..e2b919ba3e8c2e38e9920cfba2ec23f2df1ef94d 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -912,6 +912,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -905,6 +905,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) } #endif @@ -20655,7 +20625,7 @@ index 34987bde64fdff090832c37542b93513a61adccb..44f02bf329828b3d527b9adf1a059616 updateThrottleState(); } -@@ -1677,6 +1680,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1670,6 +1673,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -20678,7 +20648,7 @@ index 34987bde64fdff090832c37542b93513a61adccb..44f02bf329828b3d527b9adf1a059616 void WebPage::loadRequest(LoadParameters&& loadParameters) { WEBPAGE_RELEASE_LOG(Loading, "loadRequest: navigationID=%" PRIu64 ", shouldTreatAsContinuingLoad=%u, lastNavigationWasAppInitiated=%d, existingNetworkResourceLoadIdentifierToResume=%" PRIu64, loadParameters.navigationID, static_cast(loadParameters.shouldTreatAsContinuingLoad), loadParameters.request.isAppInitiated(), valueOrDefault(loadParameters.existingNetworkResourceLoadIdentifierToResume).toUInt64()); -@@ -1943,17 +1962,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1942,17 +1961,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20697,7 +20667,7 @@ index 34987bde64fdff090832c37542b93513a61adccb..44f02bf329828b3d527b9adf1a059616 // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1970,20 +1985,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1969,20 +1984,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20725,7 +20695,7 @@ index 34987bde64fdff090832c37542b93513a61adccb..44f02bf329828b3d527b9adf1a059616 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1991,7 +2004,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1990,7 +2003,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20733,7 +20703,7 @@ index 34987bde64fdff090832c37542b93513a61adccb..44f02bf329828b3d527b9adf1a059616 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2283,6 +2295,7 @@ void WebPage::scaleView(double scale) +@@ -2282,6 +2294,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20741,7 +20711,7 @@ index 34987bde64fdff090832c37542b93513a61adccb..44f02bf329828b3d527b9adf1a059616 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2387,17 +2400,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2386,17 +2399,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20760,7 +20730,7 @@ index 34987bde64fdff090832c37542b93513a61adccb..44f02bf329828b3d527b9adf1a059616 } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3306,6 +3315,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3309,6 +3318,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -20865,7 +20835,7 @@ index 34987bde64fdff090832c37542b93513a61adccb..44f02bf329828b3d527b9adf1a059616 #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3382,6 +3489,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3385,6 +3492,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -20877,7 +20847,7 @@ index 34987bde64fdff090832c37542b93513a61adccb..44f02bf329828b3d527b9adf1a059616 void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3620,6 +3732,7 @@ void WebPage::didCompletePageTransition() +@@ -3623,6 +3735,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -20885,7 +20855,7 @@ index 34987bde64fdff090832c37542b93513a61adccb..44f02bf329828b3d527b9adf1a059616 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4446,7 +4559,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4449,7 +4562,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -20894,7 +20864,7 @@ index 34987bde64fdff090832c37542b93513a61adccb..44f02bf329828b3d527b9adf1a059616 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6843,6 +6956,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6870,6 +6983,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20905,7 +20875,7 @@ index 34987bde64fdff090832c37542b93513a61adccb..44f02bf329828b3d527b9adf1a059616 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 510f75d63aa2a0790f43f30c046dc883c761e9f3..623b31932abd88c069aec279cdf7dda8e5435e19 100644 +index a5ebaec45ba024ad4bf2f2b9e61e2c4d5acedd97..677c1bf984b828aa93a80780603fbd34735574da 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -122,6 +122,10 @@ typedef struct _AtkObject AtkObject; @@ -20919,7 +20889,7 @@ index 510f75d63aa2a0790f43f30c046dc883c761e9f3..623b31932abd88c069aec279cdf7dda8 #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -997,11 +1001,11 @@ public: +@@ -1005,11 +1009,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -20933,7 +20903,7 @@ index 510f75d63aa2a0790f43f30c046dc883c761e9f3..623b31932abd88c069aec279cdf7dda8 void performDragControllerAction(DragControllerAction, const WebCore::DragData&, SandboxExtension::Handle&&, Vector&&); #endif -@@ -1015,6 +1019,9 @@ public: +@@ -1023,6 +1027,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -20943,7 +20913,7 @@ index 510f75d63aa2a0790f43f30c046dc883c761e9f3..623b31932abd88c069aec279cdf7dda8 #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1251,6 +1258,7 @@ public: +@@ -1261,6 +1268,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -20951,7 +20921,7 @@ index 510f75d63aa2a0790f43f30c046dc883c761e9f3..623b31932abd88c069aec279cdf7dda8 void insertNewlineInQuotedContent(); -@@ -1617,6 +1625,7 @@ private: +@@ -1631,6 +1639,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -20959,7 +20929,7 @@ index 510f75d63aa2a0790f43f30c046dc883c761e9f3..623b31932abd88c069aec279cdf7dda8 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1654,6 +1663,7 @@ private: +@@ -1668,6 +1677,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -20967,7 +20937,7 @@ index 510f75d63aa2a0790f43f30c046dc883c761e9f3..623b31932abd88c069aec279cdf7dda8 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1787,9 +1797,7 @@ private: +@@ -1802,9 +1812,7 @@ private: void requestRectForFoundTextRange(const WebFoundTextRange&, CompletionHandler&&); @@ -20977,7 +20947,7 @@ index 510f75d63aa2a0790f43f30c046dc883c761e9f3..623b31932abd88c069aec279cdf7dda8 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2325,6 +2333,7 @@ private: +@@ -2341,6 +2349,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -20986,10 +20956,10 @@ index 510f75d63aa2a0790f43f30c046dc883c761e9f3..623b31932abd88c069aec279cdf7dda8 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 18cad02713db009778ce6965816de2242b3d7472..5dcbfb0fff1f899c87d8620efece2598477fa8bc 100644 +index 6f526e49958c26be8d7122700f8b535ac0846300..6ac536da2487ace858e54b401bc4b8412472bd10 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -@@ -139,6 +139,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -144,6 +144,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType ConnectInspector(String targetId, Inspector::FrontendChannel::ConnectionType connectionType) DisconnectInspector(String targetId) SendMessageToTargetBackend(String targetId, String message) @@ -20997,7 +20967,7 @@ index 18cad02713db009778ce6965816de2242b3d7472..5dcbfb0fff1f899c87d8620efece2598 #if ENABLE(REMOTE_INSPECTOR) SetIndicating(bool indicating); -@@ -150,6 +151,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -155,6 +156,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType #endif #if !ENABLE(IOS_TOUCH_EVENTS) && ENABLE(TOUCH_EVENTS) TouchEvent(WebKit::WebTouchEvent event) @@ -21005,7 +20975,7 @@ index 18cad02713db009778ce6965816de2242b3d7472..5dcbfb0fff1f899c87d8620efece2598 #endif CancelPointer(WebCore::PointerID pointerId, WebCore::IntPoint documentPoint) -@@ -179,6 +181,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -184,6 +186,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType LoadURLInFrame(URL url, String referrer, WebCore::FrameIdentifier frameID) LoadDataInFrame(IPC::DataReference data, String MIMEType, String encodingName, URL baseURL, WebCore::FrameIdentifier frameID) LoadRequest(struct WebKit::LoadParameters loadParameters) @@ -21013,7 +20983,7 @@ index 18cad02713db009778ce6965816de2242b3d7472..5dcbfb0fff1f899c87d8620efece2598 LoadRequestWaitingForProcessLaunch(struct WebKit::LoadParameters loadParameters, URL resourceDirectoryURL, WebKit::WebPageProxyIdentifier pageID, bool checkAssumedReadAccessToResourceURL) LoadData(struct WebKit::LoadParameters loadParameters) LoadSimulatedRequestAndResponse(struct WebKit::LoadParameters loadParameters, WebCore::ResourceResponse simulatedResponse) -@@ -330,10 +333,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -337,10 +340,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType AddMIMETypeWithCustomContentProvider(String mimeType) # Drag and drop. @@ -21026,7 +20996,7 @@ index 18cad02713db009778ce6965816de2242b3d7472..5dcbfb0fff1f899c87d8620efece2598 PerformDragControllerAction(enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData, WebKit::SandboxExtension::Handle sandboxExtensionHandle, Vector sandboxExtensionsForUpload) #endif #if ENABLE(DRAG_SUPPORT) -@@ -342,6 +345,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -349,6 +352,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType DragCancelled() #endif @@ -21038,10 +21008,10 @@ index 18cad02713db009778ce6965816de2242b3d7472..5dcbfb0fff1f899c87d8620efece2598 RequestDragStart(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) RequestAdditionalItemsForDragSession(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -index 9dc00da2770c1939891a300f2337496a9c8e701d..f1be96a7cd7d5a9da83a606f55e47d888132bf93 100644 +index a8ddb5f327457f12bea029ac41acf81fb8f01884..4077430c3ea4b793e6b3e33b523a895a51e255bc 100644 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -@@ -783,21 +783,37 @@ String WebPage::platformUserAgent(const URL&) const +@@ -781,21 +781,37 @@ String WebPage::platformUserAgent(const URL&) const bool WebPage::hoverSupportedByPrimaryPointingDevice() const { @@ -21130,10 +21100,10 @@ index bb512aec34506aa588a736b6dcf6b6f3b669e342..fbcad974ad70113d527f7cac688e47d5 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index 799613d37742363bfbdcd952979962206f0228a8..ab47a2d1591beb4007e15b10fa6dee0567ec7185 100644 +index e978b9d909badec6449a6531e5c7583ae718c7ac..2f28dd7d50a0262ceeea57a51729902e6d701696 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp -@@ -91,6 +91,7 @@ +@@ -92,6 +92,7 @@ #include "WebsiteData.h" #include "WebsiteDataStoreParameters.h" #include "WebsiteDataType.h" @@ -21141,7 +21111,7 @@ index 799613d37742363bfbdcd952979962206f0228a8..ab47a2d1591beb4007e15b10fa6dee05 #include #include #include -@@ -353,6 +354,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter +@@ -356,6 +357,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter platformInitializeProcess(parameters); updateCPULimit(); @@ -21179,7 +21149,7 @@ index 4eb3f83d7d6a9c6df19dbf53792691d9e6714d44..70f0f1681de45cef6d96acf8f6960356 - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index f381b7a3a5acf2fe8be4f79c34fd3b941fab04bc..b0b0a83e1be1d9f4539992f4deb031c57415ac7b 100644 +index a9c6eba42b3a7e3f704ed52a25741a30cc354c6b..eaf353c7764efddb5d87aede889461bee2d48951 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm @@ -4058,7 +4058,7 @@ IGNORE_WARNINGS_END @@ -21232,18 +21202,18 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 4308075122f753e72b5ac66e06db1c14f206d3d4..12bb610dcebc08773ea0a4ce2723400015a7dfda 100644 +index bd2b4dca000512ea384689cc29d6e1458fa56e12..31489e4e41eb070bb8046ca5edfc302e8df9086b 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,7 @@ WEBKIT_OPTION_BEGIN() - SET_PROJECT_VERSION(2 35 3) + SET_PROJECT_VERSION(2 37 0) +set(ENABLE_WEBKIT_LEGACY OFF) set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") -@@ -28,6 +29,10 @@ find_package(EGL) +@@ -30,6 +31,10 @@ find_package(EGL) find_package(OpenGL) find_package(OpenGLES2) @@ -21254,10 +21224,10 @@ index 4308075122f753e72b5ac66e06db1c14f206d3d4..12bb610dcebc08773ea0a4ce27234000 include(GStreamerDefinitions) SET_AND_EXPOSE_TO_BUILD(USE_CAIRO TRUE) -@@ -60,23 +65,23 @@ WEBKIT_OPTION_DEFINE(ENABLE_JOURNALD_LOG "Whether to enable journald logging" PU - WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Quartz windowing target." PUBLIC ON) +@@ -63,22 +68,22 @@ WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Qua WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ON) WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ON) + WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PUBLIC OFF) -WEBKIT_OPTION_DEFINE(USE_AVIF "Whether to enable support for AVIF images." PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES}) +WEBKIT_OPTION_DEFINE(USE_AVIF "Whether to enable support for AVIF images." PUBLIC OFF) WEBKIT_OPTION_DEFINE(USE_GTK4 "Whether to enable usage of GTK4 instead of GTK3." PUBLIC OFF) @@ -21276,13 +21246,12 @@ index 4308075122f753e72b5ac66e06db1c14f206d3d4..12bb610dcebc08773ea0a4ce27234000 # Private options specific to the GTK port. Changing these options is # completely unsupported. They are intended for use only by WebKit developers. - WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PRIVATE OFF) -WEBKIT_OPTION_DEFINE(USE_ATSPI "Whether to use the ATSPI a11y implementation instead of ATK." PRIVATE ON) +WEBKIT_OPTION_DEFINE(USE_ATSPI "Whether to use the ATSPI a11y implementation instead of ATK." PRIVATE OFF) WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS USE_OPENGL_OR_ES) WEBKIT_OPTION_DEPEND(ENABLE_ASYNC_SCROLLING USE_OPENGL_OR_ES) -@@ -121,7 +126,7 @@ endif () +@@ -123,7 +128,7 @@ endif () # without approval from a GTK reviewer. There must be strong reason to support # changing the value of the option. WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON) @@ -21291,8 +21260,12 @@ index 4308075122f753e72b5ac66e06db1c14f206d3d4..12bb610dcebc08773ea0a4ce27234000 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) -@@ -155,7 +160,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYER_BASED_SVG_ENGINE PRIVATE ON) +@@ -155,10 +160,10 @@ 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_LAYER_BASED_SVG_ENGINE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) +-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_RECORDER PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) ++WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_RECORDER PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE OFF) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21300,7 +21273,16 @@ index 4308075122f753e72b5ac66e06db1c14f206d3d4..12bb610dcebc08773ea0a4ce27234000 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) -@@ -171,6 +176,15 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) +@@ -166,7 +171,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION P + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE PRIVATE ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) +-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THUNDER PRIVATE ${ENABLE_DEVELOPER_MODE}) ++WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THUNDER PRIVATE OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON) +@@ -174,6 +179,15 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21317,7 +21299,7 @@ index 4308075122f753e72b5ac66e06db1c14f206d3d4..12bb610dcebc08773ea0a4ce27234000 # 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 9038170f06852079d4c26dac6210f87edfe55d2f..1446ccb83744336e7f763ff91de3ea102ac80274 100644 +index 88ab8303da973824dd730addca4d8210b39d5fd8..7a3964c24c902c92fdf72ef2e28a0eeaba67e5d7 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) @@ -21328,8 +21310,12 @@ index 9038170f06852079d4c26dac6210f87edfe55d2f..1446ccb83744336e7f763ff91de3ea10 set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") find_package(Cairo 1.14.0 REQUIRED) -@@ -55,7 +56,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYER_BASED_SVG_ENGINE PRIVATE ON) +@@ -54,10 +55,10 @@ 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_LAYER_BASED_SVG_ENGINE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) +-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_RECORDER PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) ++WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_RECORDER PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE OFF) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21337,7 +21323,13 @@ index 9038170f06852079d4c26dac6210f87edfe55d2f..1446ccb83744336e7f763ff91de3ea10 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON) -@@ -69,17 +70,35 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE ON) +@@ -67,30 +68,48 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${EN + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) +-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THUNDER PRIVATE ${ENABLE_DEVELOPER_MODE}) ++WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THUNDER PRIVATE OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBXR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21365,9 +21357,10 @@ index 9038170f06852079d4c26dac6210f87edfe55d2f..1446ccb83744336e7f763ff91de3ea10 WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF) WEBKIT_OPTION_DEFINE(ENABLE_JOURNALD_LOG "Whether to enable journald logging" PUBLIC ON) -WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC ${ENABLE_DEVELOPER_MODE}) ++WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC OFF) + WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PUBLIC OFF) -WEBKIT_OPTION_DEFINE(USE_AVIF "Whether to enable support for AVIF images." PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES}) -WEBKIT_OPTION_DEFINE(USE_JPEGXL "Whether to enable support for JPEG-XL images." PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES}) -+WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC OFF) +WEBKIT_OPTION_DEFINE(USE_AVIF "Whether to enable support for AVIF images." PUBLIC OFF) +WEBKIT_OPTION_DEFINE(USE_JPEGXL "Whether to enable support for JPEG-XL images." PUBLIC OFF) WEBKIT_OPTION_DEFINE(USE_LCMS "Whether to enable support for image color management using libcms2." PUBLIC ON) @@ -21377,9 +21370,8 @@ index 9038170f06852079d4c26dac6210f87edfe55d2f..1446ccb83744336e7f763ff91de3ea10 WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON) # Private options specific to the WPE port. -@@ -87,7 +106,7 @@ WEBKIT_OPTION_DEFINE(USE_GSTREAMER_HOLEPUNCH "Whether to enable GStreamer holepu + WEBKIT_OPTION_DEFINE(USE_GSTREAMER_HOLEPUNCH "Whether to enable GStreamer holepunch" PRIVATE OFF) WEBKIT_OPTION_DEFINE(USE_EXTERNAL_HOLEPUNCH "Whether to enable external holepunch" PRIVATE OFF) - WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PRIVATE OFF) WEBKIT_OPTION_DEPEND(USE_ANGLE_WEBGL ENABLE_WEBGL) -WEBKIT_OPTION_DEFINE(USE_ATSPI "Whether to use the ATSPI a11y implementation instead of ATK." PRIVATE ON) +WEBKIT_OPTION_DEFINE(USE_ATSPI "Whether to use the ATSPI a11y implementation instead of ATK." PRIVATE OFF) @@ -22035,10 +22027,10 @@ index ef4407cfc114e602d98ed81724da504f453e258f..448dd483715162baba484f756fbcc1d7 + add_subdirectory(Playwright/win) endif () diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit -index 340e142c424dccae230e8135fe7c2d004aa48375..e0f14d1c4411152ac8ca848808bd024fab25ccca 100755 +index faad78e101e3bb91dc45ae55abf90c7f6dbe4dc6..94af5f57c389d8403991ee45c95a2ff46c0208cb 100755 --- a/Tools/Scripts/build-webkit +++ b/Tools/Scripts/build-webkit -@@ -258,7 +258,7 @@ if (isAppleCocoaWebKit()) { +@@ -263,7 +263,7 @@ if (isAppleCocoaWebKit()) { push @projects, ("Source/WebKit"); if (!isEmbeddedWebKit()) { @@ -22072,10 +22064,10 @@ index f6b59db3c0eeb0612f25e85b29495cd990add74d..69df426e74d2f1336a24e744ae25915b list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index 500c71d5a4a17a183876b99b9ff0623bf6426266..08597fc8a2cbc444b27a3700a520856bad912e34 100644 +index fa6b691c74c865f9e1de39b74e3c1bce8458deed..fb493556a77b744e715b1b92ed3c8f7a9b05bfc4 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp -@@ -833,6 +833,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) +@@ -834,6 +834,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) 0, // requestStorageAccessConfirm shouldAllowDeviceOrientationAndMotionAccess, runWebAuthenticationPanel, @@ -22084,10 +22076,10 @@ index 500c71d5a4a17a183876b99b9ff0623bf6426266..08597fc8a2cbc444b27a3700a520856b decidePolicyForMediaKeySystemPermissionRequest, nullptr, // requestWebAuthenticationNoGesture diff --git a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm -index 7e7585e699663e5bdc8284e4e3540818742102ab..54d1853f259e824e5731bd39825c37629ab7ae5e 100644 +index 72f80f8c702458e517fcf1ba204c2ba74d14d9df..2f110c5d51ec2959534162d055ae1adc3ad4164c 100644 --- a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm +++ b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm -@@ -894,4 +894,51 @@ void EventSenderProxy::scaleGestureEnd(double scale) +@@ -896,4 +896,51 @@ void EventSenderProxy::scaleGestureEnd(double scale) #endif // ENABLE(MAC_GESTURE_EVENTS)