Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

chore: update browser_patches to 7eee05d75 (#37688)

Adam Gastineaud2a6174fb602
diff --git a/browser_patches/firefox/UPSTREAM_CONFIG.sh b/browser_patches/firefox/UPSTREAM_CONFIG.sh
index 9d6ff4f566..9ab8a1199d 100644
--- a/browser_patches/firefox/UPSTREAM_CONFIG.sh
+++ b/browser_patches/firefox/UPSTREAM_CONFIG.sh
@@ -1,3 +1,3 @@
REMOTE_URL="https://github.com/mozilla-firefox/firefox"
BASE_BRANCH="release"
-BASE_REVISION="361373160356d92cb5cd4d67783a3806c776ee78"
+BASE_REVISION="c1ee0105d25a4c2b2887e916470bdf41a9fd47ef"
diff --git a/browser_patches/firefox/juggler/ChannelEventSink.sys.mjs b/browser_patches/firefox/juggler/ChannelEventSink.sys.mjs
new file mode 100644
index 0000000000..ab03e9f0a2
--- /dev/null
+++ b/browser_patches/firefox/juggler/ChannelEventSink.sys.mjs
@@ -0,0 +1,99 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import { ComponentUtils } from "resource://gre/modules/ComponentUtils.sys.mjs";
+
+const Cm = Components.manager;
+
+/**
+ * This is a nsIChannelEventSink implementation that monitors channel redirects.
+ * This has been forked from:
+ * https://searchfox.org/mozilla-central/source/devtools/server/actors/network-monitor/channel-event-sink.js
+ * The rest of this module is also more or less forking:
+ * https://searchfox.org/mozilla-central/source/devtools/server/actors/network-monitor/network-observer.js
+ * TODO(try to re-unify /remote/ with /devtools code)
+ */
+const SINK_CLASS_DESCRIPTION = "NetworkMonitor Channel Event Sink";
+const SINK_CLASS_ID = Components.ID("{c2b4c83e-607a-405a-beab-0ef5dbfb7617}");
+const SINK_CONTRACT_ID = "@mozilla.org/network/monitor/channeleventsink;1";
+const SINK_CATEGORY_NAME = "net-channel-event-sinks";
+
+function ChannelEventSink() {
+ this.wrappedJSObject = this;
+ this.collectors = new Set();
+}
+
+ChannelEventSink.prototype = {
+ QueryInterface: ChromeUtils.generateQI(["nsIChannelEventSink"]),
+
+ registerCollector(collector) {
+ this.collectors.add(collector);
+ },
+
+ unregisterCollector(collector) {
+ this.collectors.delete(collector);
+
+ if (this.collectors.size == 0) {
+ ChannelEventSinkFactory.unregister();
+ }
+ },
+
+ asyncOnChannelRedirect(oldChannel, newChannel, flags, callback) {
+ for (const collector of this.collectors) {
+ try {
+ collector._onChannelRedirect(oldChannel, newChannel, flags);
+ } catch (ex) {
+ console.error(
+ "StackTraceCollector.onChannelRedirect threw an exception",
+ ex
+ );
+ }
+ }
+ callback.onRedirectVerifyCallback(Cr.NS_OK);
+ },
+};
+
+export const ChannelEventSinkFactory =
+ ComponentUtils.generateSingletonFactory(ChannelEventSink);
+
+ChannelEventSinkFactory.register = function () {
+ const registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
+ if (registrar.isCIDRegistered(SINK_CLASS_ID)) {
+ return;
+ }
+
+ registrar.registerFactory(
+ SINK_CLASS_ID,
+ SINK_CLASS_DESCRIPTION,
+ SINK_CONTRACT_ID,
+ ChannelEventSinkFactory
+ );
+
+ Services.catMan.addCategoryEntry(
+ SINK_CATEGORY_NAME,
+ SINK_CONTRACT_ID,
+ SINK_CONTRACT_ID,
+ false,
+ true
+ );
+};
+
+ChannelEventSinkFactory.unregister = function () {
+ const registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
+ registrar.unregisterFactory(SINK_CLASS_ID, ChannelEventSinkFactory);
+
+ Services.catMan.deleteCategoryEntry(
+ SINK_CATEGORY_NAME,
+ SINK_CONTRACT_ID,
+ false
+ );
+};
+
+ChannelEventSinkFactory.getService = function () {
+ // Make sure the ChannelEventSink service is registered before accessing it
+ ChannelEventSinkFactory.register();
+
+ return Cc[SINK_CONTRACT_ID].getService(Ci.nsIChannelEventSink)
+ .wrappedJSObject;
+};
diff --git a/browser_patches/firefox/juggler/NetworkObserver.js b/browser_patches/firefox/juggler/NetworkObserver.js
index c063e0484d..2719cc1023 100644
--- a/browser_patches/firefox/juggler/NetworkObserver.js
+++ b/browser_patches/firefox/juggler/NetworkObserver.js
@@ -6,7 +6,7 @@
const {Helper} = ChromeUtils.importESModule('chrome://juggler/content/Helper.js');
const {NetUtil} = ChromeUtils.importESModule('resource://gre/modules/NetUtil.sys.mjs');
-const { ChannelEventSinkFactory } = ChromeUtils.importESModule("chrome://remote/content/cdp/observers/ChannelEventSink.sys.mjs");
+const { ChannelEventSinkFactory } = ChromeUtils.importESModule("chrome://juggler/content/ChannelEventSink.sys.mjs");
const Cc = Components.classes;
diff --git a/browser_patches/firefox/juggler/TargetRegistry.js b/browser_patches/firefox/juggler/TargetRegistry.js
index 5cddac6f64..14962a91e6 100644
--- a/browser_patches/firefox/juggler/TargetRegistry.js
+++ b/browser_patches/firefox/juggler/TargetRegistry.js
@@ -13,7 +13,7 @@ const Cr = Components.results;
const helper = new Helper();
const IDENTITY_NAME = 'JUGGLER ';
-const HUNDRED_YEARS = 60 * 60 * 24 * 365 * 100;
+const HUNDRED_YEARS = 1000 * 60 * 60 * 24 * 365 * 100;
const ALL_PERMISSIONS = [
'geo',
@@ -1124,7 +1124,8 @@ class BrowserContext {
setCookies(cookies) {
const protocolToSameSite = {
- [undefined]: Ci.nsICookie.SAMESITE_NONE,
+ [undefined]: Ci.nsICookie.SAMESITE_UNSET,
+ 'None': Ci.nsICookie.SAMESITE_UNSET,
'Lax': Ci.nsICookie.SAMESITE_LAX,
'Strict': Ci.nsICookie.SAMESITE_STRICT,
};
diff --git a/browser_patches/firefox/juggler/jar.mn b/browser_patches/firefox/juggler/jar.mn
index 7f3ecf5cdf..b21b33bc45 100644
--- a/browser_patches/firefox/juggler/jar.mn
+++ b/browser_patches/firefox/juggler/jar.mn
@@ -9,6 +9,7 @@ juggler.jar:
content/Helper.js (Helper.js)
content/NetworkObserver.js (NetworkObserver.js)
+ content/ChannelEventSink.sys.mjs (ChannelEventSink.sys.mjs)
content/TargetRegistry.js (TargetRegistry.js)
content/SimpleChannel.js (SimpleChannel.js)
content/JugglerFrameParent.jsm (JugglerFrameParent.jsm)
diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff
index 523cda6f45..c422ad36e4 100644
--- a/browser_patches/firefox/patches/bootstrap.diff
+++ b/browser_patches/firefox/patches/bootstrap.diff
@@ -106,19 +106,19 @@ index a315ebcb8b60875b4eddbb5d654764603e0e7bec..fa67db1ff5a331dda4eaff4457418c30
browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/allegro-pl.ico
browser/defaults/settings/main/search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index 6ebf2f62c47757f16841d04c164d2d86447fcbd0..cae3f3ac6f6ced0b59fe850643bbb90d619750d0 100644
+index 2b4d35e060dc592bb70a1f2b7ceee68616c8202b..323abfaee37445942f7678037dd5b53792dd5ed4 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -192,6 +192,9 @@
+@@ -183,6 +183,9 @@
@RESPATH@/chrome/remote.manifest
#endif
+@RESPATH@/chrome/juggler@JAREXT@
+@RESPATH@/chrome/juggler.manifest
+
- ; [Extensions]
- @RESPATH@/components/extensions-toolkit.manifest
-
+ ; Modules
+ @RESPATH@/browser/modules/*
+ @RESPATH@/modules/*
diff --git a/devtools/server/socket/websocket-server.js b/devtools/server/socket/websocket-server.js
index d49c6fbf1bf83b832795fa674f6b41f223eef812..7ea3540947ff5f61b15f27fbf4b955649f8e9ff9 100644
--- a/devtools/server/socket/websocket-server.js
@@ -167,7 +167,7 @@ index d49c6fbf1bf83b832795fa674f6b41f223eef812..7ea3540947ff5f61b15f27fbf4b95564
const transportProvider = {
setListener(upgradeListener) {
diff --git a/docshell/base/BrowsingContext.cpp b/docshell/base/BrowsingContext.cpp
-index 1a33afa481826b1a53c507d5ea596bcb629d8ac4..8f4f13ff1325b104af80e319cf092be9fd2baab0 100644
+index a5273a33caeb963017a41320b08783c3520eb376..08f73f9a316af5d70d4b1658f5d7b6fedd12c6e5 100644
--- a/docshell/base/BrowsingContext.cpp
+++ b/docshell/base/BrowsingContext.cpp
@@ -109,8 +109,15 @@ struct ParamTraits<mozilla::dom::DisplayMode>
@@ -222,7 +222,7 @@ index 1a33afa481826b1a53c507d5ea596bcb629d8ac4..8f4f13ff1325b104af80e319cf092be9
nsString&& aOldValue) {
MOZ_ASSERT(IsTop());
diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h
-index 0bd3efa16dcae42ff02f42bddce378a7f0c7b621..c8cc1bce7d9901aced6032d0e2e2285cf9eb394b 100644
+index 0c133479abbb8b9a1218ebcb95a285f859d4d39d..7fcc205d2c1a44d864339617a22bf4812f5e2659 100644
--- a/docshell/base/BrowsingContext.h
+++ b/docshell/base/BrowsingContext.h
@@ -205,10 +205,10 @@ struct EmbedderColorSchemes {
@@ -248,7 +248,7 @@ index 0bd3efa16dcae42ff02f42bddce378a7f0c7b621..c8cc1bce7d9901aced6032d0e2e2285c
/* The number of entries added to the session history because of this \
* browsing context. */ \
FIELD(HistoryEntryCount, uint32_t) \
-@@ -967,6 +970,14 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -971,6 +974,14 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
return GetForcedColorsOverride();
}
@@ -263,7 +263,7 @@ index 0bd3efa16dcae42ff02f42bddce378a7f0c7b621..c8cc1bce7d9901aced6032d0e2e2285c
bool IsInBFCache() const;
bool AllowJavascript() const { return GetAllowJavascript(); }
-@@ -1131,6 +1142,11 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -1137,6 +1148,11 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
return IsTop();
}
@@ -275,7 +275,7 @@ index 0bd3efa16dcae42ff02f42bddce378a7f0c7b621..c8cc1bce7d9901aced6032d0e2e2285c
bool CanSet(FieldIndex<IDX_ForcedColorsOverride>, dom::ForcedColorsOverride,
ContentParent*) {
return IsTop();
-@@ -1149,10 +1165,22 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -1155,10 +1171,22 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
void DidSet(FieldIndex<IDX_ForcedColorsOverride>,
dom::ForcedColorsOverride aOldValue);
@@ -299,10 +299,10 @@ index 0bd3efa16dcae42ff02f42bddce378a7f0c7b621..c8cc1bce7d9901aced6032d0e2e2285c
bool CanSet(FieldIndex<IDX_SuspendMediaWhenInactive>, bool, ContentParent*) {
diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
-index 1c5c421d6ec153ab61d3aae29200f8abb02b1a33..68751ec0190f308c20aae6b6c58687dcf0fa225d 100644
+index 6feae3858ff35301b93632645df402c0da759688..b0f6a331628a5619d68078e2a114102e5cfbcb65 100644
--- a/docshell/base/CanonicalBrowsingContext.cpp
+++ b/docshell/base/CanonicalBrowsingContext.cpp
-@@ -325,6 +325,8 @@ void CanonicalBrowsingContext::ReplacedBy(
+@@ -267,6 +267,8 @@ void CanonicalBrowsingContext::ReplacedBy(
txn.SetForceOffline(GetForceOffline());
txn.SetTopInnerSizeForRFP(GetTopInnerSizeForRFP());
txn.SetIPAddressSpace(GetIPAddressSpace());
@@ -311,7 +311,7 @@ index 1c5c421d6ec153ab61d3aae29200f8abb02b1a33..68751ec0190f308c20aae6b6c58687dc
// Propagate some settings on BrowsingContext replacement so they're not lost
// on bfcached navigations. These are important for GeckoView (see bug
-@@ -1635,6 +1637,12 @@ void CanonicalBrowsingContext::LoadURI(nsIURI* aURI,
+@@ -1578,6 +1580,12 @@ void CanonicalBrowsingContext::LoadURI(nsIURI* aURI,
return;
}
@@ -325,7 +325,7 @@ index 1c5c421d6ec153ab61d3aae29200f8abb02b1a33..68751ec0190f308c20aae6b6c58687dc
}
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
-index 5bcbbfbcb522adb9988ba421a4f590ee2105e1d3..cb9bc09a7901334b6ba73834971498f4472cce2d 100644
+index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe15901610af1f2a 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -16,6 +16,12 @@
@@ -357,7 +357,7 @@ index 5bcbbfbcb522adb9988ba421a4f590ee2105e1d3..cb9bc09a7901334b6ba73834971498f4
#include "mozilla/net/DocumentChannel.h"
#include "mozilla/net/DocumentChannelChild.h"
#include "mozilla/net/ParentChannelWrapper.h"
-@@ -118,6 +126,7 @@
+@@ -119,6 +127,7 @@
#include "nsIDocumentViewer.h"
#include "mozilla/dom/Document.h"
#include "nsHTMLDocument.h"
@@ -365,7 +365,7 @@ index 5bcbbfbcb522adb9988ba421a4f590ee2105e1d3..cb9bc09a7901334b6ba73834971498f4
#include "nsIDocumentLoaderFactory.h"
#include "nsIDOMWindow.h"
#include "nsIEditingSession.h"
-@@ -212,6 +221,7 @@
+@@ -214,6 +223,7 @@
#include "nsGlobalWindowInner.h"
#include "nsGlobalWindowOuter.h"
#include "nsJSEnvironment.h"
@@ -373,7 +373,7 @@ index 5bcbbfbcb522adb9988ba421a4f590ee2105e1d3..cb9bc09a7901334b6ba73834971498f4
#include "nsNetCID.h"
#include "nsNetUtil.h"
#include "nsObjectLoadingContent.h"
-@@ -353,6 +363,14 @@ nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext,
+@@ -355,6 +365,14 @@ nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext,
mAllowDNSPrefetch(true),
mAllowWindowControl(true),
mCSSErrorReportingEnabled(false),
@@ -388,7 +388,7 @@ index 5bcbbfbcb522adb9988ba421a4f590ee2105e1d3..cb9bc09a7901334b6ba73834971498f4
mAllowAuth(mItemType == typeContent),
mAllowKeywordFixup(false),
mDisableMetaRefreshWhenInactive(false),
-@@ -3025,6 +3043,232 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) {
+@@ -3034,6 +3052,232 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) {
return NS_OK;
}
@@ -621,7 +621,7 @@ index 5bcbbfbcb522adb9988ba421a4f590ee2105e1d3..cb9bc09a7901334b6ba73834971498f4
NS_IMETHODIMP
nsDocShell::GetIsNavigating(bool* aOut) {
*aOut = mIsNavigating;
-@@ -4790,7 +5034,7 @@ nsDocShell::GetVisibility(bool* aVisibility) {
+@@ -4813,7 +5057,7 @@ nsDocShell::GetVisibility(bool* aVisibility) {
}
void nsDocShell::ActivenessMaybeChanged() {
@@ -630,7 +630,7 @@ index 5bcbbfbcb522adb9988ba421a4f590ee2105e1d3..cb9bc09a7901334b6ba73834971498f4
if (RefPtr<PresShell> presShell = GetPresShell()) {
presShell->ActivenessMaybeChanged();
}
-@@ -6723,6 +6967,10 @@ bool nsDocShell::CanSavePresentation(uint32_t aLoadType,
+@@ -6877,6 +7121,10 @@ bool nsDocShell::CanSavePresentation(uint32_t aLoadType,
return false; // no entry to save into
}
@@ -641,7 +641,7 @@ index 5bcbbfbcb522adb9988ba421a4f590ee2105e1d3..cb9bc09a7901334b6ba73834971498f4
MOZ_ASSERT(!mozilla::SessionHistoryInParent(),
"mOSHE cannot be non-null with SHIP");
nsCOMPtr<nsIDocumentViewer> viewer = mOSHE->GetDocumentViewer();
-@@ -8464,6 +8712,12 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) {
+@@ -8633,6 +8881,12 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) {
true, // aForceNoOpener
getter_AddRefs(newBC));
MOZ_ASSERT(!newBC);
@@ -654,7 +654,7 @@ index 5bcbbfbcb522adb9988ba421a4f590ee2105e1d3..cb9bc09a7901334b6ba73834971498f4
return rv;
}
-@@ -9754,6 +10008,16 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
+@@ -9938,6 +10192,16 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
nsINetworkPredictor::PREDICT_LOAD, attrs, nullptr);
nsCOMPtr<nsIRequest> req;
@@ -671,7 +671,7 @@ index 5bcbbfbcb522adb9988ba421a4f590ee2105e1d3..cb9bc09a7901334b6ba73834971498f4
rv = DoURILoad(aLoadState, aCacheKey, getter_AddRefs(req));
if (NS_SUCCEEDED(rv)) {
-@@ -12970,6 +13234,9 @@ class OnLinkClickEvent : public Runnable {
+@@ -13165,6 +13429,9 @@ class OnLinkClickEvent : public Runnable {
mHandler->OnLinkClickSync(mContent, mLoadState, mNoOpenerImplied,
mTriggeringPrincipal);
}
@@ -681,7 +681,7 @@ index 5bcbbfbcb522adb9988ba421a4f590ee2105e1d3..cb9bc09a7901334b6ba73834971498f4
return NS_OK;
}
-@@ -13083,6 +13350,8 @@ nsresult nsDocShell::OnLinkClick(
+@@ -13280,6 +13547,8 @@ nsresult nsDocShell::OnLinkClick(
nsCOMPtr<nsIRunnable> ev = new OnLinkClickEvent(
this, aContent, loadState, noOpenerImplied, aTriggeringPrincipal);
@@ -691,7 +691,7 @@ index 5bcbbfbcb522adb9988ba421a4f590ee2105e1d3..cb9bc09a7901334b6ba73834971498f4
}
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
-index 32d1673ea09a2c9f6bb14f6dcd8a9c1c8f9831c4..a301ecd30fcad4d79d370ab316fa0d8e5e509795 100644
+index db0bd18f9828b903e240f91f8febd2d371b1cefb..104aa94dbb8ca3b2fa5caebde0df22db4f9e02a4 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -16,6 +16,7 @@
@@ -702,7 +702,7 @@ index 32d1673ea09a2c9f6bb14f6dcd8a9c1c8f9831c4..a301ecd30fcad4d79d370ab316fa0d8e
#include "mozilla/dom/WindowProxyHolder.h"
#include "nsCOMPtr.h"
#include "nsCharsetSource.h"
-@@ -78,6 +79,7 @@ class nsCommandManager;
+@@ -79,6 +80,7 @@ class nsCommandManager;
class nsDocShellEditorData;
class nsDOMNavigationTiming;
class nsDSURIContentListener;
@@ -710,7 +710,7 @@ index 32d1673ea09a2c9f6bb14f6dcd8a9c1c8f9831c4..a301ecd30fcad4d79d370ab316fa0d8e
class nsGlobalWindowOuter;
class FramingChecker;
-@@ -408,6 +410,15 @@ class nsDocShell final : public nsDocLoader,
+@@ -409,6 +411,15 @@ class nsDocShell final : public nsDocLoader,
void SetWillChangeProcess() { mWillChangeProcess = true; }
bool WillChangeProcess() { return mWillChangeProcess; }
@@ -726,7 +726,7 @@ index 32d1673ea09a2c9f6bb14f6dcd8a9c1c8f9831c4..a301ecd30fcad4d79d370ab316fa0d8e
// Create a content viewer within this nsDocShell for the given
// `WindowGlobalChild` actor.
nsresult CreateDocumentViewerForActor(
-@@ -1013,6 +1024,8 @@ class nsDocShell final : public nsDocLoader,
+@@ -1015,6 +1026,8 @@ class nsDocShell final : public nsDocLoader,
bool CSSErrorReportingEnabled() const { return mCSSErrorReportingEnabled; }
@@ -735,7 +735,7 @@ index 32d1673ea09a2c9f6bb14f6dcd8a9c1c8f9831c4..a301ecd30fcad4d79d370ab316fa0d8e
// Handles retrieval of subframe session history for nsDocShell::LoadURI. If a
// load is requested in a subframe of the current DocShell, the subframe
// loadType may need to reflect the loadType of the parent document, or in
-@@ -1301,6 +1314,17 @@ class nsDocShell final : public nsDocLoader,
+@@ -1336,6 +1349,17 @@ class nsDocShell final : public nsDocLoader,
bool mAllowDNSPrefetch : 1;
bool mAllowWindowControl : 1;
bool mCSSErrorReportingEnabled : 1;
@@ -812,10 +812,10 @@ index 159daa1dd936e84f1bf3ce413643382e4d37f592..607224a5270995abccf439992ec577f1
* This attempts to save any applicable layout history state (like
* scroll position) in the nsISHEntry. This is normally done
diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
-index a16bef739fcde0f14ba7e53e0acfa3aa2ee1dd3a..c4747478156c973307b7866f84c65520e4bff9d1 100644
+index 36f9681a989bf4007fa837e7c9ef332ee14e55bd..252347c568b99186c006b2d7aa9a35e0c5c2f3db 100644
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
-@@ -3818,6 +3818,9 @@ void Document::SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages) {
+@@ -3795,6 +3795,9 @@ void Document::SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages) {
}
void Document::ApplySettingsFromCSP(bool aSpeculative) {
@@ -825,7 +825,7 @@ index a16bef739fcde0f14ba7e53e0acfa3aa2ee1dd3a..c4747478156c973307b7866f84c65520
nsresult rv = NS_OK;
if (!aSpeculative) {
// 1) apply settings from regular CSP
-@@ -3875,6 +3878,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) {
+@@ -3852,6 +3855,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) {
MOZ_ASSERT(!mScriptGlobalObject,
"CSP must be initialized before mScriptGlobalObject is set!");
@@ -837,7 +837,7 @@ index a16bef739fcde0f14ba7e53e0acfa3aa2ee1dd3a..c4747478156c973307b7866f84c65520
// If this is a data document - no need to set CSP.
if (mLoadedAsData) {
return NS_OK;
-@@ -4699,6 +4707,10 @@ bool Document::HasFocus(ErrorResult& rv) const {
+@@ -4717,6 +4725,10 @@ bool Document::HasFocus(ErrorResult& rv) const {
return false;
}
@@ -848,7 +848,7 @@ index a16bef739fcde0f14ba7e53e0acfa3aa2ee1dd3a..c4747478156c973307b7866f84c65520
if (!fm->IsInActiveWindow(bc)) {
return false;
}
-@@ -20107,6 +20119,35 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
+@@ -20142,6 +20154,35 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
return PreferenceSheet::PrefsFor(*this).mColorScheme;
}
@@ -885,10 +885,10 @@ index a16bef739fcde0f14ba7e53e0acfa3aa2ee1dd3a..c4747478156c973307b7866f84c65520
if (!sLoadingForegroundTopLevelContentDocument) {
return false;
diff --git a/dom/base/Document.h b/dom/base/Document.h
-index f9f8089ad484330a9d863fac7559b94aa34d80fd..75b6f3b03a6fe11511cc1e9ebdc6aa16936bbbcb 100644
+index 41df6459683a9ab0f0bd20f4139dada564cc18e8..7caea88ca7934f120091c116e2551b4378559e32 100644
--- a/dom/base/Document.h
+++ b/dom/base/Document.h
-@@ -4224,6 +4224,8 @@ class Document : public nsINode,
+@@ -4235,6 +4235,8 @@ class Document : public nsINode,
// color-scheme meta tag.
ColorScheme DefaultColorScheme() const;
@@ -898,7 +898,7 @@ index f9f8089ad484330a9d863fac7559b94aa34d80fd..75b6f3b03a6fe11511cc1e9ebdc6aa16
static bool AutomaticStorageAccessPermissionCanBeGranted(
diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
-index fac275953573368e91e99bc8a72a885fb1c75521..7c1bcfdba325f8310239fc69921aaa0f14255f33 100644
+index 3f60404936ba7559d810154bb9eac7aa0a831e27..f9be3dc1b384b4d4f975be83efaac10178e9b355 100644
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -347,14 +347,18 @@ void Navigator::GetAppName(nsAString& aAppName) const {
@@ -937,7 +937,7 @@ index fac275953573368e91e99bc8a72a885fb1c75521..7c1bcfdba325f8310239fc69921aaa0f
// The returned value is cached by the binding code. The window listens to the
// accept languages change and will clear the cache when needed. It has to
-@@ -2309,7 +2319,8 @@ bool Navigator::Webdriver() {
+@@ -2303,7 +2313,8 @@ bool Navigator::Webdriver() {
}
#endif
@@ -961,10 +961,10 @@ index 893947475fbb8688becb1c1495385e4048d4927d..dfb50acf689223fdab7ef6f42afbbd53
dom::MediaCapabilities* MediaCapabilities();
dom::MediaSession* MediaSession();
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
-index 787d4c4e22715a72197e5d06831bd6d284129c2c..75fc73ce2863f994ce703b0f822acb924bee4f3d 100644
+index 67f8e934ce4be73461bf6ddb85ce6cffc55db149..fd7496044e81d82067774f6a83329e8af8c38ff3 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
-@@ -9432,11 +9432,13 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -9454,11 +9454,13 @@ nsresult nsContentUtils::SendMouseEvent(
int32_t aClickCount, int32_t aModifiers, bool aIgnoreRootScrollFrame,
float aPressure, unsigned short aInputSourceArg, uint32_t aIdentifier,
bool aToWindow, bool* aPreventDefault, bool aIsDOMEventSynthesized,
@@ -979,7 +979,7 @@ index 787d4c4e22715a72197e5d06831bd6d284129c2c..75fc73ce2863f994ce703b0f822acb92
if (aType.EqualsLiteral("mousedown")) {
msg = eMouseDown;
} else if (aType.EqualsLiteral("mouseup")) {
-@@ -9462,6 +9464,12 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -9484,6 +9486,12 @@ nsresult nsContentUtils::SendMouseEvent(
msg = eMouseHitTest;
} else if (aType.EqualsLiteral("MozMouseExploreByTouch")) {
msg = eMouseExploreByTouch;
@@ -992,7 +992,7 @@ index 787d4c4e22715a72197e5d06831bd6d284129c2c..75fc73ce2863f994ce703b0f822acb92
} else {
return NS_ERROR_FAILURE;
}
-@@ -9472,7 +9480,14 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -9494,7 +9502,14 @@ nsresult nsContentUtils::SendMouseEvent(
Maybe<WidgetPointerEvent> pointerEvent;
Maybe<WidgetMouseEvent> mouseEvent;
@@ -1008,7 +1008,7 @@ index 787d4c4e22715a72197e5d06831bd6d284129c2c..75fc73ce2863f994ce703b0f822acb92
MOZ_ASSERT(!aIsWidgetEventSynthesized,
"The event shouldn't be dispatched as a synthesized event");
if (MOZ_UNLIKELY(aIsWidgetEventSynthesized)) {
-@@ -9491,8 +9506,11 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -9513,8 +9528,11 @@ nsresult nsContentUtils::SendMouseEvent(
contextMenuKey ? WidgetMouseEvent::eContextMenuKey
: WidgetMouseEvent::eNormal);
}
@@ -1020,7 +1020,7 @@ index 787d4c4e22715a72197e5d06831bd6d284129c2c..75fc73ce2863f994ce703b0f822acb92
mouseOrPointerEvent.pointerId = aIdentifier;
mouseOrPointerEvent.mModifiers = GetWidgetModifiers(aModifiers);
mouseOrPointerEvent.mButton = aButton;
-@@ -9505,6 +9523,8 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -9527,6 +9545,8 @@ nsresult nsContentUtils::SendMouseEvent(
mouseOrPointerEvent.mClickCount = aClickCount;
mouseOrPointerEvent.mFlags.mIsSynthesizedForTests = aIsDOMEventSynthesized;
mouseOrPointerEvent.mExitFrom = exitFrom;
@@ -1030,10 +1030,10 @@ index 787d4c4e22715a72197e5d06831bd6d284129c2c..75fc73ce2863f994ce703b0f822acb92
nsPresContext* presContext = aPresShell->GetPresContext();
if (!presContext) return NS_ERROR_FAILURE;
diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
-index 7d89626774660fb9e0f564808270e3059e4d7b3c..c7f748e6f33cbcd72b0c97d437b2abbcbe4242be 100644
+index 84890a39e694af61974bb4c1d11b679a2d962340..90d9e672aeb47a878b3dd9c8dec4de6e8bf84846 100644
--- a/dom/base/nsContentUtils.h
+++ b/dom/base/nsContentUtils.h
-@@ -3078,8 +3078,9 @@ class nsContentUtils {
+@@ -3079,8 +3079,9 @@ class nsContentUtils {
int32_t aButton, int32_t aButtons, int32_t aClickCount,
int32_t aModifiers, bool aIgnoreRootScrollFrame, float aPressure,
unsigned short aInputSourceArg, uint32_t aIdentifier, bool aToWindow,
@@ -1046,7 +1046,7 @@ index 7d89626774660fb9e0f564808270e3059e4d7b3c..c7f748e6f33cbcd72b0c97d437b2abbc
static void FirePageShowEventForFrameLoaderSwap(
nsIDocShellTreeItem* aItem,
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
-index e85140d5afebf57cf56bf16ef0c43c425c8d50c7..3062737c3319e35cdc4786c06750a1ac2a99565f 100644
+index 5624bf11d000de505c51d4edb544f33f83c57c64..2468488e11d6dbeaf1528d233331076e9b693e0d 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -707,6 +707,26 @@ nsDOMWindowUtils::GetPresShellId(uint32_t* aPresShellId) {
@@ -1113,7 +1113,7 @@ index e85140d5afebf57cf56bf16ef0c43c425c8d50c7..3062737c3319e35cdc4786c06750a1ac
NS_IMETHODIMP
diff --git a/dom/base/nsDOMWindowUtils.h b/dom/base/nsDOMWindowUtils.h
-index a8a48d28fc4ef612f8234bc2490a41672f1704f5..f702b0c9a0783ec547a41bbefd68e18a27a239fe 100644
+index c9975041127870048a339232eb2701bff47289cb..a53dbf0c6439e359ad75275b002bb6ee39767d26 100644
--- a/dom/base/nsDOMWindowUtils.h
+++ b/dom/base/nsDOMWindowUtils.h
@@ -94,7 +94,7 @@ class nsDOMWindowUtils final : public nsIDOMWindowUtils,
@@ -1126,10 +1126,10 @@ index a8a48d28fc4ef612f8234bc2490a41672f1704f5..f702b0c9a0783ec547a41bbefd68e18a
MOZ_CAN_RUN_SCRIPT
nsresult SendTouchEventCommon(
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
-index be89a1c984982ea005e9bf7f440f5c8a2e8bab55..f8154882b9af02c5e9d7181e7a15b78824be8df9 100644
+index d4f4148f660d128e8df9a7517369ae744b44d26d..bcc3f91e45e45394e826459d4594a0ba564e85b9 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
-@@ -1719,6 +1719,10 @@ Maybe<uint64_t> nsFocusManager::SetFocusInner(Element* aNewContent,
+@@ -1717,6 +1717,10 @@ Maybe<uint64_t> nsFocusManager::SetFocusInner(Element* aNewContent,
(GetActiveBrowsingContext() == newRootBrowsingContext);
}
@@ -1140,7 +1140,7 @@ index be89a1c984982ea005e9bf7f440f5c8a2e8bab55..f8154882b9af02c5e9d7181e7a15b788
// Exit fullscreen if a website focuses another window
if (StaticPrefs::full_screen_api_exit_on_windowRaise() &&
!isElementInActiveWindow && (aFlags & FLAG_RAISE)) {
-@@ -2305,6 +2309,7 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
+@@ -2303,6 +2307,7 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
bool aIsLeavingDocument, bool aAdjustWidget,
bool aRemainActive, Element* aElementToFocus,
uint64_t aActionId) {
@@ -1148,7 +1148,7 @@ index be89a1c984982ea005e9bf7f440f5c8a2e8bab55..f8154882b9af02c5e9d7181e7a15b788
LOGFOCUS(("<<Blur begin actionid: %" PRIu64 ">>", aActionId));
// hold a reference to the focused content, which may be null
-@@ -2351,6 +2356,11 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
+@@ -2346,6 +2351,11 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
return true;
}
@@ -1160,7 +1160,7 @@ index be89a1c984982ea005e9bf7f440f5c8a2e8bab55..f8154882b9af02c5e9d7181e7a15b788
// Keep a ref to presShell since dispatching the DOM event may cause
// the document to be destroyed.
RefPtr<PresShell> presShell = docShell->GetPresShell();
-@@ -3061,7 +3071,9 @@ void nsFocusManager::RaiseWindow(nsPIDOMWindowOuter* aWindow,
+@@ -3046,7 +3056,9 @@ void nsFocusManager::RaiseWindow(nsPIDOMWindowOuter* aWindow,
}
}
@@ -1172,7 +1172,7 @@ index be89a1c984982ea005e9bf7f440f5c8a2e8bab55..f8154882b9af02c5e9d7181e7a15b788
// care of lowering the present active window. This happens in
// a separate runnable to avoid touching multiple windows in
diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp
-index 42ee50b53a666c05c6540a1ddcf3745694aaed2d..b15150f7d2e293c2e338f8cd3ada927c052b30b2 100644
+index b5cf9524c49361d297121731a8b2bfb77951fa6c..7bc2db9d1e1e795956a959f5aec4a341acf03e61 100644
--- a/dom/base/nsGlobalWindowOuter.cpp
+++ b/dom/base/nsGlobalWindowOuter.cpp
@@ -2511,10 +2511,16 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument,
@@ -1217,10 +1217,10 @@ index 42ee50b53a666c05c6540a1ddcf3745694aaed2d..b15150f7d2e293c2e338f8cd3ada927c
void nsGlobalWindowOuter::SetDocShell(nsDocShell* aDocShell) {
diff --git a/dom/base/nsGlobalWindowOuter.h b/dom/base/nsGlobalWindowOuter.h
-index a846e57a8786e77e055d17474c5d910a6844cd5f..02815da6a94e98d452e8b4781a998fc0d5ed1124 100644
+index 0aa48c94263f2ba99069780ccdcaf16735356318..48ad1b131b5fa307ac08503630f20bb9601ab019 100644
--- a/dom/base/nsGlobalWindowOuter.h
+++ b/dom/base/nsGlobalWindowOuter.h
-@@ -320,6 +320,7 @@ class nsGlobalWindowOuter final : public mozilla::dom::EventTarget,
+@@ -318,6 +318,7 @@ class nsGlobalWindowOuter final : public mozilla::dom::EventTarget,
// Outer windows only.
void DispatchDOMWindowCreated();
@@ -1229,10 +1229,10 @@ index a846e57a8786e77e055d17474c5d910a6844cd5f..02815da6a94e98d452e8b4781a998fc0
// Outer windows only.
virtual void EnsureSizeAndPositionUpToDate() override;
diff --git a/dom/base/nsINode.cpp b/dom/base/nsINode.cpp
-index 7d5e58f27b2ae07f8e8ac23c6d12bf90d2fdd8b7..2510572d9bfe8ea2909c48d9c3e86aa02c69e28e 100644
+index af4e9644a89c00352e363560e90debada247cfcf..0756cc712d1e7b5b7ce592d95576ceb08c91702d 100644
--- a/dom/base/nsINode.cpp
+++ b/dom/base/nsINode.cpp
-@@ -1498,6 +1498,61 @@ void nsINode::GetBoxQuadsFromWindowOrigin(const BoxQuadOptions& aOptions,
+@@ -1499,6 +1499,61 @@ void nsINode::GetBoxQuadsFromWindowOrigin(const BoxQuadOptions& aOptions,
mozilla::GetBoxQuadsFromWindowOrigin(this, aOptions, aResult, aRv);
}
@@ -1310,10 +1310,10 @@ index 6a982b3f278bf810dd582b3d5ebc33967323047e..4e991ef317c572c4a79c053d468f14df
DOMQuad& aQuad, const TextOrElementOrDocument& aFrom,
const ConvertCoordinateOptions& aOptions, CallerType aCallerType,
diff --git a/dom/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp
-index bf7eb34da03c0958de688deecb53b407d430f645..a2ec3b1b7e86f72bee38d890c0834abfe4be8637 100644
+index aed59277e27a5a90f4244dd4513f9b4feb5858c3..26750fa09bead1ffabb22482468dea5999899f18 100644
--- a/dom/base/nsJSUtils.cpp
+++ b/dom/base/nsJSUtils.cpp
-@@ -149,6 +149,11 @@ bool nsJSUtils::GetEnvironmentChainForElement(JSContext* aCx, Element* aElement,
+@@ -151,6 +151,11 @@ bool nsJSUtils::GetEnvironmentChainForElement(JSContext* aCx, Element* aElement,
return true;
}
@@ -1382,10 +1382,10 @@ index 7923fcfb3e70aabddf343ab3ec2f25313bbd227e..cf02ce032d11d85a13bcf91e93e98882
* A unique identifier for the browser element that is hosting this
* BrowsingContext tree. Every BrowsingContext in the element's tree will
diff --git a/dom/fetch/Fetch.cpp b/dom/fetch/Fetch.cpp
-index 2a29279a6d74770a2ec5cee80891bff9eadf1d13..bce59065615a33cf020aae4b20750ce8b1be66ce 100644
+index 52cf33bfc863d5ef1d3ac889ddfba3023600d60a..ccb521f367b8ccc8c40d8bad78aa621ab1b074c0 100644
--- a/dom/fetch/Fetch.cpp
+++ b/dom/fetch/Fetch.cpp
-@@ -702,6 +702,12 @@ already_AddRefed<Promise> FetchRequest(nsIGlobalObject* aGlobal,
+@@ -704,6 +704,12 @@ already_AddRefed<Promise> FetchRequest(nsIGlobalObject* aGlobal,
ipcArgs.hasCSPEventListener() = false;
ipcArgs.isWorkerRequest() = false;
@@ -1399,11 +1399,11 @@ index 2a29279a6d74770a2ec5cee80891bff9eadf1d13..bce59065615a33cf020aae4b20750ce8
mozilla::glean::networking::fetch_keepalive_request_count.Get("main"_ns)
diff --git a/dom/fetch/FetchService.cpp b/dom/fetch/FetchService.cpp
-index fcdddf2f772af305c68cc169ba891386a1dba982..d8b19d35719fff3f9c55c199718f4dc1d15cdfe9 100644
+index 1734429e8eeb155b742211ca58afcbeb73a8bf7c..15635a2e5c266f8085093a0d17288abe8ed54d9e 100644
--- a/dom/fetch/FetchService.cpp
+++ b/dom/fetch/FetchService.cpp
@@ -268,6 +268,14 @@ RefPtr<FetchServicePromises> FetchService::FetchInstance::Fetch() {
- false // IsTrackingFetch
+ net::ClassificationFlags({0, 0}) // TrackingFlags
);
+ /* --> Playwright: associate keep-alive fetch with the window */
@@ -1418,10 +1418,10 @@ index fcdddf2f772af305c68cc169ba891386a1dba982..d8b19d35719fff3f9c55c199718f4dc1
auto& args = mArgs.as<WorkerFetchArgs>();
mFetchDriver->SetWorkerScript(args.mWorkerScript);
diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp
-index 9382c73dc527f3fb676e8ea3457a30eee2d9415f..f1785121db1de071ce5aa1a0ad38d3d603c486f7 100644
+index 4d54d0925fce6d2f4f1657e6b37c670c916759a9..d70b048d70435cbdf2f0dab96ced33f685ffcb1d 100644
--- a/dom/html/HTMLInputElement.cpp
+++ b/dom/html/HTMLInputElement.cpp
-@@ -63,6 +63,7 @@
+@@ -64,6 +64,7 @@
#include "mozilla/dom/Document.h"
#include "mozilla/dom/HTMLDataListElement.h"
#include "mozilla/dom/HTMLOptionElement.h"
@@ -1429,7 +1429,7 @@ index 9382c73dc527f3fb676e8ea3457a30eee2d9415f..f1785121db1de071ce5aa1a0ad38d3d6
#include "nsIFrame.h"
#include "nsRangeFrame.h"
#include "nsError.h"
-@@ -816,6 +817,13 @@ nsresult HTMLInputElement::InitFilePicker(FilePickerType aType) {
+@@ -817,6 +818,13 @@ nsresult HTMLInputElement::InitFilePicker(FilePickerType aType) {
return NS_ERROR_FAILURE;
}
@@ -1444,10 +1444,10 @@ index 9382c73dc527f3fb676e8ea3457a30eee2d9415f..f1785121db1de071ce5aa1a0ad38d3d6
return NS_OK;
}
diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl
-index 4cdfcaafa779ed402d02411f69c02ab0eb5b4e09..e69c837f7ec340a11e8ae9485cd5b714a3ea9a88 100644
+index a1d930645ed1698e809ebce00d1601a1cdd99114..3a4a3ac8001bae356f42d2e08c2e5ddc8943c90b 100644
--- a/dom/interfaces/base/nsIDOMWindowUtils.idl
+++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
-@@ -374,6 +374,26 @@ interface nsIDOMWindowUtils : nsISupports {
+@@ -381,6 +381,26 @@ interface nsIDOMWindowUtils : nsISupports {
[optional] in long aButtons,
[optional] in unsigned long aIdentifier);
@@ -1475,10 +1475,10 @@ index 4cdfcaafa779ed402d02411f69c02ab0eb5b4e09..e69c837f7ec340a11e8ae9485cd5b714
* touchstart, touchend, touchmove, and touchcancel
*
diff --git a/dom/ipc/BrowserChild.cpp b/dom/ipc/BrowserChild.cpp
-index 310e22a130612c055f7642d813b2bc06538c8797..8528cd75252c6cf0bebe42ffbf83c0220551ba28 100644
+index 8895fa24ac3468bcd8d8c9e3c9b1cd2ec2e93c24..4cd6bdcee5e3c9dee934b352e826f88eb2301914 100644
--- a/dom/ipc/BrowserChild.cpp
+++ b/dom/ipc/BrowserChild.cpp
-@@ -1760,6 +1760,21 @@ void BrowserChild::HandleRealMouseButtonEvent(const WidgetMouseEvent& aEvent,
+@@ -1739,6 +1739,21 @@ void BrowserChild::HandleRealMouseButtonEvent(const WidgetMouseEvent& aEvent,
if (postLayerization) {
postLayerization->Register();
}
@@ -1748,7 +1748,7 @@ index d5964b27e9c99af76fe3f4076322592a9370c2d0..da217e2c1fbd9ca02e50ff74dde02818
return aGlobalOrNull;
diff --git a/dom/security/nsCSPUtils.cpp b/dom/security/nsCSPUtils.cpp
-index 40844c900fc64415e39f4d2dead4c490d5ec301b..f63d0fd6a6df7ea932ca4d4bb70dfbd7562b2fa0 100644
+index 1b88690eb703c548e8d17416a6ff4ca64266406d..5d52a4a9afc97fa133ebab0c4dd9fdccfa4c21e8 100644
--- a/dom/security/nsCSPUtils.cpp
+++ b/dom/security/nsCSPUtils.cpp
@@ -24,6 +24,7 @@
@@ -2174,10 +2174,10 @@ index 4bfd336ddcbee8004ac538ca7b7d8216d04a61c3..cd22351c4aeacea8afc9828972222aca
// No boxes to return
return;
diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
-index 1922382f924e74dde81501540d38699dcf3d9e57..c05b9ed071a9a4c99e2afb28eef0dba376777976 100644
+index ced65c024dd6e09ee3ad997b6cc616828e0a4d31..4d4b0f06059001400679a00b8ace6b0d11a86c94 100644
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
-@@ -11881,7 +11881,9 @@ bool PresShell::ComputeActiveness() const {
+@@ -12043,7 +12043,9 @@ bool PresShell::ComputeActiveness() const {
if (!browserChild->IsVisible()) {
MOZ_LOG(gLog, LogLevel::Debug,
(" > BrowserChild %p is not visible", browserChild));
@@ -2189,7 +2189,7 @@ index 1922382f924e74dde81501540d38699dcf3d9e57..c05b9ed071a9a4c99e2afb28eef0dba3
// If the browser is visible but just due to be preserving layers
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
-index bc5b7ab177070178d1a3c49b563df0f04860e7d3..393f694c766bec5e5443d91922a8bc3524ade676 100644
+index ba5183bf1021f9a1113a7de013d60ab8d25fede1..3eb118e808d221395bf01d6d9c0702a005ac4308 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -708,6 +708,10 @@ bool nsLayoutUtils::AllowZoomingForDocument(
@@ -2203,7 +2203,7 @@ index bc5b7ab177070178d1a3c49b563df0f04860e7d3..393f694c766bec5e5443d91922a8bc35
// True if we allow zooming for all documents on this platform, or if we are
// in RDM.
BrowsingContext* bc = aDocument->GetBrowsingContext();
-@@ -9773,6 +9777,9 @@ void nsLayoutUtils::ComputeSystemFont(nsFont* aSystemFont,
+@@ -9785,6 +9789,9 @@ void nsLayoutUtils::ComputeSystemFont(nsFont* aSystemFont,
/* static */
bool nsLayoutUtils::ShouldHandleMetaViewport(const Document* aDocument) {
@@ -2214,10 +2214,10 @@ index bc5b7ab177070178d1a3c49b563df0f04860e7d3..393f694c766bec5e5443d91922a8bc35
return StaticPrefs::dom_meta_viewport_enabled() || (bc && bc->InRDMPane());
}
diff --git a/layout/style/GeckoBindings.h b/layout/style/GeckoBindings.h
-index 4cdceba041ddc5af98982d27b6e622a0dd5d0e34..50f644a91923e529ff06a164256f5704e5c4d8ae 100644
+index a0560c5719310a7d6dbac232bacc1c50e8235c20..1046c095e8672aafcb3b0f053483e81393bca409 100644
--- a/layout/style/GeckoBindings.h
+++ b/layout/style/GeckoBindings.h
-@@ -594,6 +594,7 @@ float Gecko_MediaFeatures_GetResolution(const mozilla::dom::Document*);
+@@ -597,6 +597,7 @@ float Gecko_MediaFeatures_GetResolution(const mozilla::dom::Document*);
bool Gecko_MediaFeatures_PrefersReducedMotion(const mozilla::dom::Document*);
bool Gecko_MediaFeatures_PrefersReducedTransparency(
const mozilla::dom::Document*);
@@ -2264,10 +2264,10 @@ index d843c5952e273c64703af6e9f2528798e3ada307..50dcfd6839777dd0ed9f806dfac3e1a4
return StylePrefersContrast::NoPreference;
}
diff --git a/netwerk/base/LoadInfo.cpp b/netwerk/base/LoadInfo.cpp
-index c9d6cace8de545779ae9c4630973c5a920cd52c6..032a42b732179a951181f390199c2520fecd742b 100644
+index 5de4a03bc0ad25b68de169268b68ae2583cd8085..c5ba93ac46cbe6c566c005e059a685f257719244 100644
--- a/netwerk/base/LoadInfo.cpp
+++ b/netwerk/base/LoadInfo.cpp
-@@ -792,7 +792,8 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
+@@ -798,7 +798,8 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
rhs.mHasInjectedCookieForCookieBannerHandling),
mSchemelessInput(rhs.mSchemelessInput),
mHttpsUpgradeTelemetry(rhs.mHttpsUpgradeTelemetry),
@@ -2277,7 +2277,7 @@ index c9d6cace8de545779ae9c4630973c5a920cd52c6..032a42b732179a951181f390199c2520
}
LoadInfo::LoadInfo(
-@@ -2705,4 +2706,16 @@ void LoadInfo::UpdateParentAddressSpaceInfo() {
+@@ -2758,4 +2759,16 @@ void LoadInfo::UpdateParentAddressSpaceInfo() {
}
}
@@ -2295,10 +2295,10 @@ index c9d6cace8de545779ae9c4630973c5a920cd52c6..032a42b732179a951181f390199c2520
+
} // namespace mozilla::net
diff --git a/netwerk/base/LoadInfo.h b/netwerk/base/LoadInfo.h
-index 7946dacf862aa13da58c65aba3c72deef575dbba..eb307b58b5fda79fa44e5df94f1bcb4dfaa0a8b6 100644
+index 4abce849f65b77800817e16cd2156247bd37f4cf..ac2aff894c4b31409437593d4d50bcae17a5ba0e 100644
--- a/netwerk/base/LoadInfo.h
+++ b/netwerk/base/LoadInfo.h
-@@ -448,6 +448,8 @@ class LoadInfo final : public nsILoadInfo {
+@@ -455,6 +455,8 @@ class LoadInfo final : public nsILoadInfo {
bool mIsNewWindowTarget = false;
bool mSkipHTTPSUpgrade = false;
@@ -2308,10 +2308,10 @@ index 7946dacf862aa13da58c65aba3c72deef575dbba..eb307b58b5fda79fa44e5df94f1bcb4d
// This is exposed solely for testing purposes and should not be used outside of
// LoadInfo
diff --git a/netwerk/base/TRRLoadInfo.cpp b/netwerk/base/TRRLoadInfo.cpp
-index dd8cc849fb3dd56d6e979cc3cbff96727f702d90..dd2d543977cd9543494c52e862552831d955fdb2 100644
+index 9d3f613eecce65428fe8c29cca579e6f41fe8bcf..540e2608c37e58c6e1d124023ce185ddd71bd23d 100644
--- a/netwerk/base/TRRLoadInfo.cpp
+++ b/netwerk/base/TRRLoadInfo.cpp
-@@ -973,5 +973,15 @@ TRRLoadInfo::GetFetchDestination(nsACString& aDestination) {
+@@ -1009,5 +1009,15 @@ TRRLoadInfo::GetFetchDestination(nsACString& aDestination) {
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -2328,10 +2328,10 @@ index dd8cc849fb3dd56d6e979cc3cbff96727f702d90..dd2d543977cd9543494c52e862552831
} // namespace net
} // namespace mozilla
diff --git a/netwerk/base/nsILoadInfo.idl b/netwerk/base/nsILoadInfo.idl
-index 1cfda408c33c16c75a74ea839ae3bde6142ac92b..b3951bc2df4d448e6c3b7e51bef2c0050e97a35d 100644
+index cd73003e5eb54c638225dc75f9e90f01ccb34192..197c0715593865a3a8b95bfc470f6364122c8f21 100644
--- a/netwerk/base/nsILoadInfo.idl
+++ b/netwerk/base/nsILoadInfo.idl
-@@ -1650,4 +1650,6 @@ interface nsILoadInfo : nsISupports
+@@ -1683,4 +1683,6 @@ interface nsILoadInfo : nsISupports
return static_cast<mozilla::dom::UserNavigationInvolvement>(userNavigationInvolvement);
}
%}
@@ -2360,10 +2360,10 @@ index 7f91d2df6f8bb4020c75c132dc8f6bf26625fa1e..aaa5541a17039d6b13ad83ab176fdaaf
* Set the status and reason for the forthcoming synthesized response.
* Multiple calls overwrite existing values.
diff --git a/netwerk/ipc/DocumentLoadListener.cpp b/netwerk/ipc/DocumentLoadListener.cpp
-index c486793f79e2c8c248e25f7963ba4e2c08f553d2..f1e625c59ec79c1104fe9594dbf86d39f3293438 100644
+index 15b89ad43640cd7749c1b424762eb805210b4bd1..0044bba11ad2939e66a0e12ecbed598cdce1776c 100644
--- a/netwerk/ipc/DocumentLoadListener.cpp
+++ b/netwerk/ipc/DocumentLoadListener.cpp
-@@ -178,6 +178,7 @@ static auto CreateDocumentLoadInfo(CanonicalBrowsingContext* aBrowsingContext,
+@@ -185,6 +185,7 @@ static auto CreateDocumentLoadInfo(CanonicalBrowsingContext* aBrowsingContext,
loadInfo->SetTextDirectiveUserActivation(
aLoadState->GetTextDirectiveUserActivation());
loadInfo->SetIsMetaRefresh(aLoadState->IsMetaRefresh());
@@ -2372,7 +2372,7 @@ index c486793f79e2c8c248e25f7963ba4e2c08f553d2..f1e625c59ec79c1104fe9594dbf86d39
return loadInfo.forget();
}
diff --git a/netwerk/protocol/http/InterceptedHttpChannel.cpp b/netwerk/protocol/http/InterceptedHttpChannel.cpp
-index fbf4bdf1e24d1102df113984be6c8dc3a7d0d810..787bf014d3bf0b8537f99bf5eb4074e100c78c18 100644
+index fbf4bdf1e24d1102df113984be6c8dc3a7d0d810..cf1978009d74221ae804b998e223904fa943a91f 100644
--- a/netwerk/protocol/http/InterceptedHttpChannel.cpp
+++ b/netwerk/protocol/http/InterceptedHttpChannel.cpp
@@ -728,10 +728,33 @@ NS_IMPL_ISUPPORTS(ResetInterceptionHeaderVisitor, nsIHttpHeaderVisitor)
@@ -2445,7 +2445,7 @@ index 704404c9f094640ad63b685d64bd5a396e733e4b..92bdc21b4d6a015cc2f2bb22781ec675
* InterceptionTimeStamps is used to record the time stamps of the
* interception.
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
-index af4c6482ad41ad67f41b93183c94d6f341fb4989..0a18827e53760b4132381fd0aff286ee69c460e7 100644
+index e266de8ccadf11f7e17b282299da0a0e8a88aa83..1abacf109d60f273c2ffdfcb6397a4a0cb82182a 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -688,11 +688,9 @@ nsresult nsHttpChannel::OnBeforeConnect() {
@@ -2513,7 +2513,7 @@ index af4c6482ad41ad67f41b93183c94d6f341fb4989..0a18827e53760b4132381fd0aff286ee
return;
}
-@@ -4198,9 +4190,6 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
+@@ -4221,9 +4213,6 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
uint32_t cacheEntryOpenFlags;
bool offline = gIOService->IsOffline();
@@ -2523,7 +2523,7 @@ index af4c6482ad41ad67f41b93183c94d6f341fb4989..0a18827e53760b4132381fd0aff286ee
bool maybeRCWN = false;
nsAutoCString cacheControlRequestHeader;
-@@ -4211,7 +4200,7 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
+@@ -4234,7 +4223,7 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
return NS_OK;
}
@@ -2532,7 +2532,7 @@ index af4c6482ad41ad67f41b93183c94d6f341fb4989..0a18827e53760b4132381fd0aff286ee
if (offline || (mLoadFlags & INHIBIT_CACHING) || forceOffline) {
if (BYPASS_LOCAL_CACHE(mLoadFlags, LoadPreferCacheLoadOverBypass()) &&
!offline && !forceOffline) {
-@@ -7315,6 +7304,20 @@ void nsHttpChannel::MaybeStartDNSPrefetch() {
+@@ -7338,6 +7327,20 @@ void nsHttpChannel::MaybeStartDNSPrefetch() {
}
}
@@ -2669,10 +2669,10 @@ index 3d8837cdb38fb5b25abfb9e3e369ad6fe688706e..867ce2efaa10eaea87ffeeb2669cc5a7
constructor() {
this._policies = null;
diff --git a/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp b/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
-index 7dc1cee243017e1647521b021424781532552d8c..47908d73a7a39a7f95ae8ea28362b4f29505508f 100644
+index ee7d7be5f76cb530407675a26bbf7bda5045cf44..f52ac58bfc1a68be92d354db7c523209cd5d47c7 100644
--- a/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
+++ b/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
-@@ -587,7 +587,7 @@ void PopulateLanguages() {
+@@ -588,7 +588,7 @@ void PopulateLanguages() {
// sufficient to only collect this information as the other properties are
// just reformats of Navigator::GetAcceptLanguages.
nsTArray<nsString> languages;
@@ -2695,10 +2695,10 @@ index 316a86d5fcadba99918254ba132f363fb462cc3f..9dcd1b208ffd2d42db6c8ff52476a227
if (windowEnumerator) {
bool more;
diff --git a/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp b/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp
-index 89f7233835b4d03e7a140ca2c75ed8db097d482d..ed7c92d30b3cd77c102467eb0f12c9f482a08fde 100644
+index c0d60b927542653ab9beee730ec2c07f4b3d911c..85c416315f567a5edf8cfc89262dd7a48250dfd6 100644
--- a/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp
+++ b/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp
-@@ -174,8 +174,8 @@ nsBrowserStatusFilter::OnStateChange(nsIWebProgress* aWebProgress,
+@@ -176,8 +176,8 @@ nsBrowserStatusFilter::OnStateChange(nsIWebProgress* aWebProgress,
}
NS_IMETHODIMP
@@ -2710,7 +2710,7 @@ index 89f7233835b4d03e7a140ca2c75ed8db097d482d..ed7c92d30b3cd77c102467eb0f12c9f4
int32_t aMaxSelfProgress,
int32_t aCurTotalProgress,
diff --git a/toolkit/components/windowwatcher/nsWindowWatcher.cpp b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
-index 811fb16410e8cf900ad873797269e5fe715579a5..821f5b0c2af8e1dc8754cd023571d1d0ff09eeb6 100644
+index 314efebc432db04b484650dfcb781dfd18fe3788..9f4db0f0f5d4fd5fecc744dd37fa6d9b6665e86f 100644
--- a/toolkit/components/windowwatcher/nsWindowWatcher.cpp
+++ b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
@@ -1880,7 +1880,11 @@ uint32_t nsWindowWatcher::CalculateChromeFlagsForContent(
@@ -2727,10 +2727,10 @@ index 811fb16410e8cf900ad873797269e5fe715579a5..821f5b0c2af8e1dc8754cd023571d1d0
/**
diff --git a/toolkit/mozapps/update/UpdateService.sys.mjs b/toolkit/mozapps/update/UpdateService.sys.mjs
-index 26d633f4f4fe9125df557ee7367809c8591d7211..6c558e8297114ac3f94ae3836c25e9edd51cc4d4 100644
+index 5d5a3f2c46138b578b583ad4a3506e1d227607ad..6d414635b80a74edb0b5ecfc6a98dd0fee763952 100644
--- a/toolkit/mozapps/update/UpdateService.sys.mjs
+++ b/toolkit/mozapps/update/UpdateService.sys.mjs
-@@ -3873,6 +3873,8 @@ export class UpdateService {
+@@ -3874,6 +3874,8 @@ export class UpdateService {
}
get disabledForTesting() {
@@ -2740,10 +2740,10 @@ index 26d633f4f4fe9125df557ee7367809c8591d7211..6c558e8297114ac3f94ae3836c25e9ed
}
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
-index 304c39a11bd88e0b8cf681a3c3bc5dc11ed929ec..71e57ce2164e5436fac68d696b632d120a85d6f2 100644
+index e8399d277ec0b64e5ea29aa7262b118936a02779..983ed73ad1d6d734af55a9066a8e8a6cf3ae3f45 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
-@@ -151,6 +151,7 @@ if CONFIG["ENABLE_WEBDRIVER"]:
+@@ -155,6 +155,7 @@ if CONFIG["ENABLE_WEBDRIVER"]:
"/remote",
"/testing/firefox-ui",
"/testing/marionette",
@@ -2787,7 +2787,7 @@ index 7eb9e1104682d4eb47060654f43a1efa8b2a6bb2..a8315d6decf654b5302bea5beeea3414
// Only run this code if LauncherProcessWin.h was included beforehand, thus
// signalling that the hosting process should support launcher mode.
diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp
-index 444116840b68443c31d8df66699d47a582ce4622..9ae13a8462301a8a3024bffb10d9a20f9accff1d 100644
+index 9ef5370d1524ddecb965785a73a3cfea39867324..e0245cca94e496bcffba40c9660a52b518803d44 100644
--- a/uriloader/base/nsDocLoader.cpp
+++ b/uriloader/base/nsDocLoader.cpp
@@ -861,6 +861,12 @@ void nsDocLoader::DocLoaderIsEmpty(bool aFlushLayout,
@@ -2804,7 +2804,7 @@ index 444116840b68443c31d8df66699d47a582ce4622..9ae13a8462301a8a3024bffb10d9a20f
// nsDocumentViewer::LoadComplete that doesn't do various things
// that are not relevant here because this wasn't an actual
diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp
-index 7cd8c24d871465bc96fe7249eb9a41c999057eb5..02b3ce1fbaa8056219a139a3bc3f107343f9bb89 100644
+index 5bd60b585b53cc77e75c0b68c763957f90b7e164..940b3b62b09ca70ae5e69c3e94eda11ad35b9dfe 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -112,6 +112,7 @@
@@ -2828,7 +2828,7 @@ index 7cd8c24d871465bc96fe7249eb9a41c999057eb5..02b3ce1fbaa8056219a139a3bc3f1073
nsresult nsExternalHelperAppService::GetFileTokenForPath(
const char16_t* aPlatformAppPath, nsIFile** aFile) {
nsDependentString platformAppPath(aPlatformAppPath);
-@@ -1486,7 +1493,12 @@ nsresult nsExternalAppHandler::SetUpTempFile(nsIChannel* aChannel) {
+@@ -1500,7 +1507,12 @@ nsresult nsExternalAppHandler::SetUpTempFile(nsIChannel* aChannel) {
// Strip off the ".part" from mTempLeafName
mTempLeafName.Truncate(mTempLeafName.Length() - std::size(".part") + 1);
@@ -2841,7 +2841,7 @@ index 7cd8c24d871465bc96fe7249eb9a41c999057eb5..02b3ce1fbaa8056219a139a3bc3f1073
mSaver =
do_CreateInstance(NS_BACKGROUNDFILESAVERSTREAMLISTENER_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
-@@ -1671,7 +1683,36 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
+@@ -1684,7 +1696,36 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
return NS_OK;
}
@@ -2879,7 +2879,7 @@ index 7cd8c24d871465bc96fe7249eb9a41c999057eb5..02b3ce1fbaa8056219a139a3bc3f1073
if (NS_FAILED(rv)) {
nsresult transferError = rv;
-@@ -1732,6 +1773,9 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
+@@ -1745,6 +1786,9 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
bool alwaysAsk = true;
mMimeInfo->GetAlwaysAskBeforeHandling(&alwaysAsk);
@@ -2889,7 +2889,7 @@ index 7cd8c24d871465bc96fe7249eb9a41c999057eb5..02b3ce1fbaa8056219a139a3bc3f1073
if (alwaysAsk) {
// But we *don't* ask if this mimeInfo didn't come from
// our user configuration datastore and the user has said
-@@ -2248,6 +2292,16 @@ nsExternalAppHandler::OnSaveComplete(nsIBackgroundFileSaver* aSaver,
+@@ -2261,6 +2305,16 @@ nsExternalAppHandler::OnSaveComplete(nsIBackgroundFileSaver* aSaver,
NotifyTransfer(aStatus);
}
@@ -2906,7 +2906,7 @@ index 7cd8c24d871465bc96fe7249eb9a41c999057eb5..02b3ce1fbaa8056219a139a3bc3f1073
return NS_OK;
}
-@@ -2731,6 +2785,15 @@ NS_IMETHODIMP nsExternalAppHandler::Cancel(nsresult aReason) {
+@@ -2744,6 +2798,15 @@ NS_IMETHODIMP nsExternalAppHandler::Cancel(nsresult aReason) {
}
}
@@ -2923,10 +2923,10 @@ index 7cd8c24d871465bc96fe7249eb9a41c999057eb5..02b3ce1fbaa8056219a139a3bc3f1073
// OnStartRequest)
mDialog = nullptr;
diff --git a/uriloader/exthandler/nsExternalHelperAppService.h b/uriloader/exthandler/nsExternalHelperAppService.h
-index 68f240c9f9280c498900561e6cdb3bc4c4d45a38..395f54e8c47d56b0892c75a513e5828de7e4fceb 100644
+index 26dfc6f04298420317c8b87b2ecc3f2f47f59598..c458ab5efb238c62499ee13452f2d750e0569e38 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.h
+++ b/uriloader/exthandler/nsExternalHelperAppService.h
-@@ -254,6 +254,8 @@ class nsExternalHelperAppService : public nsIExternalHelperAppService,
+@@ -263,6 +263,8 @@ class nsExternalHelperAppService : public nsIExternalHelperAppService,
mozilla::dom::BrowsingContext* aContentContext, bool aForceSave,
nsIInterfaceRequestor* aWindowContext,
nsIStreamListener** aStreamListener);
@@ -2935,7 +2935,7 @@ index 68f240c9f9280c498900561e6cdb3bc4c4d45a38..395f54e8c47d56b0892c75a513e5828d
};
/**
-@@ -451,6 +453,9 @@ class nsExternalAppHandler final : public nsIStreamListener,
+@@ -460,6 +462,9 @@ class nsExternalAppHandler final : public nsIStreamListener,
* Upon successful return, both mTempFile and mSaver will be valid.
*/
nsresult SetUpTempFile(nsIChannel* aChannel);
@@ -2946,7 +2946,7 @@ index 68f240c9f9280c498900561e6cdb3bc4c4d45a38..395f54e8c47d56b0892c75a513e5828d
* When we download a helper app, we are going to retarget all load
* notifications into our own docloader and load group instead of
diff --git a/uriloader/exthandler/nsIExternalHelperAppService.idl b/uriloader/exthandler/nsIExternalHelperAppService.idl
-index 53ea934dd4876e4b491b724385c8fbf7d00ee6cd..0b7b88c853b21ce778d8e87fea0a2bfe839ad412 100644
+index e6490ebb086eb4dca9db560c14e073a9e7722e29..2792373dcb30ebc787a9bdca306ac12e72aa19ec 100644
--- a/uriloader/exthandler/nsIExternalHelperAppService.idl
+++ b/uriloader/exthandler/nsIExternalHelperAppService.idl
@@ -6,8 +6,11 @@
@@ -3017,10 +3017,10 @@ index 7098db301770ecb5b9a506d7caec89d5cf63384b..aff8d7562f8a3e595a077ce8e5910087
}
#endif
diff --git a/widget/MouseEvents.h b/widget/MouseEvents.h
-index 8004d6fe2130246252e57198f2ea731f84d1968a..7a0774b8320741108dc209c3b7069f524b1360ca 100644
+index 9f685cf741d94a48d552ca11f10759ea4c69969d..594a5c6549e5c0837f91de5b6ef76d6a35e45a5d 100644
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
-@@ -375,6 +375,9 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
+@@ -379,6 +379,9 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
// Otherwise, this must be 0.
uint32_t mClickCount = 0;
@@ -3030,7 +3030,7 @@ index 8004d6fe2130246252e57198f2ea731f84d1968a..7a0774b8320741108dc209c3b7069f52
// Whether the event should ignore scroll frame bounds during dispatch.
bool mIgnoreRootScrollFrame = false;
-@@ -398,6 +401,7 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
+@@ -402,6 +405,7 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
mContextMenuTrigger = aEvent.mContextMenuTrigger;
mExitFrom = aEvent.mExitFrom;
mClickCount = aEvent.mClickCount;
@@ -3102,7 +3102,7 @@ index 24b70173c2e8bb9be9fd6255984a70efe3b14099..75ac367a1c4bb44d4b68b5f4ecc6adf5
}
if (aEvent.IsMeta()) {
diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
-index 02b7b185caf4a2352522c0ed4185d89b514c1738..912a270b6d87e1154d844bde2ffe6a3c2b8f3061 100644
+index f09b0e4994304413cbd75f14e6650cf3f9df9025..41c184e74df2b9c59315a236506946bcb5d69216 100644
--- a/widget/gtk/nsFilePicker.cpp
+++ b/widget/gtk/nsFilePicker.cpp
@@ -21,6 +21,7 @@
@@ -3260,7 +3260,7 @@ index facd2bc65afab8ec1aa322faa20a67464964dfb9..3c5751ad1b7f042bc7cd9a63895cebcd
} // namespace widget
diff --git a/widget/headless/HeadlessWidget.cpp b/widget/headless/HeadlessWidget.cpp
-index daa2d455374fd9f75a5c6ac9f7b91696d88b065c..f45184137b52db0a5774bf3365b15f784532fbdf 100644
+index 290de12f9d0ff858474564fa8ce54814a04f6088..c144a891b84c3c57f394d6d551e6c89dcd6d9829 100644
--- a/widget/headless/HeadlessWidget.cpp
+++ b/widget/headless/HeadlessWidget.cpp
@@ -111,6 +111,8 @@ void HeadlessWidget::Destroy() {
@@ -3288,12 +3288,12 @@ index daa2d455374fd9f75a5c6ac9f7b91696d88b065c..f45184137b52db0a5774bf3365b15f78
} // namespace widget
} // namespace mozilla
diff --git a/widget/headless/HeadlessWidget.h b/widget/headless/HeadlessWidget.h
-index 39833c28e40c61e354119cde429b8389056bafac..a638fb7520b857219ce58fcbf9ca0ed939528924 100644
+index 60598d097d9dae829ebdc15dede78bd915e3107d..3b5ac5e5590dcb36440e28569f71592db3c1218c 100644
--- a/widget/headless/HeadlessWidget.h
+++ b/widget/headless/HeadlessWidget.h
-@@ -132,6 +132,9 @@ class HeadlessWidget final : public nsBaseWidget {
- int32_t aModifierFlags,
- nsIObserver* aObserver) override;
+@@ -131,6 +131,9 @@ class HeadlessWidget final : public nsBaseWidget {
+ double aDeltaX, double aDeltaY, int32_t aModifierFlags,
+ nsISynthesizedEventCallback* aCallback) override;
+ using SnapshotListener = std::function<void(RefPtr<gfx::DataSourceSurface>&&)>;
+ void SetSnapshotListener(SnapshotListener&& listener);
@@ -3302,10 +3302,10 @@ index 39833c28e40c61e354119cde429b8389056bafac..a638fb7520b857219ce58fcbf9ca0ed9
~HeadlessWidget();
bool mEnabled;
diff --git a/widget/nsGUIEventIPC.h b/widget/nsGUIEventIPC.h
-index f7262978239665cbe20470da0790d4d177d4c501..70d11aca3d5b509cf5b37d626299a23fede73ba3 100644
+index 2f4c33f151870bb9233899b186a5eccfaa6f5da6..6acf66e4938e3f9727916824a08d6294f8993452 100644
--- a/widget/nsGUIEventIPC.h
+++ b/widget/nsGUIEventIPC.h
-@@ -244,6 +244,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent> {
+@@ -251,6 +251,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent> {
aParam.mExitFrom.value()));
}
WriteParam(aWriter, aParam.mClickCount);
@@ -3313,7 +3313,7 @@ index f7262978239665cbe20470da0790d4d177d4c501..70d11aca3d5b509cf5b37d626299a23f
}
static bool Read(MessageReader* aReader, paramType* aResult) {
-@@ -268,6 +269,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent> {
+@@ -275,6 +276,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent> {
aResult->mExitFrom = Some(static_cast<paramType::ExitFrom>(exitFrom));
}
rv = rv && ReadParam(aReader, &aResult->mClickCount);
diff --git a/browser_patches/firefox/preferences/playwright.cfg b/browser_patches/firefox/preferences/playwright.cfg
index 5dc8986c19..85deeb3816 100644
--- a/browser_patches/firefox/preferences/playwright.cfg
+++ b/browser_patches/firefox/preferences/playwright.cfg
@@ -36,6 +36,7 @@ pref("fission.bfcacheInParent", false);
// When it is enabled, we have to retain "thirdPartyCookie^" permissions
// in the storageState.
pref("network.cookie.cookieBehavior", 4);
+pref("network.cookie.CHIPS.enabled", false);
// Increase max number of child web processes so that new pages
// get a new process by default and we have a process isolation
diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh
index d6e587bc4a..ecc80310e2 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="db897909f7c31d9b38793374c66427b6a4cb3dd3"
+BASE_REVISION="cf7cbd32027884e36fa99df79bcd322925f65e48"
diff --git a/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m b/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m
index 0d100edad0..19582bb021 100644
--- a/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m
+++ b/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m
@@ -327,15 +327,19 @@ const NSActivityOptions ActivityOptions =
- (WKWebView *)createHeadlessPage:(WKWebViewConfiguration *)configuration withURL:(NSString*)urlString
{
NSRect rect = NSMakeRect(0, 0, 1280, 720);
- NSScreen *firstScreen = [[NSScreen screens] objectAtIndex:0];
- NSRect windowRect = NSOffsetRect(rect, -10000, [firstScreen frame].size.height - rect.size.height + 10000);
+
+ // https://github.com/microsoft/playwright/issues/36711
+ // https://codereview.chromium.org/1380083005
+ NSScreen *firstScreen = [[NSScreen screens] firstObject];
+
+ NSRect windowRect = firstScreen ? NSOffsetRect(rect, -10000, [firstScreen frame].size.height - rect.size.height + 10000) : rect;
NSWindow* window = [[NSWindow alloc] initWithContentRect:windowRect styleMask:NSWindowStyleMaskBorderless backing:(NSBackingStoreType)_NSBackingStoreUnbuffered defer:YES];
WKWebView* webView = [[WKWebView alloc] initWithFrame:[window.contentView bounds] configuration:configuration];
- webView._windowOcclusionDetectionEnabled = NO;
if (!webView)
return nil;
+ webView._windowOcclusionDetectionEnabled = NO;
webView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
[window.contentView addSubview:webView];
[window setIsVisible:YES];
diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff
index f713c6fa09..19902f90d2 100644
--- a/browser_patches/webkit/patches/bootstrap.diff
+++ b/browser_patches/webkit/patches/bootstrap.diff
@@ -1,8 +1,8 @@
diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
-index 1b7690be3268f54cc649a97206fc38fb27453e08..d14a541e585d2b43d6738c9bb5eb26642522b46b 100644
+index 7338af549e9fb377ea1505849b3a2bd3968d8fd7..873872e23a9c3002830600ba3318bb2249b43a00 100644
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
-@@ -1418,21 +1418,26 @@ set(JavaScriptCore_INSPECTOR_DOMAINS
+@@ -1530,21 +1530,26 @@ set(JavaScriptCore_INSPECTOR_DOMAINS
${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json
@@ -60,10 +60,10 @@ index 53809cbc20c8fb942304a25899a2e5ecccc79ee3..63d93e08bcf8089e4e315e48d5d20937
$(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 cb42b0e750a8b6a64ebc58f1bfe65c50e7b4c99c..ed548bf0ac70da0273a20178a2786e232907ce68 100644
+index f0058c1cea010b2ea0f128fb4670f0fcde93924b..717df1beaa22a0e7c8df0a50f3c0585ada0385d7 100644
--- a/Source/JavaScriptCore/DerivedSources.make
+++ b/Source/JavaScriptCore/DerivedSources.make
-@@ -303,21 +303,26 @@ INSPECTOR_DOMAINS := \
+@@ -299,21 +299,26 @@ INSPECTOR_DOMAINS := \
$(JavaScriptCore)/inspector/protocol/CSS.json \
$(JavaScriptCore)/inspector/protocol/Canvas.json \
$(JavaScriptCore)/inspector/protocol/Console.json \
@@ -169,7 +169,7 @@ index 6f8cae4d995d3ae020cd09aa0ba0c9ccc1e78409..fc3d0d1e0803ea38a70fee82ea946247
// We could be called re-entrantly from a nested run loop, so restore the previous id.
SetForScope scopedRequestId(m_currentRequestId, requestId);
diff --git a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
-index c988668bd732434ec4eaa485c7bbc0a93e2e64cf..75da5ed8a0575d8fe444f3f251c1af99fed78c97 100644
+index 0f7a5ff3cd0ad31ed9d816fb281a368e1c4ddcd2..8ce48015677d4fb6691a0ce0ac797f5bb370b622 100644
--- a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
+++ b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
@@ -95,8 +95,11 @@ public:
@@ -220,10 +220,10 @@ index 0cc2127c9c12c2d82dea9550bad73f4ffb99ba24..8ca65cc042d435cbc0e05dcc5c5dfc95
}
diff --git a/Source/JavaScriptCore/inspector/InspectorTarget.h b/Source/JavaScriptCore/inspector/InspectorTarget.h
-index b555c2e5a071d0a6a016061cc60755449557556d..d019346f0932296d15212c76a4a9b56beb565ff4 100644
+index 7c50a9f4c66c1695bd0e300e800c4e882eefdbd2..f530a8210c8ebe551cb2437f47e1a0bc8561e135 100644
--- a/Source/JavaScriptCore/inspector/InspectorTarget.h
+++ b/Source/JavaScriptCore/inspector/InspectorTarget.h
-@@ -66,8 +66,12 @@ public:
+@@ -67,8 +67,12 @@ public:
virtual void connect(FrontendChannel::ConnectionType) = 0;
virtual void disconnect() = 0;
virtual void sendMessageToTargetBackend(const String&) = 0;
@@ -268,7 +268,7 @@ index 6bbd0729a65b4a901e7da4dc50cc47c669bd9897..452b25d0e8eba3df1d5f6623dc222048
void warnUnimplemented(const String& method);
void internalAddMessage(MessageType, MessageLevel, JSC::JSGlobalObject*, Ref<ScriptArguments>&&);
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp
-index 0cb6efeef2430faa5dbd812f71d4abfd5f6eb9df..787ec6a5f8413c0a9dc133cb0e51ccdab58d40d0 100644
+index a478fa0ed95015757707de9ceb163b7e05f52656..f83b62acf22c75b65f5c12346d0756ee3bfa06a1 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp
+++ b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp
@@ -194,9 +194,8 @@ void InspectorRuntimeAgent::callFunctionOn(const Protocol::Runtime::RemoteObject
@@ -295,7 +295,7 @@ index 0cb6efeef2430faa5dbd812f71d4abfd5f6eb9df..787ec6a5f8413c0a9dc133cb0e51ccda
{
Protocol::ErrorString errorString;
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
-index 816633a6dfc75a1248f6edb44807e5d4f602568c..687fb7dadfad9357e15a27e0869fa145c46fb39a 100644
+index 8240c23298f680abb6c379d02841c566fb287f1c..c9567e12c54c5775af6d52e59663e18b3a2682e4 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
@@ -64,6 +64,7 @@ public:
@@ -307,7 +307,7 @@ index 816633a6dfc75a1248f6edb44807e5d4f602568c..687fb7dadfad9357e15a27e0869fa145
Protocol::ErrorStringOr<Ref<Protocol::Runtime::ObjectPreview>> getPreview(const Protocol::Runtime::RemoteObjectId&) final;
Protocol::ErrorStringOr<std::tuple<Ref<JSON::ArrayOf<Protocol::Runtime::PropertyDescriptor>>, RefPtr<JSON::ArrayOf<Protocol::Runtime::InternalPropertyDescriptor>>>> getProperties(const Protocol::Runtime::RemoteObjectId&, std::optional<bool>&& ownProperties, std::optional<int>&& fetchStart, std::optional<int>&& fetchCount, std::optional<bool>&& generatePreview) final;
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.cpp b/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.cpp
-index db75bf0f9edf28d3e23ab40740dfb86a6fd3b104..045caf300e3f9085e5d0ae7feb424f4bf3cf964f 100644
+index 827cbaabc98f5571ee007e99fcb7fd987a443f17..c98d8ba1f5ab72ae5f23555ea7518a85c1b77bea 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.cpp
+++ b/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.cpp
@@ -90,6 +90,34 @@ Protocol::ErrorStringOr<void> InspectorTargetAgent::sendMessageToTarget(const St
@@ -365,7 +365,7 @@ index db75bf0f9edf28d3e23ab40740dfb86a6fd3b104..045caf300e3f9085e5d0ae7feb424f4b
void InspectorTargetAgent::didCommitProvisionalTarget(const String& oldTargetID, const String& committedTargetID)
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h
-index d1ebed23d1fbacd95e1543606b2591438826b0d2..8536f8325de2afa21e814c2d2ce4bef8189bda70 100644
+index 6d221e260d0f3bc6ba3914b8bb14b35befd332b5..a74deeaf80ce411fe9e8600532162f74251b1e22 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h
@@ -53,8 +53,11 @@ public:
@@ -1197,10 +1197,10 @@ index 3d032713a7f3bb9645bfc7d42455a0494b5376c0..913dda5e90b86cc5f8e4ca6881f6db57
}
diff --git a/Source/JavaScriptCore/inspector/protocol/Playwright.json b/Source/JavaScriptCore/inspector/protocol/Playwright.json
new file mode 100644
-index 0000000000000000000000000000000000000000..440dd95173e066a886de120fb3dab7597d85feb6
+index 0000000000000000000000000000000000000000..8dc7f2bd04172dd6cabb1d869a295569b4c38ed8
--- /dev/null
+++ b/Source/JavaScriptCore/inspector/protocol/Playwright.json
-@@ -0,0 +1,315 @@
+@@ -0,0 +1,316 @@
+{
+ "domain": "Playwright",
+ "availability": ["web"],
@@ -1306,7 +1306,8 @@ index 0000000000000000000000000000000000000000..440dd95173e066a886de120fb3dab759
+ "description": "Creates new ephemeral browser context.",
+ "parameters": [
+ { "name": "proxyServer", "type": "string", "optional": true, "description": "Proxy server, similar to the one passed to --proxy-server" },
-+ { "name": "proxyBypassList", "type": "string", "optional": true, "description": "Proxy bypass list, similar to the one passed to --proxy-bypass-list" }
++ { "name": "proxyBypassList", "type": "string", "optional": true, "description": "Proxy bypass list, similar to the one passed to --proxy-bypass-list" },
++ { "name": "enableStoragePartitioning", "type": "boolean", "optional": true, "description": "Wether to use storage partitioning. Be default Playwright disables the partitioning." }
+ ],
+ "returns": [
+ { "name": "browserContextId", "$ref": "ContextID", "description": "Unique identifier of the context." }
@@ -1667,7 +1668,7 @@ index 52920cded24a9c6b0ef6fb4e518664955db4f9fa..bbbabc4e7259088b9404e8cc07eecd6f
},
{
diff --git a/Source/JavaScriptCore/runtime/ConsoleClient.h b/Source/JavaScriptCore/runtime/ConsoleClient.h
-index 24891ad836086fd23024fcb4d08ca63f6974c812..29f4b6b1923383fec7a99d28a4e815dc4536d160 100644
+index ce394be47840853ba08066ebbd1d909fad1f602e..bfd82684410312890c1e112aced16be797437893 100644
--- a/Source/JavaScriptCore/runtime/ConsoleClient.h
+++ b/Source/JavaScriptCore/runtime/ConsoleClient.h
@@ -78,6 +78,7 @@ public:
@@ -1679,10 +1680,10 @@ index 24891ad836086fd23024fcb4d08ca63f6974c812..29f4b6b1923383fec7a99d28a4e815dc
private:
enum ArgumentRequirement { ArgumentRequired, ArgumentNotRequired };
diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt
-index a04e69b350a29f6b569a04d094a15872f0745870..6f2aa0dcb9fe06cdbc8184b80b13bf735729ad1f 100644
+index cb79da46457d2aeddd6c663eeef4d791ed70b0c3..54ca17420dc79c6b763b9da04282098902be0c2d 100644
--- a/Source/ThirdParty/libwebrtc/CMakeLists.txt
+++ b/Source/ThirdParty/libwebrtc/CMakeLists.txt
-@@ -1807,6 +1807,14 @@ list(APPEND webrtc_SOURCES
+@@ -1803,6 +1803,14 @@ list(APPEND webrtc_SOURCES
Source/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/modulewrapper.cc
)
@@ -1697,7 +1698,7 @@ index a04e69b350a29f6b569a04d094a15872f0745870..6f2aa0dcb9fe06cdbc8184b80b13bf73
if (WTF_CPU_X86_64 OR WTF_CPU_X86)
list(APPEND webrtc_SOURCES
Source/webrtc/common_audio/fir_filter_sse.cc
-@@ -2399,6 +2407,14 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE
+@@ -2395,6 +2403,14 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE
Source/webrtc/modules/video_coding/include
)
@@ -1747,7 +1748,7 @@ index 30585bd097ec1e57d0c5f87180bf59a71f0192df..95b7a60b3cc66704c51fd6a6ce4e3258
+_vpx_codec_version_str
+_vpx_codec_vp8_cx
diff --git a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
-index df544586f202dfdcb53b0c16ecf7a51b60ca3767..81f39ca4766d0368109ae90b94beb3cbe458a06f 100644
+index 30e52a5829c1c56ebb42cbabc97a5e78d29629e2..f45f24ddf74669d492ae882778bc16698123474a 100644
--- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
+++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
@@ -56,6 +56,20 @@
@@ -1771,7 +1772,7 @@ index df544586f202dfdcb53b0c16ecf7a51b60ca3767..81f39ca4766d0368109ae90b94beb3cb
/* 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, ); }; };
-@@ -5852,6 +5866,13 @@
+@@ -5637,6 +5651,13 @@
remoteGlobalIDString = DDF30D0527C5C003006A526F;
remoteInfo = absl;
};
@@ -1785,7 +1786,7 @@ index df544586f202dfdcb53b0c16ecf7a51b60ca3767..81f39ca4766d0368109ae90b94beb3cb
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
-@@ -24570,6 +24591,7 @@
+@@ -24140,6 +24161,7 @@
);
dependencies = (
410B3827292B73E90003E515 /* PBXTargetDependency */,
@@ -1793,7 +1794,7 @@ index df544586f202dfdcb53b0c16ecf7a51b60ca3767..81f39ca4766d0368109ae90b94beb3cb
DD2E76E827C6B69A00F2A74C /* PBXTargetDependency */,
CDEBB4CC24C01AB400ADBD44 /* PBXTargetDependency */,
411ED040212E0811004320BA /* PBXTargetDependency */,
-@@ -24663,6 +24685,7 @@
+@@ -24233,6 +24255,7 @@
4460B8B92B155B6A00392062 /* vp9_qp_parser_fuzzer */,
444A6EF02AEADFC9005FE121 /* vp9_replay_fuzzer */,
44945C512B9BA1C300447FFD /* webm_fuzzer */,
@@ -1801,7 +1802,7 @@ index df544586f202dfdcb53b0c16ecf7a51b60ca3767..81f39ca4766d0368109ae90b94beb3cb
);
};
/* End PBXProject section */
-@@ -24766,6 +24789,23 @@
+@@ -24336,6 +24359,23 @@
shellPath = /bin/sh;
shellScript = "[ -z \"${WK_DERIVED_SDK_HEADERS_DIR}\" -o -d \"${WK_DERIVED_SDK_HEADERS_DIR}\" ] && touch \"${SCRIPT_OUTPUT_FILE_0}\"\n";
};
@@ -1825,7 +1826,7 @@ index df544586f202dfdcb53b0c16ecf7a51b60ca3767..81f39ca4766d0368109ae90b94beb3cb
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
-@@ -27789,6 +27829,11 @@
+@@ -27359,6 +27399,11 @@
target = DDF30D0527C5C003006A526F /* absl */;
targetProxy = DD2E76E727C6B69A00F2A74C /* PBXContainerItemProxy */;
};
@@ -1837,7 +1838,7 @@ index df544586f202dfdcb53b0c16ecf7a51b60ca3767..81f39ca4766d0368109ae90b94beb3cb
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
-@@ -28556,6 +28601,27 @@
+@@ -28126,6 +28171,27 @@
};
name = Production;
};
@@ -1865,7 +1866,7 @@ index df544586f202dfdcb53b0c16ecf7a51b60ca3767..81f39ca4766d0368109ae90b94beb3cb
FB39D0711200ED9200088E69 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */;
-@@ -28938,6 +29004,16 @@
+@@ -28508,6 +28574,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
@@ -1904,10 +1905,10 @@ index 8675218a87262162d91bf992d00a1eecaf83f289..7dfe83ab3f9dd97bb13721f7034b4963
WEBKIT_ADD_TARGET_CXX_FLAGS(Skia
diff --git a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
-index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb81574982ee7fd1 100644
+index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf13ef04d3c 100644
--- a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
+++ b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
-@@ -562,6 +562,7 @@ ApplePayEnabled:
+@@ -540,6 +540,7 @@ ApplePayEnabled:
richJavaScript: true
# FIXME: This is on by default in WebKit2 PLATFORM(COCOA). Perhaps we should consider turning it on for WebKitLegacy as well.
@@ -1915,7 +1916,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
AsyncClipboardAPIEnabled:
type: bool
status: mature
-@@ -572,7 +573,7 @@ AsyncClipboardAPIEnabled:
+@@ -550,7 +551,7 @@ AsyncClipboardAPIEnabled:
default: false
WebKit:
"PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)" : true
@@ -1924,7 +1925,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
WebCore:
default: false
-@@ -832,13 +833,10 @@ BlobFileAccessEnforcementEnabled:
+@@ -811,13 +812,10 @@ BlobFileAccessEnforcementEnabled:
sharedPreferenceForWebProcess: true
defaultValue:
WebKitLegacy:
@@ -1938,7 +1939,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
default: false
BlockFontServiceInWebContentSandbox:
-@@ -2089,6 +2087,7 @@ CrossOriginEmbedderPolicyEnabled:
+@@ -2051,6 +2049,7 @@ CrossOriginEmbedderPolicyEnabled:
WebCore:
default: false
@@ -1946,7 +1947,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
CrossOriginOpenerPolicyEnabled:
type: bool
status: stable
-@@ -2162,6 +2161,7 @@ DOMAudioSessionFullEnabled:
+@@ -2124,6 +2123,7 @@ DOMAudioSessionFullEnabled:
WebCore:
default: false
@@ -1954,7 +1955,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
DOMPasteAccessRequestsEnabled:
type: bool
status: internal
-@@ -2173,7 +2173,7 @@ DOMPasteAccessRequestsEnabled:
+@@ -2135,7 +2135,7 @@ DOMPasteAccessRequestsEnabled:
default: false
WebKit:
"PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(VISION)": true
@@ -1963,7 +1964,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
WebCore:
default: false
-@@ -2239,10 +2239,10 @@ DataListElementEnabled:
+@@ -2201,10 +2201,10 @@ DataListElementEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -1976,7 +1977,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
default: false
sharedPreferenceForWebProcess: true
-@@ -2255,7 +2255,7 @@ DataTransferItemsEnabled:
+@@ -2217,7 +2217,7 @@ DataTransferItemsEnabled:
WebKitLegacy:
default: true
WebKit:
@@ -1985,7 +1986,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
default: false
WebCore:
default: false
-@@ -2497,7 +2497,7 @@ DirectoryUploadEnabled:
+@@ -2460,7 +2460,7 @@ DirectoryUploadEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -1994,7 +1995,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
default: false
WebCore:
default: false
-@@ -3022,10 +3022,10 @@ FullScreenEnabled:
+@@ -2999,10 +2999,10 @@ FullScreenEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -2007,7 +2008,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
default: false
sharedPreferenceForWebProcess: true
-@@ -3632,7 +3632,7 @@ InputTypeColorEnabled:
+@@ -3639,7 +3639,7 @@ InputTypeColorEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -2016,7 +2017,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
default: false
WebCore:
default: false
-@@ -3665,7 +3665,7 @@ InputTypeDateEnabled:
+@@ -3672,7 +3672,7 @@ InputTypeDateEnabled:
"PLATFORM(IOS_FAMILY)": true
default: false
WebKit:
@@ -2025,7 +2026,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
default: false
WebCore:
default: false
-@@ -3681,7 +3681,7 @@ InputTypeDateTimeLocalEnabled:
+@@ -3688,7 +3688,7 @@ InputTypeDateTimeLocalEnabled:
"PLATFORM(IOS_FAMILY)": true
default: false
WebKit:
@@ -2034,7 +2035,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
default: false
WebCore:
default: false
-@@ -3713,7 +3713,7 @@ InputTypeTimeEnabled:
+@@ -3720,7 +3720,7 @@ InputTypeTimeEnabled:
"PLATFORM(IOS_FAMILY)": true
default: false
WebKit:
@@ -2043,7 +2044,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
default: false
WebCore:
default: false
-@@ -3774,6 +3774,7 @@ InspectorMaximumResourcesContentSize:
+@@ -3781,6 +3781,7 @@ InspectorMaximumResourcesContentSize:
"PLATFORM(WPE)": 50
default: 200
@@ -2051,7 +2052,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
InspectorStartsAttached:
type: bool
status: embedder
-@@ -3781,7 +3782,7 @@ InspectorStartsAttached:
+@@ -3788,7 +3789,7 @@ InspectorStartsAttached:
exposed: [ WebKit ]
defaultValue:
WebKit:
@@ -2060,7 +2061,7 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
InspectorSupportsShowingCertificate:
type: bool
-@@ -5701,7 +5702,7 @@ PermissionsAPIEnabled:
+@@ -5755,7 +5756,7 @@ PermissionsAPIEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -2069,27 +2070,16 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
default: false
WebCore:
default: false
-@@ -5780,6 +5781,19 @@ PitchCorrectionAlgorithm:
+@@ -5850,7 +5851,7 @@ PointerLockEnabled:
+ "PLATFORM(IOS_FAMILY)": false
+ default: true
WebCore:
- default: MediaPlayerEnums::PitchCorrectionAlgorithm::BestAllAround
-
-+# Playwright: add preference 'PointerLockEnabled'.
-+PointerLockEnabled:
-+ type: bool
-+ status: embedder
-+ condition: ENABLE(POINTER_LOCK)
-+ defaultValue:
-+ WebKitLegacy:
-+ default: true
-+ WebKit:
-+ default: true
-+ WebCore:
+- default: false
+ default: true
-+
+
PointerLockOptionsEnabled:
type: bool
- status: stable
-@@ -6364,7 +6378,7 @@ ScreenOrientationAPIEnabled:
+@@ -6437,7 +6438,7 @@ ScreenOrientationAPIEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -2098,42 +2088,8 @@ index fde8f264b4df392fc8c6a06309f9a676f9c04c9c..955a01995909ccda6d486479bb815749
WebCore:
default: false
sharedPreferenceForWebProcess: true
-@@ -7847,6 +7861,7 @@ UseDamagingInformationForCompositing:
- WebCore:
- default: false
-
-+# Playwright: force-disable on Windows.
- UseGPUProcessForCanvasRenderingEnabled:
- type: bool
- status: stable
-@@ -7859,7 +7874,7 @@ UseGPUProcessForCanvasRenderingEnabled:
- defaultValue:
- WebKit:
- "ENABLE(GPU_PROCESS_BY_DEFAULT)": true
-- "USE(GRAPHICS_LAYER_WC)": true
-+ "USE(GRAPHICS_LAYER_WC)": false
- default: false
-
- UseGPUProcessForDOMRenderingEnabled:
-@@ -7904,6 +7919,7 @@ UseGPUProcessForMediaEnabled:
- sharedPreferenceForWebProcess: true
- mediaPlaybackRelated: true
-
-+# Playwright: force-disable on Windows.
- UseGPUProcessForWebGLEnabled:
- type: bool
- status: internal
-@@ -7915,7 +7931,7 @@ UseGPUProcessForWebGLEnabled:
- default: false
- WebKit:
- "ENABLE(GPU_PROCESS_BY_DEFAULT) && ENABLE(GPU_PROCESS_WEBGL_BY_DEFAULT)": true
-- "USE(GRAPHICS_LAYER_WC)": true
-+ "USE(GRAPHICS_LAYER_WC)": false
- default: false
- 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 c7bb871d6471f8ad9144db5063f39e37db20a396..0c09abedbc001572341f30deabefe588e4938e71 100644
+index 560f68add67cfce8bc5fb7b90b80160cb4019958..9bc9c8d168411c8f1bf0fe55a149a81e57c10b8e 100644
--- a/Source/WTF/wtf/PlatformEnable.h
+++ b/Source/WTF/wtf/PlatformEnable.h
@@ -381,7 +381,7 @@
@@ -2144,8 +2100,8 @@ index c7bb871d6471f8ad9144db5063f39e37db20a396..0c09abedbc001572341f30deabefe588
+#define ENABLE_ORIENTATION_EVENTS 1
#endif
- #if !defined(ENABLE_OVERFLOW_SCROLLING_TOUCH)
-@@ -498,7 +498,7 @@
+ #if OS(WINDOWS)
+@@ -494,7 +494,7 @@
#endif
#if !defined(ENABLE_TOUCH_EVENTS)
@@ -2155,10 +2111,10 @@ index c7bb871d6471f8ad9144db5063f39e37db20a396..0c09abedbc001572341f30deabefe588
#if !defined(ENABLE_TOUCH_ACTION_REGIONS)
diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h
-index ab4579dd256f98d3984882e2a2f26a527993416e..3a529e1864e88ccf3ce2df47176b0215427eb4bc 100644
+index 02a85989ff83d25a2fd7bfeec0de13c3065ce45f..0badbfca93d010d259dba4d5f98fc902143d64e2 100644
--- a/Source/WTF/wtf/PlatformEnableCocoa.h
+++ b/Source/WTF/wtf/PlatformEnableCocoa.h
-@@ -795,7 +795,7 @@
+@@ -779,7 +779,7 @@
#endif
#if !defined(ENABLE_SEC_ITEM_SHIM)
@@ -2168,10 +2124,10 @@ index ab4579dd256f98d3984882e2a2f26a527993416e..3a529e1864e88ccf3ce2df47176b0215
#if !defined(ENABLE_SERVER_PRECONNECT)
diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
-index bd819cb4b1bef3c4758353827ee0de710708848e..40c923882da567889b48730d3ec3b809aa040b1a 100644
+index 1bddb4666d19509a6e9ac202816dfa1ccbfcf192..33db65976aab8d615ded3c2a5aea0c12e818af39 100644
--- a/Source/WTF/wtf/PlatformHave.h
+++ b/Source/WTF/wtf/PlatformHave.h
-@@ -1059,7 +1059,8 @@
+@@ -1063,7 +1063,8 @@
#endif
#if PLATFORM(MAC)
@@ -2181,6 +2137,19 @@ index bd819cb4b1bef3c4758353827ee0de710708848e..40c923882da567889b48730d3ec3b809
#endif
#if !defined(HAVE_LOCKDOWN_MODE_PDF_ADDITIONS) && \
+diff --git a/Source/WTF/wtf/Variant.h b/Source/WTF/wtf/Variant.h
+index eab0cb4483bd7bf10be2608712112305a100c6d1..d7ed1288ca2e94b707254128473f0f4fe056750c 100644
+--- a/Source/WTF/wtf/Variant.h
++++ b/Source/WTF/wtf/Variant.h
+@@ -25,7 +25,7 @@
+
+ #pragma once
+
+-#if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)
++#if PLATFORM(COCOA)
+
+ // MPark.Variant
+ //
diff --git a/Source/WTF/wtf/unicode/UTF8Conversion.h b/Source/WTF/wtf/unicode/UTF8Conversion.h
index 007b8fe3292f326504013be8198ae020f7aacf35..1c722c473732ffe05fdb61010fa4417e3e399d1f 100644
--- a/Source/WTF/wtf/unicode/UTF8Conversion.h
@@ -2198,10 +2167,10 @@ index 007b8fe3292f326504013be8198ae020f7aacf35..1c722c473732ffe05fdb61010fa4417e
namespace Unicode {
diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
-index 6d76e72ddae832186e6f3609146ac29b91e77a85..18a0976d7c065968d688fb1f585b0022541bac04 100644
+index 770b335aea2c8d808bb68e2a6950d6bff3b50dc9..b203428e87c725facdaab7dba01d0e1ced72b09d 100644
--- a/Source/WebCore/DerivedSources.make
+++ b/Source/WebCore/DerivedSources.make
-@@ -1230,6 +1230,10 @@ JS_BINDING_IDLS := \
+@@ -1226,6 +1226,10 @@ JS_BINDING_IDLS := \
$(WebCore)/dom/SubscriberCallback.idl \
$(WebCore)/dom/SubscriptionObserver.idl \
$(WebCore)/dom/SubscriptionObserverCallback.idl \
@@ -2212,7 +2181,7 @@ index 6d76e72ddae832186e6f3609146ac29b91e77a85..18a0976d7c065968d688fb1f585b0022
$(WebCore)/dom/Text.idl \
$(WebCore)/dom/TextDecoder.idl \
$(WebCore)/dom/TextDecoderStream.idl \
-@@ -1830,9 +1834,6 @@ JS_BINDING_IDLS := \
+@@ -1836,9 +1840,6 @@ JS_BINDING_IDLS := \
ADDITIONAL_BINDING_IDLS = \
DocumentTouch.idl \
GestureEvent.idl \
@@ -2223,17 +2192,17 @@ index 6d76e72ddae832186e6f3609146ac29b91e77a85..18a0976d7c065968d688fb1f585b0022
vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS)
diff --git a/Source/WebCore/Modules/geolocation/Geolocation.cpp b/Source/WebCore/Modules/geolocation/Geolocation.cpp
-index 51d4e0b4cbc69d2c5c5f76b7063b54865b6fc2d0..d23693e52b96d579f0d828dd825c5dab8572e7c7 100644
+index 1bcfaa96ad38e82973150e8292b6d9f7fc40279a..55cdec501f3de05dc7088cdc6d45e38cdde75b01 100644
--- a/Source/WebCore/Modules/geolocation/Geolocation.cpp
+++ b/Source/WebCore/Modules/geolocation/Geolocation.cpp
@@ -374,8 +374,9 @@ bool Geolocation::shouldBlockGeolocationRequests()
+
bool isSecure = SecurityOrigin::isSecure(document->url()) || document->isSecureContext();
- bool hasMixedContent = !document->foundMixedContent().isEmpty();
bool isLocalOrigin = securityOrigin()->isLocal();
+ bool isPotentiallyTrustworthy = securityOrigin()->isPotentiallyTrustworthy();
if (document->canAccessResource(ScriptExecutionContext::ResourceType::Geolocation) != ScriptExecutionContext::HasResourceAccess::No) {
-- if (isLocalOrigin || (isSecure && !hasMixedContent))
-+ if (isLocalOrigin || (isSecure && !hasMixedContent) || isPotentiallyTrustworthy)
+- if (isLocalOrigin || isSecure)
++ if (isLocalOrigin || isSecure || isPotentiallyTrustworthy)
return false;
}
@@ -2286,7 +2255,7 @@ index 72b2846f2c82818fc9a64fd90b7cba0c0601e15f..22277ab6c3233f040852d9daf9becf7b
elseif (USE_SKIA)
list(APPEND WebCore_SOURCES
diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
-index f09f2e709ee13060d25d4419c05affd987e6328f..16a6491a03dc6aeaf5bfdb4c5b75c3bd6dcd6944 100644
+index ef1d576a4a7747af1ee45a9a172b5ac2d4efed20..e5d8b229f4e6a76ceb86a86bdd1f01de66b73a29 100644
--- a/Source/WebCore/SourcesCocoa.txt
+++ b/Source/WebCore/SourcesCocoa.txt
@@ -732,3 +732,9 @@ testing/cocoa/WebViewVisualIdentificationOverlay.mm
@@ -2300,10 +2269,10 @@ index f09f2e709ee13060d25d4419c05affd987e6328f..16a6491a03dc6aeaf5bfdb4c5b75c3bd
+JSTouchList.cpp
+// Playwright end
diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt
-index 393fc726c204fc3037287d67cc6b7aa9a5a9c4c3..7e45bf78bb7f0688cf3e09449728ad32e2be3870 100644
+index 2bf30108f206c8f21cb63ef2aa54744864862c6c..80bf1267be5754fa6363c9d4af399803daf4fb38 100644
--- a/Source/WebCore/SourcesGTK.txt
+++ b/Source/WebCore/SourcesGTK.txt
-@@ -113,3 +113,10 @@ platform/unix/SharedMemoryUnix.cpp
+@@ -115,3 +115,10 @@ platform/unix/SharedMemoryUnix.cpp
platform/xdg/MIMETypeRegistryXdg.cpp
platform/xr/openxr/PlatformXROpenXR.cpp
@@ -2315,36 +2284,23 @@ index 393fc726c204fc3037287d67cc6b7aa9a5a9c4c3..7e45bf78bb7f0688cf3e09449728ad32
+JSSpeechSynthesisEventInit.cpp
+// Playwright: end.
diff --git a/Source/WebCore/SourcesWPE.txt b/Source/WebCore/SourcesWPE.txt
-index f5fe901c57ba84d42c8ee3be47c404069ac6fed8..599a40b75fdb63306f706dbb7ff845b9e29a473a 100644
+index 9a760528751e6af3e2599a9b0b250607d54430c3..4c230e3ea7af8ffeb1013b2e8a17a297d714372a 100644
--- a/Source/WebCore/SourcesWPE.txt
+++ b/Source/WebCore/SourcesWPE.txt
-@@ -48,6 +48,8 @@ editing/glib/WebContentReaderGLib.cpp
-
- loader/soup/ResourceLoaderSoup.cpp
-
-+page/wpe/DragControllerWPE.cpp
-+
- page/linux/ResourceUsageOverlayLinux.cpp
- page/linux/ResourceUsageThreadLinux.cpp
-
-@@ -99,3 +101,12 @@ platform/wpe/PlatformScreenWPE.cpp
+@@ -104,3 +104,8 @@ platform/wpe/PlatformScreenWPE.cpp
platform/xdg/MIMETypeRegistryXdg.cpp
platform/xr/openxr/PlatformXROpenXR.cpp
+
-+// Playwright: begin.
-+platform/wpe/DragDataWPE.cpp
-+
+JSSpeechSynthesisErrorCode.cpp
+JSSpeechSynthesisErrorEvent.cpp
+JSSpeechSynthesisErrorEventInit.cpp
+JSSpeechSynthesisEventInit.cpp
-+// Playwright: end.
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
-index 612c2492b160e840f942b1b5bef3faf995f411cf..221ffcfc32818d1d2839aa984eefc43f60d2ba31 100644
+index cc25f5acc2b5560f6a5ca51a7c3a737e9000de8e..97ffb63520aff377162d398908b972a4f71c28af 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
-@@ -6503,6 +6503,13 @@
+@@ -6596,6 +6596,13 @@
EE62BD9D2DE12C1B006C9A05 /* ResolvedScopedName.h in Headers */ = {isa = PBXBuildFile; fileRef = EE62BD9B2DE12BD4006C9A05 /* ResolvedScopedName.h */; settings = {ATTRIBUTES = (Private, ); }; };
EEE349082DE0061C00A7D4BB /* StyleScopeIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = EEE349072DE005FC00A7D4BB /* StyleScopeIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2358,7 +2314,7 @@ index 612c2492b160e840f942b1b5bef3faf995f411cf..221ffcfc32818d1d2839aa984eefc43f
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, ); }; };
-@@ -21257,6 +21264,14 @@
+@@ -21529,6 +21536,14 @@
EEE349072DE005FC00A7D4BB /* StyleScopeIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StyleScopeIdentifier.h; sourceTree = "<group>"; };
EFB7287B2124C73D005C2558 /* CanvasActivityRecord.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasActivityRecord.cpp; sourceTree = "<group>"; };
EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasActivityRecord.h; sourceTree = "<group>"; };
@@ -2373,7 +2329,7 @@ index 612c2492b160e840f942b1b5bef3faf995f411cf..221ffcfc32818d1d2839aa984eefc43f
F12171F316A8BC63000053CA /* WebVTTElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTElement.cpp; sourceTree = "<group>"; };
F12171F416A8BC63000053CA /* WebVTTElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTElement.h; sourceTree = "<group>"; };
F32BDCD52363AAC90073B6AE /* UserGestureEmulationScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserGestureEmulationScope.cpp; sourceTree = "<group>"; };
-@@ -29046,6 +29061,11 @@
+@@ -29367,6 +29382,11 @@
BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */,
2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */,
2D4F96F21A1ECC240098BF88 /* TextIndicator.h */,
@@ -2383,9 +2339,9 @@ index 612c2492b160e840f942b1b5bef3faf995f411cf..221ffcfc32818d1d2839aa984eefc43f
+ F050E16C23AD66630011CE47 /* TouchList.cpp */,
+ F050E16B23AD66620011CE47 /* TouchList.h */,
F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */,
- F4E1965F21F26E4E00285078 /* UndoItem.cpp */,
- 2ECDBAD521D8906300F00ECD /* UndoItem.h */,
-@@ -36194,6 +36214,8 @@
+ D640B24C2E3058C800EB6C49 /* UADataValues.h */,
+ D640B24E2E3058C800EB6C49 /* UADataValues.idl */,
+@@ -36803,6 +36823,8 @@
29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */,
1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */,
1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */,
@@ -2394,7 +2350,7 @@ index 612c2492b160e840f942b1b5bef3faf995f411cf..221ffcfc32818d1d2839aa984eefc43f
FE3DC9932D0C063C0021B6FC /* PlatformTZoneImpls.cpp */,
0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */,
935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */,
-@@ -39050,6 +39072,7 @@
+@@ -39663,6 +39685,7 @@
AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */,
6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */,
6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */,
@@ -2402,7 +2358,7 @@ index 612c2492b160e840f942b1b5bef3faf995f411cf..221ffcfc32818d1d2839aa984eefc43f
7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */,
7CE7FA591EF882300060C9D6 /* DocumentTouch.h */,
A8185F3209765765005826D9 /* DocumentType.cpp */,
-@@ -44014,6 +44037,8 @@
+@@ -44643,6 +44666,8 @@
F4E90A3C2B52038E002DA469 /* PlatformTextAlternatives.h in Headers */,
0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */,
074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */,
@@ -2411,7 +2367,7 @@ index 612c2492b160e840f942b1b5bef3faf995f411cf..221ffcfc32818d1d2839aa984eefc43f
CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */,
CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */,
CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */,
-@@ -45423,6 +45448,7 @@
+@@ -46131,6 +46156,7 @@
0F54DD081881D5F5003EEDBB /* Touch.h in Headers */,
71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */,
0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */,
@@ -2419,16 +2375,17 @@ index 612c2492b160e840f942b1b5bef3faf995f411cf..221ffcfc32818d1d2839aa984eefc43f
0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */,
070334D71459FFD5008D8D45 /* TrackBase.h in Headers */,
BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */,
-@@ -46627,6 +46653,8 @@
+@@ -47340,7 +47366,9 @@
2D22830323A8470700364B7E /* CursorMac.mm in Sources */,
5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */,
07E4BDBF2A3A5FAB000D5509 /* DictationCaretAnimator.cpp in Sources */,
+ F050E17423AD6A800011CE47 /* DocumentTouch.cpp in Sources */,
+ 0749E9512E275A23009B912B /* EditingHTMLConverter.mm in Sources */,
+ 329C0C2528BD96EB00F187D2 /* ElementName.cpp in Sources */,
7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */,
4667EA3E2968D9DA00BAB1E2 /* GameControllerHapticEffect.mm in Sources */,
46FE73D32968E52000B8064C /* GameControllerHapticEngines.mm in Sources */,
-@@ -46718,6 +46746,9 @@
+@@ -47433,6 +47461,9 @@
CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */,
BE39137129B267F500FA5D4F /* TextTransformCocoa.cpp in Sources */,
51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */,
@@ -2439,18 +2396,18 @@ index 612c2492b160e840f942b1b5bef3faf995f411cf..221ffcfc32818d1d2839aa984eefc43f
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 9587b90007ab8ee8ab32f7f86219732f11d457bf..81e09081c42db3c905f1adb2f917b0bca32c24c2 100644
+index f41551ba8e1d31c2868ede9dc67c75488d0f815e..e2434bb801cb4db6fd965419a8569265279a8a0d 100644
--- a/Source/WebCore/accessibility/AccessibilityObject.cpp
+++ b/Source/WebCore/accessibility/AccessibilityObject.cpp
-@@ -72,6 +72,7 @@
+@@ -78,6 +78,7 @@
#include "HTMLTableSectionElement.h"
#include "HTMLTextAreaElement.h"
#include "HitTestResult.h"
+#include "InspectorInstrumentation.h"
#include "LocalFrame.h"
#include "LocalizedStrings.h"
- #include "MathMLNames.h"
-@@ -3998,7 +3999,12 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const
+ #include "Logging.h"
+@@ -4062,7 +4063,12 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const
if (role() == AccessibilityRole::ApplicationDialog)
return AccessibilityObjectInclusion::IncludeObject;
@@ -2465,7 +2422,7 @@ index 9587b90007ab8ee8ab32f7f86219732f11d457bf..81e09081c42db3c905f1adb2f917b0bc
bool AccessibilityObject::isWithinHiddenWebArea() const
diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
-index c4b32aaefc75bdef3b52f2469786f9abe11fb8d4..6d84e95ff7f766a2e26c1414be92af89fa7d73cf 100644
+index 9d6545ad60257c66a3f04cee67590d00ff9a5720..9a4794cc573a6507395cdd2c7a24209c0d9db3ba 100644
--- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
+++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
@@ -190,6 +190,8 @@ namespace WebCore {
@@ -2524,7 +2481,7 @@ index c0b9d058536120b4c368ab8094c16f19a5d2acba..37e7e016f5862bab19d750d06bd72b10
{
auto dataTransfer = adoptRef(*new DataTransfer(StoreMode::ReadWrite, makeUnique<StaticPasteboard>(), Type::DragAndDropData));
diff --git a/Source/WebCore/dom/DataTransfer.h b/Source/WebCore/dom/DataTransfer.h
-index 315635014cf133628d72942eb230df4e8cad036c..5424ad948028c192d9fc165cde0102e15ad65b56 100644
+index b22db7093505b1bfc39b15200640db5a1363e0ef..e96117436863ace7d52c894f37027187e33c182b 100644
--- a/Source/WebCore/dom/DataTransfer.h
+++ b/Source/WebCore/dom/DataTransfer.h
@@ -92,6 +92,9 @@ public:
@@ -2561,44 +2518,8 @@ index 9043052540b13d8120fb641de6337af46c3b36ef..a0f89e64b64640d2d4dbc14734868c4d
Exposed=Window
] interface DeviceOrientationEvent : Event {
readonly attribute unrestricted double? alpha;
-diff --git a/Source/WebCore/dom/Document+PointerLock.idl b/Source/WebCore/dom/Document+PointerLock.idl
-index 2e9c9fda6a920cd8904432bd1bdbfbf32d01c085..2fd33597e905b0544665ff765f310945305a0c4a 100644
---- a/Source/WebCore/dom/Document+PointerLock.idl
-+++ b/Source/WebCore/dom/Document+PointerLock.idl
-@@ -25,6 +25,7 @@
-
- // https://w3c.github.io/pointerlock/#extensions-to-the-document-interface
- [
-+ EnabledBySetting=PointerLockEnabled,
- Conditional=POINTER_LOCK
- ] partial interface Document {
- attribute EventHandler onpointerlockchange;
-diff --git a/Source/WebCore/dom/DocumentOrShadowRoot+PointerLock.idl b/Source/WebCore/dom/DocumentOrShadowRoot+PointerLock.idl
-index 9b8dbfc15ce078702321abcd6c0e636df7a60510..2956f7098e87af10ab8f5584b456ce9a6d432a20 100644
---- a/Source/WebCore/dom/DocumentOrShadowRoot+PointerLock.idl
-+++ b/Source/WebCore/dom/DocumentOrShadowRoot+PointerLock.idl
-@@ -25,6 +25,7 @@
-
- // https://w3c.github.io/pointerlock/#extensions-to-the-documentorshadowroot-mixin
- [
-+ EnabledBySetting=PointerLockEnabled,
- Conditional=POINTER_LOCK
- ] partial interface mixin DocumentOrShadowRoot {
- readonly attribute Element? pointerLockElement;
-diff --git a/Source/WebCore/dom/Element+PointerLock.idl b/Source/WebCore/dom/Element+PointerLock.idl
-index 9b344003de17b96d8b9ca8c7f32143a27543b1ea..2208a3f2b7d930bcd291e65b474d4c3023d2a7e4 100644
---- a/Source/WebCore/dom/Element+PointerLock.idl
-+++ b/Source/WebCore/dom/Element+PointerLock.idl
-@@ -24,6 +24,7 @@
- */
-
- [
-+ EnabledBySetting=PointerLockEnabled,
- Conditional=POINTER_LOCK
- ] partial interface Element {
- // Returns Promise<undefined> if PointerLockOptionsEnabled Runtime Flag is set, otherwise returns undefined.
diff --git a/Source/WebCore/dom/PointerEvent.cpp b/Source/WebCore/dom/PointerEvent.cpp
-index 6b0390aba75731707ce48ea206b87974ffb15857..8c634c0748f0d447476d460ee2800f82d232d7ff 100644
+index b691425261078163e043b062a0a9f1fe5215d2b5..d3a8a99b08099cf16f0b0274d680c32e9ffef54e 100644
--- a/Source/WebCore/dom/PointerEvent.cpp
+++ b/Source/WebCore/dom/PointerEvent.cpp
@@ -28,10 +28,13 @@
@@ -2615,8 +2536,8 @@ index 6b0390aba75731707ce48ea206b87974ffb15857..8c634c0748f0d447476d460ee2800f82
namespace WebCore {
-@@ -293,4 +296,59 @@ void PointerEvent::receivedTarget()
- predictedEvent->setTarget(this->target());
+@@ -331,4 +334,59 @@ double PointerEvent::offsetY()
+ return adjustedCoordinateForType(offsetLocation().y());
}
+#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS_FAMILY) && !PLATFORM(WPE)
@@ -2641,29 +2562,29 @@ index 6b0390aba75731707ce48ea206b87974ffb15857..8c634c0748f0d447476d460ee2800f82
+ return nullAtom();
+}
+
-+Ref<PointerEvent> PointerEvent::create(const PlatformTouchEvent& event, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const IntPoint& touchDelta)
++Ref<PointerEvent> PointerEvent::create(const PlatformTouchEvent& event, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const DoublePoint& touchDelta)
+{
+ const auto& type = pointerEventType(event.touchPoints().at(touchIndex).state());
+ return adoptRef(*new PointerEvent(type, event, coalescedEvents, predictedEvents, typeCanBubble(type), typeIsCancelable(type), touchIndex, isPrimary, WTFMove(view), touchDelta));
+}
+
-+Ref<PointerEvent> PointerEvent::create(const PlatformTouchEvent& event, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble canBubble, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const IntPoint& touchDelta)
++Ref<PointerEvent> PointerEvent::create(const PlatformTouchEvent& event, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble canBubble, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const DoublePoint& touchDelta)
+{
+ const auto& type = pointerEventType(event.touchPoints().at(touchIndex).state());
+ return adoptRef(*new PointerEvent(type, event, coalescedEvents, predictedEvents, canBubble, isCancelable, touchIndex, isPrimary, WTFMove(view), touchDelta));
+}
+
-+Ref<PointerEvent> PointerEvent::create(const AtomString& type, const PlatformTouchEvent& event, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const IntPoint& touchDelta)
++Ref<PointerEvent> PointerEvent::create(const AtomString& type, const PlatformTouchEvent& event, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const DoublePoint& touchDelta)
+{
+ return adoptRef(*new PointerEvent(type, event, coalescedEvents, predictedEvents, typeCanBubble(type), typeIsCancelable(type), touchIndex, isPrimary, WTFMove(view), touchDelta));
+}
+
-+PointerEvent::PointerEvent(const AtomString& type, const PlatformTouchEvent& event, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble canBubble, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const IntPoint& touchDelta)
++PointerEvent::PointerEvent(const AtomString& type, const PlatformTouchEvent& event, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble canBubble, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const DoublePoint& touchDelta)
+ : MouseEvent(EventInterfaceType::PointerEvent, type, canBubble, isCancelable, typeIsComposed(type), event.timestamp().approximateMonotonicTime(), WTFMove(view), 0,
+ event.touchPoints().at(touchIndex).pos(), event.touchPoints().at(touchIndex).pos(), touchDelta.x(), touchDelta.y(), event.modifiers(), buttonForType(type), buttonsForType(type), nullptr, 0, SyntheticClickType::NoTap, { }, { }, IsSimulated::No, IsTrusted::Yes)
+ , m_pointerId(event.touchPoints().at(touchIndex).id())
-+ , m_width(2 * event.touchPoints().at(touchIndex).radiusX())
-+ , m_height(2 * event.touchPoints().at(touchIndex).radiusY())
++ , m_width(2 * event.touchPoints().at(touchIndex).radius().width())
++ , m_height(2 * event.touchPoints().at(touchIndex).radius().height())
+ , m_pressure(event.touchPoints().at(touchIndex).force())
+ , m_pointerType(touchPointerEventType())
+ , m_isPrimary(isPrimary)
@@ -2676,7 +2597,7 @@ index 6b0390aba75731707ce48ea206b87974ffb15857..8c634c0748f0d447476d460ee2800f82
+
} // namespace WebCore
diff --git a/Source/WebCore/dom/PointerEvent.h b/Source/WebCore/dom/PointerEvent.h
-index b034595d01bb63f3d72183c427fcc14695339ae2..1886e4bbba04c6177fad1562c891f2aeff0a8247 100644
+index 2a8233fd13710bd351acd77e66626dd38ffb8749..8dcae583fe4dce69a6604dbd152015510eeb5df6 100644
--- a/Source/WebCore/dom/PointerEvent.h
+++ b/Source/WebCore/dom/PointerEvent.h
@@ -34,6 +34,8 @@
@@ -2694,16 +2615,16 @@ index b034595d01bb63f3d72183c427fcc14695339ae2..1886e4bbba04c6177fad1562c891f2ae
-#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE))
+#if ENABLE(TOUCH_EVENTS)
- static Ref<PointerEvent> create(const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const IntPoint& touchDelta = { });
- static Ref<PointerEvent> create(const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble, IsCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const IntPoint& touchDelta = { });
- static Ref<PointerEvent> create(const AtomString& type, const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const IntPoint& touchDelta = { });
-@@ -173,7 +175,7 @@ private:
+ static Ref<PointerEvent> create(const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const DoublePoint& touchDelta = { });
+ static Ref<PointerEvent> create(const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble, IsCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const DoublePoint& touchDelta = { });
+ static Ref<PointerEvent> create(const AtomString& type, const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const DoublePoint& touchDelta = { });
+@@ -187,7 +189,7 @@ private:
PointerEvent();
PointerEvent(const AtomString&, Init&&, IsTrusted);
PointerEvent(const AtomString& type, PointerID, const String& pointerType, IsPrimary);
-#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE))
+#if ENABLE(TOUCH_EVENTS)
- PointerEvent(const AtomString& type, const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble canBubble, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const IntPoint& touchDelta = { });
+ PointerEvent(const AtomString& type, const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble canBubble, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const DoublePoint& touchDelta = { });
#endif
diff --git a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp b/Source/WebCore/editing/libwpe/EditorLibWPE.cpp
@@ -2734,7 +2655,7 @@ index d0a3d5c048647b07772e1581c76c4eb60ecf41b0..bec324636991079264e620c0dfdaf984
#endif // USE(LIBWPE)
diff --git a/Source/WebCore/html/FileInputType.cpp b/Source/WebCore/html/FileInputType.cpp
-index 64137520fb575aac59fbb4a8fc8509cbdd8cc04e..5bdac5378686cefef1e05f4aa01a49729c3fd398 100644
+index 51176f56b3e691937622f5b4be0ff39f5e85630b..68c84ce1199ca81180db2b087b53bee2ab3798b5 100644
--- a/Source/WebCore/html/FileInputType.cpp
+++ b/Source/WebCore/html/FileInputType.cpp
@@ -38,6 +38,7 @@
@@ -2758,7 +2679,7 @@ index 64137520fb575aac59fbb4a8fc8509cbdd8cc04e..5bdac5378686cefef1e05f4aa01a4972
return;
diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
-index af0482d2d06db91a7964b7662dd3379804062fff..49ed24c301cecabeb21ac5f3d06d2777218cd538 100644
+index 297085f75efe06143a806e1242750c9b6ad92dee..361fb796457998d4b6e7e39a448e03811c456a1c 100644
--- a/Source/WebCore/inspector/InspectorController.cpp
+++ b/Source/WebCore/inspector/InspectorController.cpp
@@ -296,6 +296,8 @@ void InspectorController::disconnectFrontend(FrontendChannel& frontendChannel)
@@ -2769,7 +2690,7 @@ index af0482d2d06db91a7964b7662dd3379804062fff..49ed24c301cecabeb21ac5f3d06d2777
+ m_pauseOnStart = PauseCondition::DONT_PAUSE;
}
- m_inspectorClient->frontendCountChanged(m_frontendRouter->frontendCount());
+ m_inspectorBackendClient->frontendCountChanged(m_frontendRouter->frontendCount());
@@ -315,6 +317,8 @@ void InspectorController::disconnectAllFrontends()
// The frontend should call setInspectorFrontendClient(nullptr) under closeWindow().
ASSERT(!m_inspectorFrontendClient);
@@ -2826,7 +2747,7 @@ index af0482d2d06db91a7964b7662dd3379804062fff..49ed24c301cecabeb21ac5f3d06d2777
+
} // namespace WebCore
diff --git a/Source/WebCore/inspector/InspectorController.h b/Source/WebCore/inspector/InspectorController.h
-index d56afdb6e48840802c5a4f28b9a954695f09965d..7c3223c9f57bc45f4109325433ac4f5e745eb986 100644
+index fe10a03fd9d664e8735970b35819b639a60e4e32..8d3d8e0201213aa2c4ea27674388d2d0372c200b 100644
--- a/Source/WebCore/inspector/InspectorController.h
+++ b/Source/WebCore/inspector/InspectorController.h
@@ -106,6 +106,12 @@ public:
@@ -2859,10 +2780,10 @@ index d56afdb6e48840802c5a4f28b9a954695f09965d..7c3223c9f57bc45f4109325433ac4f5e
} // namespace WebCore
diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp
-index 1c660f381ad7e9a9201aeced2906f39135e810f6..6c47abc2f32b39fd5c0bf9048b9c1224959ba08c 100644
+index d23aa990856bf855830e69b3bbab2cb024d7f198..a80a86c732b514c07a92005fbdd1cc03b347ff3f 100644
--- a/Source/WebCore/inspector/InspectorInstrumentation.cpp
+++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp
-@@ -595,6 +595,12 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i
+@@ -596,6 +596,12 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i
pageAgent->applyUserAgentOverride(userAgent);
}
@@ -2875,7 +2796,7 @@ index 1c660f381ad7e9a9201aeced2906f39135e810f6..6c47abc2f32b39fd5c0bf9048b9c1224
void InspectorInstrumentation::applyEmulatedMediaImpl(InstrumentingAgents& instrumentingAgents, AtomString& media)
{
if (auto* pageAgent = instrumentingAgents.enabledPageAgent())
-@@ -678,6 +684,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen
+@@ -679,6 +685,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen
consoleAgent->didFailLoading(identifier, error); // This should come AFTER resource notification, front-end relies on this.
}
@@ -2888,7 +2809,7 @@ index 1c660f381ad7e9a9201aeced2906f39135e810f6..6c47abc2f32b39fd5c0bf9048b9c1224
void InspectorInstrumentation::willLoadXHRSynchronouslyImpl(InstrumentingAgents& instrumentingAgents)
{
if (auto* networkAgent = instrumentingAgents.enabledNetworkAgent())
-@@ -710,20 +722,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents&
+@@ -711,20 +723,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents&
void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
{
@@ -2912,7 +2833,7 @@ index 1c660f381ad7e9a9201aeced2906f39135e810f6..6c47abc2f32b39fd5c0bf9048b9c1224
}
void InspectorInstrumentation::frameDetachedFromParentImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
-@@ -803,12 +812,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins
+@@ -804,12 +813,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins
pageDOMDebuggerAgent->frameDocumentUpdated(frame);
}
@@ -2925,7 +2846,7 @@ index 1c660f381ad7e9a9201aeced2906f39135e810f6..6c47abc2f32b39fd5c0bf9048b9c1224
void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
{
if (frame.isMainFrame()) {
-@@ -839,10 +842,10 @@ void InspectorInstrumentation::frameStoppedLoadingImpl(InstrumentingAgents& inst
+@@ -840,10 +843,10 @@ void InspectorInstrumentation::frameStoppedLoadingImpl(InstrumentingAgents& inst
inspectorPageAgent->frameStoppedLoading(frame);
}
@@ -2938,7 +2859,7 @@ index 1c660f381ad7e9a9201aeced2906f39135e810f6..6c47abc2f32b39fd5c0bf9048b9c1224
}
void InspectorInstrumentation::frameClearedScheduledNavigationImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
-@@ -857,6 +860,12 @@ void InspectorInstrumentation::accessibilitySettingsDidChangeImpl(InstrumentingA
+@@ -858,6 +861,12 @@ void InspectorInstrumentation::accessibilitySettingsDidChangeImpl(InstrumentingA
inspectorPageAgent->accessibilitySettingsDidChange();
}
@@ -2951,7 +2872,7 @@ index 1c660f381ad7e9a9201aeced2906f39135e810f6..6c47abc2f32b39fd5c0bf9048b9c1224
#if ENABLE(DARK_MODE_CSS)
void InspectorInstrumentation::defaultAppearanceDidChangeImpl(InstrumentingAgents& instrumentingAgents)
{
-@@ -909,6 +918,12 @@ void InspectorInstrumentation::interceptResponseImpl(InstrumentingAgents& instru
+@@ -910,6 +919,12 @@ void InspectorInstrumentation::interceptResponseImpl(InstrumentingAgents& instru
networkAgent->interceptResponse(response, identifier, WTFMove(handler));
}
@@ -2964,7 +2885,7 @@ index 1c660f381ad7e9a9201aeced2906f39135e810f6..6c47abc2f32b39fd5c0bf9048b9c1224
// JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes.
static bool isConsoleAssertMessage(MessageSource source, MessageType type)
{
-@@ -1027,6 +1042,12 @@ void InspectorInstrumentation::consoleStopRecordingCanvasImpl(InstrumentingAgent
+@@ -1028,6 +1043,12 @@ void InspectorInstrumentation::consoleStopRecordingCanvasImpl(InstrumentingAgent
canvasAgent->consoleStopRecordingCanvas(context);
}
@@ -2977,7 +2898,7 @@ index 1c660f381ad7e9a9201aeced2906f39135e810f6..6c47abc2f32b39fd5c0bf9048b9c1224
void InspectorInstrumentation::didDispatchDOMStorageEventImpl(InstrumentingAgents& instrumentingAgents, const String& key, const String& oldValue, const String& newValue, StorageType storageType, const SecurityOrigin& securityOrigin)
{
if (auto* domStorageAgent = instrumentingAgents.enabledDOMStorageAgent())
-@@ -1317,6 +1338,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins
+@@ -1318,6 +1339,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins
layerTreeAgent->renderLayerDestroyed(renderLayer);
}
@@ -3014,7 +2935,7 @@ index 1c660f381ad7e9a9201aeced2906f39135e810f6..6c47abc2f32b39fd5c0bf9048b9c1224
InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(WorkerOrWorkletGlobalScope& globalScope)
{
return globalScope.inspectorController().m_instrumentingAgents;
-@@ -1333,6 +1384,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page)
+@@ -1334,6 +1385,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page)
return page.inspectorController().m_instrumentingAgents.get();
}
@@ -3029,7 +2950,7 @@ index 1c660f381ad7e9a9201aeced2906f39135e810f6..6c47abc2f32b39fd5c0bf9048b9c1224
{
// Using RefPtr makes us hit the m_inRemovedLastRefFunction assert.
diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h
-index ed15dcc0dd1eb8d22dc48d8c6515b2258db574c5..c297c2d0e61b8ca1f881bb7942c463626bf0118f 100644
+index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54bcc97419f 100644
--- a/Source/WebCore/inspector/InspectorInstrumentation.h
+++ b/Source/WebCore/inspector/InspectorInstrumentation.h
@@ -31,6 +31,7 @@
@@ -3341,7 +3262,7 @@ index a67a1244fa526ad5759068e97e0d220f59565d6e..0048589109fccb9472fe35a410337771
+
} // namespace WebCore
diff --git a/Source/WebCore/inspector/InspectorInstrumentationWebKit.h b/Source/WebCore/inspector/InspectorInstrumentationWebKit.h
-index c028341e84e59a6b1b16107fd74feb21f70b12ab..d385418ac34e8f315f201801a2c65226c8f6fee2 100644
+index b8a1585c14a753344d5b52b316511d2efb2d2bfe..910b98291328cd90109beeeb66e9ecf22e124a89 100644
--- a/Source/WebCore/inspector/InspectorInstrumentationWebKit.h
+++ b/Source/WebCore/inspector/InspectorInstrumentationWebKit.h
@@ -33,6 +33,7 @@
@@ -3379,7 +3300,7 @@ index c028341e84e59a6b1b16107fd74feb21f70b12ab..d385418ac34e8f315f201801a2c65226
+
}
diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
-index 08bdd6e6cd5295f4be4df37c3e3e830b03916dc7..078ef814e006a45c4b83ff1c2ff341a93705e1a0 100644
+index ae1b0775177048d3464ae2961e1f86f044ab4521..a10bc643f3ddf82696100345037b820a764431b3 100644
--- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
+++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
@@ -54,6 +54,7 @@
@@ -3405,7 +3326,7 @@ index 08bdd6e6cd5295f4be4df37c3e3e830b03916dc7..078ef814e006a45c4b83ff1c2ff341a9
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
#include "HTMLScriptElement.h"
-@@ -102,12 +108,14 @@
+@@ -103,12 +109,14 @@
#include "Pasteboard.h"
#include "PseudoElement.h"
#include "RenderGrid.h"
@@ -3420,9 +3341,9 @@ index 08bdd6e6cd5295f4be4df37c3e3e830b03916dc7..078ef814e006a45c4b83ff1c2ff341a9
#include "StaticNodeList.h"
#include "StyleProperties.h"
#include "StyleResolver.h"
-@@ -149,7 +157,8 @@ using namespace HTMLNames;
+@@ -150,7 +158,8 @@ using namespace HTMLNames;
static const size_t maxTextSize = 10000;
- static const UChar horizontalEllipsisUChar[] = { horizontalEllipsis, 0 };
+ static const char16_t horizontalEllipsisUChar[] = { horizontalEllipsis, 0 };
-static std::optional<Color> parseColor(RefPtr<JSON::Object>&& colorObject)
+// static
@@ -3430,7 +3351,7 @@ index 08bdd6e6cd5295f4be4df37c3e3e830b03916dc7..078ef814e006a45c4b83ff1c2ff341a9
{
if (!colorObject)
return std::nullopt;
-@@ -168,7 +177,7 @@ static std::optional<Color> parseColor(RefPtr<JSON::Object>&& colorObject)
+@@ -169,7 +178,7 @@ static std::optional<Color> parseColor(RefPtr<JSON::Object>&& colorObject)
static std::optional<Color> parseRequiredConfigColor(const String& fieldName, JSON::Object& configObject)
{
@@ -3439,7 +3360,7 @@ index 08bdd6e6cd5295f4be4df37c3e3e830b03916dc7..078ef814e006a45c4b83ff1c2ff341a9
}
static Color parseOptionalConfigColor(const String& fieldName, JSON::Object& configObject)
-@@ -195,6 +204,20 @@ static bool parseQuad(Ref<JSON::Array>&& quadArray, FloatQuad* quad)
+@@ -196,6 +205,20 @@ static bool parseQuad(Ref<JSON::Array>&& quadArray, FloatQuad* quad)
return true;
}
@@ -3460,7 +3381,7 @@ index 08bdd6e6cd5295f4be4df37c3e3e830b03916dc7..078ef814e006a45c4b83ff1c2ff341a9
class RevalidateStyleAttributeTask final : public CanMakeCheckedPtr<RevalidateStyleAttributeTask> {
WTF_MAKE_TZONE_ALLOCATED(RevalidateStyleAttributeTask);
WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(RevalidateStyleAttributeTask);
-@@ -475,6 +498,20 @@ Node* InspectorDOMAgent::assertNode(Inspector::Protocol::ErrorString& errorStrin
+@@ -476,6 +499,20 @@ Node* InspectorDOMAgent::assertNode(Inspector::Protocol::ErrorString& errorStrin
return node.get();
}
@@ -3481,7 +3402,7 @@ index 08bdd6e6cd5295f4be4df37c3e3e830b03916dc7..078ef814e006a45c4b83ff1c2ff341a9
Document* InspectorDOMAgent::assertDocument(Inspector::Protocol::ErrorString& errorString, Inspector::Protocol::DOM::NodeId nodeId)
{
RefPtr node = assertNode(errorString, nodeId);
-@@ -1593,16 +1630,7 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::highlightNode(std::o
+@@ -1594,16 +1631,7 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::highlightNode(std::o
Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::highlightNode(std::optional<Inspector::Protocol::DOM::NodeId>&& nodeId, const Inspector::Protocol::Runtime::RemoteObjectId& objectId, Ref<JSON::Object>&& highlightInspectorObject, RefPtr<JSON::Object>&& gridOverlayInspectorObject, RefPtr<JSON::Object>&& flexOverlayInspectorObject, std::optional<bool>&& showRulers)
{
Inspector::Protocol::ErrorString errorString;
@@ -3499,7 +3420,7 @@ index 08bdd6e6cd5295f4be4df37c3e3e830b03916dc7..078ef814e006a45c4b83ff1c2ff341a9
if (!node)
return makeUnexpected(errorString);
-@@ -1857,15 +1885,159 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::setInspectedNode(Ins
+@@ -1858,15 +1886,159 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::setInspectedNode(Ins
return { };
}
@@ -3662,7 +3583,7 @@ index 08bdd6e6cd5295f4be4df37c3e3e830b03916dc7..078ef814e006a45c4b83ff1c2ff341a9
if (!object)
return makeUnexpected("Missing injected script for given nodeId"_s);
-@@ -3131,7 +3303,7 @@ Inspector::Protocol::ErrorStringOr<Inspector::Protocol::DOM::NodeId> InspectorDO
+@@ -3132,7 +3304,7 @@ Inspector::Protocol::ErrorStringOr<Inspector::Protocol::DOM::NodeId> InspectorDO
return makeUnexpected("Missing node for given path"_s);
}
@@ -3671,7 +3592,7 @@ index 08bdd6e6cd5295f4be4df37c3e3e830b03916dc7..078ef814e006a45c4b83ff1c2ff341a9
{
Document* document = &node->document();
if (auto* templateHost = document->templateDocumentHost())
-@@ -3140,12 +3312,18 @@ RefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNod
+@@ -3141,12 +3313,18 @@ RefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNod
if (!frame)
return nullptr;
@@ -3693,7 +3614,7 @@ index 08bdd6e6cd5295f4be4df37c3e3e830b03916dc7..078ef814e006a45c4b83ff1c2ff341a9
}
Node* InspectorDOMAgent::scriptValueAsNode(JSC::JSValue value)
-@@ -3291,4 +3469,53 @@ Inspector::Protocol::ErrorStringOr<Ref<Inspector::Protocol::DOM::MediaStats>> In
+@@ -3292,4 +3470,53 @@ Inspector::Protocol::ErrorStringOr<Ref<Inspector::Protocol::DOM::MediaStats>> In
#endif
}
@@ -3748,7 +3669,7 @@ index 08bdd6e6cd5295f4be4df37c3e3e830b03916dc7..078ef814e006a45c4b83ff1c2ff341a9
+
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.h b/Source/WebCore/inspector/agents/InspectorDOMAgent.h
-index 185ba93a265317bf876cc5fedd5f3d5cf3a8757e..664fc4f47f0540e5b84d96ba4c6a530d44aacf25 100644
+index cd5edd3322a55e72643560ad852af14f7104f35b..25c3d3c73c3b9395323b4c853a70d5502c15ae52 100644
--- a/Source/WebCore/inspector/agents/InspectorDOMAgent.h
+++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.h
@@ -59,6 +59,7 @@ namespace WebCore {
@@ -3821,7 +3742,7 @@ index 185ba93a265317bf876cc5fedd5f3d5cf3a8757e..664fc4f47f0540e5b84d96ba4c6a530d
void discardBindings();
diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
-index dfb469de2c5dcaa39b03ef6c188eda34d869401c..4d1fb3b02d63c8b425b50b92c25f334334e8ac86 100644
+index 49a732b0e976efae1ec6f687efb31efe0dca01de..a2f723b067cd4aff83e29e341ee90925dc48f281 100644
--- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
+++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
@@ -58,6 +58,7 @@
@@ -3938,7 +3859,7 @@ index dfb469de2c5dcaa39b03ef6c188eda34d869401c..4d1fb3b02d63c8b425b50b92c25f3343
{
return startsWithLettersIgnoringASCIICase(mimeType, "text/"_s)
diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h
-index 66da07b880259dd1388703cb6c8c7b10d63c32d7..ff00bc16dd84f34056fe0b36896c0049d8fa9a49 100644
+index 7ae1b53be8a9b5f0d0e2787a22f5534500b7ab19..f6f33d05bcdb4084f55631fdcfd3b4d012dfc804 100644
--- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h
+++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h
@@ -35,6 +35,8 @@
@@ -3975,10 +3896,10 @@ index 66da07b880259dd1388703cb6c8c7b10d63c32d7..ff00bc16dd84f34056fe0b36896c0049
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
-index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e19a9056d 100644
+index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bcf4e1a7ce 100644
--- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
+++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
-@@ -32,19 +32,27 @@
+@@ -32,20 +32,28 @@
#include "config.h"
#include "InspectorPageAgent.h"
@@ -3995,6 +3916,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
#include "DocumentLoader.h"
+#include "Editor.h"
#include "ElementInlines.h"
+ #include "EventTargetInlines.h"
+#include "FocusController.h"
#include "ForcedAccessibilityValue.h"
#include "FrameLoadRequest.h"
@@ -4005,8 +3927,8 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
+#include "HTMLInputElement.h"
#include "HTMLNames.h"
#include "ImageBuffer.h"
- #include "InspectorClient.h"
-@@ -57,24 +65,38 @@
+ #include "InspectorBackendClient.h"
+@@ -58,24 +66,38 @@
#include "MIMETypeRegistry.h"
#include "MemoryCache.h"
#include "Page.h"
@@ -4045,7 +3967,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
#include <wtf/text/StringBuilder.h>
#if ENABLE(APPLICATION_MANIFEST)
-@@ -96,6 +118,11 @@ using namespace Inspector;
+@@ -97,6 +119,11 @@ using namespace Inspector;
WTF_MAKE_TZONE_ALLOCATED_IMPL(InspectorPageAgent);
@@ -4057,7 +3979,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
static bool decodeBuffer(std::span<const uint8_t> buffer, const String& textEncodingName, String* result)
{
if (buffer.data()) {
-@@ -348,6 +375,7 @@ InspectorPageAgent::InspectorPageAgent(PageAgentContext& context, InspectorClien
+@@ -350,6 +377,7 @@ InspectorPageAgent::InspectorPageAgent(PageAgentContext& context, InspectorBacke
, m_frontendDispatcher(makeUniqueRef<Inspector::PageFrontendDispatcher>(context.frontendRouter))
, m_backendDispatcher(Inspector::PageBackendDispatcher::create(context.backendDispatcher, this))
, m_inspectedPage(context.inspectedPage)
@@ -4065,7 +3987,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
, m_client(client)
, m_overlay(overlay)
{
-@@ -377,12 +405,20 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::enable()
+@@ -379,12 +407,20 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::enable()
defaultUserPreferencesDidChange();
@@ -4086,7 +4008,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
setShowPaintRects(false);
#if !PLATFORM(IOS_FAMILY)
-@@ -435,6 +471,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::reload(std::optiona
+@@ -437,6 +473,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::reload(std::optiona
return { };
}
@@ -4109,7 +4031,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::navigate(const String& url)
{
RefPtr localMainFrame = m_inspectedPage->localMainFrame();
-@@ -461,6 +513,13 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideUserAgent(c
+@@ -463,6 +515,13 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideUserAgent(c
return { };
}
@@ -4123,7 +4045,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Inspector::Protocol::Page::Setting setting, std::optional<bool>&& value)
{
auto& inspectedPageSettings = m_inspectedPage->settings();
-@@ -474,6 +533,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+@@ -476,6 +535,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
inspectedPageSettings.setAuthorAndUserStylesEnabledInspectorOverride(value);
return { };
@@ -4136,8 +4058,8 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
case Inspector::Protocol::Page::Setting::ICECandidateFilteringEnabled:
inspectedPageSettings.setICECandidateFilteringEnabledInspectorOverride(value);
return { };
-@@ -500,6 +565,39 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
- m_client->setDeveloperPreferenceOverride(InspectorClient::DeveloperPreference::NeedsSiteSpecificQuirks, value);
+@@ -502,6 +567,39 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+ m_client->setDeveloperPreferenceOverride(InspectorBackendClient::DeveloperPreference::NeedsSiteSpecificQuirks, value);
return { };
+#if ENABLE(NOTIFICATIONS)
@@ -4176,7 +4098,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
case Inspector::Protocol::Page::Setting::ScriptEnabled:
inspectedPageSettings.setScriptEnabledInspectorOverride(value);
return { };
-@@ -512,6 +610,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+@@ -514,6 +612,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
inspectedPageSettings.setShowRepaintCounterInspectorOverride(value);
return { };
@@ -4189,7 +4111,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
case Inspector::Protocol::Page::Setting::WebSecurityEnabled:
inspectedPageSettings.setWebSecurityEnabledInspectorOverride(value);
return { };
-@@ -920,15 +1024,16 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setShowPaintRects(b
+@@ -922,15 +1026,16 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setShowPaintRects(b
return { };
}
@@ -4211,7 +4133,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
}
void InspectorPageAgent::frameNavigated(LocalFrame& frame)
-@@ -936,13 +1041,29 @@ void InspectorPageAgent::frameNavigated(LocalFrame& frame)
+@@ -938,13 +1043,29 @@ void InspectorPageAgent::frameNavigated(LocalFrame& frame)
m_frontendDispatcher->frameNavigated(buildObjectForFrame(&frame));
}
@@ -4244,7 +4166,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
}
Frame* InspectorPageAgent::frameForId(const Inspector::Protocol::Network::FrameId& frameId)
-@@ -954,20 +1075,21 @@ String InspectorPageAgent::frameId(Frame* frame)
+@@ -956,20 +1077,21 @@ String InspectorPageAgent::frameId(Frame* frame)
{
if (!frame)
return emptyString();
@@ -4274,7 +4196,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
}
LocalFrame* InspectorPageAgent::assertFrame(Inspector::Protocol::ErrorString& errorString, const Inspector::Protocol::Network::FrameId& frameId)
-@@ -978,11 +1100,6 @@ LocalFrame* InspectorPageAgent::assertFrame(Inspector::Protocol::ErrorString& er
+@@ -980,11 +1102,6 @@ LocalFrame* InspectorPageAgent::assertFrame(Inspector::Protocol::ErrorString& er
return frame;
}
@@ -4286,7 +4208,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
void InspectorPageAgent::frameStartedLoading(LocalFrame& frame)
{
m_frontendDispatcher->frameStartedLoading(frameId(&frame));
-@@ -993,9 +1110,9 @@ void InspectorPageAgent::frameStoppedLoading(LocalFrame& frame)
+@@ -995,9 +1112,9 @@ void InspectorPageAgent::frameStoppedLoading(LocalFrame& frame)
m_frontendDispatcher->frameStoppedLoading(frameId(&frame));
}
@@ -4298,7 +4220,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
}
void InspectorPageAgent::frameClearedScheduledNavigation(Frame& frame)
-@@ -1042,6 +1159,12 @@ void InspectorPageAgent::defaultUserPreferencesDidChange()
+@@ -1044,6 +1161,12 @@ void InspectorPageAgent::defaultUserPreferencesDidChange()
m_frontendDispatcher->defaultUserPreferencesDidChange(WTFMove(defaultUserPreferences));
}
@@ -4311,7 +4233,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
#if ENABLE(DARK_MODE_CSS)
void InspectorPageAgent::defaultAppearanceDidChange()
{
-@@ -1055,6 +1178,9 @@ void InspectorPageAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapp
+@@ -1057,6 +1180,9 @@ void InspectorPageAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapp
return;
if (m_bootstrapScript.isEmpty())
@@ -4321,7 +4243,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
return;
frame.script().evaluateIgnoringException(ScriptSourceCode(m_bootstrapScript, JSC::SourceTaintedOrigin::Untainted, URL { "web-inspector://bootstrap.js"_str }));
-@@ -1102,6 +1228,51 @@ void InspectorPageAgent::didRecalculateStyle()
+@@ -1104,6 +1230,51 @@ void InspectorPageAgent::didRecalculateStyle()
protectedOverlay()->update();
}
@@ -4373,7 +4295,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
Ref<Inspector::Protocol::Page::Frame> InspectorPageAgent::buildObjectForFrame(LocalFrame* frame)
{
ASSERT_ARG(frame, frame);
-@@ -1195,6 +1366,12 @@ void InspectorPageAgent::applyUserAgentOverride(String& userAgent)
+@@ -1197,6 +1368,12 @@ void InspectorPageAgent::applyUserAgentOverride(String& userAgent)
userAgent = m_userAgentOverride;
}
@@ -4386,7 +4308,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
void InspectorPageAgent::applyEmulatedMedia(AtomString& media)
{
if (!m_emulatedMedia.isEmpty())
-@@ -1222,11 +1399,13 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotNode(Insp
+@@ -1224,11 +1401,13 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotNode(Insp
return snapshot->toDataURL("image/png"_s, std::nullopt, PreserveResolution::Yes);
}
@@ -4401,7 +4323,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
IntRect rectangle(x, y, width, height);
RefPtr localMainFrame = m_inspectedPage->localMainFrame();
-@@ -1240,6 +1419,43 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int
+@@ -1242,6 +1421,43 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int
return snapshot->toDataURL("image/png"_s, std::nullopt, PreserveResolution::Yes);
}
@@ -4445,7 +4367,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
#if ENABLE(WEB_ARCHIVE) && USE(CF)
Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
{
-@@ -1256,7 +1472,6 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
+@@ -1258,7 +1474,6 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
}
#endif
@@ -4453,7 +4375,7 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverride(std::optional<int>&& width, std::optional<int>&& height)
{
if (width.has_value() != height.has_value())
-@@ -1274,6 +1489,496 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverri
+@@ -1276,6 +1491,496 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverri
localMainFrame->setOverrideScreenSize(FloatSize(width.value_or(0), height.value_or(0)));
return { };
}
@@ -4952,21 +4874,10 @@ index 7ec43a15440452915980d0eca565f25b8c6880e9..868a6279fd57ddc3f880eeef18d0559e
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.h b/Source/WebCore/inspector/agents/InspectorPageAgent.h
-index 169a3023f68227a6ab6538dc6b1271882154deb9..b300be1ff6f278a79601613f76266c06c5ac92a8 100644
+index d8a8b85ff220105e832a6d8075982f4722197afb..dc4a5caea97e3458bd9884e1265a92e72b727bc0 100644
--- a/Source/WebCore/inspector/agents/InspectorPageAgent.h
+++ b/Source/WebCore/inspector/agents/InspectorPageAgent.h
-@@ -32,8 +32,10 @@
- #pragma once
-
- #include "CachedResource.h"
-+#include "FrameIdentifier.h"
- #include "InspectorWebAgentBase.h"
- #include "LayoutRect.h"
-+#include "ProcessIdentifier.h"
- #include <JavaScriptCore/InspectorBackendDispatchers.h>
- #include <JavaScriptCore/InspectorFrontendDispatchers.h>
- #include <JavaScriptCore/InspectorProtocolObjects.h>
-@@ -43,11 +45,16 @@
+@@ -43,11 +43,16 @@
#include <wtf/WeakRef.h>
#include <wtf/text/WTFString.h>
@@ -4980,10 +4891,10 @@ index 169a3023f68227a6ab6538dc6b1271882154deb9..b300be1ff6f278a79601613f76266c06
class DocumentLoader;
class Frame;
+class HTMLInputElement;
- class InspectorClient;
+ class InspectorBackendClient;
class InspectorOverlay;
class LocalFrame;
-@@ -80,6 +87,8 @@ public:
+@@ -80,6 +85,8 @@ public:
OtherResource,
};
@@ -4992,7 +4903,7 @@ index 169a3023f68227a6ab6538dc6b1271882154deb9..b300be1ff6f278a79601613f76266c06
static bool sharedBufferContent(RefPtr<FragmentedSharedBuffer>&&, const String& textEncodingName, bool withBase64Encode, String* result);
static Vector<CachedResource*> cachedResourcesForFrame(LocalFrame*);
static void resourceContent(Inspector::Protocol::ErrorString&, LocalFrame*, const URL&, String* result, bool* base64Encoded);
-@@ -100,8 +109,11 @@ public:
+@@ -100,8 +107,11 @@ public:
Inspector::Protocol::ErrorStringOr<void> enable();
Inspector::Protocol::ErrorStringOr<void> disable();
Inspector::Protocol::ErrorStringOr<void> reload(std::optional<bool>&& ignoreCache, std::optional<bool>&& revalidateAllResources);
@@ -5004,7 +4915,7 @@ index 169a3023f68227a6ab6538dc6b1271882154deb9..b300be1ff6f278a79601613f76266c06
Inspector::Protocol::ErrorStringOr<void> overrideSetting(Inspector::Protocol::Page::Setting, std::optional<bool>&& value);
Inspector::Protocol::ErrorStringOr<void> overrideUserPreference(Inspector::Protocol::Page::UserPreferenceName, std::optional<Inspector::Protocol::Page::UserPreferenceValue>&&);
Inspector::Protocol::ErrorStringOr<Ref<JSON::ArrayOf<Inspector::Protocol::Page::Cookie>>> getCookies();
-@@ -117,45 +129,65 @@ public:
+@@ -117,45 +127,65 @@ public:
#endif
Inspector::Protocol::ErrorStringOr<void> setShowPaintRects(bool);
Inspector::Protocol::ErrorStringOr<void> setEmulatedMedia(const String&);
@@ -5077,12 +4988,12 @@ index 169a3023f68227a6ab6538dc6b1271882154deb9..b300be1ff6f278a79601613f76266c06
Ref<InspectorOverlay> protectedOverlay() const;
-@@ -173,17 +205,22 @@ private:
+@@ -173,17 +203,22 @@ private:
const Ref<Inspector::PageBackendDispatcher> m_backendDispatcher;
WeakRef<Page> m_inspectedPage;
+ Inspector::InjectedScriptManager& m_injectedScriptManager;
- InspectorClient* m_client { nullptr };
+ InspectorBackendClient* m_client { nullptr };
WeakRef<InspectorOverlay> m_overlay;
- WeakHashMap<Frame, String> m_frameToIdentifier;
@@ -5268,7 +5179,7 @@ index 6544b61b15956b218e97814b0ceb7250809f8ed3..c6657031bcd27573533a34be62e0ea0d
} // namespace WebCore
diff --git a/Source/WebCore/loader/CookieJar.h b/Source/WebCore/loader/CookieJar.h
-index 5dbca10d65d0426d90c743b789e18c3786025817..56b1aa222343649be7c28e104e6ae1dde598e59f 100644
+index ed8bec9c10c9d1bf659efab09f77ad7d8e439594..49bdaf8b08d157ecb7cd412ea847eb8ceedb8adf 100644
--- a/Source/WebCore/loader/CookieJar.h
+++ b/Source/WebCore/loader/CookieJar.h
@@ -48,6 +48,7 @@ class NetworkStorageSession;
@@ -5290,10 +5201,10 @@ index 5dbca10d65d0426d90c743b789e18c3786025817..56b1aa222343649be7c28e104e6ae1dd
protected:
static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No);
diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
-index c63569ec7dbb402d261f16a5b5febdf428cfe749..b5cff81dcf8fbcc5a0a8cb6f05857f4382b090be 100644
+index 861b82e0ae132215c5c319e94a3ca42028557990..4031b67577112eae8cf28099425cc40c42c81f6e 100644
--- a/Source/WebCore/loader/DocumentLoader.cpp
+++ b/Source/WebCore/loader/DocumentLoader.cpp
-@@ -775,8 +775,10 @@ void DocumentLoader::willSendRequest(ResourceRequest&& newRequest, const Resourc
+@@ -776,8 +776,10 @@ void DocumentLoader::willSendRequest(ResourceRequest&& newRequest, const Resourc
if (!didReceiveRedirectResponse)
return completionHandler(WTFMove(newRequest));
@@ -5304,7 +5215,7 @@ index c63569ec7dbb402d261f16a5b5febdf428cfe749..b5cff81dcf8fbcc5a0a8cb6f05857f43
switch (navigationPolicyDecision) {
case NavigationPolicyDecision::IgnoreLoad:
case NavigationPolicyDecision::LoadWillContinueInAnotherProcess:
-@@ -1592,11 +1594,17 @@ void DocumentLoader::detachFromFrame(LoadWillContinueInAnotherProcess loadWillCo
+@@ -1601,11 +1603,17 @@ void DocumentLoader::detachFromFrame(LoadWillContinueInAnotherProcess loadWillCo
if (auto navigationID = std::exchange(m_navigationID, { }))
frame->loader().client().documentLoaderDetached(*navigationID, loadWillContinueInAnotherProcess);
@@ -5325,7 +5236,7 @@ index c63569ec7dbb402d261f16a5b5febdf428cfe749..b5cff81dcf8fbcc5a0a8cb6f05857f43
{
m_navigationID = navigationID;
diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h
-index 061494ea45af99d0516cf16af3f11c25a180e970..eff67613ea81446d7f53ecf2e66d5b428b4c6bab 100644
+index 7f1ae6df69510c2dbdeedc1163b31bd968e6da01..3767fe35412c3c1cb6739dfd178aacae527b86a7 100644
--- a/Source/WebCore/loader/DocumentLoader.h
+++ b/Source/WebCore/loader/DocumentLoader.h
@@ -220,6 +220,8 @@ public:
@@ -5338,10 +5249,10 @@ index 061494ea45af99d0516cf16af3f11c25a180e970..eff67613ea81446d7f53ecf2e66d5b42
WEBCORE_EXPORT RefPtr<FrameLoader> protectedFrameLoader() const;
WEBCORE_EXPORT SubresourceLoader* mainResourceLoader() const;
diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
-index 1263d20c197bc21cb5a4098a07493943fd2830e4..fbcfaa000c4095c9ba9257dfb2229424229ee670 100644
+index 81336952a927d10a54a5282edef51d67024a3d91..6f042943462e1c69ccffd57cf49724d032f1ce65 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
-@@ -1332,6 +1332,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr<SerializedScriptValue> stat
+@@ -1334,6 +1334,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr<SerializedScriptValue> stat
}
m_client->dispatchDidNavigateWithinPage();
@@ -5349,7 +5260,7 @@ index 1263d20c197bc21cb5a4098a07493943fd2830e4..fbcfaa000c4095c9ba9257dfb2229424
document->statePopped(stateObject ? stateObject.releaseNonNull() : SerializedScriptValue::nullValue());
m_client->dispatchDidPopStateWithinPage();
-@@ -1874,6 +1875,7 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
+@@ -1876,6 +1877,7 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
const String& httpMethod = loader->request().httpMethod();
if (shouldPerformFragmentNavigation(isFormSubmission, httpMethod, policyChecker().loadType(), newURL)) {
@@ -5357,7 +5268,7 @@ index 1263d20c197bc21cb5a4098a07493943fd2830e4..fbcfaa000c4095c9ba9257dfb2229424
RefPtr oldDocumentLoader = m_documentLoader;
NavigationAction action { frame->protectedDocument().releaseNonNull(), loader->request(), InitiatedByMainFrame::Unknown, loader->isRequestFromClientOrUserInput(), policyChecker().loadType(), isFormSubmission };
-@@ -1912,7 +1914,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
+@@ -1914,7 +1916,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
auto policyDecisionMode = loader->triggeringAction().isFromNavigationAPI() ? PolicyDecisionMode::Synchronous : PolicyDecisionMode::Asynchronous;
RELEASE_ASSERT(!isBackForwardLoadType(policyChecker().loadType()) || history().provisionalItem());
@@ -5367,7 +5278,7 @@ index 1263d20c197bc21cb5a4098a07493943fd2830e4..fbcfaa000c4095c9ba9257dfb2229424
continueLoadAfterNavigationPolicy(request, RefPtr { weakFormState.get() }.get(), navigationPolicyDecision, allowNavigationToInvalidURL);
completionHandler();
}, policyDecisionMode);
-@@ -3238,10 +3242,15 @@ String FrameLoader::userAgent(const URL& url) const
+@@ -3250,10 +3254,15 @@ String FrameLoader::userAgent(const URL& url) const
String FrameLoader::navigatorPlatform() const
{
@@ -5385,7 +5296,7 @@ index 1263d20c197bc21cb5a4098a07493943fd2830e4..fbcfaa000c4095c9ba9257dfb2229424
}
void FrameLoader::dispatchOnloadEvents()
-@@ -3702,6 +3711,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error, LoadWill
+@@ -3715,6 +3724,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error, LoadWill
checkCompleted();
if (frame->page())
checkLoadComplete(loadWillContinueInAnotherProcess);
@@ -5394,7 +5305,7 @@ index 1263d20c197bc21cb5a4098a07493943fd2830e4..fbcfaa000c4095c9ba9257dfb2229424
}
void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, const SecurityOrigin* requesterOrigin, bool shouldContinue, NavigationHistoryBehavior historyHandling)
-@@ -4591,9 +4602,6 @@ String FrameLoader::referrer() const
+@@ -4672,9 +4683,6 @@ String FrameLoader::referrer() const
void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
{
@@ -5404,7 +5315,7 @@ index 1263d20c197bc21cb5a4098a07493943fd2830e4..fbcfaa000c4095c9ba9257dfb2229424
Vector<Ref<DOMWrapperWorld>> worlds;
ScriptController::getAllWorlds(worlds);
for (auto& world : worlds)
-@@ -4603,13 +4611,12 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
+@@ -4684,13 +4692,12 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world)
{
Ref frame = m_frame.get();
@@ -5425,7 +5336,7 @@ index 1263d20c197bc21cb5a4098a07493943fd2830e4..fbcfaa000c4095c9ba9257dfb2229424
InspectorInstrumentation::didClearWindowObjectInWorld(frame, world);
}
diff --git a/Source/WebCore/loader/LoaderStrategy.h b/Source/WebCore/loader/LoaderStrategy.h
-index a33d00c3ce3a861f8746e58b01ea51e5777cb2ea..9cf20e3c47c7a0bb9db72b9385431cc3df48df86 100644
+index 31d9bf99b45e972aab694f3f5d6f48ab73f8a85d..9ff42c5fc8ca162128fa853e0c36b87cd29301c2 100644
--- a/Source/WebCore/loader/LoaderStrategy.h
+++ b/Source/WebCore/loader/LoaderStrategy.h
@@ -86,6 +86,7 @@ public:
@@ -5437,10 +5348,10 @@ index a33d00c3ce3a861f8746e58b01ea51e5777cb2ea..9cf20e3c47c7a0bb9db72b9385431cc3
virtual bool shouldPerformSecurityChecks() const { return false; }
virtual bool havePerformedSecurityChecks(const ResourceResponse&) const { return false; }
diff --git a/Source/WebCore/loader/NavigationScheduler.cpp b/Source/WebCore/loader/NavigationScheduler.cpp
-index 350f729ee5dc95ba3dd7018542db1dbfb00b382e..f8d31dfc86c0cbc10b474e1773ddbf682b3c9b66 100644
+index 181ebdf4bc5665aa808eebc29c005533a7bf06fe..4fb3f9fb2703189f96ca6863f57b0517f373378a 100644
--- a/Source/WebCore/loader/NavigationScheduler.cpp
+++ b/Source/WebCore/loader/NavigationScheduler.cpp
-@@ -803,7 +803,7 @@ void NavigationScheduler::startTimer()
+@@ -828,7 +828,7 @@ void NavigationScheduler::startTimer()
Seconds delay = 1_s * m_redirect->delay();
m_timer.startOneShot(delay);
@@ -5450,7 +5361,7 @@ index 350f729ee5dc95ba3dd7018542db1dbfb00b382e..f8d31dfc86c0cbc10b474e1773ddbf68
}
diff --git a/Source/WebCore/loader/ProgressTracker.cpp b/Source/WebCore/loader/ProgressTracker.cpp
-index 1832114445abe51041c241f40df9731d6e0a2f8d..3213517c4cd0b235ff12c098e34389987e6ea090 100644
+index 44b78d002e37a4850da17b2a265664b9aeaaacfe..011b696dbcd01673623384e6e4dc62e439e9c1dc 100644
--- a/Source/WebCore/loader/ProgressTracker.cpp
+++ b/Source/WebCore/loader/ProgressTracker.cpp
@@ -163,6 +163,8 @@ void ProgressTracker::progressCompleted(LocalFrame& frame)
@@ -5472,10 +5383,10 @@ index 1832114445abe51041c241f40df9731d6e0a2f8d..3213517c4cd0b235ff12c098e3438998
}
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
-index b78b91913be6fd14efc7621e251bb5adab05c315..b7f3252e4f201c2c44bca48997f20a3205301486 100644
+index 32762aa1a9fc99396eef869712e246f1f6f8b2b9..4421250371bbd354efea32ba3339daca5830da45 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
-@@ -1180,8 +1180,11 @@ ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requ
+@@ -1121,8 +1121,11 @@ ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requ
request.updateReferrerPolicy(document ? document->referrerPolicy() : ReferrerPolicy::Default);
@@ -5489,7 +5400,7 @@ index b78b91913be6fd14efc7621e251bb5adab05c315..b7f3252e4f201c2c44bca48997f20a32
if (RefPtr documentLoader = m_documentLoader.get()) {
bool madeHTTPS { request.resourceRequest().wasSchemeOptimisticallyUpgraded() };
-@@ -1816,8 +1819,9 @@ Vector<Ref<SVGImage>> CachedResourceLoader::allCachedSVGImages() const
+@@ -1757,8 +1760,9 @@ Vector<Ref<SVGImage>> CachedResourceLoader::allCachedSVGImages() const
ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::preload(CachedResource::Type type, CachedResourceRequest&& request)
{
@@ -5502,10 +5413,10 @@ index b78b91913be6fd14efc7621e251bb5adab05c315..b7f3252e4f201c2c44bca48997f20a32
RefPtr document = m_document.get();
ASSERT(document);
diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h
-index 7f6d70366b7841b4e5215a3b8709554fe995ba64..342de0c124714355bd5beaea78310500a9c184b7 100644
+index 21c2bbf6c049ef1af19cd78f769af84608914761..afd373b6c553fce8020f1e3832615e4e4347c82e 100644
--- a/Source/WebCore/page/ChromeClient.h
+++ b/Source/WebCore/page/ChromeClient.h
-@@ -379,7 +379,7 @@ public:
+@@ -385,7 +385,7 @@ public:
#endif
#if ENABLE(ORIENTATION_EVENTS)
@@ -5515,10 +5426,10 @@ index 7f6d70366b7841b4e5215a3b8709554fe995ba64..342de0c124714355bd5beaea78310500
virtual RefPtr<ColorChooser> createColorChooser(ColorChooserClient&, const Color&) = 0;
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
-index d501516df133e721bc2dcf580b4dd1533b3368f3..63fac9ac1a69d522ed733dae33945ca6b685e4e4 100644
+index f936eb54cafd3a196082b3cc5df4a0541bad75ec..06c159e98ce09f261293b47b4136c212f9656db5 100644
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
-@@ -4515,6 +4515,12 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr
+@@ -4538,6 +4538,12 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr
if (!document)
return false;
@@ -5531,7 +5442,7 @@ index d501516df133e721bc2dcf580b4dd1533b3368f3..63fac9ac1a69d522ed733dae33945ca6
dragState().dataTransfer = DataTransfer::createForDrag(*document);
auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No;
-@@ -5119,6 +5125,7 @@ static HitTestResult hitTestResultInFrame(LocalFrame* frame, const LayoutPoint&
+@@ -5142,6 +5148,7 @@ static HitTestResult hitTestResultInFrame(LocalFrame* frame, const LayoutPoint&
return result;
}
@@ -5539,7 +5450,7 @@ index d501516df133e721bc2dcf580b4dd1533b3368f3..63fac9ac1a69d522ed733dae33945ca6
Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
{
Ref frame = m_frame.get();
-@@ -5192,7 +5199,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+@@ -5215,7 +5222,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
// Increment the platform touch id by 1 to avoid storing a key of 0 in the hashmap.
unsigned touchPointTargetKey = point.id() + 1;
@@ -5548,7 +5459,7 @@ index d501516df133e721bc2dcf580b4dd1533b3368f3..63fac9ac1a69d522ed733dae33945ca6
bool pointerCancelled = false;
#endif
RefPtr<EventTarget> touchTarget;
-@@ -5239,7 +5246,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+@@ -5262,7 +5269,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
// we also remove it from the map.
touchTarget = m_originatingTouchPointTargets.take(touchPointTargetKey);
@@ -5557,7 +5468,7 @@ index d501516df133e721bc2dcf580b4dd1533b3368f3..63fac9ac1a69d522ed733dae33945ca6
HitTestResult result = hitTestResultAtPoint(pagePoint, hitType | HitTestRequest::Type::AllowChildFrameContent);
pointerTarget = result.targetElement();
pointerCancelled = (pointerTarget != touchTarget);
-@@ -5262,7 +5269,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+@@ -5285,7 +5292,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
if (!targetFrame)
continue;
@@ -5566,7 +5477,7 @@ index d501516df133e721bc2dcf580b4dd1533b3368f3..63fac9ac1a69d522ed733dae33945ca6
// FIXME: WPE currently does not send touch stationary events, so create a naive TouchReleased PlatformTouchPoint
// on release if the hit test result changed since the previous TouchPressed or TouchMoved
if (pointState == PlatformTouchPoint::TouchReleased && pointerCancelled) {
-@@ -5352,6 +5359,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+@@ -5372,6 +5379,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
return swallowedEvent;
}
@@ -5575,10 +5486,10 @@ index d501516df133e721bc2dcf580b4dd1533b3368f3..63fac9ac1a69d522ed733dae33945ca6
#if ENABLE(TOUCH_EVENTS)
diff --git a/Source/WebCore/page/FocusController.cpp b/Source/WebCore/page/FocusController.cpp
-index 79636a0a8528bfd4e86d8373f9ab7e96e9ac8346..f2a2ebeb6a7e41a3900d35dabde88f9fd7c4ae82 100644
+index e6db35ac9107cd946660165d18fb9598b1a51fa7..e7befc07490d52f518aab1a212edde1b8f1f621d 100644
--- a/Source/WebCore/page/FocusController.cpp
+++ b/Source/WebCore/page/FocusController.cpp
-@@ -595,13 +595,14 @@ bool FocusController::relinquishFocusToChrome(FocusDirection direction)
+@@ -613,13 +613,14 @@ bool FocusController::relinquishFocusToChrome(FocusDirection direction)
return false;
Ref page = m_page.get();
@@ -5596,10 +5507,10 @@ index 79636a0a8528bfd4e86d8373f9ab7e96e9ac8346..f2a2ebeb6a7e41a3900d35dabde88f9f
}
diff --git a/Source/WebCore/page/FrameSnapshotting.cpp b/Source/WebCore/page/FrameSnapshotting.cpp
-index 3474800864049dcbe6c84746c4216e72a68fa48f..8f5d536921eeb41c77fe689c036dcb77e625e431 100644
+index c0f0a17079be7a5574c40fdbbdeeedd3a45ef078..b6480851049f40e9f64926dda0407bb4d3be97e7 100644
--- a/Source/WebCore/page/FrameSnapshotting.cpp
+++ b/Source/WebCore/page/FrameSnapshotting.cpp
-@@ -115,7 +115,7 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
+@@ -120,7 +120,7 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
// Other paint behaviors are set by paintContentsForSnapshot.
frame.view()->setPaintBehavior(paintBehavior);
@@ -5608,7 +5519,7 @@ index 3474800864049dcbe6c84746c4216e72a68fa48f..8f5d536921eeb41c77fe689c036dcb77
if (options.flags.contains(SnapshotFlags::PaintWith3xBaseScale))
scaleFactor = 3;
-@@ -134,6 +134,8 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
+@@ -139,6 +139,8 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
return nullptr;
buffer->context().translate(-imageRect.location());
@@ -5617,7 +5528,7 @@ index 3474800864049dcbe6c84746c4216e72a68fa48f..8f5d536921eeb41c77fe689c036dcb77
if (!clipRects.isEmpty()) {
Path clipPath;
-@@ -142,7 +144,10 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
+@@ -147,7 +149,10 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
buffer->context().clipPath(clipPath);
}
@@ -5630,19 +5541,19 @@ index 3474800864049dcbe6c84746c4216e72a68fa48f..8f5d536921eeb41c77fe689c036dcb77
}
diff --git a/Source/WebCore/page/FrameSnapshotting.h b/Source/WebCore/page/FrameSnapshotting.h
-index fd9df9d9564fe29c64342fbf77082ad595612e90..af5687c79e2a5be20cde653107e5827c1d8981e5 100644
+index 77611af092f6afa507b1d42a98c3c1bef7736e0f..e0f94ad9b728bc02b08f15a43dcabd65099aec7e 100644
--- a/Source/WebCore/page/FrameSnapshotting.h
+++ b/Source/WebCore/page/FrameSnapshotting.h
-@@ -58,6 +58,7 @@ enum class SnapshotFlags : uint16_t {
- PaintWith3xBaseScale = 1 << 10,
+@@ -59,6 +59,7 @@ enum class SnapshotFlags : uint16_t {
ExcludeText = 1 << 11,
FixedAndStickyLayersOnly = 1 << 12,
-+ OmitDeviceScaleFactor = 1 << 13,
+ DraggableElement = 1 << 13,
++ OmitDeviceScaleFactor = 1 << 14,
};
struct SnapshotOptions {
diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp
-index f2dfb5966f445ee52b4430e65e0accb7e41bb913..1d25db7e91beaaea3c083f315ec3f21b317f271f 100644
+index 3513f1c7cc2763d0c15a4fc85a24e341f30dcc6a..0c6c68d1189743d6104a38b47295c9af3a691049 100644
--- a/Source/WebCore/page/History.cpp
+++ b/Source/WebCore/page/History.cpp
@@ -32,6 +32,7 @@
@@ -5663,7 +5574,7 @@ index f2dfb5966f445ee52b4430e65e0accb7e41bb913..1d25db7e91beaaea3c083f315ec3f21b
}
diff --git a/Source/WebCore/page/LocalFrame.cpp b/Source/WebCore/page/LocalFrame.cpp
-index 018a1445506e0b3cae8b7d4056f37bcdd21eb1dd..a1cd251e84d2faa8b58b5ebbf5077bacb1e5bf6e 100644
+index 4fa15f4aaf094cd582d17258955ec9dd7a6e4b4d..7843f89d325eabba5e68f0a2ffd9a346b7b0561e 100644
--- a/Source/WebCore/page/LocalFrame.cpp
+++ b/Source/WebCore/page/LocalFrame.cpp
@@ -42,6 +42,7 @@
@@ -6073,15 +5984,15 @@ index 018a1445506e0b3cae8b7d4056f37bcdd21eb1dd..a1cd251e84d2faa8b58b5ebbf5077bac
#undef FRAME_RELEASE_LOG_ERROR
diff --git a/Source/WebCore/page/LocalFrame.h b/Source/WebCore/page/LocalFrame.h
-index 92a21d8efb29d588a7a530e823079ad299cbd40a..3a925cc017500b37abee9d2d26662f9eccc2eebc 100644
+index d70f9309f700129769d61d7fa697c6e49f55bb44..2647e60e824395d50cd0da90a32f9ead0bfe4892 100644
--- a/Source/WebCore/page/LocalFrame.h
+++ b/Source/WebCore/page/LocalFrame.h
@@ -29,6 +29,7 @@
- #include "DOMPasteAccess.h"
- #include "Frame.h"
-+#include "IntDegrees.h"
- #include "ScrollbarMode.h"
+ #include <WebCore/DOMPasteAccess.h>
+ #include <WebCore/Frame.h>
++#include <WebCore/IntDegrees.h>
+ #include <WebCore/ScrollbarMode.h>
#include <wtf/CheckedRef.h>
#include <wtf/HashSet.h>
@@ -122,8 +123,8 @@ enum {
@@ -6141,10 +6052,10 @@ index 92a21d8efb29d588a7a530e823079ad299cbd40a..3a925cc017500b37abee9d2d26662f9e
const UniqueRef<ViewportArguments> m_viewportArguments;
diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
-index 6b60173931046a6361e7f0d388c6663166236dfe..fe3175f67a82a3328e1a3c1bc74521daa792dedc 100644
+index 83b514b6eb976273023e990d1d47d13ab7fc7119..a893465443a91d6b51ffdfeccba050e5834f8546 100644
--- a/Source/WebCore/page/Page.cpp
+++ b/Source/WebCore/page/Page.cpp
-@@ -667,6 +667,45 @@ void Page::setOverrideViewportArguments(const std::optional<ViewportArguments>&
+@@ -673,6 +673,45 @@ void Page::setOverrideViewportArguments(const std::optional<ViewportArguments>&
localTopDocument->updateViewportArguments();
}
@@ -6190,7 +6101,7 @@ index 6b60173931046a6361e7f0d388c6663166236dfe..fe3175f67a82a3328e1a3c1bc74521da
ScrollingCoordinator* Page::scrollingCoordinator()
{
if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) {
-@@ -4292,6 +4331,26 @@ void Page::setUseDarkAppearanceOverride(std::optional<bool> valueOverride)
+@@ -4337,6 +4376,26 @@ void Page::setUseDarkAppearanceOverride(std::optional<bool> valueOverride)
appearanceDidChange();
}
@@ -6218,10 +6129,10 @@ index 6b60173931046a6361e7f0d388c6663166236dfe..fe3175f67a82a3328e1a3c1bc74521da
{
if (insets == m_fullscreenInsets)
diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
-index cd29ee00f3499c50379f02981fe85e7bdd950d93..10b653145543c308afd3ed1497f622d7adf08e9d 100644
+index cceec7c43b52e8eb1ee7636c8696d25900242fce..ff3981aa969c09def9499dc83b9794e05cd5086a 100644
--- a/Source/WebCore/page/Page.h
+++ b/Source/WebCore/page/Page.h
-@@ -391,6 +391,9 @@ public:
+@@ -396,6 +396,9 @@ public:
const ViewportArguments* overrideViewportArguments() const { return m_overrideViewportArguments.get(); }
WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional<ViewportArguments>&);
@@ -6231,7 +6142,7 @@ index cd29ee00f3499c50379f02981fe85e7bdd950d93..10b653145543c308afd3ed1497f622d7
static void refreshPlugins(bool reload);
WEBCORE_EXPORT PluginData& pluginData();
WEBCORE_EXPORT Ref<PluginData> protectedPluginData();
-@@ -488,6 +491,10 @@ public:
+@@ -493,6 +496,10 @@ public:
#if ENABLE(DRAG_SUPPORT)
DragController& dragController() { return m_dragController.get(); }
const DragController& dragController() const { return m_dragController.get(); }
@@ -6242,7 +6153,7 @@ index cd29ee00f3499c50379f02981fe85e7bdd950d93..10b653145543c308afd3ed1497f622d7
#endif
FocusController& focusController() const { return m_focusController; }
#if ENABLE(CONTEXT_MENUS)
-@@ -671,6 +678,10 @@ public:
+@@ -676,6 +683,10 @@ public:
WEBCORE_EXPORT void setUseColorAppearance(bool useDarkAppearance, bool useElevatedUserInterfaceLevel);
bool defaultUseDarkAppearance() const { return m_useDarkAppearance; }
void setUseDarkAppearanceOverride(std::optional<bool>);
@@ -6253,7 +6164,7 @@ index cd29ee00f3499c50379f02981fe85e7bdd950d93..10b653145543c308afd3ed1497f622d7
#if ENABLE(TEXT_AUTOSIZING)
float textAutosizingWidth() const { return m_textAutosizingWidth; }
-@@ -1148,6 +1159,11 @@ public:
+@@ -1153,6 +1164,11 @@ public:
WEBCORE_EXPORT void setInteractionRegionsEnabled(bool);
#endif
@@ -6265,7 +6176,7 @@ index cd29ee00f3499c50379f02981fe85e7bdd950d93..10b653145543c308afd3ed1497f622d7
#if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY)
DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); }
#endif
-@@ -1437,6 +1453,9 @@ private:
+@@ -1454,6 +1470,9 @@ private:
#if ENABLE(DRAG_SUPPORT)
const UniqueRef<DragController> m_dragController;
@@ -6275,7 +6186,7 @@ index cd29ee00f3499c50379f02981fe85e7bdd950d93..10b653145543c308afd3ed1497f622d7
#endif
const UniqueRef<FocusController> m_focusController;
#if ENABLE(CONTEXT_MENUS)
-@@ -1515,6 +1534,8 @@ private:
+@@ -1532,6 +1551,8 @@ private:
bool m_useElevatedUserInterfaceLevel { false };
bool m_useDarkAppearance { false };
std::optional<bool> m_useDarkAppearanceOverride;
@@ -6284,7 +6195,7 @@ index cd29ee00f3499c50379f02981fe85e7bdd950d93..10b653145543c308afd3ed1497f622d7
#if ENABLE(TEXT_AUTOSIZING)
float m_textAutosizingWidth { 0 };
-@@ -1696,6 +1717,11 @@ private:
+@@ -1713,6 +1734,11 @@ private:
#endif
std::unique_ptr<ViewportArguments> m_overrideViewportArguments;
@@ -6297,7 +6208,7 @@ index cd29ee00f3499c50379f02981fe85e7bdd950d93..10b653145543c308afd3ed1497f622d7
#if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY)
RefPtr<DeviceOrientationUpdateProvider> m_deviceOrientationUpdateProvider;
diff --git a/Source/WebCore/page/PageConsoleClient.cpp b/Source/WebCore/page/PageConsoleClient.cpp
-index e3f5517e30956f17aea53324fc3c5ce11238254c..278ddea00b98d979797e1e82a5cb3f97239b63bc 100644
+index ae9e4dc7c8573235ad05777d0d4e7d1a0d3a9f94..d5fb47d14fea90b4fb87ffeb65148bca3d9257cf 100644
--- a/Source/WebCore/page/PageConsoleClient.cpp
+++ b/Source/WebCore/page/PageConsoleClient.cpp
@@ -456,4 +456,9 @@ Ref<Page> PageConsoleClient::protectedPage() const
@@ -6323,7 +6234,7 @@ index 153fc36199f26adbfb61cbef6744ffe31a68b951..cc667e06700013fd5e994467e19536d2
Ref<Page> protectedPage() const;
diff --git a/Source/WebCore/page/PointerCaptureController.cpp b/Source/WebCore/page/PointerCaptureController.cpp
-index f01c803f6afa4e2949378bc9a758af4a55681dc5..9d35c28b4ff837f4333ac50bc917513bbf2b5773 100644
+index a4644c7a7a7f5bd55701972c4a8e716b82bde08f..5a0b18b5c842db0cfe63fd42ec402c27782ac5a0 100644
--- a/Source/WebCore/page/PointerCaptureController.cpp
+++ b/Source/WebCore/page/PointerCaptureController.cpp
@@ -207,7 +207,7 @@ bool PointerCaptureController::preventsCompatibilityMouseEventsForIdentifier(Poi
@@ -6345,7 +6256,7 @@ index f01c803f6afa4e2949378bc9a758af4a55681dc5..9d35c28b4ff837f4333ac50bc917513b
#endif
diff --git a/Source/WebCore/page/PointerCaptureController.h b/Source/WebCore/page/PointerCaptureController.h
-index 2c3ae18820bd2be191dbd8d6bd513c0302a1f580..21538527135e659493ee812aa61c943ae37c0b74 100644
+index 5dae225aa25a0421b7e52c9f280795fd6d703113..6482208d93440ec2d5ef8654bc4125745df87464 100644
--- a/Source/WebCore/page/PointerCaptureController.h
+++ b/Source/WebCore/page/PointerCaptureController.h
@@ -60,7 +60,7 @@ public:
@@ -6354,7 +6265,7 @@ index 2c3ae18820bd2be191dbd8d6bd513c0302a1f580..21538527135e659493ee812aa61c943a
-#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE))
+#if ENABLE(TOUCH_EVENTS)
- void dispatchEventForTouchAtIndex(EventTarget&, const PlatformTouchEvent&, unsigned, bool isPrimary, WindowProxy&, const IntPoint&);
+ void dispatchEventForTouchAtIndex(EventTarget&, const PlatformTouchEvent&, unsigned, bool isPrimary, WindowProxy&, const DoublePoint&);
#endif
@@ -81,12 +81,12 @@ private:
@@ -6417,10 +6328,10 @@ index c45965ee6b7fe6c066871b87d7883e639a849adb..16c3a5b027222d1de5bb540c71c0b6aa
}
diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
-index 5ba13e25cbe12ea5c7e543a3e9377f662cbfe50e..b5ab59f41db851cb03a56c9dfaf76e47182f8e85 100644
+index 0b7b89981e028a0eb80b279470e7f9bc8161a419..a3b806975380f8eff991b54be481d0173bd76b58 100644
--- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
+++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
-@@ -374,6 +374,8 @@ template<typename Predicate, typename... Args>
+@@ -352,6 +352,8 @@ template<typename Predicate, typename... Args>
bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, Predicate&& predicate, Args&&... args) const
requires (!std::is_convertible_v<Predicate, ContentSecurityPolicy::ViolatedDirectiveCallback>)
{
@@ -6429,7 +6340,7 @@ index 5ba13e25cbe12ea5c7e543a3e9377f662cbfe50e..b5ab59f41db851cb03a56c9dfaf76e47
bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly;
for (auto& policy : m_policies) {
if (policy->isReportOnly() != isReportOnly)
-@@ -387,6 +389,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
+@@ -365,6 +367,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
template<typename Predicate, typename... Args>
bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, ViolatedDirectiveCallback&& callback, Predicate&& predicate, Args&&... args) const
{
@@ -6438,7 +6349,7 @@ index 5ba13e25cbe12ea5c7e543a3e9377f662cbfe50e..b5ab59f41db851cb03a56c9dfaf76e47
bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly;
bool isAllowed = true;
for (auto& policy : m_policies) {
-@@ -403,6 +407,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
+@@ -381,6 +385,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
template<typename Predicate, typename... Args>
bool ContentSecurityPolicy::allPoliciesAllow(NOESCAPE const ViolatedDirectiveCallback& callback, Predicate&& predicate, Args&&... args) const
{
@@ -6449,10 +6360,10 @@ index 5ba13e25cbe12ea5c7e543a3e9377f662cbfe50e..b5ab59f41db851cb03a56c9dfaf76e47
if (const ContentSecurityPolicyDirective* violatedDirective = (policy.get()->*predicate)(std::forward<Args>(args)...)) {
diff --git a/Source/WebCore/page/wpe/DragControllerWPE.cpp b/Source/WebCore/page/wpe/DragControllerWPE.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..803239911006cfb3b03ea911c003f2d233f67600
+index 0000000000000000000000000000000000000000..7bea08826a16de4774a55c81ccba0d81f7d72472
--- /dev/null
+++ b/Source/WebCore/page/wpe/DragControllerWPE.cpp
-@@ -0,0 +1,80 @@
+@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2007-20 Apple Inc. All rights reserved.
+ *
@@ -6488,6 +6399,8 @@ index 0000000000000000000000000000000000000000..803239911006cfb3b03ea911c003f2d2
+#include "Element.h"
+#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
++#include "LocalFrameInlines.h"
++#include "NodeInlines.h"
+#include "Pasteboard.h"
+#include "markup.h"
+
@@ -6534,18 +6447,9 @@ index 0000000000000000000000000000000000000000..803239911006cfb3b03ea911c003f2d2
+
+}
diff --git a/Source/WebCore/platform/DragData.h b/Source/WebCore/platform/DragData.h
-index f76eab27bd22db72e23cd53d98fe721f0d7e48b7..9757103efe88c0fed3b68671c3042faa29b31433 100644
+index 31e1e62bf7726eb5914be18671ef9ebab401fff2..56243558488229b44ca7a18f444945b3d60ebeff 100644
--- a/Source/WebCore/platform/DragData.h
+++ b/Source/WebCore/platform/DragData.h
-@@ -47,7 +47,7 @@ typedef void* DragDataRef;
-
- #elif PLATFORM(WIN)
- typedef struct IDataObject* DragDataRef;
--#elif PLATFORM(GTK)
-+#elif PLATFORM(GTK) || PLATFORM(WPE)
- namespace WebCore {
- class SelectionData;
- }
@@ -92,8 +92,8 @@ public:
// is initialized by the decoder and not in the constructor.
DragData() = default;
@@ -6567,44 +6471,10 @@ index f76eab27bd22db72e23cd53d98fe721f0d7e48b7..9757103efe88c0fed3b68671c3042faa
bool m_disallowFileAccess { false };
};
diff --git a/Source/WebCore/platform/Pasteboard.h b/Source/WebCore/platform/Pasteboard.h
-index f8de8815d483bd3ac684c018159c593798c0495a..e84ce8eec7424fbc3456623289588b1832d9fb7f 100644
+index 42fd947c994a56dc28d3813dae9461f5a6a99896..fd7ac7ace714da74fc7b48770d738dc839b39d32 100644
--- a/Source/WebCore/platform/Pasteboard.h
+++ b/Source/WebCore/platform/Pasteboard.h
-@@ -46,7 +46,7 @@ OBJC_CLASS NSString;
- OBJC_CLASS NSArray;
- #endif
-
--#if PLATFORM(GTK)
-+#if PLATFORM(GTK) || PLATFORM(WPE)
- #include "SelectionData.h"
- #endif
-
-@@ -200,6 +200,11 @@ public:
- explicit Pasteboard(std::unique_ptr<PasteboardContext>&&, const String& name);
- #endif
-
-+#if PLATFORM(WPE) && ENABLE(DRAG_SUPPORT)
-+ explicit Pasteboard(std::unique_ptr<PasteboardContext>&&, SelectionData&);
-+ explicit Pasteboard(std::unique_ptr<PasteboardContext>&&, SelectionData&&);
-+#endif
-+
- #if PLATFORM(WIN)
- explicit Pasteboard(std::unique_ptr<PasteboardContext>&&, IDataObject*);
- explicit Pasteboard(std::unique_ptr<PasteboardContext>&&, WCDataObject*);
-@@ -266,6 +271,12 @@ public:
- static std::unique_ptr<Pasteboard> createForGlobalSelection(std::unique_ptr<PasteboardContext>&&);
- #endif
-
-+#if PLATFORM(WPE)
-+ const SelectionData& selectionData() const {
-+ return *m_selectionData;
-+ }
-+#endif
-+
- #if PLATFORM(IOS_FAMILY)
- explicit Pasteboard(std::unique_ptr<PasteboardContext>&&, int64_t changeCount);
- explicit Pasteboard(std::unique_ptr<PasteboardContext>&&, const String& pasteboardName);
-@@ -311,6 +322,7 @@ public:
+@@ -311,6 +311,7 @@ public:
COMPtr<IDataObject> dataObject() const { return m_dataObject; }
WEBCORE_EXPORT void setExternalDataObject(IDataObject*);
const DragDataMap& dragDataMap() const { return m_dragDataMap; }
@@ -6612,18 +6482,7 @@ index f8de8815d483bd3ac684c018159c593798c0495a..e84ce8eec7424fbc3456623289588b18
void writeURLToWritableDataObject(const URL&, const String&);
COMPtr<WCDataObject> writableDataObject() const { return m_writableDataObject; }
void writeImageToDataObject(Element&, const URL&); // FIXME: Layering violation.
-@@ -366,6 +378,10 @@ private:
- int64_t m_changeCount { 0 };
- #endif
-
-+#if PLATFORM(WPE)
-+ std::optional<SelectionData> m_selectionData;
-+#endif
-+
- #if PLATFORM(COCOA)
- String m_pasteboardName;
- int64_t m_changeCount;
-@@ -381,6 +397,7 @@ private:
+@@ -381,6 +382,7 @@ private:
COMPtr<IDataObject> m_dataObject;
COMPtr<WCDataObject> m_writableDataObject;
DragDataMap m_dragDataMap;
@@ -6632,7 +6491,7 @@ index f8de8815d483bd3ac684c018159c593798c0495a..e84ce8eec7424fbc3456623289588b18
};
diff --git a/Source/WebCore/platform/PlatformKeyboardEvent.h b/Source/WebCore/platform/PlatformKeyboardEvent.h
-index 241c4f1cc29a854e8329ba5227b7aaf0cca8138e..0a2a487dd91ddeec37fb996ecc6039fc70c4ba8d 100644
+index 0982cbbac76c9bf9cbc063fb8bf418f259e4f180..8e344ac89745c91502c0117fb3415cc63c0e8f92 100644
--- a/Source/WebCore/platform/PlatformKeyboardEvent.h
+++ b/Source/WebCore/platform/PlatformKeyboardEvent.h
@@ -135,6 +135,7 @@ namespace WebCore {
@@ -6681,10 +6540,10 @@ index ef0abc9a93e878897ffc9d2497a3da0fca5b37b7..abd96c6d1a6c3ab9e0121c1e78f2f75a
+} // namespace WebCore
+#endif
diff --git a/Source/WebCore/platform/PlatformScreen.h b/Source/WebCore/platform/PlatformScreen.h
-index 26ca6a098bf39cff7e9a6505e84dbdbbd2aafc24..63d4fa7e39689a47269ae369bcf335642af6e669 100644
+index 40020a964792d52cb6167292b480cd2b7ade9b2f..ea58cebdea8d903890a5cf97ed4cc683616d86f2 100644
--- a/Source/WebCore/platform/PlatformScreen.h
+++ b/Source/WebCore/platform/PlatformScreen.h
-@@ -165,10 +165,14 @@ WEBCORE_EXPORT float screenScaleFactor(UIScreen * = nullptr);
+@@ -161,10 +161,14 @@ WEBCORE_EXPORT float screenScaleFactor(UIScreen * = nullptr);
#endif
#if ENABLE(TOUCH_EVENTS)
@@ -6715,10 +6574,10 @@ index 23f011953c66f401553bedfaef3485af215ae083..a73da2ebe47f0d8dc57f3d0159e8f299
// TouchCancelled touchPoints subsequently
void setTouchPoints(Vector<PlatformTouchPoint>& touchPoints) { m_touchPoints = touchPoints; }
diff --git a/Source/WebCore/platform/PlatformTouchPoint.h b/Source/WebCore/platform/PlatformTouchPoint.h
-index 34715d27b529750fc866db87cd330b5184286771..3eefa218af075f76d98012cdeae7e4b344850116 100644
+index 7db61e8c8092f018719e424a6b8700bbc2588f6a..7e90ae9b7e0616601a56d4881a3092f77cae3773 100644
--- a/Source/WebCore/platform/PlatformTouchPoint.h
+++ b/Source/WebCore/platform/PlatformTouchPoint.h
-@@ -49,7 +49,7 @@ public:
+@@ -47,7 +47,7 @@ public:
{
}
@@ -6726,9 +6585,9 @@ index 34715d27b529750fc866db87cd330b5184286771..3eefa218af075f76d98012cdeae7e4b3
+#if !ENABLE(IOS_TOUCH_EVENTS)
// FIXME: since WPE currently does not send touch stationary events, we need to be able to
// create a PlatformTouchPoint of type TouchCancelled artificially
- PlatformTouchPoint(unsigned id, State state, IntPoint screenPos, IntPoint pos)
+ PlatformTouchPoint(unsigned id, State state, DoublePoint screenPos, DoublePoint pos)
diff --git a/Source/WebCore/platform/Skia.cmake b/Source/WebCore/platform/Skia.cmake
-index c39b57e01190b833be46452c3d964fe243c216d3..6e4af1509037697421cf0c80e2459da0bad79ba8 100644
+index da490f391aa2e1876e792d66c08125e86e8a4719..eb8913849dd8934e4b2d60e9c18527ffc3d38264 100644
--- a/Source/WebCore/platform/Skia.cmake
+++ b/Source/WebCore/platform/Skia.cmake
@@ -14,6 +14,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
@@ -6753,10 +6612,10 @@ index 492c5e76290c2379cda40b9663f5f67ff8f66360..096752985edf39960eb4be6eb733ebe3
static const unsigned thumbBorderSize = 1;
static const unsigned overlayThumbSize = 3;
diff --git a/Source/WebCore/platform/graphics/ImageAdapter.h b/Source/WebCore/platform/graphics/ImageAdapter.h
-index f5d16bcb2d300d6e54b90583a4e9489862a7dfd0..e9c945854a011e9ec1de96cc8dfbc08ef13a91e0 100644
+index 724ec3ea72c056f6666ff8413eab113082f2170c..98d054dbdce598de8949b812fdb3cc7f1d0e4182 100644
--- a/Source/WebCore/platform/graphics/ImageAdapter.h
+++ b/Source/WebCore/platform/graphics/ImageAdapter.h
-@@ -61,11 +61,12 @@ typedef struct HBITMAP__ *HBITMAP;
+@@ -62,6 +62,8 @@ typedef struct HBITMAP__ *HBITMAP;
#include <wtf/RetainPtr.h>
#endif
@@ -6765,11 +6624,6 @@ index f5d16bcb2d300d6e54b90583a4e9489862a7dfd0..e9c945854a011e9ec1de96cc8dfbc08e
namespace WebCore {
class Image;
- class IntSize;
--class NativeImage;
-
- class ImageAdapter {
- WTF_MAKE_TZONE_ALLOCATED(ImageAdapter);
diff --git a/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h b/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h
index 5b659c763b9754b025a63f89522954cc39915b9a..448b50a2b131361a75d3f816cdcbb6a102551280 100644
--- a/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h
@@ -6796,7 +6650,7 @@ index 515ddea3cd42796efa9f41ad74be07a7447c337e..36db42e2a0822d5609b39046191f05a1
namespace WebCore {
diff --git a/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp b/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp
-index 6239b3ab731ffc0826216ddda46d951d8dace5a0..270423347baa7e6fa47ad1da2154c10423037ae2 100644
+index 63d2978699a1ff636465def5191395a055e06c32..4c2cf5bd8a83f4ffe23920b77008008a5b517bd0 100644
--- a/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp
+++ b/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp
@@ -168,6 +168,33 @@ static Vector<unsigned> stringIndicesFromClusters(const Vector<WORD>& clusters,
@@ -6830,7 +6684,7 @@ index 6239b3ab731ffc0826216ddda46d951d8dace5a0..270423347baa7e6fa47ad1da2154c104
+ return 1;
+}
+
- void ComplexTextController::collectComplexTextRunsForCharacters(std::span<const UChar> cp, unsigned stringLocation, const Font* font)
+ void ComplexTextController::collectComplexTextRunsForCharacters(std::span<const char16_t> cp, unsigned stringLocation, const Font* font)
{
if (!font) {
@@ -197,6 +224,8 @@ void ComplexTextController::collectComplexTextRunsForCharacters(std::span<const
@@ -6841,9 +6695,9 @@ index 6239b3ab731ffc0826216ddda46d951d8dace5a0..270423347baa7e6fa47ad1da2154c104
+
for (int i = 0; i < numItems; i++) {
// Determine the string for this item.
- const UChar* str = cp.data() + items[i].iCharPos;
+ const char16_t* str = cp.data() + items[i].iCharPos;
diff --git a/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp b/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
-index b3d305bfa5694f074dba36a0ca11bf3f13e80579..05faaf5417e768c958cf6a9807dfcd1f4c455a8d 100644
+index 027929649ee104ae9bf144291cf0e3ca3f1295b0..d5011dccdb34c881d264ce84a4b78b010efc88fb 100644
--- a/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
+++ b/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
@@ -37,8 +37,10 @@
@@ -7381,7 +7235,7 @@ index a8674916429908cabb86bd95dc5b3da217e1556b..6a464e2b0c1c45cd4e8effba678b8dde
{
switch (val) {
diff --git a/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp b/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp
-index f21f7d66c5dd661c289a453994597ae166c8f3d0..c293b72154e2cb8f4f1ad3cc222a05f29888891d 100644
+index b12b8c00f825f40cb98a6436549999ab07202ff8..016efe9bc0898bb648a33973e771b49ed4be5624 100644
--- a/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp
+++ b/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp
@@ -31,10 +31,18 @@
@@ -7529,10 +7383,10 @@ index 1178c8fb001994bc9e6166376a367d9bc148913c..fcc6534568cad6b42a819a435f84ba2b
m_commonHeaders.append(CommonHeader { name, value });
}
diff --git a/Source/WebCore/platform/network/NetworkStorageSession.h b/Source/WebCore/platform/network/NetworkStorageSession.h
-index 2216400912348ab0b6978a40fe02bfc12b249deb..2a0720873e26158c37d7ede83d9a1fd7a02f4409 100644
+index c2c96153a998ecfd93b402ba8e5a4b962765c1b1..b3230421da1d8270c02e36eb85c8179ef1c51825 100644
--- a/Source/WebCore/platform/network/NetworkStorageSession.h
+++ b/Source/WebCore/platform/network/NetworkStorageSession.h
-@@ -198,6 +198,7 @@ public:
+@@ -199,6 +199,7 @@ public:
NetworkingContext* context() const;
#endif
@@ -7541,7 +7395,7 @@ index 2216400912348ab0b6978a40fe02bfc12b249deb..2a0720873e26158c37d7ede83d9a1fd7
WEBCORE_EXPORT HTTPCookieAcceptPolicy cookieAcceptPolicy() const;
WEBCORE_EXPORT void setCookie(const Cookie&);
diff --git a/Source/WebCore/platform/network/ResourceResponseBase.cpp b/Source/WebCore/platform/network/ResourceResponseBase.cpp
-index a3eefa06801c54642ce6ec1c3bc7675b491ccf5c..46a8197a447b4eba385eb6b89b4a949147955bbe 100644
+index b5b95b377a4ae31676d09cf327cac99d7283155f..62f41eb6cc228582aad3841cc0a111868d4107be 100644
--- a/Source/WebCore/platform/network/ResourceResponseBase.cpp
+++ b/Source/WebCore/platform/network/ResourceResponseBase.cpp
@@ -78,6 +78,7 @@ ResourceResponseBase::ResourceResponseBase(std::optional<ResourceResponseData>&&
@@ -7581,7 +7435,7 @@ index a3eefa06801c54642ce6ec1c3bc7675b491ccf5c..46a8197a447b4eba385eb6b89b4a9491
*source,
*type,
diff --git a/Source/WebCore/platform/network/ResourceResponseBase.h b/Source/WebCore/platform/network/ResourceResponseBase.h
-index 545befb0776b62d546b7b7a28093e6f1c4478d2c..a12b31f99f380ea5fbd9b82916e397cab8b6298c 100644
+index 5f2c4f0f190d30faaed7841c3f613129b20f0383..c46eb6544af2e7be7a1c58e090b09af1be2cbc93 100644
--- a/Source/WebCore/platform/network/ResourceResponseBase.h
+++ b/Source/WebCore/platform/network/ResourceResponseBase.h
@@ -256,6 +256,11 @@ protected:
@@ -7622,15 +7476,16 @@ index 545befb0776b62d546b7b7a28093e6f1c4478d2c..a12b31f99f380ea5fbd9b82916e397ca
ResourceResponseBase::Source source;
ResourceResponseBase::Type type;
diff --git a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
-index 632ec5128ee28f9d5ea33bdfaa311bad56ec6396..837d67d61ba14e509cf9f72320cf56457263501b 100644
+index 8f91f105fb83605e259a25bccd7e6cf1e39fbc2f..b4e36cc919db381fdc241b3b6d3217f3aa3a5a0a 100644
--- a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
+++ b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
-@@ -553,6 +553,22 @@ bool NetworkStorageSession::setCookieFromDOM(const URL& firstParty, const SameSi
+@@ -574,6 +574,28 @@ bool NetworkStorageSession::setCookieFromDOM(const URL& firstParty, const SameSi
return false;
}
+void NetworkStorageSession::setCookiesFromResponse(const URL& firstParty, const SameSiteInfo& sameSiteInfo, const URL& url, const String& setCookieValue)
+{
++ auto thirdPartyCookieBlockingDecision = ThirdPartyCookieBlockingDecision::None;
+ Vector<String> cookieValues = setCookieValue.split('\n');
+ size_t count = cookieValues.size();
+ auto* cookies = [NSMutableArray arrayWithCapacity:count];
@@ -7642,7 +7497,12 @@ index 632ec5128ee28f9d5ea33bdfaa311bad56ec6396..837d67d61ba14e509cf9f72320cf5645
+ [cookies addObject:parsedCookies[0]];
+ }
+ NSURL *cookieURL = url.createNSURL().get();
-+ setHTTPCookiesForURL(cookieStorage().get(), cookies, cookieURL, firstParty.createNSURL().get(), sameSiteInfo);
++#if ENABLE(OPT_IN_PARTITIONED_COOKIES) && defined(CFN_COOKIE_ACCEPTS_POLICY_PARTITION) && CFN_COOKIE_ACCEPTS_POLICY_PARTITION
++ String partitionKey = isOptInCookiePartitioningEnabled() ? cookiePartitionIdentifier(firstParty) : String { };
++#else
++ String partitionKey;
++#endif
++ setHTTPCookiesForURL(cookieStorage().get(), cookies, cookieURL, firstParty.createNSURL().get(), nsStringNilIfEmpty(partitionKey), sameSiteInfo, thirdPartyCookieBlockingDecision);
+}
+
static NSHTTPCookieAcceptPolicy httpCookieAcceptPolicy(CFHTTPCookieStorageRef cookieStorage)
@@ -7662,7 +7522,7 @@ index 37e129136c69b27d509acc01f10be42a8a1fe35a..9df0babc8f82372925fddf2211a7c8c9
bool m_detectedDatabaseCorruption { false };
diff --git a/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp b/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp
-index 78584cd0fb75884e96d489d9da6a24f6ddedbeca..ebbb8c3e9a469d11e7433ac6ef85300e5b6d2ad4 100644
+index a765e8f33e07b492c5db681bdb8d0a1b560f3a89..aeecd7d3e5f2b22b039c377178ce93b2d3aee109 100644
--- a/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp
+++ b/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp
@@ -136,6 +136,12 @@ void NetworkStorageSession::setCookieAcceptPolicy(CookieAcceptPolicy policy) con
@@ -7679,7 +7539,7 @@ index 78584cd0fb75884e96d489d9da6a24f6ddedbeca..ebbb8c3e9a469d11e7433ac6ef85300e
{
switch (cookieDatabase().acceptPolicy()) {
diff --git a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
-index 5b3deb017487d8362e11479ea814e02e9221fd23..cb829266402ce26b193a62f7fa39d83681302a1e 100644
+index a3cc889b1440c6656d3888842bd1438a0d919c42..a6a0a2b96265ff15f1614abf7cf5392b1cb01247 100644
--- a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
+++ b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
@@ -551,6 +551,26 @@ void NetworkStorageSession::replaceCookies(const Vector<Cookie>& cookies)
@@ -7710,7 +7570,7 @@ index 5b3deb017487d8362e11479ea814e02e9221fd23..cb829266402ce26b193a62f7fa39d836
{
GUniquePtr<SoupCookie> targetCookie(cookie.toSoupCookie());
diff --git a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp b/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
-index 72e1784eff239b69db25a598934a671e7aead036..d647b0d8510edeed5aa27d780a06dd7e5cb413dd 100644
+index d78fc19ce5b5318256e9cb15dfea650fd29a3bb6..4256c020089b5e26886b680d945b695ce3a3bfc7 100644
--- a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
+++ b/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
@@ -40,6 +40,7 @@
@@ -7774,7 +7634,7 @@ index 0379437d84807e4a8d3846afac5ec8a70e743e70..5b0461bf12535d4900ffaddc2a878262
if (!m_dragDataMap.isEmpty() || !m_platformDragData)
return m_dragDataMap;
diff --git a/Source/WebCore/platform/win/KeyEventWin.cpp b/Source/WebCore/platform/win/KeyEventWin.cpp
-index d450bf9d0fd1f0bf8f28db483ac9d3d60fa9d114..72a59403a0b5493aea4a8e28eb15eac24b652b09 100644
+index 77a314281e749ca453edd66343d6dcf2979f658d..7f442dee6c8f3626d1d18227934817a0958fe0fa 100644
--- a/Source/WebCore/platform/win/KeyEventWin.cpp
+++ b/Source/WebCore/platform/win/KeyEventWin.cpp
@@ -243,10 +243,16 @@ PlatformKeyboardEvent::PlatformKeyboardEvent(HWND, WPARAM code, LPARAM keyData,
@@ -7798,7 +7658,7 @@ index d450bf9d0fd1f0bf8f28db483ac9d3d60fa9d114..72a59403a0b5493aea4a8e28eb15eac2
OptionSet<PlatformEvent::Modifier> PlatformKeyboardEvent::currentStateOfModifierKeys()
diff --git a/Source/WebCore/platform/win/PasteboardWin.cpp b/Source/WebCore/platform/win/PasteboardWin.cpp
-index e862b1201f827c58d0f6971bd1071e0c0d34d44d..3166f7a8dcb1f9c2d2d505eee846c17b370e76a7 100644
+index aac283d800d41c5185e1de655b6cbe4693c827a6..5ced4f99b3481ab88d8de7c12d44730bddf513d3 100644
--- a/Source/WebCore/platform/win/PasteboardWin.cpp
+++ b/Source/WebCore/platform/win/PasteboardWin.cpp
@@ -1144,7 +1144,21 @@ void Pasteboard::writeCustomData(const Vector<PasteboardCustomData>& data)
@@ -7849,307 +7709,11 @@ index e862b1201f827c58d0f6971bd1071e0c0d34d44d..3166f7a8dcb1f9c2d2d505eee846c17b
+}
+
} // namespace WebCore
-diff --git a/Source/WebCore/platform/wpe/DragDataWPE.cpp b/Source/WebCore/platform/wpe/DragDataWPE.cpp
-new file mode 100644
-index 0000000000000000000000000000000000000000..fbd32d390129129fd5b213f7f9c3e96bdca9355b
---- /dev/null
-+++ b/Source/WebCore/platform/wpe/DragDataWPE.cpp
-@@ -0,0 +1,92 @@
-+/*
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#include "config.h"
-+#include "DragData.h"
-+#include "SelectionData.h"
-+
-+namespace WebCore {
-+
-+bool DragData::canSmartReplace() const
-+{
-+ return false;
-+}
-+
-+bool DragData::containsColor() const
-+{
-+ return false;
-+}
-+
-+bool DragData::containsFiles() const
-+{
-+ return m_platformDragData->hasFilenames();
-+}
-+
-+unsigned DragData::numberOfFiles() const
-+{
-+ return m_platformDragData->filenames().size();
-+}
-+
-+Vector<String> DragData::asFilenames() const
-+{
-+ return m_platformDragData->filenames();
-+}
-+
-+bool DragData::containsPlainText() const
-+{
-+ return m_platformDragData->hasText();
-+}
-+
-+String DragData::asPlainText() const
-+{
-+ return m_platformDragData->text();
-+}
-+
-+Color DragData::asColor() const
-+{
-+ return Color();
-+}
-+
-+bool DragData::containsCompatibleContent(DraggingPurpose) const
-+{
-+ return containsPlainText() || containsURL() || containsColor() || containsFiles();
-+}
-+
-+bool DragData::containsURL(FilenameConversionPolicy filenamePolicy) const
-+{
-+ return !asURL(filenamePolicy).isEmpty();
-+}
-+
-+String DragData::asURL(FilenameConversionPolicy filenamePolicy, String* title) const
-+{
-+ if (!m_platformDragData->hasURL())
-+ return String();
-+ if (filenamePolicy != ConvertFilenames) {
-+ if (m_platformDragData->url().protocolIsFile())
-+ return { };
-+ }
-+
-+ if (title)
-+ *title = m_platformDragData->urlLabel();
-+ return m_platformDragData->url().string();
-+}
-+
-+bool DragData::shouldMatchStyleOnDrop() const
-+{
-+ return false;
-+}
-+
-+}
-diff --git a/Source/WebCore/platform/wpe/PasteboardWPE.cpp b/Source/WebCore/platform/wpe/PasteboardWPE.cpp
-index c0847a84e4aeba3dac78a8ffe9826d906d33a387..c1c60572473dad33e436ab4f52e5cac5bc2d2f76 100644
---- a/Source/WebCore/platform/wpe/PasteboardWPE.cpp
-+++ b/Source/WebCore/platform/wpe/PasteboardWPE.cpp
-@@ -36,6 +36,10 @@
- #include "SharedBuffer.h"
- #include <wtf/URL.h>
-
-+#if ENABLE(DRAG_SUPPORT)
-+#include "DragData.h"
-+#endif
-+
- namespace WebCore {
-
- std::unique_ptr<Pasteboard> Pasteboard::createForCopyAndPaste(std::unique_ptr<PasteboardContext>&& context)
-@@ -55,8 +59,17 @@ Pasteboard::Pasteboard(std::unique_ptr<PasteboardContext>&& context)
- {
- }
-
--void Pasteboard::writeString(const String&, const String&)
-+void Pasteboard::writeString(const String& type, const String& text)
- {
-+ if (m_selectionData) {
-+ if (type == "Files"_s || type == "text/uri-list"_s)
-+ m_selectionData->setURIList(text);
-+ else if (type == "text/html"_s)
-+ m_selectionData->setMarkup(text);
-+ else if (type == "text/plain"_s)
-+ m_selectionData->setText(text);
-+ return;
-+ }
- notImplemented();
- }
-
-@@ -69,6 +82,11 @@ void Pasteboard::writePlainText(const String& text, SmartReplaceOption)
-
- void Pasteboard::write(const PasteboardURL& pasteboardURL)
- {
-+ if (m_selectionData) {
-+ m_selectionData->clearAll();
-+ m_selectionData->setURL(pasteboardURL.url, pasteboardURL.title);
-+ return;
-+ }
- ASSERT(!pasteboardURL.url.isEmpty());
- SelectionData data;
- data.setURL(pasteboardURL.url, pasteboardURL.title);
-@@ -82,6 +100,15 @@ void Pasteboard::writeTrustworthyWebURLsPboardType(const PasteboardURL&)
-
- void Pasteboard::write(const PasteboardImage& pasteboardImage)
- {
-+ if (m_selectionData) {
-+ m_selectionData->clearAll();
-+ if (!pasteboardImage.url.url.isEmpty()) {
-+ m_selectionData->setURL(pasteboardImage.url.url, pasteboardImage.url.title);
-+ m_selectionData->setMarkup(pasteboardImage.url.markup);
-+ }
-+ m_selectionData->setImage(pasteboardImage.image.get());
-+ return;
-+ }
- SelectionData data;
- if (!pasteboardImage.url.url.isEmpty()) {
- data.setURL(pasteboardImage.url.url, pasteboardImage.url.title);
-@@ -98,6 +125,12 @@ void Pasteboard::write(const PasteboardBuffer&)
-
- void Pasteboard::write(const PasteboardWebContent& pasteboardContent)
- {
-+ if (m_selectionData) {
-+ m_selectionData->clearAll();
-+ m_selectionData->setText(pasteboardContent.text);
-+ m_selectionData->setMarkup(pasteboardContent.markup);
-+ return;
-+ }
- SelectionData data;
- data.setText(pasteboardContent.text);
- data.setMarkup(pasteboardContent.markup);
-@@ -191,6 +224,26 @@ bool Pasteboard::hasData()
-
- Vector<String> Pasteboard::typesSafeForBindings(const String& origin)
- {
-+ if (m_selectionData) {
-+ ListHashSet<String> types;
-+ if (auto& buffer = m_selectionData->customData()) {
-+ auto customData = PasteboardCustomData::fromSharedBuffer(*buffer);
-+ if (customData.origin() == origin) {
-+ for (auto& type : customData.orderedTypes())
-+ types.add(type);
-+ }
-+ }
-+
-+ if (m_selectionData->hasText())
-+ types.add("text/plain"_s);
-+ if (m_selectionData->hasMarkup())
-+ types.add("text/html"_s);
-+ if (m_selectionData->hasURIList())
-+ types.add("text/uri-list"_s);
-+
-+ return copyToVector(types);
-+ }
-+
- return platformStrategies()->pasteboardStrategy()->typesSafeForDOMToReadAndWrite(m_name, origin, context());
- }
-
-@@ -201,6 +254,13 @@ Vector<String> Pasteboard::typesForLegacyUnsafeBindings()
-
- String Pasteboard::readOrigin()
- {
-+ if (m_selectionData) {
-+ if (auto& buffer = m_selectionData->customData())
-+ return PasteboardCustomData::fromSharedBuffer(*buffer).origin();
-+
-+ return { };
-+ }
-+
- // FIXME: cache custom data?
- if (auto buffer = platformStrategies()->pasteboardStrategy()->readBufferFromClipboard(m_name, PasteboardCustomData::wpeType()))
- return PasteboardCustomData::fromSharedBuffer(*buffer).origin();
-@@ -210,11 +270,27 @@ String Pasteboard::readOrigin()
-
- String Pasteboard::readString(const String& type)
- {
-+ if (m_selectionData) {
-+ if (type == "text/plain"_s)
-+ return m_selectionData->text();;
-+ if (type == "text/html"_s)
-+ return m_selectionData->markup();
-+ if (type == "Files"_s || type == "text/uri-list"_s)
-+ return m_selectionData->uriList();
-+ return { };
-+ }
-+
- return platformStrategies()->pasteboardStrategy()->readTextFromClipboard(m_name, type);
- }
-
- String Pasteboard::readStringInCustomData(const String& type)
- {
-+ if (m_selectionData) {
-+ if (auto& buffer = m_selectionData->customData())
-+ return PasteboardCustomData::fromSharedBuffer(*buffer).readStringInCustomData(type);
-+
-+ return { };
-+ }
- // FIXME: cache custom data?
- if (auto buffer = platformStrategies()->pasteboardStrategy()->readBufferFromClipboard(m_name, PasteboardCustomData::wpeType()))
- return PasteboardCustomData::fromSharedBuffer(*buffer).readStringInCustomData(type);
-@@ -244,6 +320,17 @@ void Pasteboard::writeMarkup(const String&)
-
- void Pasteboard::writeCustomData(const Vector<PasteboardCustomData>& data)
- {
-+ if (m_selectionData) {
-+ if (!data.isEmpty()) {
-+ const auto& customData = data[0];
-+ customData.forEachPlatformString([this] (auto& type, auto& string) {
-+ writeString(type, string);
-+ });
-+ if (customData.hasSameOriginCustomData() || !customData.origin().isEmpty())
-+ m_selectionData->setCustomData(customData.createSharedBuffer());
-+ }
-+ return;
-+ }
- m_changeCount = platformStrategies()->pasteboardStrategy()->writeCustomData(data, m_name, context());
- }
-
-@@ -257,6 +344,35 @@ int64_t Pasteboard::changeCount() const
- return platformStrategies()->pasteboardStrategy()->changeCount(m_name);
- }
-
-+#if ENABLE(DRAG_SUPPORT)
-+Pasteboard::Pasteboard(std::unique_ptr<PasteboardContext>&& context, SelectionData&& selectionData)
-+ : m_context(WTFMove(context))
-+ , m_selectionData(WTFMove(selectionData))
-+{
-+}
-+
-+Pasteboard::Pasteboard(std::unique_ptr<PasteboardContext>&& context, SelectionData& selectionData)
-+ : m_context(WTFMove(context))
-+ , m_selectionData(selectionData)
-+{
-+}
-+
-+std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop(std::unique_ptr<PasteboardContext>&& context)
-+{
-+ return makeUnique<Pasteboard>(WTFMove(context), SelectionData());
-+}
-+
-+std::unique_ptr<Pasteboard> Pasteboard::create(const DragData& dragData)
-+{
-+ RELEASE_ASSERT(dragData.platformData());
-+ return makeUnique<Pasteboard>(dragData.createPasteboardContext(), *dragData.platformData());
-+}
-+
-+void Pasteboard::setDragImage(DragImage, const IntPoint&)
-+{
-+}
-+#endif
-+
- } // namespace WebCore
-
- #endif // PLATFORM(WPE)
diff --git a/Source/WebCore/rendering/RenderTextControl.cpp b/Source/WebCore/rendering/RenderTextControl.cpp
-index 1238b6ac1b2aa43f0b1f7a74e48e9436d67934fa..261ee362bbdc4fb70450a61da3c872ac3d3a8cc7 100644
+index c147c2d3efffba27f8e50a073cff4742585217a9..ce295eff5d8b4e3ebe53991950980f6eb17e79bd 100644
--- a/Source/WebCore/rendering/RenderTextControl.cpp
+++ b/Source/WebCore/rendering/RenderTextControl.cpp
-@@ -230,13 +230,13 @@ void RenderTextControl::layoutExcludedChildren(RelayoutChildren relayoutChildren
+@@ -232,13 +232,13 @@ void RenderTextControl::layoutExcludedChildren(RelayoutChildren relayoutChildren
}
}
@@ -8165,7 +7729,7 @@ index 1238b6ac1b2aa43f0b1f7a74e48e9436d67934fa..261ee362bbdc4fb70450a61da3c872ac
{
if (auto innerTextElement = this->innerTextElement(); innerTextElement && innerTextElement->renderer())
diff --git a/Source/WebCore/rendering/RenderTextControl.h b/Source/WebCore/rendering/RenderTextControl.h
-index 82e32c398dfdfa3e1fdb5dda86e98c827a290f84..c9eddb5739b1cd2ab5b744f57ecb8eb01079ad55 100644
+index 2a4b9ac7e9572ef2755b6226607567ec37339656..f2f86f9099e024b9befe94a9b0ea981178ecea5d 100644
--- a/Source/WebCore/rendering/RenderTextControl.h
+++ b/Source/WebCore/rendering/RenderTextControl.h
@@ -38,8 +38,8 @@ public:
@@ -8179,7 +7743,7 @@ index 82e32c398dfdfa3e1fdb5dda86e98c827a290f84..c9eddb5739b1cd2ab5b744f57ecb8eb0
#endif
diff --git a/Source/WebCore/workers/WorkerConsoleClient.cpp b/Source/WebCore/workers/WorkerConsoleClient.cpp
-index e675901b3a15cbdefdb731c949f8a4234af5dede..97d38d8ef0fb379ab689cb2dacba6563bcaf1e85 100644
+index a9e64a0a2aabebe6c150e959034e3a5aa41cc0b0..dfc1a928eb486f9021373fc4b49e7dabe921fbae 100644
--- a/Source/WebCore/workers/WorkerConsoleClient.cpp
+++ b/Source/WebCore/workers/WorkerConsoleClient.cpp
@@ -124,4 +124,6 @@ void WorkerConsoleClient::recordEnd(JSC::JSGlobalObject*, Ref<ScriptArguments>&&
@@ -8190,7 +7754,7 @@ index e675901b3a15cbdefdb731c949f8a4234af5dede..97d38d8ef0fb379ab689cb2dacba6563
+
} // namespace WebCore
diff --git a/Source/WebCore/workers/WorkerConsoleClient.h b/Source/WebCore/workers/WorkerConsoleClient.h
-index db95c8273bd0deb3f903a45d02fc07bbbd8ab305..bf88228b4c838b90d11d430cc9429d5130631afa 100644
+index 248649b615c7aed9b37cae14ab58152eb5ca34f1..85f3e2b7f5519822f53564a8c63b8bcb05de8594 100644
--- a/Source/WebCore/workers/WorkerConsoleClient.h
+++ b/Source/WebCore/workers/WorkerConsoleClient.h
@@ -58,6 +58,7 @@ private:
@@ -8199,10 +7763,10 @@ index db95c8273bd0deb3f903a45d02fc07bbbd8ab305..bf88228b4c838b90d11d430cc9429d51
void screenshot(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
+ void bindingCalled(JSC::JSGlobalObject*, const String& name, const String& arg) override;
- WorkerOrWorkletGlobalScope& m_globalScope;
+ WeakRef<WorkerOrWorkletGlobalScope> m_globalScope;
};
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
-index 2d8a4462ea7897aca4455d526fcb5e0fd6b3dcd3..53f0de10cdfb27736855fa837d9e4a650c18c90a 100644
+index a9ca48e0e4b059f536957c7d0cdcc189dd91b243..e72b63e6f376bdc57a9a3155e862f1ef8d193baf 100644
--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
@@ -97,6 +97,8 @@
@@ -8214,7 +7778,7 @@ index 2d8a4462ea7897aca4455d526fcb5e0fd6b3dcd3..53f0de10cdfb27736855fa837d9e4a65
#endif
#if ENABLE(APPLE_PAY_REMOTE_UI)
-@@ -1232,6 +1234,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID)
+@@ -1259,6 +1261,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID)
storageSession->clearPageSpecificDataForResourceLoadStatistics(pageID);
}
@@ -8230,10 +7794,10 @@ index 2d8a4462ea7897aca4455d526fcb5e0fd6b3dcd3..53f0de10cdfb27736855fa837d9e4a65
{
if (CheckedPtr storageSession = m_networkProcess->storageSession(m_sessionID))
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
-index 96e3d7d1370b114591191dea8e0e042c9f06c0c8..a4ddbd6483b8bd1ffb8f360cad5552dbcbcfc018 100644
+index a42ac4c2ba8b4c78b86a9f1ba8975ced3da6889e..6224d5c9b6e2a24c3a6184318a11de19ba2ebf73 100644
--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
-@@ -388,6 +388,8 @@ private:
+@@ -390,6 +390,8 @@ private:
void clearPageSpecificData(WebCore::PageIdentifier);
@@ -8243,20 +7807,20 @@ index 96e3d7d1370b114591191dea8e0e042c9f06c0c8..a4ddbd6483b8bd1ffb8f360cad5552db
void logUserInteraction(RegistrableDomain&&);
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
-index 26d43eb49dc956a104782a5e10df084dc2b1e7e8..aa92cfd23b61eae7ee90c9fb7846189f9406e379 100644
+index 66ae06fcc90ef78dd7b3d945ba0a8b22f0033eef..699ff83841f2f34229dd7d9e7e910f166c331e3c 100644
--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
-@@ -80,6 +80,8 @@ messages -> NetworkConnectionToWebProcess WantsDispatchMessage {
+@@ -83,6 +83,8 @@ messages -> NetworkConnectionToWebProcess WantsDispatchMessage {
ClearPageSpecificData(WebCore::PageIdentifier pageID);
+ SetCookieFromResponse(URL firstParty, struct WebCore::SameSiteInfo sameSiteInfo, URL url, String setCookieValue);
-+
- RemoveStorageAccessForFrame(WebCore::FrameIdentifier frameID, WebCore::PageIdentifier pageID);
++
+ [EnabledBy=StorageAccessAPIEnabled] RemoveStorageAccessForFrame(WebCore::FrameIdentifier frameID, WebCore::PageIdentifier pageID);
LogUserInteraction(WebCore::RegistrableDomain domain)
ResourceLoadStatisticsUpdated(Vector<WebCore::ResourceLoadStatistics> statistics) -> ()
diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
-index 23fbdde0494dae83161c9b715f870db48b8caff1..df27897d278c7bb755378ef309376b50d79124cb 100644
+index 22d457d4b9ae51d1ab65b0c35212281ab995e40b..d10078ae0149fd7fb6cdca4b2e4d0412dd9e8fac 100644
--- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
@@ -1136,6 +1136,14 @@ - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)data
@@ -8275,7 +7839,7 @@ index 23fbdde0494dae83161c9b715f870db48b8caff1..df27897d278c7bb755378ef309376b50
#if !LOG_DISABLED
LOG(NetworkSession, "%llu didReceiveResponse completionHandler (%s)", taskIdentifier, toString(policyAction).characters());
diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
-index 7b1879c44551fae26e338352189adc5b9add0266..dac8034d87d3bcbbb56576c2ef37713ea0ef85ff 100644
+index d5081a775c5f38d8f8075ea193514aa4eeaee25a..2ba1958d599b575ab0b1ad9db43de53f709aabdf 100644
--- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
+++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
@@ -166,6 +166,7 @@ void NetworkDataTaskCurl::curlDidReceiveResponse(CurlRequest& request, CurlRespo
@@ -8287,7 +7851,7 @@ index 7b1879c44551fae26e338352189adc5b9add0266..dac8034d87d3bcbbb56576c2ef37713e
handleCookieHeaders(request.resourceRequest(), receivedResponse);
diff --git a/Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in b/Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
-index aebce13abcf8f93c8fa48936120c2065f0a664b1..7b003cf0d65d0179b165fcbce775cfd5b6a19374 100644
+index a0ad3ac58fb9efcef3fb408aa60cc9fa0353e048..39c5df74feaef3573ecd905c1812c77dfa7c217c 100644
--- a/Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
+++ b/Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
@@ -451,9 +451,11 @@
@@ -8306,7 +7870,7 @@ index aebce13abcf8f93c8fa48936120c2065f0a664b1..7b003cf0d65d0179b165fcbce775cfd5
;; Except deny access to new-style iOS Keychain folders which are UUIDs.
(deny file-read* file-write*
diff --git a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
-index 375489f4b3944b7b6f4ac03b1784aef8ca116206..6cce36bd75b872b45b7a6ecc07e2adff00bbc7a4 100644
+index dc1bbe1c62fbc33a69afc0e57225129f1dfdd6f2..4f2d2f6af0e9ea7c7f7ca5be42772e888aa3674b 100644
--- a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
+++ b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
@@ -461,6 +461,8 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr<GInputStream>&& inputStream)
@@ -8319,10 +7883,10 @@ index 375489f4b3944b7b6f4ac03b1784aef8ca116206..6cce36bd75b872b45b7a6ecc07e2adff
}
diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index d39a11b312cc9237973ee095e995afa379da1b0d..e5fc9f02cea359414154756b27958019cbb57374 100644
+index 45b68fab2f81dc5d50df4a62113d8f0aeb10c9e2..78c9821d94e6e2b9a4257920bda2e9a4a8dd0ee7 100644
--- a/Source/WebKit/PlatformGTK.cmake
+++ b/Source/WebKit/PlatformGTK.cmake
-@@ -320,6 +320,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
+@@ -322,6 +322,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
${GSTREAMER_PBUTILS_INCLUDE_DIRS}
${GTK_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
@@ -8332,7 +7896,7 @@ index d39a11b312cc9237973ee095e995afa379da1b0d..e5fc9f02cea359414154756b27958019
)
list(APPEND WebKit_INTERFACE_INCLUDE_DIRECTORIES
-@@ -363,6 +366,9 @@ if (USE_LIBWEBRTC)
+@@ -365,6 +368,9 @@ if (USE_LIBWEBRTC)
list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
"${THIRDPARTY_DIR}/libwebrtc/Source/"
"${THIRDPARTY_DIR}/libwebrtc/Source/webrtc"
@@ -8342,7 +7906,7 @@ index d39a11b312cc9237973ee095e995afa379da1b0d..e5fc9f02cea359414154756b27958019
)
endif ()
-@@ -414,6 +420,12 @@ else ()
+@@ -416,6 +422,12 @@ else ()
set(WebKitGTK_ENUM_HEADER_TEMPLATE ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in)
endif ()
@@ -8356,10 +7920,10 @@ index d39a11b312cc9237973ee095e995afa379da1b0d..e5fc9f02cea359414154756b27958019
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 650a918189ad22a6fa76404c80ebca477331c193..74fc793279465c3aa9a586130a98c182e1334568 100644
+index 9accd2551b67ad54960f4c2da7b9692263693cde..89fdaf77834fbe059876d746e4c1f0ab5e0ed9be 100644
--- a/Source/WebKit/PlatformWPE.cmake
+++ b/Source/WebKit/PlatformWPE.cmake
-@@ -221,6 +221,7 @@ set(WPE_API_HEADER_TEMPLATES
+@@ -224,6 +224,7 @@ set(WPE_API_HEADER_TEMPLATES
${WEBKIT_DIR}/UIProcess/API/glib/WebKitWindowProperties.h.in
${WEBKIT_DIR}/UIProcess/API/glib/WebKitWebsitePolicies.h.in
${WEBKIT_DIR}/UIProcess/API/glib/webkit.h.in
@@ -8367,7 +7931,7 @@ index 650a918189ad22a6fa76404c80ebca477331c193..74fc793279465c3aa9a586130a98c182
)
if (ENABLE_2022_GLIB_API)
-@@ -432,8 +433,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
+@@ -434,8 +435,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
@@ -8386,7 +7950,7 @@ index 650a918189ad22a6fa76404c80ebca477331c193..74fc793279465c3aa9a586130a98c182
WPE::libwpe
${GLIB_LIBRARIES}
diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
-index 8429fc8b2e3721830edf197b3369f4f21bb70a9a..35e99519b9a23ac19757a8b67fe477ce26c06cd0 100644
+index 86a1febedca9fcbe7203db8cec94e8db1ef25a43..72ca856202231c8aba8efcee26a6278131141952 100644
--- a/Source/WebKit/PlatformWin.cmake
+++ b/Source/WebKit/PlatformWin.cmake
@@ -54,8 +54,13 @@ list(APPEND WebKit_SOURCES
@@ -8409,9 +7973,9 @@ index 8429fc8b2e3721830edf197b3369f4f21bb70a9a..35e99519b9a23ac19757a8b67fe477ce
WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
+ WebProcess/WebCoreSupport/win/WebDragClientWin.cpp
- WebProcess/WebPage/AcceleratedSurface.cpp
+ WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
-@@ -121,6 +127,36 @@ list(APPEND WebKit_PRIVATE_LIBRARIES
+@@ -119,6 +125,36 @@ list(APPEND WebKit_PRIVATE_LIBRARIES
comctl32
)
@@ -8449,10 +8013,10 @@ index 8429fc8b2e3721830edf197b3369f4f21bb70a9a..35e99519b9a23ac19757a8b67fe477ce
WebProcess/EntryPoint/win/WebProcessMain.cpp
diff --git a/Source/WebKit/Shared/AuxiliaryProcess.h b/Source/WebKit/Shared/AuxiliaryProcess.h
-index 35fd0f0397cd92c5bf025d89d7f7c8139c03c69d..b1559f1bb2d2d7a74d0b534f81352e366498bfc8 100644
+index 98f4a9734edcf45750ed6badce6f9f31e93c25b7..59da50b79c30d8ac1d494a37d973251f67782bc3 100644
--- a/Source/WebKit/Shared/AuxiliaryProcess.h
+++ b/Source/WebKit/Shared/AuxiliaryProcess.h
-@@ -216,6 +216,11 @@ struct AuxiliaryProcessInitializationParameters {
+@@ -220,6 +220,11 @@ struct AuxiliaryProcessInitializationParameters {
IPC::Connection::Identifier connectionIdentifier;
HashMap<String, String> extraInitializationData;
WTF::AuxiliaryProcessType processType;
@@ -8517,7 +8081,7 @@ index 60a6308dbbd3f9a09c82214dcd97f86dda9d2078..31036d180a6f319d17c53a363d58d8ba
#if USE(APPKIT)
diff --git a/Source/WebKit/Shared/NativeWebMouseEvent.h b/Source/WebKit/Shared/NativeWebMouseEvent.h
-index a39b6dd673e1639f9fe64c23dd054f0ff57f7464..4026f6244889e5a0ee85edb72696d0be20ba531d 100644
+index af507e2f942f1c94e60ad94623f0f0e097f4194b..b974bb08d79f7204e803ece42f13de207c58527c 100644
--- a/Source/WebKit/Shared/NativeWebMouseEvent.h
+++ b/Source/WebKit/Shared/NativeWebMouseEvent.h
@@ -87,6 +87,11 @@ public:
@@ -8547,10 +8111,10 @@ index f8e96218fd2671d1c0aca5e549efe0d8b94ef0f9..6cebd61bceb39c08e916fe991e4c3fc6
NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
#elif PLATFORM(GTK)
diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
-index 6bb3cc33a43da97e85efe8afb8e7ea2400dd4787..79e2b2f0196d3edb62b2219d59229bb2822e549f 100644
+index 73afacba3fe3705757e56fce7da5fbb6d44c8285..ebab11b20dfa8b6c7ed3e2a63fc3ac9f3857e068 100644
--- a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
+++ b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
-@@ -2841,6 +2841,9 @@ class WebCore::AuthenticationChallenge {
+@@ -2849,6 +2849,9 @@ class WebCore::AuthenticationChallenge {
class WebCore::DragData {
#if PLATFORM(COCOA)
String pasteboardName();
@@ -8560,7 +8124,7 @@ index 6bb3cc33a43da97e85efe8afb8e7ea2400dd4787..79e2b2f0196d3edb62b2219d59229bb2
#endif
WebCore::IntPoint clientPosition();
WebCore::IntPoint globalPosition();
-@@ -3649,6 +3652,7 @@ enum class WebCore::WasPrivateRelayed : bool;
+@@ -3708,6 +3711,7 @@ enum class WebCore::WasPrivateRelayed : bool;
String httpStatusText;
String httpVersion;
WebCore::HTTPHeaderMap httpHeaderFields;
@@ -8674,7 +8238,7 @@ index 8e4e2d6d5ebb08fba210fe0a328d45290348dd11..32a43192ec1e918c33b1b046b71d2ec5
const String& text() const { return m_text; }
diff --git a/Source/WebKit/Shared/WebMouseEvent.h b/Source/WebKit/Shared/WebMouseEvent.h
-index 20a6e465457151b02daa22e6bc059cf0e117ece5..ef4b1f737aaa683bc13c447aa4ca77e5cf0d64d7 100644
+index 249ed5bf7a9ca037349cae92a063e718d015333d..6c179a0545456967f26ebf64f701e0290acaa589 100644
--- a/Source/WebKit/Shared/WebMouseEvent.h
+++ b/Source/WebKit/Shared/WebMouseEvent.h
@@ -70,6 +70,7 @@ public:
@@ -8682,14 +8246,14 @@ index 20a6e465457151b02daa22e6bc059cf0e117ece5..ef4b1f737aaa683bc13c447aa4ca77e5
WebMouseEventButton button() const { return m_button; }
unsigned short buttons() const { return m_buttons; }
+ void playwrightSetButtons(unsigned short buttons) { m_buttons = buttons; }
- const WebCore::IntPoint& position() const { return m_position; } // Relative to the view.
- void setPosition(const WebCore::IntPoint& position) { m_position = position; }
- const WebCore::IntPoint& globalPosition() const { return m_globalPosition; }
+ const WebCore::DoublePoint& position() const { return m_position; } // Relative to the view.
+ void setPosition(const WebCore::DoublePoint& position) { m_position = position; }
+ const WebCore::DoublePoint& globalPosition() const { return m_globalPosition; }
diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h
-index 02b701cbe003b0f9e16b9712e98c4157ebedbd69..70269920251e4d31f2c73fddc2f8cecbff453498 100644
+index bc4cf118f1c9120d22d282a42348c5f3c011eb0d..3f95916695e08056dc87a700a32f4f445e2474a6 100644
--- a/Source/WebKit/Shared/WebPageCreationParameters.h
+++ b/Source/WebKit/Shared/WebPageCreationParameters.h
-@@ -303,6 +303,8 @@ struct WebPageCreationParameters {
+@@ -306,6 +306,8 @@ struct WebPageCreationParameters {
WebCore::ShouldRelaxThirdPartyCookieBlocking shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No };
bool httpsUpgradeEnabled { true };
@@ -8699,10 +8263,10 @@ index 02b701cbe003b0f9e16b9712e98c4157ebedbd69..70269920251e4d31f2c73fddc2f8cecb
#if ENABLE(APP_HIGHLIGHTS)
WebCore::HighlightVisibility appHighlightsVisible { WebCore::HighlightVisibility::Hidden };
diff --git a/Source/WebKit/Shared/WebPageCreationParameters.serialization.in b/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
-index 822229ba75d9afe290cc72966cd763bd476f76e1..4487e71729e4c874ffec33374f25aee2ce289c3e 100644
+index 1f43e0af331267900f098910e81954807aae4d13..1214484d35b1599fa08f0678d012b291292e6d5e 100644
--- a/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
+++ b/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
-@@ -225,6 +225,8 @@ enum class WebCore::UserInterfaceLayoutDirection : bool;
+@@ -228,6 +228,8 @@ enum class WebCore::UserInterfaceLayoutDirection : bool;
bool httpsUpgradeEnabled;
@@ -8793,10 +8357,10 @@ index 053e9336017d8818b3cbea79ce7c145fd5c46274..5632498d6ef875df80fc68ec206a9d08
JSC::Config::configureForTesting();
else if (!strcmp(argv[i], "-disable-jit"))
diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt
-index a978050575b323345d0de29d1abd1fa0bc993e77..f7ead71d28f77932edb9e7f8958b25e99b50fead 100644
+index 209c0c3ab2c3bdd0df08e4b6b8083943caa8815b..ddf661fe8f14923908bda6de57ed703be2f839a6 100644
--- a/Source/WebKit/Sources.txt
+++ b/Source/WebKit/Sources.txt
-@@ -392,6 +392,7 @@ UIProcess/AboutSchemeHandler.cpp
+@@ -393,6 +393,7 @@ UIProcess/AboutSchemeHandler.cpp
UIProcess/AuxiliaryProcessProxy.cpp
UIProcess/BackgroundProcessResponsivenessTimer.cpp
UIProcess/BrowsingContextGroup.cpp
@@ -8804,7 +8368,7 @@ index a978050575b323345d0de29d1abd1fa0bc993e77..f7ead71d28f77932edb9e7f8958b25e9
UIProcess/DeviceIdHashSaltStorage.cpp
UIProcess/DisplayLink.cpp
UIProcess/DisplayLinkProcessProxyClient.cpp
-@@ -401,6 +402,8 @@ UIProcess/FrameLoadState.cpp
+@@ -402,6 +403,8 @@ UIProcess/FrameLoadState.cpp
UIProcess/FrameProcess.cpp
UIProcess/GeolocationPermissionRequestManagerProxy.cpp
UIProcess/GeolocationPermissionRequestProxy.cpp
@@ -8813,7 +8377,7 @@ index a978050575b323345d0de29d1abd1fa0bc993e77..f7ead71d28f77932edb9e7f8958b25e9
UIProcess/LegacyGlobalSettings.cpp
UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp
UIProcess/MediaKeySystemPermissionRequestProxy.cpp
-@@ -408,10 +411,12 @@ UIProcess/ModelElementController.cpp
+@@ -409,10 +412,12 @@ UIProcess/ModelElementController.cpp
UIProcess/OverrideLanguages.cpp
UIProcess/PageClient.cpp
UIProcess/PageLoadState.cpp
@@ -8826,7 +8390,7 @@ index a978050575b323345d0de29d1abd1fa0bc993e77..f7ead71d28f77932edb9e7f8958b25e9
UIProcess/RemotePageDrawingAreaProxy.cpp
UIProcess/RemotePageFullscreenManagerProxy.cpp
UIProcess/RemotePagePlaybackSessionManagerProxy.cpp
-@@ -456,6 +461,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp
+@@ -457,6 +462,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp
UIProcess/WebPageDiagnosticLoggingClient.cpp
UIProcess/WebPageGroup.cpp
UIProcess/WebPageInjectedBundleClient.cpp
@@ -8835,7 +8399,7 @@ index a978050575b323345d0de29d1abd1fa0bc993e77..f7ead71d28f77932edb9e7f8958b25e9
UIProcess/WebPageProxy.cpp
UIProcess/WebPageProxyMessageReceiverRegistration.cpp
UIProcess/WebPageProxyTesting.cpp
-@@ -609,6 +616,9 @@ UIProcess/Inspector/WebPageDebuggable.cpp
+@@ -616,6 +623,9 @@ UIProcess/Inspector/WebPageDebuggable.cpp
UIProcess/Inspector/WebPageInspectorController.cpp
UIProcess/Inspector/Agents/InspectorBrowserAgent.cpp
@@ -8846,10 +8410,10 @@ index a978050575b323345d0de29d1abd1fa0bc993e77..f7ead71d28f77932edb9e7f8958b25e9
UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp
UIProcess/Media/MediaUsageManager.cpp
diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt
-index 4e2c7431cfc5c1b952232c30d6aa7f46815813c7..095c1b78812df547ab8cbe62e4ac801b5eb98968 100644
+index 50aa813e87673ff3f3c643dc2db924f5dcc1b613..cba747901f72fb63a6c3a0d1c08fd41fd7953827 100644
--- a/Source/WebKit/SourcesCocoa.txt
+++ b/Source/WebKit/SourcesCocoa.txt
-@@ -270,6 +270,7 @@ UIProcess/API/Cocoa/_WKArchiveExclusionRule.mm
+@@ -268,6 +268,7 @@ UIProcess/API/Cocoa/_WKArchiveExclusionRule.mm
UIProcess/API/Cocoa/_WKAttachment.mm
UIProcess/API/Cocoa/_WKAutomationSession.mm
UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm
@@ -8857,7 +8421,7 @@ index 4e2c7431cfc5c1b952232c30d6aa7f46815813c7..095c1b78812df547ab8cbe62e4ac801b
UIProcess/API/Cocoa/_WKContentRuleListAction.mm
UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm
UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify
-@@ -467,6 +468,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm
+@@ -466,6 +467,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm
UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm
UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm
@@ -8866,7 +8430,7 @@ index 4e2c7431cfc5c1b952232c30d6aa7f46815813c7..095c1b78812df547ab8cbe62e4ac801b
UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm
UIProcess/Inspector/mac/WKInspectorViewController.mm
diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt
-index 68733a26a5cb0cd8f944b5ab48eacb256e147976..b8d320e417303329b9a6fa56ce4c3f6fccc286b8 100644
+index b93e726f6694cf9b5232e364eceb300e22e00ac9..569b8847373c994d514ee315fdfda8281695c6a0 100644
--- a/Source/WebKit/SourcesGTK.txt
+++ b/Source/WebKit/SourcesGTK.txt
@@ -122,6 +122,7 @@ UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify
@@ -8885,7 +8449,7 @@ index 68733a26a5cb0cd8f944b5ab48eacb256e147976..b8d320e417303329b9a6fa56ce4c3f6f
UIProcess/glib/ScreenManager.cpp
UIProcess/glib/SystemSettingsManagerProxy.cpp
UIProcess/glib/WebPageProxyGLib.cpp
-@@ -272,6 +274,7 @@ UIProcess/gtk/DisplayX11.cpp @no-unify
+@@ -271,6 +273,7 @@ UIProcess/gtk/DisplayX11.cpp @no-unify
UIProcess/gtk/DisplayWayland.cpp @no-unify
UIProcess/gtk/WebDateTimePickerGtk.cpp
UIProcess/gtk/HardwareAccelerationManager.cpp
@@ -8893,7 +8457,7 @@ index 68733a26a5cb0cd8f944b5ab48eacb256e147976..b8d320e417303329b9a6fa56ce4c3f6f
UIProcess/gtk/KeyBindingTranslator.cpp
UIProcess/gtk/PointerLockManager.cpp @no-unify
UIProcess/gtk/PointerLockManagerWayland.cpp @no-unify
-@@ -285,6 +288,8 @@ UIProcess/gtk/ViewGestureControllerGtk.cpp
+@@ -284,6 +287,8 @@ UIProcess/gtk/ViewGestureControllerGtk.cpp
UIProcess/gtk/WebColorPickerGtk.cpp
UIProcess/gtk/WebContextMenuProxyGtk.cpp
UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp
@@ -8903,10 +8467,10 @@ index 68733a26a5cb0cd8f944b5ab48eacb256e147976..b8d320e417303329b9a6fa56ce4c3f6f
UIProcess/gtk/WebPasteboardProxyGtk.cpp
UIProcess/gtk/WebPopupMenuProxyGtk.cpp
diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt
-index f3647727106bd3786d17adaf0c5f373184ace9fb..419a5a7002ed6567f0110fa63ff723691f027669 100644
+index 33853de0d6c3e3ed4329c6a4a7f49d9303367b99..a7a1363d7d9b6e8f073e0f3c01b29240dcafb5cd 100644
--- a/Source/WebKit/SourcesWPE.txt
+++ b/Source/WebKit/SourcesWPE.txt
-@@ -124,6 +124,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify
+@@ -123,6 +123,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify
UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify
UIProcess/API/glib/WebKitBackForwardList.cpp @no-unify
UIProcess/API/glib/WebKitBackForwardListItem.cpp @no-unify
@@ -8914,7 +8478,7 @@ index f3647727106bd3786d17adaf0c5f373184ace9fb..419a5a7002ed6567f0110fa63ff72369
UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify
UIProcess/API/glib/WebKitCookieManager.cpp @no-unify
UIProcess/API/glib/WebKitCredential.cpp @no-unify
-@@ -157,6 +158,7 @@ UIProcess/API/glib/WebKitOptionMenu.cpp @no-unify
+@@ -156,6 +157,7 @@ UIProcess/API/glib/WebKitOptionMenu.cpp @no-unify
UIProcess/API/glib/WebKitOptionMenuItem.cpp @no-unify
UIProcess/API/glib/WebKitPermissionRequest.cpp @no-unify
UIProcess/API/glib/WebKitPermissionStateQuery.cpp @no-unify
@@ -8922,7 +8486,7 @@ index f3647727106bd3786d17adaf0c5f373184ace9fb..419a5a7002ed6567f0110fa63ff72369
UIProcess/API/glib/WebKitPolicyDecision.cpp @no-unify
UIProcess/API/glib/WebKitPrivate.cpp @no-unify
UIProcess/API/glib/WebKitProtocolHandler.cpp @no-unify
-@@ -226,6 +228,7 @@ UIProcess/glib/DisplayVBlankMonitorDRM.cpp
+@@ -225,6 +227,7 @@ UIProcess/glib/DisplayVBlankMonitorDRM.cpp
UIProcess/glib/DisplayVBlankMonitorThreaded.cpp
UIProcess/glib/DisplayVBlankMonitorTimer.cpp
UIProcess/glib/FenceMonitor.cpp
@@ -8930,9 +8494,9 @@ index f3647727106bd3786d17adaf0c5f373184ace9fb..419a5a7002ed6567f0110fa63ff72369
UIProcess/glib/ScreenManager.cpp
UIProcess/glib/SystemSettingsManagerProxy.cpp
UIProcess/glib/WebPageProxyGLib.cpp
-@@ -258,9 +261,15 @@ UIProcess/soup/WebProcessPoolSoup.cpp
+@@ -257,9 +260,15 @@ UIProcess/soup/WebProcessPoolSoup.cpp
- UIProcess/wpe/AcceleratedBackingStoreDMABuf.cpp
+ UIProcess/wpe/AcceleratedBackingStore.cpp
UIProcess/wpe/DisplayVBlankMonitorWPE.cpp
+UIProcess/wpe/InspectorTargetProxyWPE.cpp
UIProcess/wpe/ScreenManagerWPE.cpp
@@ -8946,17 +8510,8 @@ index f3647727106bd3786d17adaf0c5f373184ace9fb..419a5a7002ed6567f0110fa63ff72369
UIProcess/wpe/WebPageProxyWPE.cpp
UIProcess/wpe/WebPasteboardProxyWPE.cpp
UIProcess/wpe/WebPreferencesWPE.cpp
-@@ -292,6 +301,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp
-
- WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
-
-+WebProcess/WebCoreSupport/wpe/WebDragClientWPE.cpp
-+
- WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp
-
- WebProcess/WebPage/AcceleratedSurface.cpp
diff --git a/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp b/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
-index 1182f2afe2c857598449d3dee6c1be028746c595..4256f65734adf9c68a30d70cc49c0b3a6fec1b1a 100644
+index 7d9d8e51d0f4531602ab90d8097e0bc322d8ba51..0d8fe5bfe9eda08897dd5a3b340710ed0f3d0500 100644
--- a/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
+++ b/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
@@ -273,6 +273,11 @@ RefPtr<WebPageProxy> PageConfiguration::protectedRelatedPage() const
@@ -8972,7 +8527,7 @@ index 1182f2afe2c857598449d3dee6c1be028746c595..4256f65734adf9c68a30d70cc49c0b3a
{
return m_data.pageToCloneSessionStorageFrom.get();
diff --git a/Source/WebKit/UIProcess/API/APIPageConfiguration.h b/Source/WebKit/UIProcess/API/APIPageConfiguration.h
-index 43a17d77b13b0e51217506425607b8e0698062e4..96c7747d26cfa1d196796c784c046f6c17666969 100644
+index 9f241e19040ceeb2c525d2a58cfedd05da582427..0c79bc4e29952f3dd5ccb7522bf6a8f00dc662a6 100644
--- a/Source/WebKit/UIProcess/API/APIPageConfiguration.h
+++ b/Source/WebKit/UIProcess/API/APIPageConfiguration.h
@@ -160,6 +160,10 @@ public:
@@ -8986,7 +8541,7 @@ index 43a17d77b13b0e51217506425607b8e0698062e4..96c7747d26cfa1d196796c784c046f6c
WebKit::WebPageProxy* pageToCloneSessionStorageFrom() const;
void setPageToCloneSessionStorageFrom(WeakPtr<WebKit::WebPageProxy>&&);
-@@ -516,6 +520,7 @@ private:
+@@ -519,6 +523,7 @@ private:
#endif
RefPtr<WebKit::WebPageGroup> pageGroup;
WeakPtr<WebKit::WebPageProxy> relatedPage;
@@ -9042,10 +8597,10 @@ index 2fe09a750bf32bd6f124603af08e16adba8a6c7c..5ca91400765fd53559b4f4cefa172b5a
bool m_shouldTakeUIBackgroundAssertion { true };
bool m_shouldCaptureDisplayInUIProcess { DEFAULT_CAPTURE_DISPLAY_IN_UI_PROCESS };
diff --git a/Source/WebKit/UIProcess/API/APIUIClient.h b/Source/WebKit/UIProcess/API/APIUIClient.h
-index b5c743d02f89afbe0c9a90e5f7e746fbd31fbbb2..29dbedfcf6929788b4810b8e98acaee26d1a686d 100644
+index 89357e7184a9d01f03e8bdf17c555ce94bcc39b3..d9a2d352f51eaebecaadd2bc59c27b3e1313f706 100644
--- a/Source/WebKit/UIProcess/API/APIUIClient.h
+++ b/Source/WebKit/UIProcess/API/APIUIClient.h
-@@ -114,6 +114,7 @@ public:
+@@ -116,6 +116,7 @@ public:
virtual void runJavaScriptAlert(WebKit::WebPageProxy&, const WTF::String&, WebKit::WebFrameProxy*, WebKit::FrameInfoData&&, Function<void()>&& completionHandler) { completionHandler(); }
virtual void runJavaScriptConfirm(WebKit::WebPageProxy&, const WTF::String&, WebKit::WebFrameProxy*, WebKit::FrameInfoData&&, Function<void(bool)>&& completionHandler) { completionHandler(false); }
virtual void runJavaScriptPrompt(WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, WebKit::FrameInfoData&&, Function<void(const WTF::String&)>&& completionHandler) { completionHandler(WTF::String()); }
@@ -9097,10 +8652,10 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0
}
#endif
diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp
-index e15be39b349437382ef59f303986dac5246856dd..08b0290d847a046a5861475b7a5015513b22551f 100644
+index 9c51cbad3099f8e589262e8bfa320ef8e05fa1c1..cd914594389ee319f5f67082dd221fb7a7b2a3f6 100644
--- a/Source/WebKit/UIProcess/API/C/WKPage.cpp
+++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp
-@@ -1943,6 +1943,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
+@@ -1927,6 +1927,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
m_client.addMessageToConsole(toAPI(&page), toAPI(message.impl()), m_client.base.clientInfo);
}
@@ -9114,7 +8669,7 @@ index e15be39b349437382ef59f303986dac5246856dd..08b0290d847a046a5861475b7a501551
void setStatusText(WebPageProxy* page, const String& text) final
{
if (!m_client.setStatusText)
-@@ -1972,6 +1979,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
+@@ -1964,6 +1971,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
{
if (!m_client.didNotHandleKeyEvent)
return;
@@ -9124,7 +8679,7 @@ index e15be39b349437382ef59f303986dac5246856dd..08b0290d847a046a5861475b7a501551
}
diff --git a/Source/WebKit/UIProcess/API/C/WKPageUIClient.h b/Source/WebKit/UIProcess/API/C/WKPageUIClient.h
-index fc43c44a85a0fc6bf5f8c643bd120a16ce762914..ee86fd213d25682f9b6553ec7da99bc8a812212b 100644
+index ae4a98c2fe5782eb2356dc8b6b486f6b44db6db3..62b2f3c351fe287af11c1ee2815f1fabe044d537 100644
--- a/Source/WebKit/UIProcess/API/C/WKPageUIClient.h
+++ b/Source/WebKit/UIProcess/API/C/WKPageUIClient.h
@@ -98,6 +98,7 @@ typedef void (*WKPageRunBeforeUnloadConfirmPanelCallback)(WKPageRef page, WKStri
@@ -9135,7 +8690,7 @@ index fc43c44a85a0fc6bf5f8c643bd120a16ce762914..ee86fd213d25682f9b6553ec7da99bc8
typedef void (*WKPageRequestStorageAccessConfirmCallback)(WKPageRef page, WKFrameRef frame, WKStringRef requestingDomain, WKStringRef currentDomain, WKPageRequestStorageAccessConfirmResultListenerRef listener, const void *clientInfo);
typedef void (*WKPageTakeFocusCallback)(WKPageRef page, WKFocusDirection direction, const void *clientInfo);
typedef void (*WKPageFocusCallback)(WKPageRef page, const void *clientInfo);
-@@ -1365,6 +1366,7 @@ typedef struct WKPageUIClientV14 {
+@@ -1366,6 +1367,7 @@ typedef struct WKPageUIClientV14 {
// Version 14.
WKPageRunWebAuthenticationPanelCallback runWebAuthenticationPanel;
@@ -9143,7 +8698,7 @@ index fc43c44a85a0fc6bf5f8c643bd120a16ce762914..ee86fd213d25682f9b6553ec7da99bc8
} WKPageUIClientV14;
typedef struct WKPageUIClientV15 {
-@@ -1472,6 +1474,7 @@ typedef struct WKPageUIClientV15 {
+@@ -1473,6 +1475,7 @@ typedef struct WKPageUIClientV15 {
// Version 14.
WKPageRunWebAuthenticationPanelCallback runWebAuthenticationPanel;
@@ -9151,7 +8706,7 @@ index fc43c44a85a0fc6bf5f8c643bd120a16ce762914..ee86fd213d25682f9b6553ec7da99bc8
// Version 15.
WKPageDecidePolicyForSpeechRecognitionPermissionRequestCallback decidePolicyForSpeechRecognitionPermissionRequest;
-@@ -1583,6 +1586,7 @@ typedef struct WKPageUIClientV16 {
+@@ -1584,6 +1587,7 @@ typedef struct WKPageUIClientV16 {
// Version 14.
WKPageRunWebAuthenticationPanelCallback runWebAuthenticationPanel;
@@ -9159,7 +8714,7 @@ index fc43c44a85a0fc6bf5f8c643bd120a16ce762914..ee86fd213d25682f9b6553ec7da99bc8
// Version 15.
WKPageDecidePolicyForSpeechRecognitionPermissionRequestCallback decidePolicyForSpeechRecognitionPermissionRequest;
-@@ -1697,6 +1701,7 @@ typedef struct WKPageUIClientV17 {
+@@ -1698,6 +1702,7 @@ typedef struct WKPageUIClientV17 {
// Version 14.
WKPageRunWebAuthenticationPanelCallback runWebAuthenticationPanel;
@@ -9167,7 +8722,7 @@ index fc43c44a85a0fc6bf5f8c643bd120a16ce762914..ee86fd213d25682f9b6553ec7da99bc8
// Version 15.
WKPageDecidePolicyForSpeechRecognitionPermissionRequestCallback decidePolicyForSpeechRecognitionPermissionRequest;
-@@ -1811,6 +1816,7 @@ typedef struct WKPageUIClientV18 {
+@@ -1812,6 +1817,7 @@ typedef struct WKPageUIClientV18 {
// Version 14.
WKPageRunWebAuthenticationPanelCallback runWebAuthenticationPanel;
@@ -9175,7 +8730,7 @@ index fc43c44a85a0fc6bf5f8c643bd120a16ce762914..ee86fd213d25682f9b6553ec7da99bc8
// Version 15.
WKPageDecidePolicyForSpeechRecognitionPermissionRequestCallback decidePolicyForSpeechRecognitionPermissionRequest;
-@@ -1927,6 +1933,7 @@ typedef struct WKPageUIClientV19 {
+@@ -1928,6 +1934,7 @@ typedef struct WKPageUIClientV19 {
// Version 14.
WKPageRunWebAuthenticationPanelCallback runWebAuthenticationPanel;
@@ -9629,7 +9184,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 ef24e41f2c62e77e701a6e2b698c60004eaf0789..fd332a5b07f1dea7792eeee3bd9b5efb48afc0c5 100644
+index c17d1921232a7956c2ff786e5b5dca603b5f46fa..59f740194668b1fe3d4f16b1127947224c628b19 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp
@@ -101,6 +101,10 @@ private:
@@ -9713,10 +9268,10 @@ index c1945fbe717a42afc1f51d64a80c7de3fa9009ba..ab63fe19b00ecbd64c9421e6eecad3e2
#endif
+int webkitWebContextExistingCount();
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
-index 449a8b1247c7397cd9709e425f8824a90bc77404..b374e3f5104572d44a6fbbb8384d3031815a2202 100644
+index ea27692f82e791c65828f9e88b795f96a365fa09..f15ae92ac80fc785b9da9014ea0966e2a998ecc4 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
-@@ -39,6 +39,7 @@
+@@ -40,6 +40,7 @@
#include "WebContextMenuItem.h"
#include "WebContextMenuItemData.h"
#include "WebFrameProxy.h"
@@ -9724,7 +9279,7 @@ index 449a8b1247c7397cd9709e425f8824a90bc77404..b374e3f5104572d44a6fbbb8384d3031
#include "WebKitAuthenticationRequestPrivate.h"
#include "WebKitBackForwardListPrivate.h"
#include "WebKitContextMenuClient.h"
-@@ -154,6 +155,7 @@ enum {
+@@ -155,6 +156,7 @@ enum {
CLOSE,
SCRIPT_DIALOG,
@@ -9732,7 +9287,7 @@ index 449a8b1247c7397cd9709e425f8824a90bc77404..b374e3f5104572d44a6fbbb8384d3031
DECIDE_POLICY,
PERMISSION_REQUEST,
-@@ -524,6 +526,13 @@ GRefPtr<WebKitOptionMenu> WebKitWebViewClient::showOptionMenu(WebKitPopupMenu& p
+@@ -529,6 +531,13 @@ GRefPtr<WebKitOptionMenu> WebKitWebViewClient::showOptionMenu(WebKitPopupMenu& p
void WebKitWebViewClient::frameDisplayed(WKWPE::View&)
{
@@ -9746,7 +9301,7 @@ index 449a8b1247c7397cd9709e425f8824a90bc77404..b374e3f5104572d44a6fbbb8384d3031
{
SetForScope inFrameDisplayedGuard(m_webView->priv->inFrameDisplayed, true);
for (const auto& callback : m_webView->priv->frameDisplayedCallbacks) {
-@@ -540,6 +549,13 @@ void WebKitWebViewClient::frameDisplayed(WKWPE::View&)
+@@ -545,6 +554,13 @@ void WebKitWebViewClient::frameDisplayed(WKWPE::View&)
}
}
@@ -9760,7 +9315,7 @@ index 449a8b1247c7397cd9709e425f8824a90bc77404..b374e3f5104572d44a6fbbb8384d3031
void WebKitWebViewClient::willStartLoad(WKWPE::View&)
{
webkitWebViewWillStartLoad(m_webView);
-@@ -631,7 +647,7 @@ static gboolean webkitWebViewDecidePolicy(WebKitWebView*, WebKitPolicyDecision*
+@@ -636,7 +652,7 @@ static gboolean webkitWebViewDecidePolicy(WebKitWebView*, WebKitPolicyDecision*
static gboolean webkitWebViewPermissionRequest(WebKitWebView*, WebKitPermissionRequest* request)
{
@@ -9769,7 +9324,7 @@ index 449a8b1247c7397cd9709e425f8824a90bc77404..b374e3f5104572d44a6fbbb8384d3031
if (WEBKIT_IS_POINTER_LOCK_PERMISSION_REQUEST(request)) {
webkit_permission_request_allow(request);
return TRUE;
-@@ -954,6 +970,10 @@ static void webkitWebViewConstructed(GObject* object)
+@@ -959,6 +975,10 @@ static void webkitWebViewConstructed(GObject* object)
priv->websitePolicies = adoptGRef(webkit_website_policies_new());
Ref configuration = priv->relatedView && priv->relatedView->priv->configurationForNextRelatedView ? priv->relatedView->priv->configurationForNextRelatedView.releaseNonNull() : webkitWebViewCreatePageConfiguration(webView);
@@ -9780,7 +9335,7 @@ index 449a8b1247c7397cd9709e425f8824a90bc77404..b374e3f5104572d44a6fbbb8384d3031
webkitWebViewCreatePage(webView, WTFMove(configuration));
webkitWebContextWebViewCreated(priv->context.get(), webView);
-@@ -2022,6 +2042,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
+@@ -2044,6 +2064,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
G_TYPE_BOOLEAN, 1,
WEBKIT_TYPE_SCRIPT_DIALOG);
@@ -9796,7 +9351,7 @@ index 449a8b1247c7397cd9709e425f8824a90bc77404..b374e3f5104572d44a6fbbb8384d3031
/**
* WebKitWebView::decide-policy:
* @web_view: the #WebKitWebView on which the signal is emitted
-@@ -2812,6 +2841,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const
+@@ -2834,6 +2863,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const
webkit_script_dialog_unref(webView->priv->currentScriptDialog);
}
@@ -9821,7 +9376,7 @@ index 449a8b1247c7397cd9709e425f8824a90bc77404..b374e3f5104572d44a6fbbb8384d3031
{
if (!webView->priv->currentScriptDialog)
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebViewPrivate.h b/Source/WebKit/UIProcess/API/glib/WebKitWebViewPrivate.h
-index c80a5073b50ae7273985c9165cffc1d361a2ff03..7b1ce505325c735a0bf1c23f031ad1ee10639b91 100644
+index 4e16a2a088f6e48f43362850cc047da7de3c88ef..5ca5ae9572d2ed962d80a5dd67f8f379cd9e8117 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebViewPrivate.h
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebViewPrivate.h
@@ -64,6 +64,7 @@ void webkitWebViewRunJavaScriptAlert(WebKitWebView*, const CString& message, Fun
@@ -9845,7 +9400,7 @@ index 763cd55f7abca011ac8bc4fef7f233bf52854cda..bd43917b274bf19ff9f3d96b7e80e207
#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 92218ae7cac5f31db31d9ecde99094331a465ebf..e9d4e786b8640d93fb35187cba96496f6bbb1d32 100644
+index 9a36fe28ce7a5aac1b45350e3fc9e72b1a00dac1..cc661fa57e7ec1469e1ec003d783028d59836f06 100644
--- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
+++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
@@ -270,6 +270,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool
@@ -9870,7 +9425,7 @@ index 92218ae7cac5f31db31d9ecde99094331a465ebf..e9d4e786b8640d93fb35187cba96496f
void PageClientImpl::didChangeContentSize(const IntSize& size)
diff --git a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h
-index 3cafc1ed805da8f947dc8c8c28327116f1d3c8a4..a8ed97eb566e4f966f85b03ea55d8dfccc608e58 100644
+index ae0d906fb4bb5ff323f1e494f866c1f24b4d1e0e..e62064b583cef05f6d7c5a47b0130a4fc7e21ec8 100644
--- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h
+++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h
@@ -104,7 +104,7 @@ private:
@@ -9983,7 +9538,7 @@ 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 b58f8dd27e62f047857ed2f36fcd6dbd80e8038d..897d4f038d6dcbd9a4a37dbdda91fae46f56f521 100644
+index da61eac252a18988d3d70a7f842e75d6b35c9b0d..3a2f4b339811c9cedd0de342d7593130699b0026 100644
--- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
+++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
@@ -2884,6 +2884,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase)
@@ -10014,7 +9569,7 @@ index b58f8dd27e62f047857ed2f36fcd6dbd80e8038d..897d4f038d6dcbd9a4a37dbdda91fae4
#if !USE(GTK4)
diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
-index 8a71b1d7d9b9ef8bfe4a6935e3788e40a5fe6d5d..dad4a47725cc3a5d9d3fd6b1f4ec23c866cfe973 100644
+index 9553631aa4fc49456ae6061abae2a896da9a6988..5b4fd77cb616b5ade74889bb35ff75299272b005 100644
--- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
+++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
@@ -27,6 +27,7 @@
@@ -10024,7 +9579,7 @@ index 8a71b1d7d9b9ef8bfe4a6935e3788e40a5fe6d5d..dad4a47725cc3a5d9d3fd6b1f4ec23c8
+#include "AcceleratedBackingStore.h"
#include "APIPageConfiguration.h"
#include "InputMethodState.h"
- #include "RendererBufferFormat.h"
+ #include "RendererBufferDescription.h"
@@ -104,7 +105,7 @@ void webkitWebViewBaseStartDrag(WebKitWebViewBase*, WebCore::SelectionData&&, Op
void webkitWebViewBaseDidPerformDragControllerAction(WebKitWebViewBase*);
#endif
@@ -10037,7 +9592,7 @@ index 8a71b1d7d9b9ef8bfe4a6935e3788e40a5fe6d5d..dad4a47725cc3a5d9d3fd6b1f4ec23c8
@@ -145,3 +146,5 @@ void webkitWebViewBaseSetPlugID(WebKitWebViewBase*, const String&);
#endif
- WebKit::RendererBufferFormat webkitWebViewBaseGetRendererBufferFormat(WebKitWebViewBase*);
+ WebKit::RendererBufferDescription webkitWebViewBaseGetRendererBufferDescription(WebKitWebViewBase*);
+
+WebKit::AcceleratedBackingStore* webkitWebViewBaseGetAcceleratedBackingStore(WebKitWebViewBase*);
diff --git a/Source/WebKit/UIProcess/API/wpe/APIViewClient.h b/Source/WebKit/UIProcess/API/wpe/APIViewClient.h
@@ -10067,7 +9622,7 @@ index 9091ae5198e765c2cfe0584d121afe4f88df3c0e..b0efedec419673ef2bfd0fd79406774e
virtual void didChangePageID(WKWPE::View&) { }
virtual void didReceiveUserMessage(WKWPE::View&, WebKit::UserMessage&&, CompletionHandler<void(WebKit::UserMessage&&)>&& completionHandler) { completionHandler(WebKit::UserMessage()); }
diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
-index ab67db0aab214edea4f3c7ff80e1fa27c7c0a95b..069d41ca9eb33fdc851fc96a7b260ceca9fdfa9a 100644
+index 0cc3b527fb27dcae943b6bae522ad5fd2925843c..b2c4aea4996b73da224f9f320522b3f74567ed08 100644
--- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
+++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
@@ -35,9 +35,12 @@
@@ -10096,7 +9651,7 @@ index ab67db0aab214edea4f3c7ff80e1fa27c7c0a95b..069d41ca9eb33fdc851fc96a7b260cec
namespace WebKit {
WTF_MAKE_TZONE_ALLOCATED_IMPL(PageClientImpl);
-@@ -302,14 +311,14 @@ Ref<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& pa
+@@ -305,14 +314,14 @@ Ref<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& pa
}
#endif
@@ -10115,7 +9670,7 @@ index ab67db0aab214edea4f3c7ff80e1fa27c7c0a95b..069d41ca9eb33fdc851fc96a7b260cec
}
RefPtr<WebDateTimePicker> PageClientImpl::createDateTimePicker(WebPageProxy& page)
-@@ -551,6 +560,37 @@ void PageClientImpl::selectionDidChange()
+@@ -554,6 +563,37 @@ void PageClientImpl::selectionDidChange()
m_view.selectionDidChange();
}
@@ -10153,7 +9708,7 @@ index ab67db0aab214edea4f3c7ff80e1fa27c7c0a95b..069d41ca9eb33fdc851fc96a7b260cec
WebKitWebResourceLoadManager* PageClientImpl::webResourceLoadManager()
{
return m_view.webResourceLoadManager();
-@@ -561,4 +601,11 @@ void PageClientImpl::callAfterNextPresentationUpdate(CompletionHandler<void()>&&
+@@ -564,4 +604,11 @@ void PageClientImpl::callAfterNextPresentationUpdate(CompletionHandler<void()>&&
m_view.callAfterNextPresentationUpdate(WTFMove(callback));
}
@@ -10166,10 +9721,10 @@ index ab67db0aab214edea4f3c7ff80e1fa27c7c0a95b..069d41ca9eb33fdc851fc96a7b260cec
+
} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
-index 000b7c9950785f55fdfdcaa186026903a506c79e..2f0f821890ab40bcfa68b105710484674600a2db 100644
+index 8c257afe81fd1719434e74a3deea50991132b55b..14fd72fef0cc90464212f41770577c0c645bef9e 100644
--- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
+++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
-@@ -184,9 +184,15 @@ private:
+@@ -185,9 +185,15 @@ private:
void didChangeWebPageID() const override;
void selectionDidChange() override;
@@ -10184,8 +9739,8 @@ index 000b7c9950785f55fdfdcaa186026903a506c79e..2f0f821890ab40bcfa68b10571048467
+#endif
+
WKWPE::View& m_view;
+ DefaultUndoController m_undoController;
#if ENABLE(FULLSCREEN_API)
- std::unique_ptr<WebFullScreenManagerProxyClient> m_fullscreenClientForTesting;
diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitBrowserInspector.h b/Source/WebKit/UIProcess/API/wpe/WebKitBrowserInspector.h
new file mode 100644
index 0000000000000000000000000000000000000000..273c5105cdf1638955cea01128c9bbab3e64436c
@@ -10274,7 +9829,7 @@ index 0000000000000000000000000000000000000000..273c5105cdf1638955cea01128c9bbab
+
+#endif
diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp
-index 763bda5b29304f7ed7133c0a8158e6c8b94c5ea1..8ed962e8c1af62b9b73a68348d0d88765429861d 100644
+index 08e754111893d5f3c5dac7502b48ad2b3c760540..283f05d35729aee22659ab4b661686159ff9ad3b 100644
--- a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp
+++ b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp
@@ -54,6 +54,7 @@ struct _WebKitWebViewBackend {
@@ -10303,8 +9858,8 @@ index 763bda5b29304f7ed7133c0a8158e6c8b94c5ea1..8ed962e8c1af62b9b73a68348d0d8876
+}
+
namespace WTF {
-
- template <> WebKitWebViewBackend* refGPtr(WebKitWebViewBackend* ptr)
+ WTF_DEFINE_GREF_TRAITS(WebKitWebViewBackend, webkitWebViewBackendRef, webkitWebViewBackendUnref)
+ }
diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h
index 16dcc1f69c38cd8ad630bc49d6d69feaa3aa811e..98677028c19c12c3b6d513bb5e45375a1528fe8a 100644
--- a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h
@@ -10335,10 +9890,10 @@ index 16dcc1f69c38cd8ad630bc49d6d69feaa3aa811e..98677028c19c12c3b6d513bb5e45375a
#endif /* WebKitWebViewBackend_h */
diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackendPrivate.h b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackendPrivate.h
-index e4b92ace1531090ae38a7aec3d3d4febf19aee84..b66b573f9148c39c5ce2738add6cd01a9a352be8 100644
+index 8987c95d8493e446e871545fc84306b279bb39b6..3e12d7f309f5bb76bde712b383d7c7c9bd682f26 100644
--- a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackendPrivate.h
+++ b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackendPrivate.h
-@@ -31,3 +31,5 @@ template <> void derefGPtr(WebKitWebViewBackend* ptr);
+@@ -28,3 +28,5 @@ WTF_DECLARE_GREF_TRAITS(WebKitWebViewBackend)
}
void webkitWebViewBackendUnref(WebKitWebViewBackend*);
@@ -10361,10 +9916,10 @@ index 0fa1f2e970ed0c0232df9b9c7b8b4bcd0ceac655..d68c6747edc699de7d84bae2a63b927d
void didChangePageID(WKWPE::View&) override;
void didReceiveUserMessage(WKWPE::View&, WebKit::UserMessage&&, CompletionHandler<void(WebKit::UserMessage&&)>&&) override;
diff --git a/Source/WebKit/UIProcess/Automation/WebAutomationSession.h b/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
-index d0a40e3e9f4d59f894c0574926ee13b2d83767ab..3dfd8e059273d2a14494b76892e5abfe66475c2e 100644
+index b9346fab9e82ff29fc881f04b12cafa7af720877..2207a280d491df89b5832210ed4a7cfe541eb53d 100644
--- a/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
+++ b/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
-@@ -287,6 +287,8 @@ public:
+@@ -289,6 +289,8 @@ public:
void didDestroyFrame(WebCore::FrameIdentifier);
@@ -10373,7 +9928,7 @@ index d0a40e3e9f4d59f894c0574926ee13b2d83767ab..3dfd8e059273d2a14494b76892e5abfe
RefPtr<WebPageProxy> webPageProxyForHandle(const String&);
String handleForWebFrameID(std::optional<WebCore::FrameIdentifier>);
String handleForWebPageProxy(const WebPageProxy&);
-@@ -338,7 +340,6 @@ private:
+@@ -340,7 +342,6 @@ private:
// Get base64-encoded PNG data from a bitmap.
static std::optional<String> platformGetBase64EncodedPNGData(WebCore::ShareableBitmap::Handle&&);
@@ -10382,7 +9937,7 @@ index d0a40e3e9f4d59f894c0574926ee13b2d83767ab..3dfd8e059273d2a14494b76892e5abfe
// Save base64-encoded file contents to a local file path and return the path.
// This reuses the basename of the remote file path so that the filename exposed to DOM API remains the same.
diff --git a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
-index d5186484fee73b83dbcd611a9695d92a0a6f9579..e26cea229aeb1f6aad23f1265baccfe67e508a13 100644
+index 536a0b78e8b1ab110093fea33384e7bad528917b..ca4f5944f90868886bba20411e47b18598cc50a0 100644
--- a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
+++ b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
@@ -173,7 +173,11 @@ void AuxiliaryProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& lau
@@ -10559,10 +10114,10 @@ index 89d125f7742f81ead8c50f218ecb1771b8000636..baa6cf58ad502c6c033ee6293a6cc8d4
namespace WebKit {
diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
-index c633008451c5719866d79300c49d60f979ffb581..9cc370de9b38f70970a6ca11a43651cbb2549529 100644
+index 13a5af461910a6875d18466115c3dea34891a0fa..44c5376282be9bc8ba49fe830c1c0a5c8b9c8103 100644
--- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
+++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
-@@ -103,6 +103,7 @@ private:
+@@ -105,6 +105,7 @@ private:
void runJavaScriptAlert(WebPageProxy&, const WTF::String&, WebFrameProxy*, FrameInfoData&&, Function<void()>&& completionHandler) final;
void runJavaScriptConfirm(WebPageProxy&, const WTF::String&, WebFrameProxy*, FrameInfoData&&, Function<void(bool)>&& completionHandler) final;
void runJavaScriptPrompt(WebPageProxy&, const WTF::String&, const WTF::String&, WebFrameProxy*, FrameInfoData&&, Function<void(const WTF::String&)>&&) final;
@@ -10570,7 +10125,7 @@ index c633008451c5719866d79300c49d60f979ffb581..9cc370de9b38f70970a6ca11a43651cb
void presentStorageAccessConfirmDialog(const WTF::String& requestingDomain, const WTF::String& currentDomain, CompletionHandler<void(bool)>&&);
void requestStorageAccessConfirm(WebPageProxy&, WebFrameProxy*, const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, std::optional<WebCore::OrganizationStorageAccessPromptQuirk>&&, CompletionHandler<void(bool)>&&) final;
void decidePolicyForGeolocationPermissionRequest(WebPageProxy&, WebFrameProxy&, const FrameInfoData&, Function<void(bool)>&) final;
-@@ -226,6 +227,7 @@ private:
+@@ -228,6 +229,7 @@ private:
bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1;
bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
bool webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler : 1;
@@ -10579,10 +10134,10 @@ index c633008451c5719866d79300c49d60f979ffb581..9cc370de9b38f70970a6ca11a43651cb
bool webViewRequestStorageAccessPanelForDomainUnderCurrentDomainForQuirkDomainsCompletionHandler : 1;
bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
-index 6c934950b89e32e9ff58992497a313062658c235..c3f1b8d1193ae36efe9e5700f85eee4e86e8c548 100644
+index f9e39d7adef59446ddb76696835a633956a85f93..3c2fdd7b27a6da2cdc75c4754e41f33d18226073 100644
--- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
+++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
-@@ -135,6 +135,7 @@ void UIDelegate::setDelegate(id<WKUIDelegate> delegate)
+@@ -136,6 +136,7 @@ void UIDelegate::setDelegate(id<WKUIDelegate> delegate)
m_delegateMethods.webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:)];
m_delegateMethods.webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:)];
m_delegateMethods.webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:)];
@@ -10590,7 +10145,7 @@ index 6c934950b89e32e9ff58992497a313062658c235..c3f1b8d1193ae36efe9e5700f85eee4e
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:)];
-@@ -500,6 +501,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St
+@@ -502,6 +503,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St
}).get()];
}
@@ -10607,10 +10162,10 @@ index 6c934950b89e32e9ff58992497a313062658c235..c3f1b8d1193ae36efe9e5700f85eee4e
{
RefPtr uiDelegate = m_uiDelegate.get();
diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
-index 70f71e49666eb0bc9a732c5893d27179b051bd72..a6c273ea6793f213aadc64485fe7c1fb23854b72 100644
+index 11ff0246d535faf1d75779e3b2959b36096e8793..6282913dea0fc0c4ece3e729f6a4fa27edc4c04e 100644
--- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
+++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
-@@ -43,7 +43,9 @@
+@@ -44,7 +44,9 @@
#import "NativeWebKeyboardEvent.h"
#import "NativeWebMouseEvent.h"
#import "NavigationState.h"
@@ -10620,9 +10175,9 @@ index 70f71e49666eb0bc9a732c5893d27179b051bd72..a6c273ea6793f213aadc64485fe7c1fb
#import "PlatformXRSystem.h"
#import "PlaybackSessionManagerProxy.h"
#import "RemoteLayerTreeTransaction.h"
-@@ -351,11 +353,86 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting()
+@@ -356,11 +358,86 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting()
- void WebPageProxy::startDrag(const DragItem& dragItem, ShareableBitmap::Handle&& dragImageHandle, const std::optional<ElementIdentifier>& elementID)
+ void WebPageProxy::startDrag(const DragItem& dragItem, ShareableBitmap::Handle&& dragImageHandle, const std::optional<NodeIdentifier>& nodeID)
{
+ if (m_interceptDrags) {
+ NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName: m_overrideDragPasteboardName.createNSString().get()];
@@ -10656,7 +10211,7 @@ index 70f71e49666eb0bc9a732c5893d27179b051bd72..a6c273ea6793f213aadc64485fe7c1fb
+ }
+
if (RefPtr pageClient = this->pageClient())
- pageClient->startDrag(dragItem, WTFMove(dragImageHandle), elementID);
+ pageClient->startDrag(dragItem, WTFMove(dragImageHandle), nodeID);
}
-#endif
@@ -10709,10 +10264,10 @@ index 70f71e49666eb0bc9a732c5893d27179b051bd72..a6c273ea6793f213aadc64485fe7c1fb
#if ENABLE(ATTACHMENT_ELEMENT)
diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
-index 3b6663cb77c2c20e2e6822bfdbf822cea3022fdc..d0e67aa4714f4f8e01c3c2e1ef3fd1adc6274d20 100644
+index c742dd123d0df51dda15233b3b5b84d148f23b94..e8161d0567c67f9319e8ba54931cd40dcc43dd6d 100644
--- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
+++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
-@@ -442,7 +442,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
+@@ -443,7 +443,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
auto screenProperties = WebCore::collectScreenProperties();
parameters.screenProperties = WTFMove(screenProperties);
#if PLATFORM(MAC)
@@ -10721,7 +10276,7 @@ index 3b6663cb77c2c20e2e6822bfdbf822cea3022fdc..d0e67aa4714f4f8e01c3c2e1ef3fd1ad
#endif
#if PLATFORM(VISION)
-@@ -841,8 +841,8 @@ void WebProcessPool::registerNotificationObservers()
+@@ -850,8 +850,8 @@ void WebProcessPool::registerNotificationObservers()
}];
m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
@@ -10733,7 +10288,7 @@ index 3b6663cb77c2c20e2e6822bfdbf822cea3022fdc..d0e67aa4714f4f8e01c3c2e1ef3fd1ad
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 f356f65a1515e9ed17e51d4bde50a8c0758fd6e1..0caab4689c42a89d1d5060a3bdf9a0502e73b8ab 100644
+index c25814a7b7c26ad90c1b51ff10d334200da9472b..d9b6654e62a6766824a6df45b73408c3141e2893 100644
--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
@@ -33,6 +33,7 @@
@@ -10744,7 +10299,7 @@ index f356f65a1515e9ed17e51d4bde50a8c0758fd6e1..0caab4689c42a89d1d5060a3bdf9a050
#include "WebPageProxy.h"
#include "WebPreferences.h"
#include "WebProcessPool.h"
-@@ -40,15 +41,26 @@
+@@ -40,9 +41,15 @@
#include <WebCore/Region.h>
#include <optional>
#include <wtf/TZoneMallocInlines.h>
@@ -10760,18 +10315,7 @@ index f356f65a1515e9ed17e51d4bde50a8c0758fd6e1..0caab4689c42a89d1d5060a3bdf9a050
#endif
#if USE(GLIB_EVENT_LOOP)
- #include <wtf/glib/RunLoopSourcePriority.h>
- #endif
-
-+#if PLATFORM(WIN)
-+#include <windows.h>
-+#include <WebCore/HWndDC.h>
-+#endif
-+
- namespace WebKit {
- using namespace WebCore;
-
-@@ -182,6 +194,11 @@ void DrawingAreaProxyCoordinatedGraphics::deviceScaleFactorDidChange(CompletionH
+@@ -182,6 +189,11 @@ void DrawingAreaProxyCoordinatedGraphics::deviceScaleFactorDidChange(CompletionH
sendWithAsyncReply(Messages::DrawingArea::SetDeviceScaleFactor(page()->deviceScaleFactor()), WTFMove(completionHandler));
}
@@ -10783,7 +10327,7 @@ index f356f65a1515e9ed17e51d4bde50a8c0758fd6e1..0caab4689c42a89d1d5060a3bdf9a050
void DrawingAreaProxyCoordinatedGraphics::setBackingStoreIsDiscardable(bool isBackingStoreDiscardable)
{
#if !PLATFORM(WPE)
-@@ -243,6 +260,59 @@ void DrawingAreaProxyCoordinatedGraphics::updateAcceleratedCompositingMode(uint6
+@@ -243,6 +255,44 @@ void DrawingAreaProxyCoordinatedGraphics::updateAcceleratedCompositingMode(uint6
updateAcceleratedCompositingMode(layerTreeContext);
}
@@ -10824,26 +10368,11 @@ index f356f65a1515e9ed17e51d4bde50a8c0758fd6e1..0caab4689c42a89d1d5060a3bdf9a050
+ protectedPage()->inspectorController().didPaint(WTFMove(skImage));
+}
+#endif // PLATFORM(GTK)
-+
-+#if PLATFORM(WIN)
-+void DrawingAreaProxyCoordinatedGraphics::captureFrame()
-+{
-+ if (!m_backingStore)
-+ return;
-+ auto surface = m_backingStore->surface();
-+ if (!surface)
-+ return;
-+ auto image = surface->makeImageSnapshot();
-+ if (!image)
-+ return;
-+ protectedPage()->inspectorController().didPaint(WTFMove(image));
-+}
-+#endif // PLATFORM(WIN)
+
bool DrawingAreaProxyCoordinatedGraphics::alwaysUseCompositing() const
{
if (!page())
-@@ -310,6 +380,12 @@ void DrawingAreaProxyCoordinatedGraphics::didUpdateGeometry()
+@@ -310,6 +360,12 @@ void DrawingAreaProxyCoordinatedGraphics::didUpdateGeometry()
// we need to resend the new size here.
if (m_lastSentSize != size())
sendUpdateGeometry();
@@ -10983,7 +10512,7 @@ index bdc3efe299296ef6ef10d32672e22fba05ca230c..a24e9c7e4b0da65099326b6921ed03b4
// This can cause the DownloadProxy object to be deleted.
if (RefPtr downloadProxyMap = m_downloadProxyMap.get())
diff --git a/Source/WebKit/UIProcess/Downloads/DownloadProxy.h b/Source/WebKit/UIProcess/Downloads/DownloadProxy.h
-index 9a92a8cde3b5d1da0fbbf5fe7c549cebb8a7f2f7..9ce201ca2d7aa002c7bd389f1fe03edfb306df5d 100644
+index 8a40cba30a1f6ea119c5c77fa328491fabce1135..ccf3059e5487ffe2750ec7478082bab307dadd70 100644
--- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.h
+++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.h
@@ -166,6 +166,7 @@ private:
@@ -10995,10 +10524,10 @@ index 9a92a8cde3b5d1da0fbbf5fe7c549cebb8a7f2f7..9ce201ca2d7aa002c7bd389f1fe03edf
} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/DrawingAreaProxy.h b/Source/WebKit/UIProcess/DrawingAreaProxy.h
-index c30c32f55aff3552bb05112dd53b9b8b62dd4a3f..32417be5f8cf613f58db900ce615518751b1509a 100644
+index 75c5092b62c6911e0c2417549189667cd9e2cfb1..82d85bdbae12db42d583ebbce6c3fc1251239df9 100644
--- a/Source/WebKit/UIProcess/DrawingAreaProxy.h
+++ b/Source/WebKit/UIProcess/DrawingAreaProxy.h
-@@ -94,6 +94,7 @@ public:
+@@ -96,6 +96,7 @@ public:
const WebCore::IntSize& size() const { return m_size; }
bool setSize(const WebCore::IntSize&, const WebCore::IntSize& scrollOffset = { });
@@ -11008,10 +10537,10 @@ index c30c32f55aff3552bb05112dd53b9b8b62dd4a3f..32417be5f8cf613f58db900ce6155187
virtual void sizeToContentAutoSizeMaximumSizeDidChange() { }
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..c7a4a2f5fbd8c99d2b53fe0d3b1645c865d46634
+index 0000000000000000000000000000000000000000..3733d0c6e8875f325bd249232b8f8205256400f8
--- /dev/null
+++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp
-@@ -0,0 +1,326 @@
+@@ -0,0 +1,341 @@
+/*
+ * Copyright (C) 2020 Microsoft Corporation.
+ *
@@ -11069,6 +10598,10 @@ index 0000000000000000000000000000000000000000..c7a4a2f5fbd8c99d2b53fe0d3b1645c8
+#include <WebCore/ImageBufferUtilitiesCG.h>
+#endif
+
++#if PLATFORM(WIN)
++#include "DrawingAreaProxyWC.h"
++#endif
++
+WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN
+
+namespace WebKit {
@@ -11089,7 +10622,7 @@ index 0000000000000000000000000000000000000000..c7a4a2f5fbd8c99d2b53fe0d3b1645c8
+{
+}
+
-+void InspectorScreencastAgent::didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*)
++void InspectorScreencastAgent::didCreateFrontendAndBackend()
+{
+}
+
@@ -11268,7 +10801,7 @@ index 0000000000000000000000000000000000000000..c7a4a2f5fbd8c99d2b53fe0d3b1645c8
+ if (!m_encoder && !m_screencast)
+ return;
+
-+ RunLoop::main().dispatchAfter(Seconds(1.0 / ScreencastEncoder::fps), [agent = WeakPtr { this }]() mutable {
++ RunLoop::mainSingleton().dispatchAfter(Seconds(1.0 / ScreencastEncoder::fps), [agent = WeakPtr { this }]() mutable {
+ if (!agent)
+ return;
+ if (!agent->m_page.hasPageClient())
@@ -11324,7 +10857,7 @@ index 0000000000000000000000000000000000000000..c7a4a2f5fbd8c99d2b53fe0d3b1645c8
+}
+#endif
+
-+#if PLATFORM(GTK) || PLATFORM(WIN)
++#if PLATFORM(GTK)
+void InspectorScreencastAgent::encodeFrame()
+{
+ if (!m_encoder && !m_screencast)
@@ -11335,12 +10868,23 @@ index 0000000000000000000000000000000000000000..c7a4a2f5fbd8c99d2b53fe0d3b1645c8
+}
+#endif
+
++#if PLATFORM(WIN)
++void InspectorScreencastAgent::encodeFrame()
++{
++ if (!m_encoder && !m_screencast)
++ return;
++
++ if (auto* drawingArea = m_page.drawingArea())
++ static_cast<DrawingAreaProxyWC*>(drawingArea)->captureFrame();
++}
++#endif
++
+} // namespace WebKit
+
+WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h
new file mode 100644
-index 0000000000000000000000000000000000000000..852c199da066320f730226653a47c8e5185dc560
+index 0000000000000000000000000000000000000000..e48ba1cc781e24afaa765661c713cef19ea2215b
--- /dev/null
+++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h
@@ -0,0 +1,106 @@
@@ -11406,12 +10950,12 @@ index 0000000000000000000000000000000000000000..852c199da066320f730226653a47c8e5
+
+class InspectorScreencastAgent : public Inspector::InspectorAgentBase, public Inspector::ScreencastBackendDispatcherHandler, public CanMakeWeakPtr<InspectorScreencastAgent> {
+ WTF_MAKE_NONCOPYABLE(InspectorScreencastAgent);
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(InspectorScreencastAgent);
+public:
+ InspectorScreencastAgent(Inspector::BackendDispatcher& backendDispatcher, Inspector::FrontendRouter& frontendRouter, WebPageProxy& page);
+ ~InspectorScreencastAgent() override;
+
-+ void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
++ void didCreateFrontendAndBackend() override;
+ void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
+
+#if USE(SKIA)
@@ -11452,7 +10996,7 @@ index 0000000000000000000000000000000000000000..852c199da066320f730226653a47c8e5
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..203cedeea9cbec6964fd297884e03ef791632fe5
+index 0000000000000000000000000000000000000000..177f7f7c9a117bc5028f85b766427739e2e9cbc9
--- /dev/null
+++ b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp
@@ -0,0 +1,398 @@
@@ -11590,7 +11134,7 @@ index 0000000000000000000000000000000000000000..203cedeea9cbec6964fd297884e03ef7
+
+class ScreencastEncoder::VPXFrame {
+ WTF_MAKE_NONCOPYABLE(VPXFrame);
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(ScreencastEncoder::VPXFrame);
+public:
+#if USE(SKIA)
+ explicit VPXFrame(sk_sp<SkImage>&& surface)
@@ -11844,7 +11388,7 @@ index 0000000000000000000000000000000000000000..203cedeea9cbec6964fd297884e03ef7
+
+ flushLastFrame();
+ m_vpxCodec->finishAsync([protectRef = Ref { *this }, callback = WTFMove(callback)] () mutable {
-+ RunLoop::main().dispatch([callback = WTFMove(callback)] {
++ RunLoop::mainSingleton().dispatch([callback = WTFMove(callback)] {
+ callback();
+ });
+ });
@@ -11856,7 +11400,7 @@ index 0000000000000000000000000000000000000000..203cedeea9cbec6964fd297884e03ef7
+WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h
new file mode 100644
-index 0000000000000000000000000000000000000000..433af017b68b71cfb68c3ebcc0bd2aeb9efc40f7
+index 0000000000000000000000000000000000000000..a414e07b64a5b6ee58a777822761c87ec05605ac
--- /dev/null
+++ b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h
@@ -0,0 +1,80 @@
@@ -11904,7 +11448,7 @@ index 0000000000000000000000000000000000000000..433af017b68b71cfb68c3ebcc0bd2aeb
+
+class ScreencastEncoder : public ThreadSafeRefCounted<ScreencastEncoder> {
+ WTF_MAKE_NONCOPYABLE(ScreencastEncoder);
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(ScreencastEncoder);
+public:
+ static constexpr int fps = 25;
+
@@ -12169,10 +11713,10 @@ index edd6e7f1799279ed3d0eb81b6c2eef9f5b375134..d4231f84f3c52641f4d9e88559e8e1a4
String m_identifier;
Inspector::InspectorTargetType m_type;
diff --git a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
-index 9e1e41b6a796082231a32b04fe8b13270b02eb3e..58b4d514f7a06b7fb7cdae111f99a9009f018187 100644
+index 187e59d58ba020cbac2246acc669ef95cafd75b4..bb2498bdb082721ce539dd935b5aebada963b1ba 100644
--- a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
+++ b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
-@@ -26,13 +26,23 @@
+@@ -26,14 +26,22 @@
#include "config.h"
#include "WebPageInspectorController.h"
@@ -12189,14 +11733,13 @@ index 9e1e41b6a796082231a32b04fe8b13270b02eb3e..58b4d514f7a06b7fb7cdae111f99a900
+#include "WebPageInspectorInputAgent.h"
#include "WebPageInspectorTarget.h"
#include "WebPageProxy.h"
-+#include "WebPreferences.h"
+ #include "WebsiteDataStore.h"
+#include <WebCore/ResourceError.h>
-+#include <WebCore/StorageBlockingPolicy.h>
+#include <WebCore/WindowFeatures.h>
#include <JavaScriptCore/InspectorAgentBase.h>
#include <JavaScriptCore/InspectorBackendDispatcher.h>
#include <JavaScriptCore/InspectorBackendDispatchers.h>
-@@ -52,34 +62,115 @@ static String getTargetID(const ProvisionalPageProxy& provisionalPage)
+@@ -53,34 +61,115 @@ static String getTargetID(const ProvisionalPageProxy& provisionalPage)
WTF_MAKE_TZONE_ALLOCATED_IMPL(WebPageInspectorController);
@@ -12319,7 +11862,7 @@ index 9e1e41b6a796082231a32b04fe8b13270b02eb3e..58b4d514f7a06b7fb7cdae111f99a900
}
bool WebPageInspectorController::hasLocalFrontend() const
-@@ -93,6 +184,17 @@ void WebPageInspectorController::connectFrontend(Inspector::FrontendChannel& fro
+@@ -94,6 +183,14 @@ void WebPageInspectorController::connectFrontend(Inspector::FrontendChannel& fro
bool connectingFirstFrontend = !m_frontendRouter->hasFrontends();
@@ -12330,14 +11873,11 @@ index 9e1e41b6a796082231a32b04fe8b13270b02eb3e..58b4d514f7a06b7fb7cdae111f99a900
+ disconnectAllFrontends();
+ connectingFirstFrontend = true;
+ }
-+
-+ if (connectingFirstFrontend)
-+ adjustPageSettings();
+
m_frontendRouter->connectFrontend(frontendChannel);
if (connectingFirstFrontend)
-@@ -112,8 +214,10 @@ void WebPageInspectorController::disconnectFrontend(FrontendChannel& frontendCha
+@@ -113,8 +210,10 @@ void WebPageInspectorController::disconnectFrontend(FrontendChannel& frontendCha
m_frontendRouter->disconnectFrontend(frontendChannel);
bool disconnectingLastFrontend = !m_frontendRouter->hasFrontends();
@@ -12349,7 +11889,7 @@ index 9e1e41b6a796082231a32b04fe8b13270b02eb3e..58b4d514f7a06b7fb7cdae111f99a900
Ref inspectedPage = m_inspectedPage.get();
inspectedPage->didChangeInspectorFrontendCount(m_frontendRouter->frontendCount());
-@@ -137,6 +241,8 @@ void WebPageInspectorController::disconnectAllFrontends()
+@@ -138,6 +237,8 @@ void WebPageInspectorController::disconnectAllFrontends()
// Disconnect any remaining remote frontends.
m_frontendRouter->disconnectAllFrontends();
@@ -12358,7 +11898,7 @@ index 9e1e41b6a796082231a32b04fe8b13270b02eb3e..58b4d514f7a06b7fb7cdae111f99a900
Ref inspectedPage = m_inspectedPage.get();
inspectedPage->didChangeInspectorFrontendCount(m_frontendRouter->frontendCount());
-@@ -165,6 +271,66 @@ void WebPageInspectorController::setIndicating(bool indicating)
+@@ -166,6 +267,66 @@ void WebPageInspectorController::setIndicating(bool indicating)
}
#endif
@@ -12425,7 +11965,7 @@ index 9e1e41b6a796082231a32b04fe8b13270b02eb3e..58b4d514f7a06b7fb7cdae111f99a900
void WebPageInspectorController::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type)
{
addTarget(InspectorTargetProxy::create(protectedInspectedPage(), targetId, type));
-@@ -184,6 +350,52 @@ void WebPageInspectorController::sendMessageToInspectorFrontend(const String& ta
+@@ -185,6 +346,52 @@ void WebPageInspectorController::sendMessageToInspectorFrontend(const String& ta
checkedTargetAgent()->sendMessageFromTargetToFrontend(targetId, message);
}
@@ -12478,7 +12018,7 @@ index 9e1e41b6a796082231a32b04fe8b13270b02eb3e..58b4d514f7a06b7fb7cdae111f99a900
bool WebPageInspectorController::shouldPauseLoading(const ProvisionalPageProxy& provisionalPage) const
{
if (!m_frontendRouter->hasFrontends())
-@@ -203,7 +415,7 @@ void WebPageInspectorController::setContinueLoadingCallback(const ProvisionalPag
+@@ -204,7 +411,7 @@ void WebPageInspectorController::setContinueLoadingCallback(const ProvisionalPag
void WebPageInspectorController::didCreateProvisionalPage(ProvisionalPageProxy& provisionalPage)
{
@@ -12487,38 +12027,8 @@ index 9e1e41b6a796082231a32b04fe8b13270b02eb3e..58b4d514f7a06b7fb7cdae111f99a900
}
void WebPageInspectorController::willDestroyProvisionalPage(const ProvisionalPageProxy& provisionalPage)
-@@ -288,4 +500,29 @@ void WebPageInspectorController::browserExtensionsDisabled(HashSet<String>&& ext
- enabledBrowserAgent->extensionsDisabled(WTFMove(extensionIDs));
- }
-
-+void WebPageInspectorController::adjustPageSettings()
-+{
-+ // Set this to true as otherwise updating any preferences will override its
-+ // value in the Web Process to false (and InspectorController sets it locally
-+ // to true when frontend is connected).
-+ m_inspectedPage->preferences().setDeveloperExtrasEnabled(true);
-+
-+ // Navigation to cached pages doesn't fire some of the events (e.g. execution context created)
-+ // that inspector depends on. So we disable the cache when front-end connects.
-+ m_inspectedPage->preferences().setUsesBackForwardCache(false);
-+
-+ // Enable popup debugging.
-+ // TODO: allow to set preferences over the inspector protocol or find a better place for this.
-+ m_inspectedPage->preferences().setJavaScriptCanOpenWindowsAutomatically(true);
-+
-+ // Enable media stream.
-+ if (!m_inspectedPage->preferences().mediaDevicesEnabled()) {
-+ m_inspectedPage->preferences().setMediaDevicesEnabled(true);
-+ m_inspectedPage->preferences().setPeerConnectionEnabled(true);
-+ }
-+
-+ // Disable local storage partitioning. See https://github.com/microsoft/playwright/issues/32230
-+ m_inspectedPage->preferences().setStorageBlockingPolicy(static_cast<uint32_t>(WebCore::StorageBlockingPolicy::AllowAll));
-+}
-+
- } // namespace WebKit
diff --git a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h
-index 0e6766e155e83f9f5fde89080448b3f08a3a27e5..8ed8b9baf74866fad6498a1a13c6db96f0e2b460 100644
+index 0e6766e155e83f9f5fde89080448b3f08a3a27e5..de641a1629d40ed31b78502b1c9883beed12ba34 100644
--- a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h
+++ b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h
@@ -26,19 +26,39 @@
@@ -12635,7 +12145,7 @@ index 0e6766e155e83f9f5fde89080448b3f08a3a27e5..8ed8b9baf74866fad6498a1a13c6db96
bool shouldPauseLoading(const ProvisionalPageProxy&) const;
void setContinueLoadingCallback(const ProvisionalPageProxy&, WTF::Function<void()>&&);
-@@ -86,12 +153,13 @@ public:
+@@ -86,7 +153,7 @@ public:
void browserExtensionsDisabled(HashSet<String>&&);
private:
@@ -12644,13 +12154,7 @@ index 0e6766e155e83f9f5fde89080448b3f08a3a27e5..8ed8b9baf74866fad6498a1a13c6db96
CheckedPtr<Inspector::InspectorTargetAgent> checkedTargetAgent() { return m_targetAgent; }
WebPageAgentContext webPageAgentContext();
void createLazyAgents();
-
- void addTarget(std::unique_ptr<InspectorTargetProxy>&&);
-+ void adjustPageSettings();
-
- const Ref<Inspector::FrontendRouter> m_frontendRouter;
- const Ref<Inspector::BackendDispatcher> m_backendDispatcher;
-@@ -102,9 +170,16 @@ private:
+@@ -102,9 +169,16 @@ private:
CheckedPtr<Inspector::InspectorTargetAgent> m_targetAgent;
HashMap<String, std::unique_ptr<InspectorTargetProxy>> m_targets;
@@ -12730,7 +12234,7 @@ index 0000000000000000000000000000000000000000..6a04ee480bc3a8270a7de20b1cd0da71
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/InspectorDialogAgent.cpp b/Source/WebKit/UIProcess/InspectorDialogAgent.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..663f92f0df76042cf6385b056f8a917d688259f9
+index 0000000000000000000000000000000000000000..1c1a7640e41edfc9faf85e2bcd63e7eafbc4dc50
--- /dev/null
+++ b/Source/WebKit/UIProcess/InspectorDialogAgent.cpp
@@ -0,0 +1,88 @@
@@ -12785,7 +12289,7 @@ index 0000000000000000000000000000000000000000..663f92f0df76042cf6385b056f8a917d
+ disable();
+}
+
-+void InspectorDialogAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*)
++void InspectorDialogAgent::didCreateFrontendAndBackend()
+{
+}
+
@@ -12824,7 +12328,7 @@ index 0000000000000000000000000000000000000000..663f92f0df76042cf6385b056f8a917d
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/InspectorDialogAgent.h b/Source/WebKit/UIProcess/InspectorDialogAgent.h
new file mode 100644
-index 0000000000000000000000000000000000000000..d0e11ed81a6257c011df23d5870da7403f8e9fe4
+index 0000000000000000000000000000000000000000..7f5e7e87c2c1f76c5c3046cb5393d808d419a32f
--- /dev/null
+++ b/Source/WebKit/UIProcess/InspectorDialogAgent.h
@@ -0,0 +1,70 @@
@@ -12876,12 +12380,12 @@ index 0000000000000000000000000000000000000000..d0e11ed81a6257c011df23d5870da740
+
+class InspectorDialogAgent : public Inspector::InspectorAgentBase, public Inspector::DialogBackendDispatcherHandler {
+ WTF_MAKE_NONCOPYABLE(InspectorDialogAgent);
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(InspectorDialogAgent);
+public:
+ InspectorDialogAgent(Inspector::BackendDispatcher& backendDispatcher, Inspector::FrontendRouter& frontendRouter, WebPageProxy& page);
+ ~InspectorDialogAgent() override;
+
-+ void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
++ void didCreateFrontendAndBackend() override;
+ void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
+
+ Inspector::Protocol::ErrorStringOr<void> enable() override;
@@ -12900,10 +12404,10 @@ index 0000000000000000000000000000000000000000..d0e11ed81a6257c011df23d5870da740
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..8026d3e9aaca3434fc1d7316a19cd92827566a67
+index 0000000000000000000000000000000000000000..13e45ef13e4d43dce84a8847bde2518af300a4d0
--- /dev/null
+++ b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp
-@@ -0,0 +1,1009 @@
+@@ -0,0 +1,1040 @@
+/*
+ * Copyright (C) 2019 Microsoft Corporation.
+ *
@@ -12956,6 +12460,7 @@ index 0000000000000000000000000000000000000000..8026d3e9aaca3434fc1d7316a19cd928
+#include "WebPageInspectorTarget.h"
+#include "WebPageMessages.h"
+#include "WebPageProxy.h"
++#include "WebPreferences.h"
+#include "WebProcessPool.h"
+#include "WebProcessProxy.h"
+#include "WebsiteDataRecord.h"
@@ -12965,6 +12470,7 @@ index 0000000000000000000000000000000000000000..8026d3e9aaca3434fc1d7316a19cd928
+#include <WebCore/ProcessIdentifier.h>
+#include <WebCore/ResourceRequest.h>
+#include <WebCore/SecurityOriginData.h>
++#include <WebCore/StorageBlockingPolicy.h>
+#include <WebCore/WindowFeatures.h>
+#include <JavaScriptCore/InspectorBackendDispatcher.h>
+#include <JavaScriptCore/InspectorFrontendChannel.h>
@@ -12982,7 +12488,7 @@ index 0000000000000000000000000000000000000000..8026d3e9aaca3434fc1d7316a19cd928
+namespace WebKit {
+
+class InspectorPlaywrightAgent::PageProxyChannel : public FrontendChannel {
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(InspectorPlaywrightAgent);
+public:
+ PageProxyChannel(FrontendChannel& frontendChannel, String browserContextID, String pageProxyID, WebPageProxy& page)
+ : m_browserContextID(browserContextID)
@@ -13148,6 +12654,33 @@ index 0000000000000000000000000000000000000000..8026d3e9aaca3434fc1d7316a19cd928
+ .release();
+}
+
++void adjustInspectedPagePreferences(WebPreferences& preferences, std::optional<bool> enableStoragePartitioning)
++{
++ // Set this to true as otherwise updating any preferences will override its
++ // value in the Web Process to false (and InspectorController sets it locally
++ // to true when frontend is connected).
++ preferences.setDeveloperExtrasEnabled(true);
++
++ // Navigation to cached pages doesn't fire some of the events (e.g. execution context created)
++ // that inspector depends on. So we disable the cache when front-end connects.
++ preferences.setUsesBackForwardCache(false);
++
++ // Enable popup debugging.
++ // TODO: allow to set preferences over the inspector protocol or find a better place for this.
++ preferences.setJavaScriptCanOpenWindowsAutomatically(true);
++
++ // Enable media stream.
++ if (!preferences.mediaDevicesEnabled()) {
++ preferences.setMediaDevicesEnabled(true);
++ preferences.setPeerConnectionEnabled(true);
++ }
++
++ if (!enableStoragePartitioning || !*enableStoragePartitioning) {
++ // Disable local storage partitioning. See https://github.com/microsoft/playwright/issues/32230
++ preferences.setStorageBlockingPolicy(static_cast<uint32_t>(WebCore::StorageBlockingPolicy::AllowAll));
++ }
++}
++
+} // namespace
+
+BrowserContext::BrowserContext() = default;
@@ -13156,7 +12689,7 @@ index 0000000000000000000000000000000000000000..8026d3e9aaca3434fc1d7316a19cd928
+
+class InspectorPlaywrightAgent::BrowserContextDeletion {
+ WTF_MAKE_NONCOPYABLE(BrowserContextDeletion);
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(InspectorPlaywrightAgent::BrowserContextDeletion);
+public:
+ BrowserContextDeletion(std::unique_ptr<BrowserContext>&& context, size_t numberOfPages, Ref<DeleteContextCallback>&& callback)
+ : m_browserContext(WTFMove(context))
@@ -13295,6 +12828,7 @@ index 0000000000000000000000000000000000000000..8026d3e9aaca3434fc1d7316a19cd928
+
+ // Auto-connect to all new pages.
+ auto pageProxyChannel = makeUnique<PageProxyChannel>(*m_frontendChannel, browserContextID, pageProxyID, page);
++ adjustInspectedPagePreferences(page.preferences(), browserContext->enableStoragePartitioning);
+ page.inspectorController().connectFrontend(*pageProxyChannel);
+ // Always pause new targets if controlled remotely.
+ page.inspectorController().setPauseOnStart(true);
@@ -13480,13 +13014,14 @@ index 0000000000000000000000000000000000000000..8026d3e9aaca3434fc1d7316a19cd928
+
+}
+
-+Inspector::Protocol::ErrorStringOr<String /* browserContextID */> InspectorPlaywrightAgent::createContext(const String& proxyServer, const String& proxyBypassList)
++Inspector::Protocol::ErrorStringOr<String /* browserContextID */> InspectorPlaywrightAgent::createContext(const String& proxyServer, const String& proxyBypassList, std::optional<bool>&& enableStoragePartitioning)
+{
+ String errorString;
+ std::unique_ptr<BrowserContext> browserContext = m_client->createBrowserContext(errorString, proxyServer, proxyBypassList);
+ if (!browserContext)
+ return makeUnexpected(errorString);
+
++ browserContext->enableStoragePartitioning = WTFMove(enableStoragePartitioning);
+ // Ensure network process.
+ browserContext->dataStore->networkProcess();
+ browserContext->dataStore->setDownloadInstrumentation(this);
@@ -13915,7 +13450,7 @@ index 0000000000000000000000000000000000000000..8026d3e9aaca3434fc1d7316a19cd928
+#endif // ENABLE(REMOTE_INSPECTOR)
diff --git a/Source/WebKit/UIProcess/InspectorPlaywrightAgent.h b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.h
new file mode 100644
-index 0000000000000000000000000000000000000000..f9185788a118f57e98bec149909a206dc1aa5d99
+index 0000000000000000000000000000000000000000..23cf8d2dbcb21b21f3ffedbd5ef369c796cae34a
--- /dev/null
+++ b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.h
@@ -0,0 +1,141 @@
@@ -13987,7 +13522,7 @@ index 0000000000000000000000000000000000000000..f9185788a118f57e98bec149909a206d
+ , public Inspector::PlaywrightBackendDispatcherHandler
+ , public DownloadInstrumentation {
+ WTF_MAKE_NONCOPYABLE(InspectorPlaywrightAgent);
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(InspectorPlaywrightAgent);
+public:
+ explicit InspectorPlaywrightAgent(std::unique_ptr<InspectorPlaywrightAgentClient> client);
+ ~InspectorPlaywrightAgent() override;
@@ -14014,7 +13549,7 @@ index 0000000000000000000000000000000000000000..f9185788a118f57e98bec149909a206d
+ Inspector::Protocol::ErrorStringOr<void> disable() override;
+ Inspector::Protocol::ErrorStringOr<String> getInfo() override;
+ void close(Ref<CloseCallback>&&) override;
-+ Inspector::Protocol::ErrorStringOr<String /* browserContextID */> createContext(const String& proxyServer, const String& proxyBypassList) override;
++ Inspector::Protocol::ErrorStringOr<String /* browserContextID */> createContext(const String& proxyServer, const String& proxyBypassList, std::optional<bool>&& enableStoragePartitioning) override;
+ void deleteContext(const String& browserContextID, Ref<DeleteContextCallback>&& callback) override;
+ Inspector::Protocol::ErrorStringOr<String /* pageProxyID */> createPage(const String& browserContextID) override;
+ void navigate(const String& url, const String& pageProxyID, const String& frameId, const String& referrer, Ref<NavigateCallback>&&) override;
@@ -14062,10 +13597,10 @@ index 0000000000000000000000000000000000000000..f9185788a118f57e98bec149909a206d
+#endif // ENABLE(REMOTE_INSPECTOR)
diff --git a/Source/WebKit/UIProcess/InspectorPlaywrightAgentClient.h b/Source/WebKit/UIProcess/InspectorPlaywrightAgentClient.h
new file mode 100644
-index 0000000000000000000000000000000000000000..e7a3dcc533294bb6e12f65d79b5b716bd3c12236
+index 0000000000000000000000000000000000000000..af71e4077eb0c6f95396de7bfef89a3efb5f12d9
--- /dev/null
+++ b/Source/WebKit/UIProcess/InspectorPlaywrightAgentClient.h
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2019 Microsoft Corporation.
+ *
@@ -14113,7 +13648,7 @@ index 0000000000000000000000000000000000000000..e7a3dcc533294bb6e12f65d79b5b716b
+
+class BrowserContext {
+ WTF_MAKE_NONCOPYABLE(BrowserContext);
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(BrowserContext);
+public:
+ BrowserContext();
+ ~BrowserContext();
@@ -14122,6 +13657,7 @@ index 0000000000000000000000000000000000000000..e7a3dcc533294bb6e12f65d79b5b716b
+ RefPtr<WebProcessPool> processPool;
+ HashSet<WebPageProxy*> pages;
+ WeakPtr<OverridenGeolocationProvider> geolocationProvider;
++ std::optional<bool> enableStoragePartitioning;
+};
+
+class InspectorPlaywrightAgentClient {
@@ -14140,7 +13676,7 @@ index 0000000000000000000000000000000000000000..e7a3dcc533294bb6e12f65d79b5b716b
+
+#endif // ENABLE(REMOTE_INSPECTOR)
diff --git a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
-index f5c20099e6f746c3d26035313bf67641927549ec..4d3a40809a303bcb49bcc65cce7b7ce06ac7a96f 100644
+index 2f2a79c4780491bb12741cc1e5fabcc37f33310a..09a92636f4bb6b0cf3d86b310c544b23c4d981c1 100644
--- a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
+++ b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
@@ -168,6 +168,13 @@ void ProcessLauncher::launchProcess()
@@ -14169,7 +13705,7 @@ index f5c20099e6f746c3d26035313bf67641927549ec..4d3a40809a303bcb49bcc65cce7b7ce0
WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
diff --git a/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp b/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp
-index 71f80f5414e3e0cec1588fb3b4432665aa6facde..23bbdb9f5eac73ebd0cc5aea33bb08bcc67b60dc 100644
+index 6723ee0d9943be07bc8ad09d2b678838aca968df..0d7fb3c7b1a4c877a2ff2f2189d12c7d00eb8f7b 100644
--- a/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp
+++ b/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp
@@ -91,14 +91,21 @@ void ProcessLauncher::launchProcess()
@@ -14196,7 +13732,7 @@ index 71f80f5414e3e0cec1588fb3b4432665aa6facde..23bbdb9f5eac73ebd0cc5aea33bb08bc
BOOL result = ::CreateProcess(0, commandLine.mutableSpan().data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation);
diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h
-index 48b9ebe975bff1b8179ac26a31b4724a028ecb94..f61094aa9f8db7832f3adcb3fd77bb19005abc40 100644
+index 840ce36d9401a3b997d0a3b6f9cc1f1528cb92fb..9a30a5ada8821c8b5de53cb20b1ea2785621e6b0 100644
--- a/Source/WebKit/UIProcess/PageClient.h
+++ b/Source/WebKit/UIProcess/PageClient.h
@@ -74,6 +74,11 @@
@@ -14211,7 +13747,7 @@ index 48b9ebe975bff1b8179ac26a31b4724a028ecb94..f61094aa9f8db7832f3adcb3fd77bb19
OBJC_CLASS AVPlayerViewController;
OBJC_CLASS CALayer;
OBJC_CLASS NSFileWrapper;
-@@ -381,7 +386,16 @@ public:
+@@ -387,7 +392,16 @@ public:
virtual void selectionDidChange() = 0;
#endif
@@ -14301,7 +13837,7 @@ index 0000000000000000000000000000000000000000..95b682567eba682f927317cd3327a531
+#endif // ENABLE(FULLSCREEN_API)
diff --git a/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.h b/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.h
new file mode 100644
-index 0000000000000000000000000000000000000000..a8a92a6c5f4b03724decc97828291f6f27cfc6aa
+index 0000000000000000000000000000000000000000..f855bb5ff6e91cc3383fb9a96d32392ff7aa5493
--- /dev/null
+++ b/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.h
@@ -0,0 +1,56 @@
@@ -14341,7 +13877,7 @@ index 0000000000000000000000000000000000000000..a8a92a6c5f4b03724decc97828291f6f
+class WebPageProxy;
+
+class PlaywrightFullScreenManagerProxyClient : public WebFullScreenManagerProxyClient {
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(PlaywrightFullScreenManagerProxyClient);
+public:
+ PlaywrightFullScreenManagerProxyClient(WebPageProxy&);
+ ~PlaywrightFullScreenManagerProxyClient() override = default;
@@ -14375,10 +13911,10 @@ index 493bde430bef5c064ff6807296ad088d8dee1a72..9b6dbc259e150fba3ba5fb4b488d91e3
#include "ProvisionalFrameCreationParameters.h"
diff --git a/Source/WebKit/UIProcess/RemoteInspectorPipe.cpp b/Source/WebKit/UIProcess/RemoteInspectorPipe.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..be84b2a5ce00ec2e242785fe8b00a08c44900215
+index 0000000000000000000000000000000000000000..2d2e6bb485c9a95b871d9545b8720cfd061dd789
--- /dev/null
+++ b/Source/WebKit/UIProcess/RemoteInspectorPipe.cpp
-@@ -0,0 +1,230 @@
+@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2019 Microsoft Corporation.
+ *
@@ -14493,8 +14029,7 @@ index 0000000000000000000000000000000000000000..be84b2a5ce00ec2e242785fe8b00a08c
+} // namespace
+
+class RemoteInspectorPipe::RemoteFrontendChannel : public Inspector::FrontendChannel {
-+ WTF_MAKE_FAST_ALLOCATED;
-+
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(RemoteInspectorPipe::RemoteFrontendChannel);
+public:
+ RemoteFrontendChannel()
+ : m_senderQueue(WorkQueue::create("Inspector pipe writer"_s))
@@ -14571,7 +14106,7 @@ index 0000000000000000000000000000000000000000..be84b2a5ce00ec2e242785fe8b00a08c
+ while (!m_terminated) {
+ size_t size = ReadBytes(buffer.get(), bufSize, false);
+ if (!size) {
-+ RunLoop::main().dispatch([this] {
++ RunLoop::mainSingleton().dispatch([this] {
+ if (!m_terminated)
+ m_playwrightAgent.disconnectFrontend();
+ });
@@ -14590,7 +14125,7 @@ index 0000000000000000000000000000000000000000..be84b2a5ce00ec2e242785fe8b00a08c
+
+ if (end > start) {
+ String message = String::fromUTF8({ line.mutableSpan().data() + start, end - start });
-+ RunLoop::main().dispatch([this, message = WTFMove(message)] {
++ RunLoop::mainSingleton().dispatch([this, message = WTFMove(message)] {
+ if (!m_terminated)
+ m_playwrightAgent.dispatchMessageFromFrontend(message);
+ });
@@ -14611,7 +14146,7 @@ index 0000000000000000000000000000000000000000..be84b2a5ce00ec2e242785fe8b00a08c
+WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
diff --git a/Source/WebKit/UIProcess/RemoteInspectorPipe.h b/Source/WebKit/UIProcess/RemoteInspectorPipe.h
new file mode 100644
-index 0000000000000000000000000000000000000000..6d04f9290135069359ce6bf8726546482fd1dc95
+index 0000000000000000000000000000000000000000..23626aa70d5a14e6484c81e05b146b375379be4f
--- /dev/null
+++ b/Source/WebKit/UIProcess/RemoteInspectorPipe.h
@@ -0,0 +1,65 @@
@@ -14658,7 +14193,7 @@ index 0000000000000000000000000000000000000000..6d04f9290135069359ce6bf872654648
+
+class RemoteInspectorPipe {
+ WTF_MAKE_NONCOPYABLE(RemoteInspectorPipe);
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(RemoteInspectorPipe);
+public:
+ explicit RemoteInspectorPipe(InspectorPlaywrightAgent&);
+ ~RemoteInspectorPipe();
@@ -14724,6 +14259,18 @@ index 22c8a561850249008f998405712e88f1c2229336..70e7f76c32af780642d254003ee83420
#endif
namespace WebKit {
+diff --git a/Source/WebKit/UIProcess/WebAuthentication/Mock/MockNfcService.mm b/Source/WebKit/UIProcess/WebAuthentication/Mock/MockNfcService.mm
+index f378efe041b8a150baae5d9136d13599f4fe83da..543523b3d03d36cd4be8a8e30cc87242a76766a3 100644
+--- a/Source/WebKit/UIProcess/WebAuthentication/Mock/MockNfcService.mm
++++ b/Source/WebKit/UIProcess/WebAuthentication/Mock/MockNfcService.mm
+@@ -36,6 +36,7 @@
+ #import <wtf/RetainPtr.h>
+ #import <wtf/RunLoop.h>
+ #import <wtf/Vector.h>
++#import <wtf/cocoa/SpanCocoa.h>
+
+ #import "NearFieldSoftLink.h"
+
diff --git a/Source/WebKit/UIProcess/WebContextMenuProxy.h b/Source/WebKit/UIProcess/WebContextMenuProxy.h
index 697a350812e1bf73dd44cc3d723a6a291f9d59d1..a8e1edd710d88f48632d51fd05aa964732d727d3 100644
--- a/Source/WebKit/UIProcess/WebContextMenuProxy.h
@@ -14738,7 +14285,7 @@ index 697a350812e1bf73dd44cc3d723a6a291f9d59d1..a8e1edd710d88f48632d51fd05aa9647
RefPtr<WebPageProxy> protectedPage() const;
diff --git a/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.cpp b/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..653b3550dda624df82de679315711fd1dd4ed0b6
+index 0000000000000000000000000000000000000000..058b9a31fc23cc36a228ef63cc89a80ccf3fa62e
--- /dev/null
+++ b/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.cpp
@@ -0,0 +1,159 @@
@@ -14793,7 +14340,7 @@ index 0000000000000000000000000000000000000000..653b3550dda624df82de679315711fd1
+{
+}
+
-+void WebPageInspectorEmulationAgent::didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*)
++void WebPageInspectorEmulationAgent::didCreateFrontendAndBackend()
+{
+}
+
@@ -14817,7 +14364,7 @@ index 0000000000000000000000000000000000000000..653b3550dda624df82de679315711fd1
+ if (deviceScaleFactor)
+ m_page.setCustomDeviceScaleFactor(deviceScaleFactor.value(), [] { });
+ m_page.setUseFixedLayout(fixedlayout);
-+ if (!m_page.pageClient()->isViewVisible() && m_page.configuration().relatedPage()) {
++ if (!m_page.pageClient()->isActiveViewVisible() && m_page.configuration().relatedPage()) {
+ m_commandsToRunWhenShown.append([this, width, height, callback = WTFMove(callback)]() mutable {
+ setSize(width, height, WTFMove(callback));
+ });
@@ -14903,7 +14450,7 @@ index 0000000000000000000000000000000000000000..653b3550dda624df82de679315711fd1
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.h b/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.h
new file mode 100644
-index 0000000000000000000000000000000000000000..d00d00ce8fd800dc1497b36b8a495c5b9aef6f58
+index 0000000000000000000000000000000000000000..14db923537ba3cad1961a748ae5e1d66c7c9322c
--- /dev/null
+++ b/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.h
@@ -0,0 +1,76 @@
@@ -14954,12 +14501,12 @@ index 0000000000000000000000000000000000000000..d00d00ce8fd800dc1497b36b8a495c5b
+
+class WebPageInspectorEmulationAgent : public Inspector::InspectorAgentBase, public Inspector::EmulationBackendDispatcherHandler {
+ WTF_MAKE_NONCOPYABLE(WebPageInspectorEmulationAgent);
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(WebPageInspectorEmulationAgent);
+public:
+ WebPageInspectorEmulationAgent(Inspector::BackendDispatcher& backendDispatcher, WebPageProxy& page);
+ ~WebPageInspectorEmulationAgent() override;
+
-+ void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
++ void didCreateFrontendAndBackend() override;
+ void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
+
+ void setDeviceMetricsOverride(int width, int height, bool fixedlayout, std::optional<double>&& deviceScaleFactor, Ref<SetDeviceMetricsOverrideCallback>&&) override;
@@ -14985,7 +14532,7 @@ index 0000000000000000000000000000000000000000..d00d00ce8fd800dc1497b36b8a495c5b
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..6cb20d95c1cd8682b025cfdf4ac74f49fd8e9cda
+index 0000000000000000000000000000000000000000..dc8d041e863fa9f4522a5c48d2d8bccd32c12c42
--- /dev/null
+++ b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp
@@ -0,0 +1,394 @@
@@ -15038,7 +14585,7 @@ index 0000000000000000000000000000000000000000..6cb20d95c1cd8682b025cfdf4ac74f49
+
+template<class T>
+class CallbackList {
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(CallbackList);
+public:
+ ~CallbackList()
+ {
@@ -15098,7 +14645,7 @@ index 0000000000000000000000000000000000000000..6cb20d95c1cd8682b025cfdf4ac74f49
+ m_wheelCallbacks->sendSuccess();
+}
+
-+void WebPageInspectorInputAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*)
++void WebPageInspectorInputAgent::didCreateFrontendAndBackend()
+{
+ m_keyboardCallbacks = makeUnique<KeyboardCallbacks>();
+ m_mouseCallbacks = makeUnique<MouseCallbacks>();
@@ -15300,7 +14847,7 @@ index 0000000000000000000000000000000000000000..6cb20d95c1cd8682b025cfdf4ac74f49
+{
+ float rotationAngle = 0.0;
+ float force = 1.0;
-+ const WebCore::IntSize radius(1, 1);
++ const WebCore::DoubleSize radius(1, 1);
+
+ uint8_t unsignedModifiers = modifiers ? static_cast<uint8_t>(*modifiers) : 0;
+ OptionSet<WebEventModifier> eventModifiers;
@@ -15385,7 +14932,7 @@ index 0000000000000000000000000000000000000000..6cb20d95c1cd8682b025cfdf4ac74f49
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/WebPageInspectorInputAgent.h b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.h
new file mode 100644
-index 0000000000000000000000000000000000000000..26a2a3c0791c334f811ec99a630314f8e8521d02
+index 0000000000000000000000000000000000000000..1afb1a81f0da0d35cf2e9375e691b016eeebe10b
--- /dev/null
+++ b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.h
@@ -0,0 +1,87 @@
@@ -15437,7 +14984,7 @@ index 0000000000000000000000000000000000000000..26a2a3c0791c334f811ec99a630314f8
+
+class WebPageInspectorInputAgent : public Inspector::InspectorAgentBase, public Inspector::InputBackendDispatcherHandler {
+ WTF_MAKE_NONCOPYABLE(WebPageInspectorInputAgent);
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(WebPageInspectorInputAgent);
+public:
+ WebPageInspectorInputAgent(Inspector::BackendDispatcher& backendDispatcher, WebPageProxy& page);
+ ~WebPageInspectorInputAgent() override;
@@ -15446,7 +14993,7 @@ index 0000000000000000000000000000000000000000..26a2a3c0791c334f811ec99a630314f8
+ void didProcessAllPendingMouseEvents();
+ void didProcessAllPendingWheelEvents();
+
-+ void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
++ void didCreateFrontendAndBackend() override;
+ void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
+
+ // Protocol handler
@@ -15477,18 +15024,18 @@ index 0000000000000000000000000000000000000000..26a2a3c0791c334f811ec99a630314f8
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
-index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda102142943 100644
+index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77e449676e 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
-@@ -206,6 +206,7 @@
- #include <WebCore/BitmapImage.h>
+@@ -208,6 +208,7 @@
#include <WebCore/CaptureDeviceManager.h>
#include <WebCore/CaptureDeviceWithCapabilities.h>
+ #include <WebCore/ChromeClient.h>
+#include <WebCore/Color.h>
#include <WebCore/CompositionHighlight.h>
#include <WebCore/CrossSiteNavigationDataTransfer.h>
#include <WebCore/CryptoKey.h>
-@@ -218,6 +219,7 @@
+@@ -220,6 +221,7 @@
#include <WebCore/DigitalCredentialsProtocols.h>
#include <WebCore/DigitalCredentialsRequestData.h>
#include <WebCore/DigitalCredentialsResponseData.h>
@@ -15496,7 +15043,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
#include <WebCore/DragController.h>
#include <WebCore/DragData.h>
#include <WebCore/ElementContext.h>
-@@ -242,6 +244,7 @@
+@@ -244,6 +246,7 @@
#include <WebCore/ModalContainerTypes.h>
#include <WebCore/NotImplemented.h>
#include <WebCore/OrganizationStorageAccessPromptQuirk.h>
@@ -15504,7 +15051,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
#include <WebCore/PerformanceLoggingClient.h>
#include <WebCore/PermissionDescriptor.h>
#include <WebCore/PermissionState.h>
-@@ -250,10 +253,13 @@
+@@ -252,10 +255,13 @@
#include <WebCore/PublicSuffixStore.h>
#include <WebCore/Quirks.h>
#include <WebCore/RealtimeMediaSourceCenter.h>
@@ -15518,17 +15065,16 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
#include <WebCore/SerializedCryptoKeyWrap.h>
#include <WebCore/SerializedScriptValue.h>
#include <WebCore/ShareData.h>
-@@ -349,6 +355,9 @@
- #if USE(GBM)
- #include "AcceleratedBackingStoreDMABuf.h"
+@@ -346,7 +352,7 @@
+ #include "ViewSnapshotStore.h"
#endif
-+#endif
-+
+
+-#if PLATFORM(GTK)
+#if PLATFORM(GTK) || PLATFORM(WPE)
#include <WebCore/SelectionData.h>
#endif
-@@ -474,6 +483,8 @@ static constexpr Seconds tryCloseTimeoutDelay = 50_ms;
+@@ -476,6 +482,8 @@ static constexpr Seconds tryCloseTimeoutDelay = 50_ms;
static constexpr Seconds audibleActivityClearDelay = 10_s;
#endif
@@ -15537,7 +15083,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, webPageProxyCounter, ("WebPageProxy"));
#if PLATFORM(COCOA)
-@@ -1006,6 +1017,10 @@ WebPageProxy::~WebPageProxy()
+@@ -1007,6 +1015,10 @@ WebPageProxy::~WebPageProxy()
#endif
internals().updatePlayingMediaDidChangeTimer.stop();
@@ -15548,7 +15094,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
}
Ref<WebPageProxy> WebPageProxy::Internals::protectedPage() const
-@@ -1590,7 +1605,7 @@ void WebPageProxy::didAttachToRunningProcess()
+@@ -1591,7 +1603,7 @@ void WebPageProxy::didAttachToRunningProcess()
#if ENABLE(FULLSCREEN_API)
ASSERT(!m_fullScreenManager);
@@ -15557,7 +15103,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
#endif
#if ENABLE(VIDEO_PRESENTATION_MODE)
ASSERT(!m_playbackSessionManager);
-@@ -1754,6 +1769,7 @@ void WebPageProxy::initializeWebPage(const Site& site, WebCore::SandboxFlags eff
+@@ -1755,6 +1767,7 @@ void WebPageProxy::initializeWebPage(const Site& site, WebCore::SandboxFlags eff
if (preferences->siteIsolationEnabled())
browsingContextGroup->addPage(*this);
process->send(Messages::WebProcess::CreateWebPage(m_webPageID, creationParameters(process, *protectedDrawingArea(), m_mainFrame->frameID(), std::nullopt)), 0);
@@ -15565,7 +15111,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
#if ENABLE(WINDOW_PROXY_PROPERTY_ACCESS_NOTIFICATION)
internals().frameLoadStateObserver = WebPageProxyFrameLoadStateObserver::create();
-@@ -2036,6 +2052,21 @@ Ref<WebProcessProxy> WebPageProxy::ensureProtectedRunningProcess()
+@@ -2037,6 +2050,21 @@ Ref<WebProcessProxy> WebPageProxy::ensureProtectedRunningProcess()
return ensureRunningProcess();
}
@@ -15584,10 +15130,10 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
+ return navigation;
+}
+
- RefPtr<API::Navigation> WebPageProxy::loadRequest(WebCore::ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, IsPerformingHTTPFallback isPerformingHTTPFallback, std::unique_ptr<NavigationActionData>&& lastNavigationAction, API::Object* userData)
+ RefPtr<API::Navigation> WebPageProxy::loadRequest(WebCore::ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, IsPerformingHTTPFallback isPerformingHTTPFallback, std::unique_ptr<NavigationActionData>&& lastNavigationAction, API::Object* userData, bool isRequestFromClientOrUserInput)
{
if (m_isClosed)
-@@ -2152,11 +2183,29 @@ void WebPageProxy::loadRequestWithNavigationShared(Ref<WebProcessProxy>&& proces
+@@ -2156,11 +2184,29 @@ void WebPageProxy::loadRequestWithNavigationShared(Ref<WebProcessProxy>&& proces
navigation->setIsLoadedWithNavigationShared(true);
protectedProcess->markProcessAsRecentlyUsed();
@@ -15621,7 +15167,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
});
}
-@@ -2712,6 +2761,63 @@ void WebPageProxy::setControlledByAutomation(bool controlled)
+@@ -2716,6 +2762,63 @@ void WebPageProxy::setControlledByAutomation(bool controlled)
protectedWebsiteDataStore()->protectedNetworkProcess()->send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0);
}
@@ -15685,7 +15231,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
void WebPageProxy::createInspectorTarget(IPC::Connection& connection, const String& targetId, Inspector::InspectorTargetType type)
{
MESSAGE_CHECK_BASE(!targetId.isEmpty(), connection);
-@@ -2999,6 +3105,24 @@ void WebPageProxy::updateActivityState(OptionSet<ActivityState> flagsToUpdate)
+@@ -3003,6 +3106,24 @@ void WebPageProxy::updateActivityState(OptionSet<ActivityState> flagsToUpdate)
bool wasVisible = isViewVisible();
RefPtr pageClient = this->pageClient();
internals().activityState.remove(flagsToUpdate);
@@ -15710,7 +15256,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
if (flagsToUpdate & ActivityState::IsFocused && pageClient->isViewFocused())
internals().activityState.add(ActivityState::IsFocused);
if (flagsToUpdate & ActivityState::WindowIsActive && pageClient->isViewWindowActive())
-@@ -3762,7 +3886,7 @@ void WebPageProxy::performDragOperation(DragData& dragData, const String& dragSt
+@@ -3769,7 +3890,7 @@ void WebPageProxy::performDragOperation(DragData& dragData, const String& dragSt
if (!hasRunningProcess())
return;
@@ -15719,7 +15265,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
URL url { dragData.asURL() };
if (url.protocolIsFile())
protectedLegacyMainFrameProcess()->assumeReadAccessToBaseURL(*this, url.string(), [] { });
-@@ -3790,6 +3914,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
+@@ -3797,6 +3918,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
if (!hasRunningProcess())
return;
@@ -15728,7 +15274,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
auto completionHandler = [this, protectedThis = Ref { *this }, action, dragData] (std::optional<WebCore::DragOperation> dragOperation, WebCore::DragHandlingMethod dragHandlingMethod, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, const IntRect& insertionRect, const IntRect& editableElementRect, std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData) mutable {
if (!m_pageClient)
return;
-@@ -3801,7 +3927,7 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
+@@ -3808,7 +3931,7 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
dragData.setClientPosition(remoteUserInputEventData->transformedPoint);
performDragControllerAction(action, dragData, remoteUserInputEventData->targetFrameID);
};
@@ -15737,7 +15283,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
ASSERT(dragData.platformData());
sendWithAsyncReplyToProcessContainingFrame(frameID, Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags()), WTFMove(completionHandler));
#else
-@@ -3836,14 +3962,35 @@ void WebPageProxy::didPerformDragControllerAction(std::optional<WebCore::DragOpe
+@@ -3843,17 +3966,36 @@ void WebPageProxy::didPerformDragControllerAction(std::optional<WebCore::DragOpe
setDragCaretRect(insertionRect);
if (RefPtr pageClient = this->pageClient())
pageClient->didPerformDragControllerAction();
@@ -15746,27 +15292,26 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
+ m_inspectorController->didProcessAllPendingMouseEvents();
}
--#if PLATFORM(GTK)
-+#if PLATFORM(GTK) || PLATFORM(WPE)
+ #if PLATFORM(GTK) || PLATFORM(WPE)
void WebPageProxy::startDrag(SelectionData&& selectionData, OptionSet<WebCore::DragOperation> dragOperationMask, std::optional<ShareableBitmap::Handle>&& dragImageHandle, IntPoint&& dragImageHotspot)
{
-- if (RefPtr pageClient = this->pageClient()) {
-- RefPtr dragImage = dragImageHandle ? ShareableBitmap::create(WTFMove(*dragImageHandle)) : nullptr;
-- pageClient->startDrag(WTFMove(selectionData), dragOperationMask, WTFMove(dragImage), WTFMove(dragImageHotspot));
+ if (m_interceptDrags) {
+ m_dragSelectionData = WTFMove(selectionData);
+ m_dragSourceOperationMask = dragOperationMask;
+ } else {
-+#if PLATFORM(GTK)
+ #if PLATFORM(GTK)
+- if (RefPtr pageClient = this->pageClient()) {
+- RefPtr dragImage = dragImageHandle ? ShareableBitmap::create(WTFMove(*dragImageHandle)) : nullptr;
+- pageClient->startDrag(WTFMove(selectionData), dragOperationMask, WTFMove(dragImage), WTFMove(dragImageHotspot));
+ if (RefPtr pageClient = this->pageClient()) {
+ RefPtr dragImage = dragImageHandle ? ShareableBitmap::create(WTFMove(*dragImageHandle)) : nullptr;
+ pageClient->startDrag(WTFMove(selectionData), dragOperationMask, WTFMove(dragImage), WTFMove(dragImageHotspot));
+ }
+#endif
-+ }
+ }
+ didStartDrag();
+}
-+#endif
+ #endif
+
+#if PLATFORM(WIN) && ENABLE(DRAG_SUPPORT)
+void WebPageProxy::startDrag(WebCore::DragDataMap&& dragDataMap)
@@ -15774,10 +15319,11 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
+ if (m_interceptDrags) {
+ m_dragSelectionData = WTFMove(dragDataMap);
+ m_dragSourceOperationMask = WebCore::anyDragOperation();
- }
++ }
didStartDrag();
}
-@@ -3865,6 +4012,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo
+ #endif
+@@ -3874,6 +4016,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo
setDragCaretRect({ });
}
@@ -15802,7 +15348,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
void WebPageProxy::didStartDrag()
{
if (!hasRunningProcess())
-@@ -3872,6 +4037,26 @@ void WebPageProxy::didStartDrag()
+@@ -3881,6 +4041,26 @@ void WebPageProxy::didStartDrag()
discardQueuedMouseEvents();
send(Messages::WebPage::DidStartDrag());
@@ -15829,12 +15375,12 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
}
void WebPageProxy::dragCancelled()
-@@ -4043,26 +4228,47 @@ void WebPageProxy::processNextQueuedMouseEvent()
+@@ -4052,26 +4232,47 @@ void WebPageProxy::processNextQueuedMouseEvent()
process->startResponsivenessTimer();
}
- std::optional<Vector<SandboxExtension::Handle>> sandboxExtensions;
-+ m_lastMousePositionForDrag = event->position();
++ m_lastMousePositionForDrag = roundedIntPoint(event->position());
+ if (!m_dragSelectionData) {
+ std::optional<Vector<SandboxExtension::Handle>> sandboxExtensions;
@@ -15869,9 +15415,9 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
+ internals().coalescedMouseEvents.clear();
+ } else {
+#if PLATFORM(WIN) || PLATFORM(COCOA)
-+ DragData dragData(*m_dragSelectionData, event->position(), event->globalPosition(), m_dragSourceOperationMask);
++ DragData dragData(*m_dragSelectionData, roundedIntPoint(event->position()), roundedIntPoint(event->globalPosition()), m_dragSourceOperationMask);
+#else
-+ DragData dragData(&*m_dragSelectionData, event->position(), event->globalPosition(), m_dragSourceOperationMask);
++ DragData dragData(&*m_dragSelectionData, roundedIntPoint(event->position()), roundedIntPoint(event->globalPosition()), m_dragSourceOperationMask);
+#endif
+ if (eventType == WebEventType::MouseMove) {
+ dragUpdated(dragData);
@@ -15882,14 +15428,14 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
+ performDragOperation(dragData, ""_s, WTFMove(sandboxExtensionHandle), WTFMove(sandboxExtensionsForUpload));
+ }
+ m_dragSelectionData = std::nullopt;
-+ dragEnded(event->position(), event->globalPosition(), m_dragSourceOperationMask);
++ dragEnded(roundedIntPoint(event->position()), roundedIntPoint(event->globalPosition()), m_dragSourceOperationMask);
+ }
+ didReceiveEventIPC(process->connection(), eventType, true, std::nullopt);
+ }
}
void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function<void ()>&& action)
-@@ -4260,6 +4466,8 @@ void WebPageProxy::wheelEventHandlingCompleted(bool wasHandled)
+@@ -4269,6 +4470,8 @@ void WebPageProxy::wheelEventHandlingCompleted(bool wasHandled)
if (RefPtr automationSession = m_configuration->processPool().automationSession())
automationSession->wheelEventsFlushedForPage(*this);
@@ -15898,7 +15444,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
}
void WebPageProxy::cacheWheelEventScrollingAccelerationCurve(const NativeWebWheelEvent& nativeWheelEvent)
-@@ -4396,7 +4604,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b)
+@@ -4405,7 +4608,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b)
void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent)
{
@@ -15907,7 +15453,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
for (auto& touchPoint : touchStartEvent.touchPoints()) {
auto location = touchPoint.locationInRootView();
auto update = [this, location](TrackingType& trackingType, EventTrackingRegions::EventType eventType) {
-@@ -5078,6 +5286,7 @@ Ref<WebPageProxy> WebPageProxy::navigationOriginatingPage(const FrameInfoData& f
+@@ -5104,6 +5307,7 @@ Ref<WebPageProxy> WebPageProxy::navigationOriginatingPage(const FrameInfoData& f
void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr<API::WebsitePolicies>&& websitePolicies, Ref<API::NavigationAction>&& navigationAction, WillContinueLoadInNewProcess willContinueLoadInNewProcess, std::optional<SandboxExtension::Handle> sandboxExtensionHandle, std::optional<PolicyDecisionConsoleMessage>&& consoleMessage, CompletionHandler<void(PolicyDecision&&)>&& completionHandler)
{
@@ -15915,7 +15461,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
if (!hasRunningProcess())
return completionHandler(PolicyDecision { });
-@@ -6080,6 +6289,7 @@ void WebPageProxy::viewScaleFactorDidChange(IPC::Connection& connection, double
+@@ -6118,6 +6322,7 @@ void WebPageProxy::viewScaleFactorDidChange(IPC::Connection& connection, double
MESSAGE_CHECK_BASE(scaleFactorIsValid(scaleFactor), connection);
if (!legacyMainFrameProcess().hasConnection(connection))
return;
@@ -15923,7 +15469,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
forEachWebContentProcess([&] (auto& process, auto pageID) {
if (&process == &legacyMainFrameProcess())
-@@ -6731,6 +6941,7 @@ void WebPageProxy::didDestroyNavigationShared(Ref<WebProcessProxy>&& process, We
+@@ -6769,6 +6974,7 @@ void WebPageProxy::didDestroyNavigationShared(Ref<WebProcessProxy>&& process, We
RefPtr protectedPageClient { pageClient() };
m_navigationState->didDestroyNavigation(process->coreProcessIdentifier(), navigationID);
@@ -15931,7 +15477,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
}
void WebPageProxy::didStartProvisionalLoadForFrame(IPC::Connection& connection, FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, std::optional<WebCore::NavigationIdentifier> navigationID, URL&& url, URL&& unreachableURL, const UserData& userData, WallTime timestamp)
-@@ -7079,6 +7290,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref<WebProcessProxy>&& p
+@@ -7126,6 +7332,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref<WebProcessProxy>&& p
m_failingProvisionalLoadURL = { };
@@ -15940,7 +15486,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
// If the provisional page's load fails then we destroy the provisional page.
if (m_provisionalPage && m_provisionalPage->mainFrame() == &frame && (willContinueLoading == WillContinueLoading::No || protectedPreferences()->siteIsolationEnabled()))
m_provisionalPage = nullptr;
-@@ -8642,6 +8855,8 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
+@@ -8665,6 +8873,8 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
if (RefPtr page = originatingFrameInfo->page())
openerAppInitiatedState = page->lastNavigationWasAppInitiated();
@@ -15949,7 +15495,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
auto completionHandler = [
this,
protectedThis = Ref { *this },
-@@ -8721,6 +8936,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
+@@ -8749,6 +8959,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
configuration->setOpenedMainFrameName(openedMainFrameName);
if (!protectedPreferences()->siteIsolationEnabled())
configuration->setRelatedPage(*this);
@@ -15957,7 +15503,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
if (RefPtr openerFrame = WebFrameProxy::webFrame(originatingFrameInfoData.frameID); navigationActionData.hasOpener && openerFrame) {
configuration->setOpenerInfo({ {
-@@ -8748,6 +8964,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
+@@ -8778,6 +8989,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
void WebPageProxy::showPage()
{
m_uiClient->showPage(this);
@@ -15965,7 +15511,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
}
bool WebPageProxy::hasOpenedPage() const
-@@ -8898,6 +9115,10 @@ void WebPageProxy::closePage()
+@@ -8916,6 +9128,10 @@ void WebPageProxy::closePage()
if (isClosed())
return;
@@ -15976,7 +15522,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:");
if (RefPtr pageClient = this->pageClient())
pageClient->clearAllEditCommands();
-@@ -8936,6 +9157,8 @@ void WebPageProxy::runJavaScriptAlert(IPC::Connection& connection, FrameIdentifi
+@@ -8954,6 +9170,8 @@ void WebPageProxy::runJavaScriptAlert(IPC::Connection& connection, FrameIdentifi
}
runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), WTFMove(message), [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, String&& message, CompletionHandler<void()>&& completion) mutable {
@@ -15985,7 +15531,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
page.m_uiClient->runJavaScriptAlert(page, WTFMove(message), frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable {
reply();
completion();
-@@ -8958,6 +9181,8 @@ void WebPageProxy::runJavaScriptConfirm(IPC::Connection& connection, FrameIdenti
+@@ -8976,6 +9194,8 @@ void WebPageProxy::runJavaScriptConfirm(IPC::Connection& connection, FrameIdenti
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->willShowJavaScriptDialog(*this, message, std::nullopt);
}
@@ -15994,7 +15540,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), WTFMove(message), [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, String&& message, CompletionHandler<void()>&& completion) mutable {
page.m_uiClient->runJavaScriptConfirm(page, WTFMove(message), frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](bool result) mutable {
-@@ -8982,6 +9207,8 @@ void WebPageProxy::runJavaScriptPrompt(IPC::Connection& connection, FrameIdentif
+@@ -9000,6 +9220,8 @@ void WebPageProxy::runJavaScriptPrompt(IPC::Connection& connection, FrameIdentif
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->willShowJavaScriptDialog(*this, message, defaultValue);
}
@@ -16003,7 +15549,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), WTFMove(message), [reply = WTFMove(reply), defaultValue= WTFMove(defaultValue)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, String&& message, CompletionHandler<void()>&& completion) mutable {
page.m_uiClient->runJavaScriptPrompt(page, WTFMove(message), WTFMove(defaultValue), frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](auto& result) mutable {
-@@ -9123,6 +9350,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(IPC::Connection& connection, Fram
+@@ -9142,6 +9364,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(IPC::Connection& connection, Fram
return;
}
}
@@ -16012,7 +15558,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
// Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer.
webProcess->stopResponsivenessTimer();
-@@ -9758,6 +9987,11 @@ void WebPageProxy::resourceLoadDidCompleteWithError(ResourceLoadInfo&& loadInfo,
+@@ -9787,6 +10011,11 @@ void WebPageProxy::resourceLoadDidCompleteWithError(ResourceLoadInfo&& loadInfo,
}
#if ENABLE(FULLSCREEN_API)
@@ -16024,7 +15570,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
WebFullScreenManagerProxy* WebPageProxy::fullScreenManager()
{
return m_fullScreenManager.get();
-@@ -9890,6 +10124,17 @@ void WebPageProxy::requestDOMPasteAccess(IPC::Connection& connection, DOMPasteAc
+@@ -9919,6 +10148,17 @@ void WebPageProxy::requestDOMPasteAccess(IPC::Connection& connection, DOMPasteAc
}
}
@@ -16042,7 +15588,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
protectedPageClient()->requestDOMPasteAccess(pasteAccessCategory, requiresInteraction, elementRect, originIdentifier, WTFMove(completionHandler));
}
-@@ -10900,6 +11145,8 @@ void WebPageProxy::mouseEventHandlingCompleted(std::optional<WebEventType> event
+@@ -10930,6 +11170,8 @@ void WebPageProxy::mouseEventHandlingCompleted(std::optional<WebEventType> event
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->mouseEventsFlushedForPage(*this);
didFinishProcessingAllPendingMouseEvents();
@@ -16051,7 +15597,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
}
}
-@@ -10935,6 +11182,7 @@ void WebPageProxy::keyEventHandlingCompleted(std::optional<WebEventType> eventTy
+@@ -10965,6 +11207,7 @@ void WebPageProxy::keyEventHandlingCompleted(std::optional<WebEventType> eventTy
if (!canProcessMoreKeyEvents) {
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->keyboardEventsFlushedForPage(*this);
@@ -16059,7 +15605,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
}
}
-@@ -11369,7 +11617,10 @@ void WebPageProxy::dispatchProcessDidTerminate(WebProcessProxy& process, Process
+@@ -11399,7 +11642,10 @@ void WebPageProxy::dispatchProcessDidTerminate(WebProcessProxy& process, Process
if (protectedPreferences()->siteIsolationEnabled())
protectedBrowsingContextGroup()->processDidTerminate(*this, process);
@@ -16071,16 +15617,16 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
if (m_loaderClient)
handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this);
else
-@@ -12022,6 +12273,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
- parameters.canUseCredentialStorage = m_canUseCredentialStorage;
+@@ -12060,6 +12306,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
parameters.httpsUpgradeEnabled = preferences->upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false;
+ parameters.allowJSHandleInPageContentWorld = m_configuration->allowJSHandleInPageContentWorld();
+
+ parameters.shouldPauseInInspectorWhenShown = m_inspectorController->shouldPauseInInspectorWhenShown();
#if ENABLE(APP_HIGHLIGHTS)
parameters.appHighlightsVisible = appHighlightsVisibility() ? HighlightVisibility::Visible : HighlightVisibility::Hidden;
-@@ -12190,8 +12443,47 @@ void WebPageProxy::allowGamepadAccess()
+@@ -12222,8 +12470,47 @@ void WebPageProxy::allowGamepadAccess()
#endif // ENABLE(GAMEPAD)
@@ -16128,7 +15674,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) {
m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) {
if (shouldAllowLegacyTLS)
-@@ -12287,6 +12579,12 @@ void WebPageProxy::requestGeolocationPermissionForFrame(IPC::Connection& connect
+@@ -12319,6 +12606,12 @@ void WebPageProxy::requestGeolocationPermissionForFrame(IPC::Connection& connect
request->deny();
};
@@ -16141,7 +15687,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
// 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
-@@ -12353,6 +12651,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
+@@ -12385,6 +12678,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
shouldChangeDeniedToPrompt = false;
if (sessionID().isEphemeral()) {
@@ -16154,7 +15700,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
completionHandler(shouldChangeDeniedToPrompt ? PermissionState::Prompt : PermissionState::Denied);
return;
}
-@@ -12367,6 +12671,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
+@@ -12399,6 +12698,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
return;
}
@@ -16168,7 +15714,7 @@ index 26edaf188b554c9d0622ee3419d343e0e500e7f9..a884af86f2c56693a1aba8246168fda1
completionHandler(shouldChangeDeniedToPrompt ? PermissionState::Prompt : PermissionState::Denied);
return;
diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
-index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172ef8a2def 100644
+index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453c61783ae 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.h
+++ b/Source/WebKit/UIProcess/WebPageProxy.h
@@ -28,6 +28,7 @@
@@ -16200,7 +15746,7 @@ index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172
namespace API {
class Attachment;
-@@ -115,6 +130,7 @@ class DragData;
+@@ -114,6 +129,7 @@ class DragData;
class Exception;
class FloatPoint;
class FloatQuad;
@@ -16208,7 +15754,7 @@ index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172
class FloatRect;
class FloatSize;
class FontAttributeChanges;
-@@ -745,6 +761,8 @@ public:
+@@ -764,6 +780,8 @@ public:
void setControlledByAutomation(bool);
WebPageInspectorController& inspectorController() { return m_inspectorController.get(); }
@@ -16217,7 +15763,7 @@ index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172
#if PLATFORM(IOS_FAMILY)
void showInspectorIndication();
-@@ -778,6 +796,7 @@ public:
+@@ -797,6 +815,7 @@ public:
bool hasSleepDisabler() const;
#if ENABLE(FULLSCREEN_API)
@@ -16225,7 +15771,7 @@ index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172
WebFullScreenManagerProxy* fullScreenManager();
RefPtr<WebFullScreenManagerProxy> protectedFullScreenManager();
void setFullScreenClientForTesting(std::unique_ptr<WebKit::WebFullScreenManagerProxyClient>&&);
-@@ -870,6 +889,12 @@ public:
+@@ -889,6 +908,12 @@ public:
void setPageLoadStateObserver(RefPtr<PageLoadStateObserverBase>&&);
@@ -16238,16 +15784,16 @@ index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172
void initializeWebPage(const WebCore::Site&, WebCore::SandboxFlags);
void setDrawingArea(RefPtr<DrawingAreaProxy>&&);
-@@ -901,6 +926,8 @@ public:
+@@ -920,6 +945,8 @@ public:
RefPtr<API::Navigation> loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy, WebCore::IsPerformingHTTPFallback);
- RefPtr<API::Navigation> loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy, WebCore::IsPerformingHTTPFallback, std::unique_ptr<NavigationActionData>&&, API::Object* userData = nullptr);
+ RefPtr<API::Navigation> loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy, WebCore::IsPerformingHTTPFallback, std::unique_ptr<NavigationActionData>&&, API::Object* userData = nullptr, bool isRequestFromClientOrUserInput = true);
+ RefPtr<API::Navigation> loadRequestForInspector(WebCore::ResourceRequest&&, WebFrameProxy*);
+
RefPtr<API::Navigation> loadFile(const String& fileURL, const String& resourceDirectoryURL, bool isAppInitiated = true, API::Object* userData = nullptr);
RefPtr<API::Navigation> loadData(Ref<WebCore::SharedBuffer>&&, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr);
RefPtr<API::Navigation> loadData(Ref<WebCore::SharedBuffer>&&, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData, WebCore::ShouldOpenExternalURLsPolicy);
-@@ -990,6 +1017,7 @@ public:
+@@ -1012,6 +1039,7 @@ public:
PageClient* pageClient() const;
RefPtr<PageClient> protectedPageClient() const;
@@ -16255,24 +15801,23 @@ index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172
void setViewNeedsDisplay(const WebCore::Region&);
void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, WebCore::ScrollIsAnimated);
-@@ -1635,17 +1663,23 @@ public:
+@@ -1663,10 +1691,13 @@ public:
void didStartDrag();
void dragCancelled();
void setDragCaretRect(const WebCore::IntRect&);
+ void setInterceptDrags(bool shouldIntercept);
+ bool cancelDragIfNeeded();
#if PLATFORM(COCOA)
- void startDrag(const WebCore::DragItem&, WebCore::ShareableBitmapHandle&& dragImageHandle, const std::optional<WebCore::ElementIdentifier>&);
+ void startDrag(const WebCore::DragItem&, WebCore::ShareableBitmapHandle&& dragImageHandle, const std::optional<WebCore::NodeIdentifier>&);
void setPromisedDataForImage(IPC::Connection&, const String& pasteboardName, WebCore::SharedMemoryHandle&& imageHandle, const String& filename, const String& extension,
const String& title, const String& url, const String& visibleURL, WebCore::SharedMemoryHandle&& archiveHandle, const String& originIdentifier);
+ void releaseInspectorDragPasteboard();
#endif
--#if PLATFORM(GTK)
-+#if PLATFORM(GTK) || PLATFORM(WPE)
+ #if PLATFORM(GTK) || PLATFORM(WPE)
void startDrag(WebCore::SelectionData&&, OptionSet<WebCore::DragOperation>, std::optional<WebCore::ShareableBitmapHandle>&& dragImage, WebCore::IntPoint&& dragImageHotspot);
- #endif
+@@ -1674,6 +1705,9 @@ public:
#if ENABLE(MODEL_PROCESS)
- void modelDragEnded(const WebCore::ElementIdentifier);
+ void modelDragEnded(const WebCore::NodeIdentifier);
#endif
+#if PLATFORM(WIN)
+ void startDrag(WebCore::DragDataMap&& dragDataMap);
@@ -16280,7 +15825,7 @@ index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172
#endif
void processDidBecomeUnresponsive();
-@@ -1897,6 +1931,7 @@ public:
+@@ -1921,6 +1955,7 @@ public:
void setViewportSizeForCSSViewportUnits(const WebCore::FloatSize&);
WebCore::FloatSize viewportSizeForCSSViewportUnits() const;
@@ -16288,7 +15833,7 @@ index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172
void didReceiveAuthenticationChallengeProxy(Ref<AuthenticationChallengeProxy>&&, NegotiatedLegacyTLS);
void negotiatedLegacyTLS();
void didNegotiateModernTLS(const URL&);
-@@ -1930,6 +1965,8 @@ public:
+@@ -1953,6 +1988,8 @@ public:
#if PLATFORM(COCOA) || PLATFORM(GTK)
RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&);
RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&, ForceSoftwareCapturingViewportSnapshot);
@@ -16297,7 +15842,7 @@ index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172
#endif
void serializeAndWrapCryptoKey(IPC::Connection&, WebCore::CryptoKeyData&&, CompletionHandler<void(std::optional<Vector<uint8_t>>&&)>&&);
-@@ -2956,6 +2993,7 @@ private:
+@@ -3001,6 +3038,7 @@ private:
RefPtr<API::Navigation> launchProcessForReload();
void requestNotificationPermission(const String& originString, CompletionHandler<void(bool allowed)>&&);
@@ -16305,7 +15850,7 @@ index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172
void didChangeContentSize(const WebCore::IntSize&);
void didChangeIntrinsicContentSize(const WebCore::IntSize&);
-@@ -3482,8 +3520,10 @@ private:
+@@ -3526,8 +3564,10 @@ private:
String m_openedMainFrameName;
RefPtr<WebInspectorUIProxy> m_inspector;
@@ -16316,7 +15861,7 @@ index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172
RefPtr<WebFullScreenManagerProxy> m_fullScreenManager;
std::unique_ptr<API::FullscreenClient> m_fullscreenClient;
#endif
-@@ -3680,6 +3720,22 @@ private:
+@@ -3725,6 +3765,22 @@ private:
std::optional<WebCore::DragOperation> m_currentDragOperation;
bool m_currentDragIsOverFileInput { false };
unsigned m_currentDragNumberOfFilesToBeAccepted { 0 };
@@ -16339,7 +15884,7 @@ index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172
#endif
bool m_mainFrameHasHorizontalScrollbar { false };
-@@ -3851,6 +3907,10 @@ private:
+@@ -3897,6 +3953,10 @@ private:
RefPtr<API::Object> messageBody;
};
Vector<InjectedBundleMessage> m_pendingInjectedBundleMessages;
@@ -16351,7 +15896,7 @@ index 9cf73b03b77ddb5e68cfa1866c368b3126405610..ffcd057469132f3be590d06469518172
#if PLATFORM(IOS_FAMILY) && ENABLE(DEVICE_ORIENTATION)
RefPtr<WebDeviceOrientationUpdateProviderProxy> m_webDeviceOrientationUpdateProviderProxy;
diff --git a/Source/WebKit/UIProcess/WebPageProxy.messages.in b/Source/WebKit/UIProcess/WebPageProxy.messages.in
-index fcb0649584da102c1446029342c8f31c59628301..5559c5f690a568bb1b39fe4bc0ac181a8e1953b3 100644
+index 78928579347f7b44e1be855ef68e5521326f5d27..d1e5761093a8eb24424e9f37ea71dbadcf375d38 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.messages.in
+++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in
@@ -35,6 +35,7 @@ messages -> WebPageProxy {
@@ -16362,12 +15907,7 @@ index fcb0649584da102c1446029342c8f31c59628301..5559c5f690a568bb1b39fe4bc0ac181a
DidReceiveEventIPC(enum:uint8_t WebKit::WebEventType eventType, bool handled, struct std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData)
SetCursor(WebCore::Cursor cursor)
-@@ -333,10 +334,14 @@ messages -> WebPageProxy {
- StartDrag(struct WebCore::DragItem dragItem, WebCore::ShareableBitmapHandle dragImage, std::optional<WebCore::ElementIdentifier> elementID)
- 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)
+@@ -335,6 +336,10 @@ messages -> WebPageProxy {
StartDrag(WebCore::SelectionData selectionData, OptionSet<WebCore::DragOperation> dragOperationMask, std::optional<WebCore::ShareableBitmapHandle> dragImage, WebCore::IntPoint dragImageHotspot)
#endif
@@ -16377,9 +15917,9 @@ index fcb0649584da102c1446029342c8f31c59628301..5559c5f690a568bb1b39fe4bc0ac181a
+
#if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
WillReceiveEditDragSnapshot()
- DidReceiveEditDragSnapshot(struct std::optional<WebCore::TextIndicatorData> textIndicator)
+ DidReceiveEditDragSnapshot(RefPtr<WebCore::TextIndicator> textIndicator)
diff --git a/Source/WebKit/UIProcess/WebProcessCache.cpp b/Source/WebKit/UIProcess/WebProcessCache.cpp
-index 9619dd597aec77547cccdf0d3ce6c711335f6244..db169d23388fd7b1cb7b79eef4160301aee0e0ef 100644
+index b660187624f7a1aad8f86088f000a2a6b28d52f8..13444a265d2635083bece831e4cf7c0df944a712 100644
--- a/Source/WebKit/UIProcess/WebProcessCache.cpp
+++ b/Source/WebKit/UIProcess/WebProcessCache.cpp
@@ -100,6 +100,10 @@ bool WebProcessCache::canCacheProcess(WebProcessProxy& process) const
@@ -16394,10 +15934,10 @@ index 9619dd597aec77547cccdf0d3ce6c711335f6244..db169d23388fd7b1cb7b79eef4160301
}
diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
-index a406b5a1e1523c07cb6dc2eebc493fa4f0026575..1f4fc38edd3756d5423e89a41c30a8ce7d5bf71f 100644
+index 3b4a8bd84890e0724d4e6323bfe399a19f5abcc9..c3ad63ee402eb53aa5dacf10fd1fdf955292f7b3 100644
--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
-@@ -439,10 +439,10 @@ void WebProcessPool::setAutomationClient(std::unique_ptr<API::AutomationClient>&
+@@ -441,10 +441,10 @@ void WebProcessPool::setAutomationClient(std::unique_ptr<API::AutomationClient>&
void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
{
@@ -16410,7 +15950,7 @@ index a406b5a1e1523c07cb6dc2eebc493fa4f0026575..1f4fc38edd3756d5423e89a41c30a8ce
#if ENABLE(GPU_PROCESS)
if (RefPtr gpuProcess = GPUProcessProxy::singletonIfCreated())
-@@ -450,9 +450,10 @@ void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
+@@ -452,9 +452,10 @@ void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
#endif
#if USE(SOUP)
for (Ref networkProcess : NetworkProcessProxy::allNetworkProcesses())
@@ -16422,7 +15962,7 @@ index a406b5a1e1523c07cb6dc2eebc493fa4f0026575..1f4fc38edd3756d5423e89a41c30a8ce
void WebProcessPool::fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)
{
-@@ -999,7 +1000,7 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
+@@ -1001,7 +1002,7 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
#endif
parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
@@ -16432,10 +15972,10 @@ index a406b5a1e1523c07cb6dc2eebc493fa4f0026575..1f4fc38edd3756d5423e89a41c30a8ce
parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure());
diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp
-index 51546b2db1e5ca415ceb550e69dc2daa982df450..6d10b802e49a3a0b803eb8a630e7c1c83c53f79c 100644
+index da8a47cf02d65b8ed8969abeb3783e5766ee0d3a..8e93c8f7028bc7707bbca7a7ac42990a797c3abf 100644
--- a/Source/WebKit/UIProcess/WebProcessProxy.cpp
+++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp
-@@ -208,6 +208,11 @@ Vector<Ref<WebProcessProxy>> WebProcessProxy::allProcesses()
+@@ -207,6 +207,11 @@ Vector<Ref<WebProcessProxy>> WebProcessProxy::allProcesses()
});
}
@@ -16447,7 +15987,7 @@ index 51546b2db1e5ca415ceb550e69dc2daa982df450..6d10b802e49a3a0b803eb8a630e7c1c8
RefPtr<WebProcessProxy> WebProcessProxy::processForIdentifier(ProcessIdentifier identifier)
{
return allProcessMap().get(identifier);
-@@ -577,6 +582,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt
+@@ -531,6 +536,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt
if (WebKit::isInspectorProcessPool(protectedProcessPool()))
launchOptions.extraInitializationData.add<HashTranslatorASCIILiteral>("inspector-process"_s, "1"_s);
@@ -16475,10 +16015,10 @@ index 51546b2db1e5ca415ceb550e69dc2daa982df450..6d10b802e49a3a0b803eb8a630e7c1c8
if (isPrewarmed())
diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h
-index 4512391119154ce5b0ebb892e853499bda9747d9..33404c266e230e0cf62a0d9a597a7b59a047a1f3 100644
+index 43998d80778262987ebeb21afdae7a6f5cb9a8f6..fbb50218cbeb07953790c85c5e4f2618b3f08b35 100644
--- a/Source/WebKit/UIProcess/WebProcessProxy.h
+++ b/Source/WebKit/UIProcess/WebProcessProxy.h
-@@ -185,6 +185,7 @@ public:
+@@ -186,6 +186,7 @@ public:
static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, NOESCAPE const Function<void(WebPageProxy&)>&);
static Vector<std::pair<WebCore::ProcessIdentifier, WebCore::RegistrableDomain>> allowedFirstPartiesForCookies();
@@ -16487,7 +16027,7 @@ index 4512391119154ce5b0ebb892e853499bda9747d9..33404c266e230e0cf62a0d9a597a7b59
void initializeWebProcess(WebProcessCreationParameters&&);
diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
-index 606401f719eecd52737fc3f6f15a328f74f4f5d9..be13e62a1461f21543f0a51c57003779bb3c1c79 100644
+index 90b0872f0cf72f353ef14aa9d465460717d60daa..cc1b971dba3c37d30c01cde04151c5529222e627 100644
--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
@@ -321,15 +321,10 @@ SOAuthorizationCoordinator& WebsiteDataStore::soAuthorizationCoordinator(const W
@@ -16539,7 +16079,7 @@ index 606401f719eecd52737fc3f6f15a328f74f4f5d9..be13e62a1461f21543f0a51c57003779
void WebsiteDataStore::hasAppBoundSession(CompletionHandler<void(bool)>&& completionHandler) const
{
diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
-index 64d8fb4e83836c3dde325e77ded6b014e819cb10..c4b923995301697f8a52d72e74c842dcf4ec8161 100644
+index aad3f23761bef4b75b414606df5f09fd19657fe5..d8cf70a7944e0916fb13efd571992d2462309dad 100644
--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
@@ -98,6 +98,7 @@ class DeviceIdHashSaltStorage;
@@ -16609,7 +16149,7 @@ index 64d8fb4e83836c3dde325e77ded6b014e819cb10..c4b923995301697f8a52d72e74c842dc
String m_cookiePersistentStoragePath;
SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite };
@@ -643,6 +663,10 @@ private:
- RefPtr<API::HTTPCookieStore> m_cookieStore;
+ const RefPtr<API::HTTPCookieStore> m_cookieStore;
RefPtr<NetworkProcessProxy> m_networkProcess;
+ std::optional<bool> m_allowDownloadForAutomation;
@@ -16617,10 +16157,10 @@ index 64d8fb4e83836c3dde325e77ded6b014e819cb10..c4b923995301697f8a52d72e74c842dc
+ DownloadInstrumentation* m_downloadInstrumentation { nullptr };
+
#if HAVE(APP_SSO)
- std::unique_ptr<SOAuthorizationCoordinator> m_soAuthorizationCoordinator;
+ const std::unique_ptr<SOAuthorizationCoordinator> m_soAuthorizationCoordinator;
#endif
diff --git a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp b/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp
-index 19934de3173ecc0507c5e59956bcf6730a8a88b4..bc0e52f6f28caeca8b9b7aab14b7ff991d7e6b41 100644
+index de9b08ac0588999d167cf97dc172ee35a8f8ab56..bab2b6ca88d666f16be6c1c32d05be5e02b88119 100644
--- a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp
+++ b/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp
@@ -114,6 +114,14 @@ void GeoclueGeolocationProvider::stop()
@@ -16861,7 +16401,7 @@ index 0000000000000000000000000000000000000000..dfa06245b5411f2bc6ca7cebdb7c6d5f
+#endif // ENABLE(REMOTE_INSPECTOR)
diff --git a/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.h b/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.h
new file mode 100644
-index 0000000000000000000000000000000000000000..441442d899e4088f5c24ae9f70c3e4ffa1e6d340
+index 0000000000000000000000000000000000000000..68bc7b610703bfcd3eff0d1c032092f6967fdc16
--- /dev/null
+++ b/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.h
@@ -0,0 +1,61 @@
@@ -16905,7 +16445,7 @@ index 0000000000000000000000000000000000000000..441442d899e4088f5c24ae9f70c3e4ff
+namespace WebKit {
+
+class InspectorPlaywrightAgentClientGlib : public InspectorPlaywrightAgentClient {
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(InspectorPlaywrightAgentClientGlib);
+public:
+ InspectorPlaywrightAgentClientGlib(const WTF::String& proxyURI, const char* const* ignoreHosts);
+ ~InspectorPlaywrightAgentClientGlib() override = default;
@@ -16927,7 +16467,7 @@ index 0000000000000000000000000000000000000000..441442d899e4088f5c24ae9f70c3e4ff
+
+#endif // ENABLE(REMOTE_INSPECTOR)
diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-index 4d782728182319b3d6e8e6d05580d96dd7ea19ac..c28dff07b154dba6ba82e94953b7b24e25a89106 100644
+index 044ddc0c3e957b4d6634de3710e9d1d55082be3f..a6a8854fd6076347f3f5540d2177006a94bfa530 100644
--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
@@ -126,6 +126,8 @@ static OptionSet<AvailableInputDevices> availableInputDevices()
@@ -16939,37 +16479,16 @@ index 4d782728182319b3d6e8e6d05580d96dd7ea19ac..c28dff07b154dba6ba82e94953b7b24e
#if ENABLE(TOUCH_EVENTS)
return AvailableInputDevices::Touchscreen;
#else
-diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h
-index 5529f52048b24290f424e877cd9dbfb890e02ffb..c2b76b6188dd9596c4a1f31c137daff7d7644c7f 100644
---- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h
-+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h
-@@ -32,6 +32,7 @@
- #include <wtf/WeakPtr.h>
-
- typedef struct _cairo cairo_t;
-+typedef struct _cairo_surface cairo_surface_t;
-
- #if USE(GTK4)
- typedef struct _GdkSnapshot GdkSnapshot;
-@@ -62,6 +63,8 @@ public:
- #else
- virtual bool paint(cairo_t*, const WebCore::IntRect&) = 0;
- #endif
-+ virtual cairo_surface_t* surface() { return nullptr; }
-+
- virtual void realize() { };
- 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 395a409b6302d4146606fc0b45a15cff63c7f327..666d9629e0155e8c03b0672f7a9274de7f04d642 100644
---- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
-+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
-@@ -812,4 +812,30 @@ RefPtr<WebCore::NativeImage> AcceleratedBackingStoreDMABuf::bufferAsNativeImageF
+diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp
+index 8345d7f789d15be44e8ffb742ade501f95e011f9..5c354920d64d691ab87251966ff4912d19ee85a2 100644
+--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp
++++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp
+@@ -848,4 +848,30 @@ RefPtr<NativeImage> AcceleratedBackingStore::bufferAsNativeImageForTesting() con
return m_committedBuffer->asNativeImageForTesting();
}
+// Playwright begin
-+cairo_surface_t* AcceleratedBackingStoreDMABuf::surface()
++cairo_surface_t* AcceleratedBackingStore::surface()
+{
+ RefPtr<Buffer> buffer = m_committedBuffer.get();
+ if (!buffer)
@@ -16995,25 +16514,34 @@ index 395a409b6302d4146606fc0b45a15cff63c7f327..666d9629e0155e8c03b0672f7a9274de
+// Playwright end
+
} // namespace WebKit
-diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h
-index 63dfbed03bd898c822d426a5449141fec2841226..eaf141843da3f02c5ba6fd0322f3175248a7195b 100644
---- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h
-+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h
-@@ -98,6 +98,7 @@ private:
- #else
- bool paint(cairo_t*, const WebCore::IntRect&) override;
- #endif
-+ cairo_surface_t* surface() override;
- void unrealize() override;
- void update(const LayerTreeContext&) override;
- RendererBufferFormat bufferFormat() const override;
-@@ -253,6 +254,9 @@ private:
+diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h
+index d305b6bf990f6befccb3f3e7c22a9949c4be41d3..22b0558d5729cf52fadc64b9e191b8a1f7330608 100644
+--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h
++++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h
+@@ -41,6 +41,7 @@
+ #include <wtf/unix/UnixFileDescriptor.h>
+
+ typedef void *EGLImage;
++typedef struct _cairo_surface cairo_surface_t;
+
+ #if USE(GBM)
+ struct gbm_bo;
+@@ -84,6 +85,7 @@ public:
+ void unrealize();
+ RendererBufferDescription bufferDescription() const;
+ RefPtr<WebCore::NativeImage> bufferAsNativeImageForTesting() const;
++ cairo_surface_t* surface();
+
+ private:
+ explicit AcceleratedBackingStore(WebPageProxy&);
+@@ -251,6 +253,10 @@ private:
RefPtr<Buffer> m_committedBuffer;
Rects m_pendingDamageRects;
HashMap<uint64_t, RefPtr<Buffer>> m_buffers;
+// Playwright begin
+ RefPtr<cairo_surface_t> m_flippedSurface;
+// Playwright end
++
};
} // namespace WebKit
@@ -17327,7 +16855,7 @@ index 8afb6132fad823816f84328a8b0a1a514f998bf7..54b582e60f4b16b3c7ba038c8c52466c
CorrectionPanel();
diff --git a/Source/WebKit/UIProcess/mac/InspectorPlaywrightAgentClientMac.h b/Source/WebKit/UIProcess/mac/InspectorPlaywrightAgentClientMac.h
new file mode 100644
-index 0000000000000000000000000000000000000000..2aabc02a4b5432f68a6e85fd9689775608f05a67
+index 0000000000000000000000000000000000000000..edb4581e8f1f484976a9081d37cb61e54b9b81c5
--- /dev/null
+++ b/Source/WebKit/UIProcess/mac/InspectorPlaywrightAgentClientMac.h
@@ -0,0 +1,53 @@
@@ -17366,7 +16894,7 @@ index 0000000000000000000000000000000000000000..2aabc02a4b5432f68a6e85fd96897756
+namespace WebKit {
+
+class InspectorPlaywrightAgentClientMac : public InspectorPlaywrightAgentClient {
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(InspectorPlaywrightAgentClientMac);
+public:
+ InspectorPlaywrightAgentClientMac(_WKBrowserInspectorDelegate* delegate, bool headless);
+ ~InspectorPlaywrightAgentClientMac() override = default;
@@ -17535,7 +17063,7 @@ index 0000000000000000000000000000000000000000..8adbd51bfecad2a273117588bf50f8f7
+
+#endif
diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h
-index c0de66cc6e82f1a2459ba006b5ac0fd63d8da261..a01639bab522df3ecff9df5aa4b6218633b2f049 100644
+index 06d85d02ad62fdfaf211deb534126b0a5e966493..ab16123d697e7dab5907e4e5d4386cb84f03756e 100644
--- a/Source/WebKit/UIProcess/mac/PageClientImplMac.h
+++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.h
@@ -31,9 +31,11 @@
@@ -17559,7 +17087,7 @@ index c0de66cc6e82f1a2459ba006b5ac0fd63d8da261..a01639bab522df3ecff9df5aa4b62186
PageClientImpl(NSView *, WKWebView *);
virtual ~PageClientImpl();
-@@ -175,6 +179,9 @@ private:
+@@ -176,6 +180,9 @@ private:
void updateAcceleratedCompositingMode(const LayerTreeContext&) override;
void didFirstLayerFlush(const LayerTreeContext&) override;
@@ -17569,7 +17097,7 @@ index c0de66cc6e82f1a2459ba006b5ac0fd63d8da261..a01639bab522df3ecff9df5aa4b62186
RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&) override;
RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&, ForceSoftwareCapturingViewportSnapshot) override;
void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) override;
-@@ -226,6 +233,10 @@ private:
+@@ -227,6 +234,10 @@ private:
void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame, CompletionHandler<void()>&&) override;
#endif
@@ -17581,7 +17109,7 @@ index c0de66cc6e82f1a2459ba006b5ac0fd63d8da261..a01639bab522df3ecff9df5aa4b62186
void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&) override;
void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override;
diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
-index 0af0f031313b707c18ad675115385c42d5a1284f..4408666f4d7b4e67670f3edfabe9a1407e22afe2 100644
+index 59d3be9ffe66bcaf64687a69c00b077279ec1304..be0176b59dab6c2cdf279f0aa4e2ed8e26e9fbc7 100644
--- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
+++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
@@ -107,6 +107,13 @@ namespace WebKit {
@@ -17620,15 +17148,15 @@ index 0af0f031313b707c18ad675115385c42d5a1284f..4408666f4d7b4e67670f3edfabe9a140
if (CheckedPtr impl = m_impl.get())
@@ -192,6 +205,9 @@ void PageClientImpl::makeFirstResponder()
- bool PageClientImpl::isViewVisible()
+ bool PageClientImpl::isViewVisible(NSView *view, NSWindow *viewWindow)
{
+ if (_headless)
+ return true;
+
- RetainPtr activeView = this->activeView();
- RetainPtr activeViewWindow = activeWindow();
-
-@@ -267,7 +283,8 @@ void PageClientImpl::didRelaunchProcess()
+ auto windowIsOccluded = [&]()->bool {
+ return m_impl && m_impl->windowOcclusionDetectionEnabled() && (viewWindow.occlusionState & NSWindowOcclusionStateVisible) != NSWindowOcclusionStateVisible;
+ };
+@@ -279,7 +295,8 @@ void PageClientImpl::didRelaunchProcess()
void PageClientImpl::preferencesDidChange()
{
@@ -17638,7 +17166,7 @@ index 0af0f031313b707c18ad675115385c42d5a1284f..4408666f4d7b4e67670f3edfabe9a140
}
void PageClientImpl::toolTipChanged(const String& oldToolTip, const String& newToolTip)
-@@ -477,6 +494,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
+@@ -489,6 +506,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled)
{
@@ -17647,7 +17175,7 @@ index 0af0f031313b707c18ad675115385c42d5a1284f..4408666f4d7b4e67670f3edfabe9a140
checkedImpl()->doneWithKeyEvent(event.nativeEvent(), eventWasHandled);
}
-@@ -496,6 +515,8 @@ void PageClientImpl::computeHasVisualSearchResults(const URL& imageURL, Shareabl
+@@ -508,6 +527,8 @@ void PageClientImpl::computeHasVisualSearchResults(const URL& imageURL, Shareabl
RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy& page)
{
@@ -17656,7 +17184,7 @@ index 0af0f031313b707c18ad675115385c42d5a1284f..4408666f4d7b4e67670f3edfabe9a140
return WebPopupMenuProxyMac::create(m_view.get().get(), page.checkedPopupMenuClient().get());
}
-@@ -621,6 +642,12 @@ CALayer *PageClientImpl::footerBannerLayer() const
+@@ -633,6 +654,12 @@ CALayer *PageClientImpl::footerBannerLayer() const
return m_impl->footerBannerLayer();
}
@@ -17669,7 +17197,7 @@ index 0af0f031313b707c18ad675115385c42d5a1284f..4408666f4d7b4e67670f3edfabe9a140
RefPtr<ViewSnapshot> PageClientImpl::takeViewSnapshot(std::optional<WebCore::IntRect>&&)
{
return checkedImpl()->takeViewSnapshot();
-@@ -832,6 +859,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR
+@@ -844,6 +871,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR
#endif // ENABLE(FULLSCREEN_API)
@@ -17683,7 +17211,7 @@ index 0af0f031313b707c18ad675115385c42d5a1284f..4408666f4d7b4e67670f3edfabe9a140
void PageClientImpl::navigationGestureDidBegin()
{
checkedImpl()->dismissContentRelativeChildWindowsWithAnimation(true);
-@@ -1012,6 +1046,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c
+@@ -1024,6 +1058,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c
bool PageClientImpl::windowIsFrontWindowUnderMouse(const NativeWebMouseEvent& event)
{
@@ -17716,18 +17244,30 @@ index f46895285dbc84c624537a194814c18f771a0c08..29ef9e5afa13b8d2b47b7f2dd4ce3784
}
+#endif
-diff --git a/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm b/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm
-index b9ffbadc03edbe9d260d546b59933c1c50d4148d..d0559dbd0bdfe0aa7c83ad97f5d01d8213c0caf2 100644
---- a/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm
-+++ b/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm
-@@ -29,6 +29,7 @@
- #if ENABLE(FULLSCREEN_API) && !PLATFORM(IOS_FAMILY)
+diff --git a/Source/WebKit/UIProcess/mac/WKSharingServicePickerDelegate.h b/Source/WebKit/UIProcess/mac/WKSharingServicePickerDelegate.h
+index 27b84957c91a4c82f4bbfdfb152f1a4ba9fb4309..f0d71a99c30eefa5f56c9668c4df21430c91ee13 100644
+--- a/Source/WebKit/UIProcess/mac/WKSharingServicePickerDelegate.h
++++ b/Source/WebKit/UIProcess/mac/WKSharingServicePickerDelegate.h
+@@ -26,6 +26,7 @@
+ #if ENABLE(SERVICE_CONTROLS)
- #import "AppKitSPI.h"
-+#import "GPUProcessProxy.h"
- #import "LayerTreeContext.h"
- #import "NativeWebMouseEvent.h"
- #import "VideoPresentationManagerProxy.h"
+ #import <wtf/RetainPtr.h>
++#import <wtf/WeakPtr.h>
+ #import <wtf/text/WTFString.h>
+
+ namespace WebKit {
+diff --git a/Source/WebKit/UIProcess/mac/WKTextAnimationManagerMac.mm b/Source/WebKit/UIProcess/mac/WKTextAnimationManagerMac.mm
+index 1e32d91466e9785f20fd1d63b8fa93ee192d5f55..e355cb75d3c25f63f51d030190fb49f20831fda8 100644
+--- a/Source/WebKit/UIProcess/mac/WKTextAnimationManagerMac.mm
++++ b/Source/WebKit/UIProcess/mac/WKTextAnimationManagerMac.mm
+@@ -35,6 +35,7 @@
+ #import "WebViewImpl.h"
+ #import <WebCore/NativeImage.h>
+ #import <WebCore/TextAnimationTypes.h>
++#import <WebKit/WKWebView.h>
+ #import <pal/cocoa/WritingToolsUISoftLink.h>
+
+ @interface WKTextAnimationTypeEffectData : NSObject
diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h
index a3c53c0bf913385d4d2d92900360d5f7d75927f8..e5570ef599ff1b59224648c353f8ab16f8fe7f88 100644
--- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h
@@ -17948,8 +17488,20 @@ index 0000000000000000000000000000000000000000..dd52991f936aa1c046b404801ee97237
+}
+
+} // namespace WebKit
+diff --git a/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm b/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
+index a72ac702858542d08c4d687621d53df356386f46..e0e47b5e7d51c7ae65f12852a7f4811df2a464fb 100644
+--- a/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
++++ b/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
+@@ -61,6 +61,7 @@
+ #import <WebCore/DragItem.h>
+ #import <WebCore/GraphicsLayer.h>
+ #import <WebCore/LegacyNSPasteboardTypes.h>
++#import <WebCore/LocalizedStrings.h>
+ #import <WebCore/Pasteboard.h>
+ #import <WebCore/Quirks.h>
+ #import <WebCore/SharedBuffer.h>
diff --git a/Source/WebKit/UIProcess/mac/WebViewImpl.h b/Source/WebKit/UIProcess/mac/WebViewImpl.h
-index ad45b454acf088d5bb375971aae99684ea06d3ab..a9b4c26971969cf352cc045b01505a1751b44e46 100644
+index e621bbe3154ae0406e3617d82345a2428ba11583..d11ba4f513a3b558ef996c3247f04cb5a0b498ad 100644
--- a/Source/WebKit/UIProcess/mac/WebViewImpl.h
+++ b/Source/WebKit/UIProcess/mac/WebViewImpl.h
@@ -34,6 +34,7 @@
@@ -17960,7 +17512,7 @@ index ad45b454acf088d5bb375971aae99684ea06d3ab..a9b4c26971969cf352cc045b01505a17
#include <WebCore/FocusDirection.h>
#include <WebCore/KeypressCommand.h>
#include <WebCore/PlatformPlaybackSessionInterface.h>
-@@ -565,6 +566,9 @@ public:
+@@ -572,6 +573,9 @@ public:
void provideDataForPasteboard(NSPasteboard *, NSString *type);
NSArray *namesOfPromisedFilesDroppedAtDestination(NSURL *dropDestination);
@@ -17971,10 +17523,10 @@ index ad45b454acf088d5bb375971aae99684ea06d3ab..a9b4c26971969cf352cc045b01505a17
RefPtr<ViewSnapshot> takeViewSnapshot(ForceSoftwareCapturingViewportSnapshot);
void saveBackForwardSnapshotForCurrentItem();
diff --git a/Source/WebKit/UIProcess/mac/WebViewImpl.mm b/Source/WebKit/UIProcess/mac/WebViewImpl.mm
-index 1e906144a471367de596ccf5dd0ece2706306fe6..51cc9282b0b6d0b66df9f3b4fb69da7261b6e8d3 100644
+index e4a353131f828e0cce9f909a5feab718c1fa194d..be4338ae49c58c8570cf3921209ed903b4e114fa 100644
--- a/Source/WebKit/UIProcess/mac/WebViewImpl.mm
+++ b/Source/WebKit/UIProcess/mac/WebViewImpl.mm
-@@ -2477,6 +2477,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace()
+@@ -2488,6 +2488,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace()
if (!m_colorSpace)
m_colorSpace = [NSColorSpace sRGBColorSpace];
}
@@ -17986,7 +17538,7 @@ index 1e906144a471367de596ccf5dd0ece2706306fe6..51cc9282b0b6d0b66df9f3b4fb69da72
ASSERT(m_colorSpace);
return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] };
-@@ -4693,6 +4698,17 @@ static RetainPtr<CGImageRef> takeWindowSnapshot(CGSWindowID windowID, bool captu
+@@ -4723,6 +4728,17 @@ static RetainPtr<CGImageRef> takeWindowSnapshot(CGSWindowID windowID, bool captu
return WebCore::cgWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions);
}
@@ -18004,6 +17556,51 @@ index 1e906144a471367de596ccf5dd0ece2706306fe6..51cc9282b0b6d0b66df9f3b4fb69da72
RefPtr<ViewSnapshot> WebViewImpl::takeViewSnapshot()
{
return takeViewSnapshot(ForceSoftwareCapturingViewportSnapshot::No);
+diff --git a/Source/WebKit/UIProcess/wc/DrawingAreaProxyWC.cpp b/Source/WebKit/UIProcess/wc/DrawingAreaProxyWC.cpp
+index 3f4c7f86c46a39036d6c52f8b77e50d915b740da..a9990ef434d86b432e6e77911145c96b15dff06c 100644
+--- a/Source/WebKit/UIProcess/wc/DrawingAreaProxyWC.cpp
++++ b/Source/WebKit/UIProcess/wc/DrawingAreaProxyWC.cpp
+@@ -35,6 +35,7 @@
+ #include "MessageSenderInlines.h"
+ #include "UpdateInfo.h"
+ #include "WebPageProxy.h"
++#include "WebPageInspectorController.h"
+ #include <WebCore/Region.h>
+
+ namespace WebKit {
+@@ -116,6 +117,19 @@ void DrawingAreaProxyWC::discardBackingStore()
+ m_backingStore = std::nullopt;
+ }
+
++void DrawingAreaProxyWC::captureFrame()
++{
++ if (!m_backingStore)
++ return;
++ auto surface = m_backingStore->surface();
++ if (!surface)
++ return;
++ auto image = surface->makeImageSnapshot();
++ if (!image)
++ return;
++ page()->inspectorController().didPaint(WTFMove(image));
++}
++
+ } // namespace WebKit
+
+ #endif // USE(GRAPHICS_LAYER_WC)
+diff --git a/Source/WebKit/UIProcess/wc/DrawingAreaProxyWC.h b/Source/WebKit/UIProcess/wc/DrawingAreaProxyWC.h
+index 5ede972f4b6efe213ccdd866ef77594acfcbf162..67f66b7c685eea3478b6386e1ec449d94dfff17f 100644
+--- a/Source/WebKit/UIProcess/wc/DrawingAreaProxyWC.h
++++ b/Source/WebKit/UIProcess/wc/DrawingAreaProxyWC.h
+@@ -50,6 +50,8 @@ public:
+
+ void paint(PlatformPaintContextPtr, const WebCore::IntRect&, WebCore::Region& unpaintedRegion);
+
++ void captureFrame();
++
+ private:
+ DrawingAreaProxyWC(WebPageProxy&, WebProcessProxy&);
+
diff --git a/Source/WebKit/UIProcess/win/InspectorPlaywrightAgentClientWin.cpp b/Source/WebKit/UIProcess/win/InspectorPlaywrightAgentClientWin.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4f54a9445e5a7ecdb750c5c521da4f397776e633
@@ -18101,7 +17698,7 @@ index 0000000000000000000000000000000000000000..4f54a9445e5a7ecdb750c5c521da4f39
+#endif // ENABLE(REMOTE_INSPECTOR)
diff --git a/Source/WebKit/UIProcess/win/InspectorPlaywrightAgentClientWin.h b/Source/WebKit/UIProcess/win/InspectorPlaywrightAgentClientWin.h
new file mode 100644
-index 0000000000000000000000000000000000000000..df18883b2b7d22d73540cb084d3dd5291231097d
+index 0000000000000000000000000000000000000000..18be1f2e544e3069df48cdd1e55ad8536f57802a
--- /dev/null
+++ b/Source/WebKit/UIProcess/win/InspectorPlaywrightAgentClientWin.h
@@ -0,0 +1,60 @@
@@ -18146,7 +17743,7 @@ index 0000000000000000000000000000000000000000..df18883b2b7d22d73540cb084d3dd529
+namespace WebKit {
+
+class InspectorPlaywrightAgentClientWin : public InspectorPlaywrightAgentClient {
-+ WTF_MAKE_FAST_ALLOCATED;
++ WTF_DEPRECATED_MAKE_FAST_ALLOCATED(InspectorPlaywrightAgentClientWin);
+public:
+ InspectorPlaywrightAgentClientWin(ConfigureDataStoreCallback, CreatePageCallback, QuitCallback);
+ ~InspectorPlaywrightAgentClientWin() override = default;
@@ -18361,10 +17958,10 @@ index 0000000000000000000000000000000000000000..8b474c730139b44a13c9d5b2d13ee204
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/win/WebView.cpp b/Source/WebKit/UIProcess/win/WebView.cpp
-index 2487c6de5b717dfea02a6b5a127c815019582d3c..eae5b89de5f54e94f439a7fbe72547743ad96749 100644
+index bf8a0718e74bf9b1243dcb4bb504310e9ebbd6c2..33b865af669a3db4e3b23874f86cafa9794a71b7 100644
--- a/Source/WebKit/UIProcess/win/WebView.cpp
+++ b/Source/WebKit/UIProcess/win/WebView.cpp
-@@ -576,7 +576,7 @@ LRESULT WebView::onSizeEvent(HWND hwnd, UINT, WPARAM, LPARAM lParam, bool& handl
+@@ -569,7 +569,7 @@ LRESULT WebView::onSizeEvent(HWND hwnd, UINT, WPARAM, LPARAM lParam, bool& handl
float intrinsicDeviceScaleFactor = deviceScaleFactorForWindow(hwnd);
if (m_page)
m_page->setIntrinsicDeviceScaleFactor(intrinsicDeviceScaleFactor);
@@ -18914,10 +18511,10 @@ index 9b688ad328317fea4fd96ce66e9714bad8f0f937..402a36a9c565e13ec298aa7f014f0d92
} // namespace WebKit
diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
-index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279ad3acae1 100644
+index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab89706eb8301 100644
--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
-@@ -1565,6 +1565,7 @@
+@@ -1562,6 +1562,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 */; };
@@ -18925,7 +18522,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
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 */; };
-@@ -2352,6 +2353,18 @@
+@@ -2350,6 +2351,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 */; };
@@ -18944,7 +18541,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
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, ); }; };
-@@ -2452,6 +2465,8 @@
+@@ -2450,6 +2463,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 */; };
@@ -18953,7 +18550,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
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 */; };
-@@ -2491,6 +2506,9 @@
+@@ -2489,6 +2504,9 @@
F3EEEE592DB318270038CC1D /* BidiBrowserAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3EEEE572DB318270038CC1D /* BidiBrowserAgent.h */; };
F3EEEE5A2DB318270038CC1D /* BidiBrowserAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3EEEE582DB318270038CC1D /* BidiBrowserAgent.cpp */; };
F404455C2D5CFB56000E587E /* AppKitSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = F404455A2D5CFB56000E587E /* AppKitSoftLink.h */; };
@@ -18963,7 +18560,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
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 */; };
F41145682CD939E0004CDBD1 /* _WKTouchEventGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = F41145652CD939E0004CDBD1 /* _WKTouchEventGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };
-@@ -6458,6 +6476,7 @@
+@@ -6469,6 +6487,7 @@
5CABDC8522C40FCC001EDE8E /* WKMessageListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMessageListener.h; sourceTree = "<group>"; };
5CABE07A28F60E8A00D83FD9 /* WebPushMessage.serialization.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebPushMessage.serialization.in; sourceTree = "<group>"; };
5CADDE0D2151AA010067D309 /* AuthenticationChallengeDisposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeDisposition.h; sourceTree = "<group>"; };
@@ -18971,7 +18568,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource115.cpp; sourceTree = "<group>"; };
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 = "<group>"; };
-@@ -8191,6 +8210,19 @@
+@@ -8205,6 +8224,19 @@
DF0C5F24252ECB8D00D921DB /* WKDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownload.h; sourceTree = "<group>"; };
DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadInternal.h; sourceTree = "<group>"; };
DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadDelegate.h; sourceTree = "<group>"; };
@@ -18991,7 +18588,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHTTPCookieStorePrivate.h; sourceTree = "<group>"; };
DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentWorldPrivate.h; sourceTree = "<group>"; };
DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebWheelEvent.h; sourceTree = "<group>"; };
-@@ -8365,6 +8397,8 @@
+@@ -8382,6 +8414,8 @@
E5CBA76127A3187900DF7858 /* UnifiedSource118.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource118.cpp; sourceTree = "<group>"; };
E5CBA76227A3187900DF7858 /* UnifiedSource117.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource117.cpp; sourceTree = "<group>"; };
E5CBA76327A3187B00DF7858 /* UnifiedSource116.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource116.cpp; sourceTree = "<group>"; };
@@ -19000,7 +18597,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
E5DEFA6726F8F42600AB68DB /* PhotosUISPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PhotosUISPI.h; sourceTree = "<group>"; };
E838FCAF2DE90BF800703353 /* ISO18013MobileDocumentRequest+Extras.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ISO18013MobileDocumentRequest+Extras.swift"; sourceTree = "<group>"; };
E88885662DC914C400C572B8 /* WKISO18013Request.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKISO18013Request.h; sourceTree = "<group>"; };
-@@ -8418,6 +8452,14 @@
+@@ -8435,6 +8469,14 @@
F404455A2D5CFB56000E587E /* AppKitSoftLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppKitSoftLink.h; sourceTree = "<group>"; };
F404455B2D5CFB56000E587E /* AppKitSoftLink.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AppKitSoftLink.mm; sourceTree = "<group>"; };
F4063DDE2D71481E00F3FE6E /* LLVMProfiling.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LLVMProfiling.h; sourceTree = "<group>"; };
@@ -19015,7 +18612,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDragDestinationAction.h; sourceTree = "<group>"; };
F40C3B6F2AB40167007A3567 /* WKDatePickerPopoverController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKDatePickerPopoverController.h; path = ios/forms/WKDatePickerPopoverController.h; sourceTree = "<group>"; };
F40C3B702AB40167007A3567 /* WKDatePickerPopoverController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKDatePickerPopoverController.mm; path = ios/forms/WKDatePickerPopoverController.mm; sourceTree = "<group>"; };
-@@ -8850,6 +8892,7 @@
+@@ -8898,6 +8940,7 @@
3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */,
3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */,
7B9FC5BB28A5233B007570E7 /* libWebKitPlatform.a in Frameworks */,
@@ -19023,7 +18620,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */,
37694525184FC6B600CDE21F /* Security.framework in Frameworks */,
37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */,
-@@ -12053,6 +12096,7 @@
+@@ -12121,6 +12164,7 @@
99788ACA1F421DCA00C08000 /* _WKAutomationSessionConfiguration.mm */,
990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */,
990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */,
@@ -19031,7 +18628,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
5C4609E222430E4C009943C2 /* _WKContentRuleListAction.h */,
5C4609E322430E4D009943C2 /* _WKContentRuleListAction.mm */,
5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */,
-@@ -13433,6 +13477,7 @@
+@@ -13515,6 +13559,7 @@
E34B110C27C46BC6006D2F2E /* libWebCoreTestShim.dylib */,
E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */,
DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */,
@@ -19039,7 +18636,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
57A9FF15252C6AEF006A2040 /* libWTF.a */,
5750F32A2032D4E500389347 /* LocalAuthentication.framework */,
570DAAB0230273D200E8FC04 /* NearField.framework */,
-@@ -14015,6 +14060,12 @@
+@@ -14101,6 +14146,12 @@
children = (
9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */,
9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */,
@@ -19052,7 +18649,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
);
path = Agents;
sourceTree = "<group>";
-@@ -14023,6 +14074,7 @@
+@@ -14109,6 +14160,7 @@
isa = PBXGroup;
children = (
A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */,
@@ -19060,7 +18657,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */,
99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */,
99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */,
-@@ -14778,6 +14830,7 @@
+@@ -14869,6 +14921,7 @@
E1513C65166EABB200149FCB /* AuxiliaryProcessProxy.h */,
46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */,
46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */,
@@ -19068,7 +18665,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
5C6D69352AC3935D0099BDAF /* BrowsingContextGroup.cpp */,
5C6D69362AC3935D0099BDAF /* BrowsingContextGroup.h */,
5CA98549210BEB5A0057EB6B /* BrowsingWarning.h */,
-@@ -14802,6 +14855,8 @@
+@@ -14893,6 +14946,8 @@
BC06F43912DBCCFB002D78DE /* GeolocationPermissionRequestProxy.cpp */,
BC06F43812DBCCFB002D78DE /* GeolocationPermissionRequestProxy.h */,
2DD5A72A1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h */,
@@ -19077,7 +18674,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */,
5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */,
31607F3819627002009B87DA /* LegacySessionStateCoding.h */,
-@@ -14832,6 +14887,7 @@
+@@ -14923,6 +14978,7 @@
4683569B21E81CC7006E27A3 /* ProvisionalPageProxy.cpp */,
4683569A21E81CC7006E27A3 /* ProvisionalPageProxy.h */,
411B89CB27B2B89600F9EBD3 /* QueryPermissionResultCallback.h */,
@@ -19085,7 +18682,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
5CCB54DC2A4FEA6A0005FAA8 /* RemotePageDrawingAreaProxy.cpp */,
5CCB54DB2A4FEA6A0005FAA8 /* RemotePageDrawingAreaProxy.h */,
FABBBC802D35AC6800820017 /* RemotePageFullscreenManagerProxy.cpp */,
-@@ -14939,6 +14995,8 @@
+@@ -15030,6 +15086,8 @@
BC7B6204129A0A6700D174A4 /* WebPageGroup.h */,
2D9EA3101A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp */,
2D9EA30E1A96CBFF002D2807 /* WebPageInjectedBundleClient.h */,
@@ -19094,7 +18691,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
9B7F8A502C785725000057F3 /* WebPageLoadTiming.h */,
BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */,
BC032DCB10F4389F0058C15A /* WebPageProxy.h */,
-@@ -15118,6 +15176,7 @@
+@@ -15216,6 +15274,7 @@
BC646C1911DD399F006455B0 /* WKBackForwardListItemRef.h */,
BC646C1611DD399F006455B0 /* WKBackForwardListRef.cpp */,
BC646C1711DD399F006455B0 /* WKBackForwardListRef.h */,
@@ -19102,7 +18699,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
BCB9E24A1120E15C00A137E0 /* WKContext.cpp */,
BCB9E2491120E15C00A137E0 /* WKContext.h */,
1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */,
-@@ -15694,6 +15753,9 @@
+@@ -15794,6 +15853,9 @@
07EF07592745A8160066EA04 /* DisplayCaptureSessionManager.h */,
07EF07582745A8160066EA04 /* DisplayCaptureSessionManager.mm */,
7AFA6F682A9F57C50055322A /* DisplayLinkMac.cpp */,
@@ -19112,7 +18709,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */,
0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */,
0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */,
-@@ -15717,6 +15779,8 @@
+@@ -15817,6 +15879,8 @@
E568B92120A3AC6A00E3C856 /* WebDataListSuggestionsDropdownMac.mm */,
E55CD20124D09F1F0042DB9C /* WebDateTimePickerMac.h */,
E55CD20224D09F1F0042DB9C /* WebDateTimePickerMac.mm */,
@@ -19121,7 +18718,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
BC857E8512B71EBB00EDEB2E /* WebPageProxyMac.mm */,
BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */,
BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */,
-@@ -16826,6 +16890,7 @@
+@@ -16923,6 +16987,7 @@
99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */,
990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */,
990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */,
@@ -19129,7 +18726,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */,
5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */,
9B4CE9512CD99B7C00351173 /* _WKContentWorldConfiguration.h in Headers */,
-@@ -17139,6 +17204,7 @@
+@@ -17242,6 +17307,7 @@
E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */,
4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */,
1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */,
@@ -19137,7 +18734,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
5CA9854A210BEB640057EB6B /* BrowsingWarning.h in Headers */,
A7E69BCC2B2117A100D43D3F /* BufferAndBackendInfo.h in Headers */,
BC3065FA1259344E00E71278 /* CacheModel.h in Headers */,
-@@ -17321,7 +17387,11 @@
+@@ -17425,7 +17491,11 @@
BC14DF77120B5B7900826C0C /* InjectedBundleScriptWorld.h in Headers */,
CE550E152283752200D28791 /* InsertTextOptions.h in Headers */,
9197940523DBC4BB00257892 /* InspectorBrowserAgent.h in Headers */,
@@ -19149,7 +18746,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */,
C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */,
2D4D2C811DF60BF3002EB10C /* InteractionInformationRequest.h in Headers */,
-@@ -17581,6 +17651,7 @@
+@@ -17685,6 +17755,7 @@
0F6E7C532C4C386800F1DB85 /* RemoteDisplayListRecorderMessages.h in Headers */,
F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */,
A78A5FE42B0EB39E005036D3 /* RemoteImageBufferSetIdentifier.h in Headers */,
@@ -19157,7 +18754,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */,
2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */,
1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */,
-@@ -17638,6 +17709,7 @@
+@@ -17740,6 +17811,7 @@
E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */,
E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */,
7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */,
@@ -19165,7 +18762,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
6D4DF20C2D824242001F964C /* ScreenTimeWebsiteDataSupport.h in Headers */,
463BB93A2B9D08D80098C5C3 /* ScriptMessageHandlerIdentifier.h in Headers */,
F4E28A362C923814008120DD /* ScriptTrackingPrivacyFilter.h in Headers */,
-@@ -18002,6 +18074,8 @@
+@@ -18106,6 +18178,8 @@
939EF87029D112EE00F23AEE /* WebPageInlines.h in Headers */,
9197940823DBC4CB00257892 /* WebPageInspectorAgentBase.h in Headers */,
A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */,
@@ -19174,7 +18771,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
A543E30C215C8A8D00279CD9 /* WebPageInspectorTarget.h in Headers */,
A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */,
A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */,
-@@ -20621,7 +20695,43 @@
+@@ -20746,7 +20820,43 @@
522F792928D50EBB0069B45B /* HidService.mm in Sources */,
2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */,
2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */,
@@ -19218,7 +18815,7 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
1C5DC45F2909B05A0061EC62 /* JSWebExtensionWrapperCocoa.mm in Sources */,
C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */,
C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */,
-@@ -21023,6 +21133,8 @@
+@@ -21148,6 +21258,8 @@
078B04A02CF18EAB00B453A6 /* WebPage+NavigationPreferences.swift in Sources */,
071467782DFE84E500F77867 /* WebPage+Transferable.swift in Sources */,
07CB79962CE9435700199C49 /* WebPage.swift in Sources */,
@@ -19228,10 +18825,10 @@ index 54b3c159ca5c86663abb3c67cacce504aff0bc0b..d59f2a64a2be81756d44a1e6ebb7f279
079A4DA12D72CC0D00CA387F /* WebPageWebView.swift in Sources */,
CA2506A82DD65327001D1954 /* WebPageWebViewAdditions.swift in Sources */,
diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
-index 8e116cc2cd63a59282b330acb00f42a926ecb33b..1b979a29a149803177300c93aec4548ee42dec6c 100644
+index c445673e74cb8a98ffdf478325305432914f2f7a..5bcbaa36a7b191b480b9983aaf58b11410671dff 100644
--- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
+++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
-@@ -271,6 +271,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
+@@ -272,6 +272,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
}
#endif
@@ -19243,7 +18840,7 @@ index 8e116cc2cd63a59282b330acb00f42a926ecb33b..1b979a29a149803177300c93aec4548e
#if ENABLE(PDFJS)
if (tryLoadingUsingPDFJSHandler(resourceLoader, trackingParameters))
return;
-@@ -285,12 +290,16 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
+@@ -286,12 +291,16 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
}
if (InspectorInstrumentationWebKit::shouldInterceptRequest(resourceLoader)) {
@@ -19266,7 +18863,7 @@ index 8e116cc2cd63a59282b330acb00f42a926ecb33b..1b979a29a149803177300c93aec4548e
}
WEBLOADERSTRATEGY_RELEASE_LOG_FORWARDABLE(WEBLOADERSTRATEGY_SCHEDULELOAD);
-@@ -415,7 +424,7 @@ static void addParametersShared(const LocalFrame* frame, NetworkResourceLoadPara
+@@ -416,7 +425,7 @@ static void addParametersShared(const LocalFrame* frame, NetworkResourceLoadPara
parameters.linkPreconnectEarlyHintsEnabled = mainFrame->settings().linkPreconnectEarlyHintsEnabled();
}
@@ -19275,12 +18872,12 @@ index 8e116cc2cd63a59282b330acb00f42a926ecb33b..1b979a29a149803177300c93aec4548e
{
auto identifier = *resourceLoader.identifier();
-@@ -427,10 +436,10 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -428,10 +437,10 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
&& resourceLoader.frameLoader()->notifier().isInitialRequestIdentifier(identifier)
? MainFrameMainResource::Yes : MainFrameMainResource::No;
if (!page->allowsLoadFromURL(request.url(), mainFrameMainResource)) {
-- RunLoop::protectedMain()->dispatch([resourceLoader = Ref { resourceLoader }, error = blockedError(request)] {
-+ RunLoop::protectedMain()->dispatch([resourceLoader = Ref { resourceLoader }, error = platformStrategies()->loaderStrategy()->blockedError(request)] {
+- RunLoop::mainSingleton().dispatch([resourceLoader = Ref { resourceLoader }, error = blockedError(request)] {
++ RunLoop::mainSingleton().dispatch([resourceLoader = Ref { resourceLoader }, error = platformStrategies()->loaderStrategy()->blockedError(request)] {
resourceLoader->didFail(error);
});
- return;
@@ -19288,7 +18885,7 @@ index 8e116cc2cd63a59282b330acb00f42a926ecb33b..1b979a29a149803177300c93aec4548e
}
}
-@@ -440,14 +449,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -441,14 +450,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be scheduled with the NetworkProcess with priority %d, storedCredentialsPolicy %i", resourceLoader.url().string().latin1().data(), static_cast<int>(resourceLoader.request().priority()), (int)storedCredentialsPolicy);
@@ -19303,7 +18900,7 @@ index 8e116cc2cd63a59282b330acb00f42a926ecb33b..1b979a29a149803177300c93aec4548e
loadParameters.identifier = identifier;
loadParameters.parentPID = legacyPresentingApplicationPID();
loadParameters.contentSniffingPolicy = contentSniffingPolicy;
-@@ -531,14 +532,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -532,14 +533,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
if (loadParameters.options.mode != FetchOptions::Mode::Navigate) {
ASSERT(loadParameters.sourceOrigin);
@@ -19321,7 +18918,7 @@ index 8e116cc2cd63a59282b330acb00f42a926ecb33b..1b979a29a149803177300c93aec4548e
loadParameters.isMainFrameNavigation = isMainFrameNavigation;
if (loadParameters.isMainFrameNavigation && document)
-@@ -589,6 +587,25 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -590,6 +588,25 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
if (RefPtr frameLoader = resourceLoader.frameLoader())
loadParameters.requiredCookiesVersion = frameLoader->requiredCookiesVersion();
@@ -19347,7 +18944,7 @@ index 8e116cc2cd63a59282b330acb00f42a926ecb33b..1b979a29a149803177300c93aec4548e
std::optional<NetworkResourceLoadIdentifier> existingNetworkResourceLoadIdentifierToResume;
if (loadParameters.isMainFrameNavigation)
existingNetworkResourceLoadIdentifierToResume = std::exchange(m_existingNetworkResourceLoadIdentifierToResume, std::nullopt);
-@@ -603,7 +620,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -604,7 +621,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
}
auto loader = WebResourceLoader::create(resourceLoader, trackingParameters);
@@ -19356,7 +18953,7 @@ index 8e116cc2cd63a59282b330acb00f42a926ecb33b..1b979a29a149803177300c93aec4548e
}
void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader)
-@@ -1021,7 +1038,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier
+@@ -1022,7 +1039,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier
bool WebLoaderStrategy::isOnLine() const
{
@@ -19365,7 +18962,7 @@ index 8e116cc2cd63a59282b330acb00f42a926ecb33b..1b979a29a149803177300c93aec4548e
}
void WebLoaderStrategy::addOnlineStateChangeListener(Function<void(bool)>&& listener)
-@@ -1047,6 +1064,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet
+@@ -1048,6 +1065,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet
void WebLoaderStrategy::setOnLineState(bool isOnLine)
{
@@ -19377,7 +18974,7 @@ index 8e116cc2cd63a59282b330acb00f42a926ecb33b..1b979a29a149803177300c93aec4548e
if (m_isOnLine == isOnLine)
return;
-@@ -1055,6 +1077,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine)
+@@ -1056,6 +1078,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine)
listener(isOnLine);
}
@@ -19421,10 +19018,10 @@ index af1f8eb6b578367e8cb818b1c6020377c5a07a37..41f1a38348b11aa0d99fc9fa429fe6b8
} // namespace WebKit
diff --git a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
-index 6d448ac1d302be3e9ad938ade807d26ddd39d103..06d1995872db8de9edc0ad14f0ab556dec75eb7a 100644
+index 9e8966c65c8c0327b437446b749fe8c22c493e27..9f5afce37925d609f48febcd0054e2d8c0768c89 100644
--- a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
+++ b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
-@@ -202,9 +202,6 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
+@@ -204,9 +204,6 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
coreLoader->didReceiveResponse(ResourceResponse { inspectorResponse }, [this, protectedThis = Ref { *this }, interceptedRequestIdentifier, policyDecisionCompletionHandler = WTFMove(policyDecisionCompletionHandler), overrideData = WTFMove(overrideData)]() mutable {
RefPtr coreLoader = m_coreLoader;
@@ -19434,7 +19031,7 @@ index 6d448ac1d302be3e9ad938ade807d26ddd39d103..06d1995872db8de9edc0ad14f0ab556d
if (!m_coreLoader || !coreLoader->identifier()) {
m_interceptController.continueResponse(interceptedRequestIdentifier);
return;
-@@ -221,6 +218,8 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
+@@ -223,6 +220,8 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
}
});
});
@@ -19444,10 +19041,10 @@ index 6d448ac1d302be3e9ad938ade807d26ddd39d103..06d1995872db8de9edc0ad14f0ab556d
}
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
-index de8c8f2890b146c6dd4f34c121b92402900e8df5..11792945a16cca303a9b2d3c101edf835f60b398 100644
+index a3c66b8d8ae186866f984436460f32d5d6f4a347..ad99b0de84c581b369df06a27bac6edaf56b80cb 100644
--- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
-@@ -534,6 +534,9 @@ void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel lev
+@@ -539,6 +539,9 @@ void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel lev
if (!page)
return;
@@ -19458,20 +19055,20 @@ index de8c8f2890b146c6dd4f34c121b92402900e8df5..11792945a16cca303a9b2d3c101edf83
page->injectedBundleUIClient().willAddMessageToConsole(page.get(), source, level, message, lineNumber, columnNumber, sourceID);
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebDragClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebDragClient.cpp
-index dca2495f0196552e79c73bb0b7466b5c4fa0be46..999a7ab4eef2b8cc1a65b5a26cd69e369dcb7ab7 100644
+index 771f8c77b51976e3aa332fa10befd9fd5b258edc..f46b5bf3a6d5a1cb832b602e0c024dbde808b7b9 100644
--- a/Source/WebKit/WebProcess/WebCoreSupport/WebDragClient.cpp
+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebDragClient.cpp
@@ -53,7 +53,7 @@ OptionSet<DragSourceAction> WebDragClient::dragSourceActionMaskForPoint(const In
return protectedPage()->allowedDragSourceActions();
}
--#if !PLATFORM(COCOA) && !PLATFORM(GTK)
+-#if !PLATFORM(COCOA) && !PLATFORM(GTK) && !PLATFORM(WPE)
+#if !PLATFORM(COCOA) && !PLATFORM(GTK) && !PLATFORM(WPE) && !PLATFORM(WIN)
- void WebDragClient::startDrag(DragItem, DataTransfer&, Frame&, const std::optional<ElementIdentifier>&)
+ void WebDragClient::startDrag(DragItem, DataTransfer&, Frame&, const std::optional<NodeIdentifier>&)
{
}
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebUserMediaClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebUserMediaClient.cpp
-index bb924c778ae3999d549b14e6d810b32167baece4..341355502afeaf69827308fee41ce964c0c66541 100644
+index f0e2863e578c60cfc0ddc98a50b45061fad1fc0b..81e59abd8c5201d0550bff3ad8ecf284765cfc40 100644
--- a/Source/WebKit/WebProcess/WebCoreSupport/WebUserMediaClient.cpp
+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebUserMediaClient.cpp
@@ -26,6 +26,7 @@
@@ -19483,7 +19080,7 @@ index bb924c778ae3999d549b14e6d810b32167baece4..341355502afeaf69827308fee41ce964
#include <WebCore/UserMediaRequest.h>
#include <wtf/TZoneMallocInlines.h>
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm b/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
-index 0abeb42354ed65e20d5ad5ab72c31bf00e49d528..259caa5c016b7f5c7eab156bbe4f0ce105339f76 100644
+index 5819df852bf76f0ed4ce50105b93c0fd697123d6..2fc578b7ff70877738278fe7006f14262e82e7a2 100644
--- a/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
+++ b/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
@@ -128,7 +128,8 @@ static WebCore::CachedImage* cachedImage(Element& element)
@@ -19498,7 +19095,7 @@ index 0abeb42354ed65e20d5ad5ab72c31bf00e49d528..259caa5c016b7f5c7eab156bbe4f0ce1
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/win/WebDragClientWin.cpp b/Source/WebKit/WebProcess/WebCoreSupport/win/WebDragClientWin.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..2d2ab369bfc1b42695dbc207e1d6e05deb16990f
+index 0000000000000000000000000000000000000000..741ef5b11fe8718529105339cda0fab597bad9de
--- /dev/null
+++ b/Source/WebKit/WebProcess/WebCoreSupport/win/WebDragClientWin.cpp
@@ -0,0 +1,58 @@
@@ -19537,7 +19134,7 @@ index 0000000000000000000000000000000000000000..2d2ab369bfc1b42695dbc207e1d6e05d
+#include "WebPageProxyMessages.h"
+#include <WebCore/DataTransfer.h>
+#include <WebCore/DragData.h>
-+#include <WebCore/ElementIdentifier.h>
++#include <WebCore/NodeIdentifier.h>
+#include <WebCore/Pasteboard.h>
+#include <WebCore/ShareableBitmap.h>
+#include <wtf/win/GDIObject.h>
@@ -19551,7 +19148,7 @@ index 0000000000000000000000000000000000000000..2d2ab369bfc1b42695dbc207e1d6e05d
+{
+}
+
-+void WebDragClient::startDrag(DragItem, DataTransfer& dataTransfer, Frame& frame, const std::optional<ElementIdentifier>&)
++void WebDragClient::startDrag(DragItem, DataTransfer& dataTransfer, Frame& frame, const std::optional<NodeIdentifier>&)
+{
+ m_page->willStartDrag();
+ m_page->send(Messages::WebPageProxy::StartDrag(dataTransfer.pasteboard().createDragDataMap()));
@@ -19560,73 +19157,8 @@ index 0000000000000000000000000000000000000000..2d2ab369bfc1b42695dbc207e1d6e05d
+}; // namespace WebKit.
+
+#endif // ENABLE(DRAG_SUPPORT)
-diff --git a/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebDragClientWPE.cpp b/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebDragClientWPE.cpp
-new file mode 100644
-index 0000000000000000000000000000000000000000..d069b5eba1a64add1a2c370f8d519826ec7be213
---- /dev/null
-+++ b/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebDragClientWPE.cpp
-@@ -0,0 +1,59 @@
-+/*
-+ * Copyright (C) 2011 Igalia S.L.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ * THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "config.h"
-+#include "WebDragClient.h"
-+
-+#if ENABLE(DRAG_SUPPORT)
-+
-+#include "WebPage.h"
-+#include "WebPageProxyMessages.h"
-+#include <WebCore/DataTransfer.h>
-+#include <WebCore/DragData.h>
-+#include <WebCore/ElementIdentifier.h>
-+#include <WebCore/Pasteboard.h>
-+#include <WebCore/SelectionData.h>
-+#include <WebCore/ShareableBitmap.h>
-+
-+#include <optional>
-+
-+namespace WebKit {
-+using namespace WebCore;
-+
-+void WebDragClient::didConcludeEditDrag()
-+{
-+}
-+
-+void WebDragClient::startDrag(DragItem, DataTransfer& dataTransfer, Frame&, const std::optional<ElementIdentifier>&)
-+{
-+ m_page->willStartDrag();
-+
-+ std::optional<ShareableBitmap::Handle> handle;
-+ m_page->send(Messages::WebPageProxy::StartDrag(dataTransfer.pasteboard().selectionData(), dataTransfer.sourceOperationMask(), WTFMove(handle), dataTransfer.dragLocation()));
-+}
-+
-+}; // namespace WebKit.
-+
-+#endif // ENABLE(DRAG_SUPPORT)
diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
-index 5fed15fd5dbbfbaff305ce26a8bcf5ba3d0435d9..fec04b9a4d640dcf47e0a2312d8b71234bf10d09 100644
+index f3fad38c1e055231a008724c50312248bcaccbaf..5c6f7c4f260904cc3c88c2c28e626d90432c0ac6 100644
--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
@@ -39,6 +39,7 @@
@@ -19638,10 +19170,10 @@ index 5fed15fd5dbbfbaff305ce26a8bcf5ba3d0435d9..fec04b9a4d640dcf47e0a2312d8b7123
#include <WebCore/LocalFrameView.h>
#include <WebCore/Page.h>
diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-index 5c8694cb4229ee87c50f68f8c24b47e5598a5aee..581637fb988e0d9b465a7029fb1bac9884c09b6c 100644
+index 4ffe3d98d023cd6f415782d59e40d52bb15ab1be..d8d38f57fc57ab51585aaeea8c9c1e92bef5ce2d 100644
--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-@@ -145,6 +145,7 @@ public:
+@@ -140,6 +140,7 @@ public:
#if PLATFORM(WPE) && USE(GBM) && ENABLE(WPE_PLATFORM)
void preferredBufferFormatsDidChange();
#endif
@@ -19650,7 +19182,7 @@ index 5c8694cb4229ee87c50f68f8c24b47e5598a5aee..581637fb988e0d9b465a7029fb1bac98
void updateRootLayer();
WebCore::FloatRect visibleContentsRect() const;
diff --git a/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp b/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp
-index e4b6fc981ce302979fd3280e9602bcbea91b9d1f..9ed589d3f29b17c18018798642f34fa375afc1a2 100644
+index 04f3e2cebec36db9487ee5b5d4f33eb2ca8db3b8..4677b87d3cdfdc98e4b10747bf483df3ec1feec0 100644
--- a/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp
+++ b/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp
@@ -27,6 +27,7 @@
@@ -19662,7 +19194,7 @@ index e4b6fc981ce302979fd3280e9602bcbea91b9d1f..9ed589d3f29b17c18018798642f34fa3
#include "WebPage.h"
#include "WebPageCreationParameters.h"
diff --git a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp
-index c42601a113c5f4f390630b3f20328de17f4f7d31..1a8f3dcccae5c09220f0f519d275eeaba83b1a5e 100644
+index 7ff2b1ad2dd19a2b25c5f5c3afbe7f580dd02c4e..eceb689621ed65f4e19461489e43e9f1690f0ea1 100644
--- a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp
+++ b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp
@@ -44,6 +44,7 @@
@@ -19687,31 +19219,31 @@ index c42601a113c5f4f390630b3f20328de17f4f7d31..1a8f3dcccae5c09220f0f519d275eeab
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 d5bac4fe6d5103b4e752a7219d7870d4cddcaf27..033effbb445f5da6db5798594e2dbef34afec363 100644
+index a7ad18fc1201e5de2cc1528539a765599ecfc41e..ebea233bc54ab6e56fb7093ff63e2368e8670ccd 100644
--- a/Source/WebKit/WebProcess/WebPage/WebCookieJar.h
+++ b/Source/WebKit/WebProcess/WebPage/WebCookieJar.h
-@@ -77,6 +77,8 @@ public:
-
- void clearCache() final;
+@@ -81,6 +81,8 @@ public:
+ void setOptInCookiePartitioningEnabled(bool);
+ #endif
+ void setCookieFromResponse(WebCore::ResourceLoader&, const String& setCookieValue);
+
- #if HAVE(ALLOW_ONLY_PARTITIONED_COOKIES)
- void setOptInCookiePartitioningEnabled(bool);
- #endif
+ private:
+ WebCookieJar();
+
diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
-index 8913ab7dc32c76a251b57449ff31cc53f9a6b9e0..04beed37ef9f9702a41a75acc17cc98af4924ff6 100644
+index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace4680bc5ae0 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
-@@ -244,6 +244,7 @@
+@@ -247,6 +247,7 @@
#include <WebCore/ImageAnalysisQueue.h>
#include <WebCore/ImageOverlay.h>
#include <WebCore/InspectorController.h>
+#include <WebCore/InspectorInstrumentationWebKit.h>
#include <WebCore/JSDOMExceptionHandling.h>
+ #include <WebCore/JSNode.h>
#include <WebCore/KeyboardEvent.h>
- #include <WebCore/LegacySchemeRegistry.h>
-@@ -1165,6 +1166,12 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
+@@ -1178,6 +1179,12 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
setLinkDecorationFilteringData(WTFMove(parameters.linkDecorationFilteringData));
setAllowedQueryParametersForAdvancedPrivacyProtections(WTFMove(parameters.allowedQueryParametersForAdvancedPrivacyProtections));
#endif
@@ -19724,7 +19256,7 @@ index 8913ab7dc32c76a251b57449ff31cc53f9a6b9e0..04beed37ef9f9702a41a75acc17cc98a
if (parameters.windowFeatures) {
page->applyWindowFeatures(*parameters.windowFeatures);
page->chrome().show();
-@@ -2098,6 +2105,22 @@ void WebPage::loadDidCommitInAnotherProcess(WebCore::FrameIdentifier frameID, st
+@@ -2114,6 +2121,22 @@ void WebPage::loadDidCommitInAnotherProcess(WebCore::FrameIdentifier frameID, st
frame->loadDidCommitInAnotherProcess(layerHostingContextIdentifier);
}
@@ -19747,7 +19279,7 @@ index 8913ab7dc32c76a251b57449ff31cc53f9a6b9e0..04beed37ef9f9702a41a75acc17cc98a
void WebPage::loadRequest(LoadParameters&& loadParameters)
{
WEBPAGE_RELEASE_LOG_FORWARDABLE(Loading, WEBPAGE_LOADREQUEST, loadParameters.navigationID ? loadParameters.navigationID->toUInt64() : 0, static_cast<unsigned>(loadParameters.shouldTreatAsContinuingLoad), loadParameters.request.isAppInitiated(), loadParameters.existingNetworkResourceLoadIdentifierToResume ? loadParameters.existingNetworkResourceLoadIdentifierToResume->toUInt64() : 0);
-@@ -2298,7 +2321,9 @@ void WebPage::stopLoading()
+@@ -2314,7 +2337,9 @@ void WebPage::stopLoading()
void WebPage::stopLoadingDueToProcessSwap()
{
SetForScope isStoppingLoadingDueToProcessSwap(m_isStoppingLoadingDueToProcessSwap, true);
@@ -19757,7 +19289,7 @@ index 8913ab7dc32c76a251b57449ff31cc53f9a6b9e0..04beed37ef9f9702a41a75acc17cc98a
}
bool WebPage::defersLoading() const
-@@ -2874,7 +2899,7 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum
+@@ -2890,7 +2915,7 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum
#if PLATFORM(IOS_FAMILY)
if (m_viewportConfiguration.setViewportArguments(viewportArguments))
viewportConfigurationChanged();
@@ -19766,7 +19298,7 @@ index 8913ab7dc32c76a251b57449ff31cc53f9a6b9e0..04beed37ef9f9702a41a75acc17cc98a
// Adjust view dimensions when using fixed layout.
RefPtr localMainFrame = this->localMainFrame();
RefPtr view = localMainFrame ? localMainFrame->view() : nullptr;
-@@ -3631,6 +3656,13 @@ void WebPage::flushDeferredScrollEvents()
+@@ -3682,6 +3707,13 @@ void WebPage::flushDeferredScrollEvents()
protectedCorePage()->flushDeferredScrollEvents();
}
@@ -19780,7 +19312,7 @@ index 8913ab7dc32c76a251b57449ff31cc53f9a6b9e0..04beed37ef9f9702a41a75acc17cc98a
void WebPage::flushDeferredDidReceiveMouseEvent()
{
if (auto info = std::exchange(m_deferredDidReceiveMouseEvent, std::nullopt))
-@@ -3905,6 +3937,97 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent, CompletionHandler<void
+@@ -3956,6 +3988,97 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent, CompletionHandler<void
completionHandler(touchEvent.type(), handled);
}
@@ -19796,8 +19328,8 @@ index 8913ab7dc32c76a251b57449ff31cc53f9a6b9e0..04beed37ef9f9702a41a75acc17cc98a
+ float radiusY = 1.0;
+ float rotationAngle = 0.0;
+ float force = 1.0;
-+ const WebCore::IntSize radius(radiusX,radiusY);
-+ const WebCore::IntPoint screenPosition = position;
++ const WebCore::DoubleSize radius(radiusX,radiusY);
++ const WebCore::DoublePoint screenPosition = position;
+ OptionSet<WebEventModifier> eventModifiers;
+ eventModifiers = eventModifiers.fromRaw(modifiers);
+
@@ -19878,7 +19410,7 @@ index 8913ab7dc32c76a251b57449ff31cc53f9a6b9e0..04beed37ef9f9702a41a75acc17cc98a
#endif
void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint)
-@@ -3993,6 +4116,16 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m
+@@ -4044,6 +4167,16 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m
m_inspectorTargetController->sendMessageToTargetBackend(targetId, message);
}
@@ -19895,7 +19427,7 @@ index 8913ab7dc32c76a251b57449ff31cc53f9a6b9e0..04beed37ef9f9702a41a75acc17cc98a
void WebPage::insertNewlineInQuotedContent()
{
RefPtr frame = corePage()->focusController().focusedOrMainFrame();
-@@ -4236,6 +4369,7 @@ void WebPage::setMainFrameDocumentVisualUpdatesAllowed(bool allowed)
+@@ -4287,6 +4420,7 @@ void WebPage::setMainFrameDocumentVisualUpdatesAllowed(bool allowed)
void WebPage::show()
{
send(Messages::WebPageProxy::ShowPage());
@@ -19903,7 +19435,7 @@ index 8913ab7dc32c76a251b57449ff31cc53f9a6b9e0..04beed37ef9f9702a41a75acc17cc98a
}
void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension)
-@@ -5456,7 +5590,7 @@ RefPtr<NotificationPermissionRequestManager> WebPage::protectedNotificationPermi
+@@ -5508,7 +5642,7 @@ RefPtr<NotificationPermissionRequestManager> WebPage::protectedNotificationPermi
#if ENABLE(DRAG_SUPPORT)
@@ -19912,7 +19444,7 @@ index 8913ab7dc32c76a251b57449ff31cc53f9a6b9e0..04beed37ef9f9702a41a75acc17cc98a
void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet<DragOperation> draggingSourceOperationMask, SelectionData&& selectionData, OptionSet<DragApplicationFlags> flags, CompletionHandler<void(std::optional<DragOperation>, DragHandlingMethod, bool, unsigned, IntRect, IntRect, std::optional<RemoteUserInputEventData>)>&& completionHandler)
{
if (!m_page)
-@@ -7952,6 +8086,10 @@ void WebPage::didCommitLoad(WebFrame* frame)
+@@ -8028,6 +8162,10 @@ void WebPage::didCommitLoad(WebFrame* frame)
m_needsFixedContainerEdgesUpdate = true;
flushDeferredDidReceiveMouseEvent();
@@ -19923,7 +19455,7 @@ index 8913ab7dc32c76a251b57449ff31cc53f9a6b9e0..04beed37ef9f9702a41a75acc17cc98a
}
void WebPage::didFinishDocumentLoad(WebFrame& frame)
-@@ -8261,6 +8399,9 @@ Ref<DocumentLoader> WebPage::createDocumentLoader(LocalFrame& frame, ResourceReq
+@@ -8337,6 +8475,9 @@ Ref<DocumentLoader> WebPage::createDocumentLoader(LocalFrame& frame, ResourceReq
m_allowsContentJavaScriptFromMostRecentNavigation = m_internals->pendingWebsitePolicies->allowsContentJavaScript;
WebsitePoliciesData::applyToDocumentLoader(*std::exchange(m_internals->pendingWebsitePolicies, std::nullopt), documentLoader);
}
@@ -19934,18 +19466,18 @@ index 8913ab7dc32c76a251b57449ff31cc53f9a6b9e0..04beed37ef9f9702a41a75acc17cc98a
return documentLoader;
diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
-index 47921d36d270fc271bf966dfe183129993ac7336..91da48500f900ddb3b0eb4e99dbd43ef92230dcf 100644
+index 302e2b70e2e181e4883a90945770162b2e873eaf..d5c5e96f65253e2a7251981a2e8d9a43b7be6e6d 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
@@ -46,6 +46,7 @@
- #include <WebCore/MediaKeySystemRequest.h>
+ #include <WebCore/NodeIdentifier.h>
#include <WebCore/NowPlayingMetadataObserver.h>
#include <WebCore/OwnerPermissionsPolicyData.h>
+#include <WebCore/Page.h>
#include <WebCore/PageIdentifier.h>
#include <WebCore/PageOverlay.h>
#include <WebCore/PlatformLayerIdentifier.h>
-@@ -1286,11 +1287,11 @@ public:
+@@ -1316,11 +1317,11 @@ public:
void clearSelection();
void restoreSelectionInFocusedEditableElement();
@@ -19959,9 +19491,9 @@ index 47921d36d270fc271bf966dfe183129993ac7336..91da48500f900ddb3b0eb4e99dbd43ef
void performDragControllerAction(std::optional<WebCore::FrameIdentifier>, DragControllerAction, WebCore::DragData&&, CompletionHandler<void(std::optional<WebCore::DragOperation>, WebCore::DragHandlingMethod, bool, unsigned, WebCore::IntRect, WebCore::IntRect, std::optional<WebCore::RemoteUserInputEventData>)>&&);
void performDragOperation(WebCore::DragData&&, SandboxExtensionHandle&&, Vector<SandboxExtensionHandle>&&, CompletionHandler<void(bool)>&&);
#endif
-@@ -1308,6 +1309,9 @@ public:
+@@ -1338,6 +1339,9 @@ public:
#if ENABLE(MODEL_PROCESS)
- void modelDragEnded(WebCore::ElementIdentifier);
+ void modelDragEnded(WebCore::NodeIdentifier);
#endif
+#if PLATFORM(MAC)
+ void setDragPasteboardName(const String& pasteboardName) { m_page->setDragPasteboardName(pasteboardName); }
@@ -19969,7 +19501,7 @@ index 47921d36d270fc271bf966dfe183129993ac7336..91da48500f900ddb3b0eb4e99dbd43ef
#endif
#if ENABLE(MODEL_PROCESS)
-@@ -1394,8 +1398,11 @@ public:
+@@ -1424,8 +1428,11 @@ public:
void gestureEvent(WebCore::FrameIdentifier, const WebGestureEvent&, CompletionHandler<void(std::optional<WebEventType>, bool, std::optional<WebCore::RemoteUserInputEventData>)>&&);
#endif
@@ -19982,7 +19514,7 @@ index 47921d36d270fc271bf966dfe183129993ac7336..91da48500f900ddb3b0eb4e99dbd43ef
void dynamicViewportSizeUpdate(const DynamicViewportSizeUpdate&);
bool scaleWasSetByUIProcess() const { return m_scaleWasSetByUIProcess; }
void willStartUserTriggeredZooming();
-@@ -1548,6 +1555,8 @@ public:
+@@ -1587,6 +1594,8 @@ public:
void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType);
void disconnectInspector(const String& targetId);
void sendMessageToTargetBackend(const String& targetId, const String& message);
@@ -19991,7 +19523,7 @@ index 47921d36d270fc271bf966dfe183129993ac7336..91da48500f900ddb3b0eb4e99dbd43ef
void insertNewlineInQuotedContent();
-@@ -1972,6 +1981,7 @@ public:
+@@ -2012,6 +2021,7 @@ public:
void showContextMenuFromFrame(const FrameInfoData&, const ContextMenuContextData&, const UserData&);
#endif
void loadRequest(LoadParameters&&);
@@ -19999,7 +19531,7 @@ index 47921d36d270fc271bf966dfe183129993ac7336..91da48500f900ddb3b0eb4e99dbd43ef
void setObscuredContentInsets(const WebCore::FloatBoxExtent&);
-@@ -2176,6 +2186,7 @@ private:
+@@ -2223,6 +2233,7 @@ private:
void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled);
#elif ENABLE(TOUCH_EVENTS)
void touchEvent(const WebTouchEvent&, CompletionHandler<void(std::optional<WebEventType>, bool)>&&);
@@ -20007,7 +19539,7 @@ index 47921d36d270fc271bf966dfe183129993ac7336..91da48500f900ddb3b0eb4e99dbd43ef
#endif
void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&);
-@@ -2947,6 +2958,7 @@ private:
+@@ -3004,6 +3015,7 @@ private:
bool m_isAppNapEnabled { true };
Markable<WebCore::NavigationIdentifier> m_pendingNavigationID;
@@ -20016,10 +19548,10 @@ index 47921d36d270fc271bf966dfe183129993ac7336..91da48500f900ddb3b0eb4e99dbd43ef
bool m_mainFrameProgressCompleted { false };
bool m_shouldDispatchFakeMouseMoveEvents { true };
diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
-index a2bdf0b62ddcb75a5c834b8aed481e1b14d5737a..e09d2ae7bbe7a1f0b34b84d6a97d2593e89b39f4 100644
+index c39f816831ea04bb7d070e81891b933307c3a62f..228a2020c40a94133699bd2a1433daca568a8d38 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
-@@ -60,10 +60,13 @@ messages -> WebPage WantsAsyncDispatchMessage {
+@@ -61,10 +61,13 @@ messages -> WebPage WantsAsyncDispatchMessage {
MouseEvent(WebCore::FrameIdentifier frameID, WebKit::WebMouseEvent event, std::optional<Vector<WebKit::SandboxExtensionHandle>> sandboxExtensions)
SetLastKnownMousePosition(WebCore::FrameIdentifier frameID, WebCore::IntPoint eventPoint, WebCore::IntPoint globalPoint);
@@ -20034,7 +19566,7 @@ index a2bdf0b62ddcb75a5c834b8aed481e1b14d5737a..e09d2ae7bbe7a1f0b34b84d6a97d2593
SetOverrideViewportArguments(struct std::optional<WebCore::ViewportArguments> arguments)
DynamicViewportSizeUpdate(struct WebKit::DynamicViewportSizeUpdate target)
-@@ -155,6 +158,7 @@ messages -> WebPage WantsAsyncDispatchMessage {
+@@ -159,6 +162,7 @@ messages -> WebPage WantsAsyncDispatchMessage {
ConnectInspector(String targetId, Inspector::FrontendChannel::ConnectionType connectionType)
DisconnectInspector(String targetId)
SendMessageToTargetBackend(String targetId, String message)
@@ -20042,7 +19574,7 @@ index a2bdf0b62ddcb75a5c834b8aed481e1b14d5737a..e09d2ae7bbe7a1f0b34b84d6a97d2593
#if ENABLE(REMOTE_INSPECTOR)
SetIndicating(bool indicating);
-@@ -165,6 +169,7 @@ messages -> WebPage WantsAsyncDispatchMessage {
+@@ -169,6 +173,7 @@ messages -> WebPage WantsAsyncDispatchMessage {
#endif
#if !ENABLE(IOS_TOUCH_EVENTS) && ENABLE(TOUCH_EVENTS)
TouchEvent(WebKit::WebTouchEvent event) -> (enum:uint8_t std::optional<WebKit::WebEventType> eventType, bool handled)
@@ -20050,7 +19582,7 @@ index a2bdf0b62ddcb75a5c834b8aed481e1b14d5737a..e09d2ae7bbe7a1f0b34b84d6a97d2593
#endif
CancelPointer(WebCore::PointerID pointerId, WebCore::IntPoint documentPoint)
-@@ -190,6 +195,7 @@ messages -> WebPage WantsAsyncDispatchMessage {
+@@ -194,6 +199,7 @@ messages -> WebPage WantsAsyncDispatchMessage {
LoadDataInFrame(std::span<const uint8_t> data, String MIMEType, String encodingName, URL baseURL, WebCore::FrameIdentifier frameID)
LoadRequest(struct WebKit::LoadParameters loadParameters)
LoadDidCommitInAnotherProcess(WebCore::FrameIdentifier frameID, std::optional<WebCore::LayerHostingContextIdentifier> layerHostingContextIdentifier)
@@ -20058,7 +19590,7 @@ index a2bdf0b62ddcb75a5c834b8aed481e1b14d5737a..e09d2ae7bbe7a1f0b34b84d6a97d2593
LoadRequestWaitingForProcessLaunch(struct WebKit::LoadParameters loadParameters, URL resourceDirectoryURL, WebKit::WebPageProxyIdentifier pageID, bool checkAssumedReadAccessToResourceURL)
LoadData(struct WebKit::LoadParameters loadParameters)
LoadSimulatedRequestAndResponse(struct WebKit::LoadParameters loadParameters, WebCore::ResourceResponse simulatedResponse)
-@@ -354,10 +360,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
+@@ -358,10 +364,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
RemoveLayerForFindOverlay() -> ()
# Drag and drop.
@@ -20071,8 +19603,8 @@ index a2bdf0b62ddcb75a5c834b8aed481e1b14d5737a..e09d2ae7bbe7a1f0b34b84d6a97d2593
PerformDragControllerAction(std::optional<WebCore::FrameIdentifier> frameID, enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData) -> (enum:uint8_t std::optional<WebCore::DragOperation> dragOperation, enum:uint8_t WebCore::DragHandlingMethod dragHandlingMethod, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, WebCore::IntRect insertionRect, WebCore::IntRect editableElementRect, struct std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData)
PerformDragOperation(WebCore::DragData dragData, WebKit::SandboxExtensionHandle sandboxExtensionHandle, Vector<WebKit::SandboxExtensionHandle> sandboxExtensionsForUpload) -> (bool handled)
#endif
-@@ -377,6 +383,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
- ModelDragEnded(WebCore::ElementIdentifier elementID)
+@@ -381,6 +387,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
+ ModelDragEnded(WebCore::NodeIdentifier nodeID)
#endif
+#if PLATFORM(MAC) && ENABLE(DRAG_SUPPORT)
@@ -20121,10 +19653,10 @@ index 40ec42bb4f998774a2ce4a19e82f68512ad2ebb8..080794e14bfbb3a336d8a89791baee0e
const auto& availableInputs = WebProcess::singleton().availableInputDevices();
if (availableInputs.contains(AvailableInputDevices::Mouse))
diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
-index e36cd746c4a8d35d076b68fd76ccd211a79d63a6..156cacab648a4ad53b854bf880c924bbe13ca4b6 100644
+index d228567dab3bece6f0f640122df955debbb20645..8abfdcceff676c32b149d34654ccb133d0b20b6d 100644
--- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
+++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
-@@ -701,21 +701,37 @@ String WebPage::platformUserAgent(const URL&) const
+@@ -709,21 +709,37 @@ String WebPage::platformUserAgent(const URL&) const
bool WebPage::hoverSupportedByPrimaryPointingDevice() const
{
@@ -20213,7 +19745,7 @@ index ea3a03b5ee6d4ecadd771314c6059268db917087..91be6f4c687157afcfdaa431d7a1a6ff
}
diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp
-index fe47c90bccb9a567803485e7313e093b48ad4d4c..ec76a5edc15a914d1f00955493625f6c135d75ce 100644
+index f718a75783df828282cebdb35ba6ef7aaafceaab..f2c23623972f5f05fe358968d45712de95e78287 100644
--- a/Source/WebKit/WebProcess/WebProcess.cpp
+++ b/Source/WebKit/WebProcess/WebProcess.cpp
@@ -93,6 +93,7 @@
@@ -20224,7 +19756,7 @@ index fe47c90bccb9a567803485e7313e093b48ad4d4c..ec76a5edc15a914d1f00955493625f6c
#include <JavaScriptCore/JSLock.h>
#include <JavaScriptCore/MemoryStatistics.h>
#include <JavaScriptCore/WasmFaultSignalHandler.h>
-@@ -388,6 +389,14 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
+@@ -389,6 +390,14 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
{
JSC::Options::AllowUnfinalizedAccessScope scope;
JSC::Options::allowNonSPTagging() = false;
@@ -20239,7 +19771,7 @@ index fe47c90bccb9a567803485e7313e093b48ad4d4c..ec76a5edc15a914d1f00955493625f6c
JSC::Options::notifyOptionsChanged();
}
-@@ -395,6 +404,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
+@@ -396,6 +405,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
platformInitializeProcess(parameters);
updateCPULimit();
@@ -20248,7 +19780,7 @@ index fe47c90bccb9a567803485e7313e093b48ad4d4c..ec76a5edc15a914d1f00955493625f6c
}
void WebProcess::initializeConnection(IPC::Connection* connection)
-@@ -979,6 +990,8 @@ void WebProcess::createWebPage(PageIdentifier pageID, WebPageCreationParameters&
+@@ -1000,6 +1011,8 @@ void WebProcess::createWebPage(PageIdentifier pageID, WebPageCreationParameters&
accessibilityRelayProcessSuspended(false);
}
ASSERT(result.iterator->value);
@@ -20258,10 +19790,10 @@ index fe47c90bccb9a567803485e7313e093b48ad4d4c..ec76a5edc15a914d1f00955493625f6c
void WebProcess::removeWebPage(PageIdentifier pageID)
diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
-index 01f0546169ab61e79b730ac1fe4bded1b80ade9d..f274262554df2cc924e85b79467e16110e12af43 100644
+index 1e94fdb5528a634e1766b92f687c5d4f3b360a08..48633d0eef6b94013ad08b655b6f631df9e6144b 100644
--- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
-@@ -4219,7 +4219,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
+@@ -4220,7 +4220,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
_private->handlingMouseDownEvent = NO;
}
@@ -20271,7 +19803,7 @@ index 01f0546169ab61e79b730ac1fe4bded1b80ade9d..f274262554df2cc924e85b79467e1611
- (void)touch:(WebEvent *)event
{
diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
-index 30baa8fa7a4f030680c683eebb7e93f9723da373..f236d24511f25dcbcf84af26fe29d8eb3742512d 100644
+index 0a8524884313332dbfbacf5e76faffaa20615e04..a1123977f9a775d067dacac6f18a7923d30174c2 100644
--- a/Source/WebKitLegacy/mac/WebView/WebView.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
@@ -3972,7 +3972,7 @@ + (void)_doNotStartObservingNetworkReachability
@@ -20326,7 +19858,7 @@ index 0000000000000000000000000000000000000000..a9db9ec38d05e36517414248237e885b
+ LIBVPX_LIBRARIES
+)
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 7b9783fe14ac1eca2c6a48e42b74e6f294359b6d..584c9f2ea30a8f670b18ef271ca2f0681c637fdc 100644
+index cca9439b5b8b47d7ad594fb52169732b8fe04dcb..a35b4483dfe7f38d40d9754ad808797080bbff14 100644
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -9,6 +9,10 @@ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
@@ -20385,12 +19917,12 @@ index 7b9783fe14ac1eca2c6a48e42b74e6f294359b6d..584c9f2ea30a8f670b18ef271ca2f068
WEBKIT_OPTION_DEPEND(ENABLE_WEBXR ENABLE_GAMEPAD)
diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
-index d04d2c2504b829f240633a9c7e3de15876190ba0..9f3a7febd7374a60a55c1d6aaee50cc26df59fc6 100644
+index 0f218a220f020c02da23801959bbd7e72225117e..64800eeb278be31595b13b0a0a9ecf23a4ed5f0c 100644
--- a/Source/cmake/OptionsWPE.cmake
+++ b/Source/cmake/OptionsWPE.cmake
-@@ -23,6 +23,9 @@ find_package(WebP REQUIRED COMPONENTS demux)
- find_package(WPE REQUIRED)
- find_package(ZLIB REQUIRED)
+@@ -27,6 +27,9 @@ if (ANDROID)
+ find_package(Android REQUIRED COMPONENTS Android Log)
+ endif ()
+set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
@@ -20398,7 +19930,7 @@ index d04d2c2504b829f240633a9c7e3de15876190ba0..9f3a7febd7374a60a55c1d6aaee50cc2
WEBKIT_OPTION_BEGIN()
SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
-@@ -81,6 +84,22 @@ else ()
+@@ -86,6 +89,22 @@ else ()
WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SKIA PRIVATE OFF)
endif ()
@@ -20421,7 +19953,7 @@ index d04d2c2504b829f240633a9c7e3de15876190ba0..9f3a7febd7374a60a55c1d6aaee50cc2
# Public options specific to the WPE port. Do not add any options here unless
# there is a strong reason we should support changing the value of the option,
# and the option is not relevant to other WebKit ports.
-@@ -116,6 +135,11 @@ WEBKIT_OPTION_DEPEND(USE_QT6 ENABLE_WPE_PLATFORM)
+@@ -121,6 +140,11 @@ WEBKIT_OPTION_DEPEND(USE_QT6 ENABLE_WPE_PLATFORM)
WEBKIT_OPTION_DEPEND(USE_SKIA_OPENTYPE_SVG USE_SKIA)
WEBKIT_OPTION_DEPEND(USE_SYSTEM_SYSPROF_CAPTURE USE_SYSPROF_CAPTURE)
@@ -20434,7 +19966,7 @@ index d04d2c2504b829f240633a9c7e3de15876190ba0..9f3a7febd7374a60a55c1d6aaee50cc2
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake
-index 1a8e2da4c2a377e0dbfd7f7b1bc7b5ce597d4a4e..cee24362b16102e6efb9e017c77810ca4bdf32d7 100644
+index 4bf1704596f5555a9e23939873525d96d803ff80..e3710ad8b4100c4f30f84c3364230c6ef51575d6 100644
--- a/Source/cmake/OptionsWin.cmake
+++ b/Source/cmake/OptionsWin.cmake
@@ -55,6 +55,10 @@ find_package(ZLIB 1.2.11 REQUIRED)
@@ -20464,7 +19996,7 @@ index 1a8e2da4c2a377e0dbfd7f7b1bc7b5ce597d4a4e..cee24362b16102e6efb9e017c77810ca
set(USE_ANGLE_EGL ON)
diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
-index d8fe5503609122c55c2c675934b3678cfe709cf0..2e706bb436d6c01689bec8cc7b7de3c125ca258a 100644
+index 77a292fb8b15af7bc544de6e0307f11106cfd161..872541a17703827da5020df4129a65b3dd9d8e80 100644
--- a/Source/cmake/WebKitCompilerFlags.cmake
+++ b/Source/cmake/WebKitCompilerFlags.cmake
@@ -122,7 +122,7 @@ macro(WEBKIT_ADD_TARGET_CXX_FLAGS _target)
@@ -20879,7 +20411,7 @@ index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec9
g_clear_object(&interfaceSettings);
diff --git a/Tools/MiniBrowser/wpe/main.cpp b/Tools/MiniBrowser/wpe/main.cpp
-index 247a2dc5cf369dbf26434358de0898cb36cba100..1aff934e53a808df82ba4a59760455329d316e33 100644
+index abc3c2e649f13c0843f74214f79f2a5ea5e826c1..7a2993feb2c5017ca08572a35a74bca7c01f87e9 100644
--- a/Tools/MiniBrowser/wpe/main.cpp
+++ b/Tools/MiniBrowser/wpe/main.cpp
@@ -52,6 +52,9 @@ static gboolean headlessMode;
@@ -20902,7 +20434,7 @@ index 247a2dc5cf369dbf26434358de0898cb36cba100..1aff934e53a808df82ba4a5976045532
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, nullptr, "[URL]" },
{ nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
};
-@@ -288,15 +294,38 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul
+@@ -295,15 +301,38 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul
g_main_loop_quit(data->mainLoop);
}
@@ -20943,7 +20475,7 @@ index 247a2dc5cf369dbf26434358de0898cb36cba100..1aff934e53a808df82ba4a5976045532
{
auto backend = createViewBackend(defaultWindowWidthLegacyAPI, defaultWindowHeightLegacyAPI);
WebKitWebViewBackend* viewBackend = nullptr;
-@@ -311,12 +340,27 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
+@@ -318,12 +347,27 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
}, backend.release());
}
@@ -20977,7 +20509,7 @@ index 247a2dc5cf369dbf26434358de0898cb36cba100..1aff934e53a808df82ba4a5976045532
#if ENABLE_WPE_PLATFORM
if (auto* wpeView = webkit_web_view_get_wpe_view(newWebView)) {
-@@ -328,9 +372,13 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
+@@ -335,9 +379,13 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
g_signal_connect(newWebView, "create", G_CALLBACK(createWebView), user_data);
g_signal_connect(newWebView, "close", G_CALLBACK(webViewClose), user_data);
@@ -20993,7 +20525,7 @@ index 247a2dc5cf369dbf26434358de0898cb36cba100..1aff934e53a808df82ba4a5976045532
return newWebView;
}
-@@ -418,13 +466,105 @@ void loadConfigFile(WPESettings* settings)
+@@ -425,13 +473,105 @@ void loadConfigFile(WPESettings* settings)
}
#endif
@@ -21100,7 +20632,7 @@ index 247a2dc5cf369dbf26434358de0898cb36cba100..1aff934e53a808df82ba4a5976045532
webkit_network_session_set_itp_enabled(networkSession, enableITP);
if (proxy) {
-@@ -451,10 +591,18 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -458,10 +598,18 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
webkit_cookie_manager_set_persistent_storage(cookieManager, cookiesFile, storageType);
}
}
@@ -21121,7 +20653,7 @@ index 247a2dc5cf369dbf26434358de0898cb36cba100..1aff934e53a808df82ba4a5976045532
webkit_website_data_manager_set_itp_enabled(manager, enableITP);
if (proxy) {
-@@ -485,6 +633,7 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -492,6 +640,7 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
}
#endif
@@ -21129,7 +20661,7 @@ index 247a2dc5cf369dbf26434358de0898cb36cba100..1aff934e53a808df82ba4a5976045532
WebKitUserContentManager* userContentManager = nullptr;
if (contentFilter) {
GFile* contentFilterFile = g_file_new_for_commandline_arg(contentFilter);
-@@ -563,6 +712,15 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -570,6 +719,15 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
"autoplay", WEBKIT_AUTOPLAY_ALLOW,
nullptr);
@@ -21145,7 +20677,7 @@ index 247a2dc5cf369dbf26434358de0898cb36cba100..1aff934e53a808df82ba4a5976045532
auto* webView = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW,
"backend", viewBackend,
"web-context", webContext,
-@@ -609,12 +767,16 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -616,12 +774,16 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
}
#endif
@@ -21164,7 +20696,7 @@ index 247a2dc5cf369dbf26434358de0898cb36cba100..1aff934e53a808df82ba4a5976045532
g_hash_table_add(openViews, webView);
WebKitColor color;
-@@ -622,16 +784,11 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -629,16 +791,11 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
webkit_web_view_set_background_color(webView, &color);
if (uriArguments) {
@@ -21186,7 +20718,7 @@ index 247a2dc5cf369dbf26434358de0898cb36cba100..1aff934e53a808df82ba4a5976045532
webkit_web_view_load_uri(webView, "https://wpewebkit.org");
g_object_unref(webContext);
-@@ -728,8 +885,14 @@ int main(int argc, char *argv[])
+@@ -735,8 +892,14 @@ int main(int argc, char *argv[])
}
}
@@ -21229,10 +20761,10 @@ index 9e53f459e444b9c10fc5248f0e8059df6c1e0041..c17c875a7dd3ca05c4489578ab32378b
"${WebKitTestRunner_DIR}/InjectedBundle/Bindings/AccessibilityController.idl"
"${WebKitTestRunner_DIR}/InjectedBundle/Bindings/AccessibilityTextMarker.idl"
diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
-index 567ccd8d7a4bdb3c576c60230123b78465da6505..75bf76270063878f3f1ded7b47eb2f8cc90271d8 100644
+index 0d0c43579d26bb9738300a3b6bd142b4a0f424be..ac0e2abe9d1ad3bac7b855eeb50fed5de96cf4ad 100644
--- a/Tools/WebKitTestRunner/TestController.cpp
+++ b/Tools/WebKitTestRunner/TestController.cpp
-@@ -713,6 +713,7 @@ PlatformWebView* TestController::createOtherPlatformWebView(PlatformWebView* par
+@@ -735,6 +735,7 @@ PlatformWebView* TestController::createOtherPlatformWebView(PlatformWebView* par
nullptr, // requestStorageAccessConfirm
nullptr, // shouldAllowDeviceOrientationAndMotionAccess
nullptr, // runWebAuthenticationPanel
@@ -21240,7 +20772,7 @@ index 567ccd8d7a4bdb3c576c60230123b78465da6505..75bf76270063878f3f1ded7b47eb2f8c
nullptr, // decidePolicyForSpeechRecognitionPermissionRequest
nullptr, // decidePolicyForMediaKeySystemPermissionRequest
nullptr, // queryPermission
-@@ -1188,6 +1189,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)
+@@ -1218,6 +1219,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)
nullptr, // requestStorageAccessConfirm
shouldAllowDeviceOrientationAndMotionAccess,
runWebAuthenticationPanel,