From 38dcfd785cc1e47bd757d49f6e9ed69859456dc8 Mon Sep 17 00:00:00 2001 From: Diego Pino Date: Thu, 11 Nov 2021 21:39:00 +0800 Subject: [PATCH] browser(webkit): roll to 11/11/21 (#10237) --- browser_patches/webkit/BUILD_NUMBER | 4 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 480 +++++++++--------- 3 files changed, 237 insertions(+), 249 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 39d258ab7b..8c165460e1 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1576 -Changed: lushnikov@chromium.org Tue Nov 9 08:50:26 HST 2021 +1577 +Changed: dpino@igalia.com Thu 11 Nov 2021 07:04:56 AM UTC diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 4135b9ace9..21269ea988 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="e9cefe1562bd987dd79f6d241cc92f1a9be0fc5c" +BASE_REVISION="6bd6327f36a6a75781c39b07e430054cad815b4a" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index b4a91a9363..7c5b31b0fa 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -248,7 +248,7 @@ index 48baed6a1b7ffad453379a2f1eb71b8c4925f6c4..40d36f784f46e44dbad908402a71e6b0 } diff --git a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp -index 4895c5a70d6a4745597f77163bc92e0745594829..e4905e0d4e5ff88e479147c84e41359f9274b341 100644 +index 82129b2f5439fbf59f6e8ab3c20a27f3b287a9fc..db1ce92dfdb35b9765ef743989959e0e396545a1 100644 --- a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp +++ b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp @@ -101,7 +101,7 @@ void BackendDispatcher::registerDispatcherForDomain(const String& domain, Supple @@ -1877,7 +1877,7 @@ index fabd776e617d07a6c30b9f2df30f884491259359..d9c39df7db565545108c765407ce1cda - WEBKIT_DECLARE_DIST_TARGETS(WPE wpewebkit ${TOOLS_DIR}/wpe/manifest.txt.in) -endif () diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt -index 8d8dbaa43a9cc67635b6128a43e47c74ff73b490..6133f66447a717b6c6e2de9606143d2320576dc2 100644 +index be86666961906832f585adb43edeb381ad199222..23b1fd28ee684537fcbcc9c671e2bff827f11c53 100644 --- a/Source/ThirdParty/libwebrtc/CMakeLists.txt +++ b/Source/ThirdParty/libwebrtc/CMakeLists.txt @@ -292,6 +292,11 @@ set(webrtc_SOURCES @@ -1892,7 +1892,7 @@ index 8d8dbaa43a9cc67635b6128a43e47c74ff73b490..6133f66447a717b6c6e2de9606143d23 Source/third_party/libyuv/source/compare_common.cc Source/third_party/libyuv/source/compare_gcc.cc Source/third_party/libyuv/source/convert.cc -@@ -1744,6 +1749,10 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE +@@ -1754,6 +1759,10 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE Source/third_party/libsrtp/config Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include @@ -1904,13 +1904,14 @@ index 8d8dbaa43a9cc67635b6128a43e47c74ff73b490..6133f66447a717b6c6e2de9606143d23 Source/third_party/opus/src/celt Source/third_party/opus/src/include diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -index aa40af8d25ed5a3c64450866ddeb2f054d47cf6a..a4cedfcb05c1bf305a596ee34348b231b82bbc10 100644 +index dfe8ba87c6bed689f7f044d388b7c21b19936518..3de753ce55f0626e98d19a71c31f81f2c7b65c4c 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -@@ -328,3 +328,23 @@ __ZN3rtc12SSLCertChainD1Ev - __ZN6webrtc24SctpTransportInformationD1Ev - __ZNK3rtc9IPAddressneERKS0_ - __ZN6webrtc13CryptoOptionsC1Ev +@@ -330,4 +330,23 @@ __ZN3rtc6Thread12socketserverEv + __ZN6webrtc32webrtc_sequence_checker_internal19SequenceCheckerImplC2Ev + __ZNK3rtc14RTCCertificate17GetSSLCertificateEv + __ZTVN6webrtc30WrappingAsyncDnsResolverResultE +- +__ZN8mkvmuxer11SegmentInfo15set_writing_appEPKc +__ZN8mkvmuxer11SegmentInfo4InitEv +__ZN8mkvmuxer7Segment10OutputCuesEb @@ -1945,10 +1946,10 @@ index dd884b22250114627213c4827ca176c283ec2525..9927a937145f23d05e907083a01748dd PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libwebrtc; USE_HEADERMAP = NO; diff --git a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj -index bf829f638933f828e80ba79d853003f2203ab948..268ca471d935f8075302a485bd698e69bb8eb2e2 100644 +index a4eef414ab4e495956517320ae72235750e1c5d6..e8942e7e3b9cd57ae8b25e4854df37fee8bd760e 100644 --- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj +++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj -@@ -3853,6 +3853,9 @@ +@@ -3871,6 +3871,9 @@ CDFD2FCC24C4DAF70048DAC3 /* reader.h in Headers */ = {isa = PBXBuildFile; fileRef = CDEBB40524C0191A00ADBD44 /* reader.h */; settings = {ATTRIBUTES = (Public, ); }; }; CDFD2FCD24C4DAF70048DAC3 /* status.h in Headers */ = {isa = PBXBuildFile; fileRef = CDEBB40624C0191A00ADBD44 /* status.h */; settings = {ATTRIBUTES = (Public, ); }; }; CDFD2FCE24C4DAF70048DAC3 /* webm_parser.h in Headers */ = {isa = PBXBuildFile; fileRef = CDEBB40824C0191A00ADBD44 /* webm_parser.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1958,7 +1959,7 @@ index bf829f638933f828e80ba79d853003f2203ab948..268ca471d935f8075302a485bd698e69 /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ -@@ -8272,6 +8275,9 @@ +@@ -8309,6 +8312,9 @@ CDEBB49D24C0191A00ADBD44 /* master_parser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = master_parser.h; sourceTree = ""; }; CDFD2F9624C4B2F90048DAC3 /* vp9_header_parser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = vp9_header_parser.h; sourceTree = ""; }; CDFD2F9A24C4B2F90048DAC3 /* vp9_header_parser.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = vp9_header_parser.cc; sourceTree = ""; }; @@ -1968,7 +1969,7 @@ index bf829f638933f828e80ba79d853003f2203ab948..268ca471d935f8075302a485bd698e69 FB39D0D11200F0E300088E69 /* libwebrtc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwebrtc.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ -@@ -15233,6 +15239,7 @@ +@@ -15289,6 +15295,7 @@ isa = PBXGroup; children = ( CDFD2F9224C4B2F90048DAC3 /* common */, @@ -1976,7 +1977,7 @@ index bf829f638933f828e80ba79d853003f2203ab948..268ca471d935f8075302a485bd698e69 CDEBB19224C0191800ADBD44 /* webm_parser */, ); path = libwebm; -@@ -15367,6 +15374,16 @@ +@@ -15423,6 +15430,16 @@ path = common; sourceTree = ""; }; @@ -1993,7 +1994,7 @@ index bf829f638933f828e80ba79d853003f2203ab948..268ca471d935f8075302a485bd698e69 FB39D06E1200ED9200088E69 = { isa = PBXGroup; children = ( -@@ -17431,7 +17448,7 @@ +@@ -17494,7 +17511,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -2002,7 +2003,7 @@ index bf829f638933f828e80ba79d853003f2203ab948..268ca471d935f8075302a485bd698e69 }; 5CD286461E6E154E0094FDC8 /* Check for Weak VTables and Externals */ = { isa = PBXShellScriptBuildPhase; -@@ -18574,6 +18591,7 @@ +@@ -18638,6 +18655,7 @@ 419C82F51FE20EB50040C30F /* audio_encoder_opus.cc in Sources */, 419C82F31FE20EB50040C30F /* audio_encoder_opus_config.cc in Sources */, 4140B8201E4E3383007409E6 /* audio_encoder_pcm.cc in Sources */, @@ -2010,7 +2011,7 @@ index bf829f638933f828e80ba79d853003f2203ab948..268ca471d935f8075302a485bd698e69 5CDD8FFE1E43CE3A00621E92 /* audio_encoder_pcm16b.cc in Sources */, 5CD285461E6A61D20094FDC8 /* audio_format.cc in Sources */, 41DDB26F212679D200296D47 /* audio_format_to_string.cc in Sources */, -@@ -19011,6 +19029,7 @@ +@@ -19084,6 +19102,7 @@ 417953DB216983910028266B /* metrics.cc in Sources */, 5CDD865E1E43B8B500621E92 /* min_max_operations.c in Sources */, 4189395B242A71F5007FDC41 /* min_video_bitrate_experiment.cc in Sources */, @@ -2018,7 +2019,7 @@ index bf829f638933f828e80ba79d853003f2203ab948..268ca471d935f8075302a485bd698e69 4131C387234B957D0028A615 /* moving_average.cc in Sources */, 41FCBB1521B1F7AA00A5DF27 /* moving_average.cc in Sources */, 5CD286101E6A64C90094FDC8 /* moving_max.cc in Sources */, -@@ -19243,6 +19262,7 @@ +@@ -19314,6 +19333,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 */, @@ -2027,7 +2028,7 @@ index bf829f638933f828e80ba79d853003f2203ab948..268ca471d935f8075302a485bd698e69 41323A1D2665288B00B38623 /* packet_sequencer.cc in Sources */, 4131BF2D234B88200028A615 /* rtc_stats_collector.cc in Sources */, diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -index 6d7d92a46012278c77a624e3cda462008d9bb123..353103e6e7500e237e185451cff227b60ac02fa2 100644 +index d1673e78a4c97eece29154945bf0b771a4e7ecdb..63e414c9e736759386bd9685972f1f0b69e3a4f7 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferences.yaml @@ -1031,7 +1031,7 @@ InspectorStartsAttached: @@ -2058,7 +2059,7 @@ index 6d7d92a46012278c77a624e3cda462008d9bb123..353103e6e7500e237e185451cff227b6 type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 46771902375dbe93cb30b40bbcdd3bc346f94fed..285266df0108903bef0fbfea48797a061232ea94 100644 +index 6567e8d94ea4a2368139601cf96d6b59eb415ea4..e4b8bf95eb30f2f15d73b0eb77b1c86c7d8c2f02 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -432,7 +432,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2070,7 +2071,7 @@ index 46771902375dbe93cb30b40bbcdd3bc346f94fed..285266df0108903bef0fbfea48797a06 WebCore: default: false -@@ -813,9 +813,9 @@ MaskWebGLStringsEnabled: +@@ -811,9 +811,9 @@ MaskWebGLStringsEnabled: WebKitLegacy: default: true WebKit: @@ -2082,16 +2083,7 @@ index 46771902375dbe93cb30b40bbcdd3bc346f94fed..285266df0108903bef0fbfea48797a06 # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -875,7 +875,7 @@ MediaSessionPlaylistEnabled: - type: bool - humanReadableName: "Experimental MediaSession playlist API" - humanReadableDescription: "Enable experimental MediaSession playlist API" -- condition: ENABLE(MEDIA_SESSION_PLAYLIST) -+ condition: ENABLE(MEDIA_SESSION_COORDINATOR) && ENABLE(MEDIA_SESSION_PLAYLIST) - defaultValue: - WebKitLegacy: - default: false -@@ -1239,7 +1239,7 @@ SpeechRecognitionEnabled: +@@ -1260,7 +1260,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2235,7 +2227,7 @@ index 7bb27e9976fb14e06fa4ee48553617fca06d8d7b..79ac2c9e778c1efca4f588edd4271bf8 WTF_EXPORT_PRIVATE LocalTimeOffset calculateLocalTimeOffset(double utcInMilliseconds, TimeType = UTCTime); diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index a886c66c77e58920dfb49f3100926b737f05b1df..c6c64461781cbf7c0efef6418181395252175d58 100644 +index b49690682ac7918e3a749c87b97301dcfa3574ea..51d78fcf0c3d653baf47c973475d6f5afa1049bc 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h @@ -408,7 +408,7 @@ @@ -2257,10 +2249,10 @@ index a886c66c77e58920dfb49f3100926b737f05b1df..c6c64461781cbf7c0efef64181813952 #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index d25318c3448aa20c91413e35e8702f8f04dd0a58..137541549505b553aff2f5e219e03c21872e9f3a 100644 +index 0d143bf5b31f01532fa4c2f86d9859ec1b055eca..27738a4dd54c8e6cd31972228ca798969bb9073a 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h -@@ -220,7 +220,7 @@ +@@ -224,7 +224,7 @@ #define ENABLE_DATA_DETECTION 1 #endif @@ -2282,7 +2274,7 @@ index 3901bfb0f5479064f4e7b67c90621ff26d74b580..5b3615a871d0d7123822394c94d5ce10 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index c14aede53677dbf23b23de856e8ef8226434aa1c..fdc1810b2b303adf25287ce18fa70549bd877845 100644 +index 2d13e825a586c222d505728d0fb5ffb358bdbd9f..07506cc7ab7f63885e79c1431ee536cee03520ec 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -384,7 +384,7 @@ @@ -2307,10 +2299,10 @@ index f8bedf1af5d20d9c93a96af565e416bfb0df6faa..a072e5e130822d3658cbab453aef8d16 if (Journald_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index f23c6dffb45b19f8cf066a53f2557b2abb4b3359..11d5405a2bde0d2766cfbb18653eeddafc65feac 100644 +index f88e639b9d74b9dd5448ced99181c0df0f528144..5cdd41bcc73e0266afebc93811df65121d05c760 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -797,6 +797,10 @@ JS_BINDING_IDLS := \ +@@ -935,6 +935,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2321,7 +2313,7 @@ index f23c6dffb45b19f8cf066a53f2557b2abb4b3359..11d5405a2bde0d2766cfbb18653eedda $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1337,9 +1341,6 @@ JS_BINDING_IDLS := \ +@@ -1475,9 +1479,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2408,10 +2400,10 @@ index 9f4daefcd385d534149f0a5a6ce0e8016e25638f..37f64495ec9b316bbf0a5e3212917d43 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index 92545a5cf28a80031f086e029ec9b65ec90ba5b0..d84541d6cd51c9d4ef368872283cff66e343ed3e 100644 +index 612583af688a952423a23c3e29613a7b75cc5779..9443c611ea4606bdd20383f17b6e67a1c9c72aaa 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -603,3 +603,9 @@ platform/graphics/angle/ANGLEUtilities.cpp @no-unify +@@ -605,3 +605,9 @@ platform/graphics/angle/ANGLEUtilities.cpp @no-unify platform/graphics/angle/ExtensionsGLANGLE.cpp @no-unify platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify platform/graphics/angle/TemporaryANGLESetting.cpp @no-unify @@ -2473,10 +2465,10 @@ index 9f85e4986c53a1cc8d63b3394d3f7295832af387..1228fda7c688c5b24cecaf07e21437d3 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9e8367a16 100644 +index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec06f38e82c 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5408,6 +5408,14 @@ +@@ -5412,6 +5412,14 @@ EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; }; EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; }; EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -2491,7 +2483,7 @@ index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9 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, ); }; }; -@@ -16862,6 +16870,14 @@ +@@ -17173,6 +17181,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 = ""; }; @@ -2506,7 +2498,7 @@ index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9 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 = ""; }; -@@ -22502,7 +22518,12 @@ +@@ -23122,7 +23138,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2519,7 +2511,7 @@ index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -28336,6 +28357,8 @@ +@@ -28975,6 +28996,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2528,7 +2520,7 @@ index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -30594,6 +30617,7 @@ +@@ -31226,6 +31249,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2536,7 +2528,7 @@ index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -31607,6 +31631,7 @@ +@@ -32241,6 +32265,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2544,7 +2536,7 @@ index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -33701,6 +33726,7 @@ +@@ -34334,6 +34359,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2552,7 +2544,7 @@ index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35820,9 +35846,11 @@ +@@ -36458,9 +36484,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2564,7 +2556,7 @@ index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9 B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36783,6 +36811,7 @@ +@@ -37421,6 +37449,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2572,7 +2564,7 @@ index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36852,6 +36881,7 @@ +@@ -37490,6 +37519,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2580,7 +2572,7 @@ index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36900,6 +36930,7 @@ +@@ -37538,6 +37568,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2588,7 +2580,7 @@ index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -37432,6 +37463,7 @@ +@@ -38070,6 +38101,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2597,7 +2589,7 @@ index c3d3d07b654ce06bdb463c882e3dca1e10f7529c..55af94f6e9d84ee1201c7b15f42502d9 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 c8233c8b74be208f09ea0df9458d097f541a2440..5ca880d8850bb985b267cbc74130aa318236a2ca 100644 +index 3b66232fdce0d23055531d96473d1aee5cf004ef..da28fe4174bb30136fbdb863a5a6366f2b87c0a9 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -60,6 +60,7 @@ @@ -2608,7 +2600,7 @@ index c8233c8b74be208f09ea0df9458d097f541a2440..5ca880d8850bb985b267cbc74130aa31 #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3361,10 +3362,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3508,10 +3509,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (useParentData ? m_isIgnoredFromParentData.isPresentationalChildOfAriaRole : isPresentationalChildOfAriaRole()) return AccessibilityObjectInclusion::IgnoreObject; @@ -2628,7 +2620,7 @@ index c8233c8b74be208f09ea0df9458d097f541a2440..5ca880d8850bb985b267cbc74130aa31 { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index dbfedf3082137571888c9f350310529e1f2fb324..896847275f5b9f1af723a56149f99439c9e3e222 100644 +index ab59be81511cb7e2172e2d1a1af92d699b547ed1..d83ec1dedc4956bf3f04b363912d04c941dee774 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h @@ -109,6 +109,8 @@ namespace WebCore { @@ -2907,10 +2899,10 @@ index 40b012a9adfbd4f5e265880509e36642669a683c..8b8e44114491fff5750bf7ddd5ff685f return; diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp -index c33bc989d95a21425d43643795190cf40f7e9684..d54965c544b8cac7ebc1e9e408db8ae08e25be61 100644 +index 833c0ba844f87bced9b2430138ec7676c883bffc..ea8adf5a94705ff9e7c1ec8301a980a4d48e83d0 100644 --- a/Source/WebCore/inspector/InspectorController.cpp +++ b/Source/WebCore/inspector/InspectorController.cpp -@@ -374,8 +374,8 @@ void InspectorController::inspect(Node* node) +@@ -382,8 +382,8 @@ void InspectorController::inspect(Node* node) if (!enabled()) return; @@ -2921,7 +2913,7 @@ index c33bc989d95a21425d43643795190cf40f7e9684..d54965c544b8cac7ebc1e9e408db8ae0 ensureDOMAgent().inspect(node); } -@@ -516,4 +516,24 @@ void InspectorController::didComposite(Frame& frame) +@@ -524,4 +524,24 @@ void InspectorController::didComposite(Frame& frame) InspectorInstrumentation::didComposite(frame); } @@ -2947,7 +2939,7 @@ index c33bc989d95a21425d43643795190cf40f7e9684..d54965c544b8cac7ebc1e9e408db8ae0 + } // namespace WebCore diff --git a/Source/WebCore/inspector/InspectorController.h b/Source/WebCore/inspector/InspectorController.h -index 11c26ccfd836c23ec85a52082e4eb4f4a1ffde25..edf37988c97b0fd2bb7a957b56ec028421d45083 100644 +index f6fec7cfbcbd2d7fba30bdd3138e0edfb3f69054..519786c307944a5ca4ba468513ba257b8c28def2 100644 --- a/Source/WebCore/inspector/InspectorController.h +++ b/Source/WebCore/inspector/InspectorController.h @@ -101,6 +101,10 @@ public: @@ -2961,7 +2953,7 @@ index 11c26ccfd836c23ec85a52082e4eb4f4a1ffde25..edf37988c97b0fd2bb7a957b56ec0284 // Testing support. bool isUnderTest() const { return m_isUnderTest; } void setIsUnderTest(bool isUnderTest) { m_isUnderTest = isUnderTest; } -@@ -152,6 +156,7 @@ private: +@@ -153,6 +157,7 @@ private: bool m_isAutomaticInspection { false }; bool m_pauseAfterInitialization = { false }; bool m_didCreateLazyAgents { false }; @@ -5385,7 +5377,7 @@ 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 27c64d75a8a2ab3e40ee3c486643c1391ce1abd7..afcd17effbd7b292e077c818e8074f30796790fe 100644 +index 067f413f5c1892c53d93ce298af7a0803c64cea2..1d1e160e472cd96901d686540da6446ab8101e4a 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -1467,8 +1467,6 @@ void DocumentLoader::detachFromFrame() @@ -5416,7 +5408,7 @@ index 4fbfd7120199d27cfa87bdd596737106bce08db0..4f769e266eb4d33ca9c8fa553a4d763a DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index 95ef5ca85ce06d1bc82c7f5ee7d55dc77ec48b0e..e1f813ba74d91949bbbc52223f4a0fc0f6b14499 100644 +index 5661083805664e0119f11ffc32ea7e1927fc657b..51c1bff669efa35f54f8f0b75a0527bb97071ab3 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -1154,6 +1154,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat @@ -5584,10 +5576,10 @@ index fa84c366c63175f9fb4730eb85c4677fc3d6368f..ecf5b8dc97e35910baf493424e673155 void ProgressTracker::incrementProgress(ResourceLoaderIdentifier identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index 23a58bf8b83ce2f56be02162db5784ba7381f3e0..dd0130bc020a72b135654c2623ea61da05a9987c 100644 +index 5f6d5b4f2ec50eb17263999096d75cf153597043..64836756158b7c48ed31bca6fc6b0f6823898b3f 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h -@@ -306,7 +306,7 @@ public: +@@ -307,7 +307,7 @@ public: #endif #if ENABLE(ORIENTATION_EVENTS) @@ -5597,7 +5589,7 @@ index 23a58bf8b83ce2f56be02162db5784ba7381f3e0..dd0130bc020a72b135654c2623ea61da #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 57b3357a15462924c0118ef276e499c012454211..0712f0da9850e94ad585aca90014f73ebf455cf3 100644 +index 6ebbc47a46cd12e788888efe477add63cb6d1db7..e93bfb786d89ac4c8c07dd0b714b18791380f114 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -138,6 +138,7 @@ @@ -5695,7 +5687,7 @@ index 57b3357a15462924c0118ef276e499c012454211..0712f0da9850e94ad585aca90014f73e return swallowEvent; } -@@ -4109,7 +4109,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4100,7 +4100,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -5711,7 +5703,7 @@ index 57b3357a15462924c0118ef276e499c012454211..0712f0da9850e94ad585aca90014f73e auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4520,7 +4527,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4511,7 +4518,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -5721,7 +5713,7 @@ index 57b3357a15462924c0118ef276e499c012454211..0712f0da9850e94ad585aca90014f73e PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4647,6 +4655,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4638,6 +4646,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -5732,7 +5724,7 @@ index 57b3357a15462924c0118ef276e499c012454211..0712f0da9850e94ad585aca90014f73e m_touchPressed = touches->length() > 0; if (allTouchReleased) diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h -index a539bb773e7885f17b1383ce90b8f95ea57d0554..fe955651e7ac472cc9261d0e1bfff45d1cce5c78 100644 +index 36c80230d2b2e761a0b666c943061f9b62f547b3..78df0795a1add4fe962e64457a640959bb06cdfd 100644 --- a/Source/WebCore/page/EventHandler.h +++ b/Source/WebCore/page/EventHandler.h @@ -135,9 +135,7 @@ public: @@ -5756,7 +5748,7 @@ index a539bb773e7885f17b1383ce90b8f95ea57d0554..fe955651e7ac472cc9261d0e1bfff45d WEBCORE_EXPORT bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&); -@@ -487,10 +483,8 @@ private: +@@ -486,10 +482,8 @@ private: void defaultTabEventHandler(KeyboardEvent&); void defaultArrowEventHandler(FocusDirection, KeyboardEvent&); @@ -5767,7 +5759,7 @@ index a539bb773e7885f17b1383ce90b8f95ea57d0554..fe955651e7ac472cc9261d0e1bfff45d // The following are called at the beginning of handleMouseUp and handleDrag. // If they return true it indicates that they have consumed the event. -@@ -498,9 +492,10 @@ private: +@@ -497,9 +491,10 @@ private: #if ENABLE(DRAG_SUPPORT) bool eventLoopHandleMouseDragged(const MouseEventWithHitTestResults&); @@ -5779,7 +5771,7 @@ index a539bb773e7885f17b1383ce90b8f95ea57d0554..fe955651e7ac472cc9261d0e1bfff45d enum class SetOrClearLastScrollbar { Clear, Set }; void updateLastScrollbarUnderMouse(Scrollbar*, SetOrClearLastScrollbar); -@@ -592,8 +587,8 @@ private: +@@ -591,8 +586,8 @@ private: Timer m_autoHideCursorTimer; #endif @@ -5810,7 +5802,7 @@ index 602631bb7cd10860b1a3121043c97d8efe44761d..867320c576201d35124a186ac60c2927 request.setHTTPHeaderField(HTTPHeaderName::Accept, "text/event-stream"); request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache"); diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp -index 82a763f82760181f46bb8f341fe7818e36c165d4..16dd60a9bc541525ebca7b550d1d2d2ca1516c97 100644 +index 7788ee5755febf003f929b6df5de094fd7a9338f..227640e9a941afe56dc2d80512e48d195de9aef9 100644 --- a/Source/WebCore/page/Frame.cpp +++ b/Source/WebCore/page/Frame.cpp @@ -39,6 +39,7 @@ @@ -6210,7 +6202,7 @@ index 82a763f82760181f46bb8f341fe7818e36c165d4..16dd60a9bc541525ebca7b550d1d2d2c #undef FRAME_RELEASE_LOG_ERROR diff --git a/Source/WebCore/page/Frame.h b/Source/WebCore/page/Frame.h -index f548b0fc5b6a8754bf7092eafcd8ee25f93fc1b0..6d5c3ce719bb2d6c0ffe0099a3ed34678cd36192 100644 +index 124df1885f71dcd7d65e01d69fd79b104a07e672..51f87cd8710add1be6b6e3b99d9dc5bd5bbd264e 100644 --- a/Source/WebCore/page/Frame.h +++ b/Source/WebCore/page/Frame.h @@ -112,8 +112,8 @@ enum { @@ -6340,10 +6332,10 @@ index 28d1fc3242174a680711027877d4153923790220..058b5309eed081fcc1e4158f66e80642 if (stateObjectType == StateObjectType::Push) { frame->loader().history().pushState(WTFMove(data), title, fullURL.string()); diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp -index 8146cb59fcb71c710e6f722ac6d5ce559f649337..ea2ff713c741b5049d419fe21921d28bad04937a 100644 +index 1acd59697a4469aa2af94522dbfde29a7272ae9b..4602358e73fbf9a32a1b5e9667d667fb1b55a322 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -463,6 +463,37 @@ void Page::setOverrideViewportArguments(const std::optional& +@@ -465,6 +465,37 @@ void Page::setOverrideViewportArguments(const std::optional& document->updateViewportArguments(); } @@ -6381,7 +6373,7 @@ index 8146cb59fcb71c710e6f722ac6d5ce559f649337..ea2ff713c741b5049d419fe21921d28b ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -1299,10 +1330,6 @@ void Page::didCommitLoad() +@@ -1301,10 +1332,6 @@ void Page::didCommitLoad() m_isEditableRegionEnabled = false; #endif @@ -6392,7 +6384,7 @@ index 8146cb59fcb71c710e6f722ac6d5ce559f649337..ea2ff713c741b5049d419fe21921d28b resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3306,6 +3333,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3308,6 +3335,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6410,10 +6402,10 @@ index 8146cb59fcb71c710e6f722ac6d5ce559f649337..ea2ff713c741b5049d419fe21921d28b { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 2637a29dbf54b38f9cd628ceef81e2ed7a30a05b..aaf09725c7f88082f2ec797f6b4389a0f7771e6d 100644 +index 5a4c214014ccfc39aea38c9e50fa37d18cced861..939c9009578aae8fb801dd56c4072ddb8da5ef33 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h -@@ -266,6 +266,9 @@ public: +@@ -268,6 +268,9 @@ public: const std::optional& overrideViewportArguments() const { return m_overrideViewportArguments; } WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional&); @@ -6423,7 +6415,7 @@ index 2637a29dbf54b38f9cd628ceef81e2ed7a30a05b..aaf09725c7f88082f2ec797f6b4389a0 static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -318,6 +321,10 @@ public: +@@ -320,6 +323,10 @@ public: DragCaretController& dragCaretController() const { return *m_dragCaretController; } #if ENABLE(DRAG_SUPPORT) DragController& dragController() const { return *m_dragController; } @@ -6434,7 +6426,7 @@ index 2637a29dbf54b38f9cd628ceef81e2ed7a30a05b..aaf09725c7f88082f2ec797f6b4389a0 #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -478,6 +485,8 @@ public: +@@ -480,6 +487,8 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6443,7 +6435,7 @@ index 2637a29dbf54b38f9cd628ceef81e2ed7a30a05b..aaf09725c7f88082f2ec797f6b4389a0 #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -862,6 +871,11 @@ public: +@@ -870,6 +879,11 @@ public: WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; @@ -6455,7 +6447,7 @@ index 2637a29dbf54b38f9cd628ceef81e2ed7a30a05b..aaf09725c7f88082f2ec797f6b4389a0 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -952,6 +966,9 @@ private: +@@ -961,6 +975,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6465,7 +6457,7 @@ index 2637a29dbf54b38f9cd628ceef81e2ed7a30a05b..aaf09725c7f88082f2ec797f6b4389a0 #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1031,6 +1048,7 @@ private: +@@ -1040,6 +1057,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6473,7 +6465,7 @@ index 2637a29dbf54b38f9cd628ceef81e2ed7a30a05b..aaf09725c7f88082f2ec797f6b4389a0 #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1196,6 +1214,11 @@ private: +@@ -1209,6 +1227,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6547,10 +6539,10 @@ index f90b8e6de036986779294cbb03c753ffcaf71801..af9672ae6605c341f2cbda8559e5441c #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index 71adc0493b13f707bef23f07aaeb0cbcdf1be1f4..c32cb7c50727c298ae27774bf530e4d61b6c94e1 100644 +index cfc7731777a37f6ba2d2ac28056544e79c260ef2..b754bf8d49deda9f9b4f47404826b2f285346547 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h -@@ -196,6 +196,7 @@ public: +@@ -193,6 +193,7 @@ public: void setMouseEventsSimulationEnabled(bool isEnabled) { m_mouseEventsSimulationEnabled = isEnabled; } bool touchEventsEnabled() const; void setTouchEventsEnabled(bool isEnabled) { m_touchEventsEnabled = isEnabled; } @@ -6612,10 +6604,10 @@ index 3bec0aef174336939838fb1069fffbcb9f3d5604..566ef3806be3c5ccf1bb951251c2a90d RefPtr SocketProvider::createWebSocketChannel(Document&, WebSocketChannelClient&) diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -index 45b1d4af13e1702435c23615060d87000e91241f..a5cd4fe675a110aa6da305a11a42cbadfbb47245 100644 +index 9a4907af08ad2c085de8ae166b098e3504390ef4..b96e739616ba6172c615ab42fb709985e056b8a6 100644 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -@@ -292,6 +292,8 @@ bool ContentSecurityPolicy::protocolMatchesSelf(const URL& url) const +@@ -293,6 +293,8 @@ bool ContentSecurityPolicy::protocolMatchesSelf(const URL& url) const template typename std::enable_if::value, bool>::type ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, Predicate&& predicate, Args&&... args) const { @@ -6624,7 +6616,7 @@ index 45b1d4af13e1702435c23615060d87000e91241f..a5cd4fe675a110aa6da305a11a42cbad bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly; for (auto& policy : m_policies) { if (policy->isReportOnly() != isReportOnly) -@@ -305,6 +307,8 @@ typename std::enable_if bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, ViolatedDirectiveCallback&& callback, Predicate&& predicate, Args&&... args) const { @@ -6633,7 +6625,7 @@ index 45b1d4af13e1702435c23615060d87000e91241f..a5cd4fe675a110aa6da305a11a42cbad bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly; bool isAllowed = true; for (auto& policy : m_policies) { -@@ -321,6 +325,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit +@@ -322,6 +326,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit template bool ContentSecurityPolicy::allPoliciesAllow(ViolatedDirectiveCallback&& callback, Predicate&& predicate, Args&&... args) const { @@ -6929,7 +6921,7 @@ index d47d193e8bee85c2d2a35e218decdd84b7212dc1..a1cd2f3b8f025436b596d1b1081357d9 #endif diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h -index 9bc30cd29bda92c0b6a10f35bab2b69e1d7cddf1..e5e08abaf3c5277935d5ac199c7da75cc156e5e5 100644 +index 797997c2ea7aa9f8cdc9e8a7d9d8f4448718b531..c0d2aa0590e44241ac779db1d4868473ddcd35f3 100644 --- a/Source/WebCore/platform/ScrollableArea.h +++ b/Source/WebCore/platform/ScrollableArea.h @@ -103,7 +103,7 @@ public: @@ -8785,10 +8777,10 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp -index 14a5119206b7e609957c91b3b747f4bb51b3d7a0..5710f65d8c7bd4d423def14247bb1a9e54924ec5 100644 +index f576228defabb6f8495cfeab5ed13dbf2b5b03fb..57834044927c14d672d713ecadb81f8ad0ad2103 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp -@@ -2607,7 +2607,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay +@@ -2618,7 +2618,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay ScrollAlignment::Behavior scrollX; LayoutRect exposeRectX(exposeRect.x(), visibleRect.y(), exposeRect.width(), visibleRect.height()); LayoutUnit intersectWidth = intersection(visibleRect, exposeRectX).width(); @@ -9255,19 +9247,19 @@ index d602a5f90999fc7f440e2468d40332625ed37083..577b76728f762e7f5aa509531a65eaab void didReceiveMessage(IPC::Connection&, IPC::Decoder&); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 3cf6743a23989122cdd3d9c88d394f18cd52bd3a..72542900893c6c98914fa7e23646bbad8002b980 100644 +index c3d18f702e38e0c84d956474bcb48aebaf1f60c2..c90d063a60e49cbc9a333a79c192bfc93f36d07d 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -720,7 +720,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se - NegotiatedLegacyTLS negotiatedLegacyTLS = NegotiatedLegacyTLS::No; +@@ -735,7 +735,7 @@ void NetworkSessionCocoa::setClientAuditToken(const WebCore::AuthenticationChall if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { + sessionCocoa->setClientAuditToken(challenge); - if (NetworkSessionCocoa::allowsSpecificHTTPSCertificateForHost(challenge)) + if (sessionCocoa->ignoreCertificateErrors() || sessionCocoa->allowsSpecificHTTPSCertificateForHost(challenge)) return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); NSURLSessionTaskTransactionMetrics *metrics = task._incompleteTaskMetrics.transactionMetrics.lastObject; -@@ -953,6 +953,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END +@@ -968,6 +968,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics())); @@ -9843,7 +9835,7 @@ index f2f3979fcac9dfd97d0e0ead600fe35eb8defd40..ac91412e1a96bdf521b1890a66e465dc NSEvent* nativeEvent() const { return m_nativeEvent.get(); } #elif PLATFORM(GTK) diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -index 2bb58ffb74287265ccc3855744fad5dd01e2c953..a0d65b6248b4e4c460e32d41b3027e83f376baa2 100644 +index 32b4229e12292c54b6d1caedaaa607ec8a07ccc6..feedac190ad20ab649191dcb4f4e58f0c7960c07 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -119,6 +119,10 @@ @@ -9857,7 +9849,7 @@ index 2bb58ffb74287265ccc3855744fad5dd01e2c953..a0d65b6248b4e4c460e32d41b3027e83 // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1375,6 +1379,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1377,6 +1381,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -9867,7 +9859,7 @@ index 2bb58ffb74287265ccc3855744fad5dd01e2c953..a0d65b6248b4e4c460e32d41b3027e83 } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1403,6 +1410,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1405,6 +1412,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -9880,7 +9872,7 @@ index 2bb58ffb74287265ccc3855744fad5dd01e2c953..a0d65b6248b4e4c460e32d41b3027e83 return true; } -@@ -1416,6 +1429,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1418,6 +1431,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -9892,7 +9884,7 @@ index 2bb58ffb74287265ccc3855744fad5dd01e2c953..a0d65b6248b4e4c460e32d41b3027e83 #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1439,9 +1457,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1441,9 +1459,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -9910,7 +9902,7 @@ index 2bb58ffb74287265ccc3855744fad5dd01e2c953..a0d65b6248b4e4c460e32d41b3027e83 if (!decoder.decode(pasteboardName)) return false; -@@ -1457,8 +1482,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1459,8 +1484,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -10088,7 +10080,7 @@ index 582c5e3be33511629ccc66f821ecf2e01bc536d9..2d1bb12439f1f720c8ff77130f56d1ce return std::nullopt; diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h -index 26ad3e0b3fcbc818f99fcb7ae06eb75e95e1a2d1..989137fd39ca671a449517120f4ec01e6e181af1 100644 +index ebd51f5461fd35aa408fcde6927a16186374f6a9..fc2274d0f5b03f5ff3eb5b20060b24c473d9bdb1 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.h +++ b/Source/WebKit/Shared/WebPageCreationParameters.h @@ -254,6 +254,8 @@ struct WebPageCreationParameters { @@ -10598,7 +10590,7 @@ index 94419dd86f079c5c53e68ce8e79b915505a87ab0..076d3c33ccbdd2894239375a308df5bd WebProcess/WebPage/AcceleratedSurface.cpp diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp -index 8364a0c021217339f119faed9e3a1666f1c3fdd0..9ce2df000ad793467ae71fbdfb62146234b2145a 100644 +index cfd9c3981337c7dd02c623ce8ba686ea36bbffb9..27148d775f97804de9d7a88d57ba1dd5f60c8e16 100644 --- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp +++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp @@ -54,6 +54,9 @@ Ref ProcessPoolConfiguration::copy() @@ -10612,7 +10604,7 @@ index 8364a0c021217339f119faed9e3a1666f1c3fdd0..9ce2df000ad793467ae71fbdfb621462 copy->m_shouldTakeUIBackgroundAssertion = this->m_shouldTakeUIBackgroundAssertion; copy->m_shouldCaptureDisplayInUIProcess = this->m_shouldCaptureDisplayInUIProcess; diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h -index bc05fe15f5eacdac6f25cde2a6a488fb84c3e03c..79a9082771d4af4ad31157fac8ca2e2af69af148 100644 +index cc642c51ba663e843df54d14cfccb6d4ef81726c..229ae1a7df1e418f9b09bf9c3c3bb1edc3292a7c 100644 --- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h +++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h @@ -102,6 +102,11 @@ public: @@ -10627,7 +10619,7 @@ index bc05fe15f5eacdac6f25cde2a6a488fb84c3e03c..79a9082771d4af4ad31157fac8ca2e2a bool alwaysRunsAtBackgroundPriority() const { return m_alwaysRunsAtBackgroundPriority; } void setAlwaysRunsAtBackgroundPriority(bool alwaysRunsAtBackgroundPriority) { m_alwaysRunsAtBackgroundPriority = alwaysRunsAtBackgroundPriority; } -@@ -170,6 +175,9 @@ private: +@@ -175,6 +180,9 @@ private: bool m_attrStyleEnabled { false }; bool m_shouldThrowExceptionForGlobalConstantRedeclaration { true }; Vector m_overrideLanguages; @@ -10638,10 +10630,10 @@ index bc05fe15f5eacdac6f25cde2a6a488fb84c3e03c..79a9082771d4af4ad31157fac8ca2e2a bool m_shouldTakeUIBackgroundAssertion { true }; bool m_shouldCaptureDisplayInUIProcess { DEFAULT_CAPTURE_DISPLAY_IN_UI_PROCESS }; diff --git a/Source/WebKit/UIProcess/API/APIUIClient.h b/Source/WebKit/UIProcess/API/APIUIClient.h -index 658cebc3c285aa6d898269950bebdfdcfb1c97cf..13442f93d7996ca63237304c4fe352c271ce9647 100644 +index dd084ffe0b607f134387e803637e72fc177bac1e..b9a7dad492368ada08a8afe9afe5b0296f138f62 100644 --- a/Source/WebKit/UIProcess/API/APIUIClient.h +++ b/Source/WebKit/UIProcess/API/APIUIClient.h -@@ -94,6 +94,7 @@ public: +@@ -98,6 +98,7 @@ public: virtual void runJavaScriptAlert(WebKit::WebPageProxy&, const WTF::String&, WebKit::WebFrameProxy*, WebKit::FrameInfoData&&, Function&& completionHandler) { completionHandler(); } virtual void runJavaScriptConfirm(WebKit::WebPageProxy&, const WTF::String&, WebKit::WebFrameProxy*, WebKit::FrameInfoData&&, Function&& completionHandler) { completionHandler(false); } virtual void runJavaScriptPrompt(WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, WebKit::FrameInfoData&&, Function&& completionHandler) { completionHandler(WTF::String()); } @@ -10693,7 +10685,7 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index 67a7605ff5ea9dfe9d19bea1b564eb2c1d1e576d..0fbc4a5bfe9b36b252d370f478396d229bd915c1 100644 +index d72cc5b353d34fb0ce233ddfc8ed4a14599e8585..d9b6886ca181c532b74248d186b8014593b7f118 100644 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp @@ -1775,6 +1775,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient @@ -10984,22 +10976,22 @@ index 66bb7757b884d36211ec3b29dde9eab226b2a0ce..108f46d2488bf66e84ff223dc4113ab0 #if ENABLE(INSPECTOR_EXTENSIONS) diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h -index 8a62271a7c58409835f1d7bfe993220207c85457..9500591716027a3a09bee5dc0608f64991b06ce5 100644 +index 784983c103b29ca3c774c6204926594ebc8dfee4..08ad04cd82b4187eed05b3fa18f01bd38ecbe207 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h -@@ -65,6 +65,7 @@ WK_CLASS_AVAILABLE(macos(10.10), ios(8.0)) - #endif +@@ -66,6 +66,7 @@ WK_CLASS_AVAILABLE(macos(10.10), ios(8.0)) @property (nonatomic) pid_t presentingApplicationPID WK_API_AVAILABLE(macos(10.13), ios(11.0)); + @property (nonatomic) audit_token_t presentingApplicationProcessToken WK_API_AVAILABLE(macos(10.13), ios(11.3)); @property (nonatomic) BOOL processSwapsOnNavigation WK_API_AVAILABLE(macos(10.14), ios(12.0)); +@property (nonatomic) BOOL forceOverlayScrollbars WK_API_AVAILABLE(macos(10.14)); @property (nonatomic) BOOL alwaysKeepAndReuseSwappedProcesses WK_API_AVAILABLE(macos(10.14), ios(12.0)); @property (nonatomic) BOOL processSwapsOnWindowOpenWithOpener WK_API_AVAILABLE(macos(10.14), ios(12.0)); @property (nonatomic) BOOL processSwapsOnNavigationWithinSameNonHTTPFamilyProtocol WK_API_AVAILABLE(macos(12.0), ios(15.0)); diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm -index e23314a2904c781ca23a9f8d906299740677759e..941d0b483bba4647a9b4b160e9c3c9a79b9c0494 100644 +index 92b509ad482f4d3b5a69a00b0fd23c4d0aab16ae..33c77395b21577e8c6911a60fb1c674a75837c8f 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm -@@ -245,6 +245,16 @@ +@@ -257,6 +257,16 @@ return _processPoolConfiguration->processSwapsOnNavigation(); } @@ -12269,10 +12261,10 @@ index 8a95a3f8036bb0c664954c23ba3ecf72058ae711..dd10e28e2499cd84be2d072dc7567050 namespace WebKit { diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h -index 5cbca77a100f408ba56545be9b099fbe888476d9..e7eeb441460b23cf7e98b78ed9f05a80609cd4e5 100644 +index 9d5ef2843435bf0a681cfc0ce1b10b122b4f0615..1d041df6a5bb6d79e0b6f7a5ad0e281d35bcd539 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h -@@ -94,6 +94,7 @@ private: +@@ -95,6 +95,7 @@ private: void runJavaScriptAlert(WebPageProxy&, const WTF::String&, WebFrameProxy*, FrameInfoData&&, Function&& completionHandler) final; void runJavaScriptConfirm(WebPageProxy&, const WTF::String&, WebFrameProxy*, FrameInfoData&&, Function&& completionHandler) final; void runJavaScriptPrompt(WebPageProxy&, const WTF::String&, const WTF::String&, WebFrameProxy*, FrameInfoData&&, Function&&) final; @@ -12280,7 +12272,7 @@ index 5cbca77a100f408ba56545be9b099fbe888476d9..e7eeb441460b23cf7e98b78ed9f05a80 void presentStorageAccessConfirmDialog(const WTF::String& requestingDomain, const WTF::String& currentDomain, CompletionHandler&&); void requestStorageAccessConfirm(WebPageProxy&, WebFrameProxy*, const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, CompletionHandler&&) final; void decidePolicyForGeolocationPermissionRequest(WebPageProxy&, WebFrameProxy&, const FrameInfoData&, Function&) final; -@@ -186,6 +187,7 @@ private: +@@ -187,6 +188,7 @@ private: bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler : 1; @@ -12289,7 +12281,7 @@ index 5cbca77a100f408ba56545be9b099fbe888476d9..e7eeb441460b23cf7e98b78ed9f05a80 bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1; diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -index a004a15db9711927e2587c61b17a7c193cb0e8e2..1d373e6efa8c34a1cecef318deca1197f038fa1f 100644 +index 1cd5d0cc9b389a83529fc1d5b74b823cca5073a5..937a3e2abf3a411557db9758b294d0d5a5bed255 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm @@ -109,6 +109,7 @@ void UIDelegate::setDelegate(id delegate) @@ -12317,10 +12309,10 @@ index a004a15db9711927e2587c61b17a7c193cb0e8e2..1d373e6efa8c34a1cecef318deca1197 { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index 915b7f4c648e2fe0198efd15b55ff451181ad6f7..994a1eb25362a259f33e9307833f66d1d7573b8d 100644 +index 6a50a08103395865839ffa780e835b758335fabe..f2dd42fde3a21cc83f176613c671debe1f877e7a 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -@@ -35,6 +35,7 @@ +@@ -36,6 +36,7 @@ #import "InsertTextOptions.h" #import "LoadParameters.h" #import "PageClient.h" @@ -12328,7 +12320,7 @@ index 915b7f4c648e2fe0198efd15b55ff451181ad6f7..994a1eb25362a259f33e9307833f66d1 #import "QuarantineSPI.h" #import "QuickLookThumbnailLoader.h" #import "SafeBrowsingSPI.h" -@@ -226,9 +227,66 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting() +@@ -236,9 +237,66 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting() void WebPageProxy::startDrag(const DragItem& dragItem, const ShareableBitmap::Handle& dragImageHandle) { @@ -12396,10 +12388,10 @@ index 915b7f4c648e2fe0198efd15b55ff451181ad6f7..994a1eb25362a259f33e9307833f66d1 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index 11f053f1b537ea64fc241e60a3de970619c01d8f..b74a97669692fd9800cabd4db26290f3b7ff267e 100644 +index 418a09dac38eb9bfd5189e575fd08e05465e9190..1756a5dfea9a931f376ebf946cbdff11be911ce4 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -447,7 +447,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -422,7 +422,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -12408,7 +12400,7 @@ index 11f053f1b537ea64fc241e60a3de970619c01d8f..b74a97669692fd9800cabd4db26290f3 #endif #if PLATFORM(IOS) -@@ -758,8 +758,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -730,8 +730,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -16120,7 +16112,7 @@ index 5e2ec75599c56aca546bad2a5c63dee1a0a6732f..9fccdf89503e1a089fe20e00077d0660 virtual RefPtr takeViewSnapshot(std::optional&&) = 0; #endif diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -index db9325c2eb5a97f6e8089c0eac5e506e02675e0d..b95ea50ea5d84c817e0082a00f1415c7adf82a00 100644 +index 1df7f2806aa84c341fb84d65ac554e43d5e1f701..f58bc339eeee61e8c386f7542c11b6a11cf48b66 100644 --- a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp +++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp @@ -629,3 +629,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option @@ -16431,7 +16423,7 @@ index 0000000000000000000000000000000000000000..6d04f9290135069359ce6bf872654648 + +#endif // ENABLE(REMOTE_INSPECTOR) diff --git a/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp b/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp -index 53cadd34ab9280e20f73f1a2ba3bc13d1a541938..d354d017ff7307a2356ffa626e1c202efbda1090 100644 +index f5a6164e831c968995e332ef0269c0b8c18cf9f2..d69ae8cdca3c77d6325c703e65bd97136587f3bb 100644 --- a/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp +++ b/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp @@ -37,6 +37,8 @@ @@ -17151,7 +17143,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4f0aa347b 100644 +index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c2c8c991e 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -245,6 +245,9 @@ @@ -17444,7 +17436,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3489,6 +3635,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3490,6 +3636,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) { @@ -17452,7 +17444,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4209,6 +4356,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4210,6 +4357,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17464,7 +17456,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4542,6 +4694,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4543,6 +4695,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17472,7 +17464,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4766,6 +4919,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4767,6 +4920,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17481,7 +17473,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 // 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; -@@ -5234,7 +5389,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5235,7 +5390,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) { @@ -17497,7 +17489,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5771,6 +5933,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5792,6 +5954,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa auto* originatingPage = m_process->webPage(originatingPageID); auto originatingFrameInfo = API::FrameInfo::create(WTFMove(originatingFrameInfoData), originatingPage); auto mainFrameURL = m_mainFrame ? m_mainFrame->url() : URL(); @@ -17505,7 +17497,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 auto completionHandler = [this, protectedThis = Ref { *this }, mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5814,6 +5977,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5835,6 +5998,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17513,7 +17505,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 } void WebPageProxy::exitFullscreenImmediately() -@@ -5849,6 +6013,10 @@ void WebPageProxy::closePage() +@@ -5870,6 +6034,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17524,7 +17516,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5885,6 +6053,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5906,6 +6074,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 { @@ -17533,7 +17525,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -5906,6 +6076,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5927,6 +6097,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17542,7 +17534,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 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 { -@@ -5929,6 +6101,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -5950,6 +6122,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17551,7 +17543,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 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 { -@@ -6056,6 +6230,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6077,6 +6251,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17560,7 +17552,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7288,6 +7464,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7308,6 +7484,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17569,7 +17561,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 } break; } -@@ -7302,10 +7480,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7322,10 +7500,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -17586,7 +17578,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 break; } -@@ -7314,7 +7495,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7334,7 +7515,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()); @@ -17594,7 +17586,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7333,7 +7513,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7353,7 +7533,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); @@ -17602,7 +17594,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7342,6 +7521,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7362,6 +7541,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17610,7 +17602,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 } break; } -@@ -7696,7 +7876,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7716,7 +7896,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -17622,7 +17614,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8077,6 +8260,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -8097,6 +8280,7 @@ static const Vector& mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17630,7 +17622,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8272,6 +8456,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8292,6 +8476,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -17639,7 +17631,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 #if PLATFORM(GTK) parameters.gtkSettings = GtkSettingsManager::singleton().settingsState(); #endif -@@ -8352,6 +8538,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8373,6 +8559,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17654,7 +17646,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8445,6 +8639,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8466,6 +8660,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17671,7 +17663,7 @@ index 4dfed8dcc64a9b6706059799528dccb73626903d..08d2c12fdf13f64bcaa052b833acfdc4 // 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 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db4f4298c0 100644 +index dfcd414d1aab1cef85784cb4accf503e980d7efe..70befa965830294e1b0ae07984c9a60c0d06c5a3 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17709,7 +17701,7 @@ index 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db #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; @@ -17717,7 +17709,7 @@ index 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db class FloatRect; class FontAttributeChanges; class FontChanges; -@@ -255,7 +268,6 @@ class GraphicsLayer; +@@ -256,7 +269,6 @@ class GraphicsLayer; class IntSize; class ProtectionSpace; class RunLoopObserver; @@ -17725,7 +17717,7 @@ index 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db class SharedBuffer; class SpeechRecognitionRequest; class TextIndicator; -@@ -535,6 +547,8 @@ public: +@@ -538,6 +550,8 @@ public: void setControlledByAutomation(bool); WebPageInspectorController& inspectorController() { return *m_inspectorController; } @@ -17734,7 +17726,7 @@ index 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db #if PLATFORM(IOS_FAMILY) void showInspectorIndication(); -@@ -619,6 +633,11 @@ public: +@@ -627,6 +641,11 @@ public: void setPageLoadStateObserver(std::unique_ptr&&); @@ -17746,7 +17738,7 @@ index 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db void initializeWebPage(); void setDrawingArea(std::unique_ptr&&); -@@ -646,6 +665,7 @@ public: +@@ -654,6 +673,7 @@ public: void closePage(); void addPlatformLoadParameters(WebProcessProxy&, LoadParameters&); @@ -17754,7 +17746,7 @@ index 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db 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); -@@ -1167,6 +1187,7 @@ public: +@@ -1175,6 +1195,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17762,7 +17754,7 @@ index 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1241,14 +1262,20 @@ public: +@@ -1249,14 +1270,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17784,7 +17776,7 @@ index 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db #endif void processDidBecomeUnresponsive(); -@@ -1492,6 +1519,8 @@ public: +@@ -1500,6 +1527,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17793,7 +17785,7 @@ index 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db #endif #if ENABLE(WEB_CRYPTO) -@@ -2603,6 +2632,7 @@ private: +@@ -2615,6 +2644,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17801,7 +17793,7 @@ index 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2863,6 +2893,20 @@ private: +@@ -2879,6 +2909,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17822,7 +17814,7 @@ index 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db #endif PageLoadState m_pageLoadState; -@@ -3075,6 +3119,9 @@ private: +@@ -3091,6 +3135,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17833,7 +17825,7 @@ index 48f19b6fd5456ff154e509a76ed54b62372fc9b4..f6223cc36cdfbb0a9024e8574162b7db #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 56e8a1dce818c6390ca0622e3b44a5c1ed10ef11..c6e13c604a3f2b452dad680c0bcea0327abcd1c6 100644 +index ba374c0022f52b146436f2cf1e3b3bc8c6b8e702..52cc5c0bde3038416af126b9765866924aa33105 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17868,10 +17860,10 @@ index 56e8a1dce818c6390ca0622e3b44a5c1ed10ef11..c6e13c604a3f2b452dad680c0bcea032 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 4920e6c6aac7c45a2d9df43da48e231811962fac..6fe07f2663d028f6b39ac0014af47bc0434cd4c5 100644 +index a2e7212a2e5dadbc54b999d238709cd53da743d1..1534e71f8a1a2fd772be50c71158ae6fc69fd2e4 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp -@@ -513,6 +513,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro +@@ -522,6 +522,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro // Arbitrarily choose the first process pool to host the service worker process. auto* processPool = processPools()[0]; @@ -17886,7 +17878,7 @@ index 4920e6c6aac7c45a2d9df43da48e231811962fac..6fe07f2663d028f6b39ac0014af47bc0 ASSERT(processPool); WebProcessProxy* serviceWorkerProcessProxy { nullptr }; -@@ -781,8 +789,12 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa +@@ -793,8 +801,12 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa #endif parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel(); @@ -17902,7 +17894,7 @@ index 4920e6c6aac7c45a2d9df43da48e231811962fac..6fe07f2663d028f6b39ac0014af47bc0 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 94817608c808a6be09cec44ec0ca08955f609535..f6ea11207499ef863670eb2afd7ec76261158532 100644 +index 9c00c47b7c5cd0264f270302ea7bf6354580b7cf..9beba394871c99e3f946d75aced3383b2c86f1a1 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp @@ -143,6 +143,11 @@ HashMap& WebProcessProxy::allProcesses() @@ -17918,10 +17910,10 @@ index 94817608c808a6be09cec44ec0ca08955f609535..f6ea11207499ef863670eb2afd7ec762 { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index 194005878066a308d30ba5c909b558953d9a4673..ee3fbe022402c06a76e291510ecad091196ed914 100644 +index 429c3c10631f34beab57297e64cf9393a83fda09..315dd55978cb6272bc6a22e948176dcc7dd8593b 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h -@@ -141,6 +141,7 @@ public: +@@ -142,6 +142,7 @@ public: ~WebProcessProxy(); static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, const Function&); @@ -17930,10 +17922,10 @@ index 194005878066a308d30ba5c909b558953d9a4673..ee3fbe022402c06a76e291510ecad091 WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 3bd48bb5f30e93ecf80d3f783adb2b8397490b2a..177fe48b54804dc107547b19d5767a82d9bf2e0a 100644 +index bc22379ba7663aca6b2d11766c195803a7e03061..d41538bd010c45e697ec2184b4a90ad5aa32fdb6 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2021,6 +2021,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O +@@ -2032,6 +2032,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); } @@ -17952,7 +17944,7 @@ index 3bd48bb5f30e93ecf80d3f783adb2b8397490b2a..177fe48b54804dc107547b19d5767a82 void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index 15046be5b5e40ff1b785ec54cb4b5e41c0b5c70b..0df6d710ab4501ee5d0f704dd2c635f14328e5ef 100644 +index 6196280f76da120298e2b7ab16405d2f0ba28923..c6baf0e4594ae4ed3d497c445f42ed9e060dd3bc 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h @@ -87,6 +87,7 @@ class SecKeyProxyStore; @@ -17960,10 +17952,10 @@ index 15046be5b5e40ff1b785ec54cb4b5e41c0b5c70b..0df6d710ab4501ee5d0f704dd2c635f1 class NetworkProcessProxy; class SOAuthorizationCoordinator; +class DownloadProxy; + class VirtualAuthenticatorManager; class WebPageProxy; class WebProcessPool; - class WebProcessProxy; -@@ -95,6 +96,7 @@ enum class CacheModel : uint8_t; +@@ -96,6 +97,7 @@ enum class CacheModel : uint8_t; enum class WebsiteDataFetchOption : uint8_t; enum class WebsiteDataType : uint32_t; @@ -17971,7 +17963,7 @@ index 15046be5b5e40ff1b785ec54cb4b5e41c0b5c70b..0df6d710ab4501ee5d0f704dd2c635f1 struct NetworkProcessConnectionInfo; struct WebsiteDataRecord; struct WebsiteDataStoreParameters; -@@ -105,6 +107,14 @@ enum class StorageAccessStatus : uint8_t; +@@ -106,6 +108,14 @@ enum class StorageAccessStatus : uint8_t; enum class StorageAccessPromptStatus; #endif @@ -17986,7 +17978,7 @@ index 15046be5b5e40ff1b785ec54cb4b5e41c0b5c70b..0df6d710ab4501ee5d0f704dd2c635f1 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 @@ -18001,7 +17993,7 @@ index 15046be5b5e40ff1b785ec54cb4b5e41c0b5c70b..0df6d710ab4501ee5d0f704dd2c635f1 void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&); const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; } void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType); -@@ -350,6 +362,14 @@ public: +@@ -352,6 +364,14 @@ public: static WTF::String defaultJavaScriptConfigurationDirectory(); static bool http3Enabled(); @@ -18016,7 +18008,7 @@ index 15046be5b5e40ff1b785ec54cb4b5e41c0b5c70b..0df6d710ab4501ee5d0f704dd2c635f1 void resetQuota(CompletionHandler&&); void clearStorage(CompletionHandler&&); -@@ -433,9 +453,11 @@ private: +@@ -435,9 +455,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -18029,7 +18021,7 @@ index 15046be5b5e40ff1b785ec54cb4b5e41c0b5c70b..0df6d710ab4501ee5d0f704dd2c635f1 WebCore::SoupNetworkProxySettings m_networkProxySettings; String m_cookiePersistentStoragePath; SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite }; -@@ -463,6 +485,11 @@ private: +@@ -465,6 +487,11 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -19986,10 +19978,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129bc81d853 100644 +index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75c06350bf 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1900,6 +1900,18 @@ +@@ -1909,6 +1909,18 @@ DF0C5F28252ECB8E00D921DB /* WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F24252ECB8D00D921DB /* WKDownload.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2A252ECB8E00D921DB /* WKDownloadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2B252ED44000D921DB /* WKDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */; }; @@ -20008,7 +20000,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF84CEE4249AA24D009096F6 /* WKPDFHUDView.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF84CEE2249AA21F009096F6 /* WKPDFHUDView.mm */; }; -@@ -1956,6 +1968,9 @@ +@@ -1965,6 +1977,9 @@ E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; E5DEFA6826F8F42600AB68DB /* PhotosUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E5DEFA6726F8F42600AB68DB /* PhotosUISPI.h */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -20018,7 +20010,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 F4094CBD2553053D003D73E3 /* DisplayListReaderHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = F4094CBB255304AF003D73E3 /* DisplayListReaderHandle.h */; }; F4094CBE25530540003D73E3 /* DisplayListWriterHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = F4094CB92553047E003D73E3 /* DisplayListWriterHandle.h */; }; F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; -@@ -5779,6 +5794,19 @@ +@@ -5797,6 +5812,19 @@ DF0C5F24252ECB8D00D921DB /* WKDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownload.h; sourceTree = ""; }; DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadInternal.h; sourceTree = ""; }; DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadDelegate.h; sourceTree = ""; }; @@ -20038,7 +20030,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHTTPCookieStorePrivate.h; sourceTree = ""; }; DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentWorldPrivate.h; sourceTree = ""; }; DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebWheelEvent.h; sourceTree = ""; }; -@@ -5898,6 +5926,14 @@ +@@ -5916,6 +5944,14 @@ ECA680D31E6904B500731D20 /* ExtraPrivateSymbolsForTAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtraPrivateSymbolsForTAPI.h; sourceTree = ""; }; ECBFC1DB1E6A4D66000300C7 /* ExtraPublicSymbolsForTAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtraPublicSymbolsForTAPI.h; sourceTree = ""; }; F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = ""; }; @@ -20053,7 +20045,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 F4094CB92553047E003D73E3 /* DisplayListWriterHandle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListWriterHandle.h; sourceTree = ""; }; F4094CBA2553047E003D73E3 /* DisplayListWriterHandle.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DisplayListWriterHandle.cpp; sourceTree = ""; }; F4094CBB255304AF003D73E3 /* DisplayListReaderHandle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListReaderHandle.h; sourceTree = ""; }; -@@ -6030,6 +6066,7 @@ +@@ -6048,6 +6084,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -20061,7 +20053,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -7790,6 +7827,7 @@ +@@ -7810,6 +7847,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -20069,7 +20061,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -8894,6 +8932,7 @@ +@@ -8928,6 +8966,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -20077,7 +20069,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9377,6 +9416,12 @@ +@@ -9412,6 +9451,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -20090,7 +20082,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 ); path = Agents; sourceTree = ""; -@@ -9385,6 +9430,7 @@ +@@ -9420,6 +9465,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -20098,7 +20090,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -9906,6 +9952,12 @@ +@@ -9941,6 +9987,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -20111,7 +20103,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10207,6 +10259,7 @@ +@@ -10242,6 +10294,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -20119,7 +20111,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -10780,6 +10833,11 @@ +@@ -10815,6 +10868,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -20131,7 +20123,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -11632,6 +11690,7 @@ +@@ -11667,6 +11725,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -20139,7 +20131,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -11937,6 +11996,7 @@ +@@ -11974,6 +12033,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -20147,7 +20139,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -11953,6 +12013,7 @@ +@@ -11990,6 +12050,7 @@ 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, F40BBB41257FF46E0067463A /* GPUProcessWakeupMessageArguments.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -20155,7 +20147,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -12095,6 +12156,7 @@ +@@ -12132,6 +12193,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -20163,7 +20155,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -12160,6 +12222,7 @@ +@@ -12197,6 +12259,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -20171,7 +20163,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, -@@ -12182,6 +12245,7 @@ +@@ -12219,6 +12282,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -20179,7 +20171,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -12504,6 +12568,7 @@ +@@ -12545,6 +12609,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -20187,7 +20179,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -12636,6 +12701,7 @@ +@@ -12677,6 +12742,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -20195,7 +20187,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -12689,6 +12755,7 @@ +@@ -12730,6 +12796,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -20203,7 +20195,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -12845,6 +12912,7 @@ +@@ -12886,6 +12953,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -20211,7 +20203,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -14110,6 +14178,8 @@ +@@ -14151,6 +14219,8 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -20220,7 +20212,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */, C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, -@@ -14127,6 +14197,7 @@ +@@ -14168,6 +14238,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, @@ -20228,7 +20220,7 @@ index 4c90e71141195d3e948e7836ac2d8c0c52582c52..d88ec3abe8d1e426d07dada77a1c6129 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, C1C1B30F2540F50D00D9100B /* NetworkConnectionToWebProcessMac.mm in Sources */, 51DD9F2816367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp in Sources */, -@@ -14431,6 +14502,7 @@ +@@ -14475,6 +14546,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20416,10 +20408,10 @@ index 5edd887612819d7d25ce86713434dd0bd4aff78c..1a9e2fbe665a408ba230313f220f9484 auto permissionHandlers = m_requestsPerOrigin.take(securityOrigin); diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index 0c8da665770bd473aeaabab3f16af60160b2750f..064cec74ddedea795f2ebf6d9d921cf7d0209562 100644 +index 286815a88d3c3d3363e4b5229caa695fce505814..0a630fc0a340676b59265892916f4e9df085b452 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -@@ -403,6 +403,8 @@ void WebChromeClient::setResizable(bool resizable) +@@ -407,6 +407,8 @@ void WebChromeClient::setResizable(bool resizable) void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) { @@ -20428,7 +20420,7 @@ index 0c8da665770bd473aeaabab3f16af60160b2750f..064cec74ddedea795f2ebf6d9d921cf7 // Notify the bundle client. m_page.injectedBundleUIClient().willAddMessageToConsole(&m_page, source, level, message, lineNumber, columnNumber, sourceID); } -@@ -826,6 +828,13 @@ std::unique_ptr WebChromeClient::createDateTimeChooser(DateTime +@@ -830,6 +832,13 @@ std::unique_ptr WebChromeClient::createDateTimeChooser(DateTime #endif @@ -20470,7 +20462,7 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index e48a68dff1efeda9ba9239c2aef2fb9d47d1f317..6ca275cb733c05a06c838a62c2747232c0ff59fd 100644 +index 4bdbbccd3fbc620e0754105cea09eddf05120b6b..f2f2c6eddfc6791647fcd197247197633f59a9dc 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp @@ -1574,13 +1574,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() @@ -20850,10 +20842,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 cd72c8e3fe2a3fe07a312897b8b9eaf297d8d183..9e50f3069df7b34cc5c2c415fcffc1fbd1318853 100644 +index d5409bedce5617a4a07f7212a87ffd62d6f000f7..d1264361a9091e74d49ed9d4fec70f128b2d7e74 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -898,6 +898,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -902,6 +902,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) m_page->setCanUseCredentialStorage(parameters.canUseCredentialStorage); @@ -20863,7 +20855,7 @@ index cd72c8e3fe2a3fe07a312897b8b9eaf297d8d183..9e50f3069df7b34cc5c2c415fcffc1fb updateThrottleState(); } -@@ -1664,6 +1667,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1668,6 +1671,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -20886,7 +20878,7 @@ index cd72c8e3fe2a3fe07a312897b8b9eaf297d8d183..9e50f3069df7b34cc5c2c415fcffc1fb void WebPage::loadRequest(LoadParameters&& loadParameters) { setLastNavigationWasAppInitiated(loadParameters.request.isAppInitiated()); -@@ -1920,17 +1939,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1924,17 +1943,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20905,7 +20897,7 @@ index cd72c8e3fe2a3fe07a312897b8b9eaf297d8d183..9e50f3069df7b34cc5c2c415fcffc1fb // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1947,20 +1962,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1951,20 +1966,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20933,7 +20925,7 @@ index cd72c8e3fe2a3fe07a312897b8b9eaf297d8d183..9e50f3069df7b34cc5c2c415fcffc1fb #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1968,7 +1981,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1972,7 +1985,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20941,7 +20933,7 @@ index cd72c8e3fe2a3fe07a312897b8b9eaf297d8d183..9e50f3069df7b34cc5c2c415fcffc1fb void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2263,6 +2275,7 @@ void WebPage::scaleView(double scale) +@@ -2267,6 +2279,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20949,7 +20941,7 @@ index cd72c8e3fe2a3fe07a312897b8b9eaf297d8d183..9e50f3069df7b34cc5c2c415fcffc1fb scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2367,17 +2380,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2371,17 +2384,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20968,7 +20960,7 @@ index cd72c8e3fe2a3fe07a312897b8b9eaf297d8d183..9e50f3069df7b34cc5c2c415fcffc1fb } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3264,6 +3273,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3268,6 +3277,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -21073,7 +21065,7 @@ index cd72c8e3fe2a3fe07a312897b8b9eaf297d8d183..9e50f3069df7b34cc5c2c415fcffc1fb #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3340,6 +3447,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3344,6 +3451,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -21085,7 +21077,7 @@ index cd72c8e3fe2a3fe07a312897b8b9eaf297d8d183..9e50f3069df7b34cc5c2c415fcffc1fb void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3578,6 +3690,7 @@ void WebPage::didCompletePageTransition() +@@ -3582,6 +3694,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -21093,7 +21085,7 @@ index cd72c8e3fe2a3fe07a312897b8b9eaf297d8d183..9e50f3069df7b34cc5c2c415fcffc1fb } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4375,7 +4488,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4379,7 +4492,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -21102,7 +21094,7 @@ index cd72c8e3fe2a3fe07a312897b8b9eaf297d8d183..9e50f3069df7b34cc5c2c415fcffc1fb void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6685,6 +6798,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6694,6 +6807,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -21113,7 +21105,7 @@ index cd72c8e3fe2a3fe07a312897b8b9eaf297d8d183..9e50f3069df7b34cc5c2c415fcffc1fb return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index a3d70f541247005a929213bed4061973658300d3..ef12c2e1469ee969737b6cc294e5b887a0be9164 100644 +index 4dd587cbbe31ae10c20994b6e512239ca479d142..cd3f0ed3bcfbb674ecc75c616daa74e8456e3e12 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -121,6 +121,10 @@ typedef struct _AtkObject AtkObject; @@ -21151,7 +21143,7 @@ index a3d70f541247005a929213bed4061973658300d3..ef12c2e1469ee969737b6cc294e5b887 #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1242,6 +1249,7 @@ public: +@@ -1243,6 +1250,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -21159,7 +21151,7 @@ index a3d70f541247005a929213bed4061973658300d3..ef12c2e1469ee969737b6cc294e5b887 void insertNewlineInQuotedContent(); -@@ -1603,6 +1611,7 @@ private: +@@ -1604,6 +1612,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -21167,7 +21159,7 @@ index a3d70f541247005a929213bed4061973658300d3..ef12c2e1469ee969737b6cc294e5b887 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1640,6 +1649,7 @@ private: +@@ -1641,6 +1650,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -21175,7 +21167,7 @@ index a3d70f541247005a929213bed4061973658300d3..ef12c2e1469ee969737b6cc294e5b887 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1763,9 +1773,7 @@ private: +@@ -1764,9 +1774,7 @@ private: void countStringMatches(const String&, OptionSet, uint32_t maxMatchCount); void replaceMatches(const Vector& matchIndices, const String& replacementText, bool selectionOnly, CompletionHandler&&); @@ -21185,7 +21177,7 @@ index a3d70f541247005a929213bed4061973658300d3..ef12c2e1469ee969737b6cc294e5b887 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2301,6 +2309,7 @@ private: +@@ -2302,6 +2310,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -21194,7 +21186,7 @@ index a3d70f541247005a929213bed4061973658300d3..ef12c2e1469ee969737b6cc294e5b887 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 38ce4570c98a8b7a92a1038a2155a1b27ea41849..7c89884055454cb78557c687842d84bb037fe661 100644 +index 185be547c3ac1a8e9f322a9979f682177fea77e4..e68186ab18a1404d2fec40fd13a0c2d686d202a0 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -137,6 +137,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -21387,7 +21379,7 @@ index 838e413381a8075a3d62459455267a5bbb55a991..e179a07490cc8fd579f219ff7ebb0ed5 - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index aba10413cd8789b7da33ac963cb80e31022e386e..667f66a761298491c5f843fd26e16f0aa1d9df16 100644 +index 0c396c8b2788b7a2ede74152ecdda1a298e05919..db876af327e4b9bd4b3860a9774aa3ad68213c70 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm @@ -4040,7 +4040,7 @@ IGNORE_WARNINGS_END @@ -21440,7 +21432,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index bddfb7a51e8af377eb8de05ba62508ef31d44893..50cab168ad65cd728a86ddf473b0c915f36c1b29 100644 +index 27cca989c87cf3c0a704edd807363908043d9436..50cab168ad65cd728a86ddf473b0c915f36c1b29 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,7 @@ WEBKIT_OPTION_BEGIN() @@ -21489,13 +21481,11 @@ index bddfb7a51e8af377eb8de05ba62508ef31d44893..50cab168ad65cd728a86ddf473b0c915 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) -@@ -151,8 +156,8 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE ON) +@@ -152,7 +157,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) --WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE OFF) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) -+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE OFF) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON) @@ -21518,7 +21508,7 @@ index bddfb7a51e8af377eb8de05ba62508ef31d44893..50cab168ad65cd728a86ddf473b0c915 # Finalize the value for all options. Do not attempt to use an option before diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index 6fd7aaf40eccec7d5014e289a6355f2798d1324c..a0bfa778441052a7d251d1c15b14326849a1e694 100644 +index bfaebdecc600f5538258b26b6b1879662343b16a..a0bfa778441052a7d251d1c15b14326849a1e694 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) @@ -21529,13 +21519,11 @@ index 6fd7aaf40eccec7d5014e289a6355f2798d1324c..a0bfa778441052a7d251d1c15b143268 set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") find_package(Cairo 1.14.0 REQUIRED) -@@ -53,8 +54,8 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GPU_PROCESS PRIVATE OFF) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE ON) +@@ -54,7 +55,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) --WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE OFF) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) -+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE OFF) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) @@ -22153,10 +22141,10 @@ index ef4407cfc114e602d98ed81724da504f453e258f..448dd483715162baba484f756fbcc1d7 + add_subdirectory(Playwright/win) endif () diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit -index ddc2a96ac68cd51d5f4efeca78a118db91709aa2..57a78f54e72d264daa27faa53ac2a30cab98dd82 100755 +index 1e3db5a4d3e39b8d54d1681e05bf6cccb7fcd061..e4b84ef77b85eeeed645701852330f421dc20126 100755 --- a/Tools/Scripts/build-webkit +++ b/Tools/Scripts/build-webkit -@@ -247,7 +247,7 @@ if (isAppleCocoaWebKit()) { +@@ -253,7 +253,7 @@ if (isAppleCocoaWebKit()) { push @projects, ("Source/WebKit"); if (!isEmbeddedWebKit()) { @@ -22202,10 +22190,10 @@ index b090bbd31ff486d19d379ac40828df3edd0b2df6..ed0b92061bdb14d321787a7aa1153a15 decidePolicyForMediaKeySystemPermissionRequest }; diff --git a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm -index 5d11e2ff86c913c92b1c8749617f0f68c0723a35..cec4af5c4f99c1d18df032f93a5ee55f731b2bf5 100644 +index 7e7585e699663e5bdc8284e4e3540818742102ab..54d1853f259e824e5731bd39825c37629ab7ae5e 100644 --- a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm +++ b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm -@@ -826,4 +826,51 @@ void EventSenderProxy::scaleGestureEnd(double scale) +@@ -894,4 +894,51 @@ void EventSenderProxy::scaleGestureEnd(double scale) #endif // ENABLE(MAC_GESTURE_EVENTS)