From d3834736cf448adce6fdaf89d852860bf8f1beee Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Mon, 29 Apr 2024 16:57:50 -0700 Subject: [PATCH] chore: update playwright-browsers to Mar 19 Upstream commit 5a76c58a3d8e61d581e593882532346961863354 --- .../firefox/juggler/TargetRegistry.js | 6 +- .../firefox/juggler/content/PageAgent.js | 6 + .../firefox/patches/bootstrap.diff | 47 +- .../firefox/preferences/playwright.cfg | 13 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 1087 +++++++++-------- 6 files changed, 603 insertions(+), 558 deletions(-) diff --git a/browser_patches/firefox/juggler/TargetRegistry.js b/browser_patches/firefox/juggler/TargetRegistry.js index 0b1dcd4906687..25c5eb562ea56 100644 --- a/browser_patches/firefox/juggler/TargetRegistry.js +++ b/browser_patches/firefox/juggler/TargetRegistry.js @@ -21,6 +21,8 @@ const ALL_PERMISSIONS = [ 'desktop-notification', ]; +let globalTabAndWindowActivationChain = Promise.resolve(); + class DownloadInterceptor { constructor(registry) { this._registry = registry @@ -384,7 +386,7 @@ class PageTarget { const tabBrowser = ownerWindow.gBrowser; // Serialize all tab-switching commands per tabbed browser // to disallow concurrent tab switching. - const result = (tabBrowser.__serializedChain ?? Promise.resolve()).then(async () => { + const result = globalTabAndWindowActivationChain.then(async () => { this._window.focus(); if (tabBrowser.selectedTab !== this._tab) { const promise = helper.awaitEvent(ownerWindow, 'TabSwitchDone'); @@ -399,7 +401,7 @@ class PageTarget { notificationsPopup?.style.removeProperty('pointer-events'); } }); - tabBrowser.__serializedChain = result.catch(error => { /* swallow errors to keep chain running */ }); + globalTabAndWindowActivationChain = result.catch(error => { /* swallow errors to keep chain running */ }); return result; } diff --git a/browser_patches/firefox/juggler/content/PageAgent.js b/browser_patches/firefox/juggler/content/PageAgent.js index a3359228bcb70..e1aa790c4b510 100644 --- a/browser_patches/firefox/juggler/content/PageAgent.js +++ b/browser_patches/firefox/juggler/content/PageAgent.js @@ -382,6 +382,12 @@ class PageAgent { throw new Error('Object is not input!'); const nsFiles = await Promise.all(files.map(filePath => File.createFromFileName(filePath))); unsafeObject.mozSetFileArray(nsFiles); + const events = [ + new (frame.domWindow().Event)('input', { bubbles: true, cancelable: true, composed: true }), + new (frame.domWindow().Event)('change', { bubbles: true, cancelable: true, composed: true }), + ]; + for (const event of events) + unsafeObject.dispatchEvent(event); } _getContentQuads({objectId, frameId}) { diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff index a44d9e646b594..9de655e886e21 100644 --- a/browser_patches/firefox/patches/bootstrap.diff +++ b/browser_patches/firefox/patches/bootstrap.diff @@ -2475,7 +2475,7 @@ index 6dfd07d6b676a99993408921de8dea9d561f201d..e3c6794363cd6336effbeac83a179f37 readonly attribute boolean securityCheckDisabled; }; diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs -index 73c83e526be1a3a252f995d0718e3975d50bffa7..4b05141c8ab8b084d977341127f36ea6d226aa9a 100644 +index 73c83e526be1a3a252f995d0718e3975d50bffa7..db5977c54221e19e107a8325a0834302c2e84546 100644 --- a/services/settings/Utils.sys.mjs +++ b/services/settings/Utils.sys.mjs @@ -95,7 +95,7 @@ function _isUndefined(value) { @@ -2487,6 +2487,16 @@ index 73c83e526be1a3a252f995d0718e3975d50bffa7..4b05141c8ab8b084d977341127f36ea6 ? lazy.gServerURL : AppConstants.REMOTE_SETTINGS_SERVER_URL; }, +@@ -108,6 +108,9 @@ export var Utils = { + log, + + get shouldSkipRemoteActivityDueToTests() { ++ // Playwright does not set Cu.isInAutomation, hence we just return true ++ // here in order to disable the remote activity. ++ return true; + return ( + (lazy.isRunningTests || Cu.isInAutomation) && + this.SERVER_URL == "data:,#remote-settings-dummy/v1" diff --git a/servo/components/style/gecko/media_features.rs b/servo/components/style/gecko/media_features.rs index c9ad30b28b069a122cf01c5e97b83dc68ef022ff..f32dbcfe26fe2f6b8a0d066d6dfd208f1afc510d 100644 --- a/servo/components/style/gecko/media_features.rs @@ -2925,7 +2935,7 @@ diff --git a/widget/cocoa/NativeKeyBindings.mm b/widget/cocoa/NativeKeyBindings. index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce8050630a1aa 100644 --- a/widget/cocoa/NativeKeyBindings.mm +++ b/widget/cocoa/NativeKeyBindings.mm -@@ -528,6 +528,13 @@ +@@ -528,6 +528,13 @@ void NativeKeyBindings::GetEditCommandsForTests( break; case KEY_NAME_INDEX_ArrowLeft: if (aEvent.IsAlt()) { @@ -2939,7 +2949,7 @@ index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce805 break; } if (aEvent.IsMeta() || (aEvent.IsControl() && aEvent.IsShift())) { -@@ -550,6 +557,13 @@ +@@ -550,6 +557,13 @@ void NativeKeyBindings::GetEditCommandsForTests( break; case KEY_NAME_INDEX_ArrowRight: if (aEvent.IsAlt()) { @@ -2953,7 +2963,7 @@ index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce805 break; } if (aEvent.IsMeta() || (aEvent.IsControl() && aEvent.IsShift())) { -@@ -572,6 +586,10 @@ +@@ -572,6 +586,10 @@ void NativeKeyBindings::GetEditCommandsForTests( break; case KEY_NAME_INDEX_ArrowUp: if (aEvent.IsControl()) { @@ -2964,7 +2974,7 @@ index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce805 break; } if (aEvent.IsMeta()) { -@@ -582,7 +600,7 @@ +@@ -582,7 +600,7 @@ void NativeKeyBindings::GetEditCommandsForTests( !aEvent.IsShift() ? ToObjcSelectorPtr(@selector(moveToBeginningOfDocument:)) : ToObjcSelectorPtr( @@ -2973,7 +2983,7 @@ index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce805 aCommands); break; } -@@ -609,6 +627,10 @@ +@@ -609,6 +627,10 @@ void NativeKeyBindings::GetEditCommandsForTests( break; case KEY_NAME_INDEX_ArrowDown: if (aEvent.IsControl()) { @@ -2984,31 +2994,6 @@ index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce805 break; } if (aEvent.IsMeta()) { -diff --git a/widget/cocoa/nsCocoaUtils.mm b/widget/cocoa/nsCocoaUtils.mm -index f3a760476290953df2179fa44bd68dd171d291ab..6cd3f8178d260904905372c1afc7ecbcc568fbc8 100644 ---- a/widget/cocoa/nsCocoaUtils.mm -+++ b/widget/cocoa/nsCocoaUtils.mm -@@ -267,14 +267,17 @@ static float MenuBarScreenHeight() { - return nullptr; - } - -- nsCOMPtr hiddenWindowWidget; -+ nsCOMPtr mainWindowWidget; - if (NS_FAILED(baseHiddenWindow->GetMainWidget( -- getter_AddRefs(hiddenWindowWidget)))) { -+ getter_AddRefs(mainWindowWidget)))) { - NS_WARNING("Couldn't get nsIWidget from hidden window (nsIBaseWindow)"); - return nullptr; - } - -- return hiddenWindowWidget; -+ // In the case of headless mode, it's a HeadlessWidget while the callee expects a nsCocoaWindow -+ if (gfxPlatform::IsHeadless()) -+ return nullptr; -+ return mainWindowWidget; - } - - BOOL nsCocoaUtils::WasLaunchedAtLogin() { diff --git a/widget/headless/HeadlessCompositorWidget.cpp b/widget/headless/HeadlessCompositorWidget.cpp index bb4ee9175e66dc40de1871a7f91368fe309494a3..747625e3869882300bfbc18b184db5151dd90c1a 100644 --- a/widget/headless/HeadlessCompositorWidget.cpp diff --git a/browser_patches/firefox/preferences/playwright.cfg b/browser_patches/firefox/preferences/playwright.cfg index 3d54e07f49745..99fbf39420999 100644 --- a/browser_patches/firefox/preferences/playwright.cfg +++ b/browser_patches/firefox/preferences/playwright.cfg @@ -112,9 +112,20 @@ pref("prompts.contentPromptSubDialog", false); // Do not use system colors - they are affected by themes. pref("ui.use_standins_for_native_colors", true); +// Turn off the Push service. pref("dom.push.serverURL", ""); -// This setting breaks settings loading. +// Prevent Remote Settings (firefox.settings.services.mozilla.com) to issue non local connections. pref("services.settings.server", ""); +// Prevent location.services.mozilla.com to issue non local connections. +pref("browser.region.network.url", ""); +pref("browser.pocket.enabled", false); +pref("browser.newtabpage.activity-stream.feeds.topsites", false); +// Disable sponsored tiles from "Mozilla Tiles Service" +pref("browser.newtabpage.activity-stream.showSponsoredTopSites", false); +// required to prevent non-local access to push.services.mozilla.com +pref("dom.push.connection.enabled", false); +// Prevent contile.services.mozilla.com to issue non local connections. +pref("browser.topsites.contile.enabled", false); pref("browser.safebrowsing.provider.mozilla.updateURL", ""); pref("browser.library.activity-stream.enabled", false); pref("browser.search.geoSpecificDefaults", false); diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index f6a773c3cbc94..71ae625752275 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="d477c762a9ecbbc8dedf3ca7a6a2a079577bf60c" +BASE_REVISION="e225c278f4c06f451ea92cc68b12986dd2a99979" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index db62b8da94a31..538f93273830b 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -1,5 +1,5 @@ diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt -index 5fbb9a3bc1101b829db1cea0184187b982a2c9d2..7b9398f9feb2345b536d1058f61b596d75a17b3d 100644 +index 598c68f5ad80520cec7aa886d931a93b425dcac0..743a677b61d67db06eb8e76bcca0729fb45914ed 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt @@ -1419,22 +1419,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS @@ -31,7 +31,7 @@ index 5fbb9a3bc1101b829db1cea0184187b982a2c9d2..7b9398f9feb2345b536d1058f61b596d ${JAVASCRIPTCORE_DIR}/inspector/protocol/ServiceWorker.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Target.json diff --git a/Source/JavaScriptCore/DerivedSources-input.xcfilelist b/Source/JavaScriptCore/DerivedSources-input.xcfilelist -index 26c7d29ba48583b4f0f3928f4dcc7a07c963d66e..da7fb28277de995cbf586414671839f82526cb83 100644 +index b26ef7b2b8f732160ddee36697a61ca7776fc2c3..9a442a4cda7efd7f2bd4e225d8bcbfedf8c4a0c5 100644 --- a/Source/JavaScriptCore/DerivedSources-input.xcfilelist +++ b/Source/JavaScriptCore/DerivedSources-input.xcfilelist @@ -98,21 +98,26 @@ $(PROJECT_DIR)/inspector/protocol/CPUProfiler.json @@ -62,7 +62,7 @@ index 26c7d29ba48583b4f0f3928f4dcc7a07c963d66e..da7fb28277de995cbf586414671839f8 $(PROJECT_DIR)/inspector/protocol/Security.json $(PROJECT_DIR)/inspector/protocol/ServiceWorker.json diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make -index 155b33b7093256410d7da9f642579ebc60b41bec..ba1e299e467e1e946417b83555797975f3c882c9 100644 +index 15d6e32cd525905b116f25a5bdd50bd1ef390cee..74b1415d21dcddc49e842e077e87e06724af8365 100644 --- a/Source/JavaScriptCore/DerivedSources.make +++ b/Source/JavaScriptCore/DerivedSources.make @@ -298,22 +298,27 @@ INSPECTOR_DOMAINS := \ @@ -1659,7 +1659,7 @@ index 72c81757450ad5ebacd5fd20d2a16095514802ec..b7d8ab1e04d3850180079870468b28ef private: enum ArgumentRequirement { ArgumentRequired, ArgumentNotRequired }; diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt -index afbb586ab7d4325ff66320556797154a456ff957..1ae308637b190d0d219c5ec245d10014b9f38f26 100644 +index bff7beb4674150d0620513ccdbd30c970bb78554..79532335e892aeb209d54fa26312380d6b1da5b2 100644 --- a/Source/ThirdParty/libwebrtc/CMakeLists.txt +++ b/Source/ThirdParty/libwebrtc/CMakeLists.txt @@ -452,6 +452,7 @@ set(webrtc_SOURCES @@ -1682,7 +1682,7 @@ index afbb586ab7d4325ff66320556797154a456ff957..1ae308637b190d0d219c5ec245d10014 Source/third_party/libyuv/source/compare.cc Source/third_party/libyuv/source/compare_common.cc Source/third_party/libyuv/source/compare_gcc.cc -@@ -2241,6 +2247,10 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE +@@ -2262,6 +2268,10 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE Source/third_party/libsrtp/config Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include @@ -1760,10 +1760,10 @@ index f95c3b6c6b73a01974f26d88bcc533e5032ddb66..6a9368c60824cd32649c93286522d779 #include "api/array_view.h" diff --git a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj -index 810ef5c6d20ac29f35afba47689a0b5298bd4a89..84ba906e541ecd991fbc3243837fdd8d0198ab6e 100644 +index f5f1d0ef71f7fcf175b016ddaefd99f18d96c1c3..5632dcb4919eb22133a62810b91e143329e31ee0 100644 --- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj +++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj -@@ -34,6 +34,20 @@ +@@ -35,6 +35,20 @@ }; /* End PBXAggregateTarget section */ @@ -1784,7 +1784,7 @@ index 810ef5c6d20ac29f35afba47689a0b5298bd4a89..84ba906e541ecd991fbc3243837fdd8d /* Begin PBXBuildFile section */ 2D6BFF60280A93DF00A1A74F /* video_coding.h in Headers */ = {isa = PBXBuildFile; fileRef = 4131C45B234C81710028A615 /* video_coding.h */; settings = {ATTRIBUTES = (Public, ); }; }; 2D6BFF61280A93EC00A1A74F /* video_codec_initializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4131C45E234C81720028A615 /* video_codec_initializer.h */; settings = {ATTRIBUTES = (Public, ); }; }; -@@ -5114,6 +5128,9 @@ +@@ -5118,6 +5132,9 @@ DDF30D9127C5C725006A526F /* receive_side_congestion_controller.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF30D9027C5C725006A526F /* receive_side_congestion_controller.h */; }; DDF30D9527C5C756006A526F /* bwe_defines.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF30D9327C5C756006A526F /* bwe_defines.h */; }; DDF30D9627C5C756006A526F /* remote_bitrate_estimator.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF30D9427C5C756006A526F /* remote_bitrate_estimator.h */; }; @@ -1794,7 +1794,7 @@ index 810ef5c6d20ac29f35afba47689a0b5298bd4a89..84ba906e541ecd991fbc3243837fdd8d /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ -@@ -5588,6 +5605,13 @@ +@@ -5606,6 +5623,13 @@ remoteGlobalIDString = DDF30D0527C5C003006A526F; remoteInfo = absl; }; @@ -1808,7 +1808,7 @@ index 810ef5c6d20ac29f35afba47689a0b5298bd4a89..84ba906e541ecd991fbc3243837fdd8d /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ -@@ -11131,6 +11155,9 @@ +@@ -11165,6 +11189,9 @@ DDF30D9027C5C725006A526F /* receive_side_congestion_controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = receive_side_congestion_controller.h; sourceTree = ""; }; DDF30D9327C5C756006A526F /* bwe_defines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bwe_defines.h; sourceTree = ""; }; DDF30D9427C5C756006A526F /* remote_bitrate_estimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = remote_bitrate_estimator.h; sourceTree = ""; }; @@ -1818,7 +1818,7 @@ index 810ef5c6d20ac29f35afba47689a0b5298bd4a89..84ba906e541ecd991fbc3243837fdd8d FB39D0D11200F0E300088E69 /* libwebrtc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwebrtc.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ -@@ -19938,6 +19965,7 @@ +@@ -19991,6 +20018,7 @@ isa = PBXGroup; children = ( CDFD2F9224C4B2F90048DAC3 /* common */, @@ -1826,7 +1826,7 @@ index 810ef5c6d20ac29f35afba47689a0b5298bd4a89..84ba906e541ecd991fbc3243837fdd8d CDEBB19224C0191800ADBD44 /* webm_parser */, ); path = libwebm; -@@ -20364,6 +20392,16 @@ +@@ -20418,6 +20446,16 @@ path = include; sourceTree = ""; }; @@ -1843,7 +1843,7 @@ index 810ef5c6d20ac29f35afba47689a0b5298bd4a89..84ba906e541ecd991fbc3243837fdd8d FB39D06E1200ED9200088E69 = { isa = PBXGroup; children = ( -@@ -23620,6 +23658,7 @@ +@@ -23693,6 +23731,7 @@ ); dependencies = ( 410B3827292B73E90003E515 /* PBXTargetDependency */, @@ -1851,15 +1851,15 @@ index 810ef5c6d20ac29f35afba47689a0b5298bd4a89..84ba906e541ecd991fbc3243837fdd8d DD2E76E827C6B69A00F2A74C /* PBXTargetDependency */, CDEBB4CC24C01AB400ADBD44 /* PBXTargetDependency */, 411ED040212E0811004320BA /* PBXTargetDependency */, -@@ -23701,6 +23740,7 @@ - 4460B89B2B155B2E00392062 /* vp9_depacketizer_fuzzer */, +@@ -23775,6 +23814,7 @@ 4460B8B92B155B6A00392062 /* vp9_qp_parser_fuzzer */, 444A6EF02AEADFC9005FE121 /* vp9_replay_fuzzer */, + 44945C512B9BA1C300447FFD /* webm_fuzzer */, + F31720AC27FE215900EEE407 /* Copy libvpx headers */, ); }; /* End PBXProject section */ -@@ -23784,6 +23824,23 @@ +@@ -23858,6 +23898,23 @@ shellPath = /bin/sh; shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n"; }; @@ -1883,7 +1883,7 @@ index 810ef5c6d20ac29f35afba47689a0b5298bd4a89..84ba906e541ecd991fbc3243837fdd8d /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ -@@ -25749,6 +25806,9 @@ +@@ -25831,6 +25888,9 @@ 5CDD865E1E43B8B500621E92 /* min_max_operations.c in Sources */, 4189395B242A71F5007FDC41 /* min_video_bitrate_experiment.cc in Sources */, 41B8D8FB28CB85CB00E5FA37 /* missing_mandatory_parameter_cause.cc in Sources */, @@ -1893,7 +1893,7 @@ index 810ef5c6d20ac29f35afba47689a0b5298bd4a89..84ba906e541ecd991fbc3243837fdd8d 4131C387234B957D0028A615 /* moving_average.cc in Sources */, 41FCBB1521B1F7AA00A5DF27 /* moving_average.cc in Sources */, 5CD286101E6A64C90094FDC8 /* moving_max.cc in Sources */, -@@ -26616,6 +26676,11 @@ +@@ -26708,6 +26768,11 @@ target = DDF30D0527C5C003006A526F /* absl */; targetProxy = DD2E76E727C6B69A00F2A74C /* PBXContainerItemProxy */; }; @@ -1905,7 +1905,7 @@ index 810ef5c6d20ac29f35afba47689a0b5298bd4a89..84ba906e541ecd991fbc3243837fdd8d /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ -@@ -27209,6 +27274,27 @@ +@@ -27283,6 +27348,27 @@ }; name = Production; }; @@ -1933,7 +1933,7 @@ index 810ef5c6d20ac29f35afba47689a0b5298bd4a89..84ba906e541ecd991fbc3243837fdd8d FB39D0711200ED9200088E69 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */; -@@ -27501,6 +27587,16 @@ +@@ -27585,6 +27671,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Production; }; @@ -1951,18 +1951,18 @@ index 810ef5c6d20ac29f35afba47689a0b5298bd4a89..84ba906e541ecd991fbc3243837fdd8d isa = XCConfigurationList; buildConfigurations = ( diff --git a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml -index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a9fea2fec 100644 +index c7812f1c9eed5b85cfd0f2c95224509743572eef..df12b644468fe5cba5592be5265147a0f541003a 100644 --- a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml -@@ -576,6 +576,7 @@ AriaReflectionForElementReferencesEnabled: - default: true +@@ -562,6 +562,7 @@ ApplePayEnabled: + default: false # FIXME: This is on by default in WebKit2 PLATFORM(COCOA). Perhaps we should consider turning it on for WebKitLegacy as well. +# Playwright: enable on all platforms to align with Safari. AsyncClipboardAPIEnabled: type: bool status: mature -@@ -586,7 +587,7 @@ AsyncClipboardAPIEnabled: +@@ -572,7 +573,7 @@ AsyncClipboardAPIEnabled: default: false WebKit: "PLATFORM(COCOA) || PLATFORM(GTK)" : true @@ -1971,7 +1971,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a WebCore: default: false -@@ -1949,9 +1950,10 @@ CrossOriginEmbedderPolicyEnabled: +@@ -1851,9 +1852,10 @@ CrossOriginEmbedderPolicyEnabled: WebCore: default: false @@ -1983,7 +1983,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a category: security humanReadableName: "Cross-Origin-Opener-Policy (COOP) header" humanReadableDescription: "Support for Cross-Origin-Opener-Policy (COOP) header" -@@ -1959,7 +1961,7 @@ CrossOriginOpenerPolicyEnabled: +@@ -1861,7 +1863,7 @@ CrossOriginOpenerPolicyEnabled: WebKitLegacy: default: false WebKit: @@ -1992,7 +1992,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a WebCore: default: false -@@ -2003,7 +2005,7 @@ CustomPasteboardDataEnabled: +@@ -1905,7 +1907,7 @@ CustomPasteboardDataEnabled: WebKitLegacy: default: false WebKit: @@ -2001,7 +2001,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a default: false CustomStateSetEnabled: -@@ -2062,6 +2064,7 @@ DOMAudioSessionFullEnabled: +@@ -1964,6 +1966,7 @@ DOMAudioSessionFullEnabled: WebCore: default: false @@ -2009,7 +2009,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a DOMPasteAccessRequestsEnabled: type: bool status: internal -@@ -2073,7 +2076,7 @@ DOMPasteAccessRequestsEnabled: +@@ -1975,7 +1978,7 @@ DOMPasteAccessRequestsEnabled: default: false WebKit: "PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(VISION)": true @@ -2018,7 +2018,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a WebCore: default: false -@@ -3542,6 +3545,7 @@ InspectorAttachmentSide: +@@ -3414,6 +3417,7 @@ InspectorAttachmentSide: WebKit: default: 0 @@ -2026,7 +2026,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a InspectorStartsAttached: type: bool status: embedder -@@ -3549,7 +3553,7 @@ InspectorStartsAttached: +@@ -3421,7 +3425,7 @@ InspectorStartsAttached: exposed: [ WebKit ] defaultValue: WebKit: @@ -2035,7 +2035,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a InspectorWindowFrame: type: String -@@ -3904,9 +3908,10 @@ LayoutViewportHeightExpansionFactor: +@@ -3776,9 +3780,10 @@ LayoutViewportHeightExpansionFactor: WebCore: default: 0 @@ -2047,7 +2047,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a category: html humanReadableName: "Lazy iframe loading" humanReadableDescription: "Enable lazy iframe loading support" -@@ -3914,9 +3919,9 @@ LazyIframeLoadingEnabled: +@@ -3786,9 +3791,9 @@ LazyIframeLoadingEnabled: WebKitLegacy: default: true WebKit: @@ -2059,7 +2059,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a LazyImageLoadingEnabled: type: bool -@@ -5320,6 +5325,19 @@ PitchCorrectionAlgorithm: +@@ -5210,6 +5215,19 @@ PitchCorrectionAlgorithm: WebCore: default: MediaPlayerEnums::PitchCorrectionAlgorithm::BestAllAround @@ -2079,7 +2079,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a PopoverAttributeEnabled: type: bool status: stable -@@ -7067,6 +7085,7 @@ UseCGDisplayListsForDOMRendering: +@@ -6946,6 +6964,7 @@ UseCGDisplayListsForDOMRendering: WebKit: default: true @@ -2087,7 +2087,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a UseGPUProcessForCanvasRenderingEnabled: type: bool status: stable -@@ -7079,7 +7098,7 @@ UseGPUProcessForCanvasRenderingEnabled: +@@ -6958,7 +6977,7 @@ UseGPUProcessForCanvasRenderingEnabled: defaultValue: WebKit: "ENABLE(GPU_PROCESS_BY_DEFAULT)": true @@ -2096,7 +2096,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a default: false UseGPUProcessForDOMRenderingEnabled: -@@ -7121,6 +7140,7 @@ UseGPUProcessForMediaEnabled: +@@ -7000,6 +7019,7 @@ UseGPUProcessForMediaEnabled: "ENABLE(GPU_PROCESS_BY_DEFAULT)": true default: false @@ -2104,7 +2104,7 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a UseGPUProcessForWebGLEnabled: type: bool status: internal -@@ -7132,7 +7152,7 @@ UseGPUProcessForWebGLEnabled: +@@ -7011,7 +7031,7 @@ UseGPUProcessForWebGLEnabled: default: false WebKit: "ENABLE(GPU_PROCESS_BY_DEFAULT) && ENABLE(GPU_PROCESS_WEBGL_BY_DEFAULT)": true @@ -2114,10 +2114,10 @@ index 9a7a20bcdf56471f8709ce4b4e2cf216e1b44dd9..0f4d2454f3b9aaece6f281729eb5c81a WebCore: "ENABLE(GPU_PROCESS_BY_DEFAULT) && ENABLE(GPU_PROCESS_WEBGL_BY_DEFAULT)": true diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index 33fa0c0aab9aac1e6a87abe3a1629c5c3de6de8f..b00d4e50365a81c8a9400930e6eb1f757c5b34c0 100644 +index 6fbfe8530da9b3f0c537f42ff66ec4ff7bc18eef..1b777bff1c688c4c0d1e8b81eff345e44c5068ef 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h -@@ -413,7 +413,7 @@ +@@ -409,7 +409,7 @@ // ORIENTATION_EVENTS should never get enabled on Desktop, only Mobile. #if !defined(ENABLE_ORIENTATION_EVENTS) @@ -2126,7 +2126,7 @@ index 33fa0c0aab9aac1e6a87abe3a1629c5c3de6de8f..b00d4e50365a81c8a9400930e6eb1f75 #endif #if !defined(ENABLE_OVERFLOW_SCROLLING_TOUCH) -@@ -518,7 +518,7 @@ +@@ -514,7 +514,7 @@ #endif #if !defined(ENABLE_TOUCH_EVENTS) @@ -2136,10 +2136,10 @@ index 33fa0c0aab9aac1e6a87abe3a1629c5c3de6de8f..b00d4e50365a81c8a9400930e6eb1f75 #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index 76ee6e498b037ab4a7985e4dc2e1d3eff98dc5e7..d80a2cb6bbc6e56f09649d561f6cef771de94ffb 100644 +index ced4314427247eeccfec1792da08ac8c4138f229..ff97e57bd8e70a7025959469d9fed7b20762f887 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h -@@ -787,7 +787,7 @@ +@@ -791,7 +791,7 @@ #endif #if !defined(ENABLE_SEC_ITEM_SHIM) @@ -2149,7 +2149,7 @@ index 76ee6e498b037ab4a7985e4dc2e1d3eff98dc5e7..d80a2cb6bbc6e56f09649d561f6cef77 #if !defined(ENABLE_SERVER_PRECONNECT) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index bfcffbf60dafebc61fcc992112dca5d110ca545a..feb5c20174a6a3092a9c76460b9c5d3508588508 100644 +index c4f3e13ed22dcd09335804ea248437ed42269f2c..0cdb4fd452ef373fdd95cb5ec0195c1456f16813 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -419,7 +419,7 @@ @@ -2161,7 +2161,7 @@ index bfcffbf60dafebc61fcc992112dca5d110ca545a..feb5c20174a6a3092a9c76460b9c5d35 #define HAVE_OS_DARK_MODE_SUPPORT 1 #endif -@@ -1278,7 +1278,8 @@ +@@ -1274,7 +1274,8 @@ #endif #if PLATFORM(MAC) @@ -2187,10 +2187,10 @@ index 8c27e4ca50e6208262966834dbd9f08214294c5f..40898c535e48536418eebf1ed151887c namespace Unicode { diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index 0908ad1e04fb10b098b382d0878ea5d7a5b7dbcb..9326efa447088c1ec4e46344f2208d53ce980008 100644 +index 4ab111cd6c9090f3ff912b6e0249df92da0d6523..dfd80b0297e5ee657a29375241eed77cab4e039e 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -1146,6 +1146,10 @@ JS_BINDING_IDLS := \ +@@ -1147,6 +1147,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2201,7 +2201,7 @@ index 0908ad1e04fb10b098b382d0878ea5d7a5b7dbcb..9326efa447088c1ec4e46344f2208d53 $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1735,9 +1739,6 @@ JS_BINDING_IDLS := \ +@@ -1736,9 +1740,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2212,7 +2212,7 @@ index 0908ad1e04fb10b098b382d0878ea5d7a5b7dbcb..9326efa447088c1ec4e46344f2208d53 vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) diff --git a/Source/WebCore/Modules/geolocation/Geolocation.cpp b/Source/WebCore/Modules/geolocation/Geolocation.cpp -index 9dfd25d4160011d576e9c636e4c805bfd486fd26..573edcb686440ea8426e3a59540250a5dbba5a9b 100644 +index d27f967de68f36c5a4cb2b9df6d011380b48b593..82fc33a1d0ab8c5368842385ed74e4981e1d6a72 100644 --- a/Source/WebCore/Modules/geolocation/Geolocation.cpp +++ b/Source/WebCore/Modules/geolocation/Geolocation.cpp @@ -362,8 +362,9 @@ bool Geolocation::shouldBlockGeolocationRequests() @@ -2263,7 +2263,7 @@ index 506ebb25fa290f27a75674a6fe5506fc311910d6..07d34c567b42aca08b188243c3f036f6 [self sendSpeechEndIfNeeded]; diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake -index 90675dde744af0c4b23b5d0b640774e4148acdcb..d99395c448de747750724bebd96da0b5071a887a 100644 +index 5c4d75ebdab0739a2d7f37e87f63f9c62bd297f4..1ac5a96ea17ec88dc4906c3b9d24d30026380968 100644 --- a/Source/WebCore/PlatformWPE.cmake +++ b/Source/WebCore/PlatformWPE.cmake @@ -57,6 +57,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS @@ -2275,7 +2275,7 @@ index 90675dde744af0c4b23b5d0b640774e4148acdcb..d99395c448de747750724bebd96da0b5 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index c6c468066dc47a93fb33bfddd11195f116980316..ccb7e2f109b45456c195fd496dc6d2ca6dc0e749 100644 +index 9fd175c505e01a219000c92dbf83fd5cacd428a2..e8be3e733db6a49b1993ef1edb062298849e05f2 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt @@ -712,3 +712,9 @@ testing/cocoa/WebViewVisualIdentificationOverlay.mm @@ -2289,10 +2289,10 @@ index c6c468066dc47a93fb33bfddd11195f116980316..ccb7e2f109b45456c195fd496dc6d2ca +JSTouchList.cpp +// Playwright end diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt -index ed024e1f513ce419d0c1289df28637cc19fd5d89..a690d901c64d5b29ef9e528a98b3d7c04e773d86 100644 +index 867352b020400643f6aeff8acc4c2c874c5aec83..3bf8903963d0128b015879bb6cfa192d4b302c39 100644 --- a/Source/WebCore/SourcesGTK.txt +++ b/Source/WebCore/SourcesGTK.txt -@@ -116,3 +116,10 @@ platform/unix/LoggingUnix.cpp +@@ -107,3 +107,10 @@ platform/unix/LoggingUnix.cpp platform/unix/SharedMemoryUnix.cpp platform/xdg/MIMETypeRegistryXdg.cpp @@ -2304,7 +2304,7 @@ index ed024e1f513ce419d0c1289df28637cc19fd5d89..a690d901c64d5b29ef9e528a98b3d7c0 +JSSpeechSynthesisEventInit.cpp +// Playwright: end. diff --git a/Source/WebCore/SourcesWPE.txt b/Source/WebCore/SourcesWPE.txt -index 969b2a1714104eef5c2d1d9c0a8c50d8955b0b55..c8295e7990948f034d20f31d0012883316bcc5f6 100644 +index e24a29cf23786daa6bce604694db462d3ccf67a4..ed61fb29cafea30491a52fdd8f8f4dce3e1e3a3a 100644 --- a/Source/WebCore/SourcesWPE.txt +++ b/Source/WebCore/SourcesWPE.txt @@ -45,6 +45,8 @@ editing/libwpe/EditorLibWPE.cpp @@ -2316,7 +2316,7 @@ index 969b2a1714104eef5c2d1d9c0a8c50d8955b0b55..c8295e7990948f034d20f31d00128833 page/linux/ResourceUsageOverlayLinux.cpp page/linux/ResourceUsageThreadLinux.cpp -@@ -94,6 +96,17 @@ platform/text/LocaleICU.cpp +@@ -84,6 +86,17 @@ platform/text/LocaleICU.cpp platform/unix/LoggingUnix.cpp platform/unix/SharedMemoryUnix.cpp @@ -2335,10 +2335,10 @@ index 969b2a1714104eef5c2d1d9c0a8c50d8955b0b55..c8295e7990948f034d20f31d00128833 +JSSpeechSynthesisEventInit.cpp +// Playwright: end. diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 00207bc91352ca6f5f3ca8fd8f93e02166d805fb..04b93941af67aab49de3f1daaf49f6c4cdc19d4a 100644 +index 426658f2035cb425d913c21ad621a8f1a8f03f14..1a462ad491fdf8044c2cad77c43da4afc4e335e1 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -6210,6 +6210,13 @@ +@@ -6215,6 +6215,13 @@ EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; }; EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; }; EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -2352,7 +2352,7 @@ index 00207bc91352ca6f5f3ca8fd8f93e02166d805fb..04b93941af67aab49de3f1daaf49f6c4 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, ); }; }; -@@ -20081,6 +20088,14 @@ +@@ -20080,6 +20087,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 = ""; }; @@ -2367,7 +2367,7 @@ index 00207bc91352ca6f5f3ca8fd8f93e02166d805fb..04b93941af67aab49de3f1daaf49f6c4 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 = ""; }; -@@ -27693,6 +27708,11 @@ +@@ -27690,6 +27705,11 @@ BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */, 2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */, 2D4F96F21A1ECC240098BF88 /* TextIndicator.h */, @@ -2379,7 +2379,7 @@ index 00207bc91352ca6f5f3ca8fd8f93e02166d805fb..04b93941af67aab49de3f1daaf49f6c4 F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */, F4E1965F21F26E4E00285078 /* UndoItem.cpp */, 2ECDBAD521D8906300F00ECD /* UndoItem.h */, -@@ -33988,6 +34008,8 @@ +@@ -33986,6 +34006,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2388,7 +2388,7 @@ index 00207bc91352ca6f5f3ca8fd8f93e02166d805fb..04b93941af67aab49de3f1daaf49f6c4 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, F491A66A2A9FEFA300F96146 /* PlatformWheelEvent.serialization.in */, -@@ -36665,6 +36687,7 @@ +@@ -36653,6 +36675,7 @@ AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, @@ -2396,7 +2396,7 @@ index 00207bc91352ca6f5f3ca8fd8f93e02166d805fb..04b93941af67aab49de3f1daaf49f6c4 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, 7CE7FA591EF882300060C9D6 /* DocumentTouch.h */, A8185F3209765765005826D9 /* DocumentType.cpp */, -@@ -41387,6 +41410,8 @@ +@@ -41383,6 +41406,8 @@ F4E90A3C2B52038E002DA469 /* PlatformTextAlternatives.h in Headers */, 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, @@ -2405,7 +2405,7 @@ index 00207bc91352ca6f5f3ca8fd8f93e02166d805fb..04b93941af67aab49de3f1daaf49f6c4 CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, -@@ -42667,6 +42692,7 @@ +@@ -42660,6 +42685,7 @@ 0F54DD081881D5F5003EEDBB /* Touch.h in Headers */, 71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */, 0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */, @@ -2413,7 +2413,7 @@ index 00207bc91352ca6f5f3ca8fd8f93e02166d805fb..04b93941af67aab49de3f1daaf49f6c4 0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */, 070334D71459FFD5008D8D45 /* TrackBase.h in Headers */, BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */, -@@ -43820,6 +43846,8 @@ +@@ -43788,6 +43814,8 @@ 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, 07E4BDBF2A3A5FAB000D5509 /* DictationCaretAnimator.cpp in Sources */, @@ -2422,7 +2422,7 @@ index 00207bc91352ca6f5f3ca8fd8f93e02166d805fb..04b93941af67aab49de3f1daaf49f6c4 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 4667EA3E2968D9DA00BAB1E2 /* GameControllerHapticEffect.mm in Sources */, 46FE73D32968E52000B8064C /* GameControllerHapticEngines.mm in Sources */, -@@ -43907,6 +43935,9 @@ +@@ -43875,6 +43903,9 @@ CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, BE39137129B267F500FA5D4F /* TextTransformCocoa.cpp in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2433,7 +2433,7 @@ index 00207bc91352ca6f5f3ca8fd8f93e02166d805fb..04b93941af67aab49de3f1daaf49f6c4 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp -index 52cf02d7ce08556f9011634131313254788f5599..52cd9f51e7daefda0a92ed4f22a4237a544917d8 100644 +index ed50745a2ae8973604461d1f91994656cb6ba26f..f69247170ffc45a2dc6e477a9e1f6a48d9862ea2 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -65,6 +65,7 @@ @@ -2444,7 +2444,7 @@ index 52cf02d7ce08556f9011634131313254788f5599..52cd9f51e7daefda0a92ed4f22a4237a #include "LocalFrame.h" #include "LocalizedStrings.h" #include "MathMLNames.h" -@@ -4020,9 +4021,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -4063,9 +4064,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (roleValue() == AccessibilityRole::ApplicationDialog) return AccessibilityObjectInclusion::IncludeObject; @@ -2462,13 +2462,13 @@ index 52cf02d7ce08556f9011634131313254788f5599..52cd9f51e7daefda0a92ed4f22a4237a { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index ec4bcfd28dab3d2c50af0c4978f0f826c8b1ead2..9600417367e1e70d58ebb4f8fd5ffb787250e9ed 100644 +index f20ac9d4d61a6f396e9ed796c8e6c5b8a7ea0577..3151b5e54ea17c0d979d22a0cc43c5ce0688c183 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h @@ -183,6 +183,8 @@ namespace WebCore { macro(DelayNode) \ macro(DeprecationReportBody) \ - macro(DigitalIdentity) \ + macro(DigitalCredential) \ + macro(DeviceMotionEvent) \ + macro(DeviceOrientationEvent) \ macro(DocumentTimeline) \ @@ -2502,7 +2502,7 @@ index bae4d73a2e54a59595843bc64eb34252ca421a4a..a9ed264d3c5a46224d0f9a3bdabfbf19 case ForcedAccessibilityValue::On: return true; diff --git a/Source/WebCore/dom/DataTransfer.cpp b/Source/WebCore/dom/DataTransfer.cpp -index 067d7e703a2750087429c55971516d4d2bdc14ee..59052024c94a8af719442908f2a31a4beb4636e7 100644 +index 4cc52397bbf1397aaa210e1d73831d178a3ff443..16eb5f885aeb17f61611109287ba2ce11a458ab6 100644 --- a/Source/WebCore/dom/DataTransfer.cpp +++ b/Source/WebCore/dom/DataTransfer.cpp @@ -510,6 +510,14 @@ Ref DataTransfer::createForDrag(const Document& document) @@ -2595,7 +2595,7 @@ index f27718c1e2b8cd0a8075e556d4cdba7d9ae8fc54..2b61721594e5435845f3151e0de345e9 ] partial interface Element { undefined requestPointerLock(); diff --git a/Source/WebCore/dom/PointerEvent.cpp b/Source/WebCore/dom/PointerEvent.cpp -index 4d8a06e48fbd2c6a0f9af32f1fdead5cb393d5a7..f58cf907d1cfb1bb8f06ae42250526eae363d557 100644 +index c35c7851f168954a0c5265ea218a2173b7b079a8..500b267351d2e4ac9864129650b6c00627a8ea6f 100644 --- a/Source/WebCore/dom/PointerEvent.cpp +++ b/Source/WebCore/dom/PointerEvent.cpp @@ -27,9 +27,11 @@ @@ -2610,9 +2610,9 @@ index 4d8a06e48fbd2c6a0f9af32f1fdead5cb393d5a7..f58cf907d1cfb1bb8f06ae42250526ea #include namespace WebCore { -@@ -127,4 +129,51 @@ EventInterface PointerEvent::eventInterface() const - return PointerEventInterfaceType; - } +@@ -122,4 +124,51 @@ PointerEvent::PointerEvent(const AtomString& type, PointerID pointerId, const St + + PointerEvent::~PointerEvent() = default; +#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS_FAMILY) && !PLATFORM(WPE) + @@ -2663,7 +2663,7 @@ index 4d8a06e48fbd2c6a0f9af32f1fdead5cb393d5a7..f58cf907d1cfb1bb8f06ae42250526ea + } // namespace WebCore diff --git a/Source/WebCore/dom/PointerEvent.h b/Source/WebCore/dom/PointerEvent.h -index c67cf54a953a4792395132e15ab978bdc39eef9b..20640dbb12fd4b4118c5313bbd732adcdfe1fb3e 100644 +index 261a8c7e8946cac87b9ebc5fc5e3b697f326b7f4..02645d3bdce44f40a648e720e99a6b296f371fb2 100644 --- a/Source/WebCore/dom/PointerEvent.h +++ b/Source/WebCore/dom/PointerEvent.h @@ -34,6 +34,8 @@ @@ -2684,7 +2684,7 @@ index c67cf54a953a4792395132e15ab978bdc39eef9b..20640dbb12fd4b4118c5313bbd732adc static Ref create(const PlatformTouchEvent&, unsigned touchIndex, bool isPrimary, Ref&&, const IntPoint& touchDelta = { }); static Ref create(const AtomString& type, const PlatformTouchEvent&, unsigned touchIndex, bool isPrimary, Ref&&, const IntPoint& touchDelta = { }); #endif -@@ -141,7 +143,7 @@ private: +@@ -140,7 +142,7 @@ private: PointerEvent(const AtomString&, Init&&); PointerEvent(const AtomString& type, MouseButton, const MouseEvent&, PointerID, const String& pointerType); PointerEvent(const AtomString& type, PointerID, const String& pointerType, IsPrimary); @@ -3696,7 +3696,7 @@ index 5f1dba2bc4d5c2f113a88dcc9ba479679cb79233..5616c853a99b5fdb38306a804cc0e917 void discardBindings(); diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp -index 4f6157154362aef3c6c1987382178ca9de565610..3b1b143617bd78165870ef49edf42f40007bd5b2 100644 +index cf2145f9d95fb7e1639757b0b90d1e93fb6b6f14..93da4f3e31842777238ff26ea1cf7ce8d03165ca 100644 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp @@ -59,6 +59,7 @@ @@ -3806,7 +3806,7 @@ index dc7e574ee6e9256a1f75ea838d20ca7f5e9190de..5dd4464256e0f5d652fa51fd611286dd // InspectorInstrumentation void willRecalculateStyle(); diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp -index 8fc922b0ab24e76458c959361551736c361bf390..29a7a29022ac0e4ddb6c2b5eb1009e3e632d04fc 100644 +index 8fc922b0ab24e76458c959361551736c361bf390..4c3a462dbfacf1cdf9b16478ab579d8965221aa4 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp @@ -32,19 +32,26 @@ @@ -4274,7 +4274,7 @@ index 8fc922b0ab24e76458c959361551736c361bf390..29a7a29022ac0e4ddb6c2b5eb1009e3e Inspector::Protocol::ErrorStringOr InspectorPageAgent::setScreenSizeOverride(std::optional&& width, std::optional&& height) { if (width.has_value() != height.has_value()) -@@ -1251,6 +1451,517 @@ Inspector::Protocol::ErrorStringOr InspectorPageAgent::setScreenSizeOverri +@@ -1251,6 +1451,523 @@ Inspector::Protocol::ErrorStringOr InspectorPageAgent::setScreenSizeOverri localMainFrame->setOverrideScreenSize(FloatSize(width.value_or(0), height.value_or(0))); return { }; } @@ -4282,12 +4282,14 @@ index 8fc922b0ab24e76458c959361551736c361bf390..29a7a29022ac0e4ddb6c2b5eb1009e3e +Protocol::ErrorStringOr InspectorPageAgent::insertText(const String& text) +{ + UserGestureIndicator indicator { IsProcessingUserGesture::Yes }; -+ LocalFrame& frame = m_inspectedPage.focusController().focusedOrMainFrame(); ++ RefPtr frame = m_inspectedPage.checkedFocusController()->focusedOrMainFrame(); ++ if (!frame) ++ return { }; + -+ if (frame.editor().hasComposition()) { -+ frame.editor().confirmComposition(text); ++ if (frame->editor().hasComposition()) { ++ frame->editor().confirmComposition(text); + } else { -+ Document* focusedDocument = frame.document(); ++ Document* focusedDocument = frame->document(); + TypingCommand::insertText(*focusedDocument, text, { }); + } + return { }; @@ -4368,6 +4370,8 @@ index 8fc922b0ab24e76458c959361551736c361bf390..29a7a29022ac0e4ddb6c2b5eb1009e3e + return "DocumentMath"_s; + case AccessibilityRole::DocumentNote: + return "DocumentNote"_s; ++ case AccessibilityRole::Emphasis: ++ return "Emphasis"_s; + case AccessibilityRole::Feed: + return "Feed"_s; + case AccessibilityRole::Figure: @@ -4518,6 +4522,8 @@ index 8fc922b0ab24e76458c959361551736c361bf390..29a7a29022ac0e4ddb6c2b5eb1009e3e + return "Splitter"_s; + case AccessibilityRole::StaticText: + return "StaticText"_s; ++ case AccessibilityRole::Strong: ++ return "Strong"_s; + case AccessibilityRole::Subscript: + return "Subscript"_s; + case AccessibilityRole::Suggestion: @@ -5130,10 +5136,10 @@ index edfc601a36f006122f26946de5b3a60573a07968..794a6c389be8af23989a54696d573123 protected: static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No); diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp -index 6bb10715441131b9712a79d7952f8bdff4a28b04..88d179bb82cf7c687e674f8c4460b4701230f2f0 100644 +index e85ff270c6f646f5f8f7e02ce5346a1f0b5cadaa..84214d0b81ad08f8039522b9a48ac8b34d933f38 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp -@@ -762,8 +762,10 @@ void DocumentLoader::willSendRequest(ResourceRequest&& newRequest, const Resourc +@@ -763,8 +763,10 @@ void DocumentLoader::willSendRequest(ResourceRequest&& newRequest, const Resourc if (!didReceiveRedirectResponse) return completionHandler(WTFMove(newRequest)); @@ -5144,7 +5150,7 @@ index 6bb10715441131b9712a79d7952f8bdff4a28b04..88d179bb82cf7c687e674f8c4460b470 switch (navigationPolicyDecision) { case NavigationPolicyDecision::IgnoreLoad: case NavigationPolicyDecision::LoadWillContinueInAnotherProcess: -@@ -1524,11 +1526,17 @@ void DocumentLoader::detachFromFrame(LoadWillContinueInAnotherProcess loadWillCo +@@ -1532,11 +1534,17 @@ void DocumentLoader::detachFromFrame(LoadWillContinueInAnotherProcess loadWillCo if (auto navigationID = std::exchange(m_navigationID, 0)) m_frame->loader().client().documentLoaderDetached(navigationID, loadWillContinueInAnotherProcess); @@ -5165,7 +5171,7 @@ index 6bb10715441131b9712a79d7952f8bdff4a28b04..88d179bb82cf7c687e674f8c4460b470 { ASSERT(navigationID); diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index 43718ea3d4fe5378179e497f8e35881831a7b9cd..86fd689e144f3407cb0331b886b75990e28d8e59 100644 +index 875b1833d5c8a3c7402070de33587630114e1a93..b61fa5f72c3aab410b1d3a4b58dd268d996f5311 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h @@ -191,6 +191,8 @@ public: @@ -5178,10 +5184,10 @@ index 43718ea3d4fe5378179e497f8e35881831a7b9cd..86fd689e144f3407cb0331b886b75990 CheckedPtr checkedFrameLoader() const; WEBCORE_EXPORT SubresourceLoader* mainResourceLoader() const; diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index 6c38a011b6dfae5b0ef12c91e1c18f86b385c11f..01fd8f4bb4e037f63cf144e193c4b6cfab48cc82 100644 +index 504ef796ccbc570fc44b441c69a4ddc4b89fee75..9c3a168dd937dbd274ecd758398e82729a47911a 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp -@@ -1277,6 +1277,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr stat +@@ -1310,6 +1310,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr stat } m_client->dispatchDidNavigateWithinPage(); @@ -5189,7 +5195,7 @@ index 6c38a011b6dfae5b0ef12c91e1c18f86b385c11f..01fd8f4bb4e037f63cf144e193c4b6cf document->statePopped(stateObject ? stateObject.releaseNonNull() : SerializedScriptValue::nullValue()); m_client->dispatchDidPopStateWithinPage(); -@@ -1739,6 +1740,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t +@@ -1775,6 +1776,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t const String& httpMethod = loader->request().httpMethod(); if (shouldPerformFragmentNavigation(isFormSubmission, httpMethod, policyChecker().loadType(), newURL)) { @@ -5198,7 +5204,7 @@ index 6c38a011b6dfae5b0ef12c91e1c18f86b385c11f..01fd8f4bb4e037f63cf144e193c4b6cf RefPtr oldDocumentLoader = m_documentLoader; NavigationAction action { frame->protectedDocument().releaseNonNull(), loader->request(), InitiatedByMainFrame::Unknown, loader->isRequestFromClientOrUserInput(), policyChecker().loadType(), isFormSubmission }; oldDocumentLoader->setTriggeringAction(WTFMove(action)); -@@ -1772,7 +1775,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t +@@ -1808,7 +1811,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t } RELEASE_ASSERT(!isBackForwardLoadType(policyChecker().loadType()) || history().provisionalItem()); @@ -5208,7 +5214,7 @@ index 6c38a011b6dfae5b0ef12c91e1c18f86b385c11f..01fd8f4bb4e037f63cf144e193c4b6cf continueLoadAfterNavigationPolicy(request, RefPtr { weakFormState.get() }.get(), navigationPolicyDecision, allowNavigationToInvalidURL); completionHandler(); }, PolicyDecisionMode::Asynchronous); -@@ -3031,14 +3036,19 @@ String FrameLoader::userAgent(const URL& url) const +@@ -3066,14 +3071,19 @@ String FrameLoader::userAgent(const URL& url) const String FrameLoader::navigatorPlatform() const { @@ -5230,7 +5236,7 @@ index 6c38a011b6dfae5b0ef12c91e1c18f86b385c11f..01fd8f4bb4e037f63cf144e193c4b6cf } void FrameLoader::dispatchOnloadEvents() -@@ -3475,6 +3485,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) +@@ -3514,6 +3524,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) checkCompleted(); if (frame->page()) checkLoadComplete(); @@ -5239,7 +5245,7 @@ index 6c38a011b6dfae5b0ef12c91e1c18f86b385c11f..01fd8f4bb4e037f63cf144e193c4b6cf } void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, const SecurityOrigin* requesterOrigin, bool shouldContinue) -@@ -4328,9 +4340,6 @@ String FrameLoader::referrer() const +@@ -4367,9 +4379,6 @@ String FrameLoader::referrer() const void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() { @@ -5249,7 +5255,7 @@ index 6c38a011b6dfae5b0ef12c91e1c18f86b385c11f..01fd8f4bb4e037f63cf144e193c4b6cf Vector> worlds; ScriptController::getAllWorlds(worlds); for (auto& world : worlds) -@@ -4340,13 +4349,12 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() +@@ -4379,13 +4388,12 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world) { Ref frame = m_frame.get(); @@ -5329,10 +5335,10 @@ index b74c5258454b0df9f74aa8a5297674b733925685..b6c3999745368c7f7e2e6176bfca6dc0 void ProgressTracker::incrementProgress(ResourceLoaderIdentifier identifier, const ResourceResponse& response) diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp -index 9035c6e4e13154bd9cbba7d6d3c2d0f286204349..7157eadd2fe730eef228aad4d13bcface647dbe0 100644 +index a2220c148173e75ab575dbca17506243523a7f7e..1bd9e2d210c4b7c636666e7584c0d33f2102345b 100644 --- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp +++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp -@@ -1062,8 +1062,11 @@ ResourceErrorOr> CachedResourceLoader::requ +@@ -1061,8 +1061,11 @@ ResourceErrorOr> CachedResourceLoader::requ request.updateReferrerPolicy(document() ? document()->referrerPolicy() : ReferrerPolicy::Default); @@ -5346,7 +5352,7 @@ index 9035c6e4e13154bd9cbba7d6d3c2d0f286204349..7157eadd2fe730eef228aad4d13bcfac Ref page = *frame->page(); -@@ -1669,8 +1672,9 @@ Vector> CachedResourceLoader::allCachedSVGImages() const +@@ -1670,8 +1673,9 @@ Vector> CachedResourceLoader::allCachedSVGImages() const ResourceErrorOr> CachedResourceLoader::preload(CachedResource::Type type, CachedResourceRequest&& request) { @@ -5359,7 +5365,7 @@ index 9035c6e4e13154bd9cbba7d6d3c2d0f286204349..7157eadd2fe730eef228aad4d13bcfac ASSERT(m_document); if (request.charset().isEmpty() && m_document && (type == CachedResource::Type::Script || type == CachedResource::Type::CSSStyleSheet)) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index 15aba82d841a1bcc4b51033364a4e1432bab9d97..e3c35ca97bee61cc1e60ed51c43cbf61c660ae34 100644 +index ba86781050d91cdc6b67f088bfd199b29bbc7a3f..b13a833c0712d8d2b6c8b3a0cee3fa5827d04de2 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -334,7 +334,7 @@ public: @@ -5372,10 +5378,10 @@ index 15aba82d841a1bcc4b51033364a4e1432bab9d97..e3c35ca97bee61cc1e60ed51c43cbf61 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 585e801807bd0923bdd6c77003ca5d10eceb2c5c..5a6b2ee3ab303584b5bdb2905e5adb2b9f735e02 100644 +index ac9e55cc26b95ceb6b8a3bd62b984ccf4e96fbec..37edb3407986ba04a82c0d1acd1662e5e835fb6a 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp -@@ -4313,6 +4313,12 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4322,6 +4322,12 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!document) return false; @@ -5388,7 +5394,7 @@ index 585e801807bd0923bdd6c77003ca5d10eceb2c5c..5a6b2ee3ab303584b5bdb2905e5adb2b dragState().dataTransfer = DataTransfer::createForDrag(*document); auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; -@@ -4940,7 +4946,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve +@@ -4948,7 +4954,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve // Increment the platform touch id by 1 to avoid storing a key of 0 in the hashmap. unsigned touchPointTargetKey = point.id() + 1; @@ -5397,7 +5403,7 @@ index 585e801807bd0923bdd6c77003ca5d10eceb2c5c..5a6b2ee3ab303584b5bdb2905e5adb2b bool pointerCancelled = false; #endif RefPtr touchTarget; -@@ -4987,7 +4993,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve +@@ -4995,7 +5001,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve // we also remove it from the map. touchTarget = m_originatingTouchPointTargets.take(touchPointTargetKey); @@ -5406,7 +5412,7 @@ index 585e801807bd0923bdd6c77003ca5d10eceb2c5c..5a6b2ee3ab303584b5bdb2905e5adb2b HitTestResult result = hitTestResultAtPoint(pagePoint, hitType | HitTestRequest::Type::AllowChildFrameContent); pointerTarget = result.targetElement(); pointerCancelled = (pointerTarget != touchTarget); -@@ -5010,7 +5016,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve +@@ -5018,7 +5024,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve if (!targetFrame) continue; @@ -5416,10 +5422,10 @@ index 585e801807bd0923bdd6c77003ca5d10eceb2c5c..5a6b2ee3ab303584b5bdb2905e5adb2b // on release if the hit test result changed since the previous TouchPressed or TouchMoved if (pointState == PlatformTouchPoint::TouchReleased && pointerCancelled) { diff --git a/Source/WebCore/page/FrameSnapshotting.cpp b/Source/WebCore/page/FrameSnapshotting.cpp -index 7ee2659df6aca0f84b61cb0de78ba9518b65b61e..0f09634cc4e679742b64a29506e2bd65e73c6fe9 100644 +index 36ff7673bffcfea97e705d03f31459c36dc46164..1a65fcc874877b8b54e4e6aebb56b66294ef1ceb 100644 --- a/Source/WebCore/page/FrameSnapshotting.cpp +++ b/Source/WebCore/page/FrameSnapshotting.cpp -@@ -109,7 +109,7 @@ RefPtr snapshotFrameRectWithClip(LocalFrame& frame, const IntRect& +@@ -113,7 +113,7 @@ RefPtr snapshotFrameRectWithClip(LocalFrame& frame, const IntRect& // Other paint behaviors are set by paintContentsForSnapshot. frame.view()->setPaintBehavior(paintBehavior); @@ -5428,7 +5434,7 @@ index 7ee2659df6aca0f84b61cb0de78ba9518b65b61e..0f09634cc4e679742b64a29506e2bd65 if (frame.page()->delegatesScaling()) scaleFactor *= frame.page()->pageScaleFactor(); -@@ -124,7 +124,13 @@ RefPtr snapshotFrameRectWithClip(LocalFrame& frame, const IntRect& +@@ -128,7 +128,13 @@ RefPtr snapshotFrameRectWithClip(LocalFrame& frame, const IntRect& if (!buffer) return nullptr; @@ -5442,7 +5448,7 @@ index 7ee2659df6aca0f84b61cb0de78ba9518b65b61e..0f09634cc4e679742b64a29506e2bd65 if (!clipRects.isEmpty()) { Path clipPath; -@@ -133,7 +139,10 @@ RefPtr snapshotFrameRectWithClip(LocalFrame& frame, const IntRect& +@@ -137,7 +143,10 @@ RefPtr snapshotFrameRectWithClip(LocalFrame& frame, const IntRect& buffer->context().clipPath(clipPath); } @@ -5455,28 +5461,19 @@ index 7ee2659df6aca0f84b61cb0de78ba9518b65b61e..0f09634cc4e679742b64a29506e2bd65 } diff --git a/Source/WebCore/page/FrameSnapshotting.h b/Source/WebCore/page/FrameSnapshotting.h -index 5f85bb24166b1c1805323fcbb34144be3191643b..09d2782e3961d70b9483a77e0c12923bc58860d7 100644 +index e4f52ca1cb3228868bc77a5498c87e1f2af59ce4..9ce6b102570cdcd2775ebf5adcd1650db837f311 100644 --- a/Source/WebCore/page/FrameSnapshotting.h +++ b/Source/WebCore/page/FrameSnapshotting.h -@@ -44,7 +44,7 @@ class ImageBuffer; - class LocalFrame; - class Node; - --enum class SnapshotFlags : uint8_t { -+enum class SnapshotFlags : uint16_t { - ExcludeSelectionHighlighting = 1 << 0, - PaintSelectionOnly = 1 << 1, - InViewCoordinates = 1 << 2, -@@ -53,6 +53,7 @@ enum class SnapshotFlags : uint8_t { - PaintEverythingExcludingSelection = 1 << 5, +@@ -54,6 +54,7 @@ enum class SnapshotFlags : uint16_t { PaintWithIntegralScaleFactor = 1 << 6, Shareable = 1 << 7, -+ OmitDeviceScaleFactor = 1 << 8, + Accelerated = 1 << 8, ++ OmitDeviceScaleFactor = 1 << 9, }; struct SnapshotOptions { diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp -index 66fc6dd13e5d1eadb58b159416bc21ef12bf9605..bcf4fb2c5bcaea3df1b7d4468e9fbb4f89ac3777 100644 +index fc2312697a19a2dca1907f9ddaffef26a2918113..ab51a74df8ff444302c46f85f0bc8ab0f791d1dc 100644 --- a/Source/WebCore/page/History.cpp +++ b/Source/WebCore/page/History.cpp @@ -32,6 +32,7 @@ @@ -5487,7 +5484,7 @@ index 66fc6dd13e5d1eadb58b159416bc21ef12bf9605..bcf4fb2c5bcaea3df1b7d4468e9fbb4f #include "LocalFrame.h" #include "LocalFrameLoaderClient.h" #include "Logging.h" -@@ -290,6 +291,7 @@ ExceptionOr History::stateObjectAdded(RefPtr&& data +@@ -298,6 +299,7 @@ ExceptionOr History::stateObjectAdded(RefPtr&& data if (!urlString.isEmpty()) frame->protectedDocument()->updateURLForPushOrReplaceState(fullURL); @@ -5496,7 +5493,7 @@ index 66fc6dd13e5d1eadb58b159416bc21ef12bf9605..bcf4fb2c5bcaea3df1b7d4468e9fbb4f if (stateObjectType == StateObjectType::Push) { frame->loader().history().pushState(WTFMove(data), fullURL.string()); diff --git a/Source/WebCore/page/LocalFrame.cpp b/Source/WebCore/page/LocalFrame.cpp -index 88e11344718de503f2786b6a4323a2246e59950a..e874738aa50968dc4570778d50b326426d7b56dc 100644 +index 1261ef00be22e57714d52a718a1a463aff4b902e..1b6eaf61ebf7f3987b0b5785637341016eb2ff44 100644 --- a/Source/WebCore/page/LocalFrame.cpp +++ b/Source/WebCore/page/LocalFrame.cpp @@ -40,6 +40,7 @@ @@ -5983,10 +5980,10 @@ index 8664b164cf806585025da5d60ad1440ee4723482..8e0a986d16eb6cd6bb4cf381d18434b6 ViewportArguments m_viewportArguments; diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp -index 0b621ec69894565d19d8fe7ca6cab167b3780d5c..6d4bce07d0aa86e0316d09b8abccfb07c7d5c9ba 100644 +index 2e0f4477ca7e4874b4b5b38fe1e8fefd2bc75cd8..c0e9358b9cdbb92c273832edbb560236af24e80c 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -552,6 +552,45 @@ void Page::setOverrideViewportArguments(const std::optional& +@@ -554,6 +554,45 @@ void Page::setOverrideViewportArguments(const std::optional& document->updateViewportArguments(); } @@ -6032,7 +6029,7 @@ index 0b621ec69894565d19d8fe7ca6cab167b3780d5c..6d4bce07d0aa86e0316d09b8abccfb07 ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -3816,6 +3855,26 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3834,6 +3873,26 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6060,10 +6057,10 @@ index 0b621ec69894565d19d8fe7ca6cab167b3780d5c..6d4bce07d0aa86e0316d09b8abccfb07 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 299c291d22f11e8eb77ebd3fa3c158fa6b66f9c5..3b176700ea7dd2d82af0f158504eb40ed9e73102 100644 +index 1941a2ed150ad039c4e7b02fa826a3be6c55a0bd..5c5610ef3410a55b8f1b684ff68be456c11a0db8 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h -@@ -311,6 +311,9 @@ public: +@@ -312,6 +312,9 @@ public: const std::optional& overrideViewportArguments() const { return m_overrideViewportArguments; } WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional&); @@ -6073,7 +6070,7 @@ index 299c291d22f11e8eb77ebd3fa3c158fa6b66f9c5..3b176700ea7dd2d82af0f158504eb40e static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -372,6 +375,10 @@ public: +@@ -375,6 +378,10 @@ public: #if ENABLE(DRAG_SUPPORT) DragController& dragController() { return m_dragController.get(); } const DragController& dragController() const { return m_dragController.get(); } @@ -6084,7 +6081,7 @@ index 299c291d22f11e8eb77ebd3fa3c158fa6b66f9c5..3b176700ea7dd2d82af0f158504eb40e #endif FocusController& focusController() const { return *m_focusController; } WEBCORE_EXPORT CheckedRef checkedFocusController() const; -@@ -552,6 +559,10 @@ public: +@@ -555,6 +562,10 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6095,7 +6092,7 @@ index 299c291d22f11e8eb77ebd3fa3c158fa6b66f9c5..3b176700ea7dd2d82af0f158504eb40e #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -1001,6 +1012,11 @@ public: +@@ -1003,6 +1014,11 @@ public: WEBCORE_EXPORT void setInteractionRegionsEnabled(bool); #endif @@ -6107,7 +6104,7 @@ index 299c291d22f11e8eb77ebd3fa3c158fa6b66f9c5..3b176700ea7dd2d82af0f158504eb40e #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -1160,6 +1176,9 @@ private: +@@ -1166,6 +1182,9 @@ private: #if ENABLE(DRAG_SUPPORT) UniqueRef m_dragController; @@ -6117,7 +6114,7 @@ index 299c291d22f11e8eb77ebd3fa3c158fa6b66f9c5..3b176700ea7dd2d82af0f158504eb40e #endif std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1234,6 +1253,8 @@ private: +@@ -1241,6 +1260,8 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6126,7 +6123,7 @@ index 299c291d22f11e8eb77ebd3fa3c158fa6b66f9c5..3b176700ea7dd2d82af0f158504eb40e #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1411,6 +1432,11 @@ private: +@@ -1419,6 +1440,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6259,7 +6256,7 @@ index 4e4dfdebe954bf3f047d3a86a758dfd0913f732e..da2bcd0256cdfc2ba28fb07094abd0b6 } diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -index f8f503996052b812c077fa32040893c15db26ee1..5ae7c302bc8ac0f2e7d8f24bca1340cde8f27116 100644 +index ad0c3f33aa674454f270899400cc0e8e4421a874..6c68e218b27b117145324b10572393854d48ead0 100644 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp @@ -336,6 +336,8 @@ bool ContentSecurityPolicy::allowContentSecurityPolicySourceStarToMatchAnyProtoc @@ -6421,7 +6418,7 @@ index 35cce31f0f77478754a7859c16f42b6a7ec6edda..03660bd492fad8863aeb21d73a54e7b9 bool m_disallowFileAccess { false }; }; diff --git a/Source/WebCore/platform/DragImage.cpp b/Source/WebCore/platform/DragImage.cpp -index 9b613ca69af779a1e52b6a66216b0905809262dc..cd48a3551ae8da7702154798fcc6ab4df00f7f7f 100644 +index dc894343a5d9ce0e45a370a83bebf97fdcbeccc5..00003bd9bada8f134b6cc49f47c8c5cb459d1ebd 100644 --- a/Source/WebCore/platform/DragImage.cpp +++ b/Source/WebCore/platform/DragImage.cpp @@ -280,7 +280,7 @@ DragImage::~DragImage() @@ -6618,7 +6615,7 @@ index 34715d27b529750fc866db87cd330b5184286771..3eefa218af075f76d98012cdeae7e4b3 // create a PlatformTouchPoint of type TouchCancelled artificially PlatformTouchPoint(unsigned id, State state, IntPoint screenPos, IntPoint pos) diff --git a/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp b/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp -index a2310a15ba9e9703a1d8ec4691b3f626cbfab640..63a7d6027fb35a3ac60bb41a51df2f1c70fef56d 100644 +index e280025043b3c03c3974289e62ef7cc88ebfa2c7..077a4ab4aa5b688937ed4d5018745aa6f6af7442 100644 --- a/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp +++ b/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp @@ -43,7 +43,7 @@ @@ -6631,7 +6628,7 @@ index a2310a15ba9e9703a1d8ec4691b3f626cbfab640..63a7d6027fb35a3ac60bb41a51df2f1c static const unsigned thumbBorderSize = 1; static const unsigned overlayThumbSize = 3; diff --git a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp -index ba4211130b222abe1cba86e9eedf525940f317a0..f2289378791bc76a5bc82ba89876c3ed6aa645e3 100644 +index a126eaa294ef640841f62a3f0d9364b733236e6b..f5b81118b2b430b87492f1c3669ffff2d563d721 100644 --- a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp +++ b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp @@ -48,6 +48,13 @@ @@ -7684,7 +7681,7 @@ index 35ade40b37f0c476815535541118f9246ed199cd..2bd1444f9a5e9a14ab3d6acbc020434e m_commonHeaders.append(CommonHeader { name, value }); } diff --git a/Source/WebCore/platform/network/NetworkStorageSession.h b/Source/WebCore/platform/network/NetworkStorageSession.h -index 952e935a4124c228e106ed8c3e788b97774732e5..2292247c2bd40aacf3530e3f4a9035a4a00f147b 100644 +index d044695c67cc56999c6e0f71dcccf5ce65c7dd2f..3ca5d2ad1d8993958b198cc78eb40cfb6f6483dc 100644 --- a/Source/WebCore/platform/network/NetworkStorageSession.h +++ b/Source/WebCore/platform/network/NetworkStorageSession.h @@ -167,6 +167,8 @@ public: @@ -8511,10 +8508,10 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderTextControl.cpp b/Source/WebCore/rendering/RenderTextControl.cpp -index 4d46548757a4537e1cf55dde8c777b5817b706ff..bbc7771d987c74581f73ca47dae617cc28717a78 100644 +index 43d3b0ea8c3000a82999356aeca617e9ce0cc9bc..6e0557a1cd8b9d1d03f6dbc6f8b67df462d8a2a9 100644 --- a/Source/WebCore/rendering/RenderTextControl.cpp +++ b/Source/WebCore/rendering/RenderTextControl.cpp -@@ -210,13 +210,13 @@ void RenderTextControl::layoutExcludedChildren(bool relayoutChildren) +@@ -222,13 +222,13 @@ void RenderTextControl::layoutExcludedChildren(bool relayoutChildren) } } @@ -8545,7 +8542,7 @@ index e064a7a15a416e593b68de15133c5528b1ce2ae0..2860c13fad04ea32e28142848e058370 int innerLineHeight() const override; #endif diff --git a/Source/WebCore/workers/WorkerConsoleClient.cpp b/Source/WebCore/workers/WorkerConsoleClient.cpp -index 3a0f87d60e42971d841b9eb5c8f1b36b4cb9649e..f2da6be1c58b89adc458c9e2c86c9ab6d613ff2a 100644 +index 2cd5580e166c7eb03d7813fba647cb9748ee72ab..8d897cd56b35301031626bc4160fac907677f9f6 100644 --- a/Source/WebCore/workers/WorkerConsoleClient.cpp +++ b/Source/WebCore/workers/WorkerConsoleClient.cpp @@ -101,4 +101,6 @@ void WorkerConsoleClient::recordEnd(JSC::JSGlobalObject*, Ref&& @@ -8568,7 +8565,7 @@ index 1d8488e0d36288e09cd5662bd7f770ade95dfee3..dee07f87b47d62d4ef8ede45824bdb2f WorkerOrWorkletGlobalScope& m_globalScope; }; diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -index 45c208c43d3989a2167aff77e71264c34392f4e5..96314d38c4b6f0723ba4a663480c388bdb43eec2 100644 +index bf5894cb3065bcded234f5bb0c2384ffe8afeaf1..5bb922d3fb26790b337e39460dde88b736157126 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -96,6 +96,8 @@ @@ -8580,7 +8577,7 @@ index 45c208c43d3989a2167aff77e71264c34392f4e5..96314d38c4b6f0723ba4a663480c388b #endif #if ENABLE(APPLE_PAY_REMOTE_UI) -@@ -1069,6 +1071,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) +@@ -1077,6 +1079,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) storageSession->clearPageSpecificDataForResourceLoadStatistics(pageID); } @@ -8596,10 +8593,10 @@ index 45c208c43d3989a2167aff77e71264c34392f4e5..96314d38c4b6f0723ba4a663480c388b { if (auto* storageSession = networkProcess().storageSession(m_sessionID)) diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -index 488bf8eba7393480635db5bea3c59e8753ec84b4..3cba3441ee02576eafa36166780384c08a466097 100644 +index 2e75a2e5f36e4bf8572dde214007ef9112340147..da32d9a2159dde35b31ad6494b57ee002bc32230 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -@@ -339,6 +339,8 @@ private: +@@ -343,6 +343,8 @@ private: void clearPageSpecificData(WebCore::PageIdentifier); @@ -8609,10 +8606,10 @@ index 488bf8eba7393480635db5bea3c59e8753ec84b4..3cba3441ee02576eafa36166780384c0 void logUserInteraction(RegistrableDomain&&); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in -index eaa6f34e690304fd936a0115b16bee6d448dafb8..914572c48a132a95879593b5629f2266db3b712f 100644 +index db2fd2aa2a4e2cc6f8e543a1238768a87a47b7b3..6fd98fff31ca2f07267c2f1e87e67585d356504b 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in -@@ -73,6 +73,8 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver { +@@ -74,6 +74,8 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver { ClearPageSpecificData(WebCore::PageIdentifier pageID); @@ -8622,7 +8619,7 @@ index eaa6f34e690304fd936a0115b16bee6d448dafb8..914572c48a132a95879593b5629f2266 LogUserInteraction(WebCore::RegistrableDomain domain) ResourceLoadStatisticsUpdated(Vector statistics) -> () diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp -index 1d10e5bb09fe292d7a01612b6aed9e35da45c18c..012479c922cedca0b7f72d95e2e9a83323df081c 100644 +index a64ab0c971d231725f54b48f2dfce9b14f176413..edf339a771288a5779088f47dd140bbb1ac79d9f 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -630,6 +630,12 @@ void NetworkProcess::registrableDomainsExemptFromWebsiteDataDeletion(PAL::Sessio @@ -8639,7 +8636,7 @@ index 1d10e5bb09fe292d7a01612b6aed9e35da45c18c..012479c922cedca0b7f72d95e2e9a833 { if (auto* session = networkSession(sessionID)) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index 10e053350e326197542f65fb808447115bc27952..dc58f8e2c4aff12f80ba7712507b1513831a7a0c 100644 +index a8e9afedc539d5be95b11d30a621d75b0a1e21ca..3a94e96c865c1e324571a31fba49fdeb7f524a58 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -33,6 +33,7 @@ @@ -8669,7 +8666,7 @@ index 10e053350e326197542f65fb808447115bc27952..dc58f8e2c4aff12f80ba7712507b1513 void clearUserInteraction(PAL::SessionID, RegistrableDomain&&, CompletionHandler&&); void deleteAndRestrictWebsiteDataForRegistrableDomains(PAL::SessionID, OptionSet, RegistrableDomainsToDeleteOrRestrictWebsiteDataFor&&, bool shouldNotifyPage, CompletionHandler&&)>&&); diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in -index 8e93b5fab125d3ac047d10982918be5fbc42de6a..1d04d3eabb1753329831c78f26267864db0a54f6 100644 +index 0a6ee4fa17b06a3983e083ccef42af134367a63b..0e386d5f16c60c185ebec1d3b974c6242fadd6bc 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in @@ -79,6 +79,8 @@ messages -> NetworkProcess LegacyReceiver { @@ -8704,10 +8701,10 @@ index e0abf3efc001aef58ecdc10e7b0066d5a0f0bc3f..0940c4918d6db0f22a350abde8089b30 HashSet> m_keptAliveLoads; diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index cd45693c6921525069d7a9fe20ba9eaf80678788..55050c618d4c4fc4896d39d39ff62f901761ec04 100644 +index 95fd05820627eb2ec3ab61bbfe3c93011761464c..b1944ca937b09a942a42ce4e57311f8a5ff6aa51 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -760,6 +760,8 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didRece +@@ -761,6 +761,8 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didRece if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { sessionCocoa->setClientAuditToken(challenge); @@ -8716,7 +8713,7 @@ index cd45693c6921525069d7a9fe20ba9eaf80678788..55050c618d4c4fc4896d39d39ff62f90 NSURLSessionTaskTransactionMetrics *metrics = task._incompleteTaskMetrics.transactionMetrics.lastObject; auto tlsVersion = (tls_protocol_version_t)metrics.negotiatedTLSProtocolVersion.unsignedShortValue; -@@ -1099,6 +1101,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END +@@ -1100,6 +1102,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics())); @@ -8731,10 +8728,10 @@ index cd45693c6921525069d7a9fe20ba9eaf80678788..55050c618d4c4fc4896d39d39ff62f90 #if !LOG_DISABLED LOG(NetworkSession, "%llu didReceiveResponse completionHandler (%d)", taskIdentifier, policyAction); diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp -index c152b51b88aca272fc1bcc441c63e2a194ae0634..872cc3c8c425a425001abf7e9d72a18d5640980c 100644 +index 383b0c08feda5c59455407093f656311c0a0c3fc..4522f3a562e67f41f29ee699ab9ed9dad999d90e 100644 --- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp +++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp -@@ -79,10 +79,18 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas +@@ -80,10 +80,18 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas blockCookies(); restrictRequestReferrerToOriginIfNeeded(request); @@ -8757,7 +8754,7 @@ index c152b51b88aca272fc1bcc441c63e2a194ae0634..872cc3c8c425a425001abf7e9d72a18d } } -@@ -165,6 +173,7 @@ void NetworkDataTaskCurl::curlDidReceiveResponse(CurlRequest& request, CurlRespo +@@ -166,6 +174,7 @@ void NetworkDataTaskCurl::curlDidReceiveResponse(CurlRequest& request, CurlRespo updateNetworkLoadMetrics(receivedResponse.networkLoadMetrics); m_response.setDeprecatedNetworkLoadMetrics(Box::create(WTFMove(receivedResponse.networkLoadMetrics))); @@ -8765,7 +8762,7 @@ index c152b51b88aca272fc1bcc441c63e2a194ae0634..872cc3c8c425a425001abf7e9d72a18d handleCookieHeaders(request.resourceRequest(), receivedResponse); -@@ -289,6 +298,36 @@ bool NetworkDataTaskCurl::shouldRedirectAsGET(const ResourceRequest& request, bo +@@ -290,6 +299,36 @@ bool NetworkDataTaskCurl::shouldRedirectAsGET(const ResourceRequest& request, bo return false; } @@ -8802,7 +8799,7 @@ index c152b51b88aca272fc1bcc441c63e2a194ae0634..872cc3c8c425a425001abf7e9d72a18d void NetworkDataTaskCurl::invokeDidReceiveResponse() { didReceiveResponse(ResourceResponse(m_response), NegotiatedLegacyTLS::No, PrivateRelayed::No, [this, protectedThis = Ref { *this }](PolicyAction policyAction) { -@@ -319,6 +358,8 @@ void NetworkDataTaskCurl::invokeDidReceiveResponse() +@@ -320,6 +359,8 @@ void NetworkDataTaskCurl::invokeDidReceiveResponse() downloadPtr->didCreateDestination(m_pendingDownloadLocation); if (m_curlRequest) m_curlRequest->completeDidReceiveResponse(); @@ -8811,7 +8808,7 @@ index c152b51b88aca272fc1bcc441c63e2a194ae0634..872cc3c8c425a425001abf7e9d72a18d break; } default: -@@ -405,6 +446,8 @@ void NetworkDataTaskCurl::willPerformHTTPRedirection() +@@ -408,6 +449,8 @@ void NetworkDataTaskCurl::willPerformHTTPRedirection() m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password()); m_curlRequest->setAuthenticationScheme(ProtectionSpace::AuthenticationScheme::HTTPBasic); } @@ -8862,10 +8859,10 @@ index bfff08efb10d4d6cd1a27755403ed53ed58ce919..1a59755f684229bd47fd70369e4a9d42 bool m_blockingCookies { false }; diff --git a/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp -index 8dc0bcdb1cdfa86d04fc7e4e3718f1fe2c457c80..21180451b653bdd3596164a9b60d34d73d1eebfc 100644 +index 486849ef6f550a0f3caab311abf5743c6d38e5af..afeaac63a18d9e71d3afead23b7da4fecfc27544 100644 --- a/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp +++ b/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp -@@ -65,7 +65,7 @@ void NetworkSessionCurl::clearAlternativeServices(WallTime) +@@ -68,7 +68,7 @@ void NetworkSessionCurl::clearAlternativeServices(WallTime) std::unique_ptr NetworkSessionCurl::createWebSocketTask(WebPageProxyIdentifier webPageProxyID, std::optional, std::optional, NetworkSocketChannel& channel, const WebCore::ResourceRequest& request, const String& protocol, const WebCore::ClientOrigin& clientOrigin, bool, bool, OptionSet, ShouldRelaxThirdPartyCookieBlocking, StoredCredentialsPolicy) { @@ -8875,7 +8872,7 @@ index 8dc0bcdb1cdfa86d04fc7e4e3718f1fe2c457c80..21180451b653bdd3596164a9b60d34d7 void NetworkSessionCurl::didReceiveChallenge(WebSocketTask& webSocketTask, WebCore::AuthenticationChallenge&& challenge, CompletionHandler&& challengeCompletionHandler) diff --git a/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.cpp -index 8bc3ce1ecd8a8681565f32fecf77343eafa59d84..d98ead04c93f7d447cae0e1c3b98a8abe3703ddb 100644 +index 34712a017c7a7f444f6e296681ad5d95db9df63c..d5fc1c0583df5548ca9ec3e8760d8f50a6be13e3 100644 --- a/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.cpp +++ b/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.cpp @@ -36,11 +36,12 @@ @@ -8901,7 +8898,7 @@ index 8bc3ce1ecd8a8681565f32fecf77343eafa59d84..d98ead04c93f7d447cae0e1c3b98a8ab m_channel.didSendHandshakeRequest(WebCore::ResourceRequest(m_request)); } -@@ -255,7 +256,7 @@ void WebSocketTask::tryServerTrustEvaluation(WebCore::AuthenticationChallenge&& +@@ -257,7 +258,7 @@ void WebSocketTask::tryServerTrustEvaluation(WebCore::AuthenticationChallenge&& if (networkSession() && networkSession()->networkProcess().localhostAliasesForTesting().contains(m_request.url().host())) localhostAlias = WebCore::CurlStream::LocalhostAlias::Enable; @@ -8911,7 +8908,7 @@ index 8bc3ce1ecd8a8681565f32fecf77343eafa59d84..d98ead04c93f7d447cae0e1c3b98a8ab didFail(WTFMove(errorReason)); }); diff --git a/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.h b/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.h -index c29124f90328c9c50bb7a1c3d9bd48605f190e94..f3f51bea1e622c1e7172efd3fd7249daca56ca57 100644 +index 5023a9be6554abc9ffe8fb37968978cb28c5b9a1..9cfdedd0411bf32843c2c9a7d7d722c5ee4f6e46 100644 --- a/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.h +++ b/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.h @@ -49,7 +49,7 @@ struct SessionSet; @@ -9034,7 +9031,7 @@ index 3fa6072886e6d34d53c63fffb131d51a197540fd..72d919c0043fb524109aed043897195a } diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index c782b8e2c8afd47b55ba2de49ca46fc6e9cf4cb5..cb640ae7889bad991a2b82b78bba461d7b8c5502 100644 +index a2d21b8fab2c038ed4d73dd9505b2e523084c219..84fa5c0fa497a55b3959e5c24a8ecde5acdbfc74 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake @@ -316,6 +316,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES @@ -9057,7 +9054,7 @@ index c782b8e2c8afd47b55ba2de49ca46fc6e9cf4cb5..cb640ae7889bad991a2b82b78bba461d ) endif () -@@ -398,6 +404,12 @@ else () +@@ -406,6 +412,12 @@ else () set(WebKitGTK_ENUM_HEADER_TEMPLATE ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in) endif () @@ -9071,7 +9068,7 @@ index c782b8e2c8afd47b55ba2de49ca46fc6e9cf4cb5..cb640ae7889bad991a2b82b78bba461d set(WebKitGTK_ENUM_GENERATION_HEADERS ${WebKitGTK_INSTALLED_HEADERS}) list(REMOVE_ITEM WebKitGTK_ENUM_GENERATION_HEADERS ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h) diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake -index 3514e1612eca9338d5e3398b225790d05bd63742..bcc942a8dcd6929e338b4f01d5851457a4ec95ff 100644 +index be960eda81a449e654cc76f98998f6695e3be15b..61546c86ac76c565517e7a5c27f968c9e5cab4da 100644 --- a/Source/WebKit/PlatformWPE.cmake +++ b/Source/WebKit/PlatformWPE.cmake @@ -210,6 +210,7 @@ set(WPE_API_HEADER_TEMPLATES @@ -9082,7 +9079,7 @@ index 3514e1612eca9338d5e3398b225790d05bd63742..bcc942a8dcd6929e338b4f01d5851457 ) if (ENABLE_2022_GLIB_API) -@@ -414,8 +415,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -422,8 +423,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GIO_UNIX_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -9335,7 +9332,7 @@ index 72ad2880160a374e8fa663e561d59becf9d2f36d..372ae6953199245fe4fc55a49813c7ca #endif }; diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -index 1825429d961b31b096ec9e30fe12e01f3b44d04e..f0ce6330e02a5d40416df9eebed8e7a556b6f374 100644 +index 27289a1df966d9ce4964a21ed407cf694c8a4b84..4403ea531c85fd7c623e2c8793e71820d6043530 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -182,6 +182,10 @@ @@ -9350,10 +9347,10 @@ index 1825429d961b31b096ec9e30fe12e01f3b44d04e..f0ce6330e02a5d40416df9eebed8e7a5 namespace IPC { diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in -index 484326884f5ca5ab769a737c811e8bbe5e9cfb3d..92a6fc4a75f80a2fef6c9a702ce124b5780011ad 100644 +index 3c2e6946fe221f15889e98b46bdb82eab8055ad5..843a49d6ae1476ed83147d417015520e523f1e01 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in -@@ -2589,6 +2589,9 @@ class WebCore::AuthenticationChallenge { +@@ -2609,6 +2609,9 @@ class WebCore::AuthenticationChallenge { class WebCore::DragData { #if PLATFORM(COCOA) String pasteboardName(); @@ -9363,7 +9360,7 @@ index 484326884f5ca5ab769a737c811e8bbe5e9cfb3d..92a6fc4a75f80a2fef6c9a702ce124b5 #endif WebCore::IntPoint clientPosition(); WebCore::IntPoint globalPosition(); -@@ -3149,6 +3152,7 @@ header: +@@ -3170,6 +3173,7 @@ enum class WebCore::WasPrivateRelayed : bool; String httpStatusText; String httpVersion; WebCore::HTTPHeaderMap httpHeaderFields; @@ -9489,10 +9486,10 @@ index a38fc7fde1d5f1a1fd04ae1f84eb59c1501deec5..d3669c3d3bad91468fbbeeaa328c3610 void setPosition(const WebCore::IntPoint& position) { m_position = position; } const WebCore::IntPoint& globalPosition() const { return m_globalPosition; } diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h -index 680ebe78307fc1f22b4d3004eafe6f810d025a56..5609703d43d53f3fb52fe3d5ed0256969b13c69c 100644 +index 91be42f87923a08e8f19a35bbacc9cbc3781a550..b4de1b8170a28ec38556922967d849b05861468c 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.h +++ b/Source/WebKit/Shared/WebPageCreationParameters.h -@@ -288,6 +288,8 @@ struct WebPageCreationParameters { +@@ -295,6 +295,8 @@ struct WebPageCreationParameters { bool httpsUpgradeEnabled { true }; @@ -9502,10 +9499,10 @@ index 680ebe78307fc1f22b4d3004eafe6f810d025a56..5609703d43d53f3fb52fe3d5ed025696 bool allowsDeprecatedSynchronousXMLHttpRequestDuringUnload { false }; #endif diff --git a/Source/WebKit/Shared/WebPageCreationParameters.serialization.in b/Source/WebKit/Shared/WebPageCreationParameters.serialization.in -index eebb7a21567e5c87d8349b19f8144de0b75ddf7d..7b0242aa8da6697d714cb01baeae494b3959c12d 100644 +index 4ea97727612b82724ed25a1a6f04d07dd6faa7b7..7eb2a40699258a5cad2bc09631f54993cdf1945e 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.serialization.in +++ b/Source/WebKit/Shared/WebPageCreationParameters.serialization.in -@@ -225,6 +225,8 @@ headers: "ArgumentCoders.h" +@@ -227,6 +227,8 @@ enum class WebCore::UserInterfaceLayoutDirection : bool; bool httpsUpgradeEnabled; @@ -9783,10 +9780,10 @@ index 665b9d6a9de903ee9ad6dc53e15ab421b6cb769f..2b129963074d2ceec1c05f3a637c5e1c #endif // ENABLE(TOUCH_EVENTS) diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 80f43c5fd21a0e7b8cc9c4ef9a6bc4be1972a21a..2ba8d1e58f0bce43599191a4fd82607c7fe997ed 100644 +index e57ec3140eeed2a50f0465448a165de12abc09bb..d3509d47546a35c31f4ed053cf4fa4f5f78caa7f 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -379,6 +379,7 @@ Shared/XR/XRDeviceProxy.cpp +@@ -378,6 +378,7 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp UIProcess/BrowsingContextGroup.cpp @@ -9794,8 +9791,8 @@ index 80f43c5fd21a0e7b8cc9c4ef9a6bc4be1972a21a..2ba8d1e58f0bce43599191a4fd82607c UIProcess/DeviceIdHashSaltStorage.cpp UIProcess/DisplayLink.cpp UIProcess/DisplayLinkProcessProxyClient.cpp -@@ -387,16 +388,20 @@ UIProcess/FindStringCallbackAggregator.cpp - UIProcess/FrameLoadState.cpp +@@ -387,16 +388,20 @@ UIProcess/FrameLoadState.cpp + UIProcess/FrameProcess.cpp UIProcess/GeolocationPermissionRequestManagerProxy.cpp UIProcess/GeolocationPermissionRequestProxy.cpp +UIProcess/InspectorDialogAgent.cpp @@ -9837,10 +9834,10 @@ index 80f43c5fd21a0e7b8cc9c4ef9a6bc4be1972a21a..2ba8d1e58f0bce43599191a4fd82607c UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 187950f0b525a7658755ab44420f53103b2502e5..d78e4bcec5c3d5954be21e45b83ede25ae27c9d2 100644 +index f23b74ff14d4c0bcf3ea58dc93c3582ae9d8ff54..0b615daef0d042deba914ad958a437c50cab926c 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -266,6 +266,7 @@ UIProcess/API/Cocoa/_WKArchiveExclusionRule.mm +@@ -269,6 +269,7 @@ UIProcess/API/Cocoa/_WKArchiveExclusionRule.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -9848,7 +9845,7 @@ index 187950f0b525a7658755ab44420f53103b2502e5..d78e4bcec5c3d5954be21e45b83ede25 UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -444,6 +445,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -447,6 +448,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -9857,10 +9854,10 @@ index 187950f0b525a7658755ab44420f53103b2502e5..d78e4bcec5c3d5954be21e45b83ede25 UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm UIProcess/Inspector/mac/WKInspectorViewController.mm diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt -index 1929ffb033fd11f98991a13e84ff506418bf77b2..fd814286fedbe19a2987c91b0f3118bd8bf9c06e 100644 +index 103182e1768930dbeecdbabe590e6491af0d92bf..96305b9bfafec6b70ec807a04c78f7e2002da0ea 100644 --- a/Source/WebKit/SourcesGTK.txt +++ b/Source/WebKit/SourcesGTK.txt -@@ -132,6 +132,7 @@ UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify +@@ -134,6 +134,7 @@ UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify UIProcess/API/glib/WebKitBackForwardList.cpp @no-unify UIProcess/API/glib/WebKitBackForwardListItem.cpp @no-unify UIProcess/API/glib/WebKitClipboardPermissionRequest.cpp @no-unify @@ -9868,7 +9865,7 @@ index 1929ffb033fd11f98991a13e84ff506418bf77b2..fd814286fedbe19a2987c91b0f3118bd UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify UIProcess/API/glib/WebKitCookieManager.cpp @no-unify UIProcess/API/glib/WebKitCredential.cpp @no-unify -@@ -260,6 +261,7 @@ UIProcess/glib/DisplayLinkGLib.cpp +@@ -262,6 +263,7 @@ UIProcess/glib/DisplayLinkGLib.cpp UIProcess/glib/DisplayVBlankMonitor.cpp UIProcess/glib/DisplayVBlankMonitorDRM.cpp UIProcess/glib/DisplayVBlankMonitorTimer.cpp @@ -9876,7 +9873,7 @@ index 1929ffb033fd11f98991a13e84ff506418bf77b2..fd814286fedbe19a2987c91b0f3118bd UIProcess/glib/ScreenManager.cpp UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp -@@ -275,6 +277,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify +@@ -277,6 +279,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify UIProcess/gtk/WebDateTimePickerGtk.cpp UIProcess/gtk/GtkSettingsManager.cpp UIProcess/gtk/HardwareAccelerationManager.cpp @@ -9884,7 +9881,7 @@ index 1929ffb033fd11f98991a13e84ff506418bf77b2..fd814286fedbe19a2987c91b0f3118bd UIProcess/gtk/KeyBindingTranslator.cpp UIProcess/gtk/PointerLockManager.cpp @no-unify UIProcess/gtk/PointerLockManagerWayland.cpp @no-unify -@@ -287,6 +290,8 @@ UIProcess/gtk/ViewGestureControllerGtk.cpp +@@ -289,6 +292,8 @@ UIProcess/gtk/ViewGestureControllerGtk.cpp UIProcess/gtk/WebColorPickerGtk.cpp UIProcess/gtk/WebContextMenuProxyGtk.cpp UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp @@ -9894,7 +9891,7 @@ index 1929ffb033fd11f98991a13e84ff506418bf77b2..fd814286fedbe19a2987c91b0f3118bd UIProcess/gtk/WebPasteboardProxyGtk.cpp UIProcess/gtk/WebPopupMenuProxyGtk.cpp diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt -index 614a7cb0f897415401b8e14322bfdac8b9bd31a0..be0c5049b40ac5f87ff95e446db847fe16cc7195 100644 +index 10b4c898beea0c4246e5329298dba514a6f68663..fb685e34364ab73bacaf8314336c2d2ead031c3b 100644 --- a/Source/WebKit/SourcesWPE.txt +++ b/Source/WebKit/SourcesWPE.txt @@ -86,6 +86,7 @@ Shared/glib/ProcessExecutablePathGLib.cpp @@ -9948,9 +9945,9 @@ index 614a7cb0f897415401b8e14322bfdac8b9bd31a0..be0c5049b40ac5f87ff95e446db847fe +UIProcess/wpe/WebPageInspectorEmulationAgentWPE.cpp +UIProcess/wpe/WebPageInspectorInputAgentWPE.cpp UIProcess/wpe/WebPageProxyWPE.cpp + UIProcess/wpe/WebPreferencesWPE.cpp - WebProcess/GPU/graphics/gbm/RemoteGraphicsContextGLProxyGBM.cpp -@@ -279,6 +289,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp +@@ -280,6 +290,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp @@ -9960,7 +9957,7 @@ index 614a7cb0f897415401b8e14322bfdac8b9bd31a0..be0c5049b40ac5f87ff95e446db847fe WebProcess/WebPage/AcceleratedSurface.cpp diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp -index 43e92894e25645b5a5de94c319fd69587a5c8d59..1b508155bb2713d2b1d5277ff51c1c9a74722aa6 100644 +index d561c07ae53a60c6503a355ed620bc289a2220ae..b950ac5190d8d05c66718c545c76d53d45cfff9d 100644 --- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp +++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp @@ -52,6 +52,10 @@ Ref ProcessPoolConfiguration::copy() @@ -9975,7 +9972,7 @@ index 43e92894e25645b5a5de94c319fd69587a5c8d59..1b508155bb2713d2b1d5277ff51c1c9a 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 04148f6286dfbe53b02b0b0f6bf98bc3f82c929e..e6bb962ee44fb314c5185bf4f4688c47f3d16c46 100644 +index 32ef9bd308e520f5ac7173639c8b23ea91cde037..7a80553c2d91b9236f563fa1b76aa8a50b8545ba 100644 --- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h +++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h @@ -96,6 +96,16 @@ public: @@ -10062,10 +10059,10 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index 5ef4d1ec4a8361bca454c442f4c4d1b48e0eaac1..69351093501860555a272f527eade8e646fd5220 100644 +index 8db060fa2f15d58d8bbc9faed88cac4e51d0f3c1..22fcdf0790b7187fbf2978bf3079b3011929d23e 100644 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp -@@ -1785,6 +1785,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient +@@ -1783,6 +1783,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient completionHandler(String()); } @@ -10079,7 +10076,7 @@ index 5ef4d1ec4a8361bca454c442f4c4d1b48e0eaac1..69351093501860555a272f527eade8e6 void setStatusText(WebPageProxy* page, const String& text) final { if (!m_client.setStatusText) -@@ -1814,6 +1821,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient +@@ -1812,6 +1819,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient { if (!m_client.didNotHandleKeyEvent) return; @@ -10149,10 +10146,10 @@ index 1484f064ec89ee8c25c35df9f0a4462896699415..0622f4d5fc9144b9059395d9d0730a4a // Version 15. WKPageDecidePolicyForSpeechRecognitionPermissionRequestCallback decidePolicyForSpeechRecognitionPermissionRequest; diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm b/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm -index 3f244fd88e065457eb8bb059fa99c1c4ebda652e..4c693abf384d418f926281b684fe95ba876950ef 100644 +index 9479d9025142e679533061397c93f750053efacb..01031cca01abb99eef44a054dc200922be6b782d 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm -@@ -697,6 +697,16 @@ - (void)_setMediaCaptureRequiresSecureConnection:(BOOL)requiresSecureConnection +@@ -700,6 +700,16 @@ - (void)_setMediaCaptureRequiresSecureConnection:(BOOL)requiresSecureConnection _preferences->setMediaCaptureRequiresSecureConnection(requiresSecureConnection); } @@ -10220,7 +10217,7 @@ index 4f5956098f0e83c2e9c421c97056b6718b124a3c..1eb51dd70dc6ef1b7e95a09118aa816b NS_ASSUME_NONNULL_END diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm -index 0823e17265feef5d11c2dc45b1d60c4d4bccdc69..1273d076401326c34f06c87479f458b379b8632f 100644 +index 07a937bf57e682398c2befad11ad6a4d228e741e..189f4b3cbe358490f2779a1042f2e9fd240fa422 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm @@ -51,6 +51,7 @@ @@ -10230,8 +10227,8 @@ index 0823e17265feef5d11c2dc45b1d60c4d4bccdc69..1273d076401326c34f06c87479f458b3 +#import #import #import - #import -@@ -426,6 +427,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple + #import +@@ -444,6 +445,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple }); } @@ -10642,7 +10639,7 @@ index 0000000000000000000000000000000000000000..e0b1da48465c850f541532ed961d1b77 +WebKit::WebPageProxy* webkitBrowserInspectorCreateNewPageInContext(WebKitWebContext*); +void webkitBrowserInspectorQuitApplication(); diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp -index d0c42fa8f30c14c0ff3f37341fc163f387585b85..fb0ba2db94d9f193e1ad217bfdfd8059286cc21c 100644 +index a13f808f23a97bd4eaf452fc57e0f1279e3a264b..e222833eeea5d4252189ba2755993e35c3190963 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp @@ -94,6 +94,10 @@ private: @@ -10657,10 +10654,10 @@ index d0c42fa8f30c14c0ff3f37341fc163f387585b85..fb0ba2db94d9f193e1ad217bfdfd8059 bool canRunBeforeUnloadConfirmPanel() const final { return true; } diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -index d897f14bbc9cc9743072759b54905776813aaf72..3c0e61fb6e54071deeb978cd16ad2eff959e5343 100644 +index cdf57e32e9024051ed28eb57678662376b0aae6c..8647bf0e5beff4d5d92e02733548332abeb00c55 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -@@ -413,10 +413,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa +@@ -415,10 +415,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa } } @@ -10680,7 +10677,7 @@ index d897f14bbc9cc9743072759b54905776813aaf72..3c0e61fb6e54071deeb978cd16ad2eff GUniquePtr bundleFilename(g_build_filename(injectedBundleDirectory(), INJECTED_BUNDLE_FILENAME, nullptr)); WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object); -@@ -473,6 +482,8 @@ static void webkitWebContextConstructed(GObject* object) +@@ -475,6 +484,8 @@ static void webkitWebContextConstructed(GObject* object) static void webkitWebContextDispose(GObject* object) { @@ -10689,7 +10686,7 @@ index d897f14bbc9cc9743072759b54905776813aaf72..3c0e61fb6e54071deeb978cd16ad2eff WebKitWebContextPrivate* priv = WEBKIT_WEB_CONTEXT(object)->priv; if (!priv->clientsDetached) { priv->clientsDetached = true; -@@ -932,6 +943,11 @@ WebKitNetworkSession* webkit_web_context_get_network_session_for_automation(WebK +@@ -934,6 +945,11 @@ WebKitNetworkSession* webkit_web_context_get_network_session_for_automation(WebK return nullptr; #endif } @@ -10726,7 +10723,7 @@ index e994309b097c1b140abfa4373fd2fafee46c05ec..6e0cc677a3bf33683ae8c89d12a48191 #endif +int webkitWebContextExistingCount(); diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp -index 26a9142a4d700d9b00bd6de922e3899dd387b46b..117c216c3d806c64a5a1aa8ae355e6a4cdf41eca 100644 +index 4a15f81cbca7ab84ce25b6ccc96cd6ad720f6129..a1d6e0f4ccdceddff6c88563c480266b4e8c4247 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp @@ -33,6 +33,7 @@ @@ -10857,10 +10854,10 @@ index 805f9f638c1630b5e9310494ae2970262de001cc..add3e80896c2e82bdd12cee15c8014bf #include <@API_INCLUDE_PREFIX@/WebKitClipboardPermissionRequest.h> #include <@API_INCLUDE_PREFIX@/WebKitColorChooserRequest.h> diff --git a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp -index 5f65faca6a85c1c344cd41df3e1e7edda783eae9..31154cc107ada818a1a4550b4d619c70b7f79d0d 100644 +index 1c4f884537edf50ed867378786f58ace47eabfaa..283fa58d2427cffc115e12a861ab9d6882004214 100644 --- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp +++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp -@@ -257,6 +257,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool +@@ -266,6 +266,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool { if (wasEventHandled || event.type() != WebEventType::KeyDown || !event.nativeEvent()) return; @@ -10869,7 +10866,7 @@ index 5f65faca6a85c1c344cd41df3e1e7edda783eae9..31154cc107ada818a1a4550b4d619c70 // Always consider arrow keys as handled, otherwise the GtkWindow key bindings will move the focus. guint keyval; -@@ -359,9 +361,9 @@ void PageClientImpl::selectionDidChange() +@@ -368,9 +370,9 @@ void PageClientImpl::selectionDidChange() webkitWebViewSelectionDidChange(WEBKIT_WEB_VIEW(m_viewWidget)); } @@ -10995,10 +10992,10 @@ index 496079da90993ac37689b060b69ecd4a67c2b6a8..af30181ca922f16c0f6e245c70e5ce7d G_BEGIN_DECLS diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -index b70030ed4a69a53e8f8453ebff3e3040193dfbd1..0d1de922dd3170607fc10effcee1d9549b1eecdc 100644 +index e1a7e687913826b5912ab1e735894a6e0a5b4da9..d75b97ebdd06e529e457266b2ee2bfa7debd3330 100644 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -@@ -2924,6 +2924,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) +@@ -2923,6 +2923,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) #endif } @@ -11010,7 +11007,7 @@ index b70030ed4a69a53e8f8453ebff3e3040193dfbd1..0d1de922dd3170607fc10effcee1d954 void webkitWebViewBaseEnterAcceleratedCompositingMode(WebKitWebViewBase* webkitWebViewBase, const LayerTreeContext& layerTreeContext) { ASSERT(webkitWebViewBase->priv->acceleratedBackingStore); -@@ -2980,12 +2985,12 @@ void webkitWebViewBasePageClosed(WebKitWebViewBase* webkitWebViewBase) +@@ -2979,12 +2984,12 @@ void webkitWebViewBasePageClosed(WebKitWebViewBase* webkitWebViewBase) webkitWebViewBase->priv->acceleratedBackingStore->update({ }); } @@ -11186,10 +11183,10 @@ index dbd9dd946fceebb49b70d6600b1e654e2f0cc0a6..22c6839e2e7c9aa435be04727c6218a8 }; diff --git a/Source/WebKit/UIProcess/API/wpe/WPEWebView.cpp b/Source/WebKit/UIProcess/API/wpe/WPEWebView.cpp -index 7963c80c34554e26cbec5feb4c8c802385b3a465..1e653564db64bab16dca83edb7b7f6e82214275e 100644 +index 9a682ff7309e3a7290384d922579094e35ef0167..ec1cd8cb3b8518cb90c526f55f1ba9d482ddb097 100644 --- a/Source/WebKit/UIProcess/API/wpe/WPEWebView.cpp +++ b/Source/WebKit/UIProcess/API/wpe/WPEWebView.cpp -@@ -97,7 +97,9 @@ View::View(struct wpe_view_backend* backend, WPEDisplay* display, const API::Pag +@@ -103,7 +103,9 @@ View::View(struct wpe_view_backend* backend, WPEDisplay* display, const API::Pag if (preferences) { preferences->setAcceleratedCompositingEnabled(true); preferences->setForceCompositingMode(true); @@ -11494,10 +11491,10 @@ index 720c88818bdb4cde3cb58e95785454754f6c1396..7f702c0b922e13128522d2bb1ace6a23 void didChangePageID(WKWPE::View&) override; void didReceiveUserMessage(WKWPE::View&, WebKit::UserMessage&&, CompletionHandler&&) override; diff --git a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp -index 34079e24bb2450ff52788ffc9e5acfdd0e42513a..f4b618f175230e7a96d1dc3a68030ab923ae9a50 100644 +index 39e4660d5936fd8915cf0dcd7afa83aece092067..da3ef68451021c296b3ff12416ad3bf8440fa657 100644 --- a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp +++ b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp -@@ -153,7 +153,11 @@ void AuxiliaryProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& lau +@@ -157,7 +157,11 @@ void AuxiliaryProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& lau launchOptions.processCmdPrefix = String::fromUTF8(processCmdPrefix); #endif // ENABLE(DEVELOPER_MODE) && (PLATFORM(GTK) || PLATFORM(WPE)) @@ -11510,10 +11507,10 @@ index 34079e24bb2450ff52788ffc9e5acfdd0e42513a..f4b618f175230e7a96d1dc3a68030ab9 platformGetLaunchOptions(launchOptions); } diff --git a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h -index 631906d5b435cd2c5393be2487675851991aaa3f..ec9826641ce6c890a766a0641ba857a17d793b47 100644 +index a18630c193b4902b58f3880b038928c9518cb4d1..c3c9e54a8eb5c653be37a6be81336f4f7ac1e209 100644 --- a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h +++ b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h -@@ -256,13 +256,16 @@ protected: +@@ -259,13 +259,16 @@ protected: static RefPtr fetchAudioComponentServerRegistrations(); #endif @@ -11532,10 +11529,10 @@ index 631906d5b435cd2c5393be2487675851991aaa3f..ec9826641ce6c890a766a0641ba857a1 ResponsivenessTimer m_responsivenessTimer; diff --git a/Source/WebKit/UIProcess/BackingStore.h b/Source/WebKit/UIProcess/BackingStore.h -index 20d652a341434ac37fd64bfb0b3abdc78d9a59b0..d603912e707f0b6662c6ac82fc7966fc91bda2fc 100644 +index f9b557ae57a25f53f6d17aab23a256e3cc7d1e66..cced83f477cb1344dd079b9c3523b109ee5cfd89 100644 --- a/Source/WebKit/UIProcess/BackingStore.h +++ b/Source/WebKit/UIProcess/BackingStore.h -@@ -54,6 +54,7 @@ public: +@@ -61,6 +61,7 @@ public: float deviceScaleFactor() const { return m_deviceScaleFactor; } void paint(PlatformPaintContextPtr, const WebCore::IntRect&); @@ -11675,20 +11672,8 @@ index 957f7f088087169668a9b4f1ba65d9f206a2a836..15e44c8d5b6a3eafb7f1148707366b0c // FSM: Idle => Active => Completed class PopUpSOAuthorizationSession final : public SOAuthorizationSession { public: -diff --git a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.mm b/Source/WebKit/UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.mm -index cf38fc10398dedc434a58de0cb8825c7284bc06f..6250135f505f4d64b1fbd7f59bd2166cb9bf7842 100644 ---- a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.mm -+++ b/Source/WebKit/UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.mm -@@ -28,6 +28,7 @@ - - #if HAVE(APP_SSO) - -+#import "Logging.h" - #import "SOAuthorizationSession.h" - #import "WebPageProxy.h" - #import diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h -index acf00168d52b636eec6e7482488254bada5e4008..8d7b676ea54b2b3df7dd9f80295b4faba131cde0 100644 +index b310d8ccd4ab217564ff72b1e9d02e1136eb7b89..052056e17d3e8c198a3148e8578905c08d34e7f6 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h @@ -96,6 +96,7 @@ private: @@ -11705,10 +11690,10 @@ index acf00168d52b636eec6e7482488254bada5e4008..8d7b676ea54b2b3df7dd9f80295b4fab bool webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler : 1; + bool webViewHandleJavaScriptDialogValue : 1; bool webViewRequestStorageAccessPanelUnderFirstPartyCompletionHandler : 1; + bool webViewRequestStorageAccessPanelForDomainUnderCurrentDomainForQuirkDomainsCompletionHandler : 1; bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; - bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1; diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -index fd2cd1359a933a739ec12958dbb789f77874f7ae..5a702f652051541bf9c7c591ea2d29ae6f392034 100644 +index eeaf81b4869c7d557e9547b0d1bd99ce1efe7aa1..136eef5fcc033fc37a046939f87625c8348b4544 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm @@ -117,6 +117,7 @@ void UIDelegate::setDelegate(id delegate) @@ -11717,9 +11702,9 @@ index fd2cd1359a933a739ec12958dbb789f77874f7ae..5a702f652051541bf9c7c591ea2d29ae m_delegateMethods.webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:)]; + m_delegateMethods.webViewHandleJavaScriptDialogValue = [delegate respondsToSelector:@selector(webView:handleJavaScriptDialog:value:)]; m_delegateMethods.webViewRequestStorageAccessPanelUnderFirstPartyCompletionHandler = [delegate respondsToSelector:@selector(_webView:requestStorageAccessPanelForDomain:underCurrentDomain:completionHandler:)]; + m_delegateMethods.webViewRequestStorageAccessPanelForDomainUnderCurrentDomainForQuirkDomainsCompletionHandler = [delegate respondsToSelector:@selector(_webView:requestStorageAccessPanelForDomain:underCurrentDomain:forQuirkDomains:completionHandler:)]; m_delegateMethods.webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(_webView:runBeforeUnloadConfirmPanelWithMessage:initiatedByFrame:completionHandler:)]; - m_delegateMethods.webViewRequestGeolocationPermissionForOriginDecisionHandler = [delegate respondsToSelector:@selector(_webView:requestGeolocationPermissionForOrigin:initiatedByFrame:decisionHandler:)]; -@@ -437,6 +438,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St +@@ -438,6 +439,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St }).get()]; } @@ -11736,7 +11721,7 @@ index fd2cd1359a933a739ec12958dbb789f77874f7ae..5a702f652051541bf9c7c591ea2d29ae { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index f0f7d8a806b2cae4551c3c3d98b710ed91c80231..7b66039ebcccc990e6ada097aac95ddb3cce4c7d 100644 +index 1e5123cddd3d09b7bd1076f8e050979b3388757d..827edb9d65ad34f4b1372d884cce08aa7880346e 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -38,6 +38,7 @@ @@ -11837,10 +11822,10 @@ index f0f7d8a806b2cae4551c3c3d98b710ed91c80231..7b66039ebcccc990e6ada097aac95ddb #if ENABLE(ATTACHMENT_ELEMENT) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index 530f8810360f4f5c5f4f48ea5e0d7ab87853955d..de230982f2a5efd16708666705918a4c24c8a3fb 100644 +index 39e5b93f61600114b4229c53ca529aa2ea5357bd..b8c0f37272184c6847ed1ed1737464cbb0febe10 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -425,7 +425,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END +@@ -429,7 +429,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -11849,7 +11834,7 @@ index 530f8810360f4f5c5f4f48ea5e0d7ab87853955d..de230982f2a5efd16708666705918a4c #endif #if (PLATFORM(IOS) || PLATFORM(VISION)) && HAVE(AGX_COMPILER_SERVICE) -@@ -776,8 +776,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -797,8 +797,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -11861,7 +11846,7 @@ index 530f8810360f4f5c5f4f48ea5e0d7ab87853955d..de230982f2a5efd16708666705918a4c m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -index 6b37fca9aca846b0474fb108d5cd5b5aab8caf9c..0479d229e73e7133fb72710b4413f96dc54f51b2 100644 +index 40ad458db34babad87d145c16244a678d4531941..55c32131029665071775a0c8881d0f171cbae89d 100644 --- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp @@ -33,14 +33,17 @@ @@ -11907,7 +11892,7 @@ index 6b37fca9aca846b0474fb108d5cd5b5aab8caf9c..0479d229e73e7133fb72710b4413f96d + void DrawingAreaProxyCoordinatedGraphics::setBackingStoreIsDiscardable(bool isBackingStoreDiscardable) { - #if USE(GRAPHICS_LAYER_WC) || (USE(CAIRO) && !PLATFORM(WPE)) + #if !PLATFORM(WPE) @@ -221,6 +236,45 @@ void DrawingAreaProxyCoordinatedGraphics::updateAcceleratedCompositingMode(uint6 updateAcceleratedCompositingMode(layerTreeContext); } @@ -11965,9 +11950,9 @@ index 6b37fca9aca846b0474fb108d5cd5b5aab8caf9c..0479d229e73e7133fb72710b4413f96d + } } - #if USE(GRAPHICS_LAYER_WC) || (USE(CAIRO) && !PLATFORM(WPE)) + #if !PLATFORM(WPE) diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h -index a6170f5994ffa2fb7317239c1813b65d125e9a01..cb28017397959d90471e7db2b7e8d15482d6291f 100644 +index d2ceeda76e90ab2041f238c240f81bf9e37f6072..faa338a2b4af13663bb63efc940b7efe5544e409 100644 --- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h +++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h @@ -29,6 +29,7 @@ @@ -11977,7 +11962,7 @@ index a6170f5994ffa2fb7317239c1813b65d125e9a01..cb28017397959d90471e7db2b7e8d154 +#include #include - #if USE(GRAPHICS_LAYER_WC) || (USE(CAIRO) && !PLATFORM(WPE)) + #if !PLATFORM(WPE) @@ -52,6 +53,10 @@ public: bool isInAcceleratedCompositingMode() const { return !m_layerTreeContext.isEmpty(); } @@ -12005,7 +11990,7 @@ index a6170f5994ffa2fb7317239c1813b65d125e9a01..cb28017397959d90471e7db2b7e8d154 + Vector> m_callbacks; - #if USE(GRAPHICS_LAYER_WC) || (USE(CAIRO) && !PLATFORM(WPE)) + #if !PLATFORM(WPE) bool m_isBackingStoreDiscardable { true }; @@ -125,6 +134,10 @@ private: RunLoop::Timer m_discardBackingStoreTimer; @@ -12111,7 +12096,7 @@ index 6f0d076b1b1cb0ec3e1c7fdc5f3a6dfffe9ee63d..656d4259dbf9ab97a8b0408c061c0fd2 } // namespace WebKit diff --git a/Source/WebKit/UIProcess/DrawingAreaProxy.h b/Source/WebKit/UIProcess/DrawingAreaProxy.h -index 660270a146f8f358a00f591df7d95f37c043ea7a..aed1c1f4181c1636f63a33e2e48f40d89eb68ed6 100644 +index 8cfe9bf3d49afd3345209c22c59663f72791fea4..9c13c012e21b33a889eb04a3733712a66470a88e 100644 --- a/Source/WebKit/UIProcess/DrawingAreaProxy.h +++ b/Source/WebKit/UIProcess/DrawingAreaProxy.h @@ -89,6 +89,7 @@ public: @@ -12122,7 +12107,7 @@ index 660270a146f8f358a00f591df7d95f37c043ea7a..aed1c1f4181c1636f63a33e2e48f40d8 virtual void minimumSizeForAutoLayoutDidChange() { } virtual void sizeToContentAutoSizeMaximumSizeDidChange() { } -@@ -173,6 +174,10 @@ private: +@@ -172,6 +173,10 @@ private: virtual void update(uint64_t /* backingStoreStateID */, UpdateInfo&&) { } virtual void exitAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, UpdateInfo&&) { } #endif @@ -15550,6 +15535,18 @@ index 3fe0abcfe36bef7ca45bed5661a737ed2bfe56d0..510656948af01ec65d4543c805e9667a #include "RemoteMediaSessionCoordinatorMessages.h" #include "RemoteMediaSessionCoordinatorProxyMessages.h" #include "WebPageProxy.h" +diff --git a/Source/WebKit/UIProcess/Notifications/glib/NotificationService.cpp b/Source/WebKit/UIProcess/Notifications/glib/NotificationService.cpp +index 6f2b716f4445008123e96f9db494aea307520636..8f0235a699c91d966a4de9fd03aff57712e80675 100644 +--- a/Source/WebKit/UIProcess/Notifications/glib/NotificationService.cpp ++++ b/Source/WebKit/UIProcess/Notifications/glib/NotificationService.cpp +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h index 42eee66ab16a2194f63b01a9f26c20aeb728a872..c66aca2950f5cc8823194c4f6cfd60275f5f00a2 100644 --- a/Source/WebKit/UIProcess/PageClient.h @@ -15709,7 +15706,7 @@ index 0000000000000000000000000000000000000000..3c8fd0549f1847515d35092f0f49b060 + +#endif // ENABLE(FULLSCREEN_API) diff --git a/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp b/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp -index c3252ba8c21e33c4c6d1ebd98570b0e2aec811c8..51ba95e41f175b703f8e29822218340dc178b760 100644 +index a2dabe84360ef09ea687ded6234d4a742fcc8e56..c411e95dc6549be2e8ed65f025f154bbc9f1ef2c 100644 --- a/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp +++ b/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp @@ -25,6 +25,7 @@ @@ -15718,7 +15715,7 @@ index c3252ba8c21e33c4c6d1ebd98570b0e2aec811c8..51ba95e41f175b703f8e29822218340d #include "ProvisionalFrameProxy.h" +#include "WebFrameProxy.h" - #include "RemotePageProxy.h" + #include "FrameProcess.h" #include "VisitedLinkStore.h" diff --git a/Source/WebKit/UIProcess/RemoteInspectorPipe.cpp b/Source/WebKit/UIProcess/RemoteInspectorPipe.cpp new file mode 100644 @@ -16022,21 +16019,8 @@ index 0000000000000000000000000000000000000000..6d04f9290135069359ce6bf872654648 +} // namespace WebKit + +#endif // ENABLE(REMOTE_INSPECTOR) -diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteAcceleratedEffectStack.mm b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteAcceleratedEffectStack.mm -index 922a4bc217e0370b1ef3673c9c5808ea9ef0fd24..72d8914646df8b1316ecb6510b0baf452661e4ca 100644 ---- a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteAcceleratedEffectStack.mm -+++ b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteAcceleratedEffectStack.mm -@@ -193,7 +193,7 @@ void RemoteAcceleratedEffectStack::applyEffectsFromMainThread(PlatformLayer *lay - } - } - --AcceleratedEffectValues RemoteAcceleratedEffectStack::computeValues(MonotonicTime now) const -+WebCore::AcceleratedEffectValues RemoteAcceleratedEffectStack::computeValues(MonotonicTime now) const - { - auto values = m_baseValues; - auto currentTime = now.secondsSinceEpoch() - m_acceleratedTimelineTimeOrigin; diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteLayerTreeEventDispatcher.h b/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteLayerTreeEventDispatcher.h -index f526b55ccf239f3b430dafe76eccea8251845e2e..d43c3049b4f1d3fc9d86059f3d11574d2206c7ed 100644 +index d499ee31f32b9dcdb456ba0b476d211fba115673..43b349887d18e21162b59fa8174df32c0dd6abbd 100644 --- a/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteLayerTreeEventDispatcher.h +++ b/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteLayerTreeEventDispatcher.h @@ -30,6 +30,7 @@ @@ -16044,10 +16028,10 @@ index f526b55ccf239f3b430dafe76eccea8251845e2e..d43c3049b4f1d3fc9d86059f3d11574d #include "MomentumEventDispatcher.h" #include "NativeWebWheelEvent.h" +#include "RemoteLayerTreeNode.h" + #include + #include #include - #include - #include -@@ -39,6 +40,11 @@ +@@ -41,6 +42,11 @@ #include #include #include @@ -16060,7 +16044,7 @@ index f526b55ccf239f3b430dafe76eccea8251845e2e..d43c3049b4f1d3fc9d86059f3d11574d namespace WebCore { class PlatformWheelEvent; diff --git a/Source/WebKit/UIProcess/RemotePageProxy.cpp b/Source/WebKit/UIProcess/RemotePageProxy.cpp -index 9f4d09484e3248dd2e35f790b6131372694f0ab0..d041845327fafde6656efad9aa4fcbb865105823 100644 +index 7ba86bc321d138d96705bfb979088a327cd14944..41ce842abf547f173672ff220f2256f89f4aae47 100644 --- a/Source/WebKit/UIProcess/RemotePageProxy.cpp +++ b/Source/WebKit/UIProcess/RemotePageProxy.cpp @@ -42,6 +42,7 @@ @@ -16072,17 +16056,29 @@ index 9f4d09484e3248dd2e35f790b6131372694f0ab0..d041845327fafde6656efad9aa4fcbb8 namespace WebKit { diff --git a/Source/WebKit/UIProcess/RemotePageProxy.h b/Source/WebKit/UIProcess/RemotePageProxy.h -index bfd4a4125506da7d12f2282a2efa32faa1bf41d6..146adadff9f424c12aa14515db79ae43e2172f32 100644 +index 5ecfa03204724d8e5696149dd45e4d35877993f0..fc8262fb617aef3eb68cf13117747dc48a7d843e 100644 --- a/Source/WebKit/UIProcess/RemotePageProxy.h +++ b/Source/WebKit/UIProcess/RemotePageProxy.h -@@ -65,7 +65,6 @@ class WebProcessProxy; +@@ -64,7 +64,6 @@ class WebProcessProxy; struct FrameInfoData; struct FrameTreeCreationParameters; -struct NavigationActionData; - class RemotePageProxy : public RefCounted, public IPC::MessageReceiver { + class RemotePageProxy : public IPC::MessageReceiver { WTF_MAKE_FAST_ALLOCATED; +diff --git a/Source/WebKit/UIProcess/WebAuthentication/fido/U2fAuthenticator.cpp b/Source/WebKit/UIProcess/WebAuthentication/fido/U2fAuthenticator.cpp +index b2d3197c7a4428171d97a8dff2054e0eebd965fe..2cc258a0343cdeffa1d3c7afd89985b9388f715a 100644 +--- a/Source/WebKit/UIProcess/WebAuthentication/fido/U2fAuthenticator.cpp ++++ b/Source/WebKit/UIProcess/WebAuthentication/fido/U2fAuthenticator.cpp +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #define U2F_RELEASE_LOG(fmt, ...) RELEASE_LOG(WebAuthn, "%p [transport=%s] - U2fAuthenticator::" fmt, this, transportForDebugging().utf8().data(), ##__VA_ARGS__) + diff --git a/Source/WebKit/UIProcess/WebContextMenuProxy.cpp b/Source/WebKit/UIProcess/WebContextMenuProxy.cpp index d74ec9892f9a57bd7622ff5a4e16b67262165661..e884998f2a0823c32f33fe7a8499c7b4904a2fc0 100644 --- a/Source/WebKit/UIProcess/WebContextMenuProxy.cpp @@ -16108,18 +16104,18 @@ index e7d6621532fcc73212cc9130a7cafbb13f458d1d..ec931c8f19d2a61c0fa7d78b52df7f3f WebPageProxy* page() const { return m_page.get(); } diff --git a/Source/WebKit/UIProcess/WebFrameProxy.cpp b/Source/WebKit/UIProcess/WebFrameProxy.cpp -index 42540d06f3417fb9c9dbeddb3daa984ac83c4930..3fd3f0b3fa12f67e6d9abda5223becff1028b099 100644 +index 049738f4f0db8071eb2dce0d3187fb50da0214af..30ee4aff100cfcb6aa90d730bceea6bb3b9f3b0d 100644 --- a/Source/WebKit/UIProcess/WebFrameProxy.cpp +++ b/Source/WebKit/UIProcess/WebFrameProxy.cpp -@@ -30,6 +30,7 @@ +@@ -31,6 +31,7 @@ #include "Connection.h" #include "DrawingAreaMessages.h" #include "DrawingAreaProxy.h" +#include "FormDataReference.h" + #include "FrameProcess.h" #include "FrameTreeCreationParameters.h" #include "FrameTreeNodeData.h" - #include "LoadedWebArchive.h" -@@ -41,6 +42,7 @@ +@@ -43,6 +44,7 @@ #include "RemotePageProxy.h" #include "WebFramePolicyListenerProxy.h" #include "WebNavigationState.h" @@ -16814,10 +16810,10 @@ index 0000000000000000000000000000000000000000..3e87bf40ced2301f4fb145c6cb31f2cf + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7569d44b9 100644 +index df4dd0b19148e6c1ec29ca080209bca624f9bdd1..f64fd97f7d82209da372c102cd6ca8aee698d86a 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp -@@ -182,12 +182,14 @@ +@@ -183,12 +183,14 @@ #include #include #include @@ -16832,7 +16828,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 #include #include #include -@@ -207,6 +209,7 @@ +@@ -209,6 +211,7 @@ #include #include #include @@ -16840,7 +16836,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 #include #include #include -@@ -214,11 +217,13 @@ +@@ -216,11 +219,13 @@ #include #include #include @@ -16854,7 +16850,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 #include #include #include -@@ -293,6 +298,9 @@ +@@ -296,6 +301,9 @@ #include "AcceleratedBackingStoreDMABuf.h" #endif #include "GtkSettingsManager.h" @@ -16864,7 +16860,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 #include #endif -@@ -402,6 +410,8 @@ static constexpr Seconds tryCloseTimeoutDelay = 50_ms; +@@ -409,6 +417,8 @@ static constexpr Seconds tryCloseTimeoutDelay = 50_ms; static constexpr Seconds audibleActivityClearDelay = 10_s; #endif @@ -16873,7 +16869,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, webPageProxyCounter, ("WebPageProxy")); #if PLATFORM(COCOA) -@@ -806,6 +816,10 @@ WebPageProxy::~WebPageProxy() +@@ -813,6 +823,10 @@ WebPageProxy::~WebPageProxy() if (preferences->mediaSessionCoordinatorEnabled()) GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this); #endif @@ -16884,7 +16880,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 } void WebPageProxy::addAllMessageReceivers() -@@ -1338,6 +1352,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -1341,6 +1355,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) protectedPageClient()->didRelaunchProcess(); internals().pageLoadState.didSwapWebProcesses(); @@ -16892,7 +16888,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 } void WebPageProxy::didAttachToRunningProcess() -@@ -1346,7 +1361,7 @@ void WebPageProxy::didAttachToRunningProcess() +@@ -1349,7 +1364,7 @@ void WebPageProxy::didAttachToRunningProcess() #if ENABLE(FULLSCREEN_API) ASSERT(!m_fullScreenManager); @@ -16901,7 +16897,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 #endif #if ENABLE(VIDEO_PRESENTATION_MODE) ASSERT(!m_playbackSessionManager); -@@ -1746,6 +1761,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1747,6 +1762,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -16991,7 +16987,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 if (flagsToUpdate & ActivityState::IsFocused && pageClient->isViewFocused()) internals().activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient->isViewWindowActive()) -@@ -3263,7 +3347,7 @@ void WebPageProxy::performDragOperation(DragData& dragData, const String& dragSt +@@ -3273,7 +3357,7 @@ void WebPageProxy::performDragOperation(DragData& dragData, const String& dragSt grantAccessToCurrentPasteboardData(dragStorageName); #endif @@ -17000,7 +16996,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 performDragControllerAction(DragControllerAction::PerformDragOperation, dragData); #else if (!hasRunningProcess()) -@@ -3280,6 +3364,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -3290,6 +3374,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag if (!hasRunningProcess()) return; @@ -17009,7 +17005,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 auto completionHandler = [this, protectedThis = Ref { *this }, action, dragData] (std::optional dragOperation, WebCore::DragHandlingMethod dragHandlingMethod, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, const IntRect& insertionRect, const IntRect& editableElementRect, std::optional remoteUserInputEventData) mutable { if (!remoteUserInputEventData) { didPerformDragControllerAction(dragOperation, dragHandlingMethod, mouseIsOverFileInput, numberOfItemsToBeAccepted, insertionRect, editableElementRect); -@@ -3296,6 +3382,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -3306,6 +3392,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag protectedProcess()->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -17018,7 +17014,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 sendWithAsyncReply(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags()), WTFMove(completionHandler)); #else sendToProcessContainingFrame(frameID, Messages::WebPage::PerformDragControllerAction(frameID, action, dragData), WTFMove(completionHandler)); -@@ -3311,14 +3399,34 @@ void WebPageProxy::didPerformDragControllerAction(std::optionaldidPerformDragControllerAction(); @@ -17056,7 +17052,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 didStartDrag(); } #endif -@@ -3339,6 +3447,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -3349,6 +3457,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17081,7 +17077,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 void WebPageProxy::didStartDrag() { if (!hasRunningProcess()) -@@ -3346,6 +3472,16 @@ void WebPageProxy::didStartDrag() +@@ -3356,6 +3482,16 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17098,7 +17094,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 } void WebPageProxy::dragCancelled() -@@ -3498,16 +3634,37 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -3508,16 +3644,37 @@ void WebPageProxy::processNextQueuedMouseEvent() process->startResponsivenessTimer(); } @@ -17142,7 +17138,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3673,6 +3830,8 @@ void WebPageProxy::wheelEventHandlingCompleted(bool wasHandled) +@@ -3683,6 +3840,8 @@ void WebPageProxy::wheelEventHandlingCompleted(bool wasHandled) if (RefPtr automationSession = process().processPool().automationSession()) automationSession->wheelEventsFlushedForPage(*this); @@ -17151,7 +17147,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 } void WebPageProxy::cacheWheelEventScrollingAccelerationCurve(const NativeWebWheelEvent& nativeWheelEvent) -@@ -3819,7 +3978,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3829,7 +3988,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17160,7 +17156,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 for (auto& touchPoint : touchStartEvent.touchPoints()) { auto location = touchPoint.location(); auto update = [this, location](TrackingType& trackingType, EventTrackingRegions::EventType eventType) { -@@ -4408,6 +4567,7 @@ void WebPageProxy::receivedNavigationActionPolicyDecision(WebProcessProxy& proce +@@ -4420,6 +4579,7 @@ void WebPageProxy::receivedNavigationActionPolicyDecision(WebProcessProxy& proce void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, Ref&& navigationAction, WillContinueLoadInNewProcess willContinueLoadInNewProcess, std::optional sandboxExtensionHandle, std::optional&& consoleMessage, CompletionHandler&& completionHandler) { @@ -17168,7 +17164,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 if (!hasRunningProcess()) return completionHandler(PolicyDecision { }); -@@ -5325,6 +5485,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -5342,6 +5502,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17180,7 +17176,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { MESSAGE_CHECK(m_process, scaleFactorIsValid(pluginScaleFactor)); -@@ -5867,6 +6032,7 @@ void WebPageProxy::didDestroyNavigationShared(Ref&& process, ui +@@ -5872,6 +6037,7 @@ void WebPageProxy::didDestroyNavigationShared(Ref&& process, ui Ref protectedPageClient { pageClient() }; m_navigationState->didDestroyNavigation(process->coreProcessIdentifier(), navigationID); @@ -17188,7 +17184,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -6121,6 +6287,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -6126,6 +6292,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17197,7 +17193,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 // 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; -@@ -6746,7 +6914,14 @@ void WebPageProxy::beginSafeBrowsingCheck(const URL&, bool, WebFramePolicyListen +@@ -6767,7 +6935,14 @@ void WebPageProxy::beginSafeBrowsingCheck(const URL&, bool, WebFramePolicyListen void WebPageProxy::decidePolicyForNavigationActionAsync(NavigationActionData&& data, CompletionHandler&& completionHandler) { @@ -17213,7 +17209,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, NavigationActionData&& data, CompletionHandler&& completionHandler) -@@ -7390,6 +7565,7 @@ void WebPageProxy::createNewPage(WindowFeatures&& windowFeatures, NavigationActi +@@ -7404,6 +7579,7 @@ void WebPageProxy::createNewPage(WindowFeatures&& windowFeatures, NavigationActi if (RefPtr page = originatingFrameInfo->page()) openerAppInitiatedState = page->lastNavigationWasAppInitiated(); @@ -17221,7 +17217,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 auto completionHandler = [ this, protectedThis = Ref { *this }, -@@ -7448,6 +7624,7 @@ void WebPageProxy::createNewPage(WindowFeatures&& windowFeatures, NavigationActi +@@ -7462,6 +7638,7 @@ void WebPageProxy::createNewPage(WindowFeatures&& windowFeatures, NavigationActi void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17229,7 +17225,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 } bool WebPageProxy::hasOpenedPage() const -@@ -7527,6 +7704,10 @@ void WebPageProxy::closePage() +@@ -7541,6 +7718,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17240,7 +17236,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); protectedPageClient()->clearAllEditCommands(); m_uiClient->close(this); -@@ -7563,6 +7744,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -7577,6 +7758,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 { @@ -17249,7 +17245,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -7584,6 +7767,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -7598,6 +7781,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (RefPtr automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17258,7 +17254,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 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 { -@@ -7607,6 +7792,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -7621,6 +7806,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (RefPtr automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17267,7 +17263,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 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 { -@@ -7723,6 +7910,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -7737,6 +7924,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17276,7 +17272,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. protectedProcess()->stopResponsivenessTimer(); -@@ -8206,6 +8395,11 @@ void WebPageProxy::resourceLoadDidCompleteWithError(ResourceLoadInfo&& loadInfo, +@@ -8220,6 +8409,11 @@ void WebPageProxy::resourceLoadDidCompleteWithError(ResourceLoadInfo&& loadInfo, } #if ENABLE(FULLSCREEN_API) @@ -17288,7 +17284,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 WebFullScreenManagerProxy* WebPageProxy::fullScreenManager() { return m_fullScreenManager.get(); -@@ -8282,6 +8476,17 @@ void WebPageProxy::requestDOMPasteAccess(WebCore::DOMPasteAccessCategory pasteAc +@@ -8296,6 +8490,17 @@ void WebPageProxy::requestDOMPasteAccess(WebCore::DOMPasteAccessCategory pasteAc { MESSAGE_CHECK_COMPLETION(m_process, !originIdentifier.isEmpty(), completionHandler(DOMPasteAccessResponse::DeniedForGesture)); @@ -17306,7 +17302,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 m_pageClient->requestDOMPasteAccess(pasteAccessCategory, elementRect, originIdentifier, WTFMove(completionHandler)); } -@@ -9107,6 +9312,8 @@ void WebPageProxy::mouseEventHandlingCompleted(std::optional event +@@ -9121,6 +9326,8 @@ void WebPageProxy::mouseEventHandlingCompleted(std::optional event if (RefPtr automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17315,7 +17311,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 } } -@@ -9141,6 +9348,7 @@ void WebPageProxy::keyEventHandlingCompleted(std::optional eventTy +@@ -9155,6 +9362,7 @@ void WebPageProxy::keyEventHandlingCompleted(std::optional eventTy if (!canProcessMoreKeyEvents) { if (RefPtr automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17323,7 +17319,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 } } -@@ -9546,7 +9754,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -9560,7 +9768,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%" PUBLIC_LOG_STRING, processTerminationReasonToString(reason)); @@ -17335,15 +17331,15 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -9911,6 +10122,7 @@ bool WebPageProxy::useGPUProcessForDOMRenderingEnabled() const +@@ -9927,6 +10138,7 @@ bool WebPageProxy::useGPUProcessForDOMRenderingEnabled() const - WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) + WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, bool isProcessSwap, RefPtr&& websitePolicies, std::optional&& mainFrameIdentifier, SubframeProcessPageParameters* subframeProcessPageParameters, std::optional topContentInset) { + WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -10131,6 +10343,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -10151,6 +10363,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.httpsUpgradeEnabled = preferences().upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false; @@ -17352,7 +17348,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 #if PLATFORM(IOS) || PLATFORM(VISION) // FIXME: This is also being passed over the to WebProcess via the PreferencesStore. parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload(); -@@ -10224,8 +10438,42 @@ void WebPageProxy::gamepadActivity(const Vector>& gam +@@ -10257,8 +10471,42 @@ void WebPageProxy::gamepadActivity(const Vector>& gam #endif @@ -17395,7 +17391,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -10320,6 +10568,12 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -10353,6 +10601,12 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17408,7 +17404,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 // FIXME: Once iOS migrates to the new WKUIDelegate SPI, clean this up // and make it one UIClient call that calls the completionHandler with false // if there is no delegate instead of returning the completionHandler -@@ -10382,6 +10636,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi +@@ -10415,6 +10669,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi shouldChangeDeniedToPrompt = false; if (sessionID().isEphemeral()) { @@ -17421,7 +17417,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 completionHandler(shouldChangeDeniedToPrompt ? PermissionState::Prompt : PermissionState::Denied); return; } -@@ -10396,6 +10656,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi +@@ -10429,6 +10689,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi return; } @@ -17435,7 +17431,7 @@ index 88666845add03e47c0429cdfe780aef22a1dbf47..fb197f331645319a0b283683798a26a7 completionHandler(shouldChangeDeniedToPrompt ? PermissionState::Prompt : PermissionState::Denied); return; diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h -index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca6890e6ac 100644 +index d02f8aff91035baa83a6465152c8d62d824a2829..074bb4572f078ee140375f60c5fca07ba620d7be 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -26,6 +26,7 @@ @@ -17479,7 +17475,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca class FloatRect; class FloatSize; class FontAttributeChanges; -@@ -417,6 +437,7 @@ class WebExtensionController; +@@ -418,6 +438,7 @@ class WebExtensionController; class WebFramePolicyListenerProxy; class WebFrameProxy; class WebFullScreenManagerProxy; @@ -17487,7 +17483,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca class WebInspectorUIProxy; class WebKeyboardEvent; class WebMouseEvent; -@@ -641,6 +662,8 @@ public: +@@ -645,6 +666,8 @@ public: void setControlledByAutomation(bool); WebPageInspectorController& inspectorController() { return *m_inspectorController; } @@ -17496,7 +17492,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca #if PLATFORM(IOS_FAMILY) void showInspectorIndication(); -@@ -674,6 +697,7 @@ public: +@@ -678,6 +701,7 @@ public: bool hasSleepDisabler() const; #if ENABLE(FULLSCREEN_API) @@ -17504,7 +17500,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca WebFullScreenManagerProxy* fullScreenManager(); API::FullscreenClient& fullscreenClient() const { return *m_fullscreenClient; } -@@ -762,6 +786,11 @@ public: +@@ -766,6 +790,11 @@ public: void setPageLoadStateObserver(std::unique_ptr&&); @@ -17516,7 +17512,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca void initializeWebPage(); void setDrawingArea(std::unique_ptr&&); -@@ -788,6 +817,7 @@ public: +@@ -792,6 +821,7 @@ public: void addPlatformLoadParameters(WebProcessProxy&, LoadParameters&); RefPtr loadRequest(WebCore::ResourceRequest&&); RefPtr loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy, API::Object* userData = nullptr); @@ -17524,7 +17520,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca RefPtr loadFile(const String& fileURL, const String& resourceDirectoryURL, bool isAppInitiated = true, API::Object* userData = nullptr); RefPtr loadData(std::span, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr); RefPtr loadData(std::span, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData, WebCore::ShouldOpenExternalURLsPolicy); -@@ -852,6 +882,7 @@ public: +@@ -856,6 +886,7 @@ public: PageClient& pageClient() const; Ref protectedPageClient() const; @@ -17532,7 +17528,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca void setViewNeedsDisplay(const WebCore::Region&); void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, WebCore::ScrollIsAnimated); -@@ -1372,6 +1403,7 @@ public: +@@ -1376,6 +1407,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17540,7 +17536,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1456,14 +1488,20 @@ public: +@@ -1460,14 +1492,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17562,7 +17558,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca #endif void processDidBecomeUnresponsive(); -@@ -1693,6 +1731,7 @@ public: +@@ -1700,6 +1738,7 @@ public: void setViewportSizeForCSSViewportUnits(const WebCore::FloatSize&); WebCore::FloatSize viewportSizeForCSSViewportUnits() const; @@ -17570,7 +17566,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca void didReceiveAuthenticationChallengeProxy(Ref&&, NegotiatedLegacyTLS); void negotiatedLegacyTLS(); void didNegotiateModernTLS(const URL&); -@@ -1727,6 +1766,8 @@ public: +@@ -1734,6 +1773,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17578,8 +17574,8 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca + RefPtr takeViewSnapshot(std::optional&&) { return nullptr; } #endif - void wrapCryptoKey(const Vector&, CompletionHandler&&)>&&); -@@ -2591,6 +2632,7 @@ private: + void wrapCryptoKey(const Vector&, CompletionHandler>&&)>&&); +@@ -2596,6 +2637,7 @@ private: RefPtr launchProcessForReload(); void requestNotificationPermission(const String& originString, CompletionHandler&&); @@ -17587,7 +17583,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca void didChangeContentSize(const WebCore::IntSize&); void didChangeIntrinsicContentSize(const WebCore::IntSize&); -@@ -3100,8 +3142,10 @@ private: +@@ -3103,8 +3145,10 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17598,7 +17594,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca std::unique_ptr m_fullScreenManager; std::unique_ptr m_fullscreenClient; #endif -@@ -3291,6 +3335,22 @@ private: +@@ -3294,6 +3338,22 @@ private: std::optional m_currentDragOperation; bool m_currentDragIsOverFileInput { false }; unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; @@ -17621,7 +17617,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca #endif bool m_mainFrameHasHorizontalScrollbar { false }; -@@ -3462,6 +3522,10 @@ private: +@@ -3465,6 +3525,10 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17633,7 +17629,7 @@ index 9fd32bf3cb7e4246fb8f126f94a0ccac6f8ea68f..11c7b58bc56fdc3312aac51134b7a0ca #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 9c5d7a86d60e4427fc616f5fd93c99c64386b7fc..24119d93741ac69f0a2914374ebc3bdfa0e0c694 100644 +index 3b1f8c7613d9ebc836bb173b49187bb5cc53247e..91a86a693e99950efb90c406199dcb9769c1e401 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17653,12 +17649,12 @@ index 9c5d7a86d60e4427fc616f5fd93c99c64386b7fc..24119d93741ac69f0a2914374ebc3bdf PluginZoomFactorDidChange(double zoomFactor) @@ -303,10 +305,14 @@ messages -> WebPageProxy { - StartDrag(struct WebCore::DragItem dragItem, WebCore::ShareableBitmap::Handle dragImage) + StartDrag(struct WebCore::DragItem dragItem, WebCore::ShareableBitmapHandle dragImage) SetPromisedDataForImage(String pasteboardName, WebCore::SharedMemory::Handle imageHandle, String filename, String extension, String title, String url, String visibleURL, WebCore::SharedMemory::Handle archiveHandle, String originIdentifier) #endif -#if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT) +#if (PLATFORM(GTK) || PLATFORM(WPE)) && ENABLE(DRAG_SUPPORT) - StartDrag(WebCore::SelectionData selectionData, OptionSet dragOperationMask, std::optional dragImage, WebCore::IntPoint dragImageHotspot) + StartDrag(WebCore::SelectionData selectionData, OptionSet dragOperationMask, std::optional dragImage, WebCore::IntPoint dragImageHotspot) #endif +#if PLATFORM(WIN) && ENABLE(DRAG_SUPPORT) @@ -17669,10 +17665,10 @@ index 9c5d7a86d60e4427fc616f5fd93c99c64386b7fc..24119d93741ac69f0a2914374ebc3bdf DidHandleDragStartRequest(bool started) DidHandleAdditionalDragItemsRequest(bool added) diff --git a/Source/WebKit/UIProcess/WebProcessCache.cpp b/Source/WebKit/UIProcess/WebProcessCache.cpp -index 452eab87e181ec5d33ad2b0c48437bc875fc9f7f..1c9bf0a77ebcffec1ae827b657d090b9119b503d 100644 +index c909cd634d6acd72695de8372866691269ad6a04..ff5b37e3b4a17eab4bd3f8e9a2a6ef8460110052 100644 --- a/Source/WebKit/UIProcess/WebProcessCache.cpp +++ b/Source/WebKit/UIProcess/WebProcessCache.cpp -@@ -87,6 +87,10 @@ bool WebProcessCache::canCacheProcess(WebProcessProxy& process) const +@@ -88,6 +88,10 @@ bool WebProcessCache::canCacheProcess(WebProcessProxy& process) const return false; } @@ -17684,10 +17680,10 @@ index 452eab87e181ec5d33ad2b0c48437bc875fc9f7f..1c9bf0a77ebcffec1ae827b657d090b9 } diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 32aded96c08584fefc07221ed7d7605a71f31534..05fd86a130a8b03df565d83d7f1b9ca36f6e6569 100644 +index 8d176f2829f0c11fbb5c2d052a3036bcae981c78..5416b923ad7f36d6676120b640ca258905176aa2 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp -@@ -424,10 +424,10 @@ void WebProcessPool::setAutomationClient(std::unique_ptr& +@@ -429,10 +429,10 @@ void WebProcessPool::setAutomationClient(std::unique_ptr& void WebProcessPool::setOverrideLanguages(Vector&& languages) { @@ -17700,7 +17696,7 @@ index 32aded96c08584fefc07221ed7d7605a71f31534..05fd86a130a8b03df565d83d7f1b9ca3 #if ENABLE(GPU_PROCESS) if (RefPtr gpuProcess = GPUProcessProxy::singletonIfCreated()) -@@ -435,9 +435,10 @@ void WebProcessPool::setOverrideLanguages(Vector&& languages) +@@ -440,9 +440,10 @@ void WebProcessPool::setOverrideLanguages(Vector&& languages) #endif #if USE(SOUP) for (Ref networkProcess : NetworkProcessProxy::allNetworkProcesses()) @@ -17712,7 +17708,7 @@ index 32aded96c08584fefc07221ed7d7605a71f31534..05fd86a130a8b03df565d83d7f1b9ca3 void WebProcessPool::fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled) { -@@ -930,7 +931,7 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa +@@ -934,7 +935,7 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa #endif parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel(); @@ -17722,10 +17718,10 @@ index 32aded96c08584fefc07221ed7d7605a71f31534..05fd86a130a8b03df565d83d7f1b9ca3 parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp -index f90d14daca9649d4f556e23f1218ff1fd7d08f1d..9d39eb7e3e4de35cb885f72a75f83727d2d481a8 100644 +index c10fcb327b2d8ddf2393a7acda99c84531cab4e2..ab03eb619003f7202ccefed2d030f5cd6c7251c3 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp -@@ -178,6 +178,11 @@ Vector> WebProcessProxy::allProcesses() +@@ -184,6 +184,11 @@ Vector> WebProcessProxy::allProcesses() }); } @@ -17737,7 +17733,7 @@ index f90d14daca9649d4f556e23f1218ff1fd7d08f1d..9d39eb7e3e4de35cb885f72a75f83727 RefPtr WebProcessProxy::processForIdentifier(ProcessIdentifier identifier) { return allProcessMap().get(identifier); -@@ -518,6 +523,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt +@@ -541,6 +546,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt if (WebKit::isInspectorProcessPool(processPool())) launchOptions.extraInitializationData.add("inspector-process"_s, "1"_s); @@ -17765,10 +17761,10 @@ index f90d14daca9649d4f556e23f1218ff1fd7d08f1d..9d39eb7e3e4de35cb885f72a75f83727 if (isPrewarmed()) diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index 34b5a585b708921e87101245f5c9101035eb8d68..4289b24ab517582155fd07fdd7b7aa2b2563813a 100644 +index bb3e329ad02085273cbc7f00c514acfb3c8f9c35..be6d0e7e0d8023f3c6a84af9535db6b786855993 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h -@@ -163,6 +163,7 @@ public: +@@ -164,6 +164,7 @@ public: static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, const Function&); static Vector> allowedFirstPartiesForCookies(); @@ -17777,10 +17773,10 @@ index 34b5a585b708921e87101245f5c9101035eb8d68..4289b24ab517582155fd07fdd7b7aa2b WebConnection* webConnection() const { return m_webConnection.get(); } RefPtr protectedWebConnection() const { return m_webConnection; } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 257e15389adcebb47f4319328752699a66d53948..51a252036f2c0c38d16845a6db75d7fb58de5a5f 100644 +index d6ab1fddd24467a01e748a6ec94fbbd2a806454c..14486b0c5e1f80f0825ebc6cec337283732e5fd2 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -301,7 +301,8 @@ SOAuthorizationCoordinator& WebsiteDataStore::soAuthorizationCoordinator(const W +@@ -305,7 +305,8 @@ SOAuthorizationCoordinator& WebsiteDataStore::soAuthorizationCoordinator(const W static Ref networkProcessForSession(PAL::SessionID sessionID) { @@ -17790,7 +17786,7 @@ index 257e15389adcebb47f4319328752699a66d53948..51a252036f2c0c38d16845a6db75d7fb if (sessionID.isEphemeral()) { // Reuse a previous persistent session network process for ephemeral sessions. for (auto& dataStore : allDataStores().values()) { -@@ -2184,6 +2185,12 @@ void WebsiteDataStore::originDirectoryForTesting(WebCore::ClientOrigin&& origin, +@@ -2266,6 +2267,12 @@ void WebsiteDataStore::originDirectoryForTesting(WebCore::ClientOrigin&& origin, protectedNetworkProcess()->websiteDataOriginDirectoryForTesting(m_sessionID, WTFMove(origin), type, WTFMove(completionHandler)); } @@ -17804,10 +17800,10 @@ index 257e15389adcebb47f4319328752699a66d53948..51a252036f2c0c38d16845a6db75d7fb void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index 37614db69a75c432447315b463dac8c1ad9bc6d9..9473a61bf90efac85898cc3a67df550d1b74e6be 100644 +index f89889023ac34839a249145b37540cf34e9a6e9e..25418e0cba99a7d82ee2cd758f25e34bad93c053 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -@@ -98,6 +98,7 @@ class DeviceIdHashSaltStorage; +@@ -97,6 +97,7 @@ class DeviceIdHashSaltStorage; class DownloadProxy; class NetworkProcessProxy; class SOAuthorizationCoordinator; @@ -17815,7 +17811,7 @@ index 37614db69a75c432447315b463dac8c1ad9bc6d9..9473a61bf90efac85898cc3a67df550d class VirtualAuthenticatorManager; class WebPageProxy; class WebProcessPool; -@@ -113,12 +114,21 @@ enum class UnifiedOriginStorageLevel : uint8_t; +@@ -112,12 +113,21 @@ enum class UnifiedOriginStorageLevel : uint8_t; enum class WebsiteDataFetchOption : uint8_t; enum class WebsiteDataType : uint32_t; @@ -17834,10 +17830,10 @@ index 37614db69a75c432447315b463dac8c1ad9bc6d9..9473a61bf90efac85898cc3a67df550d + virtual ~DownloadInstrumentation() = default; +}; + - class WebsiteDataStore : public API::ObjectImpl, public Identified, public CanMakeWeakPtr { + class WebsiteDataStore : public API::ObjectImpl, public CanMakeWeakPtr { public: static Ref defaultDataStore(); -@@ -321,11 +331,13 @@ public: +@@ -302,11 +312,13 @@ public: const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; } #endif @@ -17852,7 +17848,7 @@ index 37614db69a75c432447315b463dac8c1ad9bc6d9..9473a61bf90efac85898cc3a67df550d void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&); const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; } void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType); -@@ -410,6 +422,12 @@ public: +@@ -391,6 +403,12 @@ public: static const String& defaultBaseDataDirectory(); #endif @@ -17865,7 +17861,7 @@ index 37614db69a75c432447315b463dac8c1ad9bc6d9..9473a61bf90efac85898cc3a67df550d void resetQuota(CompletionHandler&&); void resetStoragePersistedState(CompletionHandler&&); #if PLATFORM(IOS_FAMILY) -@@ -573,9 +591,11 @@ private: +@@ -561,9 +579,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -17878,7 +17874,7 @@ index 37614db69a75c432447315b463dac8c1ad9bc6d9..9473a61bf90efac85898cc3a67df550d WebCore::SoupNetworkProxySettings m_networkProxySettings; String m_cookiePersistentStoragePath; SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite }; -@@ -604,6 +624,10 @@ private: +@@ -590,6 +610,10 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -17890,32 +17886,25 @@ index 37614db69a75c432447315b463dac8c1ad9bc6d9..9473a61bf90efac85898cc3a67df550d std::unique_ptr m_soAuthorizationCoordinator; #endif diff --git a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp b/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp -index 692a45a48fa027f9221338d74f5351bef4baf00f..db8c761c71cc7009be66255c2668de4eff36dee0 100644 +index 8cf57bf6b4370d7c19d0a624e852a8bec4f9aba3..cc9047c17a10863a9ea8bdda903af9367018c3cc 100644 --- a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp +++ b/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp -@@ -60,6 +60,8 @@ void GeoclueGeolocationProvider::start(UpdateNotifyFunction&& updateNotifyFuncti - m_isRunning = true; - m_cancellable = adoptGRef(g_cancellable_new()); - if (!m_manager) { -+ g_cancellable_cancel(m_cancellable_start.get()); -+ m_cancellable_start = adoptGRef(g_cancellable_new()); - g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, nullptr, - "org.freedesktop.GeoClue2", "/org/freedesktop/GeoClue2/Manager", "org.freedesktop.GeoClue2.Manager", m_cancellable.get(), - [](GObject*, GAsyncResult* result, gpointer userData) { -@@ -91,6 +93,12 @@ void GeoclueGeolocationProvider::stop() - g_cancellable_cancel(m_cancellable.get()); - m_cancellable = nullptr; - stopClient(); +@@ -100,6 +100,14 @@ void GeoclueGeolocationProvider::stop() + } + + m_sourceType = LocationProviderSource::Unknown; ++ stopGeoclueClient(); + g_cancellable_cancel(m_cancellable_start.get()); + m_cancellable_start = nullptr; + g_cancellable_cancel(m_cancellable_setup.get()); + m_cancellable_setup = nullptr; + g_cancellable_cancel(m_cancellable_create.get()); + m_cancellable_create = nullptr; - destroyManagerLater(); ++ destroyStateLater(); } -@@ -153,6 +161,8 @@ void GeoclueGeolocationProvider::createClient(const char* clientPath) + void GeoclueGeolocationProvider::setEnableHighAccuracy(bool enabled) +@@ -372,6 +380,8 @@ void GeoclueGeolocationProvider::createGeoclueClient(const char* clientPath) return; } @@ -17925,19 +17914,19 @@ index 692a45a48fa027f9221338d74f5351bef4baf00f..db8c761c71cc7009be66255c2668de4e "org.freedesktop.GeoClue2", clientPath, "org.freedesktop.GeoClue2.Client", m_cancellable.get(), [](GObject*, GAsyncResult* result, gpointer userData) { diff --git a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.h b/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.h -index db15435ed4581388a631547cdc92c092362ff84a..de45cfe0b737a0450455bafbda91887d0a944445 100644 +index 69610f8f7b81d914d74444d9c86b3b039251edb6..c234848afb5e523165bf827bac8008486d2f8e14 100644 --- a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.h +++ b/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.h -@@ -71,6 +71,9 @@ private: - GRefPtr m_manager; - GRefPtr m_client; +@@ -90,6 +90,9 @@ private: + unsigned responseSignalId; + } m_portal; GRefPtr m_cancellable; + GRefPtr m_cancellable_start; + GRefPtr m_cancellable_setup; + GRefPtr m_cancellable_create; UpdateNotifyFunction m_updateNotifyFunction; - RunLoop::Timer m_destroyManagerLaterTimer; - }; + LocationProviderSource m_sourceType { LocationProviderSource::Unknown }; + RunLoop::Timer m_destroyLaterTimer; diff --git a/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp b/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp new file mode 100644 index 0000000000000000000000000000000000000000..93de9be341045a616b0219a965af2447ecbfc926 @@ -18217,10 +18206,10 @@ index 71fb4cbd4338bcbda3a61019cbf4a914bf74953e..6f56e4afb345c23b4d8b91ee77f1991c virtual void unrealize() { }; virtual int renderHostFileDescriptor() { return -1; } diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp -index 6bd656b957aa4c8e1052e7e3c970d6e02d6715a9..622732d0de8fd742e6ecf3ac026a3f425d1b840f 100644 +index a02443e27fe05c1ad14337b676c365a7ff63aaa6..d0772d4ac275dd8298dbf24d4ecc6d3ae101f2e1 100644 --- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp +++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp -@@ -608,6 +608,32 @@ bool AcceleratedBackingStoreDMABuf::paint(cairo_t* cr, const WebCore::IntRect& c +@@ -618,6 +618,32 @@ bool AcceleratedBackingStoreDMABuf::paint(cairo_t* cr, const WebCore::IntRect& c } #endif @@ -18254,7 +18243,7 @@ index 6bd656b957aa4c8e1052e7e3c970d6e02d6715a9..622732d0de8fd742e6ecf3ac026a3f42 #endif // USE(EGL) diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h -index 3cb25f26b7a08b2a85226e8ba174dab2a528f6e9..9c137f506345f55d89913b3469483d805be3ea9a 100644 +index 8bfba047f41fa3f805d93771c648ca2045411ed6..f32e795be4d60cd35e3a704cd3975065146cdb06 100644 --- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h +++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h @@ -88,6 +88,7 @@ private: @@ -18949,10 +18938,10 @@ index 6ab7aacaebfda818e3010bb06db72c8552ac598a..3e19cba50d73084392f62f176ad4c315 bool showAfterPostProcessingContextData(); diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm -index 6443d35db2dfadb6bd5157ab0d20557b29b22b8d..5b4cb0061f270e3e048ea5d6d2ade3060f53dace 100644 +index 5edd66a5259b64217d338ac041c8dd0dafafed9b..c786a8205ddd8f9e40c1da3d2c4a67732d2d2499 100644 --- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm +++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm -@@ -480,6 +480,12 @@ void WebContextMenuProxyMac::getShareMenuItem(CompletionHandlersizeInBytes(); auto stride = bitmap->bytesPerRow(); GRefPtr bytes = adoptGRef(g_bytes_new_with_free_func(data, dataSize, [](gpointer userData) { @@ -19582,7 +19570,7 @@ index 0a63ba9604cc6a06da1a9a662ab16b874b01c973..63d0ac8e65bca121d99f54121f3045ed + delete static_cast(userData); }, bitmap.leakRef())); - GRefPtr buffer = adoptGRef(WPE_BUFFER(wpe_buffer_shm_new(display, size.width(), size.height(), WPE_PIXEL_FORMAT_ARGB8888, bytes.get(), stride))); + GRefPtr buffer = adoptGRef(WPE_BUFFER(wpe_buffer_shm_new(m_wpeView.get(), size.width(), size.height(), WPE_PIXEL_FORMAT_ARGB8888, bytes.get(), stride))); diff --git a/Source/WebKit/UIProcess/wpe/InspectorTargetProxyWPE.cpp b/Source/WebKit/UIProcess/wpe/InspectorTargetProxyWPE.cpp new file mode 100644 index 0000000000000000000000000000000000000000..7453194ca6f032ba86a4c67f5bf12688ab6ec1be @@ -19986,7 +19974,7 @@ index 0000000000000000000000000000000000000000..a7d88f8c745f95af21db71dcfce368ba + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp b/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp -index fa5cf9a4acc96f0aefe31a13043636532d53dad2..f075f86ad517585b8da18c56f7730be5d0ac0664 100644 +index 057b6c7a43cbde35cfaac266dfc9fce5bc3c6a31..1605888e79ccb9416719eff486d8151a6845fe98 100644 --- a/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp +++ b/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp @@ -29,6 +29,7 @@ @@ -19998,10 +19986,10 @@ index fa5cf9a4acc96f0aefe31a13043636532d53dad2..f075f86ad517585b8da18c56f7730be5 #include diff --git a/Source/WebKit/WPEPlatform/CMakeLists.txt b/Source/WebKit/WPEPlatform/CMakeLists.txt -index f79722e63d048c1b6d237acd4054156d09f6c7b4..de009fed30c444001efdeb208e66c93093f55d3d 100644 +index 4dc0d0990d9ab5f89efa44bd404b95264c2bbfa8..0cb39461386cfe0e34bcf33cc07bcb03e3826a05 100644 --- a/Source/WebKit/WPEPlatform/CMakeLists.txt +++ b/Source/WebKit/WPEPlatform/CMakeLists.txt -@@ -80,6 +80,7 @@ set(WPEPlatform_SYSTEM_INCLUDE_DIRECTORIES +@@ -82,6 +82,7 @@ set(WPEPlatform_SYSTEM_INCLUDE_DIRECTORIES set(WPEPlatform_LIBRARIES Epoxy::Epoxy @@ -20010,10 +19998,10 @@ index f79722e63d048c1b6d237acd4054156d09f6c7b4..de009fed30c444001efdeb208e66c930 ${GLIB_GIO_LIBRARIES} ${GLIB_GOBJECT_LIBRARIES} diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc563148578c 100644 +index 399ee15035d02439fd905dcfef995b15c367cbc0..3119ffb671cb9518ec080b3b78a08f51337a21b8 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1528,6 +1528,7 @@ +@@ -1535,6 +1535,7 @@ 5CABDC8722C40FED001EDE8E /* APIMessageListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CABDC8322C40FA7001EDE8E /* APIMessageListener.h */; }; 5CADDE05215046BD0067D309 /* WKWebProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C74300E21500492004BFA17 /* WKWebProcess.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5CAECB6627465AE400AB78D0 /* UnifiedSource115.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */; }; @@ -20021,7 +20009,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 5CAF7AA726F93AB00003F19E /* adattributiond.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CAF7AA526F93A950003F19E /* adattributiond.cpp */; }; 5CAFDE452130846300B1F7E1 /* _WKInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE422130843500B1F7E1 /* _WKInspector.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5CAFDE472130846A00B1F7E1 /* _WKInspectorInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE442130843600B1F7E1 /* _WKInspectorInternal.h */; }; -@@ -2362,6 +2363,18 @@ +@@ -2369,6 +2370,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 */; }; @@ -20040,7 +20028,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 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, ); }; }; DF7A231C291B088D00B98DF3 /* WKSnapshotConfigurationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF7A231B291B088D00B98DF3 /* WKSnapshotConfigurationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; -@@ -2446,6 +2459,8 @@ +@@ -2453,6 +2466,8 @@ E5BEF6822130C48000F31111 /* WebDataListSuggestionsDropdownIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E5BEF6802130C47F00F31111 /* WebDataListSuggestionsDropdownIOS.h */; }; E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; E5CBA76427A318E100DF7858 /* UnifiedSource120.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA75F27A3187800DF7858 /* UnifiedSource120.cpp */; }; @@ -20049,7 +20037,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 E5CBA76527A318E100DF7858 /* UnifiedSource118.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76127A3187900DF7858 /* UnifiedSource118.cpp */; }; E5CBA76627A318E100DF7858 /* UnifiedSource116.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76327A3187B00DF7858 /* UnifiedSource116.cpp */; }; E5CBA76727A318E100DF7858 /* UnifiedSource119.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76027A3187900DF7858 /* UnifiedSource119.cpp */; }; -@@ -2466,6 +2481,9 @@ +@@ -2473,6 +2488,9 @@ EBA8D3B627A5E33F00CB7900 /* MockPushServiceConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = EBA8D3B027A5E33F00CB7900 /* MockPushServiceConnection.mm */; }; EBA8D3B727A5E33F00CB7900 /* PushServiceConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = EBA8D3B127A5E33F00CB7900 /* PushServiceConnection.mm */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -20059,7 +20047,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; F40C3B712AB401C5007A3567 /* WKDatePickerPopoverController.h in Headers */ = {isa = PBXBuildFile; fileRef = F40C3B6F2AB40167007A3567 /* WKDatePickerPopoverController.h */; }; F41795A62AC61B78007F5F12 /* CompactContextMenuPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = F41795A42AC619A2007F5F12 /* CompactContextMenuPresenter.h */; }; -@@ -6164,6 +6182,7 @@ +@@ -6192,6 +6210,7 @@ 5CABDC8522C40FCC001EDE8E /* WKMessageListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMessageListener.h; sourceTree = ""; }; 5CABE07A28F60E8A00D83FD9 /* WebPushMessage.serialization.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebPushMessage.serialization.in; sourceTree = ""; }; 5CADDE0D2151AA010067D309 /* AuthenticationChallengeDisposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeDisposition.h; sourceTree = ""; }; @@ -20067,7 +20055,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource115.cpp; sourceTree = ""; }; 5CAF7AA426F93A750003F19E /* adattributiond */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = adattributiond; sourceTree = BUILT_PRODUCTS_DIR; }; 5CAF7AA526F93A950003F19E /* adattributiond.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = adattributiond.cpp; sourceTree = ""; }; -@@ -7864,6 +7883,19 @@ +@@ -7894,6 +7913,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 = ""; }; @@ -20087,7 +20075,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 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 = ""; }; -@@ -8010,6 +8042,8 @@ +@@ -8040,6 +8072,8 @@ E5CBA76127A3187900DF7858 /* UnifiedSource118.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource118.cpp; sourceTree = ""; }; E5CBA76227A3187900DF7858 /* UnifiedSource117.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource117.cpp; sourceTree = ""; }; E5CBA76327A3187B00DF7858 /* UnifiedSource116.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource116.cpp; sourceTree = ""; }; @@ -20096,7 +20084,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 E5DEFA6726F8F42600AB68DB /* PhotosUISPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PhotosUISPI.h; sourceTree = ""; }; EB0D312D275AE13300863D8F /* com.apple.webkit.webpushd.mac.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = com.apple.webkit.webpushd.mac.plist; sourceTree = ""; }; EB0D312E275AE13300863D8F /* com.apple.webkit.webpushd.ios.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = com.apple.webkit.webpushd.ios.plist; sourceTree = ""; }; -@@ -8034,6 +8068,14 @@ +@@ -8064,6 +8098,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 = ""; }; @@ -20111,7 +20099,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDragDestinationAction.h; sourceTree = ""; }; F40C3B6F2AB40167007A3567 /* WKDatePickerPopoverController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKDatePickerPopoverController.h; path = ios/forms/WKDatePickerPopoverController.h; sourceTree = ""; }; F40C3B702AB40167007A3567 /* WKDatePickerPopoverController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKDatePickerPopoverController.mm; path = ios/forms/WKDatePickerPopoverController.mm; sourceTree = ""; }; -@@ -8320,6 +8362,7 @@ +@@ -8351,6 +8393,7 @@ 3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */, 3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */, 7B9FC5BB28A5233B007570E7 /* libWebKitPlatform.a in Frameworks */, @@ -20119,7 +20107,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, -@@ -11162,6 +11205,7 @@ +@@ -11211,6 +11254,7 @@ 99788ACA1F421DCA00C08000 /* _WKAutomationSessionConfiguration.mm */, 990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */, 990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */, @@ -20127,7 +20115,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 5C4609E222430E4C009943C2 /* _WKContentRuleListAction.h */, 5C4609E322430E4D009943C2 /* _WKContentRuleListAction.mm */, 5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */, -@@ -12450,6 +12494,7 @@ +@@ -12503,6 +12547,7 @@ E34B110C27C46BC6006D2F2E /* libWebCoreTestShim.dylib */, E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */, DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */, @@ -20135,7 +20123,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 57A9FF15252C6AEF006A2040 /* libWTF.a */, 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, -@@ -13020,6 +13065,12 @@ +@@ -13073,6 +13118,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -20148,7 +20136,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 ); path = Agents; sourceTree = ""; -@@ -13028,6 +13079,7 @@ +@@ -13081,6 +13132,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -20156,7 +20144,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -13740,6 +13792,7 @@ +@@ -13794,6 +13846,7 @@ E1513C65166EABB200149FCB /* AuxiliaryProcessProxy.h */, 46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */, 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */, @@ -20164,7 +20152,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 5C6D69352AC3935D0099BDAF /* BrowsingContextGroup.cpp */, 5C6D69362AC3935D0099BDAF /* BrowsingContextGroup.h */, 07297F9C1C1711EA003F0735 /* DeviceIdHashSaltStorage.cpp */, -@@ -13761,6 +13814,8 @@ +@@ -13817,6 +13870,8 @@ BC06F43912DBCCFB002D78DE /* GeolocationPermissionRequestProxy.cpp */, BC06F43812DBCCFB002D78DE /* GeolocationPermissionRequestProxy.h */, 2DD5A72A1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h */, @@ -20173,7 +20161,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */, 5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */, 31607F3819627002009B87DA /* LegacySessionStateCoding.h */, -@@ -13794,6 +13849,7 @@ +@@ -13850,6 +13905,7 @@ 1A0C227D2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm */, 1AEE57232409F142002005D6 /* QuickLookThumbnailLoader.h */, 1AEE57242409F142002005D6 /* QuickLookThumbnailLoader.mm */, @@ -20181,7 +20169,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 5CCB54DC2A4FEA6A0005FAA8 /* RemotePageDrawingAreaProxy.cpp */, 5CCB54DB2A4FEA6A0005FAA8 /* RemotePageDrawingAreaProxy.h */, 5C907E9A294D507100B3402D /* RemotePageProxy.cpp */, -@@ -13900,6 +13956,8 @@ +@@ -13955,6 +14011,8 @@ BC7B6204129A0A6700D174A4 /* WebPageGroup.h */, 2D9EA3101A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp */, 2D9EA30E1A96CBFF002D2807 /* WebPageInjectedBundleClient.h */, @@ -20190,7 +20178,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */, BC032DCB10F4389F0058C15A /* WebPageProxy.h */, BCBD38FA125BAB9A00D2C29F /* WebPageProxy.messages.in */, -@@ -14062,6 +14120,7 @@ +@@ -14117,6 +14175,7 @@ BC646C1911DD399F006455B0 /* WKBackForwardListItemRef.h */, BC646C1611DD399F006455B0 /* WKBackForwardListRef.cpp */, BC646C1711DD399F006455B0 /* WKBackForwardListRef.h */, @@ -20198,7 +20186,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 BCB9E24A1120E15C00A137E0 /* WKContext.cpp */, BCB9E2491120E15C00A137E0 /* WKContext.h */, 1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */, -@@ -14645,6 +14704,9 @@ +@@ -14700,6 +14759,9 @@ 7AFA6F682A9F57C50055322A /* DisplayLinkMac.cpp */, 31ABA79C215AF9E000C90E31 /* HighPerformanceGPUManager.h */, 31ABA79D215AF9E000C90E31 /* HighPerformanceGPUManager.mm */, @@ -20208,7 +20196,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */, 0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */, 0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */, -@@ -14668,6 +14730,8 @@ +@@ -14723,6 +14785,8 @@ E568B92120A3AC6A00E3C856 /* WebDataListSuggestionsDropdownMac.mm */, E55CD20124D09F1F0042DB9C /* WebDateTimePickerMac.h */, E55CD20224D09F1F0042DB9C /* WebDateTimePickerMac.mm */, @@ -20217,7 +20205,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 BC857E8512B71EBB00EDEB2E /* WebPageProxyMac.mm */, BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */, BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */, -@@ -15671,6 +15735,7 @@ +@@ -15726,6 +15790,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -20225,7 +20213,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -15973,6 +16038,7 @@ +@@ -16029,6 +16094,7 @@ E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */, 4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */, 1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */, @@ -20233,7 +20221,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 A7E69BCC2B2117A100D43D3F /* BufferAndBackendInfo.h in Headers */, BC3065FA1259344E00E71278 /* CacheModel.h in Headers */, 935BF7FC2936BF1A00B41326 /* CacheStorageCache.h in Headers */, -@@ -16152,7 +16218,11 @@ +@@ -16208,7 +16274,11 @@ BC14DF77120B5B7900826C0C /* InjectedBundleScriptWorld.h in Headers */, CE550E152283752200D28791 /* InsertTextOptions.h in Headers */, 9197940523DBC4BB00257892 /* InspectorBrowserAgent.h in Headers */, @@ -20245,7 +20233,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */, C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */, 2D4D2C811DF60BF3002EB10C /* InteractionInformationRequest.h in Headers */, -@@ -16407,6 +16477,7 @@ +@@ -16464,6 +16534,7 @@ CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, A78A5FE42B0EB39E005036D3 /* RemoteImageBufferSetIdentifier.h in Headers */, @@ -20253,15 +20241,15 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -16462,6 +16533,7 @@ +@@ -16519,6 +16590,7 @@ E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */, E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */, 7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */, + F303B849249A8D640031DE5C /* ScreencastEncoder.h in Headers */, + 463BB93A2B9D08D80098C5C3 /* ScriptMessageHandlerIdentifier.h in Headers */, E4D54D0421F1D72D007E3C36 /* ScrollingTreeFrameScrollingNodeRemoteIOS.h in Headers */, 0F931C1C18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h in Headers */, - 0F931C1C18C5711900DBB8D4 /* ScrollingTreeScrollingNodeDelegateIOS.h in Headers */, -@@ -16805,6 +16877,8 @@ +@@ -16868,6 +16940,8 @@ 939EF87029D112EE00F23AEE /* WebPageInlines.h in Headers */, 9197940823DBC4CB00257892 /* WebPageInspectorAgentBase.h in Headers */, A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */, @@ -20270,7 +20258,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 A543E30C215C8A8D00279CD9 /* WebPageInspectorTarget.h in Headers */, A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, -@@ -19098,6 +19172,8 @@ +@@ -19161,6 +19235,8 @@ 522F792928D50EBB0069B45B /* HidService.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -20279,7 +20267,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 1CC94E532AC92F190045F269 /* JSWebExtensionAPIAction.mm in Sources */, 1C2B4D4B2A819D0D00C528A1 /* JSWebExtensionAPIAlarms.mm in Sources */, 1C8ECFEA2AFC7DCB007BAA62 /* JSWebExtensionAPICommands.mm in Sources */, -@@ -19538,6 +19614,8 @@ +@@ -19600,6 +19676,8 @@ E3816B3D27E2463A005EAFC0 /* WebMockContentFilterManager.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20289,7 +20277,7 @@ index 46e7e6073977b7981d517cdf11d04dc4d5b4aef7..925ee9191cc0cb4efd5815d292bfcc56 BCBD3914125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp in Sources */, 7CE9CE101FA0767A000177DE /* WebPageUpdatePreferences.cpp in Sources */, diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp -index 006cb4d9ffe6119755fdac47f553cdbf490034a0..d29afe39ca22aba30409e1044eb2459031fc127f 100644 +index 610dc831f72e672abd8ebd1ad9dfdf77ca94a727..e297bd173390d9ae50fded54d3ff9b35995a4b59 100644 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp @@ -229,6 +229,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou @@ -20331,7 +20319,7 @@ index 006cb4d9ffe6119755fdac47f553cdbf490034a0..d29afe39ca22aba30409e1044eb24590 loadParameters.identifier = identifier; loadParameters.webPageProxyID = trackingParameters.webPageProxyID; loadParameters.webPageID = trackingParameters.pageID; -@@ -477,14 +482,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -476,14 +481,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL if (loadParameters.options.mode != FetchOptions::Mode::Navigate) { ASSERT(loadParameters.sourceOrigin); @@ -20349,7 +20337,7 @@ index 006cb4d9ffe6119755fdac47f553cdbf490034a0..d29afe39ca22aba30409e1044eb24590 loadParameters.isMainFrameNavigation = isMainFrameNavigation; if (loadParameters.isMainFrameNavigation && document) -@@ -526,12 +528,24 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -525,12 +527,24 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials); @@ -20374,7 +20362,7 @@ index 006cb4d9ffe6119755fdac47f553cdbf490034a0..d29afe39ca22aba30409e1044eb24590 if (frame && !frame->settings().siteIsolationEnabled() && !WebProcess::singleton().allowsFirstPartyForCookies(loadParameters.request.firstPartyForCookies())) RELEASE_LOG_FAULT(IPC, "scheduleLoad: Process will terminate due to failed allowsFirstPartyForCookies check"); -@@ -544,7 +558,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -543,7 +557,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } auto loader = WebResourceLoader::create(resourceLoader, trackingParameters); @@ -20383,7 +20371,7 @@ index 006cb4d9ffe6119755fdac47f553cdbf490034a0..d29afe39ca22aba30409e1044eb24590 } void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader) -@@ -954,7 +968,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier +@@ -953,7 +967,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier bool WebLoaderStrategy::isOnLine() const { @@ -20392,7 +20380,7 @@ index 006cb4d9ffe6119755fdac47f553cdbf490034a0..d29afe39ca22aba30409e1044eb24590 } void WebLoaderStrategy::addOnlineStateChangeListener(Function&& listener) -@@ -981,6 +995,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet +@@ -980,6 +994,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet void WebLoaderStrategy::setOnLineState(bool isOnLine) { @@ -20404,7 +20392,7 @@ index 006cb4d9ffe6119755fdac47f553cdbf490034a0..d29afe39ca22aba30409e1044eb24590 if (m_isOnLine == isOnLine) return; -@@ -989,6 +1008,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) +@@ -988,6 +1007,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) listener(isOnLine); } @@ -20484,7 +20472,7 @@ index ee9c3c4f48c328daaa015e2122235e51349bd999..5b3a4d3e742147195e0ff9e88176759d auto permissionHandlers = m_requestsPerOrigin.take(securityOrigin); diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index 54d732ab06524cd6f94a2dcef5323a81ceb330ac..a653197191c2bfeea762375c07ccb1e1a2a0e457 100644 +index 14a6547ae278cd186805daf5f812d1070582aaf1..83a809d9a2ff7987ce8ecb4f2aed7f27009bf4d6 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -468,6 +468,8 @@ void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel lev @@ -20524,10 +20512,10 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..0f6a539f00a42149c0f2b2237a9cbdd8 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebLocalFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebLocalFrameLoaderClient.cpp -index ecddea9f99d6d3ecb9db72d23054b2d08b5b2e39..65f10a77cf34fd7237baefdc18cf3bb1c9fcc044 100644 +index 991213d7cb5c4790f563a8c09add8413a7f48b3c..275629aaff71d44397b58685b4c9ff0baf759f09 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebLocalFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebLocalFrameLoaderClient.cpp -@@ -1589,14 +1589,6 @@ void WebLocalFrameLoaderClient::transitionToCommittedForNewPage() +@@ -1588,14 +1588,6 @@ void WebLocalFrameLoaderClient::transitionToCommittedForNewPage() if (webPage->scrollPinningBehavior() != ScrollPinningBehavior::DoNotPin) view->setScrollPinningBehavior(webPage->scrollPinningBehavior()); @@ -20684,7 +20672,7 @@ index 0000000000000000000000000000000000000000..4fa6b70b978998849950d1fe4d9f902e + +#endif // ENABLE(DRAG_SUPPORT) diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp -index d49a3e054f11e2e07c37a3f2e7ce55252998365c..b6e71fe25b6a49ac50ba89ba1128cbb6a6bb2f44 100644 +index 6780fb04b94241977df3396ffb77585f10faf035..db015c88e2b3413c9fde348779b62c90896ba09c 100644 --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp @@ -39,6 +39,7 @@ @@ -20712,7 +20700,7 @@ index d49a3e054f11e2e07c37a3f2e7ce55252998365c..b6e71fe25b6a49ac50ba89ba1128cbb6 m_layerTreeHost->scrollNonCompositedContents(scrollRect); return; } -@@ -556,6 +567,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay +@@ -562,6 +573,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay m_scrollOffset = IntSize(); m_displayTimer.stop(); m_isWaitingForDidUpdate = false; @@ -20724,7 +20712,7 @@ index d49a3e054f11e2e07c37a3f2e7ce55252998365c..b6e71fe25b6a49ac50ba89ba1128cbb6 } void DrawingAreaCoordinatedGraphics::sendEnterAcceleratedCompositingModeIfNeeded() -@@ -613,6 +629,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() +@@ -619,6 +635,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() // UI process, we still need to let it know about the new contents, so send an Update message. send(Messages::DrawingAreaProxy::Update(0, WTFMove(updateInfo))); } @@ -20737,7 +20725,7 @@ index d49a3e054f11e2e07c37a3f2e7ce55252998365c..b6e71fe25b6a49ac50ba89ba1128cbb6 void DrawingAreaCoordinatedGraphics::scheduleDisplay() diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp -index 0180860001b598d414f3a472715da8daa640c5f6..c11c1ecf8c43faf2a67e1a3c7196ec5a7e62e6c4 100644 +index 33fe769ad9c94388e4038e5848b4c50087bf9cd3..9cff157e96cd005a43e9c64dcd83ddc35d5c1518 100644 --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp @@ -194,8 +194,16 @@ void LayerTreeHost::setViewOverlayRootLayer(GraphicsLayer* viewOverlayRootLayer) @@ -20757,7 +20745,15 @@ index 0180860001b598d414f3a472715da8daa640c5f6..c11c1ecf8c43faf2a67e1a3c7196ec5a m_viewportController.didScroll(rect.location()); didChangeViewport(); -@@ -314,6 +322,10 @@ void LayerTreeHost::didChangeViewport() +@@ -274,6 +282,7 @@ GraphicsLayerFactory* LayerTreeHost::graphicsLayerFactory() + void LayerTreeHost::contentsSizeChanged(const IntSize& newSize) + { + m_viewportController.didChangeContentsSize(newSize); ++ didChangeViewport(); + } + + void LayerTreeHost::didChangeViewportAttributes(ViewportAttributes&& attr) +@@ -313,6 +322,10 @@ void LayerTreeHost::didChangeViewport() if (!view->useFixedLayout()) view->notifyScrollPositionChanged(m_lastScrollPosition); @@ -20769,10 +20765,10 @@ index 0180860001b598d414f3a472715da8daa640c5f6..c11c1ecf8c43faf2a67e1a3c7196ec5a if (m_lastPageScaleFactor != pageScale) { diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h -index cb3d2cc477cc1244d6d2ccedb3d484cdf4a0d82c..077019e38cd782a62e9328948b6d0a9fb6920380 100644 +index 40926ecda30b9f7cdb4d1908436b1af4353999a4..2fa2c6363cfedd3dac46692cc6c8642752ec728f 100644 --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h -@@ -114,6 +114,13 @@ public: +@@ -115,6 +115,13 @@ public: #if PLATFORM(WPE) && USE(GBM) && ENABLE(WPE_PLATFORM) void preferredBufferFormatsDidChange(); #endif @@ -20813,12 +20809,12 @@ index 94bbead87936ab599f79c3c08b260cad939aea62..5099d3d7bdf220aa5c8f3729a04397ec { if (m_hasRemovedMessageReceiver) diff --git a/Source/WebKit/WebProcess/WebPage/DrawingArea.h b/Source/WebKit/WebProcess/WebPage/DrawingArea.h -index 891e7d4dba97ec6a2b2ac27ae052636ec4de6057..ff1932c7c6d8233b1c92360f1b9fe47d5786e461 100644 +index e61851e273de92fc97b7707c4427b4d03cd2df70..d1e0850461624188febc8a477e6d3d6bc44fee50 100644 --- a/Source/WebKit/WebProcess/WebPage/DrawingArea.h +++ b/Source/WebKit/WebProcess/WebPage/DrawingArea.h -@@ -163,6 +163,9 @@ public: - virtual void deviceOrPageScaleFactorChanged() = 0; +@@ -164,6 +164,9 @@ public: virtual bool enterAcceleratedCompositingModeIfNeeded() = 0; + virtual void backgroundColorDidChange() { }; #endif +#if PLATFORM(WIN) + void didChangeAcceleratedCompositingMode(bool enabled); @@ -20827,7 +20823,7 @@ index 891e7d4dba97ec6a2b2ac27ae052636ec4de6057..ff1932c7c6d8233b1c92360f1b9fe47d #if PLATFORM(WPE) && USE(GBM) && ENABLE(WPE_PLATFORM) virtual void preferredBufferFormatsDidChange() { } diff --git a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp -index 003a617e9926b0d832d7613d361ab1abf246da5a..51dd176ab2e7275896b94dd21c776d70216ee05b 100644 +index 935edefd61482ee2b268415ed24f7e2639bdbe35..8ec21eb117958c455ea4772907dd4e3afe0c1fcc 100644 --- a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp @@ -44,6 +44,7 @@ @@ -20838,7 +20834,7 @@ index 003a617e9926b0d832d7613d361ab1abf246da5a..51dd176ab2e7275896b94dd21c776d70 #include #include #include -@@ -391,4 +392,10 @@ void WebCookieJar::removeChangeListener(const String& host, const WebCore::Cooki +@@ -393,6 +394,12 @@ void WebCookieJar::removeChangeListener(const String& host, const WebCore::Cooki } #endif @@ -20848,12 +20844,14 @@ index 003a617e9926b0d832d7613d361ab1abf246da5a..51dd176ab2e7275896b94dd21c776d70 + WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::SetCookieFromResponse(request.firstPartyForCookies(), SameSiteInfo::create(request), request.url(), setCookieValue), 0); +} + - } // namespace WebKit + #if !PLATFORM(COCOA) + + String WebCookieJar::cookiesInPartitionedCookieStorage(const WebCore::Document&, const URL&, const WebCore::SameSiteInfo&) const diff --git a/Source/WebKit/WebProcess/WebPage/WebCookieJar.h b/Source/WebKit/WebProcess/WebPage/WebCookieJar.h -index eb7001bc2cc2dee3a446c1b7adbe93b4d74664ce..c7b3722d51398e0dcc220398d1ed024e48e58a6c 100644 +index b6e5283f51db82b60091320df44ef0bbf20c33c6..0d82fbb98b93e760cecf5fa7a41327d0473f8a03 100644 --- a/Source/WebKit/WebProcess/WebPage/WebCookieJar.h +++ b/Source/WebKit/WebProcess/WebPage/WebCookieJar.h -@@ -70,6 +70,8 @@ public: +@@ -74,6 +74,8 @@ public: void clearCache() final; @@ -20863,10 +20861,10 @@ index eb7001bc2cc2dee3a446c1b7adbe93b4d74664ce..c7b3722d51398e0dcc220398d1ed024e WebCookieJar(); diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index d295e3e7342ae550f2ecefbb44a4ae17f0f6b734..bfa033e7531be339a61e297cc73e45a4ae883542 100644 +index da971ba778c6e8c0397c255b60a33c76d4124056..ebfb82b8ec31cb78a9f13b6da929c20996a5049e 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -1021,6 +1021,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -1024,6 +1024,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) #endif #endif // HAVE(SANDBOX_STATE_FLAGS) @@ -20876,7 +20874,7 @@ index d295e3e7342ae550f2ecefbb44a4ae17f0f6b734..bfa033e7531be339a61e297cc73e45a4 updateThrottleState(); #if ENABLE(ACCESSIBILITY_ANIMATION_CONTROL) updateImageAnimationEnabled(); -@@ -1956,6 +1959,22 @@ void WebPage::transitionFrameToLocal(LocalFrameCreationParameters&& creationPara +@@ -1991,6 +1994,22 @@ void WebPage::transitionFrameToLocal(LocalFrameCreationParameters&& creationPara frame->transitionToLocal(creationParameters.layerHostingContextIdentifier); } @@ -20899,7 +20897,7 @@ index d295e3e7342ae550f2ecefbb44a4ae17f0f6b734..bfa033e7531be339a61e297cc73e45a4 void WebPage::loadRequest(LoadParameters&& loadParameters) { WEBPAGE_RELEASE_LOG(Loading, "loadRequest: navigationID=%" PRIu64 ", shouldTreatAsContinuingLoad=%u, lastNavigationWasAppInitiated=%d, existingNetworkResourceLoadIdentifierToResume=%" PRIu64, loadParameters.navigationID, static_cast(loadParameters.shouldTreatAsContinuingLoad), loadParameters.request.isAppInitiated(), valueOrDefault(loadParameters.existingNetworkResourceLoadIdentifierToResume).toUInt64()); -@@ -2235,17 +2254,14 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -2270,17 +2289,14 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20917,7 +20915,7 @@ index d295e3e7342ae550f2ecefbb44a4ae17f0f6b734..bfa033e7531be339a61e297cc73e45a4 void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArguments) { RefPtr localMainFrame = dynamicDowncast(m_page->mainFrame()); -@@ -2270,20 +2286,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -2305,20 +2321,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20945,7 +20943,7 @@ index d295e3e7342ae550f2ecefbb44a4ae17f0f6b734..bfa033e7531be339a61e297cc73e45a4 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -2291,7 +2305,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -2326,7 +2340,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20953,7 +20951,7 @@ index d295e3e7342ae550f2ecefbb44a4ae17f0f6b734..bfa033e7531be339a61e297cc73e45a4 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2584,6 +2597,7 @@ void WebPage::scaleView(double scale) +@@ -2619,6 +2632,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20961,7 +20959,7 @@ index d295e3e7342ae550f2ecefbb44a4ae17f0f6b734..bfa033e7531be339a61e297cc73e45a4 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2763,18 +2777,14 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2798,18 +2812,14 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20981,7 +20979,7 @@ index d295e3e7342ae550f2ecefbb44a4ae17f0f6b734..bfa033e7531be339a61e297cc73e45a4 } #if !PLATFORM(IOS_FAMILY) -@@ -3766,6 +3776,97 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent, CompletionHandlersendMessageToTargetBackend(targetId, message); } @@ -21090,8 +21088,8 @@ index d295e3e7342ae550f2ecefbb44a4ae17f0f6b734..bfa033e7531be339a61e297cc73e45a4 + void WebPage::insertNewlineInQuotedContent() { - Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -4065,6 +4171,7 @@ void WebPage::didCompletePageTransition() + RefPtr frame = m_page->checkedFocusController()->focusedOrMainFrame(); +@@ -4129,6 +4235,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -21099,7 +21097,7 @@ index d295e3e7342ae550f2ecefbb44a4ae17f0f6b734..bfa033e7531be339a61e297cc73e45a4 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -5150,7 +5257,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -5224,7 +5331,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -21108,7 +21106,7 @@ index d295e3e7342ae550f2ecefbb44a4ae17f0f6b734..bfa033e7531be339a61e297cc73e45a4 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags, CompletionHandler, DragHandlingMethod, bool, unsigned, IntRect, IntRect, std::optional)>&& completionHandler) { if (!m_page) -@@ -7399,6 +7506,10 @@ void WebPage::didCommitLoad(WebFrame* frame) +@@ -7552,6 +7659,10 @@ void WebPage::didCommitLoad(WebFrame* frame) #endif flushDeferredDidReceiveMouseEvent(); @@ -21119,7 +21117,7 @@ index d295e3e7342ae550f2ecefbb44a4ae17f0f6b734..bfa033e7531be339a61e297cc73e45a4 } void WebPage::didFinishDocumentLoad(WebFrame& frame) -@@ -7633,6 +7744,9 @@ Ref WebPage::createDocumentLoader(LocalFrame& frame, const Resou +@@ -7792,6 +7903,9 @@ Ref WebPage::createDocumentLoader(LocalFrame& frame, const Resou WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -21130,10 +21128,10 @@ index d295e3e7342ae550f2ecefbb44a4ae17f0f6b734..bfa033e7531be339a61e297cc73e45a4 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index e04672c5e6b8a37852b61a46a311ec43393da20b..c4cc0b1c52f3c7fe703614436a7689e58eb0a9ba 100644 +index d122b26429823b3dfc9a215977174a1348a19fd0..6b154a312bedd764f78d32aba8c4452e2261b5b7 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h -@@ -68,6 +68,7 @@ +@@ -69,6 +69,7 @@ #include #include #include @@ -21141,7 +21139,7 @@ index e04672c5e6b8a37852b61a46a311ec43393da20b..c4cc0b1c52f3c7fe703614436a7689e5 #include #include #include -@@ -109,6 +110,10 @@ +@@ -110,6 +111,10 @@ #include "WebPrintOperationGtk.h" #endif @@ -21152,7 +21150,7 @@ index e04672c5e6b8a37852b61a46a311ec43393da20b..c4cc0b1c52f3c7fe703614436a7689e5 #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -1126,11 +1131,11 @@ public: +@@ -1135,11 +1140,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -21166,7 +21164,7 @@ index e04672c5e6b8a37852b61a46a311ec43393da20b..c4cc0b1c52f3c7fe703614436a7689e5 void performDragControllerAction(std::optional, DragControllerAction, WebCore::DragData&&, CompletionHandler, WebCore::DragHandlingMethod, bool, unsigned, WebCore::IntRect, WebCore::IntRect, std::optional)>&&); void performDragOperation(WebCore::DragData&&, SandboxExtension::Handle&&, Vector&&, CompletionHandler&&); #endif -@@ -1145,6 +1150,9 @@ public: +@@ -1154,6 +1159,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -21176,7 +21174,7 @@ index e04672c5e6b8a37852b61a46a311ec43393da20b..c4cc0b1c52f3c7fe703614436a7689e5 #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1368,6 +1376,7 @@ public: +@@ -1377,6 +1385,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -21184,7 +21182,7 @@ index e04672c5e6b8a37852b61a46a311ec43393da20b..c4cc0b1c52f3c7fe703614436a7689e5 void insertNewlineInQuotedContent(); -@@ -1825,6 +1834,7 @@ private: +@@ -1834,6 +1843,7 @@ private: void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); void transitionFrameToLocal(LocalFrameCreationParameters&&, WebCore::FrameIdentifier); @@ -21192,7 +21190,7 @@ index e04672c5e6b8a37852b61a46a311ec43393da20b..c4cc0b1c52f3c7fe703614436a7689e5 void loadRequest(LoadParameters&&); [[noreturn]] void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1864,6 +1874,7 @@ private: +@@ -1873,6 +1883,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&, CompletionHandler, bool)>&&); @@ -21200,7 +21198,7 @@ index e04672c5e6b8a37852b61a46a311ec43393da20b..c4cc0b1c52f3c7fe703614436a7689e5 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -2011,9 +2022,7 @@ private: +@@ -2017,9 +2028,7 @@ private: void addLayerForFindOverlay(CompletionHandler&&); void removeLayerForFindOverlay(CompletionHandler&&); @@ -21210,7 +21208,7 @@ index e04672c5e6b8a37852b61a46a311ec43393da20b..c4cc0b1c52f3c7fe703614436a7689e5 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2593,6 +2602,7 @@ private: +@@ -2603,6 +2612,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -21219,7 +21217,7 @@ index e04672c5e6b8a37852b61a46a311ec43393da20b..c4cc0b1c52f3c7fe703614436a7689e5 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 2a2c08292952243611e318eb894d0f3324eee168..7dce572b61b8fb218a8a884739f338652431487c 100644 +index 3b1d4404bd28adadb01c27d39a335cf5519b83f3..7fcdf4d0ac653c249938974105707a21a899b942 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -149,6 +149,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -21257,7 +21255,7 @@ index 2a2c08292952243611e318eb894d0f3324eee168..7dce572b61b8fb218a8a884739f33865 -#if !PLATFORM(GTK) && ENABLE(DRAG_SUPPORT) +#if !PLATFORM(GTK) && !PLATFORM(WPE) && ENABLE(DRAG_SUPPORT) PerformDragControllerAction(std::optional frameID, enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData) -> (std::optional dragOperation, enum:uint8_t WebCore::DragHandlingMethod dragHandlingMethod, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, WebCore::IntRect insertionRect, WebCore::IntRect editableElementRect, struct std::optional remoteUserInputEventData) - PerformDragOperation(WebCore::DragData dragData, WebKit::SandboxExtension::Handle sandboxExtensionHandle, Vector sandboxExtensionsForUpload) -> (bool handled) + PerformDragOperation(WebCore::DragData dragData, WebKit::SandboxExtensionHandle sandboxExtensionHandle, Vector sandboxExtensionsForUpload) -> (bool handled) #endif @@ -370,6 +373,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType DragCancelled() @@ -21271,10 +21269,10 @@ index 2a2c08292952243611e318eb894d0f3324eee168..7dce572b61b8fb218a8a884739f33865 RequestDragStart(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) RequestAdditionalItemsForDragSession(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -index 5f9b880c80bf59683296a4c55a68e43246710470..941b6583b8e48e81899e05a57d858ac90bc4d446 100644 +index fbc94ccff0a00b9b827c5f6fd22735ee3ff3eab7..380bafd4d7decd8dbefe14dd1780a4f1bf664ba3 100644 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -@@ -839,21 +839,37 @@ String WebPage::platformUserAgent(const URL&) const +@@ -800,21 +800,37 @@ String WebPage::platformUserAgent(const URL&) const bool WebPage::hoverSupportedByPrimaryPointingDevice() const { @@ -21363,7 +21361,7 @@ index f17f5d719d892309ed9c7093384945866b5117b9..1dba47bbf0dbd0362548423a74b38034 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index 1977756a15c3ba23a02ef6e03044af4d6f34ef68..2e6d9e185ab7f0a8da8a19e97a61baa79d60c8e8 100644 +index 3ad4794de88f16fb0b90c004654782e80b1d0b1e..ef49378d65ea56b10f30ecf8d6817dffc35acb01 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -88,6 +88,7 @@ @@ -21399,7 +21397,7 @@ index 8987c3964a9308f2454759de7f8972215a3ae416..bcac0afeb94ed8123d1f9fb0b932c849 SetProcessDPIAware(); return true; diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -index 20b69d828a5a5f12cec5382b32064c4ce86a663b..a79db828df1c5f2f0e05c43f2f01e38a29accc70 100644 +index 79b45534f7468cddc04a9021623799bf1052a7f9..d8efaabf72c725ca3a7247bc8475d90a9cecdd50 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm @@ -4214,7 +4214,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END @@ -21412,10 +21410,10 @@ index 20b69d828a5a5f12cec5382b32064c4ce86a663b..a79db828df1c5f2f0e05c43f2f01e38a - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index e527382b814031c47421e3a74142eb9db7c5fb4b..939c24109fb1fd4e30fc1073261e91e899d48b82 100644 +index 1e9502677b2434c8f0e7c8ae395d4c1e148cf9d7..0da8e737d05031413b12803eb62041a7f571d26b 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm -@@ -3947,7 +3947,7 @@ + (void)_doNotStartObservingNetworkReachability +@@ -3974,7 +3974,7 @@ + (void)_doNotStartObservingNetworkReachability } #endif // PLATFORM(IOS_FAMILY) @@ -21424,7 +21422,7 @@ index e527382b814031c47421e3a74142eb9db7c5fb4b..939c24109fb1fd4e30fc1073261e91e8 - (NSArray *)_touchEventRegions { -@@ -3989,7 +3989,7 @@ - (NSArray *)_touchEventRegions +@@ -4016,7 +4016,7 @@ - (NSArray *)_touchEventRegions }).autorelease(); } @@ -21465,7 +21463,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 9b613b751bafaa2b7ebaa9aafa726cc408a68550..5a6a9ff9f835e796dfaf68aa3331570756a3cf88 100644 +index 6bf415090c55f84b887319aff5316e3538e78ca8..2aaba526ca8ccb39b7457821e7332cc775f8b715 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -11,8 +11,13 @@ if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ni @@ -21480,9 +21478,9 @@ index 9b613b751bafaa2b7ebaa9aafa726cc408a68550..5a6a9ff9f835e796dfaf68aa33315707 +set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Cairo 1.16.0 REQUIRED) - find_package(Fontconfig 2.13.0 REQUIRED) - find_package(Freetype 2.9.0 REQUIRED) -@@ -31,6 +36,10 @@ find_package(ZLIB REQUIRED) + find_package(LibGcrypt 1.7.0 REQUIRED) + find_package(Libtasn1 REQUIRED) +@@ -29,6 +34,10 @@ find_package(ZLIB REQUIRED) find_package(WebP REQUIRED COMPONENTS demux) find_package(ATSPI 2.5.3) @@ -21492,8 +21490,8 @@ index 9b613b751bafaa2b7ebaa9aafa726cc408a68550..5a6a9ff9f835e796dfaf68aa33315707 + include(GStreamerDefinitions) - SET_AND_EXPOSE_TO_BUILD(USE_CAIRO TRUE) -@@ -90,14 +99,14 @@ endif () + SET_AND_EXPOSE_TO_BUILD(USE_GCRYPT TRUE) +@@ -87,14 +96,14 @@ endif () # without approval from a GTK reviewer. There must be strong reason to support # changing the value of the option. WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON) @@ -21511,7 +21509,7 @@ index 9b613b751bafaa2b7ebaa9aafa726cc408a68550..5a6a9ff9f835e796dfaf68aa33315707 WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_LCMS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_JPEGXL PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_WOFF2 PUBLIC ON) -@@ -123,7 +132,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON) +@@ -120,7 +129,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYER_BASED_SVG_ENGINE PRIVATE ON) @@ -21520,7 +21518,7 @@ index 9b613b751bafaa2b7ebaa9aafa726cc408a68550..5a6a9ff9f835e796dfaf68aa33315707 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ON) -@@ -135,7 +144,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION P +@@ -132,7 +141,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION P WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21529,7 +21527,7 @@ index 9b613b751bafaa2b7ebaa9aafa726cc408a68550..5a6a9ff9f835e796dfaf68aa33315707 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) -@@ -145,6 +154,14 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON) +@@ -142,6 +151,14 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CODECS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21545,7 +21543,7 @@ index 9b613b751bafaa2b7ebaa9aafa726cc408a68550..5a6a9ff9f835e796dfaf68aa33315707 # 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 bb4408e1483b3368d3755f91e1c314c5a8356b6d..6e0926a1aae4f99d9ad912621c91f77b4ae6a09c 100644 +index 7ca4dbcaa45ad799539f96a19377ca2b7023a921..770d7fbc68bec3112c530f47edabb48492d7ca37 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -9,6 +9,8 @@ if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ni @@ -21630,8 +21628,8 @@ index bb4408e1483b3368d3755f91e1c314c5a8356b6d..6e0926a1aae4f99d9ad912621c91f77b -WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC ${ENABLE_DEVELOPER_MODE}) +WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC OFF) WEBKIT_OPTION_DEFINE(ENABLE_WPE_1_1_API "Whether to build WPE 1.1 instead of WPE 2.0" PUBLIC OFF) - WEBKIT_OPTION_DEFINE(USE_SKIA "Whether to use Skia instead of Cairo." PRIVATE OFF) WEBKIT_OPTION_DEFINE(USE_GBM "Whether to enable usage of GBM." PUBLIC ON) + WEBKIT_OPTION_DEFINE(USE_LIBBACKTRACE "Whether to enable usage of libbacktrace." PUBLIC ON) diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake index e60d013125f60b32b7b9bca1847eb118cfb72406..5fca8f7c0a78e36144e28e1b1388dc1380f1bcf9 100644 --- a/Source/cmake/OptionsWin.cmake @@ -21682,10 +21680,10 @@ index e60d013125f60b32b7b9bca1847eb118cfb72406..5fca8f7c0a78e36144e28e1b1388dc13 set(USE_ANGLE_EGL ON) diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake -index 0732785ed1b6c78c0088596349d2ee6e980ca663..f32ba67f06038712a624511729acf3afb304a6af 100644 +index 26f8c4421bf45bb2f7e5f67ebd31ecfd9c0ddd3d..52ad063be9977fbbfa17ed0ae09676fd9455aef9 100644 --- a/Source/cmake/WebKitCompilerFlags.cmake +++ b/Source/cmake/WebKitCompilerFlags.cmake -@@ -87,7 +87,7 @@ macro(WEBKIT_ADD_TARGET_CXX_FLAGS _target) +@@ -122,7 +122,7 @@ macro(WEBKIT_ADD_TARGET_CXX_FLAGS _target) endmacro() @@ -22010,7 +22008,7 @@ index 451e0333dd4e8f5d6313fa80c5027ef2661a61ac..7398af4772ed9a479b1632e38af2d4ee return exitAfterLoad && webProcessCrashed ? 1 : 0; diff --git a/Tools/MiniBrowser/wpe/main.cpp b/Tools/MiniBrowser/wpe/main.cpp -index f055ae8bf4b9758815a6d8ad779f66d2fe8d5f96..ddcb1a8157e44738f6e1a33c59a57fd91473ce44 100644 +index 630d96d01ca6175ef114ec07fbf9396af0a85b26..75d31fcf0507fcc1fc27696c956a3f8ae9e35f4a 100644 --- a/Tools/MiniBrowser/wpe/main.cpp +++ b/Tools/MiniBrowser/wpe/main.cpp @@ -42,6 +42,9 @@ static gboolean headlessMode; @@ -22033,7 +22031,7 @@ index f055ae8bf4b9758815a6d8ad779f66d2fe8d5f96..ddcb1a8157e44738f6e1a33c59a57fd9 { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, nullptr, "[URL]" }, { nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr } }; -@@ -202,15 +208,38 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul +@@ -210,15 +216,38 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul g_main_loop_quit(data->mainLoop); } @@ -22074,7 +22072,7 @@ index f055ae8bf4b9758815a6d8ad779f66d2fe8d5f96..ddcb1a8157e44738f6e1a33c59a57fd9 { auto backend = createViewBackend(1280, 720); -@@ -226,18 +255,37 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi +@@ -234,18 +263,37 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi }, backend.release()); } @@ -22118,7 +22116,7 @@ index f055ae8bf4b9758815a6d8ad779f66d2fe8d5f96..ddcb1a8157e44738f6e1a33c59a57fd9 return newWebView; } -@@ -251,13 +299,89 @@ static WebKitFeature* findFeature(WebKitFeatureList* featureList, const char* id +@@ -259,13 +307,89 @@ static WebKitFeature* findFeature(WebKitFeatureList* featureList, const char* id return nullptr; } @@ -22209,7 +22207,7 @@ index f055ae8bf4b9758815a6d8ad779f66d2fe8d5f96..ddcb1a8157e44738f6e1a33c59a57fd9 webkit_network_session_set_itp_enabled(networkSession, enableITP); if (proxy) { -@@ -284,10 +408,18 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend* +@@ -292,10 +416,18 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend* webkit_cookie_manager_set_persistent_storage(cookieManager, cookiesFile, storageType); } } @@ -22230,7 +22228,7 @@ index f055ae8bf4b9758815a6d8ad779f66d2fe8d5f96..ddcb1a8157e44738f6e1a33c59a57fd9 webkit_website_data_manager_set_itp_enabled(manager, enableITP); if (proxy) { -@@ -318,6 +450,7 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend* +@@ -326,6 +458,7 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend* } #endif @@ -22238,9 +22236,9 @@ index f055ae8bf4b9758815a6d8ad779f66d2fe8d5f96..ddcb1a8157e44738f6e1a33c59a57fd9 WebKitUserContentManager* userContentManager = nullptr; if (contentFilter) { GFile* contentFilterFile = g_file_new_for_commandline_arg(contentFilter); -@@ -385,6 +518,15 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend* - delete static_cast(data); - }, backend) : nullptr; +@@ -398,6 +531,15 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend* + "autoplay", WEBKIT_AUTOPLAY_ALLOW, + nullptr); +// Playwright begin + if (headlessMode) { @@ -22254,7 +22252,7 @@ index f055ae8bf4b9758815a6d8ad779f66d2fe8d5f96..ddcb1a8157e44738f6e1a33c59a57fd9 auto* webView = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW, "backend", viewBackend, "web-context", webContext, -@@ -409,8 +551,6 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend* +@@ -424,8 +566,6 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend* g_signal_connect(wpeView, "event", G_CALLBACK(wpeViewEventCallback), webView); #endif @@ -22263,7 +22261,7 @@ index f055ae8bf4b9758815a6d8ad779f66d2fe8d5f96..ddcb1a8157e44738f6e1a33c59a57fd9 webkit_web_context_set_automation_allowed(webContext, automationMode); g_signal_connect(webContext, "automation-started", G_CALLBACK(automationStartedCallback), webView); g_signal_connect(webView, "permission-request", G_CALLBACK(decidePermissionRequest), nullptr); -@@ -423,16 +563,9 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend* +@@ -438,16 +578,9 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend* webkit_web_view_set_background_color(webView, &color); if (uriArguments) { @@ -22283,7 +22281,7 @@ index f055ae8bf4b9758815a6d8ad779f66d2fe8d5f96..ddcb1a8157e44738f6e1a33c59a57fd9 webkit_web_view_load_uri(webView, "about:blank"); else webkit_web_view_load_uri(webView, "https://wpewebkit.org"); -@@ -506,8 +639,14 @@ int main(int argc, char *argv[]) +@@ -521,8 +654,14 @@ int main(int argc, char *argv[]) } } @@ -22470,18 +22468,19 @@ index 0bd2f996ba2641cbe4f4864b6fd8ce59204bae0a..b211f1bad06fab907de2bb592de84368 diff --git a/Tools/jhbuild/jhbuild-minimal.modules b/Tools/jhbuild/jhbuild-minimal.modules -index 9c4870249367d0c0fb8c08cee660cfd63a6cb8de..496c35c5bd3d3d3c40ec7fc050182c70734c4f84 100644 +index 6c9e52c5c872d81e6e50ee44af9a3abae7750029..34b30f388341865a94f3fe26bf7feea9a17e2678 100644 --- a/Tools/jhbuild/jhbuild-minimal.modules +++ b/Tools/jhbuild/jhbuild-minimal.modules -@@ -26,7 +26,6 @@ +@@ -24,7 +24,7 @@ - ++ -@@ -122,10 +121,10 @@ +@@ -120,10 +120,10 @@ @@ -22495,8 +22494,25 @@ index 9c4870249367d0c0fb8c08cee660cfd63a6cb8de..496c35c5bd3d3d3c40ec7fc050182c70 +@@ -219,6 +219,16 @@ + + + ++ ++ ++ libdrm.pc ++ ++ ++ + + + + ++ + + + +@@ -101,10 +102,10 @@ @@ -22575,6 +22599,23 @@ index 191d23b445c58ddbf0fb0eb416deea938f28e2aa..5e632ca166760adf21ee91eaee35275e +@@ -323,6 +324,16 @@ + hash="sha256:c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf"/> + + ++ ++ ++ libdrm.pc ++ ++ ++ + +