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 (#38286)

Simon Knott019900fd24d8
diff --git a/browser_patches/firefox/UPSTREAM_CONFIG.sh b/browser_patches/firefox/UPSTREAM_CONFIG.sh
index 9ab8a1199d..59bf574a1c 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="c1ee0105d25a4c2b2887e916470bdf41a9fd47ef"
+BASE_REVISION="e0df3d598dba47de812bb5144cbc187557377095"
diff --git a/browser_patches/firefox/juggler/TargetRegistry.js b/browser_patches/firefox/juggler/TargetRegistry.js
index 14962a91e6..55afdad864 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 = 1000 * 60 * 60 * 24 * 365 * 100;
+const HUNDRED_YEARS = 60 * 60 * 24 * 365 * 100;
const ALL_PERMISSIONS = [
'geo',
@@ -1153,7 +1153,7 @@ class BrowserContext {
secure,
cookie.httpOnly || false,
cookie.expires === undefined || cookie.expires === -1 /* isSession */,
- cookie.expires === undefined ? Date.now() + HUNDRED_YEARS : cookie.expires,
+ cookie.expires === undefined ? Date.now() + HUNDRED_YEARS : cookie.expires * 1000,
{ userContextId: this.userContextId || undefined } /* originAttributes */,
protocolToSameSite[cookie.sameSite],
Ci.nsICookie.SCHEME_UNSET
@@ -1183,7 +1183,7 @@ class BrowserContext {
value: cookie.value,
domain: cookie.host,
path: cookie.path,
- expires: cookie.isSession ? -1 : cookie.expiry,
+ expires: cookie.isSession ? -1 : cookie.expiry / 1000,
size: cookie.name.length + cookie.value.length,
httpOnly: cookie.isHttpOnly,
secure: cookie.isSecure,
diff --git a/browser_patches/firefox/juggler/content/main.js b/browser_patches/firefox/juggler/content/main.js
index 462566e626..61e410630c 100644
--- a/browser_patches/firefox/juggler/content/main.js
+++ b/browser_patches/firefox/juggler/content/main.js
@@ -31,7 +31,7 @@ export function initialize(browsingContext, docShell) {
heading: NaN,
speed: NaN,
},
- timestamp: Date.now()
+ timestamp: Date.now() + 24 * 60 * 60 * 1000, // Make sure it does not expire for a day.
});
} else {
browsingContext.setGeolocationServiceOverride();
diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff
index c422ad36e4..25c06cbe42 100644
--- a/browser_patches/firefox/patches/bootstrap.diff
+++ b/browser_patches/firefox/patches/bootstrap.diff
@@ -1,16 +1,3 @@
-diff --git a/accessible/base/NotificationController.h b/accessible/base/NotificationController.h
-index 1bcd464d3bd6b8465f78c62b074b0d57dbc6a082..f878ac9db2d800542dabcc2f48e8ae4727ec4b9a 100644
---- a/accessible/base/NotificationController.h
-+++ b/accessible/base/NotificationController.h
-@@ -244,6 +244,8 @@ class NotificationController final : public EventQueue,
- }
- #endif
-
-+ bool IsUpdatePendingForJugglerAccessibility() { return IsUpdatePending(); }
-+
- protected:
- virtual ~NotificationController();
-
diff --git a/accessible/interfaces/nsIAccessibleDocument.idl b/accessible/interfaces/nsIAccessibleDocument.idl
index 6c932c14a03e9cbf70723171dc9a1006bd2c017d..6312131c94c6d7e994a4a49dd64b2b4c5777251f 100644
--- a/accessible/interfaces/nsIAccessibleDocument.idl
@@ -26,7 +13,7 @@ index 6c932c14a03e9cbf70723171dc9a1006bd2c017d..6312131c94c6d7e994a4a49dd64b2b4c
+ readonly attribute boolean isUpdatePendingForJugglerAccessibility;
};
diff --git a/accessible/xpcom/xpcAccessibleDocument.cpp b/accessible/xpcom/xpcAccessibleDocument.cpp
-index 3229ee415b93b9a47d7d40605ed7b509744c94ad..24a0837c508f7bc2709538fc28fdafe83ed524f8 100644
+index 3229ee415b93b9a47d7d40605ed7b509744c94ad..c2cc38ded257a02de8922312057892bf9d0cad7b 100644
--- a/accessible/xpcom/xpcAccessibleDocument.cpp
+++ b/accessible/xpcom/xpcAccessibleDocument.cpp
@@ -151,6 +151,13 @@ xpcAccessibleDocument::GetBrowsingContext(
@@ -36,7 +23,7 @@ index 3229ee415b93b9a47d7d40605ed7b509744c94ad..24a0837c508f7bc2709538fc28fdafe8
+NS_IMETHODIMP
+xpcAccessibleDocument::GetIsUpdatePendingForJugglerAccessibility(bool* updating) {
+ NS_ENSURE_ARG_POINTER(updating);
-+ *updating = Intl()->Controller()->IsUpdatePendingForJugglerAccessibility();
++ *updating = Intl()->Controller()->IsUpdatePending();
+ return NS_OK;
+}
+
@@ -89,7 +76,7 @@ index 8167d2b81c918e02ce757f7f448f22e07c29d140..3ae798880acfd8aa965ae08051f2f818
DWORD creationFlags = CREATE_SUSPENDED | CREATE_UNICODE_ENVIRONMENT;
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
-index a315ebcb8b60875b4eddbb5d654764603e0e7bec..fa67db1ff5a331dda4eaff4457418c306869d011 100644
+index 6bbc4016cd6d56e8625e808b5070515a23de7600..2fb56fb1afa5b108a426737cb5e62dc42a199354 100644
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -59,6 +59,12 @@ browser/chrome/browser/builtin-addons/webcompat/shims/empty-shim.txt
@@ -167,10 +154,10 @@ index d49c6fbf1bf83b832795fa674f6b41f223eef812..7ea3540947ff5f61b15f27fbf4b95564
const transportProvider = {
setListener(upgradeListener) {
diff --git a/docshell/base/BrowsingContext.cpp b/docshell/base/BrowsingContext.cpp
-index a5273a33caeb963017a41320b08783c3520eb376..08f73f9a316af5d70d4b1658f5d7b6fedd12c6e5 100644
+index 97334bee3a111a538779789d3495805cec8b1e9a..67d030f2adecd9acc62665e2a627123148aa927d 100644
--- a/docshell/base/BrowsingContext.cpp
+++ b/docshell/base/BrowsingContext.cpp
-@@ -109,8 +109,15 @@ struct ParamTraits<mozilla::dom::DisplayMode>
+@@ -110,8 +110,15 @@ struct ParamTraits<mozilla::dom::DisplayMode>
template <>
struct ParamTraits<mozilla::dom::PrefersColorSchemeOverride>
@@ -188,8 +175,8 @@ index a5273a33caeb963017a41320b08783c3520eb376..08f73f9a316af5d70d4b1658f5d7b6fe
template <>
struct ParamTraits<mozilla::dom::ForcedColorsOverride>
-@@ -2915,6 +2922,32 @@ void BrowsingContext::DidSet(FieldIndex<IDX_ForcedColorsOverride>,
- PresContextAffectingFieldChanged();
+@@ -2950,6 +2957,32 @@ void BrowsingContext::DidSet(FieldIndex<IDX_LanguageOverride>,
+ });
}
+void BrowsingContext::DidSet(FieldIndex<IDX_PrefersContrastOverride>,
@@ -221,8 +208,41 @@ index a5273a33caeb963017a41320b08783c3520eb376..08f73f9a316af5d70d4b1658f5d7b6fe
void BrowsingContext::DidSet(FieldIndex<IDX_MediumOverride>,
nsString&& aOldValue) {
MOZ_ASSERT(IsTop());
+@@ -3290,7 +3323,7 @@ void BrowsingContext::SetGeolocationServiceOverride(
+ if (aGeolocationOverride.WasPassed()) {
+ if (!mGeolocationServiceOverride) {
+ mGeolocationServiceOverride = new nsGeolocationService();
+- mGeolocationServiceOverride->Init();
++ mGeolocationServiceOverride->Init(true /* isOverride */);
+ }
+ mGeolocationServiceOverride->Update(aGeolocationOverride.Value());
+ } else if (RefPtr<nsGeolocationService> serviceOverride =
+@@ -3793,6 +3826,23 @@ void BrowsingContext::DidSet(FieldIndex<IDX_IsUnderHiddenEmbedderElement>,
+ }
+ }
+
++void BrowsingContext::DidSet(FieldIndex<IDX_ForceOffline>, bool aOldValue) {
++ const bool newValue = ForceOffline();
++ if (newValue == aOldValue) {
++ return;
++ }
++ PreOrderWalk([&](BrowsingContext* aContext) {
++ if (Document* doc = aContext->GetDocument()) {
++ if (nsPIDOMWindowOuter* win = aContext->GetDOMWindow()) {
++ nsContentUtils::DispatchTrustedEvent(
++ doc, nsGlobalWindowOuter::Cast(win),
++ newValue ? u"offline"_ns : u"online"_ns,
++ CanBubble::eYes, Cancelable::eYes, nullptr);
++ }
++ }
++ });
++}
++
+ bool BrowsingContext::IsPopupAllowed() {
+ for (auto* context = GetCurrentWindowContext(); context;
+ context = context->GetParentWindowContext()) {
diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h
-index 0c133479abbb8b9a1218ebcb95a285f859d4d39d..7fcc205d2c1a44d864339617a22bf4812f5e2659 100644
+index b42c32133c6490755ae4e1c599255418e6443011..afa502833ba55c94dbd30726d37450c460a69e2b 100644
--- a/docshell/base/BrowsingContext.h
+++ b/docshell/base/BrowsingContext.h
@@ -205,10 +205,10 @@ struct EmbedderColorSchemes {
@@ -238,7 +258,7 @@ index 0c133479abbb8b9a1218ebcb95a285f859d4d39d..7fcc205d2c1a44d864339617a22bf481
FIELD(EmbedderElementType, Maybe<nsString>) \
FIELD(MessageManagerGroup, nsString) \
FIELD(MaxTouchPointsOverride, uint8_t) \
-@@ -245,6 +245,9 @@ struct EmbedderColorSchemes {
+@@ -246,6 +246,9 @@ struct EmbedderColorSchemes {
* <browser> embedder element. */ \
FIELD(EmbedderColorSchemes, EmbedderColorSchemes) \
FIELD(DisplayMode, dom::DisplayMode) \
@@ -248,7 +268,7 @@ index 0c133479abbb8b9a1218ebcb95a285f859d4d39d..7fcc205d2c1a44d864339617a22bf481
/* The number of entries added to the session history because of this \
* browsing context. */ \
FIELD(HistoryEntryCount, uint32_t) \
-@@ -971,6 +974,14 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -975,6 +978,14 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
return GetForcedColorsOverride();
}
@@ -263,7 +283,7 @@ index 0c133479abbb8b9a1218ebcb95a285f859d4d39d..7fcc205d2c1a44d864339617a22bf481
bool IsInBFCache() const;
bool AllowJavascript() const { return GetAllowJavascript(); }
-@@ -1137,6 +1148,11 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -1146,6 +1157,11 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
return IsTop();
}
@@ -275,7 +295,7 @@ index 0c133479abbb8b9a1218ebcb95a285f859d4d39d..7fcc205d2c1a44d864339617a22bf481
bool CanSet(FieldIndex<IDX_ForcedColorsOverride>, dom::ForcedColorsOverride,
ContentParent*) {
return IsTop();
-@@ -1155,10 +1171,22 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -1164,12 +1180,24 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
void DidSet(FieldIndex<IDX_ForcedColorsOverride>,
dom::ForcedColorsOverride aOldValue);
@@ -286,6 +306,8 @@ index 0c133479abbb8b9a1218ebcb95a285f859d4d39d..7fcc205d2c1a44d864339617a22bf481
void WalkPresContexts(Callback&&);
void PresContextAffectingFieldChanged();
+ void DidSet(FieldIndex<IDX_LanguageOverride>, nsString&& aOldValue);
+
+ bool CanSet(FieldIndex<IDX_PrefersReducedMotionOverride>,
+ dom::PrefersReducedMotionOverride, ContentParent*) {
+ return IsTop();
@@ -298,8 +320,17 @@ index 0c133479abbb8b9a1218ebcb95a285f859d4d39d..7fcc205d2c1a44d864339617a22bf481
void DidSet(FieldIndex<IDX_MediumOverride>, nsString&& aOldValue);
bool CanSet(FieldIndex<IDX_SuspendMediaWhenInactive>, bool, ContentParent*) {
+@@ -1360,6 +1388,8 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+
+ void DidSet(FieldIndex<IDX_IsUnderHiddenEmbedderElement>, bool aOldValue);
+
++ void DidSet(FieldIndex<IDX_ForceOffline>, bool aOldValue);
++
+ // Allow if the process attemping to set field is the same as the owning
+ // process. Deprecated. New code that might use this should generally be moved
+ // to WindowContext or be settable only by the parent process.
diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
-index 6feae3858ff35301b93632645df402c0da759688..b0f6a331628a5619d68078e2a114102e5cfbcb65 100644
+index 4953744c3f627bb68b78606d8ae4bf6ab649398a..17c7cc94dafc76cd72aacddfd633b7df58eeae78 100644
--- a/docshell/base/CanonicalBrowsingContext.cpp
+++ b/docshell/base/CanonicalBrowsingContext.cpp
@@ -267,6 +267,8 @@ void CanonicalBrowsingContext::ReplacedBy(
@@ -311,7 +342,7 @@ index 6feae3858ff35301b93632645df402c0da759688..b0f6a331628a5619d68078e2a114102e
// Propagate some settings on BrowsingContext replacement so they're not lost
// on bfcached navigations. These are important for GeckoView (see bug
-@@ -1578,6 +1580,12 @@ void CanonicalBrowsingContext::LoadURI(nsIURI* aURI,
+@@ -1705,6 +1707,12 @@ void CanonicalBrowsingContext::LoadURI(nsIURI* aURI,
return;
}
@@ -325,7 +356,7 @@ index 6feae3858ff35301b93632645df402c0da759688..b0f6a331628a5619d68078e2a114102e
}
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
-index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe15901610af1f2a 100644
+index bf702818cf4116ec1cd911b6e7b5f7ddafa3e508..d846e5f6f900d2d69228331b80031bd1c18b08ed 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -16,6 +16,12 @@
@@ -349,7 +380,7 @@ index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe159016
#include "mozilla/dom/HTMLAnchorElement.h"
#include "mozilla/dom/HTMLIFrameElement.h"
#include "mozilla/dom/Navigation.h"
-@@ -95,6 +102,7 @@
+@@ -98,6 +105,7 @@
#include "mozilla/dom/DocumentBinding.h"
#include "mozilla/glean/DocshellMetrics.h"
#include "mozilla/ipc/ProtocolUtils.h"
@@ -357,7 +388,7 @@ index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe159016
#include "mozilla/net/DocumentChannel.h"
#include "mozilla/net/DocumentChannelChild.h"
#include "mozilla/net/ParentChannelWrapper.h"
-@@ -119,6 +127,7 @@
+@@ -122,6 +130,7 @@
#include "nsIDocumentViewer.h"
#include "mozilla/dom/Document.h"
#include "nsHTMLDocument.h"
@@ -365,7 +396,7 @@ index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe159016
#include "nsIDocumentLoaderFactory.h"
#include "nsIDOMWindow.h"
#include "nsIEditingSession.h"
-@@ -214,6 +223,7 @@
+@@ -217,6 +226,7 @@
#include "nsGlobalWindowInner.h"
#include "nsGlobalWindowOuter.h"
#include "nsJSEnvironment.h"
@@ -373,7 +404,7 @@ index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe159016
#include "nsNetCID.h"
#include "nsNetUtil.h"
#include "nsObjectLoadingContent.h"
-@@ -355,6 +365,14 @@ nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext,
+@@ -358,6 +368,14 @@ nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext,
mAllowDNSPrefetch(true),
mAllowWindowControl(true),
mCSSErrorReportingEnabled(false),
@@ -388,7 +419,7 @@ index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe159016
mAllowAuth(mItemType == typeContent),
mAllowKeywordFixup(false),
mDisableMetaRefreshWhenInactive(false),
-@@ -3034,6 +3052,232 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) {
+@@ -3037,6 +3055,232 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) {
return NS_OK;
}
@@ -621,7 +652,7 @@ index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe159016
NS_IMETHODIMP
nsDocShell::GetIsNavigating(bool* aOut) {
*aOut = mIsNavigating;
-@@ -4813,7 +5057,7 @@ nsDocShell::GetVisibility(bool* aVisibility) {
+@@ -4819,7 +5063,7 @@ nsDocShell::GetVisibility(bool* aVisibility) {
}
void nsDocShell::ActivenessMaybeChanged() {
@@ -630,7 +661,7 @@ index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe159016
if (RefPtr<PresShell> presShell = GetPresShell()) {
presShell->ActivenessMaybeChanged();
}
-@@ -6877,6 +7121,10 @@ bool nsDocShell::CanSavePresentation(uint32_t aLoadType,
+@@ -6881,6 +7125,10 @@ bool nsDocShell::CanSavePresentation(uint32_t aLoadType,
return false; // no entry to save into
}
@@ -641,7 +672,7 @@ index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe159016
MOZ_ASSERT(!mozilla::SessionHistoryInParent(),
"mOSHE cannot be non-null with SHIP");
nsCOMPtr<nsIDocumentViewer> viewer = mOSHE->GetDocumentViewer();
-@@ -8633,6 +8881,12 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) {
+@@ -8637,6 +8885,12 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) {
true, // aForceNoOpener
getter_AddRefs(newBC));
MOZ_ASSERT(!newBC);
@@ -654,7 +685,7 @@ index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe159016
return rv;
}
-@@ -9938,6 +10192,16 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
+@@ -9934,6 +10188,16 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
nsINetworkPredictor::PREDICT_LOAD, attrs, nullptr);
nsCOMPtr<nsIRequest> req;
@@ -671,7 +702,7 @@ index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe159016
rv = DoURILoad(aLoadState, aCacheKey, getter_AddRefs(req));
if (NS_SUCCEEDED(rv)) {
-@@ -13165,6 +13429,9 @@ class OnLinkClickEvent : public Runnable {
+@@ -13323,6 +13587,9 @@ class OnLinkClickEvent : public Runnable {
mHandler->OnLinkClickSync(mContent, mLoadState, mNoOpenerImplied,
mTriggeringPrincipal);
}
@@ -681,7 +712,7 @@ index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe159016
return NS_OK;
}
-@@ -13280,6 +13547,8 @@ nsresult nsDocShell::OnLinkClick(
+@@ -13439,6 +13706,8 @@ nsresult nsDocShell::OnLinkClick(
nsCOMPtr<nsIRunnable> ev = new OnLinkClickEvent(
this, aContent, loadState, noOpenerImplied, aTriggeringPrincipal);
@@ -691,7 +722,7 @@ index bd505e670bffd4db1f880cdaa90c084915c596bc..df7df15ec45185417a91226fbe159016
}
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
-index db0bd18f9828b903e240f91f8febd2d371b1cefb..104aa94dbb8ca3b2fa5caebde0df22db4f9e02a4 100644
+index 3050f0a5a10c7f49f56cf325cd8bfe5e6508b5be..a4f4895f69a2eaa55f3eeae77bd6a3fb29931ad4 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -16,6 +16,7 @@
@@ -702,7 +733,7 @@ index db0bd18f9828b903e240f91f8febd2d371b1cefb..104aa94dbb8ca3b2fa5caebde0df22db
#include "mozilla/dom/WindowProxyHolder.h"
#include "nsCOMPtr.h"
#include "nsCharsetSource.h"
-@@ -79,6 +80,7 @@ class nsCommandManager;
+@@ -80,6 +81,7 @@ class nsCommandManager;
class nsDocShellEditorData;
class nsDOMNavigationTiming;
class nsDSURIContentListener;
@@ -710,7 +741,7 @@ index db0bd18f9828b903e240f91f8febd2d371b1cefb..104aa94dbb8ca3b2fa5caebde0df22db
class nsGlobalWindowOuter;
class FramingChecker;
-@@ -409,6 +411,15 @@ class nsDocShell final : public nsDocLoader,
+@@ -410,6 +412,15 @@ class nsDocShell final : public nsDocLoader,
void SetWillChangeProcess() { mWillChangeProcess = true; }
bool WillChangeProcess() { return mWillChangeProcess; }
@@ -726,7 +757,7 @@ index db0bd18f9828b903e240f91f8febd2d371b1cefb..104aa94dbb8ca3b2fa5caebde0df22db
// Create a content viewer within this nsDocShell for the given
// `WindowGlobalChild` actor.
nsresult CreateDocumentViewerForActor(
-@@ -1015,6 +1026,8 @@ class nsDocShell final : public nsDocLoader,
+@@ -1036,6 +1047,8 @@ class nsDocShell final : public nsDocLoader,
bool CSSErrorReportingEnabled() const { return mCSSErrorReportingEnabled; }
@@ -735,7 +766,7 @@ index db0bd18f9828b903e240f91f8febd2d371b1cefb..104aa94dbb8ca3b2fa5caebde0df22db
// 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
-@@ -1336,6 +1349,17 @@ class nsDocShell final : public nsDocLoader,
+@@ -1355,6 +1368,17 @@ class nsDocShell final : public nsDocLoader,
bool mAllowDNSPrefetch : 1;
bool mAllowWindowControl : 1;
bool mCSSErrorReportingEnabled : 1;
@@ -754,12 +785,12 @@ index db0bd18f9828b903e240f91f8febd2d371b1cefb..104aa94dbb8ca3b2fa5caebde0df22db
bool mAllowKeywordFixup : 1;
bool mDisableMetaRefreshWhenInactive : 1;
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
-index 159daa1dd936e84f1bf3ce413643382e4d37f592..607224a5270995abccf439992ec577f11178e522 100644
+index 763c7adb5ab9e3e56d6f1608899f6622997f272a..4f77795b5ce1f8fff79581987e017165dbdcbc1e 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -44,6 +44,7 @@ interface nsIURI;
interface nsIChannel;
- interface nsIContentSecurityPolicy;
+ interface nsIPolicyContainer;
interface nsIDocumentViewer;
+interface nsIDOMGeoPosition;
interface nsIEditor;
@@ -812,10 +843,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 36f9681a989bf4007fa837e7c9ef332ee14e55bd..252347c568b99186c006b2d7aa9a35e0c5c2f3db 100644
+index 40da41ae4ac7d8d61c664e25bec8a74091d8b3e0..50ee1170e6d5b261334c7baccc63ed492b86ec38 100644
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
-@@ -3795,6 +3795,9 @@ void Document::SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages) {
+@@ -3799,6 +3799,9 @@ void Document::SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages) {
}
void Document::ApplySettingsFromCSP(bool aSpeculative) {
@@ -824,10 +855,10 @@ index 36f9681a989bf4007fa837e7c9ef332ee14e55bd..252347c568b99186c006b2d7aa9a35e0
+
nsresult rv = NS_OK;
if (!aSpeculative) {
- // 1) apply settings from regular CSP
-@@ -3852,6 +3855,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) {
- MOZ_ASSERT(!mScriptGlobalObject,
- "CSP must be initialized before mScriptGlobalObject is set!");
+ nsIContentSecurityPolicy* csp = PolicyContainer::GetCSP(mPolicyContainer);
+@@ -3887,6 +3890,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) {
+ MOZ_ASSERT(mPolicyContainer,
+ "Policy container must be initialized before CSP!");
+ nsCOMPtr<nsIDocShell> shell(mDocumentContainer);
+ if (shell && nsDocShell::Cast(shell)->IsBypassCSPEnabled()) {
@@ -837,7 +868,7 @@ index 36f9681a989bf4007fa837e7c9ef332ee14e55bd..252347c568b99186c006b2d7aa9a35e0
// If this is a data document - no need to set CSP.
if (mLoadedAsData) {
return NS_OK;
-@@ -4717,6 +4725,10 @@ bool Document::HasFocus(ErrorResult& rv) const {
+@@ -4753,6 +4761,10 @@ bool Document::HasFocus(ErrorResult& rv) const {
return false;
}
@@ -848,7 +879,7 @@ index 36f9681a989bf4007fa837e7c9ef332ee14e55bd..252347c568b99186c006b2d7aa9a35e0
if (!fm->IsInActiveWindow(bc)) {
return false;
}
-@@ -20142,6 +20154,35 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
+@@ -20326,6 +20338,35 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
return PreferenceSheet::PrefsFor(*this).mColorScheme;
}
@@ -885,10 +916,10 @@ index 36f9681a989bf4007fa837e7c9ef332ee14e55bd..252347c568b99186c006b2d7aa9a35e0
if (!sLoadingForegroundTopLevelContentDocument) {
return false;
diff --git a/dom/base/Document.h b/dom/base/Document.h
-index 41df6459683a9ab0f0bd20f4139dada564cc18e8..7caea88ca7934f120091c116e2551b4378559e32 100644
+index 20f726a52f9f3591502597e20eeb8c07fe35feb2..c46f58ac88d536850169e6c51b9cfcb871d36e70 100644
--- a/dom/base/Document.h
+++ b/dom/base/Document.h
-@@ -4235,6 +4235,8 @@ class Document : public nsINode,
+@@ -4252,6 +4252,8 @@ class Document : public nsINode,
// color-scheme meta tag.
ColorScheme DefaultColorScheme() const;
@@ -898,7 +929,7 @@ index 41df6459683a9ab0f0bd20f4139dada564cc18e8..7caea88ca7934f120091c116e2551b43
static bool AutomaticStorageAccessPermissionCanBeGranted(
diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
-index 3f60404936ba7559d810154bb9eac7aa0a831e27..f9be3dc1b384b4d4f975be83efaac10178e9b355 100644
+index 11a57adbb57b0adccf7ae491e7d7757f838bd9dc..e478244cedc2089fb99b3153d7493b7d36d72ea9 100644
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -347,14 +347,18 @@ void Navigator::GetAppName(nsAString& aAppName) const {
@@ -937,7 +968,7 @@ index 3f60404936ba7559d810154bb9eac7aa0a831e27..f9be3dc1b384b4d4f975be83efaac101
// 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
-@@ -2303,7 +2313,8 @@ bool Navigator::Webdriver() {
+@@ -2315,7 +2325,8 @@ bool Navigator::Webdriver() {
}
#endif
@@ -961,10 +992,10 @@ index 893947475fbb8688becb1c1495385e4048d4927d..dfb50acf689223fdab7ef6f42afbbd53
dom::MediaCapabilities* MediaCapabilities();
dom::MediaSession* MediaSession();
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
-index 67f8e934ce4be73461bf6ddb85ce6cffc55db149..fd7496044e81d82067774f6a83329e8af8c38ff3 100644
+index 7703ab18c104848eab9377769641d3b60e9bcf8e..3028fc5a7e6c54a7f4455f135e889d038eed378d 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
-@@ -9454,11 +9454,13 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -9528,11 +9528,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 +1010,7 @@ index 67f8e934ce4be73461bf6ddb85ce6cffc55db149..fd7496044e81d82067774f6a83329e8a
if (aType.EqualsLiteral("mousedown")) {
msg = eMouseDown;
} else if (aType.EqualsLiteral("mouseup")) {
-@@ -9484,6 +9486,12 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -9558,6 +9560,12 @@ nsresult nsContentUtils::SendMouseEvent(
msg = eMouseHitTest;
} else if (aType.EqualsLiteral("MozMouseExploreByTouch")) {
msg = eMouseExploreByTouch;
@@ -992,7 +1023,7 @@ index 67f8e934ce4be73461bf6ddb85ce6cffc55db149..fd7496044e81d82067774f6a83329e8a
} else {
return NS_ERROR_FAILURE;
}
-@@ -9494,7 +9502,14 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -9568,7 +9576,14 @@ nsresult nsContentUtils::SendMouseEvent(
Maybe<WidgetPointerEvent> pointerEvent;
Maybe<WidgetMouseEvent> mouseEvent;
@@ -1008,7 +1039,7 @@ index 67f8e934ce4be73461bf6ddb85ce6cffc55db149..fd7496044e81d82067774f6a83329e8a
MOZ_ASSERT(!aIsWidgetEventSynthesized,
"The event shouldn't be dispatched as a synthesized event");
if (MOZ_UNLIKELY(aIsWidgetEventSynthesized)) {
-@@ -9513,8 +9528,11 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -9587,8 +9602,11 @@ nsresult nsContentUtils::SendMouseEvent(
contextMenuKey ? WidgetMouseEvent::eContextMenuKey
: WidgetMouseEvent::eNormal);
}
@@ -1020,7 +1051,7 @@ index 67f8e934ce4be73461bf6ddb85ce6cffc55db149..fd7496044e81d82067774f6a83329e8a
mouseOrPointerEvent.pointerId = aIdentifier;
mouseOrPointerEvent.mModifiers = GetWidgetModifiers(aModifiers);
mouseOrPointerEvent.mButton = aButton;
-@@ -9527,6 +9545,8 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -9601,6 +9619,8 @@ nsresult nsContentUtils::SendMouseEvent(
mouseOrPointerEvent.mClickCount = aClickCount;
mouseOrPointerEvent.mFlags.mIsSynthesizedForTests = aIsDOMEventSynthesized;
mouseOrPointerEvent.mExitFrom = exitFrom;
@@ -1030,10 +1061,10 @@ index 67f8e934ce4be73461bf6ddb85ce6cffc55db149..fd7496044e81d82067774f6a83329e8a
nsPresContext* presContext = aPresShell->GetPresContext();
if (!presContext) return NS_ERROR_FAILURE;
diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
-index 84890a39e694af61974bb4c1d11b679a2d962340..90d9e672aeb47a878b3dd9c8dec4de6e8bf84846 100644
+index a1b96bce18e1904f4068057defa26142ebe8874b..f2fc14da57cf08139723980dedc33f2d3a9a431b 100644
--- a/dom/base/nsContentUtils.h
+++ b/dom/base/nsContentUtils.h
-@@ -3079,8 +3079,9 @@ class nsContentUtils {
+@@ -3080,8 +3080,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 +1077,7 @@ index 84890a39e694af61974bb4c1d11b679a2d962340..90d9e672aeb47a878b3dd9c8dec4de6e
static void FirePageShowEventForFrameLoaderSwap(
nsIDocShellTreeItem* aItem,
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
-index 5624bf11d000de505c51d4edb544f33f83c57c64..2468488e11d6dbeaf1528d233331076e9b693e0d 100644
+index c6c5833cd29ef041da348d4398513bab7ef2f9aa..424cc396bfc211bc7debb3df203cfa26da7a4c55 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -707,6 +707,26 @@ nsDOMWindowUtils::GetPresShellId(uint32_t* aPresShellId) {
@@ -1113,7 +1144,7 @@ index 5624bf11d000de505c51d4edb544f33f83c57c64..2468488e11d6dbeaf1528d233331076e
NS_IMETHODIMP
diff --git a/dom/base/nsDOMWindowUtils.h b/dom/base/nsDOMWindowUtils.h
-index c9975041127870048a339232eb2701bff47289cb..a53dbf0c6439e359ad75275b002bb6ee39767d26 100644
+index 4553ad5e7696055e861be5f840f8ce2bc54a5b29..1afc16325fcb63a3e510bdc387c8386eccf5d48b 100644
--- a/dom/base/nsDOMWindowUtils.h
+++ b/dom/base/nsDOMWindowUtils.h
@@ -94,7 +94,7 @@ class nsDOMWindowUtils final : public nsIDOMWindowUtils,
@@ -1126,7 +1157,7 @@ index c9975041127870048a339232eb2701bff47289cb..a53dbf0c6439e359ad75275b002bb6ee
MOZ_CAN_RUN_SCRIPT
nsresult SendTouchEventCommon(
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
-index d4f4148f660d128e8df9a7517369ae744b44d26d..bcc3f91e45e45394e826459d4594a0ba564e85b9 100644
+index 62c4bfb96dbb6e64aeadd9e45c296905b7956811..83f1e7303e2ebabfc73921d9bd27a255304a2ea4 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -1717,6 +1717,10 @@ Maybe<uint64_t> nsFocusManager::SetFocusInner(Element* aNewContent,
@@ -1172,7 +1203,7 @@ index d4f4148f660d128e8df9a7517369ae744b44d26d..bcc3f91e45e45394e826459d4594a0ba
// 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 b5cf9524c49361d297121731a8b2bfb77951fa6c..7bc2db9d1e1e795956a959f5aec4a341acf03e61 100644
+index 5e2844f6e65da71ca9e1dadb1a88a74ab45f485c..a8f033e17ffbc28261072d561c89914d4bd2e325 100644
--- a/dom/base/nsGlobalWindowOuter.cpp
+++ b/dom/base/nsGlobalWindowOuter.cpp
@@ -2511,10 +2511,16 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument,
@@ -1217,7 +1248,7 @@ index b5cf9524c49361d297121731a8b2bfb77951fa6c..7bc2db9d1e1e795956a959f5aec4a341
void nsGlobalWindowOuter::SetDocShell(nsDocShell* aDocShell) {
diff --git a/dom/base/nsGlobalWindowOuter.h b/dom/base/nsGlobalWindowOuter.h
-index 0aa48c94263f2ba99069780ccdcaf16735356318..48ad1b131b5fa307ac08503630f20bb9601ab019 100644
+index 1fbb506b07714f9ab2a2c9aff3683aa7fec4b156..42878f8f0c6365c7e2958a3b35fce0e7db9abfff 100644
--- a/dom/base/nsGlobalWindowOuter.h
+++ b/dom/base/nsGlobalWindowOuter.h
@@ -318,6 +318,7 @@ class nsGlobalWindowOuter final : public mozilla::dom::EventTarget,
@@ -1229,10 +1260,10 @@ index 0aa48c94263f2ba99069780ccdcaf16735356318..48ad1b131b5fa307ac08503630f20bb9
// Outer windows only.
virtual void EnsureSizeAndPositionUpToDate() override;
diff --git a/dom/base/nsINode.cpp b/dom/base/nsINode.cpp
-index af4e9644a89c00352e363560e90debada247cfcf..0756cc712d1e7b5b7ce592d95576ceb08c91702d 100644
+index 7b8da8b4a5e8de02d0d2e1befc8407da88fbf890..533f3bf77e1ef78dd231ac899e3d8032938ea812 100644
--- a/dom/base/nsINode.cpp
+++ b/dom/base/nsINode.cpp
-@@ -1499,6 +1499,61 @@ void nsINode::GetBoxQuadsFromWindowOrigin(const BoxQuadOptions& aOptions,
+@@ -1500,6 +1500,61 @@ void nsINode::GetBoxQuadsFromWindowOrigin(const BoxQuadOptions& aOptions,
mozilla::GetBoxQuadsFromWindowOrigin(this, aOptions, aResult, aRv);
}
@@ -1295,10 +1326,10 @@ index af4e9644a89c00352e363560e90debada247cfcf..0756cc712d1e7b5b7ce592d95576ceb0
DOMQuad& aQuad, const GeometryNode& aFrom,
const ConvertCoordinateOptions& aOptions, CallerType aCallerType,
diff --git a/dom/base/nsINode.h b/dom/base/nsINode.h
-index 6a982b3f278bf810dd582b3d5ebc33967323047e..4e991ef317c572c4a79c053d468f14df6c8880b5 100644
+index c3d84856e1bc92caf0437be312ccdbf7a2726ba5..d81c8e7152ca79b0fbb1ebee0f6f3aa40d0f34e2 100644
--- a/dom/base/nsINode.h
+++ b/dom/base/nsINode.h
-@@ -2417,6 +2417,10 @@ class nsINode : public mozilla::dom::EventTarget {
+@@ -2421,6 +2421,10 @@ class nsINode : public mozilla::dom::EventTarget {
nsTArray<RefPtr<DOMQuad>>& aResult,
ErrorResult& aRv);
@@ -1338,7 +1369,7 @@ index f32e21752d5013bf143eb45391ab9218debab08e..83763d2354dade2f8d2b7930ba18ae91
static bool DumpEnabled();
diff --git a/dom/chrome-webidl/BrowsingContext.webidl b/dom/chrome-webidl/BrowsingContext.webidl
-index 7923fcfb3e70aabddf343ab3ec2f25313bbd227e..cf02ce032d11d85a13bcf91e93e98882eaa9f7c7 100644
+index 6d150cc3ad77f694af5aa943c60eac37ba0733c0..9e68e18601cfb3e9e9c03b4bf0057c1a3d50a9d5 100644
--- a/dom/chrome-webidl/BrowsingContext.webidl
+++ b/dom/chrome-webidl/BrowsingContext.webidl
@@ -62,6 +62,26 @@ enum ForcedColorsOverride {
@@ -1368,7 +1399,7 @@ index 7923fcfb3e70aabddf343ab3ec2f25313bbd227e..cf02ce032d11d85a13bcf91e93e98882
/**
* Allowed overrides of platform/pref default behaviour for touch events.
*/
-@@ -226,6 +246,12 @@ interface BrowsingContext {
+@@ -228,6 +248,12 @@ interface BrowsingContext {
// Forced-colors simulation, for DevTools
[SetterThrows] attribute ForcedColorsOverride forcedColorsOverride;
@@ -1417,8 +1448,104 @@ index 1734429e8eeb155b742211ca58afcbeb73a8bf7c..15635a2e5c266f8085093a0d17288abe
if (mArgsType == FetchArgsType::WorkerFetch) {
auto& args = mArgs.as<WorkerFetchArgs>();
mFetchDriver->SetWorkerScript(args.mWorkerScript);
+diff --git a/dom/geolocation/Geolocation.cpp b/dom/geolocation/Geolocation.cpp
+index 70ce9ce97c6d0ccba8b4129c55079cf9122e5b17..1c503c68c2c0949cfdaa18a76a263a81807952e1 100644
+--- a/dom/geolocation/Geolocation.cpp
++++ b/dom/geolocation/Geolocation.cpp
+@@ -394,7 +394,10 @@ nsGeolocationRequest::Allow(JS::Handle<JS::Value> aChoices) {
+ return NS_OK;
+ }
+
+- if (mBehavior != SystemGeolocationPermissionBehavior::NoPrompt) {
++ RefPtr<nsGeolocationService> gs = nsGeolocationService::GetGeolocationService(
++ mLocator->GetBrowsingContext());
++
++ if (mBehavior != SystemGeolocationPermissionBehavior::NoPrompt && !gs->IsOverride()) {
+ // Asynchronously present the system dialog or open system preferences
+ // (RequestGeolocationPermissionFromUser will know which to do), and wait
+ // for the permission to change or the request to be canceled. If the
+@@ -426,8 +429,6 @@ nsGeolocationRequest::Allow(JS::Handle<JS::Value> aChoices) {
+ return NS_OK;
+ }
+
+- RefPtr<nsGeolocationService> gs = nsGeolocationService::GetGeolocationService(
+- mLocator->GetBrowsingContext());
+ bool canUseCache = false;
+ CachedPositionAndAccuracy lastPosition = gs->GetCachedPosition();
+ if (lastPosition.position) {
+@@ -710,11 +711,16 @@ NS_INTERFACE_MAP_END
+ NS_IMPL_ADDREF(nsGeolocationService)
+ NS_IMPL_RELEASE(nsGeolocationService)
+
+-nsresult nsGeolocationService::Init() {
++nsresult nsGeolocationService::Init(bool isOverride) {
+ if (!StaticPrefs::geo_enabled()) {
+ return NS_ERROR_FAILURE;
+ }
+
++ if (isOverride) {
++ mIsOverride = true;
++ mHigherAccuracy = true;
++ }
++
+ if (XRE_IsContentProcess()) {
+ return NS_OK;
+ }
+@@ -793,6 +799,10 @@ nsresult nsGeolocationService::Init() {
+ return NS_OK;
+ }
+
++bool nsGeolocationService::IsOverride() {
++ return mIsOverride;
++}
++
+ nsGeolocationService::~nsGeolocationService() = default;
+
+ NS_IMETHODIMP
+@@ -936,6 +946,10 @@ bool nsGeolocationService::HighAccuracyRequested() {
+ }
+
+ void nsGeolocationService::UpdateAccuracy(bool aForceHigh) {
++ if (mIsOverride) {
++ return;
++ }
++
+ bool highRequired = aForceHigh || HighAccuracyRequested();
+
+ if (XRE_IsContentProcess()) {
+diff --git a/dom/geolocation/Geolocation.h b/dom/geolocation/Geolocation.h
+index 57814242d551774e81403b7fdc20c795deadb625..c48c1b19a8d5499784ffb7b50d5e88e40c7b2a05 100644
+--- a/dom/geolocation/Geolocation.h
++++ b/dom/geolocation/Geolocation.h
+@@ -67,7 +67,7 @@ class nsGeolocationService final : public nsIGeolocationUpdate,
+
+ nsGeolocationService() = default;
+
+- nsresult Init();
++ nsresult Init(bool isOverride = false);
+
+ // Management of the Geolocation objects
+ void AddLocator(mozilla::dom::Geolocation* aLocator);
+@@ -92,6 +92,8 @@ class nsGeolocationService final : public nsIGeolocationUpdate,
+ void UpdateAccuracy(bool aForceHigh = false);
+ bool HighAccuracyRequested();
+
++ bool IsOverride();
++
+ private:
+ ~nsGeolocationService();
+
+@@ -118,6 +120,8 @@ class nsGeolocationService final : public nsIGeolocationUpdate,
+ // Nothing() if not being started, or a boolean reflecting the requested
+ // accuracy.
+ mozilla::Maybe<bool> mStarting;
++
++ bool mIsOverride = false;
+ };
+
+ namespace mozilla::dom {
diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp
-index 4d54d0925fce6d2f4f1657e6b37c670c916759a9..d70b048d70435cbdf2f0dab96ced33f685ffcb1d 100644
+index 5b0228d4a61dfe2b95e7a3ce016217007e8dee12..b753b0fceeec3278cb026d9137aafab5fb6ef968 100644
--- a/dom/html/HTMLInputElement.cpp
+++ b/dom/html/HTMLInputElement.cpp
@@ -64,6 +64,7 @@
@@ -1444,12 +1571,12 @@ index 4d54d0925fce6d2f4f1657e6b37c670c916759a9..d70b048d70435cbdf2f0dab96ced33f6
return NS_OK;
}
diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl
-index a1d930645ed1698e809ebce00d1601a1cdd99114..3a4a3ac8001bae356f42d2e08c2e5ddc8943c90b 100644
+index 64a2dad65911395ea7eb8ded3374ae6bdd31cf3c..e333c802f8a9232e58d963e05187c0a1b30948f5 100644
--- a/dom/interfaces/base/nsIDOMWindowUtils.idl
+++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
-@@ -381,6 +381,26 @@ interface nsIDOMWindowUtils : nsISupports {
- [optional] in long aButtons,
- [optional] in unsigned long aIdentifier);
+@@ -390,6 +390,26 @@ cenum AsyncEnabledOption : 8 {
+ ASYNC_ENABLED = 1
+ };
+ /**
+ * Playwright: a separate method to dispatch mouse event with a
@@ -1475,10 +1602,10 @@ index a1d930645ed1698e809ebce00d1601a1cdd99114..3a4a3ac8001bae356f42d2e08c2e5ddc
* touchstart, touchend, touchmove, and touchcancel
*
diff --git a/dom/ipc/BrowserChild.cpp b/dom/ipc/BrowserChild.cpp
-index 8895fa24ac3468bcd8d8c9e3c9b1cd2ec2e93c24..4cd6bdcee5e3c9dee934b352e826f88eb2301914 100644
+index 780550d573644bcfe4a9bc03243aa4559a62d979..9ed69194ef329aad1e8a3e2c06041a443e4bc6ba 100644
--- a/dom/ipc/BrowserChild.cpp
+++ b/dom/ipc/BrowserChild.cpp
-@@ -1739,6 +1739,21 @@ void BrowserChild::HandleRealMouseButtonEvent(const WidgetMouseEvent& aEvent,
+@@ -1744,6 +1744,21 @@ void BrowserChild::HandleRealMouseButtonEvent(const WidgetMouseEvent& aEvent,
if (postLayerization) {
postLayerization->Register();
}
@@ -1501,10 +1628,10 @@ index 8895fa24ac3468bcd8d8c9e3c9b1cd2ec2e93c24..4cd6bdcee5e3c9dee934b352e826f88e
mozilla::ipc::IPCResult BrowserChild::RecvNormalPriorityRealMouseButtonEvent(
diff --git a/dom/ipc/CoalescedMouseData.cpp b/dom/ipc/CoalescedMouseData.cpp
-index 31d56e5d4ea1f21b4b827c763d6e4b34432eeb7d..8537ae198faeec5fd5cced71995bbce9dccf90c4 100644
+index 83aa0d08839f6fa5a150e5791b9b717e5aa9e751..fc1e1140ac7c6cda8cf116027c2fc2898dbe9d4b 100644
--- a/dom/ipc/CoalescedMouseData.cpp
+++ b/dom/ipc/CoalescedMouseData.cpp
-@@ -71,6 +71,9 @@ bool CoalescedMouseData::CanCoalesce(const WidgetMouseEvent& aEvent,
+@@ -72,6 +72,9 @@ bool CoalescedMouseData::CanCoalesce(const WidgetMouseEvent& aEvent,
mCoalescedInputEvent->pointerId != aEvent.pointerId ||
mCoalescedInputEvent->mButton != aEvent.mButton ||
mCoalescedInputEvent->mButtons != aEvent.mButtons || mGuid != aGuid ||
@@ -1748,7 +1875,7 @@ index d5964b27e9c99af76fe3f4076322592a9370c2d0..da217e2c1fbd9ca02e50ff74dde02818
return aGlobalOrNull;
diff --git a/dom/security/nsCSPUtils.cpp b/dom/security/nsCSPUtils.cpp
-index 1b88690eb703c548e8d17416a6ff4ca64266406d..5d52a4a9afc97fa133ebab0c4dd9fdccfa4c21e8 100644
+index 8b68f22ae64d19165bf4b3c58aea8f5c237ba351..c3733bfa4ed550c98ab5f72c406cd6d01a621aca 100644
--- a/dom/security/nsCSPUtils.cpp
+++ b/dom/security/nsCSPUtils.cpp
@@ -24,6 +24,7 @@
@@ -1759,7 +1886,7 @@ index 1b88690eb703c548e8d17416a6ff4ca64266406d..5d52a4a9afc97fa133ebab0c4dd9fdcc
#include "mozilla/Assertions.h"
#include "mozilla/Components.h"
-@@ -135,6 +136,11 @@ void CSP_ApplyMetaCSPToDoc(mozilla::dom::Document& aDoc,
+@@ -136,6 +137,11 @@ void CSP_ApplyMetaCSPToDoc(mozilla::dom::Document& aDoc,
return;
}
@@ -1795,10 +1922,10 @@ index aee376e971ae01ac1e512c3920b115bfaf06afa8..1701311534bf77e6cd9bafc0e3a28361
* returned quads are further translated relative to the window
* origin -- which is not the layout origin. Further translation
diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
-index 76035deec8f20933800284211a07ff23e124c1b9..d46c22728c82c15ed6b5c9d3c57f8b8e2229212b 100644
+index 83cef5b52b8f5c3168cd1d59266b4149425647fd..a80e89ec26a7e049c8ed84687ba2cd49597be05f 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
-@@ -1079,7 +1079,7 @@ void PrefLanguagesChanged(const char* /* aPrefName */, void* /* aClosure */) {
+@@ -1082,7 +1082,7 @@ void PrefLanguagesChanged(const char* /* aPrefName */, void* /* aClosure */) {
AssertIsOnMainThread();
nsTArray<nsString> languages;
@@ -1807,7 +1934,7 @@ index 76035deec8f20933800284211a07ff23e124c1b9..d46c22728c82c15ed6b5c9d3c57f8b8e
RuntimeService* runtime = RuntimeService::GetService();
if (runtime) {
-@@ -1269,8 +1269,7 @@ bool RuntimeService::RegisterWorker(WorkerPrivate& aWorkerPrivate) {
+@@ -1272,8 +1272,7 @@ bool RuntimeService::RegisterWorker(WorkerPrivate& aWorkerPrivate) {
}
// The navigator overridden properties should have already been read.
@@ -1817,7 +1944,7 @@ index 76035deec8f20933800284211a07ff23e124c1b9..d46c22728c82c15ed6b5c9d3c57f8b8e
mNavigatorPropertiesLoaded = true;
}
-@@ -1898,6 +1897,13 @@ void RuntimeService::PropagateStorageAccessPermissionGranted(
+@@ -1901,6 +1900,13 @@ void RuntimeService::PropagateStorageAccessPermissionGranted(
}
}
@@ -1831,7 +1958,7 @@ index 76035deec8f20933800284211a07ff23e124c1b9..d46c22728c82c15ed6b5c9d3c57f8b8e
template <typename Func>
void RuntimeService::BroadcastAllWorkers(const Func& aFunc) {
AssertIsOnMainThread();
-@@ -2438,6 +2444,14 @@ void PropagateStorageAccessPermissionGrantedToWorkers(
+@@ -2451,6 +2457,14 @@ void PropagateStorageAccessPermissionGrantedToWorkers(
}
}
@@ -1847,10 +1974,10 @@ index 76035deec8f20933800284211a07ff23e124c1b9..d46c22728c82c15ed6b5c9d3c57f8b8e
MOZ_ASSERT(!NS_IsMainThread());
MOZ_ASSERT(aCx);
diff --git a/dom/workers/RuntimeService.h b/dom/workers/RuntimeService.h
-index b17efeafac1df3653ed9659e506c3d582044e2d0..3dc739c3b72980daf8a99190123920d0096da00c 100644
+index 6d75c6708bcb999dc1dc3b0172afa14136110bc6..809d0ef80ffe793beff5d3c11bf6bf7912385e99 100644
--- a/dom/workers/RuntimeService.h
+++ b/dom/workers/RuntimeService.h
-@@ -112,6 +112,8 @@ class RuntimeService final : public nsIObserver {
+@@ -115,6 +115,8 @@ class RuntimeService final : public nsIObserver {
void PropagateStorageAccessPermissionGranted(
const nsPIDOMWindowInner& aWindow);
@@ -1860,10 +1987,10 @@ index b17efeafac1df3653ed9659e506c3d582044e2d0..3dc739c3b72980daf8a99190123920d0
return mNavigatorProperties;
}
diff --git a/dom/workers/WorkerCommon.h b/dom/workers/WorkerCommon.h
-index c928f8292a29ce7b53dd45aec4abc107263b1c8f..e11fdf6159623b2232e51160efbcbb6df5b6ed89 100644
+index af8d36c0d72683712a3fee22661f8c3279e103db..6b3a967c9acde2c81ab38148d4b1ac120a4717a2 100644
--- a/dom/workers/WorkerCommon.h
+++ b/dom/workers/WorkerCommon.h
-@@ -47,6 +47,8 @@ void ResumeWorkersForWindow(const nsPIDOMWindowInner& aWindow);
+@@ -50,6 +50,8 @@ void ResumeWorkersForWindow(const nsPIDOMWindowInner& aWindow);
void PropagateStorageAccessPermissionGrantedToWorkers(
const nsPIDOMWindowInner& aWindow);
@@ -1873,10 +2000,10 @@ index c928f8292a29ce7b53dd45aec4abc107263b1c8f..e11fdf6159623b2232e51160efbcbb6d
bool IsWorkerGlobal(JSObject* global);
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
-index e19f398e2672a6ffe07f53c820dd53c3210dd8b1..8dba789845e910986d3240f317a8749a37cd50b6 100644
+index 06083bb8f9546be06fa0b5c78d4e005a1617e51b..1753896265c1701ad50425c565f8d44392d0afb9 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
-@@ -755,6 +755,18 @@ class UpdateContextOptionsRunnable final : public WorkerControlRunnable {
+@@ -738,6 +738,18 @@ class UpdateContextOptionsRunnable final : public WorkerControlRunnable {
}
};
@@ -1895,7 +2022,7 @@ index e19f398e2672a6ffe07f53c820dd53c3210dd8b1..8dba789845e910986d3240f317a8749a
class UpdateLanguagesRunnable final : public WorkerThreadRunnable {
nsTArray<nsString> mLanguages;
-@@ -2401,6 +2413,16 @@ void WorkerPrivate::UpdateContextOptions(
+@@ -2334,6 +2346,16 @@ void WorkerPrivate::UpdateContextOptions(
}
}
@@ -1912,7 +2039,7 @@ index e19f398e2672a6ffe07f53c820dd53c3210dd8b1..8dba789845e910986d3240f317a8749a
void WorkerPrivate::UpdateLanguages(const nsTArray<nsString>& aLanguages) {
AssertIsOnParentThread();
-@@ -6374,6 +6396,15 @@ void WorkerPrivate::UpdateContextOptionsInternal(
+@@ -5996,6 +6018,15 @@ void WorkerPrivate::UpdateContextOptionsInternal(
}
}
@@ -1929,10 +2056,10 @@ index e19f398e2672a6ffe07f53c820dd53c3210dd8b1..8dba789845e910986d3240f317a8749a
const nsTArray<nsString>& aLanguages) {
WorkerGlobalScope* globalScope = GlobalScope();
diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h
-index d887a9ca510730aef61d71c6f8b2e58c3762e5df..7ffe86c8ec792558e3d83e5b7ca8fccd39147385 100644
+index 15c819c84fa934e25517ac8f55fd39ef8ba46986..fe01e09abcf2315abe41a3d19418c4e0f8c7df2b 100644
--- a/dom/workers/WorkerPrivate.h
+++ b/dom/workers/WorkerPrivate.h
-@@ -453,6 +453,8 @@ class WorkerPrivate final
+@@ -457,6 +457,8 @@ class WorkerPrivate final
void UpdateContextOptionsInternal(JSContext* aCx,
const JS::ContextOptions& aContextOptions);
@@ -1941,7 +2068,7 @@ index d887a9ca510730aef61d71c6f8b2e58c3762e5df..7ffe86c8ec792558e3d83e5b7ca8fccd
void UpdateLanguagesInternal(const nsTArray<nsString>& aLanguages);
void UpdateJSWorkerMemoryParameterInternal(JSContext* aCx, JSGCParamKey key,
-@@ -1099,6 +1101,8 @@ class WorkerPrivate final
+@@ -1103,6 +1105,8 @@ class WorkerPrivate final
void UpdateContextOptions(const JS::ContextOptions& aContextOptions);
@@ -2019,10 +2146,10 @@ index 2d177b5aade6d158e9ae62d317d5155b72cdcf84..28af5d41eb06d4b33cd5f86484dc29c9
}
diff --git a/js/src/vm/DateTime.cpp b/js/src/vm/DateTime.cpp
-index a57b8fefa104f966393a99f5a81876b9a95f9743..adc42dd227e52643b06fb101170aeafb490c0acc 100644
+index cc366b4cc411ed8de972811237563edb376355e3..adf727cf80fadebce3be9301752dc1d0b9ee35b9 100644
--- a/js/src/vm/DateTime.cpp
+++ b/js/src/vm/DateTime.cpp
-@@ -185,6 +185,11 @@ void js::DateTimeInfo::internalResetTimeZone(ResetTimeZoneMode mode) {
+@@ -188,6 +188,11 @@ void js::DateTimeInfo::internalResetTimeZone(ResetTimeZoneMode mode) {
}
}
@@ -2034,7 +2161,7 @@ index a57b8fefa104f966393a99f5a81876b9a95f9743..adc42dd227e52643b06fb101170aeafb
void js::DateTimeInfo::updateTimeZone() {
MOZ_ASSERT(timeZoneStatus_ != TimeZoneStatus::Valid);
-@@ -528,10 +533,24 @@ void js::ResetTimeZoneInternal(ResetTimeZoneMode mode) {
+@@ -556,10 +561,24 @@ void js::ResetTimeZoneInternal(ResetTimeZoneMode mode) {
js::DateTimeInfo::resetTimeZone(mode);
}
@@ -2059,7 +2186,7 @@ index a57b8fefa104f966393a99f5a81876b9a95f9743..adc42dd227e52643b06fb101170aeafb
#if JS_HAS_INTL_API
# if defined(XP_WIN)
static bool IsOlsonCompatibleWindowsTimeZoneId(std::string_view tz) {
-@@ -749,6 +768,15 @@ static bool ReadTimeZoneLink(std::string_view tz,
+@@ -773,6 +792,15 @@ static bool ReadTimeZoneLink(std::string_view tz,
void js::DateTimeInfo::internalResyncICUDefaultTimeZone() {
#if JS_HAS_INTL_API
@@ -2075,7 +2202,7 @@ index a57b8fefa104f966393a99f5a81876b9a95f9743..adc42dd227e52643b06fb101170aeafb
// In the future we should not be setting a default ICU time zone at all,
// instead all accesses should go through the appropriate DateTimeInfo
// instance depending on the resist fingerprinting status. For now we return
-@@ -760,7 +788,6 @@ void js::DateTimeInfo::internalResyncICUDefaultTimeZone() {
+@@ -784,7 +812,6 @@ void js::DateTimeInfo::internalResyncICUDefaultTimeZone() {
if (const char* tzenv = std::getenv("TZ")) {
std::string_view tz(tzenv);
@@ -2084,19 +2211,19 @@ index a57b8fefa104f966393a99f5a81876b9a95f9743..adc42dd227e52643b06fb101170aeafb
# if defined(XP_WIN)
diff --git a/js/src/vm/DateTime.h b/js/src/vm/DateTime.h
-index e3cf82daa3749664aa8ced7e6553b8c6434dfec8..b45b49c4f3bbf12853c4afb12de21d99ac88d77b 100644
+index 7be5b49afdce8e761af05dfbd48f3cb22e9ce318..3899c7988959f11bbadd0c005462acb979823fd1 100644
--- a/js/src/vm/DateTime.h
+++ b/js/src/vm/DateTime.h
-@@ -65,6 +65,8 @@ enum class ResetTimeZoneMode : bool {
- */
- extern void ResetTimeZoneInternal(ResetTimeZoneMode mode);
+@@ -75,6 +75,8 @@ using TimeZoneIdentifierVector =
+ SystemAllocPolicy>;
+ #endif
+extern void SetTimeZoneOverrideInternal(std::string timeZone);
+
/**
* Stores date/time information, particularly concerning the current local
* time zone, and implements a small cache for daylight saving time offset
-@@ -253,6 +255,7 @@ class DateTimeInfo {
+@@ -258,6 +260,7 @@ class DateTimeInfo {
private:
// The method below should only be called via js::ResetTimeZoneInternal().
friend void js::ResetTimeZoneInternal(ResetTimeZoneMode);
@@ -2104,7 +2231,7 @@ index e3cf82daa3749664aa8ced7e6553b8c6434dfec8..b45b49c4f3bbf12853c4afb12de21d99
static void resetTimeZone(ResetTimeZoneMode mode) {
{
-@@ -352,6 +355,8 @@ class DateTimeInfo {
+@@ -362,6 +365,8 @@ class DateTimeInfo {
JS::UniqueChars locale_;
JS::UniqueTwoByteChars standardName_;
JS::UniqueTwoByteChars daylightSavingsName_;
@@ -2113,7 +2240,7 @@ index e3cf82daa3749664aa8ced7e6553b8c6434dfec8..b45b49c4f3bbf12853c4afb12de21d99
#else
// Restrict the data-time range to the minimum required time_t range as
// specified in POSIX. Most operating systems support 64-bit time_t
-@@ -367,6 +372,8 @@ class DateTimeInfo {
+@@ -377,6 +382,8 @@ class DateTimeInfo {
void internalResetTimeZone(ResetTimeZoneMode mode);
@@ -2123,12 +2250,12 @@ index e3cf82daa3749664aa8ced7e6553b8c6434dfec8..b45b49c4f3bbf12853c4afb12de21d99
void internalResyncICUDefaultTimeZone();
diff --git a/layout/base/GeometryUtils.cpp b/layout/base/GeometryUtils.cpp
-index 4bfd336ddcbee8004ac538ca7b7d8216d04a61c3..cd22351c4aeacea8afc9828972222aca1b3063bf 100644
+index 67673c5c306e7237613b0560c7b3f888bd6ad1b8..fe4a278dad4b1747b41b5a824978636a70a9dea8 100644
--- a/layout/base/GeometryUtils.cpp
+++ b/layout/base/GeometryUtils.cpp
@@ -23,6 +23,7 @@
#include "nsContentUtils.h"
- #include "nsCSSFrameConstructor.h"
+ #include "nsIFrame.h"
#include "nsLayoutUtils.h"
+#include "ChildIterator.h"
@@ -2174,10 +2301,10 @@ index 4bfd336ddcbee8004ac538ca7b7d8216d04a61c3..cd22351c4aeacea8afc9828972222aca
// No boxes to return
return;
diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
-index ced65c024dd6e09ee3ad997b6cc616828e0a4d31..4d4b0f06059001400679a00b8ace6b0d11a86c94 100644
+index 26119628ab4839858733ce39c6c9ef2970092b49..a9c4dbc4936755fd25b8528511e9a4c62695de89 100644
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
-@@ -12043,7 +12043,9 @@ bool PresShell::ComputeActiveness() const {
+@@ -12150,7 +12150,9 @@ bool PresShell::ComputeActiveness() const {
if (!browserChild->IsVisible()) {
MOZ_LOG(gLog, LogLevel::Debug,
(" > BrowserChild %p is not visible", browserChild));
@@ -2189,10 +2316,10 @@ index ced65c024dd6e09ee3ad997b6cc616828e0a4d31..4d4b0f06059001400679a00b8ace6b0d
// 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 ba5183bf1021f9a1113a7de013d60ab8d25fede1..3eb118e808d221395bf01d6d9c0702a005ac4308 100644
+index ee4e4b7e04f0f949b0afc7e8097711fcefe8b3c3..3af1d380d514b70392d1daaa4bc623afd7a570e6 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
-@@ -708,6 +708,10 @@ bool nsLayoutUtils::AllowZoomingForDocument(
+@@ -707,6 +707,10 @@ bool nsLayoutUtils::AllowZoomingForDocument(
!aDocument->GetPresShell()->AsyncPanZoomEnabled()) {
return false;
}
@@ -2203,7 +2330,7 @@ index ba5183bf1021f9a1113a7de013d60ab8d25fede1..3eb118e808d221395bf01d6d9c0702a0
// True if we allow zooming for all documents on this platform, or if we are
// in RDM.
BrowsingContext* bc = aDocument->GetBrowsingContext();
-@@ -9785,6 +9789,9 @@ void nsLayoutUtils::ComputeSystemFont(nsFont* aSystemFont,
+@@ -9772,6 +9776,9 @@ void nsLayoutUtils::ComputeSystemFont(nsFont* aSystemFont,
/* static */
bool nsLayoutUtils::ShouldHandleMetaViewport(const Document* aDocument) {
@@ -2214,10 +2341,10 @@ index ba5183bf1021f9a1113a7de013d60ab8d25fede1..3eb118e808d221395bf01d6d9c0702a0
return StaticPrefs::dom_meta_viewport_enabled() || (bc && bc->InRDMPane());
}
diff --git a/layout/style/GeckoBindings.h b/layout/style/GeckoBindings.h
-index a0560c5719310a7d6dbac232bacc1c50e8235c20..1046c095e8672aafcb3b0f053483e81393bca409 100644
+index 9527443c79077e0a728d78c3184ab7319f1c9efd..4e193ed114b4f70fb72bea928709fc7723f35b88 100644
--- a/layout/style/GeckoBindings.h
+++ b/layout/style/GeckoBindings.h
-@@ -597,6 +597,7 @@ float Gecko_MediaFeatures_GetResolution(const mozilla::dom::Document*);
+@@ -593,6 +593,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*);
@@ -2226,7 +2353,7 @@ index a0560c5719310a7d6dbac232bacc1c50e8235c20..1046c095e8672aafcb3b0f053483e813
const mozilla::dom::Document*);
mozilla::StylePrefersColorScheme Gecko_MediaFeatures_PrefersColorScheme(
diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp
-index d843c5952e273c64703af6e9f2528798e3ada307..50dcfd6839777dd0ed9f806dfac3e1a4b0102efa 100644
+index 21bcc8e890a0d3f3e86b5ea6eed79d017dd2fb76..eefc7d5c934f03b4a9213dafcbb65dd32b695622 100644
--- a/layout/style/nsMediaFeatures.cpp
+++ b/layout/style/nsMediaFeatures.cpp
@@ -268,11 +268,7 @@ bool Gecko_MediaFeatures_MatchesPlatform(StylePlatform aPlatform) {
@@ -2264,10 +2391,10 @@ index d843c5952e273c64703af6e9f2528798e3ada307..50dcfd6839777dd0ed9f806dfac3e1a4
return StylePrefersContrast::NoPreference;
}
diff --git a/netwerk/base/LoadInfo.cpp b/netwerk/base/LoadInfo.cpp
-index 5de4a03bc0ad25b68de169268b68ae2583cd8085..c5ba93ac46cbe6c566c005e059a685f257719244 100644
+index e5cf36273d5790de2c80acb42a6ee181bdb66f08..0523a37fc19b470e3817ae61c912a3dc54fc57a6 100644
--- a/netwerk/base/LoadInfo.cpp
+++ b/netwerk/base/LoadInfo.cpp
-@@ -798,7 +798,8 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
+@@ -801,7 +801,8 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
rhs.mHasInjectedCookieForCookieBannerHandling),
mSchemelessInput(rhs.mSchemelessInput),
mHttpsUpgradeTelemetry(rhs.mHttpsUpgradeTelemetry),
@@ -2277,7 +2404,7 @@ index 5de4a03bc0ad25b68de169268b68ae2583cd8085..c5ba93ac46cbe6c566c005e059a685f2
}
LoadInfo::LoadInfo(
-@@ -2758,4 +2759,16 @@ void LoadInfo::UpdateParentAddressSpaceInfo() {
+@@ -2778,4 +2779,16 @@ void LoadInfo::UpdateParentAddressSpaceInfo() {
}
}
@@ -2295,7 +2422,7 @@ index 5de4a03bc0ad25b68de169268b68ae2583cd8085..c5ba93ac46cbe6c566c005e059a685f2
+
} // namespace mozilla::net
diff --git a/netwerk/base/LoadInfo.h b/netwerk/base/LoadInfo.h
-index 4abce849f65b77800817e16cd2156247bd37f4cf..ac2aff894c4b31409437593d4d50bcae17a5ba0e 100644
+index 6547d451f3a764c8860dd0c19b5b490caecbf0af..feccce92e3769b8e9a3a4926cca9b85fccda86a5 100644
--- a/netwerk/base/LoadInfo.h
+++ b/netwerk/base/LoadInfo.h
@@ -455,6 +455,8 @@ class LoadInfo final : public nsILoadInfo {
@@ -2308,10 +2435,10 @@ index 4abce849f65b77800817e16cd2156247bd37f4cf..ac2aff894c4b31409437593d4d50bcae
// 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 9d3f613eecce65428fe8c29cca579e6f41fe8bcf..540e2608c37e58c6e1d124023ce185ddd71bd23d 100644
+index 551d89315243f4b515aa29d3a67eb23050ea9f0a..ac3a1ca6d846826c5d704d1b4abdaee55b834b0d 100644
--- a/netwerk/base/TRRLoadInfo.cpp
+++ b/netwerk/base/TRRLoadInfo.cpp
-@@ -1009,5 +1009,15 @@ TRRLoadInfo::GetFetchDestination(nsACString& aDestination) {
+@@ -1010,5 +1010,15 @@ TRRLoadInfo::GetFetchDestination(nsACString& aDestination) {
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -2328,10 +2455,10 @@ index 9d3f613eecce65428fe8c29cca579e6f41fe8bcf..540e2608c37e58c6e1d124023ce185dd
} // namespace net
} // namespace mozilla
diff --git a/netwerk/base/nsILoadInfo.idl b/netwerk/base/nsILoadInfo.idl
-index cd73003e5eb54c638225dc75f9e90f01ccb34192..197c0715593865a3a8b95bfc470f6364122c8f21 100644
+index f1b54736d9ee006292bf4c9cd0b3490d5ec8da66..257fda17a10f702cee39fb42ad69e0cd86ca95d1 100644
--- a/netwerk/base/nsILoadInfo.idl
+++ b/netwerk/base/nsILoadInfo.idl
-@@ -1683,4 +1683,6 @@ interface nsILoadInfo : nsISupports
+@@ -1686,4 +1686,6 @@ interface nsILoadInfo : nsISupports
return static_cast<mozilla::dom::UserNavigationInvolvement>(userNavigationInvolvement);
}
%}
@@ -2360,7 +2487,7 @@ 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 15b89ad43640cd7749c1b424762eb805210b4bd1..0044bba11ad2939e66a0e12ecbed598cdce1776c 100644
+index 1471432c1f1a47be5073ed01b746f1f13d3a0b47..585f81762e2bf51681d11c06c9459063121c34e9 100644
--- a/netwerk/ipc/DocumentLoadListener.cpp
+++ b/netwerk/ipc/DocumentLoadListener.cpp
@@ -185,6 +185,7 @@ static auto CreateDocumentLoadInfo(CanonicalBrowsingContext* aBrowsingContext,
@@ -2445,10 +2572,10 @@ 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 e266de8ccadf11f7e17b282299da0a0e8a88aa83..1abacf109d60f273c2ffdfcb6397a4a0cb82182a 100644
+index 1051d1e91c1ebf036f2e5db82a37636dd7cda4c3..3ef53c09442e24fb50308740950aa6d354703b7d 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
-@@ -688,11 +688,9 @@ nsresult nsHttpChannel::OnBeforeConnect() {
+@@ -685,11 +685,9 @@ nsresult nsHttpChannel::OnBeforeConnect() {
// SecurityInfo.sys.mjs
mLoadInfo->SetHstsStatus(isSecureURI);
@@ -2461,7 +2588,7 @@ index e266de8ccadf11f7e17b282299da0a0e8a88aa83..1abacf109d60f273c2ffdfcb6397a4a0
BYPASS_LOCAL_CACHE(mLoadFlags, LoadPreferCacheLoadOverBypass())) {
return NS_ERROR_OFFLINE;
}
-@@ -805,9 +803,7 @@ nsresult nsHttpChannel::MaybeUseHTTPSRRForUpgrade(bool aShouldUpgrade,
+@@ -802,9 +800,7 @@ nsresult nsHttpChannel::MaybeUseHTTPSRRForUpgrade(bool aShouldUpgrade,
return aStatus;
}
@@ -2472,7 +2599,7 @@ index e266de8ccadf11f7e17b282299da0a0e8a88aa83..1abacf109d60f273c2ffdfcb6397a4a0
if (mURI->SchemeIs("https") || aShouldUpgrade || !LoadUseHTTPSSVC() ||
forceOffline) {
-@@ -1266,15 +1262,14 @@ nsresult nsHttpChannel::ContinueConnect() {
+@@ -1263,15 +1259,14 @@ nsresult nsHttpChannel::ContinueConnect() {
"CORS preflight must have been finished by the time we "
"do the rest of ContinueConnect");
@@ -2490,7 +2617,7 @@ index e266de8ccadf11f7e17b282299da0a0e8a88aa83..1abacf109d60f273c2ffdfcb6397a4a0
BYPASS_LOCAL_CACHE(mLoadFlags, LoadPreferCacheLoadOverBypass())) {
return NS_ERROR_OFFLINE;
}
-@@ -1316,7 +1311,7 @@ nsresult nsHttpChannel::ContinueConnect() {
+@@ -1313,7 +1308,7 @@ nsresult nsHttpChannel::ContinueConnect() {
}
// We're about to hit the network. Don't if we're forced offline.
@@ -2499,7 +2626,7 @@ index e266de8ccadf11f7e17b282299da0a0e8a88aa83..1abacf109d60f273c2ffdfcb6397a4a0
return NS_ERROR_OFFLINE;
}
-@@ -1421,12 +1416,9 @@ void nsHttpChannel::SpeculativeConnect() {
+@@ -1418,12 +1413,9 @@ void nsHttpChannel::SpeculativeConnect() {
// don't speculate if we are offline, when doing http upgrade (i.e.
// websockets bootstrap), or if we can't do keep-alive (because then we
// couldn't reuse the speculative connection anyhow).
@@ -2513,7 +2640,7 @@ index e266de8ccadf11f7e17b282299da0a0e8a88aa83..1abacf109d60f273c2ffdfcb6397a4a0
return;
}
-@@ -4221,9 +4213,6 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
+@@ -4240,9 +4232,6 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
uint32_t cacheEntryOpenFlags;
bool offline = gIOService->IsOffline();
@@ -2523,7 +2650,7 @@ index e266de8ccadf11f7e17b282299da0a0e8a88aa83..1abacf109d60f273c2ffdfcb6397a4a0
bool maybeRCWN = false;
nsAutoCString cacheControlRequestHeader;
-@@ -4234,7 +4223,7 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
+@@ -4253,7 +4242,7 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
return NS_OK;
}
@@ -2532,7 +2659,7 @@ index e266de8ccadf11f7e17b282299da0a0e8a88aa83..1abacf109d60f273c2ffdfcb6397a4a0
if (offline || (mLoadFlags & INHIBIT_CACHING) || forceOffline) {
if (BYPASS_LOCAL_CACHE(mLoadFlags, LoadPreferCacheLoadOverBypass()) &&
!offline && !forceOffline) {
-@@ -7338,6 +7327,20 @@ void nsHttpChannel::MaybeStartDNSPrefetch() {
+@@ -7357,6 +7346,20 @@ void nsHttpChannel::MaybeStartDNSPrefetch() {
}
}
@@ -2554,10 +2681,10 @@ index e266de8ccadf11f7e17b282299da0a0e8a88aa83..1abacf109d60f273c2ffdfcb6397a4a0
nsHttpChannel::GetEncodedBodySize(uint64_t* aEncodedBodySize) {
if (mCacheEntry && !LoadCacheEntryIsWriteOnly()) {
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
-index fb16e050efea8d49cd315203bfc6a0779f34bb02..c7b5a9894cb993bd420a5407c1aefb4aacd35595 100644
+index 9d28bae2d270690517c11383abe4c4bcc0edda96..9087d345b1b63bdce0912abb0c880c50900a797b 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
-@@ -303,6 +303,10 @@ class nsHttpChannel final : public HttpBaseChannel,
+@@ -305,6 +305,10 @@ class nsHttpChannel final : public HttpBaseChannel,
void MaybeResolveProxyAndBeginConnect();
void MaybeStartDNSPrefetch();
@@ -2569,10 +2696,10 @@ index fb16e050efea8d49cd315203bfc6a0779f34bb02..c7b5a9894cb993bd420a5407c1aefb4a
// end server host name.
ProxyDNSStrategy GetProxyDNSStrategy();
diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp
-index 324d71a1567ef2acbd5e9a008961e39a11445419..e76d57612f318b7ad325196684e2e57660008a94 100644
+index ce2a868b9a915b98938518b6c935870f8169e0f7..e6d0a75bb3f5e8dea3f3e7f3448b553979860bd3 100644
--- a/parser/html/nsHtml5TreeOpExecutor.cpp
+++ b/parser/html/nsHtml5TreeOpExecutor.cpp
-@@ -1359,6 +1359,10 @@ void nsHtml5TreeOpExecutor::UpdateReferrerInfoFromMeta(
+@@ -1361,6 +1361,10 @@ void nsHtml5TreeOpExecutor::UpdateReferrerInfoFromMeta(
void nsHtml5TreeOpExecutor::AddSpeculationCSP(const nsAString& aCSP) {
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@@ -2669,7 +2796,7 @@ index 3d8837cdb38fb5b25abfb9e3e369ad6fe688706e..867ce2efaa10eaea87ffeeb2669cc5a7
constructor() {
this._policies = null;
diff --git a/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp b/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
-index ee7d7be5f76cb530407675a26bbf7bda5045cf44..f52ac58bfc1a68be92d354db7c523209cd5d47c7 100644
+index 52fa968554a88d1624bf9403b07781a8b42c93b6..2bd5162859dbc482361e2f6aaf5b7a732e9a5929 100644
--- a/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
+++ b/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
@@ -588,7 +588,7 @@ void PopulateLanguages() {
@@ -2682,7 +2809,7 @@ index ee7d7be5f76cb530407675a26bbf7bda5045cf44..f52ac58bfc1a68be92d354db7c523209
for (const auto& language : languages) {
diff --git a/toolkit/components/startup/nsAppStartup.cpp b/toolkit/components/startup/nsAppStartup.cpp
-index 316a86d5fcadba99918254ba132f363fb462cc3f..9dcd1b208ffd2d42db6c8ff52476a22791149eb4 100644
+index d8f0c072c8a52c2837d87fe749ccac6e3e59e48a..6837927e6a49a8ff4c9f709502bf8d8983bd735c 100644
--- a/toolkit/components/startup/nsAppStartup.cpp
+++ b/toolkit/components/startup/nsAppStartup.cpp
@@ -361,7 +361,7 @@ nsAppStartup::Quit(uint32_t aMode, int aExitCode, bool* aUserAllowedQuit) {
@@ -2710,10 +2837,10 @@ index c0d60b927542653ab9beee730ec2c07f4b3d911c..85c416315f567a5edf8cfc89262dd7a4
int32_t aMaxSelfProgress,
int32_t aCurTotalProgress,
diff --git a/toolkit/components/windowwatcher/nsWindowWatcher.cpp b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
-index 314efebc432db04b484650dfcb781dfd18fe3788..9f4db0f0f5d4fd5fecc744dd37fa6d9b6665e86f 100644
+index 622ff7fe214d22e1e5d5a561753cffe3e1eafe31..ac2f30e00a9a6d18c61d00b0d6d4bf41ff48af95 100644
--- a/toolkit/components/windowwatcher/nsWindowWatcher.cpp
+++ b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
-@@ -1880,7 +1880,11 @@ uint32_t nsWindowWatcher::CalculateChromeFlagsForContent(
+@@ -1882,7 +1882,11 @@ uint32_t nsWindowWatcher::CalculateChromeFlagsForContent(
// Open a minimal popup.
*aIsPopupRequested = true;
@@ -3017,10 +3144,10 @@ index 7098db301770ecb5b9a506d7caec89d5cf63384b..aff8d7562f8a3e595a077ce8e5910087
}
#endif
diff --git a/widget/MouseEvents.h b/widget/MouseEvents.h
-index 9f685cf741d94a48d552ca11f10759ea4c69969d..594a5c6549e5c0837f91de5b6ef76d6a35e45a5d 100644
+index 4f7ca9d0d460da3124ec8489917a9484661d5624..a04c3661b3e1e2be030ac6fe90041c81e653d26e 100644
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
-@@ -379,6 +379,9 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
+@@ -380,6 +380,9 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
// Otherwise, this must be 0.
uint32_t mClickCount = 0;
@@ -3030,7 +3157,7 @@ index 9f685cf741d94a48d552ca11f10759ea4c69969d..594a5c6549e5c0837f91de5b6ef76d6a
// Whether the event should ignore scroll frame bounds during dispatch.
bool mIgnoreRootScrollFrame = false;
-@@ -402,6 +405,7 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
+@@ -407,6 +410,7 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
mContextMenuTrigger = aEvent.mContextMenuTrigger;
mExitFrom = aEvent.mExitFrom;
mClickCount = aEvent.mClickCount;
@@ -3042,7 +3169,7 @@ diff --git a/widget/cocoa/NativeKeyBindings.mm b/widget/cocoa/NativeKeyBindings.
index 24b70173c2e8bb9be9fd6255984a70efe3b14099..75ac367a1c4bb44d4b68b5f4ecc6adf56dbd408e 100644
--- a/widget/cocoa/NativeKeyBindings.mm
+++ b/widget/cocoa/NativeKeyBindings.mm
-@@ -549,6 +549,13 @@
+@@ -549,6 +549,13 @@ void NativeKeyBindings::GetEditCommandsForTests(
break;
case KEY_NAME_INDEX_ArrowLeft:
if (aEvent.IsAlt()) {
@@ -3056,7 +3183,7 @@ index 24b70173c2e8bb9be9fd6255984a70efe3b14099..75ac367a1c4bb44d4b68b5f4ecc6adf5
break;
}
if (aEvent.IsMeta() || (aEvent.IsControl() && aEvent.IsShift())) {
-@@ -571,6 +578,13 @@
+@@ -571,6 +578,13 @@ void NativeKeyBindings::GetEditCommandsForTests(
break;
case KEY_NAME_INDEX_ArrowRight:
if (aEvent.IsAlt()) {
@@ -3070,7 +3197,7 @@ index 24b70173c2e8bb9be9fd6255984a70efe3b14099..75ac367a1c4bb44d4b68b5f4ecc6adf5
break;
}
if (aEvent.IsMeta() || (aEvent.IsControl() && aEvent.IsShift())) {
-@@ -593,6 +607,10 @@
+@@ -593,6 +607,10 @@ void NativeKeyBindings::GetEditCommandsForTests(
break;
case KEY_NAME_INDEX_ArrowUp:
if (aEvent.IsControl()) {
@@ -3081,7 +3208,7 @@ index 24b70173c2e8bb9be9fd6255984a70efe3b14099..75ac367a1c4bb44d4b68b5f4ecc6adf5
break;
}
if (aEvent.IsMeta()) {
-@@ -603,7 +621,7 @@
+@@ -603,7 +621,7 @@ void NativeKeyBindings::GetEditCommandsForTests(
!aEvent.IsShift()
? ToObjcSelectorPtr(@selector(moveToBeginningOfDocument:))
: ToObjcSelectorPtr(
@@ -3090,7 +3217,7 @@ index 24b70173c2e8bb9be9fd6255984a70efe3b14099..75ac367a1c4bb44d4b68b5f4ecc6adf5
aCommands);
break;
}
-@@ -630,6 +648,10 @@
+@@ -630,6 +648,10 @@ void NativeKeyBindings::GetEditCommandsForTests(
break;
case KEY_NAME_INDEX_ArrowDown:
if (aEvent.IsControl()) {
diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh
index ecc80310e2..fddf578548 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="cf7cbd32027884e36fa99df79bcd322925f65e48"
+BASE_REVISION="486de399887bc8fa8a69e2f194ebc9476589a08a"
diff --git a/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m b/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m
index 19582bb021..b89fa92d7e 100644
--- a/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m
+++ b/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m
@@ -186,9 +186,6 @@ const NSActivityOptions ActivityOptions =
NSURL *cookieFile = [NSURL fileURLWithPath:[NSString stringWithFormat:@"%@/cookie.db", _userDataDir]];
[configuration _setCookieStorageFile:cookieFile];
- NSURL *applicationCacheDirectory = [NSURL fileURLWithPath:[NSString stringWithFormat:@"%@/ApplicationCache", _userDataDir]];
- [configuration setApplicationCacheDirectory:applicationCacheDirectory];
-
NSURL *cacheStorageDirectory = [NSURL fileURLWithPath:[NSString stringWithFormat:@"%@/CacheStorage", _userDataDir]];
[configuration _setCacheStorageDirectory:cacheStorageDirectory];
diff --git a/browser_patches/webkit/embedder/Playwright/win/WinMain.cpp b/browser_patches/webkit/embedder/Playwright/win/WinMain.cpp
index 2261c2b810..8dde328f19 100644
--- a/browser_patches/webkit/embedder/Playwright/win/WinMain.cpp
+++ b/browser_patches/webkit/embedder/Playwright/win/WinMain.cpp
@@ -109,7 +109,6 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
auto configuration = adoptWK(WKWebsiteDataStoreConfigurationCreate());
if (g_options.userDataDir.length()) {
std::string profileFolder = toUTF8String(g_options.userDataDir, g_options.userDataDir.length());
- WKWebsiteDataStoreConfigurationSetApplicationCacheDirectory(configuration.get(), toWK(profileFolder + "\\ApplicationCache").get());
WKWebsiteDataStoreConfigurationSetNetworkCacheDirectory(configuration.get(), toWK(profileFolder + "\\Cache").get());
WKWebsiteDataStoreConfigurationSetCacheStorageDirectory(configuration.get(), toWK(profileFolder + "\\CacheStorage").get());
WKWebsiteDataStoreConfigurationSetIndexedDBDatabaseDirectory(configuration.get(), toWK(profileFolder + "\\Databases" + "\\IndexedDB").get());
diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff
index 19902f90d2..80d62c3967 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 7338af549e9fb377ea1505849b3a2bd3968d8fd7..873872e23a9c3002830600ba3318bb2249b43a00 100644
+index 1262273a2d71853caba03827fd454f1d4fa5124e..cd5bf3b6bc2268b8d50d2a7b8c344d4bda65ad30 100644
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
-@@ -1530,21 +1530,26 @@ set(JavaScriptCore_INSPECTOR_DOMAINS
+@@ -1561,21 +1561,26 @@ set(JavaScriptCore_INSPECTOR_DOMAINS
${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json
@@ -220,10 +220,10 @@ index 0cc2127c9c12c2d82dea9550bad73f4ffb99ba24..8ca65cc042d435cbc0e05dcc5c5dfc95
}
diff --git a/Source/JavaScriptCore/inspector/InspectorTarget.h b/Source/JavaScriptCore/inspector/InspectorTarget.h
-index 7c50a9f4c66c1695bd0e300e800c4e882eefdbd2..f530a8210c8ebe551cb2437f47e1a0bc8561e135 100644
+index 64b809b451dc6715ae7e762c702a32f1f8d722da..bfb39f616789786a1851b0a36635a8a2013ba6dc 100644
--- a/Source/JavaScriptCore/inspector/InspectorTarget.h
+++ b/Source/JavaScriptCore/inspector/InspectorTarget.h
-@@ -67,8 +67,12 @@ public:
+@@ -66,8 +66,12 @@ public:
virtual void connect(FrontendChannel::ConnectionType) = 0;
virtual void disconnect() = 0;
virtual void sendMessageToTargetBackend(const String&) = 0;
@@ -307,7 +307,7 @@ index 8240c23298f680abb6c379d02841c566fb287f1c..c9567e12c54c5775af6d52e59663e18b
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 827cbaabc98f5571ee007e99fcb7fd987a443f17..c98d8ba1f5ab72ae5f23555ea7518a85c1b77bea 100644
+index bc315cb8bd326b10a883aaeace698f531d3d24ca..580cf5987e1652d757227b4c8c293427dc0bd9ac 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
@@ -345,7 +345,7 @@ index 827cbaabc98f5571ee007e99fcb7fd987a443f17..c98d8ba1f5ab72ae5f23555ea7518a85
void InspectorTargetAgent::sendMessageFromTargetToFrontend(const String& targetId, const String& message)
{
ASSERT_WITH_MESSAGE(m_targets.get(targetId), "Sending a message from an untracked target to the frontend.");
-@@ -147,7 +175,17 @@ void InspectorTargetAgent::targetDestroyed(InspectorTarget& target)
+@@ -149,7 +177,17 @@ void InspectorTargetAgent::targetDestroyed(InspectorTarget& target)
if (!m_isConnected)
return;
@@ -866,7 +866,7 @@ index 96af27ece2ac200e11c4311b3ca0d9d3b5a048da..3168f7806fcbdabec07acc5e304bae1e
],
"events": [
diff --git a/Source/JavaScriptCore/inspector/protocol/Page.json b/Source/JavaScriptCore/inspector/protocol/Page.json
-index 3d032713a7f3bb9645bfc7d42455a0494b5376c0..913dda5e90b86cc5f8e4ca6881f6db57520a7f66 100644
+index a9a991e82e5354f5f98949ce6d4a61ede0aba83f..2b37089c853e4e0aa430532e6c7db237d588b29f 100644
--- a/Source/JavaScriptCore/inspector/protocol/Page.json
+++ b/Source/JavaScriptCore/inspector/protocol/Page.json
@@ -20,7 +20,15 @@
@@ -1119,18 +1119,8 @@ index 3d032713a7f3bb9645bfc7d42455a0494b5376c0..913dda5e90b86cc5f8e4ca6881f6db57
{
"name": "frameDetached",
"description": "Fired when frame has been detached from its parent.",
-@@ -381,7 +540,8 @@
- "targetTypes": ["page"],
- "parameters": [
- { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has scheduled a navigation." },
-- { "name": "delay", "type": "number", "description": "Delay (in seconds) until the navigation is scheduled to begin. The navigation is not guaranteed to start." }
-+ { "name": "delay", "type": "number", "description": "Delay (in seconds) until the navigation is scheduled to begin. The navigation is not guaranteed to start." },
-+ { "name": "targetIsCurrentFrame", "type": "boolean", "description": "Whether the naviation will happen in the same frame." }
- ]
- },
- {
-@@ -392,6 +552,22 @@
- { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has cleared its scheduled navigation." }
+@@ -361,6 +520,22 @@
+ { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has been detached." }
]
},
+ {
@@ -1152,7 +1142,7 @@ index 3d032713a7f3bb9645bfc7d42455a0494b5376c0..913dda5e90b86cc5f8e4ca6881f6db57
{
"name": "defaultUserPreferencesDidChange",
"description": "Fired when the default value of a user preference changes at the system level.",
-@@ -399,6 +575,42 @@
+@@ -368,6 +543,42 @@
"parameters": [
{ "name": "preferences", "type": "array", "items": { "$ref": "UserPreference" }, "description": "List of user preferences that can be overriden and their new system (default) values." }
]
@@ -1623,13 +1613,13 @@ index 0000000000000000000000000000000000000000..73a4e53ced3acc41316bb8d4c787306d
+ ]
+}
diff --git a/Source/JavaScriptCore/inspector/protocol/Target.json b/Source/JavaScriptCore/inspector/protocol/Target.json
-index 52920cded24a9c6b0ef6fb4e518664955db4f9fa..bbbabc4e7259088b9404e8cc07eecd6f45077da0 100644
+index a861a83b87e4e7752e547b7070ec1ef26e1cc3e5..16d6ec26034758e127dcb599f5cb170823182470 100644
--- a/Source/JavaScriptCore/inspector/protocol/Target.json
+++ b/Source/JavaScriptCore/inspector/protocol/Target.json
@@ -10,7 +10,7 @@
"properties": [
{ "name": "targetId", "type": "string", "description": "Unique identifier for the target." },
- { "name": "type", "type": "string", "enum": ["page", "service-worker", "worker"] },
+ { "name": "type", "type": "string", "enum": ["page", "frame", "service-worker", "worker"] },
- { "name": "isProvisional", "type": "boolean", "optional": true, "description": "Whether this is a provisional page target." },
+ { "name": "isProvisional", "type": "boolean", "optional": true, "description": "True value indicates that this is a provisional page target i.e. Such target may be created when current page starts cross-origin navigation. Eventually each provisional target is either committed and swaps with the current target or gets destroyed, e.g. in case of load request failure." },
{ "name": "isPaused", "type": "boolean", "optional": true, "description": "Whether the target is paused on start and has to be explicitely resumed by inspector." }
@@ -1680,10 +1670,10 @@ index ce394be47840853ba08066ebbd1d909fad1f602e..bfd82684410312890c1e112aced16be7
private:
enum ArgumentRequirement { ArgumentRequired, ArgumentNotRequired };
diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt
-index cb79da46457d2aeddd6c663eeef4d791ed70b0c3..54ca17420dc79c6b763b9da04282098902be0c2d 100644
+index 5a6fca7b0bef95d05511baf41deff8841d872e04..1f59d06c9a89efe248c3b172c4324d95608e26bb 100644
--- a/Source/ThirdParty/libwebrtc/CMakeLists.txt
+++ b/Source/ThirdParty/libwebrtc/CMakeLists.txt
-@@ -1803,6 +1803,14 @@ list(APPEND webrtc_SOURCES
+@@ -1796,6 +1796,14 @@ list(APPEND webrtc_SOURCES
Source/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/modulewrapper.cc
)
@@ -1698,7 +1688,7 @@ index cb79da46457d2aeddd6c663eeef4d791ed70b0c3..54ca17420dc79c6b763b9da042820989
if (WTF_CPU_X86_64 OR WTF_CPU_X86)
list(APPEND webrtc_SOURCES
Source/webrtc/common_audio/fir_filter_sse.cc
-@@ -2395,6 +2403,14 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE
+@@ -2387,6 +2395,14 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE
Source/webrtc/modules/video_coding/include
)
@@ -1727,13 +1717,13 @@ index 0c5c8e689bdddec766f9de5bffd4444a5e068d77..330dd1f585e530722178c65c883641a2
// FIXME: Set WEBRTC_USE_BUILTIN_ISAC_FIX and WEBRTC_USE_BUILTIN_ISAC_FLOAT for iOS and Mac
diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp
-index 30585bd097ec1e57d0c5f87180bf59a71f0192df..95b7a60b3cc66704c51fd6a6ce4e32582a089f9f 100644
+index 001fe26ea1ce01ec7d8a605b706db20ed9bf36f6..8906ae2fa79dd94378c61cf10df4a16e9c5e8642 100644
--- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp
+++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp
-@@ -404,3 +404,16 @@ __ZTVN6webrtc14NetworkManagerE
- __ZTVN6webrtc17AsyncPacketSocketE
- __ZTVN6webrtc18NetworkManagerBaseE
- __ZNK6webrtc9IPAddressneERKS0_
+@@ -411,3 +411,16 @@ __ZN6webrtc11EnableMediaERNS_33PeerConnectionFactoryDependenciesE
+ __ZN6webrtc18BasicPortAllocatorC1ERKNS_11EnvironmentEPNS_14NetworkManagerEPNS_19PacketSocketFactoryEPNS_14TurnCustomizerEPNS_25RelayPortFactoryInterfaceENSt3__110unique_ptrINS_44LocalNetworkAccessPermissionFactoryInterfaceENSC_14default_deleteISE_EEEE
+ __ZNK6webrtc12IceCandidate8ToStringEv
+ __ZN6webrtc12IceCandidate6CreateENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEEiS5_PNS_13SdpParseErrorE
+__ZN8mkvmuxer11SegmentInfo4InitEv
+__ZN8mkvmuxer9MkvWriterC1EP7__sFILE
+_ARGBToI420
@@ -1748,7 +1738,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 30e52a5829c1c56ebb42cbabc97a5e78d29629e2..f45f24ddf74669d492ae882778bc16698123474a 100644
+index 94a27d3d4cebbbbc79e0b5c263ecabca8eae23de..3be6c41a824cb82aaea89bc2934c8431cc75ba94 100644
--- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
+++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
@@ -56,6 +56,20 @@
@@ -1770,9 +1760,9 @@ index 30e52a5829c1c56ebb42cbabc97a5e78d29629e2..f45f24ddf74669d492ae882778bc1669
+/* End PBXAggregateTarget section */
+
/* 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, ); }; };
-@@ -5637,6 +5651,13 @@
+ 2938424F2E258DF1006DF6A9 /* aesni-gcm-x86_64-apple.S in Sources */ = {isa = PBXBuildFile; fileRef = 293841D82E258DF1006DF6A9 /* aesni-gcm-x86_64-apple.S */; };
+ 293842512E258DF1006DF6A9 /* ghash-x86_64-apple.S in Sources */ = {isa = PBXBuildFile; fileRef = 293842002E258DF1006DF6A9 /* ghash-x86_64-apple.S */; };
+@@ -5692,6 +5706,13 @@
remoteGlobalIDString = DDF30D0527C5C003006A526F;
remoteInfo = absl;
};
@@ -1786,7 +1776,7 @@ index 30e52a5829c1c56ebb42cbabc97a5e78d29629e2..f45f24ddf74669d492ae882778bc1669
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
-@@ -24140,6 +24161,7 @@
+@@ -24341,6 +24362,7 @@
);
dependencies = (
410B3827292B73E90003E515 /* PBXTargetDependency */,
@@ -1794,7 +1784,7 @@ index 30e52a5829c1c56ebb42cbabc97a5e78d29629e2..f45f24ddf74669d492ae882778bc1669
DD2E76E827C6B69A00F2A74C /* PBXTargetDependency */,
CDEBB4CC24C01AB400ADBD44 /* PBXTargetDependency */,
411ED040212E0811004320BA /* PBXTargetDependency */,
-@@ -24233,6 +24255,7 @@
+@@ -24434,6 +24456,7 @@
4460B8B92B155B6A00392062 /* vp9_qp_parser_fuzzer */,
444A6EF02AEADFC9005FE121 /* vp9_replay_fuzzer */,
44945C512B9BA1C300447FFD /* webm_fuzzer */,
@@ -1802,7 +1792,7 @@ index 30e52a5829c1c56ebb42cbabc97a5e78d29629e2..f45f24ddf74669d492ae882778bc1669
);
};
/* End PBXProject section */
-@@ -24336,6 +24359,23 @@
+@@ -24537,6 +24560,23 @@
shellPath = /bin/sh;
shellScript = "[ -z \"${WK_DERIVED_SDK_HEADERS_DIR}\" -o -d \"${WK_DERIVED_SDK_HEADERS_DIR}\" ] && touch \"${SCRIPT_OUTPUT_FILE_0}\"\n";
};
@@ -1826,7 +1816,7 @@ index 30e52a5829c1c56ebb42cbabc97a5e78d29629e2..f45f24ddf74669d492ae882778bc1669
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
-@@ -27359,6 +27399,11 @@
+@@ -27611,6 +27651,11 @@
target = DDF30D0527C5C003006A526F /* absl */;
targetProxy = DD2E76E727C6B69A00F2A74C /* PBXContainerItemProxy */;
};
@@ -1838,7 +1828,7 @@ index 30e52a5829c1c56ebb42cbabc97a5e78d29629e2..f45f24ddf74669d492ae882778bc1669
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
-@@ -28126,6 +28171,27 @@
+@@ -28378,6 +28423,27 @@
};
name = Production;
};
@@ -1866,7 +1856,7 @@ index 30e52a5829c1c56ebb42cbabc97a5e78d29629e2..f45f24ddf74669d492ae882778bc1669
FB39D0711200ED9200088E69 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */;
-@@ -28508,6 +28574,16 @@
+@@ -28760,6 +28826,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
@@ -1884,7 +1874,7 @@ index 30e52a5829c1c56ebb42cbabc97a5e78d29629e2..f45f24ddf74669d492ae882778bc1669
isa = XCConfigurationList;
buildConfigurations = (
diff --git a/Source/ThirdParty/skia/CMakeLists.txt b/Source/ThirdParty/skia/CMakeLists.txt
-index 8675218a87262162d91bf992d00a1eecaf83f289..7dfe83ab3f9dd97bb13721f7034b4963efce3a30 100644
+index 462e0e6993c543ed3c264ff12347ed703e3787cf..6422f9369f496ff9045abc7eac8f511c6c82f19b 100644
--- a/Source/ThirdParty/skia/CMakeLists.txt
+++ b/Source/ThirdParty/skia/CMakeLists.txt
@@ -10,6 +10,8 @@ if (USE_SKIA_ENCODERS)
@@ -1896,7 +1886,7 @@ index 8675218a87262162d91bf992d00a1eecaf83f289..7dfe83ab3f9dd97bb13721f7034b4963
if (ANDROID)
find_package(EXPAT REQUIRED)
endif ()
-@@ -958,6 +960,7 @@ endif ()
+@@ -960,6 +962,7 @@ endif ()
target_link_libraries(Skia PRIVATE
JPEG::JPEG
PNG::PNG
@@ -1905,7 +1895,7 @@ 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 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf13ef04d3c 100644
+index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca8b143e0d 100644
--- a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
+++ b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
@@ -540,6 +540,7 @@ ApplePayEnabled:
@@ -1939,7 +1929,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
default: false
BlockFontServiceInWebContentSandbox:
-@@ -2051,6 +2049,7 @@ CrossOriginEmbedderPolicyEnabled:
+@@ -2080,6 +2078,7 @@ CrossOriginEmbedderPolicyEnabled:
WebCore:
default: false
@@ -1947,7 +1937,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
CrossOriginOpenerPolicyEnabled:
type: bool
status: stable
-@@ -2124,6 +2123,7 @@ DOMAudioSessionFullEnabled:
+@@ -2153,6 +2152,7 @@ DOMAudioSessionFullEnabled:
WebCore:
default: false
@@ -1955,7 +1945,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
DOMPasteAccessRequestsEnabled:
type: bool
status: internal
-@@ -2135,7 +2135,7 @@ DOMPasteAccessRequestsEnabled:
+@@ -2164,7 +2164,7 @@ DOMPasteAccessRequestsEnabled:
default: false
WebKit:
"PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(VISION)": true
@@ -1964,7 +1954,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
WebCore:
default: false
-@@ -2201,10 +2201,10 @@ DataListElementEnabled:
+@@ -2230,10 +2230,10 @@ DataListElementEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -1977,7 +1967,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
default: false
sharedPreferenceForWebProcess: true
-@@ -2217,7 +2217,7 @@ DataTransferItemsEnabled:
+@@ -2246,7 +2246,7 @@ DataTransferItemsEnabled:
WebKitLegacy:
default: true
WebKit:
@@ -1986,7 +1976,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
default: false
WebCore:
default: false
-@@ -2460,7 +2460,7 @@ DirectoryUploadEnabled:
+@@ -2489,7 +2489,7 @@ DirectoryUploadEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -1995,7 +1985,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
default: false
WebCore:
default: false
-@@ -2999,10 +2999,10 @@ FullScreenEnabled:
+@@ -3057,10 +3057,10 @@ FullScreenEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -2008,7 +1998,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
default: false
sharedPreferenceForWebProcess: true
-@@ -3639,7 +3639,7 @@ InputTypeColorEnabled:
+@@ -3737,7 +3737,7 @@ InputTypeColorEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -2017,7 +2007,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
default: false
WebCore:
default: false
-@@ -3672,7 +3672,7 @@ InputTypeDateEnabled:
+@@ -3770,7 +3770,7 @@ InputTypeDateEnabled:
"PLATFORM(IOS_FAMILY)": true
default: false
WebKit:
@@ -2026,7 +2016,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
default: false
WebCore:
default: false
-@@ -3688,7 +3688,7 @@ InputTypeDateTimeLocalEnabled:
+@@ -3786,7 +3786,7 @@ InputTypeDateTimeLocalEnabled:
"PLATFORM(IOS_FAMILY)": true
default: false
WebKit:
@@ -2035,7 +2025,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
default: false
WebCore:
default: false
-@@ -3720,7 +3720,7 @@ InputTypeTimeEnabled:
+@@ -3818,7 +3818,7 @@ InputTypeTimeEnabled:
"PLATFORM(IOS_FAMILY)": true
default: false
WebKit:
@@ -2044,7 +2034,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
default: false
WebCore:
default: false
-@@ -3781,6 +3781,7 @@ InspectorMaximumResourcesContentSize:
+@@ -3879,6 +3879,7 @@ InspectorMaximumResourcesContentSize:
"PLATFORM(WPE)": 50
default: 200
@@ -2052,7 +2042,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
InspectorStartsAttached:
type: bool
status: embedder
-@@ -3788,7 +3789,7 @@ InspectorStartsAttached:
+@@ -3886,7 +3887,7 @@ InspectorStartsAttached:
exposed: [ WebKit ]
defaultValue:
WebKit:
@@ -2061,16 +2051,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
InspectorSupportsShowingCertificate:
type: bool
-@@ -5755,7 +5756,7 @@ PermissionsAPIEnabled:
- WebKitLegacy:
- default: false
- WebKit:
-- "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)" : true
-+ "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)" : true
- default: false
- WebCore:
- default: false
-@@ -5850,7 +5851,7 @@ PointerLockEnabled:
+@@ -5980,7 +5981,7 @@ PointerLockEnabled:
"PLATFORM(IOS_FAMILY)": false
default: true
WebCore:
@@ -2079,7 +2060,7 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
PointerLockOptionsEnabled:
type: bool
-@@ -6437,7 +6438,7 @@ ScreenOrientationAPIEnabled:
+@@ -6568,7 +6569,7 @@ ScreenOrientationAPIEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -2089,10 +2070,10 @@ index 1d15bce935b114c9c4634cfa127ccaf1ada207e2..63ec486759061e928bbd19bb630a6cf1
default: false
sharedPreferenceForWebProcess: true
diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h
-index 560f68add67cfce8bc5fb7b90b80160cb4019958..9bc9c8d168411c8f1bf0fe55a149a81e57c10b8e 100644
+index 8304087cdf984c0bf5b48a638b4ae9ac85aa2f0e..96761b8bde2865a0b4a673febaf8b48b74dc421e 100644
--- a/Source/WTF/wtf/PlatformEnable.h
+++ b/Source/WTF/wtf/PlatformEnable.h
-@@ -381,7 +381,7 @@
+@@ -385,7 +385,7 @@
// ORIENTATION_EVENTS should never get enabled on Desktop, only Mobile.
#if !defined(ENABLE_ORIENTATION_EVENTS)
@@ -2111,10 +2092,10 @@ index 560f68add67cfce8bc5fb7b90b80160cb4019958..9bc9c8d168411c8f1bf0fe55a149a81e
#if !defined(ENABLE_TOUCH_ACTION_REGIONS)
diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h
-index 02a85989ff83d25a2fd7bfeec0de13c3065ce45f..0badbfca93d010d259dba4d5f98fc902143d64e2 100644
+index a11439b16d2427d9a2ecbf4d2bf29f99bb1bafb0..69f1fd6c1b0f5e6b439b2313d5563af981fcfcab 100644
--- a/Source/WTF/wtf/PlatformEnableCocoa.h
+++ b/Source/WTF/wtf/PlatformEnableCocoa.h
-@@ -779,7 +779,7 @@
+@@ -783,7 +783,7 @@
#endif
#if !defined(ENABLE_SEC_ITEM_SHIM)
@@ -2124,10 +2105,10 @@ index 02a85989ff83d25a2fd7bfeec0de13c3065ce45f..0badbfca93d010d259dba4d5f98fc902
#if !defined(ENABLE_SERVER_PRECONNECT)
diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
-index 1bddb4666d19509a6e9ac202816dfa1ccbfcf192..33db65976aab8d615ded3c2a5aea0c12e818af39 100644
+index bfaf9b0b2f4a95af1cea02e180685cbbbe743f9e..a5f63c3b8f2efd4f8bb00d44523e08db9858377f 100644
--- a/Source/WTF/wtf/PlatformHave.h
+++ b/Source/WTF/wtf/PlatformHave.h
-@@ -1063,7 +1063,8 @@
+@@ -1069,7 +1069,8 @@
#endif
#if PLATFORM(MAC)
@@ -2137,26 +2118,13 @@ index 1bddb4666d19509a6e9ac202816dfa1ccbfcf192..33db65976aab8d615ded3c2a5aea0c12
#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
+index f507b6b97236e9e2e01d2b007c74b404e0ced2cb..ccd616e75835a389de17c5fc8314e2ce225635ff 100644
--- a/Source/WTF/wtf/unicode/UTF8Conversion.h
+++ b/Source/WTF/wtf/unicode/UTF8Conversion.h
@@ -27,6 +27,11 @@
- #include <wtf/text/LChar.h>
+ #include <wtf/text/Latin1Character.h>
+// Can be probably removed when we drop Debian 11.
+#ifdef Success
@@ -2167,10 +2135,10 @@ index 007b8fe3292f326504013be8198ae020f7aacf35..1c722c473732ffe05fdb61010fa4417e
namespace Unicode {
diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
-index 770b335aea2c8d808bb68e2a6950d6bff3b50dc9..b203428e87c725facdaab7dba01d0e1ced72b09d 100644
+index 0f68d7a3ff54d2bb7ddb9b4e21436a323a782367..9d7134d62756baa12f1428d6b627b12d383f76b4 100644
--- a/Source/WebCore/DerivedSources.make
+++ b/Source/WebCore/DerivedSources.make
-@@ -1226,6 +1226,10 @@ JS_BINDING_IDLS := \
+@@ -1240,6 +1240,10 @@ JS_BINDING_IDLS := \
$(WebCore)/dom/SubscriberCallback.idl \
$(WebCore)/dom/SubscriptionObserver.idl \
$(WebCore)/dom/SubscriptionObserverCallback.idl \
@@ -2181,7 +2149,7 @@ index 770b335aea2c8d808bb68e2a6950d6bff3b50dc9..b203428e87c725facdaab7dba01d0e1c
$(WebCore)/dom/Text.idl \
$(WebCore)/dom/TextDecoder.idl \
$(WebCore)/dom/TextDecoderStream.idl \
-@@ -1836,9 +1840,6 @@ JS_BINDING_IDLS := \
+@@ -1852,9 +1856,6 @@ JS_BINDING_IDLS := \
ADDITIONAL_BINDING_IDLS = \
DocumentTouch.idl \
GestureEvent.idl \
@@ -2192,10 +2160,10 @@ index 770b335aea2c8d808bb68e2a6950d6bff3b50dc9..b203428e87c725facdaab7dba01d0e1c
vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS)
diff --git a/Source/WebCore/Modules/geolocation/Geolocation.cpp b/Source/WebCore/Modules/geolocation/Geolocation.cpp
-index 1bcfaa96ad38e82973150e8292b6d9f7fc40279a..55cdec501f3de05dc7088cdc6d45e38cdde75b01 100644
+index 0896a8a08f0548a1758623b926bbfce683d6795c..354495b7ca6d4663d87473b34e113e193d15fffd 100644
--- a/Source/WebCore/Modules/geolocation/Geolocation.cpp
+++ b/Source/WebCore/Modules/geolocation/Geolocation.cpp
-@@ -374,8 +374,9 @@ bool Geolocation::shouldBlockGeolocationRequests()
+@@ -376,8 +376,9 @@ bool Geolocation::shouldBlockGeolocationRequests()
bool isSecure = SecurityOrigin::isSecure(document->url()) || document->isSecureContext();
bool isLocalOrigin = securityOrigin()->isLocal();
@@ -2255,13 +2223,13 @@ index 72b2846f2c82818fc9a64fd90b7cba0c0601e15f..22277ab6c3233f040852d9daf9becf7b
elseif (USE_SKIA)
list(APPEND WebCore_SOURCES
diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
-index ef1d576a4a7747af1ee45a9a172b5ac2d4efed20..e5d8b229f4e6a76ceb86a86bdd1f01de66b73a29 100644
+index 40e8b4e9d5ceb5d499acf8e5804e6357cf3e15e8..a4f037ca12093f0c5b72efeb1e36fa1649649453 100644
--- a/Source/WebCore/SourcesCocoa.txt
+++ b/Source/WebCore/SourcesCocoa.txt
-@@ -732,3 +732,9 @@ testing/cocoa/WebViewVisualIdentificationOverlay.mm
+@@ -734,3 +734,9 @@ testing/cocoa/WebViewVisualIdentificationOverlay.mm @nonARC
platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify
- platform/graphics/cocoa/GraphicsContextGLCocoa.mm @no-unify
- platform/graphics/cv/GraphicsContextGLCVCocoa.mm @no-unify
+ platform/graphics/cocoa/GraphicsContextGLCocoa.mm @nonARC @no-unify
+ platform/graphics/cv/GraphicsContextGLCVCocoa.mm @nonARC @no-unify
+
+// Playwright begin
+JSTouch.cpp
@@ -2269,10 +2237,10 @@ index ef1d576a4a7747af1ee45a9a172b5ac2d4efed20..e5d8b229f4e6a76ceb86a86bdd1f01de
+JSTouchList.cpp
+// Playwright end
diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt
-index 2bf30108f206c8f21cb63ef2aa54744864862c6c..80bf1267be5754fa6363c9d4af399803daf4fb38 100644
+index 55b8164ff85ba521e9e5e858109dafc1e24a6636..abb09e02ff454bee9e86667655d66ada16c5e104 100644
--- a/Source/WebCore/SourcesGTK.txt
+++ b/Source/WebCore/SourcesGTK.txt
-@@ -115,3 +115,10 @@ platform/unix/SharedMemoryUnix.cpp
+@@ -117,3 +117,10 @@ platform/unix/SharedMemoryUnix.cpp
platform/xdg/MIMETypeRegistryXdg.cpp
platform/xr/openxr/PlatformXROpenXR.cpp
@@ -2284,10 +2252,10 @@ index 2bf30108f206c8f21cb63ef2aa54744864862c6c..80bf1267be5754fa6363c9d4af399803
+JSSpeechSynthesisEventInit.cpp
+// Playwright: end.
diff --git a/Source/WebCore/SourcesWPE.txt b/Source/WebCore/SourcesWPE.txt
-index 9a760528751e6af3e2599a9b0b250607d54430c3..4c230e3ea7af8ffeb1013b2e8a17a297d714372a 100644
+index 2a5fdd8fd9ad31ed9145917d2335820b0b4975c1..b8085a7b2f0ad0535bfb673077e0273cee98a28b 100644
--- a/Source/WebCore/SourcesWPE.txt
+++ b/Source/WebCore/SourcesWPE.txt
-@@ -104,3 +104,8 @@ platform/wpe/PlatformScreenWPE.cpp
+@@ -109,3 +109,8 @@ platform/wpe/PlatformScreenWPE.cpp
platform/xdg/MIMETypeRegistryXdg.cpp
platform/xr/openxr/PlatformXROpenXR.cpp
@@ -2297,10 +2265,10 @@ index 9a760528751e6af3e2599a9b0b250607d54430c3..4c230e3ea7af8ffeb1013b2e8a17a297
+JSSpeechSynthesisErrorEventInit.cpp
+JSSpeechSynthesisEventInit.cpp
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
-index cc25f5acc2b5560f6a5ca51a7c3a737e9000de8e..97ffb63520aff377162d398908b972a4f71c28af 100644
+index be2dd5b204efd83fc08698d13c24cc8aff92ba52..9e145d385b52bb65b865712f5e49af1e9b8b821e 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
-@@ -6596,6 +6596,13 @@
+@@ -6733,6 +6733,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, ); }; };
@@ -2312,12 +2280,12 @@ index cc25f5acc2b5560f6a5ca51a7c3a737e9000de8e..97ffb63520aff377162d398908b972a4
+ F050E17423AD6A800011CE47 /* DocumentTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F050E17323AD6A800011CE47 /* DocumentTouch.cpp */; };
+ F050E17823AD70C50011CE47 /* PlatformTouchPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = F050E17623AD70C40011CE47 /* PlatformTouchPoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
F12171F616A8CF0B000053CA /* WebVTTElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F12171F416A8BC63000053CA /* WebVTTElement.h */; };
+ F30EE46B2E721BA800935B60 /* FrameInspectorController.h in Headers */ = {isa = PBXBuildFile; fileRef = F30EE46A2E721B9D00935B60 /* FrameInspectorController.h */; settings = {ATTRIBUTES = (Private, ); }; };
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, ); }; };
-@@ -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>"; };
+@@ -21844,6 +21851,14 @@
EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasActivityRecord.h; sourceTree = "<group>"; };
+ F088343F2E721B29001B2348 /* AXLocalFrame.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AXLocalFrame.h; sourceTree = "<group>"; };
+ F08834402E721B33001B2348 /* AXLocalFrame.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AXLocalFrame.cpp; sourceTree = "<group>"; };
+ F050E16623AC9C070011CE47 /* PlatformTouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformTouchEvent.h; sourceTree = "<group>"; };
+ F050E16923AD660C0011CE47 /* Touch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Touch.cpp; path = dom/Touch.cpp; sourceTree = SOURCE_ROOT; };
+ F050E16B23AD66620011CE47 /* TouchList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TouchList.h; path = dom/TouchList.h; sourceTree = SOURCE_ROOT; };
@@ -2328,8 +2296,8 @@ index cc25f5acc2b5560f6a5ca51a7c3a737e9000de8e..97ffb63520aff377162d398908b972a4
+ F050E17623AD70C40011CE47 /* PlatformTouchPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformTouchPoint.h; sourceTree = "<group>"; };
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>"; };
-@@ -29367,6 +29382,11 @@
+ F30EE46A2E721B9D00935B60 /* FrameInspectorController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FrameInspectorController.h; sourceTree = "<group>"; };
+@@ -29744,6 +29759,11 @@
BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */,
2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */,
2D4F96F21A1ECC240098BF88 /* TextIndicator.h */,
@@ -2341,7 +2309,7 @@ index cc25f5acc2b5560f6a5ca51a7c3a737e9000de8e..97ffb63520aff377162d398908b972a4
F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */,
D640B24C2E3058C800EB6C49 /* UADataValues.h */,
D640B24E2E3058C800EB6C49 /* UADataValues.idl */,
-@@ -36803,6 +36823,8 @@
+@@ -37333,6 +37353,8 @@
29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */,
1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */,
1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */,
@@ -2350,7 +2318,7 @@ index cc25f5acc2b5560f6a5ca51a7c3a737e9000de8e..97ffb63520aff377162d398908b972a4
FE3DC9932D0C063C0021B6FC /* PlatformTZoneImpls.cpp */,
0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */,
935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */,
-@@ -39663,6 +39685,7 @@
+@@ -40227,6 +40249,7 @@
AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */,
6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */,
6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */,
@@ -2358,7 +2326,7 @@ index cc25f5acc2b5560f6a5ca51a7c3a737e9000de8e..97ffb63520aff377162d398908b972a4
7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */,
7CE7FA591EF882300060C9D6 /* DocumentTouch.h */,
A8185F3209765765005826D9 /* DocumentType.cpp */,
-@@ -44643,6 +44666,8 @@
+@@ -45281,6 +45304,8 @@
F4E90A3C2B52038E002DA469 /* PlatformTextAlternatives.h in Headers */,
0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */,
074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */,
@@ -2367,15 +2335,15 @@ index cc25f5acc2b5560f6a5ca51a7c3a737e9000de8e..97ffb63520aff377162d398908b972a4
CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */,
CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */,
CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */,
-@@ -46131,6 +46156,7 @@
+@@ -46858,6 +46883,7 @@
0F54DD081881D5F5003EEDBB /* Touch.h in Headers */,
71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */,
0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */,
+ F050E16D23AD66630011CE47 /* TouchList.h in Headers */,
0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */,
070334D71459FFD5008D8D45 /* TrackBase.h in Headers */,
- BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */,
-@@ -47340,7 +47366,9 @@
+ 513C7B6E2E7C2E7A00079881 /* TrackInfo.h in Headers */,
+@@ -48087,7 +48113,9 @@
2D22830323A8470700364B7E /* CursorMac.mm in Sources */,
5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */,
07E4BDBF2A3A5FAB000D5509 /* DictationCaretAnimator.cpp in Sources */,
@@ -2385,18 +2353,18 @@ index cc25f5acc2b5560f6a5ca51a7c3a737e9000de8e..97ffb63520aff377162d398908b972a4
7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */,
4667EA3E2968D9DA00BAB1E2 /* GameControllerHapticEffect.mm in Sources */,
46FE73D32968E52000B8064C /* GameControllerHapticEngines.mm in Sources */,
-@@ -47433,6 +47461,9 @@
- CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */,
+@@ -48181,6 +48209,9 @@
+ 072F696F2E755BFA00281FC5 /* TextListParser.cpp in Sources */,
BE39137129B267F500FA5D4F /* TextTransformCocoa.cpp in Sources */,
51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */,
+ F050E16A23AD660C0011CE47 /* Touch.cpp in Sources */,
+ F050E17123AD669F0011CE47 /* TouchEvent.cpp in Sources */,
+ F050E16E23AD66630011CE47 /* TouchList.cpp in Sources */,
- 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */,
+ 538EC8031F96AF81004D22A8 /* UnifiedSource1-nonARC.mm in Sources */,
538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */,
- 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */,
+ 538EC8051F96AF81004D22A8 /* UnifiedSource2-nonARC.mm in Sources */,
diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
-index f41551ba8e1d31c2868ede9dc67c75488d0f815e..e2434bb801cb4db6fd965419a8569265279a8a0d 100644
+index 8e1a3e5d52305d451dff8cfee3fc9028cda42494..3a3468329217444a1d24cb1aced5e0f2a53ca3dc 100644
--- a/Source/WebCore/accessibility/AccessibilityObject.cpp
+++ b/Source/WebCore/accessibility/AccessibilityObject.cpp
@@ -78,6 +78,7 @@
@@ -2407,10 +2375,10 @@ index f41551ba8e1d31c2868ede9dc67c75488d0f815e..e2434bb801cb4db6fd965419a8569265
#include "LocalFrame.h"
#include "LocalizedStrings.h"
#include "Logging.h"
-@@ -4062,7 +4063,12 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const
- if (role() == AccessibilityRole::ApplicationDialog)
+@@ -3897,7 +3898,12 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const
+ // to search within them for revealable text matching the search query string.
return AccessibilityObjectInclusion::IncludeObject;
-
+ }
- return accessibilityPlatformIncludesObject();
+ AccessibilityObjectInclusion platformBehavior = accessibilityPlatformIncludesObject();
+ if (platformBehavior != AccessibilityObjectInclusion::DefaultBehavior) {
@@ -2422,10 +2390,10 @@ index f41551ba8e1d31c2868ede9dc67c75488d0f815e..e2434bb801cb4db6fd965419a8569265
bool AccessibilityObject::isWithinHiddenWebArea() const
diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
-index 9d6545ad60257c66a3f04cee67590d00ff9a5720..9a4794cc573a6507395cdd2c7a24209c0d9db3ba 100644
+index 84d30421b5b6993853f92627544d64713754821e..f9bbe4d630fe9269fb549c3b0aca5dc8afab3835 100644
--- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
+++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
-@@ -190,6 +190,8 @@ namespace WebCore {
+@@ -192,6 +192,8 @@ namespace WebCore {
macro(DelayNode) \
macro(DeprecationReportBody) \
macro(DigitalCredential) \
@@ -2597,10 +2565,10 @@ index b691425261078163e043b062a0a9f1fe5215d2b5..d3a8a99b08099cf16f0b0274d680c32e
+
} // namespace WebCore
diff --git a/Source/WebCore/dom/PointerEvent.h b/Source/WebCore/dom/PointerEvent.h
-index 2a8233fd13710bd351acd77e66626dd38ffb8749..8dcae583fe4dce69a6604dbd152015510eeb5df6 100644
+index b721aea206773db628f2a7c2bbba3bec3beeb8ec..74da0c84c430f4959125b4c690d100e6289cea8b 100644
--- a/Source/WebCore/dom/PointerEvent.h
+++ b/Source/WebCore/dom/PointerEvent.h
-@@ -34,6 +34,8 @@
+@@ -35,6 +35,8 @@
#if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS_FAMILY)
#include "PlatformTouchEventIOS.h"
@@ -2609,7 +2577,7 @@ index 2a8233fd13710bd351acd77e66626dd38ffb8749..8dcae583fe4dce69a6604dbd15201551
#endif
#if ENABLE(TOUCH_EVENTS) && PLATFORM(WPE)
-@@ -94,7 +96,7 @@ public:
+@@ -95,7 +97,7 @@ public:
static Ref<PointerEvent> create(const AtomString& type, MouseButton, const MouseEvent&, PointerID, const String& pointerType, CanBubble, IsCancelable);
static Ref<PointerEvent> create(const AtomString& type, PointerID, const String& pointerType, IsPrimary = IsPrimary::No);
@@ -2618,7 +2586,7 @@ index 2a8233fd13710bd351acd77e66626dd38ffb8749..8dcae583fe4dce69a6604dbd15201551
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:
+@@ -188,7 +190,7 @@ private:
PointerEvent();
PointerEvent(const AtomString&, Init&&, IsTrusted);
PointerEvent(const AtomString& type, PointerID, const String& pointerType, IsPrimary);
@@ -2679,10 +2647,10 @@ index 51176f56b3e691937622f5b4be0ff39f5e85630b..68c84ce1199ca81180db2b087b53bee2
return;
diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
-index 297085f75efe06143a806e1242750c9b6ad92dee..361fb796457998d4b6e7e39a448e03811c456a1c 100644
+index 4f11be48fc6f3bed8d02579b166c54221f442e58..7150b1a4f16d467cc31bce52c3c5c0095cf5cf49 100644
--- a/Source/WebCore/inspector/InspectorController.cpp
+++ b/Source/WebCore/inspector/InspectorController.cpp
-@@ -296,6 +296,8 @@ void InspectorController::disconnectFrontend(FrontendChannel& frontendChannel)
+@@ -297,6 +297,8 @@ void InspectorController::disconnectFrontend(FrontendChannel& frontendChannel)
// Unplug all instrumentations since they aren't needed now.
InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
@@ -2691,7 +2659,7 @@ index 297085f75efe06143a806e1242750c9b6ad92dee..361fb796457998d4b6e7e39a448e0381
}
m_inspectorBackendClient->frontendCountChanged(m_frontendRouter->frontendCount());
-@@ -315,6 +317,8 @@ void InspectorController::disconnectAllFrontends()
+@@ -316,6 +318,8 @@ void InspectorController::disconnectAllFrontends()
// The frontend should call setInspectorFrontendClient(nullptr) under closeWindow().
ASSERT(!m_inspectorFrontendClient);
@@ -2700,7 +2668,7 @@ index 297085f75efe06143a806e1242750c9b6ad92dee..361fb796457998d4b6e7e39a448e0381
if (!m_frontendRouter->hasFrontends())
return;
-@@ -398,8 +402,8 @@ void InspectorController::inspect(Node* node)
+@@ -399,8 +403,8 @@ void InspectorController::inspect(Node* node)
if (!enabled())
return;
@@ -2711,7 +2679,7 @@ index 297085f75efe06143a806e1242750c9b6ad92dee..361fb796457998d4b6e7e39a448e0381
ensureDOMAgent().inspect(node);
}
-@@ -542,4 +546,34 @@ void InspectorController::didComposite(LocalFrame& frame)
+@@ -548,4 +552,34 @@ void InspectorController::didComposite(LocalFrame& frame)
InspectorInstrumentation::didComposite(frame);
}
@@ -2747,10 +2715,10 @@ index 297085f75efe06143a806e1242750c9b6ad92dee..361fb796457998d4b6e7e39a448e0381
+
} // namespace WebCore
diff --git a/Source/WebCore/inspector/InspectorController.h b/Source/WebCore/inspector/InspectorController.h
-index fe10a03fd9d664e8735970b35819b639a60e4e32..8d3d8e0201213aa2c4ea27674388d2d0372c200b 100644
+index aeeca8fc1b3d6e6133ee7e85005febadd17c5c00..a0019b8cf2dc43622a34d79d687426fbb7174312 100644
--- a/Source/WebCore/inspector/InspectorController.h
+++ b/Source/WebCore/inspector/InspectorController.h
-@@ -106,6 +106,12 @@ public:
+@@ -107,6 +107,12 @@ public:
WEBCORE_EXPORT void willComposite(LocalFrame&);
WEBCORE_EXPORT void didComposite(LocalFrame&);
@@ -2763,7 +2731,7 @@ index fe10a03fd9d664e8735970b35819b639a60e4e32..8d3d8e0201213aa2c4ea27674388d2d0
// Testing support.
bool isUnderTest() const { return m_isUnderTest; }
void setIsUnderTest(bool isUnderTest) { m_isUnderTest = isUnderTest; }
-@@ -136,6 +142,7 @@ private:
+@@ -137,6 +143,7 @@ private:
PageAgentContext pageAgentContext();
void createLazyAgents();
@@ -2771,7 +2739,7 @@ index fe10a03fd9d664e8735970b35819b639a60e4e32..8d3d8e0201213aa2c4ea27674388d2d0
WeakRef<Page> m_page;
const Ref<InstrumentingAgents> m_instrumentingAgents;
-@@ -159,6 +166,7 @@ private:
+@@ -160,6 +167,7 @@ private:
bool m_isAutomaticInspection { false };
bool m_pauseAfterInitialization = { false };
bool m_didCreateLazyAgents { false };
@@ -2780,10 +2748,10 @@ index fe10a03fd9d664e8735970b35819b639a60e4e32..8d3d8e0201213aa2c4ea27674388d2d0
} // namespace WebCore
diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp
-index d23aa990856bf855830e69b3bbab2cb024d7f198..a80a86c732b514c07a92005fbdd1cc03b347ff3f 100644
+index 93f631d3897bcce961d5f8ea71cd75411d71df87..c654164fdd0f4a7ff6d5509873192fc3bce4a2f2 100644
--- a/Source/WebCore/inspector/InspectorInstrumentation.cpp
+++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp
-@@ -596,6 +596,12 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i
+@@ -598,6 +598,12 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i
pageAgent->applyUserAgentOverride(userAgent);
}
@@ -2796,7 +2764,7 @@ index d23aa990856bf855830e69b3bbab2cb024d7f198..a80a86c732b514c07a92005fbdd1cc03
void InspectorInstrumentation::applyEmulatedMediaImpl(InstrumentingAgents& instrumentingAgents, AtomString& media)
{
if (auto* pageAgent = instrumentingAgents.enabledPageAgent())
-@@ -679,6 +685,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen
+@@ -681,6 +687,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen
consoleAgent->didFailLoading(identifier, error); // This should come AFTER resource notification, front-end relies on this.
}
@@ -2809,7 +2777,7 @@ index d23aa990856bf855830e69b3bbab2cb024d7f198..a80a86c732b514c07a92005fbdd1cc03
void InspectorInstrumentation::willLoadXHRSynchronouslyImpl(InstrumentingAgents& instrumentingAgents)
{
if (auto* networkAgent = instrumentingAgents.enabledNetworkAgent())
-@@ -711,20 +723,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents&
+@@ -713,20 +725,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents&
void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
{
@@ -2833,7 +2801,7 @@ index d23aa990856bf855830e69b3bbab2cb024d7f198..a80a86c732b514c07a92005fbdd1cc03
}
void InspectorInstrumentation::frameDetachedFromParentImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
-@@ -804,12 +813,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins
+@@ -806,12 +815,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins
pageDOMDebuggerAgent->frameDocumentUpdated(frame);
}
@@ -2846,20 +2814,7 @@ index d23aa990856bf855830e69b3bbab2cb024d7f198..a80a86c732b514c07a92005fbdd1cc03
void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
{
if (frame.isMainFrame()) {
-@@ -840,10 +843,10 @@ void InspectorInstrumentation::frameStoppedLoadingImpl(InstrumentingAgents& inst
- inspectorPageAgent->frameStoppedLoading(frame);
- }
-
--void InspectorInstrumentation::frameScheduledNavigationImpl(InstrumentingAgents& instrumentingAgents, Frame& frame, Seconds delay)
-+void InspectorInstrumentation::frameScheduledNavigationImpl(InstrumentingAgents& instrumentingAgents, Frame& frame, Seconds delay, bool targetIsCurrentFrame)
- {
- if (auto* inspectorPageAgent = instrumentingAgents.enabledPageAgent())
-- inspectorPageAgent->frameScheduledNavigation(frame, delay);
-+ inspectorPageAgent->frameScheduledNavigation(frame, delay, targetIsCurrentFrame);
- }
-
- void InspectorInstrumentation::frameClearedScheduledNavigationImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
-@@ -858,6 +861,12 @@ void InspectorInstrumentation::accessibilitySettingsDidChangeImpl(InstrumentingA
+@@ -842,6 +845,12 @@ void InspectorInstrumentation::accessibilitySettingsDidChangeImpl(InstrumentingA
inspectorPageAgent->accessibilitySettingsDidChange();
}
@@ -2872,7 +2827,7 @@ index d23aa990856bf855830e69b3bbab2cb024d7f198..a80a86c732b514c07a92005fbdd1cc03
#if ENABLE(DARK_MODE_CSS)
void InspectorInstrumentation::defaultAppearanceDidChangeImpl(InstrumentingAgents& instrumentingAgents)
{
-@@ -910,6 +919,12 @@ void InspectorInstrumentation::interceptResponseImpl(InstrumentingAgents& instru
+@@ -894,6 +903,12 @@ void InspectorInstrumentation::interceptResponseImpl(InstrumentingAgents& instru
networkAgent->interceptResponse(response, identifier, WTFMove(handler));
}
@@ -2885,7 +2840,7 @@ index d23aa990856bf855830e69b3bbab2cb024d7f198..a80a86c732b514c07a92005fbdd1cc03
// JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes.
static bool isConsoleAssertMessage(MessageSource source, MessageType type)
{
-@@ -1028,6 +1043,12 @@ void InspectorInstrumentation::consoleStopRecordingCanvasImpl(InstrumentingAgent
+@@ -1012,6 +1027,12 @@ void InspectorInstrumentation::consoleStopRecordingCanvasImpl(InstrumentingAgent
canvasAgent->consoleStopRecordingCanvas(context);
}
@@ -2898,7 +2853,7 @@ index d23aa990856bf855830e69b3bbab2cb024d7f198..a80a86c732b514c07a92005fbdd1cc03
void InspectorInstrumentation::didDispatchDOMStorageEventImpl(InstrumentingAgents& instrumentingAgents, const String& key, const String& oldValue, const String& newValue, StorageType storageType, const SecurityOrigin& securityOrigin)
{
if (auto* domStorageAgent = instrumentingAgents.enabledDOMStorageAgent())
-@@ -1318,6 +1339,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins
+@@ -1309,6 +1330,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins
layerTreeAgent->renderLayerDestroyed(renderLayer);
}
@@ -2935,7 +2890,7 @@ index d23aa990856bf855830e69b3bbab2cb024d7f198..a80a86c732b514c07a92005fbdd1cc03
InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(WorkerOrWorkletGlobalScope& globalScope)
{
return globalScope.inspectorController().m_instrumentingAgents;
-@@ -1334,6 +1385,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page)
+@@ -1343,6 +1394,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page)
return page.inspectorController().m_instrumentingAgents.get();
}
@@ -2950,7 +2905,7 @@ index d23aa990856bf855830e69b3bbab2cb024d7f198..a80a86c732b514c07a92005fbdd1cc03
{
// Using RefPtr makes us hit the m_inRemovedLastRefFunction assert.
diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h
-index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54bcc97419f 100644
+index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868794bf2c5 100644
--- a/Source/WebCore/inspector/InspectorInstrumentation.h
+++ b/Source/WebCore/inspector/InspectorInstrumentation.h
@@ -31,6 +31,7 @@
@@ -2961,23 +2916,23 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
#include "CSSSelector.h"
#include "CanvasBase.h"
#include "CanvasRenderingContext.h"
-@@ -45,6 +46,7 @@
- #include "LocalFrame.h"
- #include "LocalFrameView.h"
+@@ -42,6 +43,7 @@
+ #include "HitTestResult.h"
+ #include "InspectorInstrumentationPublic.h"
#include "Page.h"
+#include "ResourceError.h"
#include "ResourceLoader.h"
#include "ResourceLoaderIdentifier.h"
#include "StorageArea.h"
-@@ -78,6 +80,7 @@ class DOMWrapperWorld;
- class Document;
+@@ -76,6 +78,7 @@ class Document;
class DocumentLoader;
+ class DocumentThreadableLoader;
class EventListener;
+class HTMLInputElement;
class HTTPHeaderMap;
class InspectorTimelineAgent;
class InstrumentingAgents;
-@@ -197,6 +200,7 @@ public:
+@@ -199,6 +202,7 @@ public:
static void didRecalculateStyle(Document&);
static void didScheduleStyleRecalculation(Document&);
static void applyUserAgentOverride(LocalFrame&, String&);
@@ -2985,7 +2940,7 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
static void applyEmulatedMedia(LocalFrame&, AtomString&);
static void flexibleBoxRendererBeganLayout(const RenderObject&);
-@@ -209,6 +213,7 @@ public:
+@@ -211,6 +215,7 @@ public:
static void didReceiveData(LocalFrame*, ResourceLoaderIdentifier, const SharedBuffer*, int encodedDataLength);
static void didFinishLoading(LocalFrame*, DocumentLoader*, ResourceLoaderIdentifier, const NetworkLoadMetrics&, ResourceLoader*);
static void didFailLoading(LocalFrame*, DocumentLoader*, ResourceLoaderIdentifier, const ResourceError&);
@@ -2993,7 +2948,7 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
static void willSendRequest(ServiceWorkerGlobalScope&, ResourceLoaderIdentifier, ResourceRequest&);
static void didReceiveResourceResponse(ServiceWorkerGlobalScope&, ResourceLoaderIdentifier, const ResourceResponse&);
-@@ -235,13 +240,13 @@ public:
+@@ -237,11 +242,11 @@ public:
static void frameDetachedFromParent(LocalFrame&);
static void didCommitLoad(LocalFrame&, DocumentLoader*);
static void frameDocumentUpdated(LocalFrame&);
@@ -3001,9 +2956,6 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
static void frameStartedLoading(LocalFrame&);
static void frameStoppedLoading(LocalFrame&);
static void didCompleteRenderingFrame(Frame&);
-- static void frameScheduledNavigation(Frame&, Seconds delay);
-+ static void frameScheduledNavigation(Frame&, Seconds delay, bool targetIsCurrentFrame);
- static void frameClearedScheduledNavigation(Frame&);
static void accessibilitySettingsDidChange(Page&);
+ static void didNavigateWithinPage(LocalFrame&);
#if ENABLE(DARK_MODE_CSS)
@@ -3015,7 +2967,7 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
static void interceptResponse(const LocalFrame&, const ResourceResponse&, ResourceLoaderIdentifier, CompletionHandler<void(const ResourceResponse&, RefPtr<FragmentedSharedBuffer>)>&&);
+ static void setStoppingLoadingDueToProcessSwap(Page*, bool);
- static void addMessageToConsole(Page&, std::unique_ptr<Inspector::ConsoleMessage>);
+ static void addMessageToConsole(LocalFrame&, std::unique_ptr<Inspector::ConsoleMessage>);
static void addMessageToConsole(WorkerOrWorkletGlobalScope&, std::unique_ptr<Inspector::ConsoleMessage>);
@@ -277,6 +283,7 @@ public:
static void stopProfiling(WorkerOrWorkletGlobalScope&, const String& title);
@@ -3063,7 +3015,7 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
static void willLoadXHRSynchronouslyImpl(InstrumentingAgents&);
static void didLoadXHRSynchronouslyImpl(InstrumentingAgents&);
static void scriptImportedImpl(InstrumentingAgents&, ResourceLoaderIdentifier, const String& sourceString);
-@@ -451,13 +468,13 @@ private:
+@@ -451,11 +468,11 @@ private:
static void frameDetachedFromParentImpl(InstrumentingAgents&, LocalFrame&);
static void didCommitLoadImpl(InstrumentingAgents&, LocalFrame&, DocumentLoader*);
static void frameDocumentUpdatedImpl(InstrumentingAgents&, LocalFrame&);
@@ -3071,15 +3023,12 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
static void frameStartedLoadingImpl(InstrumentingAgents&, LocalFrame&);
static void didCompleteRenderingFrameImpl(InstrumentingAgents&);
static void frameStoppedLoadingImpl(InstrumentingAgents&, LocalFrame&);
-- static void frameScheduledNavigationImpl(InstrumentingAgents&, Frame&, Seconds delay);
-+ static void frameScheduledNavigationImpl(InstrumentingAgents&, Frame&, Seconds delay, bool targetIsCurrentFrame);
- static void frameClearedScheduledNavigationImpl(InstrumentingAgents&, Frame&);
static void accessibilitySettingsDidChangeImpl(InstrumentingAgents&);
+ static void didNavigateWithinPageImpl(InstrumentingAgents&, LocalFrame&);
#if ENABLE(DARK_MODE_CSS)
static void defaultAppearanceDidChangeImpl(InstrumentingAgents&);
#endif
-@@ -468,6 +485,7 @@ private:
+@@ -466,6 +483,7 @@ private:
static bool shouldInterceptResponseImpl(InstrumentingAgents&, const ResourceResponse&);
static void interceptRequestImpl(InstrumentingAgents&, ResourceLoader&, Function<void(const ResourceRequest&)>&&);
static void interceptResponseImpl(InstrumentingAgents&, const ResourceResponse&, ResourceLoaderIdentifier, CompletionHandler<void(const ResourceResponse&, RefPtr<FragmentedSharedBuffer>)>&&);
@@ -3087,7 +3036,7 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
static void addMessageToConsoleImpl(InstrumentingAgents&, std::unique_ptr<Inspector::ConsoleMessage>);
-@@ -482,6 +500,7 @@ private:
+@@ -480,6 +498,7 @@ private:
static void stopProfilingImpl(InstrumentingAgents&, const String& title);
static void consoleStartRecordingCanvasImpl(InstrumentingAgents&, CanvasRenderingContext&, JSC::JSGlobalObject&, JSC::JSObject* options);
static void consoleStopRecordingCanvasImpl(InstrumentingAgents&, CanvasRenderingContext&);
@@ -3095,7 +3044,7 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
static void performanceMarkImpl(InstrumentingAgents&, const String& label, std::optional<MonotonicTime>);
-@@ -535,6 +554,12 @@ private:
+@@ -533,6 +552,12 @@ private:
static void layerTreeDidChangeImpl(InstrumentingAgents&);
static void renderLayerDestroyedImpl(InstrumentingAgents&, const RenderLayer&);
@@ -3108,7 +3057,7 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
static InstrumentingAgents& instrumentingAgents(Page&);
static InstrumentingAgents& instrumentingAgents(WorkerOrWorkletGlobalScope&);
static InstrumentingAgents& instrumentingAgents(ServiceWorkerGlobalScope&);
-@@ -1094,6 +1119,13 @@ inline void InspectorInstrumentation::applyUserAgentOverride(LocalFrame& frame,
+@@ -1093,6 +1118,13 @@ inline void InspectorInstrumentation::applyUserAgentOverride(LocalFrame& frame,
applyUserAgentOverrideImpl(*agents, userAgent);
}
@@ -3122,7 +3071,7 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
inline void InspectorInstrumentation::applyEmulatedMedia(LocalFrame& frame, AtomString& media)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
-@@ -1196,6 +1228,13 @@ inline void InspectorInstrumentation::didFailLoading(ServiceWorkerGlobalScope& g
+@@ -1195,6 +1227,13 @@ inline void InspectorInstrumentation::didFailLoading(ServiceWorkerGlobalScope& g
didFailLoadingImpl(instrumentingAgents(globalScope), identifier, nullptr, error);
}
@@ -3136,7 +3085,7 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
inline void InspectorInstrumentation::continueAfterXFrameOptionsDenied(LocalFrame& frame, ResourceLoaderIdentifier identifier, DocumentLoader& loader, const ResourceResponse& response)
{
// Treat the same as didReceiveResponse.
-@@ -1286,13 +1325,6 @@ inline void InspectorInstrumentation::frameDocumentUpdated(LocalFrame& frame)
+@@ -1285,13 +1324,6 @@ inline void InspectorInstrumentation::frameDocumentUpdated(LocalFrame& frame)
frameDocumentUpdatedImpl(*agents, frame);
}
@@ -3150,21 +3099,7 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
inline void InspectorInstrumentation::frameStartedLoading(LocalFrame& frame)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
-@@ -1314,11 +1346,11 @@ inline void InspectorInstrumentation::frameStoppedLoading(LocalFrame& frame)
- frameStoppedLoadingImpl(*agents, frame);
- }
-
--inline void InspectorInstrumentation::frameScheduledNavigation(Frame& frame, Seconds delay)
-+inline void InspectorInstrumentation::frameScheduledNavigation(Frame& frame, Seconds delay, bool targetIsCurrentFrame)
- {
- FAST_RETURN_IF_NO_FRONTENDS(void());
- if (auto* agents = instrumentingAgents(frame))
-- frameScheduledNavigationImpl(*agents, frame, delay);
-+ frameScheduledNavigationImpl(*agents, frame, delay, targetIsCurrentFrame);
- }
-
- inline void InspectorInstrumentation::frameClearedScheduledNavigation(Frame& frame)
-@@ -1334,6 +1366,13 @@ inline void InspectorInstrumentation::accessibilitySettingsDidChange(Page& page)
+@@ -1319,6 +1351,13 @@ inline void InspectorInstrumentation::accessibilitySettingsDidChange(Page& page)
accessibilitySettingsDidChangeImpl(instrumentingAgents(page));
}
@@ -3178,7 +3113,7 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
#if ENABLE(DARK_MODE_CSS)
inline void InspectorInstrumentation::defaultAppearanceDidChange(Page& page)
{
-@@ -1386,6 +1425,13 @@ inline void InspectorInstrumentation::interceptResponse(const LocalFrame& frame,
+@@ -1371,6 +1410,13 @@ inline void InspectorInstrumentation::interceptResponse(const LocalFrame& frame,
interceptResponseImpl(*agents, response, identifier, WTFMove(handler));
}
@@ -3192,7 +3127,7 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
inline void InspectorInstrumentation::didDispatchDOMStorageEvent(Page& page, const String& key, const String& oldValue, const String& newValue, StorageType storageType, const SecurityOrigin& securityOrigin)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
-@@ -1726,6 +1772,11 @@ inline void InspectorInstrumentation::performanceMark(ScriptExecutionContext& co
+@@ -1710,6 +1756,11 @@ inline void InspectorInstrumentation::performanceMark(ScriptExecutionContext& co
performanceMarkImpl(*agents, label, WTFMove(startTime));
}
@@ -3204,7 +3139,7 @@ index 645aa88d02d3cc85bfce2905bcba61a2a398a3e7..1097e767c9ed1a6b7b8c8bc449d5d54b
inline void InspectorInstrumentation::didRequestAnimationFrame(ScriptExecutionContext& scriptExecutionContext, int callbackId)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
-@@ -1782,6 +1833,42 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren
+@@ -1766,6 +1817,42 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren
renderLayerDestroyedImpl(*agents, renderLayer);
}
@@ -3300,10 +3235,10 @@ index b8a1585c14a753344d5b52b316511d2efb2d2bfe..910b98291328cd90109beeeb66e9ecf2
+
}
diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
-index ae1b0775177048d3464ae2961e1f86f044ab4521..a10bc643f3ddf82696100345037b820a764431b3 100644
+index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b18123ce70 100644
--- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
+++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
-@@ -54,6 +54,7 @@
+@@ -55,6 +55,7 @@
#include "Cookie.h"
#include "CookieJar.h"
#include "CustomElementRegistry.h"
@@ -3311,7 +3246,7 @@ index ae1b0775177048d3464ae2961e1f86f044ab4521..a10bc643f3ddf82696100345037b820a
#include "DOMEditor.h"
#include "DOMException.h"
#include "DOMPatchSupport.h"
-@@ -65,9 +66,14 @@
+@@ -66,9 +67,14 @@
#include "Event.h"
#include "EventListener.h"
#include "EventNames.h"
@@ -3326,7 +3261,7 @@ index ae1b0775177048d3464ae2961e1f86f044ab4521..a10bc643f3ddf82696100345037b820a
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
#include "HTMLScriptElement.h"
-@@ -103,12 +109,14 @@
+@@ -104,12 +110,14 @@
#include "Pasteboard.h"
#include "PseudoElement.h"
#include "RenderGrid.h"
@@ -3341,7 +3276,7 @@ index ae1b0775177048d3464ae2961e1f86f044ab4521..a10bc643f3ddf82696100345037b820a
#include "StaticNodeList.h"
#include "StyleProperties.h"
#include "StyleResolver.h"
-@@ -150,7 +158,8 @@ using namespace HTMLNames;
+@@ -151,7 +159,8 @@ using namespace HTMLNames;
static const size_t maxTextSize = 10000;
static const char16_t horizontalEllipsisUChar[] = { horizontalEllipsis, 0 };
@@ -3351,7 +3286,7 @@ index ae1b0775177048d3464ae2961e1f86f044ab4521..a10bc643f3ddf82696100345037b820a
{
if (!colorObject)
return std::nullopt;
-@@ -169,7 +178,7 @@ static std::optional<Color> parseColor(RefPtr<JSON::Object>&& colorObject)
+@@ -170,7 +179,7 @@ static std::optional<Color> parseColor(RefPtr<JSON::Object>&& colorObject)
static std::optional<Color> parseRequiredConfigColor(const String& fieldName, JSON::Object& configObject)
{
@@ -3360,7 +3295,7 @@ index ae1b0775177048d3464ae2961e1f86f044ab4521..a10bc643f3ddf82696100345037b820a
}
static Color parseOptionalConfigColor(const String& fieldName, JSON::Object& configObject)
-@@ -196,6 +205,20 @@ static bool parseQuad(Ref<JSON::Array>&& quadArray, FloatQuad* quad)
+@@ -197,6 +206,20 @@ static bool parseQuad(Ref<JSON::Array>&& quadArray, FloatQuad* quad)
return true;
}
@@ -3381,7 +3316,7 @@ index ae1b0775177048d3464ae2961e1f86f044ab4521..a10bc643f3ddf82696100345037b820a
class RevalidateStyleAttributeTask final : public CanMakeCheckedPtr<RevalidateStyleAttributeTask> {
WTF_MAKE_TZONE_ALLOCATED(RevalidateStyleAttributeTask);
WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(RevalidateStyleAttributeTask);
-@@ -476,6 +499,20 @@ Node* InspectorDOMAgent::assertNode(Inspector::Protocol::ErrorString& errorStrin
+@@ -477,6 +500,20 @@ Node* InspectorDOMAgent::assertNode(Inspector::Protocol::ErrorString& errorStrin
return node.get();
}
@@ -3402,7 +3337,7 @@ index ae1b0775177048d3464ae2961e1f86f044ab4521..a10bc643f3ddf82696100345037b820a
Document* InspectorDOMAgent::assertDocument(Inspector::Protocol::ErrorString& errorString, Inspector::Protocol::DOM::NodeId nodeId)
{
RefPtr node = assertNode(errorString, nodeId);
-@@ -1594,16 +1631,7 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::highlightNode(std::o
+@@ -1595,16 +1632,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;
@@ -3420,7 +3355,7 @@ index ae1b0775177048d3464ae2961e1f86f044ab4521..a10bc643f3ddf82696100345037b820a
if (!node)
return makeUnexpected(errorString);
-@@ -1858,15 +1886,159 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::setInspectedNode(Ins
+@@ -1859,15 +1887,159 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::setInspectedNode(Ins
return { };
}
@@ -3583,7 +3518,7 @@ index ae1b0775177048d3464ae2961e1f86f044ab4521..a10bc643f3ddf82696100345037b820a
if (!object)
return makeUnexpected("Missing injected script for given nodeId"_s);
-@@ -3132,7 +3304,7 @@ Inspector::Protocol::ErrorStringOr<Inspector::Protocol::DOM::NodeId> InspectorDO
+@@ -3133,7 +3305,7 @@ Inspector::Protocol::ErrorStringOr<Inspector::Protocol::DOM::NodeId> InspectorDO
return makeUnexpected("Missing node for given path"_s);
}
@@ -3592,7 +3527,7 @@ index ae1b0775177048d3464ae2961e1f86f044ab4521..a10bc643f3ddf82696100345037b820a
{
Document* document = &node->document();
if (auto* templateHost = document->templateDocumentHost())
-@@ -3141,12 +3313,18 @@ RefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNod
+@@ -3142,12 +3314,18 @@ RefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNod
if (!frame)
return nullptr;
@@ -3614,7 +3549,7 @@ index ae1b0775177048d3464ae2961e1f86f044ab4521..a10bc643f3ddf82696100345037b820a
}
Node* InspectorDOMAgent::scriptValueAsNode(JSC::JSValue value)
-@@ -3292,4 +3470,53 @@ Inspector::Protocol::ErrorStringOr<Ref<Inspector::Protocol::DOM::MediaStats>> In
+@@ -3295,4 +3473,53 @@ Inspector::Protocol::ErrorStringOr<Ref<Inspector::Protocol::DOM::MediaStats>> In
#endif
}
@@ -3742,7 +3677,7 @@ index cd5edd3322a55e72643560ad852af14f7104f35b..25c3d3c73c3b9395323b4c853a70d550
void discardBindings();
diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
-index 49a732b0e976efae1ec6f687efb31efe0dca01de..a2f723b067cd4aff83e29e341ee90925dc48f281 100644
+index ccedbcac06dec7ae5ddfec6f682092c9869c330d..e2dc52d5a6cbada4f5a44d9bb5b7612885e24b47 100644
--- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
+++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
@@ -58,6 +58,7 @@
@@ -3764,7 +3699,7 @@ index 49a732b0e976efae1ec6f687efb31efe0dca01de..a2f723b067cd4aff83e29e341ee90925
}
if (resourceLoader) {
-@@ -398,6 +399,8 @@ RefPtr<Inspector::Protocol::Network::Response> InspectorNetworkAgent::buildObjec
+@@ -397,6 +398,8 @@ RefPtr<Inspector::Protocol::Network::Response> InspectorNetworkAgent::buildObjec
.setSource(responseSource(response.source()))
.release();
@@ -3773,7 +3708,7 @@ index 49a732b0e976efae1ec6f687efb31efe0dca01de..a2f723b067cd4aff83e29e341ee90925
if (resourceLoader) {
auto* metrics = response.deprecatedNetworkLoadMetricsOrNull();
responseObject->setTiming(buildObjectForTiming(metrics ? *metrics : NetworkLoadMetrics::emptyMetrics(), *resourceLoader));
-@@ -684,6 +687,9 @@ void InspectorNetworkAgent::didFailLoading(ResourceLoaderIdentifier identifier,
+@@ -683,6 +686,9 @@ void InspectorNetworkAgent::didFailLoading(ResourceLoaderIdentifier identifier,
String requestId = IdentifiersFactory::requestId(identifier.toUInt64());
if (loader && m_resourcesData->resourceType(requestId) == InspectorPageAgent::DocumentResource) {
@@ -3783,7 +3718,7 @@ index 49a732b0e976efae1ec6f687efb31efe0dca01de..a2f723b067cd4aff83e29e341ee90925
auto* frame = loader->frame();
if (frame && frame->loader().documentLoader() && frame->document()) {
m_resourcesData->addResourceSharedBuffer(requestId,
-@@ -913,6 +919,7 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::disable()
+@@ -912,6 +918,7 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::disable()
m_instrumentingAgents.setEnabledNetworkAgent(nullptr);
m_resourcesData->clear();
m_extraRequestHeaders.clear();
@@ -3791,7 +3726,7 @@ index 49a732b0e976efae1ec6f687efb31efe0dca01de..a2f723b067cd4aff83e29e341ee90925
continuePendingRequests();
continuePendingResponses();
-@@ -958,6 +965,7 @@ void InspectorNetworkAgent::continuePendingResponses()
+@@ -957,6 +964,7 @@ void InspectorNetworkAgent::continuePendingResponses()
Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::setExtraHTTPHeaders(Ref<JSON::Object>&& headers)
{
@@ -3799,7 +3734,7 @@ index 49a732b0e976efae1ec6f687efb31efe0dca01de..a2f723b067cd4aff83e29e341ee90925
for (auto& entry : headers.get()) {
auto stringValue = entry.value->asString();
if (!!stringValue)
-@@ -1207,6 +1215,11 @@ void InspectorNetworkAgent::interceptResponse(const ResourceResponse& response,
+@@ -1206,6 +1214,11 @@ void InspectorNetworkAgent::interceptResponse(const ResourceResponse& response,
m_frontendDispatcher->responseIntercepted(requestId, resourceResponse.releaseNonNull());
}
@@ -3811,7 +3746,7 @@ index 49a732b0e976efae1ec6f687efb31efe0dca01de..a2f723b067cd4aff83e29e341ee90925
Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptContinue(const Inspector::Protocol::Network::RequestId& requestId, Inspector::Protocol::Network::NetworkStage networkStage)
{
switch (networkStage) {
-@@ -1236,6 +1249,9 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptWithReq
+@@ -1235,6 +1248,9 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptWithReq
return makeUnexpected("Missing pending intercept request for given requestId"_s);
auto& loader = *pendingRequest->m_loader;
@@ -3821,7 +3756,7 @@ index 49a732b0e976efae1ec6f687efb31efe0dca01de..a2f723b067cd4aff83e29e341ee90925
ResourceRequest request = loader.request();
if (!!url)
request.setURL(URL({ }, url));
-@@ -1331,13 +1347,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptRequest
+@@ -1330,13 +1346,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptRequest
response.setHTTPStatusCode(status);
response.setHTTPStatusText(String { statusText });
HTTPHeaderMap explicitHeaders;
@@ -3845,7 +3780,7 @@ index 49a732b0e976efae1ec6f687efb31efe0dca01de..a2f723b067cd4aff83e29e341ee90925
loader->didReceiveResponse(WTFMove(response), [loader, buffer = data.releaseNonNull()]() {
if (loader->reachedTerminalState())
return;
-@@ -1401,6 +1426,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::setEmulatedCondi
+@@ -1400,6 +1425,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::setEmulatedCondi
#endif // ENABLE(INSPECTOR_NETWORK_THROTTLING)
@@ -3896,13 +3831,14 @@ index 7ae1b53be8a9b5f0d0e2787a22f5534500b7ab19..f6f33d05bcdb4084f55631fdcfd3b4d0
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
-index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bcf4e1a7ce 100644
+index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70df0d7f81 100644
--- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
+++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
-@@ -32,20 +32,28 @@
+@@ -32,20 +32,29 @@
#include "config.h"
#include "InspectorPageAgent.h"
++#include "AccessibilityObjectInlines.h"
+#include "AXCoreObject.h"
+#include "AXObjectCache.h"
+#include "BackForwardController.h"
@@ -3928,7 +3864,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
#include "HTMLNames.h"
#include "ImageBuffer.h"
#include "InspectorBackendClient.h"
-@@ -58,24 +66,38 @@
+@@ -58,24 +67,38 @@
#include "MIMETypeRegistry.h"
#include "MemoryCache.h"
#include "Page.h"
@@ -3967,7 +3903,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
#include <wtf/text/StringBuilder.h>
#if ENABLE(APPLICATION_MANIFEST)
-@@ -97,6 +119,11 @@ using namespace Inspector;
+@@ -97,6 +120,11 @@ using namespace Inspector;
WTF_MAKE_TZONE_ALLOCATED_IMPL(InspectorPageAgent);
@@ -3979,7 +3915,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
static bool decodeBuffer(std::span<const uint8_t> buffer, const String& textEncodingName, String* result)
{
if (buffer.data()) {
-@@ -350,6 +377,7 @@ InspectorPageAgent::InspectorPageAgent(PageAgentContext& context, InspectorBacke
+@@ -350,6 +378,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)
@@ -3987,7 +3923,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
, m_client(client)
, m_overlay(overlay)
{
-@@ -379,12 +407,20 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::enable()
+@@ -379,12 +408,20 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::enable()
defaultUserPreferencesDidChange();
@@ -4008,7 +3944,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
setShowPaintRects(false);
#if !PLATFORM(IOS_FAMILY)
-@@ -437,6 +473,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::reload(std::optiona
+@@ -437,6 +474,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::reload(std::optiona
return { };
}
@@ -4031,7 +3967,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::navigate(const String& url)
{
RefPtr localMainFrame = m_inspectedPage->localMainFrame();
-@@ -463,6 +515,13 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideUserAgent(c
+@@ -463,6 +516,13 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideUserAgent(c
return { };
}
@@ -4045,7 +3981,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Inspector::Protocol::Page::Setting setting, std::optional<bool>&& value)
{
auto& inspectedPageSettings = m_inspectedPage->settings();
-@@ -476,6 +535,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+@@ -476,6 +536,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
inspectedPageSettings.setAuthorAndUserStylesEnabledInspectorOverride(value);
return { };
@@ -4058,7 +3994,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
case Inspector::Protocol::Page::Setting::ICECandidateFilteringEnabled:
inspectedPageSettings.setICECandidateFilteringEnabledInspectorOverride(value);
return { };
-@@ -502,6 +567,39 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+@@ -502,6 +568,39 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
m_client->setDeveloperPreferenceOverride(InspectorBackendClient::DeveloperPreference::NeedsSiteSpecificQuirks, value);
return { };
@@ -4098,7 +4034,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
case Inspector::Protocol::Page::Setting::ScriptEnabled:
inspectedPageSettings.setScriptEnabledInspectorOverride(value);
return { };
-@@ -514,6 +612,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+@@ -514,6 +613,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
inspectedPageSettings.setShowRepaintCounterInspectorOverride(value);
return { };
@@ -4111,7 +4047,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
case Inspector::Protocol::Page::Setting::WebSecurityEnabled:
inspectedPageSettings.setWebSecurityEnabledInspectorOverride(value);
return { };
-@@ -922,15 +1026,16 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setShowPaintRects(b
+@@ -922,15 +1027,16 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setShowPaintRects(b
return { };
}
@@ -4133,7 +4069,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
}
void InspectorPageAgent::frameNavigated(LocalFrame& frame)
-@@ -938,13 +1043,29 @@ void InspectorPageAgent::frameNavigated(LocalFrame& frame)
+@@ -938,13 +1044,29 @@ void InspectorPageAgent::frameNavigated(LocalFrame& frame)
m_frontendDispatcher->frameNavigated(buildObjectForFrame(&frame));
}
@@ -4166,7 +4102,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
}
Frame* InspectorPageAgent::frameForId(const Inspector::Protocol::Network::FrameId& frameId)
-@@ -956,20 +1077,21 @@ String InspectorPageAgent::frameId(Frame* frame)
+@@ -956,20 +1078,21 @@ String InspectorPageAgent::frameId(Frame* frame)
{
if (!frame)
return emptyString();
@@ -4196,31 +4132,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
}
LocalFrame* InspectorPageAgent::assertFrame(Inspector::Protocol::ErrorString& errorString, const Inspector::Protocol::Network::FrameId& frameId)
-@@ -980,11 +1102,6 @@ LocalFrame* InspectorPageAgent::assertFrame(Inspector::Protocol::ErrorString& er
- return frame;
- }
-
--void InspectorPageAgent::loaderDetachedFromFrame(DocumentLoader& loader)
--{
-- m_loaderToIdentifier.remove(&loader);
--}
--
- void InspectorPageAgent::frameStartedLoading(LocalFrame& frame)
- {
- m_frontendDispatcher->frameStartedLoading(frameId(&frame));
-@@ -995,9 +1112,9 @@ void InspectorPageAgent::frameStoppedLoading(LocalFrame& frame)
- m_frontendDispatcher->frameStoppedLoading(frameId(&frame));
- }
-
--void InspectorPageAgent::frameScheduledNavigation(Frame& frame, Seconds delay)
-+void InspectorPageAgent::frameScheduledNavigation(Frame& frame, Seconds delay, bool targetIsCurrentFrame)
- {
-- m_frontendDispatcher->frameScheduledNavigation(frameId(&frame), delay.value());
-+ m_frontendDispatcher->frameScheduledNavigation(frameId(&frame), delay.value(), targetIsCurrentFrame);
- }
-
- void InspectorPageAgent::frameClearedScheduledNavigation(Frame& frame)
-@@ -1044,6 +1161,12 @@ void InspectorPageAgent::defaultUserPreferencesDidChange()
+@@ -1024,6 +1147,12 @@ void InspectorPageAgent::defaultUserPreferencesDidChange()
m_frontendDispatcher->defaultUserPreferencesDidChange(WTFMove(defaultUserPreferences));
}
@@ -4233,7 +4145,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
#if ENABLE(DARK_MODE_CSS)
void InspectorPageAgent::defaultAppearanceDidChange()
{
-@@ -1057,6 +1180,9 @@ void InspectorPageAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapp
+@@ -1037,6 +1166,9 @@ void InspectorPageAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapp
return;
if (m_bootstrapScript.isEmpty())
@@ -4243,7 +4155,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
return;
frame.script().evaluateIgnoringException(ScriptSourceCode(m_bootstrapScript, JSC::SourceTaintedOrigin::Untainted, URL { "web-inspector://bootstrap.js"_str }));
-@@ -1104,6 +1230,51 @@ void InspectorPageAgent::didRecalculateStyle()
+@@ -1084,6 +1216,51 @@ void InspectorPageAgent::didRecalculateStyle()
protectedOverlay()->update();
}
@@ -4295,7 +4207,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
Ref<Inspector::Protocol::Page::Frame> InspectorPageAgent::buildObjectForFrame(LocalFrame* frame)
{
ASSERT_ARG(frame, frame);
-@@ -1197,6 +1368,12 @@ void InspectorPageAgent::applyUserAgentOverride(String& userAgent)
+@@ -1177,6 +1354,12 @@ void InspectorPageAgent::applyUserAgentOverride(String& userAgent)
userAgent = m_userAgentOverride;
}
@@ -4308,14 +4220,14 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
void InspectorPageAgent::applyEmulatedMedia(AtomString& media)
{
if (!m_emulatedMedia.isEmpty())
-@@ -1224,11 +1401,13 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotNode(Insp
+@@ -1204,11 +1387,13 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotNode(Insp
return snapshot->toDataURL("image/png"_s, std::nullopt, PreserveResolution::Yes);
}
-Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int x, int y, int width, int height, Inspector::Protocol::Page::CoordinateSystem coordinateSystem)
+Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int x, int y, int width, int height, Inspector::Protocol::Page::CoordinateSystem coordinateSystem, std::optional<bool>&& omitDeviceScaleFactor)
{
- SnapshotOptions options { { }, ImageBufferPixelFormat::BGRA8, DestinationColorSpace::SRGB() };
+ SnapshotOptions options { { }, PixelFormat::BGRA8, DestinationColorSpace::SRGB() };
if (coordinateSystem == Inspector::Protocol::Page::CoordinateSystem::Viewport)
options.flags.add(SnapshotFlags::InViewCoordinates);
+ if (omitDeviceScaleFactor.has_value() && *omitDeviceScaleFactor)
@@ -4323,7 +4235,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
IntRect rectangle(x, y, width, height);
RefPtr localMainFrame = m_inspectedPage->localMainFrame();
-@@ -1242,6 +1421,43 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int
+@@ -1222,6 +1407,43 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int
return snapshot->toDataURL("image/png"_s, std::nullopt, PreserveResolution::Yes);
}
@@ -4367,7 +4279,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
#if ENABLE(WEB_ARCHIVE) && USE(CF)
Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
{
-@@ -1258,7 +1474,6 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
+@@ -1238,7 +1460,6 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
}
#endif
@@ -4375,7 +4287,7 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverride(std::optional<int>&& width, std::optional<int>&& height)
{
if (width.has_value() != height.has_value())
-@@ -1276,6 +1491,496 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverri
+@@ -1256,6 +1477,500 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverri
localMainFrame->setOverrideScreenSize(FloatSize(width.value_or(0), height.value_or(0)));
return { };
}
@@ -4478,6 +4390,8 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
+ return "Footnote"_s;
+ case AccessibilityRole::Form:
+ return "Form"_s;
++ case AccessibilityRole::FrameHost:
++ return "FrameHost"_s;
+ case AccessibilityRole::Generic:
+ return "Generic"_s;
+ case AccessibilityRole::GraphicsDocument:
@@ -4540,6 +4454,8 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
+ return "ListItem"_s;
+ case AccessibilityRole::ListMarker:
+ return "ListMarker"_s;
++ case AccessibilityRole::LocalFrame:
++ return "LocalFrame"_s;
+ case AccessibilityRole::Mark:
+ return "Mark"_s;
+ case AccessibilityRole::MathElement:
@@ -4874,10 +4790,10 @@ index 033d3cb9c8c8d605e97bb78f9b794cf4a8b861ba..8e9d36406513b09928be27bcc6e837bc
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.h b/Source/WebCore/inspector/agents/InspectorPageAgent.h
-index d8a8b85ff220105e832a6d8075982f4722197afb..dc4a5caea97e3458bd9884e1265a92e72b727bc0 100644
+index 194a97b59c553830963e72fd4a2ff4f796e0a065..256b1377b89024b5c2bcbb91615e5e62ed28a3dc 100644
--- a/Source/WebCore/inspector/agents/InspectorPageAgent.h
+++ b/Source/WebCore/inspector/agents/InspectorPageAgent.h
-@@ -43,11 +43,16 @@
+@@ -44,11 +44,16 @@
#include <wtf/WeakRef.h>
#include <wtf/text/WTFString.h>
@@ -4894,7 +4810,7 @@ index d8a8b85ff220105e832a6d8075982f4722197afb..dc4a5caea97e3458bd9884e1265a92e7
class InspectorBackendClient;
class InspectorOverlay;
class LocalFrame;
-@@ -80,6 +85,8 @@ public:
+@@ -81,6 +86,8 @@ public:
OtherResource,
};
@@ -4903,7 +4819,7 @@ index d8a8b85ff220105e832a6d8075982f4722197afb..dc4a5caea97e3458bd9884e1265a92e7
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 +107,11 @@ public:
+@@ -101,8 +108,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);
@@ -4915,7 +4831,7 @@ index d8a8b85ff220105e832a6d8075982f4722197afb..dc4a5caea97e3458bd9884e1265a92e7
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 +127,65 @@ public:
+@@ -118,41 +128,62 @@ public:
#endif
Inspector::Protocol::ErrorStringOr<void> setShowPaintRects(bool);
Inspector::Protocol::ErrorStringOr<void> setEmulatedMedia(const String&);
@@ -4948,12 +4864,7 @@ index d8a8b85ff220105e832a6d8075982f4722197afb..dc4a5caea97e3458bd9884e1265a92e7
+ void loadEventFired(LocalFrame&);
void frameNavigated(LocalFrame&);
void frameDetached(LocalFrame&);
-- void loaderDetachedFromFrame(DocumentLoader&);
- void frameStartedLoading(LocalFrame&);
- void frameStoppedLoading(LocalFrame&);
-- void frameScheduledNavigation(Frame&, Seconds delay);
-+ void frameScheduledNavigation(Frame&, Seconds delay, bool targetIsCurrentFrame);
- void frameClearedScheduledNavigation(Frame&);
+ void loaderDetachedFromFrame(DocumentLoader&);
void accessibilitySettingsDidChange();
void defaultUserPreferencesDidChange();
+ void didNavigateWithinPage(LocalFrame&);
@@ -4988,7 +4899,7 @@ index d8a8b85ff220105e832a6d8075982f4722197afb..dc4a5caea97e3458bd9884e1265a92e7
Ref<InspectorOverlay> protectedOverlay() const;
-@@ -173,17 +203,22 @@ private:
+@@ -170,17 +201,22 @@ private:
const Ref<Inspector::PageBackendDispatcher> m_backendDispatcher;
WeakRef<Page> m_inspectedPage;
@@ -5013,20 +4924,20 @@ index d8a8b85ff220105e832a6d8075982f4722197afb..dc4a5caea97e3458bd9884e1265a92e7
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp b/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp
-index 2f591841f3db6618a2936802d5e4e9604cd25963..639bf063a684a361e71b04c7a17c4dfc2541513a 100644
+index 157249fd95354782e13a63e860757383c0aaf51d..f0220b54eeb035f926013c9e6405bfe6774e10ff 100644
--- a/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp
+++ b/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp
-@@ -34,6 +34,7 @@
-
+@@ -35,6 +35,7 @@
#include "DOMWrapperWorld.h"
#include "Document.h"
+ #include "FrameConsoleClient.h"
+#include "FrameLoader.h"
#include "InspectorPageAgent.h"
#include "InstrumentingAgents.h"
#include "JSDOMWindowCustom.h"
@@ -42,6 +43,7 @@
+ #include "LocalFrame.h"
#include "Page.h"
- #include "PageConsoleClient.h"
#include "ScriptController.h"
+#include "ScriptSourceCode.h"
#include "SecurityOrigin.h"
@@ -5201,10 +5112,10 @@ index ed8bec9c10c9d1bf659efab09f77ad7d8e439594..49bdaf8b08d157ecb7cd412ea847eb8c
protected:
static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No);
diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
-index 861b82e0ae132215c5c319e94a3ca42028557990..4031b67577112eae8cf28099425cc40c42c81f6e 100644
+index 9d47b5803f10fb3484d9a1f82d65e728f2b26500..3aa64308c20835f4e69a80344bfe93814f1f1099 100644
--- a/Source/WebCore/loader/DocumentLoader.cpp
+++ b/Source/WebCore/loader/DocumentLoader.cpp
-@@ -776,8 +776,10 @@ void DocumentLoader::willSendRequest(ResourceRequest&& newRequest, const Resourc
+@@ -753,8 +753,10 @@ void DocumentLoader::willSendRequest(ResourceRequest&& newRequest, const Resourc
if (!didReceiveRedirectResponse)
return completionHandler(WTFMove(newRequest));
@@ -5215,7 +5126,7 @@ index 861b82e0ae132215c5c319e94a3ca42028557990..4031b67577112eae8cf28099425cc40c
switch (navigationPolicyDecision) {
case NavigationPolicyDecision::IgnoreLoad:
case NavigationPolicyDecision::LoadWillContinueInAnotherProcess:
-@@ -1601,11 +1603,17 @@ void DocumentLoader::detachFromFrame(LoadWillContinueInAnotherProcess loadWillCo
+@@ -1532,11 +1534,17 @@ void DocumentLoader::detachFromFrame(LoadWillContinueInAnotherProcess loadWillCo
if (auto navigationID = std::exchange(m_navigationID, { }))
frame->loader().client().documentLoaderDetached(*navigationID, loadWillContinueInAnotherProcess);
@@ -5236,10 +5147,10 @@ index 861b82e0ae132215c5c319e94a3ca42028557990..4031b67577112eae8cf28099425cc40c
{
m_navigationID = navigationID;
diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h
-index 7f1ae6df69510c2dbdeedc1163b31bd968e6da01..3767fe35412c3c1cb6739dfd178aacae527b86a7 100644
+index f64c002d4e2fe48eb38058ae52fd8939a6bab31b..e6f6679d6a40cfa9cacc3a8e3fd629a774283551 100644
--- a/Source/WebCore/loader/DocumentLoader.h
+++ b/Source/WebCore/loader/DocumentLoader.h
-@@ -220,6 +220,8 @@ public:
+@@ -221,6 +221,8 @@ public:
WEBCORE_EXPORT virtual void detachFromFrame(LoadWillContinueInAnotherProcess);
@@ -5249,10 +5160,10 @@ index 7f1ae6df69510c2dbdeedc1163b31bd968e6da01..3767fe35412c3c1cb6739dfd178aacae
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 81336952a927d10a54a5282edef51d67024a3d91..6f042943462e1c69ccffd57cf49724d032f1ce65 100644
+index 65040a4e2fa0def1672638668e298eab3228c3f8..65faf6687413a223828be10d55f3c8f8c1789739 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
-@@ -1334,6 +1334,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr<SerializedScriptValue> stat
+@@ -1335,6 +1335,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr<SerializedScriptValue> stat
}
m_client->dispatchDidNavigateWithinPage();
@@ -5260,7 +5171,7 @@ index 81336952a927d10a54a5282edef51d67024a3d91..6f042943462e1c69ccffd57cf49724d0
document->statePopped(stateObject ? stateObject.releaseNonNull() : SerializedScriptValue::nullValue());
m_client->dispatchDidPopStateWithinPage();
-@@ -1876,6 +1877,7 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
+@@ -1879,6 +1880,7 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
const String& httpMethod = loader->request().httpMethod();
if (shouldPerformFragmentNavigation(isFormSubmission, httpMethod, policyChecker().loadType(), newURL)) {
@@ -5268,7 +5179,7 @@ index 81336952a927d10a54a5282edef51d67024a3d91..6f042943462e1c69ccffd57cf49724d0
RefPtr oldDocumentLoader = m_documentLoader;
NavigationAction action { frame->protectedDocument().releaseNonNull(), loader->request(), InitiatedByMainFrame::Unknown, loader->isRequestFromClientOrUserInput(), policyChecker().loadType(), isFormSubmission };
-@@ -1914,7 +1916,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
+@@ -1917,7 +1919,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
auto policyDecisionMode = loader->triggeringAction().isFromNavigationAPI() ? PolicyDecisionMode::Synchronous : PolicyDecisionMode::Asynchronous;
RELEASE_ASSERT(!isBackForwardLoadType(policyChecker().loadType()) || history().provisionalItem());
@@ -5278,7 +5189,7 @@ index 81336952a927d10a54a5282edef51d67024a3d91..6f042943462e1c69ccffd57cf49724d0
continueLoadAfterNavigationPolicy(request, RefPtr { weakFormState.get() }.get(), navigationPolicyDecision, allowNavigationToInvalidURL);
completionHandler();
}, policyDecisionMode);
-@@ -3250,10 +3254,15 @@ String FrameLoader::userAgent(const URL& url) const
+@@ -3255,10 +3259,15 @@ String FrameLoader::userAgent(const URL& url) const
String FrameLoader::navigatorPlatform() const
{
@@ -5296,7 +5207,7 @@ index 81336952a927d10a54a5282edef51d67024a3d91..6f042943462e1c69ccffd57cf49724d0
}
void FrameLoader::dispatchOnloadEvents()
-@@ -3715,6 +3724,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error, LoadWill
+@@ -3719,6 +3728,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error, LoadWill
checkCompleted();
if (frame->page())
checkLoadComplete(loadWillContinueInAnotherProcess);
@@ -5305,7 +5216,7 @@ index 81336952a927d10a54a5282edef51d67024a3d91..6f042943462e1c69ccffd57cf49724d0
}
void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, const SecurityOrigin* requesterOrigin, bool shouldContinue, NavigationHistoryBehavior historyHandling)
-@@ -4672,9 +4683,6 @@ String FrameLoader::referrer() const
+@@ -4668,9 +4679,6 @@ String FrameLoader::referrer() const
void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
{
@@ -5315,7 +5226,7 @@ index 81336952a927d10a54a5282edef51d67024a3d91..6f042943462e1c69ccffd57cf49724d0
Vector<Ref<DOMWrapperWorld>> worlds;
ScriptController::getAllWorlds(worlds);
for (auto& world : worlds)
-@@ -4684,13 +4692,12 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
+@@ -4680,13 +4688,12 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world)
{
Ref frame = m_frame.get();
@@ -5336,10 +5247,10 @@ index 81336952a927d10a54a5282edef51d67024a3d91..6f042943462e1c69ccffd57cf49724d0
InspectorInstrumentation::didClearWindowObjectInWorld(frame, world);
}
diff --git a/Source/WebCore/loader/LoaderStrategy.h b/Source/WebCore/loader/LoaderStrategy.h
-index 31d9bf99b45e972aab694f3f5d6f48ab73f8a85d..9ff42c5fc8ca162128fa853e0c36b87cd29301c2 100644
+index 2ab5e8426274fcf96f6ea97ca816a4e166876ed1..291f5a495d4f3af67a766d7f51e18e4e9c399cc5 100644
--- a/Source/WebCore/loader/LoaderStrategy.h
+++ b/Source/WebCore/loader/LoaderStrategy.h
-@@ -86,6 +86,7 @@ public:
+@@ -89,6 +89,7 @@ public:
virtual bool isOnLine() const = 0;
virtual void addOnlineStateChangeListener(Function<void(bool)>&&) = 0;
@@ -5347,21 +5258,8 @@ index 31d9bf99b45e972aab694f3f5d6f48ab73f8a85d..9ff42c5fc8ca162128fa853e0c36b87c
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 181ebdf4bc5665aa808eebc29c005533a7bf06fe..4fb3f9fb2703189f96ca6863f57b0517f373378a 100644
---- a/Source/WebCore/loader/NavigationScheduler.cpp
-+++ b/Source/WebCore/loader/NavigationScheduler.cpp
-@@ -828,7 +828,7 @@ void NavigationScheduler::startTimer()
-
- Seconds delay = 1_s * m_redirect->delay();
- m_timer.startOneShot(delay);
-- InspectorInstrumentation::frameScheduledNavigation(frame, delay);
-+ InspectorInstrumentation::frameScheduledNavigation(frame, delay, m_redirect->targetIsCurrentFrame());
- m_redirect->didStartTimer(frame, m_timer); // m_redirect may be null on return (e.g. the client canceled the load)
- }
-
diff --git a/Source/WebCore/loader/ProgressTracker.cpp b/Source/WebCore/loader/ProgressTracker.cpp
-index 44b78d002e37a4850da17b2a265664b9aeaaacfe..011b696dbcd01673623384e6e4dc62e439e9c1dc 100644
+index 48105098fe5559ba6a668df6e10391b70327c9c6..b8ee8e094a9b8f383379f364e586cdaa6315af67 100644
--- a/Source/WebCore/loader/ProgressTracker.cpp
+++ b/Source/WebCore/loader/ProgressTracker.cpp
@@ -163,6 +163,8 @@ void ProgressTracker::progressCompleted(LocalFrame& frame)
@@ -5383,7 +5281,7 @@ index 44b78d002e37a4850da17b2a265664b9aeaaacfe..011b696dbcd01673623384e6e4dc62e4
}
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
-index 32762aa1a9fc99396eef869712e246f1f6f8b2b9..4421250371bbd354efea32ba3339daca5830da45 100644
+index 6d78143371282d29ade0ae86f54bdec1e495cb39..a6cdf8022abd836425c1224cac5602bc92ef7235 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
@@ -1121,8 +1121,11 @@ ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requ
@@ -5400,7 +5298,7 @@ index 32762aa1a9fc99396eef869712e246f1f6f8b2b9..4421250371bbd354efea32ba3339daca
if (RefPtr documentLoader = m_documentLoader.get()) {
bool madeHTTPS { request.resourceRequest().wasSchemeOptimisticallyUpgraded() };
-@@ -1757,8 +1760,9 @@ Vector<Ref<SVGImage>> CachedResourceLoader::allCachedSVGImages() const
+@@ -1758,8 +1761,9 @@ Vector<Ref<SVGImage>> CachedResourceLoader::allCachedSVGImages() const
ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::preload(CachedResource::Type type, CachedResourceRequest&& request)
{
@@ -5413,10 +5311,10 @@ index 32762aa1a9fc99396eef869712e246f1f6f8b2b9..4421250371bbd354efea32ba3339daca
RefPtr document = m_document.get();
ASSERT(document);
diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h
-index 21c2bbf6c049ef1af19cd78f769af84608914761..afd373b6c553fce8020f1e3832615e4e4347c82e 100644
+index 29f97b1ce6fe791d79f7e0551ff28177bb777843..4ccd94a3bc1c6f0eec47a32297d16b6eaf85173f 100644
--- a/Source/WebCore/page/ChromeClient.h
+++ b/Source/WebCore/page/ChromeClient.h
-@@ -385,7 +385,7 @@ public:
+@@ -366,7 +366,7 @@ public:
#endif
#if ENABLE(ORIENTATION_EVENTS)
@@ -5426,10 +5324,10 @@ index 21c2bbf6c049ef1af19cd78f769af84608914761..afd373b6c553fce8020f1e3832615e4e
virtual RefPtr<ColorChooser> createColorChooser(ColorChooserClient&, const Color&) = 0;
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
-index f936eb54cafd3a196082b3cc5df4a0541bad75ec..06c159e98ce09f261293b47b4136c212f9656db5 100644
+index f4b2f2a8fa6fe7928cf264c2bd75bccc3ebce4f7..1d31e44020610fc76ed0bc8d1765b6942f54458e 100644
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
-@@ -4538,6 +4538,12 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr
+@@ -4721,6 +4721,12 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr
if (!document)
return false;
@@ -5442,7 +5340,7 @@ index f936eb54cafd3a196082b3cc5df4a0541bad75ec..06c159e98ce09f261293b47b4136c212
dragState().dataTransfer = DataTransfer::createForDrag(*document);
auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No;
-@@ -5142,6 +5148,7 @@ static HitTestResult hitTestResultInFrame(LocalFrame* frame, const LayoutPoint&
+@@ -5325,6 +5331,7 @@ static HitTestResult hitTestResultInFrame(LocalFrame* frame, const LayoutPoint&
return result;
}
@@ -5450,7 +5348,7 @@ index f936eb54cafd3a196082b3cc5df4a0541bad75ec..06c159e98ce09f261293b47b4136c212
Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
{
Ref frame = m_frame.get();
-@@ -5215,7 +5222,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+@@ -5398,7 +5405,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;
@@ -5459,7 +5357,7 @@ index f936eb54cafd3a196082b3cc5df4a0541bad75ec..06c159e98ce09f261293b47b4136c212
bool pointerCancelled = false;
#endif
RefPtr<EventTarget> touchTarget;
-@@ -5262,7 +5269,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+@@ -5445,7 +5452,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
// we also remove it from the map.
touchTarget = m_originatingTouchPointTargets.take(touchPointTargetKey);
@@ -5468,7 +5366,7 @@ index f936eb54cafd3a196082b3cc5df4a0541bad75ec..06c159e98ce09f261293b47b4136c212
HitTestResult result = hitTestResultAtPoint(pagePoint, hitType | HitTestRequest::Type::AllowChildFrameContent);
pointerTarget = result.targetElement();
pointerCancelled = (pointerTarget != touchTarget);
-@@ -5285,7 +5292,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+@@ -5468,7 +5475,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
if (!targetFrame)
continue;
@@ -5477,7 +5375,7 @@ index f936eb54cafd3a196082b3cc5df4a0541bad75ec..06c159e98ce09f261293b47b4136c212
// 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) {
-@@ -5372,6 +5379,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+@@ -5555,6 +5562,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
return swallowedEvent;
}
@@ -5486,10 +5384,10 @@ index f936eb54cafd3a196082b3cc5df4a0541bad75ec..06c159e98ce09f261293b47b4136c212
#if ENABLE(TOUCH_EVENTS)
diff --git a/Source/WebCore/page/FocusController.cpp b/Source/WebCore/page/FocusController.cpp
-index e6db35ac9107cd946660165d18fb9598b1a51fa7..e7befc07490d52f518aab1a212edde1b8f1f621d 100644
+index 22583fed98df02646b25410c9d6528005350f37f..7222c97da3878e77960f47aac6f747a06157f059 100644
--- a/Source/WebCore/page/FocusController.cpp
+++ b/Source/WebCore/page/FocusController.cpp
-@@ -613,13 +613,14 @@ bool FocusController::relinquishFocusToChrome(FocusDirection direction)
+@@ -617,13 +617,14 @@ bool FocusController::relinquishFocusToChrome(FocusDirection direction)
return false;
Ref page = m_page.get();
@@ -5506,6 +5404,35 @@ index e6db35ac9107cd946660165d18fb9598b1a51fa7..e7befc07490d52f518aab1a212edde1b
return true;
}
+diff --git a/Source/WebCore/page/FrameConsoleClient.cpp b/Source/WebCore/page/FrameConsoleClient.cpp
+index ec1ebf9ce1d2501bc8fb39772a9cbc24d562fac5..de5d867d6cea82ebf36385da5792a46367c4b1e6 100644
+--- a/Source/WebCore/page/FrameConsoleClient.cpp
++++ b/Source/WebCore/page/FrameConsoleClient.cpp
+@@ -476,4 +476,12 @@ void FrameConsoleClient::screenshot(JSC::JSGlobalObject* lexicalGlobalObject, Re
+ addMessage(makeUnique<Inspector::ConsoleMessage>(MessageSource::ConsoleAPI, MessageType::Image, MessageLevel::Log, dataURL, WTFMove(arguments), lexicalGlobalObject, 0, timestamp));
+ }
+
++void FrameConsoleClient::bindingCalled(JSC::JSGlobalObject* globalObject, const String& name, const String& arg)
++{
++ RefPtr frame = m_frame.get();
++ if (!frame)
++ return;
++ InspectorInstrumentation::bindingCalled(*frame->page(), globalObject, name, arg);
++}
++
+ } // namespace WebCore
+diff --git a/Source/WebCore/page/FrameConsoleClient.h b/Source/WebCore/page/FrameConsoleClient.h
+index 66c57501b719d3c58ab8d6f780d9e7e7b5df3745..0e31080ca92bf2095d592cbccb1838cf4a00d6ca 100644
+--- a/Source/WebCore/page/FrameConsoleClient.h
++++ b/Source/WebCore/page/FrameConsoleClient.h
+@@ -92,6 +92,7 @@ private:
+ void record(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
+ void recordEnd(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
+ void screenshot(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
++ void bindingCalled(JSC::JSGlobalObject*, const String& name, const String& arg) override;
+
+ WeakRef<LocalFrame> m_frame;
+ };
diff --git a/Source/WebCore/page/FrameSnapshotting.cpp b/Source/WebCore/page/FrameSnapshotting.cpp
index c0f0a17079be7a5574c40fdbbdeeedd3a45ef078..b6480851049f40e9f64926dda0407bb4d3be97e7 100644
--- a/Source/WebCore/page/FrameSnapshotting.cpp
@@ -5541,7 +5468,7 @@ index c0f0a17079be7a5574c40fdbbdeeedd3a45ef078..b6480851049f40e9f64926dda0407bb4
}
diff --git a/Source/WebCore/page/FrameSnapshotting.h b/Source/WebCore/page/FrameSnapshotting.h
-index 77611af092f6afa507b1d42a98c3c1bef7736e0f..e0f94ad9b728bc02b08f15a43dcabd65099aec7e 100644
+index 4935bfd9a6e43d59a101c153fa89a8484fcb49e2..8384f5b5db8e405f86e1201d144d92d76a1a5ebd 100644
--- a/Source/WebCore/page/FrameSnapshotting.h
+++ b/Source/WebCore/page/FrameSnapshotting.h
@@ -59,6 +59,7 @@ enum class SnapshotFlags : uint16_t {
@@ -5553,7 +5480,7 @@ index 77611af092f6afa507b1d42a98c3c1bef7736e0f..e0f94ad9b728bc02b08f15a43dcabd65
struct SnapshotOptions {
diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp
-index 3513f1c7cc2763d0c15a4fc85a24e341f30dcc6a..0c6c68d1189743d6104a38b47295c9af3a691049 100644
+index 221c0273606e72f0b8c36e822a0115d3cd1e0add..a674c72ea49aefae98affd84331539f8a03a0049 100644
--- a/Source/WebCore/page/History.cpp
+++ b/Source/WebCore/page/History.cpp
@@ -32,6 +32,7 @@
@@ -5564,7 +5491,7 @@ index 3513f1c7cc2763d0c15a4fc85a24e341f30dcc6a..0c6c68d1189743d6104a38b47295c9af
#include "LocalFrame.h"
#include "LocalFrameLoaderClient.h"
#include "Logging.h"
-@@ -309,6 +310,8 @@ ExceptionOr<void> History::stateObjectAdded(RefPtr<SerializedScriptValue>&& data
+@@ -310,6 +311,8 @@ ExceptionOr<void> History::stateObjectAdded(RefPtr<SerializedScriptValue>&& data
}
frame->loader().updateURLAndHistory(fullURL, WTFMove(data), historyBehavior);
@@ -5574,7 +5501,7 @@ index 3513f1c7cc2763d0c15a4fc85a24e341f30dcc6a..0c6c68d1189743d6104a38b47295c9af
}
diff --git a/Source/WebCore/page/LocalFrame.cpp b/Source/WebCore/page/LocalFrame.cpp
-index 4fa15f4aaf094cd582d17258955ec9dd7a6e4b4d..7843f89d325eabba5e68f0a2ffd9a346b7b0561e 100644
+index 225fa07a08763d986141eb5cc2fb3f8dd4c5598d..c99e75c04355479d97ace4f1e2c14955f585a2d1 100644
--- a/Source/WebCore/page/LocalFrame.cpp
+++ b/Source/WebCore/page/LocalFrame.cpp
@@ -42,6 +42,7 @@
@@ -5585,7 +5512,7 @@ index 4fa15f4aaf094cd582d17258955ec9dd7a6e4b4d..7843f89d325eabba5e68f0a2ffd9a346
#include "DiagnosticLoggingClient.h"
#include "DiagnosticLoggingKeys.h"
#include "DocumentLoader.h"
-@@ -60,6 +61,7 @@
+@@ -62,6 +63,7 @@
#include "FrameSelection.h"
#include "GraphicsContext.h"
#include "GraphicsLayer.h"
@@ -5593,7 +5520,7 @@ index 4fa15f4aaf094cd582d17258955ec9dd7a6e4b4d..7843f89d325eabba5e68f0a2ffd9a346
#include "HTMLAttachmentElement.h"
#include "HTMLFormControlElement.h"
#include "HTMLFormElement.h"
-@@ -82,6 +84,7 @@
+@@ -84,6 +86,7 @@
#include "Logging.h"
#include "Navigator.h"
#include "NodeList.h"
@@ -5601,7 +5528,7 @@ index 4fa15f4aaf094cd582d17258955ec9dd7a6e4b4d..7843f89d325eabba5e68f0a2ffd9a346
#include "NodeTraversal.h"
#include "Page.h"
#include "PaymentSession.h"
-@@ -217,6 +220,7 @@ LocalFrame::LocalFrame(Page& page, ClientCreator&& clientCreator, FrameIdentifie
+@@ -216,6 +219,7 @@ LocalFrame::LocalFrame(Page& page, ClientCreator&& clientCreator, FrameIdentifie
void LocalFrame::init()
{
@@ -5618,8 +5545,8 @@ index 4fa15f4aaf094cd582d17258955ec9dd7a6e4b4d..7843f89d325eabba5e68f0a2ffd9a346
return 0;
}
#endif // ENABLE(ORIENTATION_EVENTS)
-@@ -1599,6 +1603,364 @@ RefPtr<SecurityOrigin> LocalFrame::frameDocumentSecurityOrigin() const
- return nullptr;
+@@ -1647,6 +1651,364 @@ Ref<FrameInspectorController> LocalFrame::protectedInspectorController()
+ return m_inspectorController.get();
}
+#if !PLATFORM(IOS_FAMILY)
@@ -5984,7 +5911,7 @@ index 4fa15f4aaf094cd582d17258955ec9dd7a6e4b4d..7843f89d325eabba5e68f0a2ffd9a346
#undef FRAME_RELEASE_LOG_ERROR
diff --git a/Source/WebCore/page/LocalFrame.h b/Source/WebCore/page/LocalFrame.h
-index d70f9309f700129769d61d7fa697c6e49f55bb44..2647e60e824395d50cd0da90a32f9ead0bfe4892 100644
+index f58a04b7d8d985e05cffa434f4ed4e12f7d80698..730c98188deeabc4c2da3e06ffcff4c1ae6db95e 100644
--- a/Source/WebCore/page/LocalFrame.h
+++ b/Source/WebCore/page/LocalFrame.h
@@ -29,6 +29,7 @@
@@ -5995,7 +5922,7 @@ index d70f9309f700129769d61d7fa697c6e49f55bb44..2647e60e824395d50cd0da90a32f9ead
#include <WebCore/ScrollbarMode.h>
#include <wtf/CheckedRef.h>
#include <wtf/HashSet.h>
-@@ -122,8 +123,8 @@ enum {
+@@ -125,8 +126,8 @@ enum {
};
enum OverflowScrollAction { DoNotPerformOverflowScroll, PerformOverflowScroll };
@@ -6005,7 +5932,7 @@ index d70f9309f700129769d61d7fa697c6e49f55bb44..2647e60e824395d50cd0da90a32f9ead
class LocalFrame final : public Frame {
public:
-@@ -229,10 +230,6 @@ public:
+@@ -235,10 +236,6 @@ public:
WEBCORE_EXPORT DataDetectionResultsStorage& dataDetectionResults();
#endif
@@ -6016,7 +5943,7 @@ index d70f9309f700129769d61d7fa697c6e49f55bb44..2647e60e824395d50cd0da90a32f9ead
WEBCORE_EXPORT Node* deepestNodeAtLocation(const FloatPoint& viewportLocation);
WEBCORE_EXPORT Node* nodeRespondingToClickEvents(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, SecurityOrigin* = nullptr);
WEBCORE_EXPORT Node* nodeRespondingToDoubleClickEvent(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation);
-@@ -240,6 +237,10 @@ public:
+@@ -246,6 +243,10 @@ public:
WEBCORE_EXPORT Node* nodeRespondingToScrollWheelEvents(const FloatPoint& viewportLocation);
WEBCORE_EXPORT Node* approximateNodeAtViewportLocationLegacy(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation);
@@ -6027,7 +5954,7 @@ index d70f9309f700129769d61d7fa697c6e49f55bb44..2647e60e824395d50cd0da90a32f9ead
WEBCORE_EXPORT NSArray *wordsInCurrentParagraph() const;
WEBCORE_EXPORT CGRect renderRectForPoint(CGPoint, bool* isReplaced, float* fontSize) const;
-@@ -307,6 +308,7 @@ public:
+@@ -313,6 +314,7 @@ public:
WEBCORE_EXPORT FloatSize screenSize() const;
void setOverrideScreenSize(FloatSize&&);
@@ -6035,7 +5962,7 @@ index d70f9309f700129769d61d7fa697c6e49f55bb44..2647e60e824395d50cd0da90a32f9ead
void selfOnlyRef();
void selfOnlyDeref();
-@@ -378,7 +380,6 @@ private:
+@@ -393,7 +395,6 @@ private:
#if ENABLE(DATA_DETECTION)
std::unique_ptr<DataDetectionResultsStorage> m_dataDetectionResults;
#endif
@@ -6043,7 +5970,7 @@ index d70f9309f700129769d61d7fa697c6e49f55bb44..2647e60e824395d50cd0da90a32f9ead
void betterApproximateNode(const IntPoint& testPoint, const NodeQualifier&, Node*& best, Node* failedNode, IntPoint& bestPoint, IntRect& bestRect, const IntRect& testRect);
bool hitTestResultAtViewportLocation(const FloatPoint& viewportLocation, HitTestResult&, IntPoint& center);
-@@ -386,6 +387,7 @@ private:
+@@ -401,6 +402,7 @@ private:
enum class ShouldFindRootEditableElement : bool { No, Yes };
Node* qualifyingNodeAtViewportLocation(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, const NodeQualifier&, ShouldApproximate, ShouldFindRootEditableElement = ShouldFindRootEditableElement::Yes);
@@ -6051,11 +5978,28 @@ index d70f9309f700129769d61d7fa697c6e49f55bb44..2647e60e824395d50cd0da90a32f9ead
void setTimersPausedInternal(bool);
const UniqueRef<ViewportArguments> m_viewportArguments;
+diff --git a/Source/WebCore/page/Navigation.cpp b/Source/WebCore/page/Navigation.cpp
+index bcff12eb045a53365d90988679d4c4740f3489da..3a7800b80d16a8c0479a619e61ead5ff21e17b84 100644
+--- a/Source/WebCore/page/Navigation.cpp
++++ b/Source/WebCore/page/Navigation.cpp
+@@ -161,8 +161,10 @@ void Navigation::initializeForNewWindow(std::optional<NavigationNavigationType>
+
+ m_currentEntryIndex = getEntryIndexOfHistoryItem(m_entries, *currentItem);
+
+- ASSERT(navigationType);
+- m_activation = NavigationActivation::create(*navigationType, *currentEntry(), WTFMove(previousEntry));
++ if (m_currentEntryIndex) {
++ ASSERT(navigationType);
++ m_activation = NavigationActivation::create(*navigationType, *currentEntry(), WTFMove(previousEntry));
++ }
+
+ return;
+ }
diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
-index 83b514b6eb976273023e990d1d47d13ab7fc7119..a893465443a91d6b51ffdfeccba050e5834f8546 100644
+index 6f2b8ef8748bcf5a9a3f4abd30df2a2a8703f34b..78dc7bd99ffa49b43ce0a8009011af681c9bc556 100644
--- a/Source/WebCore/page/Page.cpp
+++ b/Source/WebCore/page/Page.cpp
-@@ -673,6 +673,45 @@ void Page::setOverrideViewportArguments(const std::optional<ViewportArguments>&
+@@ -676,6 +676,45 @@ void Page::setOverrideViewportArguments(const std::optional<ViewportArguments>&
localTopDocument->updateViewportArguments();
}
@@ -6101,7 +6045,7 @@ index 83b514b6eb976273023e990d1d47d13ab7fc7119..a893465443a91d6b51ffdfeccba050e5
ScrollingCoordinator* Page::scrollingCoordinator()
{
if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) {
-@@ -4337,6 +4376,26 @@ void Page::setUseDarkAppearanceOverride(std::optional<bool> valueOverride)
+@@ -4379,6 +4418,26 @@ void Page::setUseDarkAppearanceOverride(std::optional<bool> valueOverride)
appearanceDidChange();
}
@@ -6129,10 +6073,10 @@ index 83b514b6eb976273023e990d1d47d13ab7fc7119..a893465443a91d6b51ffdfeccba050e5
{
if (insets == m_fullscreenInsets)
diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
-index cceec7c43b52e8eb1ee7636c8696d25900242fce..ff3981aa969c09def9499dc83b9794e05cd5086a 100644
+index 4d3d400560b95af2f632f36597a0628d58911445..102f5efc2e43d668d703c0941d0cb7687c3b2d44 100644
--- a/Source/WebCore/page/Page.h
+++ b/Source/WebCore/page/Page.h
-@@ -396,6 +396,9 @@ public:
+@@ -407,6 +407,9 @@ public:
const ViewportArguments* overrideViewportArguments() const { return m_overrideViewportArguments.get(); }
WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional<ViewportArguments>&);
@@ -6142,7 +6086,7 @@ index cceec7c43b52e8eb1ee7636c8696d25900242fce..ff3981aa969c09def9499dc83b9794e0
static void refreshPlugins(bool reload);
WEBCORE_EXPORT PluginData& pluginData();
WEBCORE_EXPORT Ref<PluginData> protectedPluginData();
-@@ -493,6 +496,10 @@ public:
+@@ -506,6 +509,10 @@ public:
#if ENABLE(DRAG_SUPPORT)
DragController& dragController() { return m_dragController.get(); }
const DragController& dragController() const { return m_dragController.get(); }
@@ -6153,7 +6097,7 @@ index cceec7c43b52e8eb1ee7636c8696d25900242fce..ff3981aa969c09def9499dc83b9794e0
#endif
FocusController& focusController() const { return m_focusController; }
#if ENABLE(CONTEXT_MENUS)
-@@ -676,6 +683,10 @@ public:
+@@ -696,6 +703,10 @@ public:
WEBCORE_EXPORT void setUseColorAppearance(bool useDarkAppearance, bool useElevatedUserInterfaceLevel);
bool defaultUseDarkAppearance() const { return m_useDarkAppearance; }
void setUseDarkAppearanceOverride(std::optional<bool>);
@@ -6164,7 +6108,7 @@ index cceec7c43b52e8eb1ee7636c8696d25900242fce..ff3981aa969c09def9499dc83b9794e0
#if ENABLE(TEXT_AUTOSIZING)
float textAutosizingWidth() const { return m_textAutosizingWidth; }
-@@ -1153,6 +1164,11 @@ public:
+@@ -1168,6 +1179,11 @@ public:
WEBCORE_EXPORT void setInteractionRegionsEnabled(bool);
#endif
@@ -6176,7 +6120,7 @@ index cceec7c43b52e8eb1ee7636c8696d25900242fce..ff3981aa969c09def9499dc83b9794e0
#if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY)
DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); }
#endif
-@@ -1454,6 +1470,9 @@ private:
+@@ -1479,6 +1495,9 @@ private:
#if ENABLE(DRAG_SUPPORT)
const UniqueRef<DragController> m_dragController;
@@ -6186,7 +6130,7 @@ index cceec7c43b52e8eb1ee7636c8696d25900242fce..ff3981aa969c09def9499dc83b9794e0
#endif
const UniqueRef<FocusController> m_focusController;
#if ENABLE(CONTEXT_MENUS)
-@@ -1532,6 +1551,8 @@ private:
+@@ -1557,6 +1576,8 @@ private:
bool m_useElevatedUserInterfaceLevel { false };
bool m_useDarkAppearance { false };
std::optional<bool> m_useDarkAppearanceOverride;
@@ -6195,7 +6139,7 @@ index cceec7c43b52e8eb1ee7636c8696d25900242fce..ff3981aa969c09def9499dc83b9794e0
#if ENABLE(TEXT_AUTOSIZING)
float m_textAutosizingWidth { 0 };
-@@ -1713,6 +1734,11 @@ private:
+@@ -1735,6 +1756,11 @@ private:
#endif
std::unique_ptr<ViewportArguments> m_overrideViewportArguments;
@@ -6207,32 +6151,6 @@ index cceec7c43b52e8eb1ee7636c8696d25900242fce..ff3981aa969c09def9499dc83b9794e0
#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 ae9e4dc7c8573235ad05777d0d4e7d1a0d3a9f94..d5fb47d14fea90b4fb87ffeb65148bca3d9257cf 100644
---- a/Source/WebCore/page/PageConsoleClient.cpp
-+++ b/Source/WebCore/page/PageConsoleClient.cpp
-@@ -456,4 +456,9 @@ Ref<Page> PageConsoleClient::protectedPage() const
- return m_page.get();
- }
-
-+void PageConsoleClient::bindingCalled(JSC::JSGlobalObject* globalObject, const String& name, const String& arg)
-+{
-+ InspectorInstrumentation::bindingCalled(m_page, globalObject, name, arg);
-+}
-+
- } // namespace WebCore
-diff --git a/Source/WebCore/page/PageConsoleClient.h b/Source/WebCore/page/PageConsoleClient.h
-index 153fc36199f26adbfb61cbef6744ffe31a68b951..cc667e06700013fd5e994467e19536d2e4cab189 100644
---- a/Source/WebCore/page/PageConsoleClient.h
-+++ b/Source/WebCore/page/PageConsoleClient.h
-@@ -86,6 +86,7 @@ private:
- void record(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
- void recordEnd(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
- void screenshot(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
-+ void bindingCalled(JSC::JSGlobalObject*, const String& name, const String& arg) override;
-
- Ref<Page> protectedPage() const;
-
diff --git a/Source/WebCore/page/PointerCaptureController.cpp b/Source/WebCore/page/PointerCaptureController.cpp
index a4644c7a7a7f5bd55701972c4a8e716b82bde08f..5a0b18b5c842db0cfe63fd42ec402c27782ac5a0 100644
--- a/Source/WebCore/page/PointerCaptureController.cpp
@@ -6256,10 +6174,10 @@ index a4644c7a7a7f5bd55701972c4a8e716b82bde08f..5a0b18b5c842db0cfe63fd42ec402c27
#endif
diff --git a/Source/WebCore/page/PointerCaptureController.h b/Source/WebCore/page/PointerCaptureController.h
-index 5dae225aa25a0421b7e52c9f280795fd6d703113..6482208d93440ec2d5ef8654bc4125745df87464 100644
+index f893be35388e1fb933e369e616ebd6f4e55900a3..937be6100c16a1625f99f02efe2d6d14df1465a0 100644
--- a/Source/WebCore/page/PointerCaptureController.h
+++ b/Source/WebCore/page/PointerCaptureController.h
-@@ -60,7 +60,7 @@ public:
+@@ -63,7 +63,7 @@ public:
RefPtr<PointerEvent> pointerEventForMouseEvent(const MouseEvent&, PointerID, const String& pointerType);
@@ -6268,7 +6186,7 @@ index 5dae225aa25a0421b7e52c9f280795fd6d703113..6482208d93440ec2d5ef8654bc412574
void dispatchEventForTouchAtIndex(EventTarget&, const PlatformTouchEvent&, unsigned, bool isPrimary, WindowProxy&, const DoublePoint&);
#endif
-@@ -81,12 +81,12 @@ private:
+@@ -84,12 +84,12 @@ private:
WeakPtr<Document, WeakPtrImplWithEventTargetData> activeDocument;
RefPtr<Element> pendingTargetOverride;
RefPtr<Element> targetOverride;
@@ -6284,10 +6202,10 @@ index 5dae225aa25a0421b7e52c9f280795fd6d703113..6482208d93440ec2d5ef8654bc412574
#endif
;
diff --git a/Source/WebCore/page/Screen.cpp b/Source/WebCore/page/Screen.cpp
-index c45965ee6b7fe6c066871b87d7883e639a849adb..16c3a5b027222d1de5bb540c71c0b6aa107c4657 100644
+index cb7069099b5983761e38f7474e0a2a9dbdd8e127..eeef89846d28005372412f46ea04c7e087d978a6 100644
--- a/Source/WebCore/page/Screen.cpp
+++ b/Source/WebCore/page/Screen.cpp
-@@ -124,6 +124,9 @@ int Screen::availLeft() const
+@@ -125,6 +125,9 @@ int Screen::availLeft() const
if (shouldApplyScreenFingerprintingProtections(*frame))
return 0;
@@ -6297,7 +6215,7 @@ index c45965ee6b7fe6c066871b87d7883e639a849adb..16c3a5b027222d1de5bb540c71c0b6aa
return static_cast<int>(screenAvailableRect(frame->protectedView().get()).x());
}
-@@ -139,6 +142,9 @@ int Screen::availTop() const
+@@ -140,6 +143,9 @@ int Screen::availTop() const
if (shouldApplyScreenFingerprintingProtections(*frame))
return 0;
@@ -6307,7 +6225,7 @@ index c45965ee6b7fe6c066871b87d7883e639a849adb..16c3a5b027222d1de5bb540c71c0b6aa
return static_cast<int>(screenAvailableRect(frame->protectedView().get()).y());
}
-@@ -154,6 +160,9 @@ int Screen::availHeight() const
+@@ -155,6 +161,9 @@ int Screen::availHeight() const
if (shouldApplyScreenFingerprintingProtections(*frame))
return static_cast<int>(frame->screenSize().height());
@@ -6317,7 +6235,7 @@ index c45965ee6b7fe6c066871b87d7883e639a849adb..16c3a5b027222d1de5bb540c71c0b6aa
return static_cast<int>(screenAvailableRect(frame->protectedView().get()).height());
}
-@@ -169,6 +178,9 @@ int Screen::availWidth() const
+@@ -170,6 +179,9 @@ int Screen::availWidth() const
if (shouldApplyScreenFingerprintingProtections(*frame))
return static_cast<int>(frame->screenSize().width());
@@ -6328,10 +6246,10 @@ index c45965ee6b7fe6c066871b87d7883e639a849adb..16c3a5b027222d1de5bb540c71c0b6aa
}
diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
-index 0b7b89981e028a0eb80b279470e7f9bc8161a419..a3b806975380f8eff991b54be481d0173bd76b58 100644
+index 4def6177eda669ebf2a48537afc25ed564e19108..b2cdbe97821585bc32fa4a6238c63552628445bd 100644
--- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
+++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
-@@ -352,6 +352,8 @@ template<typename Predicate, typename... Args>
+@@ -353,6 +353,8 @@ template<typename Predicate, typename... Args>
bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, Predicate&& predicate, Args&&... args) const
requires (!std::is_convertible_v<Predicate, ContentSecurityPolicy::ViolatedDirectiveCallback>)
{
@@ -6340,7 +6258,7 @@ index 0b7b89981e028a0eb80b279470e7f9bc8161a419..a3b806975380f8eff991b54be481d017
bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly;
for (auto& policy : m_policies) {
if (policy->isReportOnly() != isReportOnly)
-@@ -365,6 +367,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
+@@ -366,6 +368,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
template<typename Predicate, typename... Args>
bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, ViolatedDirectiveCallback&& callback, Predicate&& predicate, Args&&... args) const
{
@@ -6349,7 +6267,7 @@ index 0b7b89981e028a0eb80b279470e7f9bc8161a419..a3b806975380f8eff991b54be481d017
bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly;
bool isAllowed = true;
for (auto& policy : m_policies) {
-@@ -381,6 +385,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
+@@ -382,6 +386,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
template<typename Predicate, typename... Args>
bool ContentSecurityPolicy::allPoliciesAllow(NOESCAPE const ViolatedDirectiveCallback& callback, Predicate&& predicate, Args&&... args) const
{
@@ -6447,10 +6365,10 @@ index 0000000000000000000000000000000000000000..7bea08826a16de4774a55c81ccba0d81
+
+}
diff --git a/Source/WebCore/platform/DragData.h b/Source/WebCore/platform/DragData.h
-index 31e1e62bf7726eb5914be18671ef9ebab401fff2..56243558488229b44ca7a18f444945b3d60ebeff 100644
+index c0dcbbb5f740871254f9bb1e0b56c638f2501cb1..5db61fd8ac5b1451e2bda863464c8e8251b68f64 100644
--- a/Source/WebCore/platform/DragData.h
+++ b/Source/WebCore/platform/DragData.h
-@@ -92,8 +92,8 @@ public:
+@@ -93,8 +93,8 @@ public:
// is initialized by the decoder and not in the constructor.
DragData() = default;
#if PLATFORM(WIN)
@@ -6461,7 +6379,7 @@ index 31e1e62bf7726eb5914be18671ef9ebab401fff2..56243558488229b44ca7a18f444945b3
void getDragFileDescriptorData(int& size, String& pathname);
void getDragFileContentData(int size, void* dataBlob);
#endif
-@@ -143,7 +143,7 @@ private:
+@@ -144,7 +144,7 @@ private:
String m_pasteboardName;
#endif
#if PLATFORM(WIN)
@@ -6470,11 +6388,26 @@ index 31e1e62bf7726eb5914be18671ef9ebab401fff2..56243558488229b44ca7a18f444945b3
#endif
bool m_disallowFileAccess { false };
};
+diff --git a/Source/WebCore/platform/GStreamer.cmake b/Source/WebCore/platform/GStreamer.cmake
+index 86f926e951590926d149a75f6a5aa166ea40db19..1cee66e548af766d6ec872545ae3fa33aaf355f1 100644
+--- a/Source/WebCore/platform/GStreamer.cmake
++++ b/Source/WebCore/platform/GStreamer.cmake
+@@ -1,6 +1,10 @@
+ include(CheckCXXSymbolExists)
+
+ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
++ list(APPEND WebCore_LIBRARIES
++ GLib::GioUnix
++ )
++
+ list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/Modules/mediastream/gstreamer"
+ "${WEBCORE_DIR}/platform/graphics/gstreamer"
diff --git a/Source/WebCore/platform/Pasteboard.h b/Source/WebCore/platform/Pasteboard.h
-index 42fd947c994a56dc28d3813dae9461f5a6a99896..fd7ac7ace714da74fc7b48770d738dc839b39d32 100644
+index 9c281b53044eb2f37ae814a772dd7f01a2b91e9f..05efee508f3ec4e91bf66c1142672d5fc574a81b 100644
--- a/Source/WebCore/platform/Pasteboard.h
+++ b/Source/WebCore/platform/Pasteboard.h
-@@ -311,6 +311,7 @@ public:
+@@ -313,6 +313,7 @@ public:
COMPtr<IDataObject> dataObject() const { return m_dataObject; }
WEBCORE_EXPORT void setExternalDataObject(IDataObject*);
const DragDataMap& dragDataMap() const { return m_dragDataMap; }
@@ -6482,7 +6415,7 @@ index 42fd947c994a56dc28d3813dae9461f5a6a99896..fd7ac7ace714da74fc7b48770d738dc8
void writeURLToWritableDataObject(const URL&, const String&);
COMPtr<WCDataObject> writableDataObject() const { return m_writableDataObject; }
void writeImageToDataObject(Element&, const URL&); // FIXME: Layering violation.
-@@ -381,6 +382,7 @@ private:
+@@ -383,6 +384,7 @@ private:
COMPtr<IDataObject> m_dataObject;
COMPtr<WCDataObject> m_writableDataObject;
DragDataMap m_dragDataMap;
@@ -6491,10 +6424,10 @@ index 42fd947c994a56dc28d3813dae9461f5a6a99896..fd7ac7ace714da74fc7b48770d738dc8
};
diff --git a/Source/WebCore/platform/PlatformKeyboardEvent.h b/Source/WebCore/platform/PlatformKeyboardEvent.h
-index 0982cbbac76c9bf9cbc063fb8bf418f259e4f180..8e344ac89745c91502c0117fb3415cc63c0e8f92 100644
+index 6af0b4f643ec3edd83122637c4e2abdf002ff7ba..fe927a0d5a208ee01fb67e2df235e5b757f8b52c 100644
--- a/Source/WebCore/platform/PlatformKeyboardEvent.h
+++ b/Source/WebCore/platform/PlatformKeyboardEvent.h
-@@ -135,6 +135,7 @@ namespace WebCore {
+@@ -139,6 +139,7 @@ namespace WebCore {
static String keyCodeForHardwareKeyCode(unsigned);
static String keyIdentifierForGdkKeyCode(unsigned);
static int windowsKeyCodeForGdkKeyCode(unsigned);
@@ -6502,7 +6435,7 @@ index 0982cbbac76c9bf9cbc063fb8bf418f259e4f180..8e344ac89745c91502c0117fb3415cc6
static String singleCharacterString(unsigned);
#endif
-@@ -143,6 +144,7 @@ namespace WebCore {
+@@ -147,6 +148,7 @@ namespace WebCore {
static String keyCodeForHardwareKeyCode(unsigned);
static String keyIdentifierForWPEKeyCode(unsigned);
static int windowsKeyCodeForWPEKeyCode(unsigned);
@@ -6540,10 +6473,10 @@ index ef0abc9a93e878897ffc9d2497a3da0fca5b37b7..abd96c6d1a6c3ab9e0121c1e78f2f75a
+} // namespace WebCore
+#endif
diff --git a/Source/WebCore/platform/PlatformScreen.h b/Source/WebCore/platform/PlatformScreen.h
-index 40020a964792d52cb6167292b480cd2b7ade9b2f..ea58cebdea8d903890a5cf97ed4cc683616d86f2 100644
+index 4566e5537a36331a9b5bd75f7235f94d0d9d60d4..195cfe90a57fafb57dc6ff0cabd1fa15b984b979 100644
--- a/Source/WebCore/platform/PlatformScreen.h
+++ b/Source/WebCore/platform/PlatformScreen.h
-@@ -161,10 +161,14 @@ WEBCORE_EXPORT float screenScaleFactor(UIScreen * = nullptr);
+@@ -164,10 +164,14 @@ WEBCORE_EXPORT float screenScaleFactor(UIScreen * = nullptr);
#endif
#if ENABLE(TOUCH_EVENTS)
@@ -6574,7 +6507,7 @@ 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 7db61e8c8092f018719e424a6b8700bbc2588f6a..7e90ae9b7e0616601a56d4881a3092f77cae3773 100644
+index 1e04806dbf9cfb27dda3e5d2c3c61aa66efd8ae6..93aa8e77e9ddd315587cf2c93620874a8eaa91a8 100644
--- a/Source/WebCore/platform/PlatformTouchPoint.h
+++ b/Source/WebCore/platform/PlatformTouchPoint.h
@@ -47,7 +47,7 @@ public:
@@ -6599,10 +6532,10 @@ index da490f391aa2e1876e792d66c08125e86e8a4719..eb8913849dd8934e4b2d60e9c18527ff
platform/graphics/skia/SkiaHarfBuzzFontCache.h
platform/graphics/skia/SkiaPaintingEngine.h
diff --git a/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp b/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp
-index 492c5e76290c2379cda40b9663f5f67ff8f66360..096752985edf39960eb4be6eb733ebe3713313cb 100644
+index 70667bd3d6ec5ace90c169df2783f1b8741de287..f81d431335e4e80321396edc81caaf55ecad1634 100644
--- a/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp
+++ b/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp
-@@ -46,7 +46,7 @@
+@@ -47,7 +47,7 @@
namespace WebCore {
@@ -6612,10 +6545,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 724ec3ea72c056f6666ff8413eab113082f2170c..98d054dbdce598de8949b812fdb3cc7f1d0e4182 100644
+index ffb22298e8f9b336191b3250ff438c2a8de47dc6..a76a55c7ed8a59636ab0129a7af057d4411efed2 100644
--- a/Source/WebCore/platform/graphics/ImageAdapter.h
+++ b/Source/WebCore/platform/graphics/ImageAdapter.h
-@@ -62,6 +62,8 @@ typedef struct HBITMAP__ *HBITMAP;
+@@ -63,6 +63,8 @@ typedef struct HBITMAP__ *HBITMAP;
#include <wtf/RetainPtr.h>
#endif
@@ -6697,7 +6630,7 @@ index 63d2978699a1ff636465def5191395a055e06c32..4c2cf5bd8a83f4ffe23920b77008008a
// Determine the string for this item.
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 027929649ee104ae9bf144291cf0e3ca3f1295b0..d5011dccdb34c881d264ce84a4b78b010efc88fb 100644
+index d1027a2cd6135a95ded90440d472a66e8ab339c8..6f34476d89a531d0be8447cad1e75f23dc5c82bf 100644
--- a/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
+++ b/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
@@ -37,8 +37,10 @@
@@ -6972,7 +6905,7 @@ index 98d93889a1b97450fde21cee53e45111b622dca7..9362518e8351eb8fe5b30a2d7875417b
return getScreenProperties().screenHasTouchDevice;
}
diff --git a/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp b/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
-index a8674916429908cabb86bd95dc5b3da217e1556b..6a464e2b0c1c45cd4e8effba678b8dde9dd870da 100644
+index 3bd964f3b0fd5531bba3981ed9c730accf806424..1a6419d30d433940a9f85b8db6d1c524945f86e7 100644
--- a/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
+++ b/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
@@ -30,9 +30,11 @@
@@ -7235,7 +7168,7 @@ index a8674916429908cabb86bd95dc5b3da217e1556b..6a464e2b0c1c45cd4e8effba678b8dde
{
switch (val) {
diff --git a/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp b/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp
-index b12b8c00f825f40cb98a6436549999ab07202ff8..016efe9bc0898bb648a33973e771b49ed4be5624 100644
+index e47f5bade7c0a27e8a27f8dc95b51174f025b4a6..016efe9bc0898bb648a33973e771b49ed4be5624 100644
--- a/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp
+++ b/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp
@@ -31,10 +31,18 @@
@@ -7257,7 +7190,7 @@ index b12b8c00f825f40cb98a6436549999ab07202ff8..016efe9bc0898bb648a33973e771b49e
PlatformPasteboard::PlatformPasteboard(const String&)
: m_pasteboard(wpe_pasteboard_get_singleton())
{
-@@ -59,74 +67,26 @@ int64_t PlatformPasteboard::changeCount() const
+@@ -59,76 +67,26 @@ int64_t PlatformPasteboard::changeCount() const
void PlatformPasteboard::getTypes(Vector<String>& types) const
{
@@ -7296,6 +7229,7 @@ index b12b8c00f825f40cb98a6436549999ab07202ff8..016efe9bc0898bb648a33973e771b49e
- CString textString = content.text.utf8();
- CString markupString = content.markup.utf8();
-
+- IGNORE_CLANG_WARNINGS_BEGIN("unsafe-buffer-usage-in-libc-call")
- std::array<struct wpe_pasteboard_string_pair, 2> pairs = { {
- { { nullptr, 0 }, { nullptr, 0 } },
- { { nullptr, 0 }, { nullptr, 0 } },
@@ -7305,6 +7239,7 @@ index b12b8c00f825f40cb98a6436549999ab07202ff8..016efe9bc0898bb648a33973e771b49e
- wpe_pasteboard_string_initialize(&pairs[1].type, htmlText, strlen(htmlText));
- wpe_pasteboard_string_initialize(&pairs[1].string, markupString.data(), markupString.length());
- struct wpe_pasteboard_string_map map = { pairs.data(), pairs.size() };
+- IGNORE_CLANG_WARNINGS_END
-
- wpe_pasteboard_write(m_pasteboard, &map);
- m_changeCount++;
@@ -7340,8 +7275,29 @@ index b12b8c00f825f40cb98a6436549999ab07202ff8..016efe9bc0898bb648a33973e771b49e
}
Vector<String> PlatformPasteboard::typesSafeForDOMToReadAndWrite(const String&) const
+diff --git a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoDecoderFactory.cpp b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoDecoderFactory.cpp
+index 9dd62ba6c463d5d1e70bc8e9fe9b68bfbaa3cd96..b8a8186919b5c891289bc0b4bd839851e86809cc 100644
+--- a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoDecoderFactory.cpp
++++ b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoDecoderFactory.cpp
+@@ -41,6 +41,7 @@
+ #include <wtf/TZoneMallocInlines.h>
+ #include <wtf/glib/GUniquePtr.h>
+ #include <wtf/glib/RunLoopSourcePriority.h>
++#include <wtf/text/ASCIILiteral.h>
+ #include <wtf/text/MakeString.h>
+ #include <wtf/text/WTFString.h>
+
+@@ -77,7 +78,7 @@ public:
+ GstElement* makeElement(ASCIILiteral factoryName)
+ {
+ static Atomic<uint32_t> elementId;
+- auto name = makeString(Name(), "-dec-"_s, factoryName, "-"_s, elementId.exchangeAdd(1));
++ auto name = makeString(unsafeSpan(Name()), "-dec-"_s, factoryName, "-"_s, elementId.exchangeAdd(1));
+ return makeGStreamerElement(factoryName, name);
+ }
+
diff --git a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoFrameLibWebRTC.cpp b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoFrameLibWebRTC.cpp
-index 80c20938d5ec8282485fb0152b96304c83124354..22975b7c1b99357a7689747251410f306bfb3dcc 100644
+index a629b8b54577cb26b3a89966991deef85c405163..b7b3ca8c854b516e6707c31f8f7b7d96162ba688 100644
--- a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoFrameLibWebRTC.cpp
+++ b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoFrameLibWebRTC.cpp
@@ -23,6 +23,8 @@
@@ -7383,10 +7339,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 c2c96153a998ecfd93b402ba8e5a4b962765c1b1..b3230421da1d8270c02e36eb85c8179ef1c51825 100644
+index c250e3716214d4ce040cf956672902d9a204bb36..085998000445d48a8c3dd9fbac3f1c1876f61978 100644
--- a/Source/WebCore/platform/network/NetworkStorageSession.h
+++ b/Source/WebCore/platform/network/NetworkStorageSession.h
-@@ -199,6 +199,7 @@ public:
+@@ -200,6 +200,7 @@ public:
NetworkingContext* context() const;
#endif
@@ -7395,10 +7351,10 @@ index c2c96153a998ecfd93b402ba8e5a4b962765c1b1..b3230421da1d8270c02e36eb85c8179e
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 b5b95b377a4ae31676d09cf327cac99d7283155f..62f41eb6cc228582aad3841cc0a111868d4107be 100644
+index ff4b0aa51b104f1f71246e223553458012b5ab4e..fc58265466d7177ad25cfde1aa664dfec0634e11 100644
--- a/Source/WebCore/platform/network/ResourceResponseBase.cpp
+++ b/Source/WebCore/platform/network/ResourceResponseBase.cpp
-@@ -78,6 +78,7 @@ ResourceResponseBase::ResourceResponseBase(std::optional<ResourceResponseData>&&
+@@ -79,6 +79,7 @@ ResourceResponseBase::ResourceResponseBase(std::optional<ResourceResponseData>&&
, m_httpStatusText(data ? WTFMove(data->httpStatusText) : String { })
, m_httpVersion(data ? WTFMove(data->httpVersion) : String { })
, m_httpHeaderFields(data ? WTFMove(data->httpHeaderFields) : HTTPHeaderMap { })
@@ -7406,7 +7362,7 @@ index b5b95b377a4ae31676d09cf327cac99d7283155f..62f41eb6cc228582aad3841cc0a11186
, m_networkLoadMetrics(data && data->networkLoadMetrics ? Box<NetworkLoadMetrics>::create(WTFMove(*data->networkLoadMetrics)) : Box<NetworkLoadMetrics> { })
, m_certificateInfo(data ? WTFMove(data->certificateInfo) : std::nullopt)
, m_httpStatusCode(data ? data->httpStatusCode : 0)
-@@ -904,6 +905,7 @@ std::optional<ResourceResponseData> ResourceResponseBase::getResponseData() cons
+@@ -908,6 +909,7 @@ std::optional<ResourceResponseData> ResourceResponseBase::getResponseData() cons
String { m_httpStatusText },
String { m_httpVersion },
HTTPHeaderMap { m_httpHeaderFields },
@@ -7414,7 +7370,7 @@ index b5b95b377a4ae31676d09cf327cac99d7283155f..62f41eb6cc228582aad3841cc0a11186
m_networkLoadMetrics ? std::optional(*m_networkLoadMetrics) : std::nullopt,
m_source,
m_type,
-@@ -979,6 +981,11 @@ std::optional<WebCore::ResourceResponseData> Coder<WebCore::ResourceResponseData
+@@ -984,6 +986,11 @@ std::optional<WebCore::ResourceResponseData> Coder<WebCore::ResourceResponseData
if (!httpHeaderFields)
return std::nullopt;
@@ -7426,7 +7382,7 @@ index b5b95b377a4ae31676d09cf327cac99d7283155f..62f41eb6cc228582aad3841cc0a11186
std::optional<short> httpStatusCode;
decoder >> httpStatusCode;
if (!httpStatusCode)
-@@ -1038,6 +1045,7 @@ std::optional<WebCore::ResourceResponseData> Coder<WebCore::ResourceResponseData
+@@ -1043,6 +1050,7 @@ std::optional<WebCore::ResourceResponseData> Coder<WebCore::ResourceResponseData
WTFMove(*httpStatusText),
WTFMove(*httpVersion),
WTFMove(*httpHeaderFields),
@@ -7435,10 +7391,10 @@ index b5b95b377a4ae31676d09cf327cac99d7283155f..62f41eb6cc228582aad3841cc0a11186
*source,
*type,
diff --git a/Source/WebCore/platform/network/ResourceResponseBase.h b/Source/WebCore/platform/network/ResourceResponseBase.h
-index 5f2c4f0f190d30faaed7841c3f613129b20f0383..c46eb6544af2e7be7a1c58e090b09af1be2cbc93 100644
+index 5bbde70653944b02f8dfe6030e74696cdd53b4de..37fce47686d2956f625ff33338ef3b3b53a084d3 100644
--- a/Source/WebCore/platform/network/ResourceResponseBase.h
+++ b/Source/WebCore/platform/network/ResourceResponseBase.h
-@@ -256,6 +256,11 @@ protected:
+@@ -263,6 +263,11 @@ protected:
String m_httpStatusText;
String m_httpVersion;
HTTPHeaderMap m_httpHeaderFields;
@@ -7450,16 +7406,16 @@ index 5f2c4f0f190d30faaed7841c3f613129b20f0383..c46eb6544af2e7be7a1c58e090b09af1
Box<NetworkLoadMetrics> m_networkLoadMetrics;
mutable std::optional<CertificateInfo> m_certificateInfo;
-@@ -297,7 +302,7 @@ struct ResourceResponseData {
+@@ -306,7 +311,7 @@ struct ResourceResponseData {
ResourceResponseData() = default;
ResourceResponseData(ResourceResponseData&&) = default;
ResourceResponseData& operator=(ResourceResponseData&&) = default;
-- ResourceResponseData(URL&& url, String&& mimeType, long long expectedContentLength, String&& textEncodingName, int httpStatusCode, String&& httpStatusText, String&& httpVersion, HTTPHeaderMap&& httpHeaderFields, std::optional<NetworkLoadMetrics>&& networkLoadMetrics, ResourceResponseSource source, ResourceResponseBaseType type, ResourceResponseBaseTainting tainting, bool isRedirected, UsedLegacyTLS usedLegacyTLS, WasPrivateRelayed wasPrivateRelayed, String&& proxyName, bool isRangeRequested, std::optional<CertificateInfo> certificateInfo)
-+ ResourceResponseData(URL&& url, String&& mimeType, long long expectedContentLength, String&& textEncodingName, int httpStatusCode, String&& httpStatusText, String&& httpVersion, HTTPHeaderMap&& httpHeaderFields, HTTPHeaderMap&& httpRequestHeaderFields, std::optional<NetworkLoadMetrics>&& networkLoadMetrics, ResourceResponseSource source, ResourceResponseBaseType type, ResourceResponseBaseTainting tainting, bool isRedirected, UsedLegacyTLS usedLegacyTLS, WasPrivateRelayed wasPrivateRelayed, String&& proxyName, bool isRangeRequested, std::optional<CertificateInfo> certificateInfo)
+- ResourceResponseData(URL&& url, String&& mimeType, long long expectedContentLength, String&& textEncodingName, int httpStatusCode, String&& httpStatusText, String&& httpVersion, HTTPHeaderMap&& httpHeaderFields, std::optional<NetworkLoadMetrics>&& networkLoadMetrics, ResourceResponseSource source, ResourceResponseBaseType type, ResourceResponseBaseTainting tainting, bool isRedirected, UsedLegacyTLS usedLegacyTLS, WasPrivateRelayed wasPrivateRelayed, String&& proxyName, bool isRangeRequested, std::optional<CertificateInfo> certificateInfo, IPAddressSpace ipAddressSpace)
++ ResourceResponseData(URL&& url, String&& mimeType, long long expectedContentLength, String&& textEncodingName, int httpStatusCode, String&& httpStatusText, String&& httpVersion, HTTPHeaderMap&& httpHeaderFields, HTTPHeaderMap&& httpRequestHeaderFields, std::optional<NetworkLoadMetrics>&& networkLoadMetrics, ResourceResponseSource source, ResourceResponseBaseType type, ResourceResponseBaseTainting tainting, bool isRedirected, UsedLegacyTLS usedLegacyTLS, WasPrivateRelayed wasPrivateRelayed, String&& proxyName, bool isRangeRequested, std::optional<CertificateInfo> certificateInfo, IPAddressSpace ipAddressSpace)
: url(WTFMove(url))
, mimeType(WTFMove(mimeType))
, expectedContentLength(expectedContentLength)
-@@ -306,6 +311,7 @@ struct ResourceResponseData {
+@@ -315,6 +320,7 @@ struct ResourceResponseData {
, httpStatusText(WTFMove(httpStatusText))
, httpVersion(WTFMove(httpVersion))
, httpHeaderFields(WTFMove(httpHeaderFields))
@@ -7467,7 +7423,7 @@ index 5f2c4f0f190d30faaed7841c3f613129b20f0383..c46eb6544af2e7be7a1c58e090b09af1
, networkLoadMetrics(WTFMove(networkLoadMetrics))
, source(source)
, type(type)
-@@ -329,6 +335,7 @@ struct ResourceResponseData {
+@@ -339,6 +345,7 @@ struct ResourceResponseData {
String httpStatusText;
String httpVersion;
HTTPHeaderMap httpHeaderFields;
@@ -7476,10 +7432,10 @@ index 5f2c4f0f190d30faaed7841c3f613129b20f0383..c46eb6544af2e7be7a1c58e090b09af1
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 8f91f105fb83605e259a25bccd7e6cf1e39fbc2f..b4e36cc919db381fdc241b3b6d3217f3aa3a5a0a 100644
+index f10d0326535f351b4a1c37d90d73e24585c86a14..6ee029953d785ee6272a8363a5c19d364384dda6 100644
--- a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
+++ b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
-@@ -574,6 +574,28 @@ bool NetworkStorageSession::setCookieFromDOM(const URL& firstParty, const SameSi
+@@ -576,6 +576,28 @@ bool NetworkStorageSession::setCookieFromDOM(const URL& firstParty, const SameSi
return false;
}
@@ -7539,10 +7495,10 @@ index a765e8f33e07b492c5db681bdb8d0a1b560f3a89..aeecd7d3e5f2b22b039c377178ce93b2
{
switch (cookieDatabase().acceptPolicy()) {
diff --git a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
-index a3cc889b1440c6656d3888842bd1438a0d919c42..a6a0a2b96265ff15f1614abf7cf5392b1cb01247 100644
+index bcde277ededa3deeff602a8dede32d35c918b388..83ca088c2f7cdaed08d62f8450e63ef1d341d359 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)
+@@ -553,6 +553,26 @@ void NetworkStorageSession::replaceCookies(const Vector<Cookie>& cookies)
g_signal_emit(jar, signalId, 0, nullptr, nullptr);
}
@@ -7634,7 +7590,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 77a314281e749ca453edd66343d6dcf2979f658d..7f442dee6c8f3626d1d18227934817a0958fe0fa 100644
+index 90898196cd9077ceffa78cd00b024c917ce46e09..956d676a4bc32b682004c9662dba61b1c95fb188 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,
@@ -7710,10 +7666,10 @@ index aac283d800d41c5185e1de655b6cbe4693c827a6..5ced4f99b3481ab88d8de7c12d44730b
+
} // namespace WebCore
diff --git a/Source/WebCore/rendering/RenderTextControl.cpp b/Source/WebCore/rendering/RenderTextControl.cpp
-index c147c2d3efffba27f8e50a073cff4742585217a9..ce295eff5d8b4e3ebe53991950980f6eb17e79bd 100644
+index f9d2a09bf46ab0f9ec829aa891fa7dc7a1177842..56e84e4dc60b71b45b8e8205311703509d9697c0 100644
--- a/Source/WebCore/rendering/RenderTextControl.cpp
+++ b/Source/WebCore/rendering/RenderTextControl.cpp
-@@ -232,13 +232,13 @@ void RenderTextControl::layoutExcludedChildren(RelayoutChildren relayoutChildren
+@@ -256,13 +256,13 @@ void RenderTextControl::layoutExcludedChildren(RelayoutChildren relayoutChildren
}
}
@@ -7729,10 +7685,10 @@ index c147c2d3efffba27f8e50a073cff4742585217a9..ce295eff5d8b4e3ebe53991950980f6e
{
if (auto innerTextElement = this->innerTextElement(); innerTextElement && innerTextElement->renderer())
diff --git a/Source/WebCore/rendering/RenderTextControl.h b/Source/WebCore/rendering/RenderTextControl.h
-index 2a4b9ac7e9572ef2755b6226607567ec37339656..f2f86f9099e024b9befe94a9b0ea981178ecea5d 100644
+index 5eba39f814e848db970d968ab42a482a9d1f0d3e..5a8dbd07b599daf3e6b5906ec677138531f996bf 100644
--- a/Source/WebCore/rendering/RenderTextControl.h
+++ b/Source/WebCore/rendering/RenderTextControl.h
-@@ -38,8 +38,8 @@ public:
+@@ -39,8 +39,8 @@ public:
WEBCORE_EXPORT HTMLTextFormControlElement& textFormControlElement() const;
WEBCORE_EXPORT Ref<HTMLTextFormControlElement> protectedTextFormControlElement() const;
@@ -7766,10 +7722,10 @@ index 248649b615c7aed9b37cae14ab58152eb5ca34f1..85f3e2b7f5519822f53564a8c63b8bcb
WeakRef<WorkerOrWorkletGlobalScope> m_globalScope;
};
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
-index a9ca48e0e4b059f536957c7d0cdcc189dd91b243..e72b63e6f376bdc57a9a3155e862f1ef8d193baf 100644
+index 23c28e80ad53d469daf5c91c4c8bf684b532984a..124541dcc16a7c6028363a7ed611eb5c3509d76a 100644
--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
-@@ -97,6 +97,8 @@
+@@ -98,6 +98,8 @@
#if PLATFORM(COCOA)
#include <wtf/OSObjectPtr.h>
@@ -7778,7 +7734,7 @@ index a9ca48e0e4b059f536957c7d0cdcc189dd91b243..e72b63e6f376bdc57a9a3155e862f1ef
#endif
#if ENABLE(APPLE_PAY_REMOTE_UI)
-@@ -1259,6 +1261,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID)
+@@ -1264,6 +1266,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID)
storageSession->clearPageSpecificDataForResourceLoadStatistics(pageID);
}
@@ -7794,10 +7750,10 @@ index a9ca48e0e4b059f536957c7d0cdcc189dd91b243..e72b63e6f376bdc57a9a3155e862f1ef
{
if (CheckedPtr storageSession = m_networkProcess->storageSession(m_sessionID))
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
-index a42ac4c2ba8b4c78b86a9f1ba8975ced3da6889e..6224d5c9b6e2a24c3a6184318a11de19ba2ebf73 100644
+index 4b7fe5bf71c5e3e1f63961259b8ad9d0a0834d34..3f1656764919c53b2d80067645ef7f19dc03c388 100644
--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
-@@ -390,6 +390,8 @@ private:
+@@ -386,6 +386,8 @@ private:
void clearPageSpecificData(WebCore::PageIdentifier);
@@ -7807,7 +7763,7 @@ index a42ac4c2ba8b4c78b86a9f1ba8975ced3da6889e..6224d5c9b6e2a24c3a6184318a11de19
void logUserInteraction(RegistrableDomain&&);
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
-index 66ae06fcc90ef78dd7b3d945ba0a8b22f0033eef..699ff83841f2f34229dd7d9e7e910f166c331e3c 100644
+index 4bdff7c2b3a30297db5474cbff918bbb21e9bfdf..9fc3e410dc6cb49447dafa13dfd5e0207bc9959f 100644
--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
@@ -83,6 +83,8 @@ messages -> NetworkConnectionToWebProcess WantsDispatchMessage {
@@ -7820,7 +7776,7 @@ index 66ae06fcc90ef78dd7b3d945ba0a8b22f0033eef..699ff83841f2f34229dd7d9e7e910f16
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 22d457d4b9ae51d1ab65b0c35212281ab995e40b..d10078ae0149fd7fb6cdca4b2e4d0412dd9e8fac 100644
+index 9b6ca02653e98895b9fcde7f9d39386b3afe01dc..b939bfbc41a0d0c06c25bf656f2c12840eb653e1 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
@@ -7837,9 +7793,9 @@ index 22d457d4b9ae51d1ab65b0c35212281ab995e40b..d10078ae0149fd7fb6cdca4b2e4d0412
+
networkDataTask->didReceiveResponse(WTFMove(resourceResponse), negotiatedLegacyTLS, privateRelayed, [completionHandler = makeBlockPtr(completionHandler), taskIdentifier](WebCore::PolicyAction policyAction) {
#if !LOG_DISABLED
- LOG(NetworkSession, "%llu didReceiveResponse completionHandler (%s)", taskIdentifier, toString(policyAction).characters());
+ LOG(NetworkSession, "%zu didReceiveResponse completionHandler (%s)", taskIdentifier, toString(policyAction).characters());
diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
-index d5081a775c5f38d8f8075ea193514aa4eeaee25a..2ba1958d599b575ab0b1ad9db43de53f709aabdf 100644
+index 6b03d650bc91f5d6f634e2d627d4745ba44e93ca..db97531e193720058d423324c09b3f221ae6e4d2 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
@@ -7851,10 +7807,10 @@ index d5081a775c5f38d8f8075ea193514aa4eeaee25a..2ba1958d599b575ab0b1ad9db43de53f
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 a0ad3ac58fb9efcef3fb408aa60cc9fa0353e048..39c5df74feaef3573ecd905c1812c77dfa7c217c 100644
+index 0f57c0d6cc2d0d494bc636625e85ba31210bef79..d8bbe4e4fc0a1faea7a9b8d47e800bf1d6637db2 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 @@
+@@ -452,9 +452,11 @@
;; FIXME: This should be removed when <rdar://problem/10479685> is fixed.
;; Restrict AppSandboxed processes from creating /Library/Keychains, but allow access to the contents of /Library/Keychains:
@@ -7870,7 +7826,7 @@ index a0ad3ac58fb9efcef3fb408aa60cc9fa0353e048..39c5df74feaef3573ecd905c1812c77d
;; 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 dc1bbe1c62fbc33a69afc0e57225129f1dfdd6f2..4f2d2f6af0e9ea7c7f7ca5be42772e888aa3674b 100644
+index 369be58defabbaa8e3ba2a4d2f422b99d49c07f1..9a02761ede19dc320218a10e500594443ba5e644 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)
@@ -7883,12 +7839,12 @@ index dc1bbe1c62fbc33a69afc0e57225129f1dfdd6f2..4f2d2f6af0e9ea7c7f7ca5be42772e88
}
diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index 45b68fab2f81dc5d50df4a62113d8f0aeb10c9e2..78c9821d94e6e2b9a4257920bda2e9a4a8dd0ee7 100644
+index 7a447e1614d0306bf648dc7d0aae254673e49ecb..b594feaa95f41889558baeadf4d464c0f33b35c8 100644
--- a/Source/WebKit/PlatformGTK.cmake
+++ b/Source/WebKit/PlatformGTK.cmake
-@@ -322,6 +322,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
+@@ -325,6 +325,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
+ ${GSTREAMER_INCLUDE_DIRS}
${GSTREAMER_PBUTILS_INCLUDE_DIRS}
- ${GTK_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
+# Playwright begin
+ ${LIBVPX_INCLUDE_DIRS}
@@ -7896,7 +7852,7 @@ index 45b68fab2f81dc5d50df4a62113d8f0aeb10c9e2..78c9821d94e6e2b9a4257920bda2e9a4
)
list(APPEND WebKit_INTERFACE_INCLUDE_DIRECTORIES
-@@ -365,6 +368,9 @@ if (USE_LIBWEBRTC)
+@@ -368,6 +371,9 @@ if (USE_LIBWEBRTC)
list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
"${THIRDPARTY_DIR}/libwebrtc/Source/"
"${THIRDPARTY_DIR}/libwebrtc/Source/webrtc"
@@ -7906,7 +7862,7 @@ index 45b68fab2f81dc5d50df4a62113d8f0aeb10c9e2..78c9821d94e6e2b9a4257920bda2e9a4
)
endif ()
-@@ -416,6 +422,12 @@ else ()
+@@ -419,6 +425,12 @@ else ()
set(WebKitGTK_ENUM_HEADER_TEMPLATE ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in)
endif ()
@@ -7920,20 +7876,20 @@ index 45b68fab2f81dc5d50df4a62113d8f0aeb10c9e2..78c9821d94e6e2b9a4257920bda2e9a4
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 9accd2551b67ad54960f4c2da7b9692263693cde..89fdaf77834fbe059876d746e4c1f0ab5e0ed9be 100644
+index e1043f03708269b7f1d5d07dbbbd3a047d1f15a6..eca0204c02c117a8c3c6831090236a5e0d9f2aad 100644
--- a/Source/WebKit/PlatformWPE.cmake
+++ b/Source/WebKit/PlatformWPE.cmake
@@ -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/WebKitXRPermissionRequest.h.in
${WEBKIT_DIR}/UIProcess/API/glib/webkit.h.in
+ ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPointerLockPermissionRequest.h.in
)
if (ENABLE_2022_GLIB_API)
-@@ -434,8 +435,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
- ${GIO_UNIX_INCLUDE_DIRS}
- ${GLIB_INCLUDE_DIRS}
+@@ -441,8 +442,17 @@ list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES
+
+ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
${LIBSOUP_INCLUDE_DIRS}
+# Playwright begin
+ "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/include"
@@ -7947,10 +7903,10 @@ index 9accd2551b67ad54960f4c2da7b9692263693cde..89fdaf77834fbe059876d746e4c1f0ab
+# Playwright end
+
list(APPEND WebKit_LIBRARIES
+ GLib::Module
WPE::libwpe
- ${GLIB_LIBRARIES}
diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
-index 86a1febedca9fcbe7203db8cec94e8db1ef25a43..72ca856202231c8aba8efcee26a6278131141952 100644
+index 86a1febedca9fcbe7203db8cec94e8db1ef25a43..5817071222a03d57dd4d6afa550f47559a244d54 100644
--- a/Source/WebKit/PlatformWin.cmake
+++ b/Source/WebKit/PlatformWin.cmake
@@ -54,8 +54,13 @@ list(APPEND WebKit_SOURCES
@@ -7958,7 +7914,7 @@ index 86a1febedca9fcbe7203db8cec94e8db1ef25a43..72ca856202231c8aba8efcee26a62781
UIProcess/win/AutomationClientWin.cpp
UIProcess/win/AutomationSessionClientWin.cpp
+
-+ UIProcess/win/InspectorTargetProxyWin.cpp
++ UIProcess/win/WebPageInspectorTargetProxyWin.cpp
+ UIProcess/win/InspectorPlaywrightAgentClientWin.cpp
UIProcess/win/PageClientImpl.cpp
UIProcess/win/WebContextMenuProxyWin.cpp
@@ -8013,10 +7969,10 @@ index 86a1febedca9fcbe7203db8cec94e8db1ef25a43..72ca856202231c8aba8efcee26a62781
WebProcess/EntryPoint/win/WebProcessMain.cpp
diff --git a/Source/WebKit/Shared/AuxiliaryProcess.h b/Source/WebKit/Shared/AuxiliaryProcess.h
-index 98f4a9734edcf45750ed6badce6f9f31e93c25b7..59da50b79c30d8ac1d494a37d973251f67782bc3 100644
+index f7e60f52af0df8081d3f223a21b10674e79c2542..e3cb79b52db7073122d78acabf03b2d19cabf1ea 100644
--- a/Source/WebKit/Shared/AuxiliaryProcess.h
+++ b/Source/WebKit/Shared/AuxiliaryProcess.h
-@@ -220,6 +220,11 @@ struct AuxiliaryProcessInitializationParameters {
+@@ -221,6 +221,11 @@ struct AuxiliaryProcessInitializationParameters {
IPC::Connection::Identifier connectionIdentifier;
HashMap<String, String> extraInitializationData;
WTF::AuxiliaryProcessType processType;
@@ -8029,7 +7985,7 @@ index 98f4a9734edcf45750ed6badce6f9f31e93c25b7..59da50b79c30d8ac1d494a37d973251f
} // namespace WebKit
diff --git a/Source/WebKit/Shared/NativeWebKeyboardEvent.h b/Source/WebKit/Shared/NativeWebKeyboardEvent.h
-index 60a6308dbbd3f9a09c82214dcd97f86dda9d2078..31036d180a6f319d17c53a363d58d8bad1550a97 100644
+index 60a6308dbbd3f9a09c82214dcd97f86dda9d2078..b33855b4c9284698155cc13ac1023bc9923d73a1 100644
--- a/Source/WebKit/Shared/NativeWebKeyboardEvent.h
+++ b/Source/WebKit/Shared/NativeWebKeyboardEvent.h
@@ -33,6 +33,7 @@
@@ -8044,7 +8000,7 @@ index 60a6308dbbd3f9a09c82214dcd97f86dda9d2078..31036d180a6f319d17c53a363d58d8ba
#if USE(APPKIT)
// FIXME: Share iOS's HandledByInputMethod enum here instead of passing a boolean.
NativeWebKeyboardEvent(NSEvent *, bool handledByInputMethod, bool replacesSoftSpace, const Vector<WebCore::KeypressCommand>&);
-+ NativeWebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, WallTime timestamp, Vector<WebCore::KeypressCommand>&& commands)
++ NativeWebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, MonotonicTime timestamp, Vector<WebCore::KeypressCommand>&& commands)
+ : WebKeyboardEvent(type, text, unmodifiedText, key, code, keyIdentifier, windowsVirtualKeyCode, nativeVirtualKeyCode, isAutoRepeat, isKeypad, isSystemKey, modifiers, timestamp, WTFMove(commands))
+ {
+ }
@@ -8053,7 +8009,7 @@ index 60a6308dbbd3f9a09c82214dcd97f86dda9d2078..31036d180a6f319d17c53a363d58d8ba
NativeWebKeyboardEvent(GdkEvent*, const String&, bool isAutoRepeat, Vector<String>&& commands);
NativeWebKeyboardEvent(const String&, std::optional<Vector<WebCore::CompositionUnderline>>&&, std::optional<EditingRange>&&);
NativeWebKeyboardEvent(WebEventType, const String& text, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, Vector<String>&& commands, bool isAutoRepeat, bool isKeypad, OptionSet<WebEventModifier>);
-+ NativeWebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, WallTime timestamp, Vector<String>&& commands)
++ NativeWebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, MonotonicTime timestamp, Vector<String>&& commands)
+ : WebKeyboardEvent(type, text, unmodifiedText, key, code, keyIdentifier, windowsVirtualKeyCode, nativeVirtualKeyCode, isAutoRepeat, isKeypad, isSystemKey, modifiers, timestamp, WTFMove(commands))
+ {
+ }
@@ -8063,7 +8019,7 @@ index 60a6308dbbd3f9a09c82214dcd97f86dda9d2078..31036d180a6f319d17c53a363d58d8ba
#elif USE(LIBWPE)
enum class HandledByInputMethod : bool { No, Yes };
NativeWebKeyboardEvent(struct wpe_input_keyboard_event*, const String&, bool isAutoRepeat, HandledByInputMethod, std::optional<Vector<WebCore::CompositionUnderline>>&&, std::optional<EditingRange>&&);
-+ NativeWebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, WallTime timestamp)
++ NativeWebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, MonotonicTime timestamp)
+ : WebKeyboardEvent(type, text, unmodifiedText, key, code, keyIdentifier, windowsVirtualKeyCode, nativeVirtualKeyCode, isAutoRepeat, isKeypad, isSystemKey, modifiers, timestamp)
+ {
+ }
@@ -8073,7 +8029,7 @@ index 60a6308dbbd3f9a09c82214dcd97f86dda9d2078..31036d180a6f319d17c53a363d58d8ba
#endif
#elif PLATFORM(WIN)
NativeWebKeyboardEvent(HWND, UINT message, WPARAM, LPARAM, Vector<MSG>&& pendingCharEvents);
-+ NativeWebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, WallTime timestamp)
++ NativeWebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, MonotonicTime timestamp)
+ : WebKeyboardEvent(type, text, unmodifiedText, key, code, keyIdentifier, windowsVirtualKeyCode, nativeVirtualKeyCode, isAutoRepeat, isKeypad, isSystemKey, modifiers, timestamp)
+ {
+ }
@@ -8081,7 +8037,7 @@ index 60a6308dbbd3f9a09c82214dcd97f86dda9d2078..31036d180a6f319d17c53a363d58d8ba
#if USE(APPKIT)
diff --git a/Source/WebKit/Shared/NativeWebMouseEvent.h b/Source/WebKit/Shared/NativeWebMouseEvent.h
-index af507e2f942f1c94e60ad94623f0f0e097f4194b..b974bb08d79f7204e803ece42f13de207c58527c 100644
+index 37f4fe60ee03fe314312417d3f550786d838f35f..d6388da22512fe1ef98fe33c79edc3ffc066b389 100644
--- a/Source/WebKit/Shared/NativeWebMouseEvent.h
+++ b/Source/WebKit/Shared/NativeWebMouseEvent.h
@@ -87,6 +87,11 @@ public:
@@ -8089,7 +8045,7 @@ index af507e2f942f1c94e60ad94623f0f0e097f4194b..b974bb08d79f7204e803ece42f13de20
#endif
+#if PLATFORM(GTK) || USE(LIBWPE) || PLATFORM(WIN)
-+ NativeWebMouseEvent(WebEventType type, WebMouseEventButton button, unsigned short buttons, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, OptionSet<WebEventModifier> modifiers, WallTime timestamp)
++ NativeWebMouseEvent(WebEventType type, WebMouseEventButton button, unsigned short buttons, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, OptionSet<WebEventModifier> modifiers, MonotonicTime timestamp)
+ : WebMouseEvent({type, modifiers, timestamp}, button, buttons, position, globalPosition, deltaX, deltaY, deltaZ, clickCount) { }
+#endif
+
@@ -8111,10 +8067,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 73afacba3fe3705757e56fce7da5fbb6d44c8285..ebab11b20dfa8b6c7ed3e2a63fc3ac9f3857e068 100644
+index 3cd24844ad5bec58aa2bdad353d861ead360170d..6678b4eb1e379ffea440a656c9b7be69e5cc4a27 100644
--- a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
+++ b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
-@@ -2849,6 +2849,9 @@ class WebCore::AuthenticationChallenge {
+@@ -2838,6 +2838,9 @@ class WebCore::AuthenticationChallenge {
class WebCore::DragData {
#if PLATFORM(COCOA)
String pasteboardName();
@@ -8124,7 +8080,7 @@ index 73afacba3fe3705757e56fce7da5fbb6d44c8285..ebab11b20dfa8b6c7ed3e2a63fc3ac9f
#endif
WebCore::IntPoint clientPosition();
WebCore::IntPoint globalPosition();
-@@ -3708,6 +3711,7 @@ enum class WebCore::WasPrivateRelayed : bool;
+@@ -3693,6 +3696,7 @@ enum class WebCore::WasPrivateRelayed : bool;
String httpStatusText;
String httpVersion;
WebCore::HTTPHeaderMap httpHeaderFields;
@@ -8133,14 +8089,14 @@ index 73afacba3fe3705757e56fce7da5fbb6d44c8285..ebab11b20dfa8b6c7ed3e2a63fc3ac9f
WebCore::ResourceResponseBase::Source source;
WebCore::ResourceResponseBase::Type type;
diff --git a/Source/WebKit/Shared/WebKeyboardEvent.cpp b/Source/WebKit/Shared/WebKeyboardEvent.cpp
-index 8040819bba9dcde87311aaafe7d8177d0e07281d..24972c0a357324d27910ae6ff1979d1c6b8bc758 100644
+index 8040819bba9dcde87311aaafe7d8177d0e07281d..b20b2d56a90d1139b5e01942a3a18b20c4f83714 100644
--- a/Source/WebKit/Shared/WebKeyboardEvent.cpp
+++ b/Source/WebKit/Shared/WebKeyboardEvent.cpp
@@ -51,6 +51,24 @@ WebKeyboardEvent::WebKeyboardEvent(WebEvent&& event, const String& text, const S
ASSERT(isKeyboardEventType(type()));
}
-+WebKeyboardEvent::WebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, WallTime timestamp, Vector<WebCore::KeypressCommand>&& commands)
++WebKeyboardEvent::WebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, MonotonicTime timestamp, Vector<WebCore::KeypressCommand>&& commands)
+ : WebEvent(type, modifiers, timestamp)
+ , m_text(text)
+ , m_unmodifiedText(text)
@@ -8165,7 +8121,7 @@ index 8040819bba9dcde87311aaafe7d8177d0e07281d..24972c0a357324d27910ae6ff1979d1c
ASSERT(isKeyboardEventType(type()));
}
-+WebKeyboardEvent::WebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, WallTime timestamp, Vector<String>&& commands)
++WebKeyboardEvent::WebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, MonotonicTime timestamp, Vector<String>&& commands)
+ : WebEvent(type, modifiers, timestamp)
+ , m_text(text)
+ , m_unmodifiedText(text)
@@ -8192,7 +8148,7 @@ index 8040819bba9dcde87311aaafe7d8177d0e07281d..24972c0a357324d27910ae6ff1979d1c
+#if PLATFORM(WIN) || USE(LIBWPE)
+
-+WebKeyboardEvent::WebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, WallTime timestamp)
++WebKeyboardEvent::WebKeyboardEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, MonotonicTime timestamp)
+ : WebEvent(type, modifiers, timestamp)
+ , m_text(text)
+ , m_unmodifiedText(text)
@@ -8215,25 +8171,25 @@ index 8040819bba9dcde87311aaafe7d8177d0e07281d..24972c0a357324d27910ae6ff1979d1c
{
}
diff --git a/Source/WebKit/Shared/WebKeyboardEvent.h b/Source/WebKit/Shared/WebKeyboardEvent.h
-index 8e4e2d6d5ebb08fba210fe0a328d45290348dd11..32a43192ec1e918c33b1b046b71d2ec571dc92ff 100644
+index aacce0eda14902d8fe6cb2ca4bd9679737959a6f..cffe39a16c6ebbe64cad670059e4916728b134d1 100644
--- a/Source/WebKit/Shared/WebKeyboardEvent.h
+++ b/Source/WebKit/Shared/WebKeyboardEvent.h
@@ -42,14 +42,18 @@ public:
#if USE(APPKIT)
WebKeyboardEvent(WebEvent&&, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, int macCharCode, bool handledByInputMethod, const Vector<WebCore::KeypressCommand>&, bool isAutoRepeat, bool isKeypad, bool isSystemKey);
-+ WebKeyboardEvent(WebEventType, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier>, WallTime timestamp, Vector<WebCore::KeypressCommand>&& commands);
++ WebKeyboardEvent(WebEventType, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier>, MonotonicTime timestamp, Vector<WebCore::KeypressCommand>&& commands);
#elif PLATFORM(GTK)
WebKeyboardEvent(WebEvent&&, const String& text, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool handledByInputMethod, std::optional<Vector<WebCore::CompositionUnderline>>&&, std::optional<EditingRange>&&, Vector<String>&& commands, bool isAutoRepeat, bool isKeypad);
-+ WebKeyboardEvent(WebEventType, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier>, WallTime timestamp, Vector<String>&& commands);
++ WebKeyboardEvent(WebEventType, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier>, MonotonicTime timestamp, Vector<String>&& commands);
#elif PLATFORM(IOS_FAMILY)
WebKeyboardEvent(WebEvent&&, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, int macCharCode, bool handledByInputMethod, bool isAutoRepeat, bool isKeypad, bool isSystemKey);
#elif USE(LIBWPE)
WebKeyboardEvent(WebEvent&&, const String& text, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool handledByInputMethod, std::optional<Vector<WebCore::CompositionUnderline>>&&, std::optional<EditingRange>&&, bool isAutoRepeat, bool isKeypad);
-+ WebKeyboardEvent(WebEventType, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier>, WallTime timestamp);
++ WebKeyboardEvent(WebEventType, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier>, MonotonicTime timestamp);
#else
WebKeyboardEvent(WebEvent&&, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, int macCharCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey);
-+ WebKeyboardEvent(WebEventType, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier>, WallTime timestamp);
++ WebKeyboardEvent(WebEventType, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier>, MonotonicTime timestamp);
#endif
const String& text() const { return m_text; }
@@ -8250,10 +8206,10 @@ index 249ed5bf7a9ca037349cae92a063e718d015333d..6c179a0545456967f26ebf64f701e029
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 bc4cf118f1c9120d22d282a42348c5f3c011eb0d..3f95916695e08056dc87a700a32f4f445e2474a6 100644
+index 2561e488be3e3bb74e1d4b154c14217476712dbd..16d8c3c5ff6ad1a62943b97aba11a2e8afc625c0 100644
--- a/Source/WebKit/Shared/WebPageCreationParameters.h
+++ b/Source/WebKit/Shared/WebPageCreationParameters.h
-@@ -306,6 +306,8 @@ struct WebPageCreationParameters {
+@@ -311,6 +311,8 @@ struct WebPageCreationParameters {
WebCore::ShouldRelaxThirdPartyCookieBlocking shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No };
bool httpsUpgradeEnabled { true };
@@ -8263,10 +8219,10 @@ index bc4cf118f1c9120d22d282a42348c5f3c011eb0d..3f95916695e08056dc87a700a32f4f44
#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 1f43e0af331267900f098910e81954807aae4d13..1214484d35b1599fa08f0678d012b291292e6d5e 100644
+index 12ad96808abbf6cc6072f45ba6cf51bd2e6ca23f..30c52b2d07bbb7321d518d1bbc74b245c2595387 100644
--- a/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
+++ b/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
-@@ -228,6 +228,8 @@ enum class WebCore::UserInterfaceLayoutDirection : bool;
+@@ -229,6 +229,8 @@ enum class WebCore::UserInterfaceLayoutDirection : bool;
bool httpsUpgradeEnabled;
@@ -8298,20 +8254,20 @@ index b41816f4ba670a7058014f078ef02441c3ab0abf..983d8679574a2555b348ab0df7699253
if (execDirectory) {
String processPath = FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(execDirectory), StringView::fromLatin1(processName));
diff --git a/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp b/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp
-index 8aa8b7623aad418b7ddd81f46c803d9c59d6a943..ac3c89fbb0ec41afe841cffebf9250304581d768 100644
+index 70d2b8b67d93498b94ee6ff3d711d0c13b8ec6e9..9464788f0e3837fe23b717aa8390e9e220a7a37e 100644
--- a/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp
+++ b/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp
@@ -51,7 +51,7 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent(const String& text, std::optional
}
NativeWebKeyboardEvent::NativeWebKeyboardEvent(WebEventType type, const String& text, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, Vector<String>&& commands, bool isAutoRepeat, bool isKeypad, OptionSet<WebEventModifier> modifiers)
-- : WebKeyboardEvent(WebEvent(type, modifiers, WallTime::now()), text, key, code, keyIdentifier, windowsVirtualKeyCode, nativeVirtualKeyCode, false, std::nullopt, std::nullopt, WTFMove(commands), isAutoRepeat, isKeypad)
-+ : WebKeyboardEvent(WebEvent(type, modifiers, WallTime::now()), text, key, code, keyIdentifier, windowsVirtualKeyCode, nativeVirtualKeyCode, false, std::nullopt, std::nullopt, WTFMove(commands), false, isKeypad)
+- : WebKeyboardEvent(WebEvent(type, modifiers, MonotonicTime::now()), text, key, code, keyIdentifier, windowsVirtualKeyCode, nativeVirtualKeyCode, false, std::nullopt, std::nullopt, WTFMove(commands), isAutoRepeat, isKeypad)
++ : WebKeyboardEvent(WebEvent(type, modifiers, MonotonicTime::now()), text, key, code, keyIdentifier, windowsVirtualKeyCode, nativeVirtualKeyCode, false, std::nullopt, std::nullopt, WTFMove(commands), false, isKeypad)
{
}
diff --git a/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp b/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp
-index 7fcd22cd2172cd7fa77aee12ad5cfcf7a435abba..bc822b40eea889fb0499dd4e78f89f04d87c64a1 100644
+index dc348e105065fd3c5494aa827cd69690f593dc2e..ee883b24d9c62784890b2638014c9427f6ad43ae 100644
--- a/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp
+++ b/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp
@@ -40,6 +40,15 @@
@@ -8330,7 +8286,7 @@ index 7fcd22cd2172cd7fa77aee12ad5cfcf7a435abba..bc822b40eea889fb0499dd4e78f89f04
AuxiliaryProcessMainCommon::AuxiliaryProcessMainCommon()
{
#if ENABLE(BREAKPAD)
-@@ -94,6 +103,10 @@ WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
+@@ -81,6 +90,10 @@ WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
}
#endif
@@ -8357,10 +8313,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 209c0c3ab2c3bdd0df08e4b6b8083943caa8815b..ddf661fe8f14923908bda6de57ed703be2f839a6 100644
+index 4e786e350a6f29dad57a696df0c8a143fe552cd3..ba9cc32943c6e85fee47cfec44ff5281b9fa1ea0 100644
--- a/Source/WebKit/Sources.txt
+++ b/Source/WebKit/Sources.txt
-@@ -393,6 +393,7 @@ UIProcess/AboutSchemeHandler.cpp
+@@ -403,6 +403,7 @@ UIProcess/AboutSchemeHandler.cpp
UIProcess/AuxiliaryProcessProxy.cpp
UIProcess/BackgroundProcessResponsivenessTimer.cpp
UIProcess/BrowsingContextGroup.cpp
@@ -8368,7 +8324,7 @@ index 209c0c3ab2c3bdd0df08e4b6b8083943caa8815b..ddf661fe8f14923908bda6de57ed703b
UIProcess/DeviceIdHashSaltStorage.cpp
UIProcess/DisplayLink.cpp
UIProcess/DisplayLinkProcessProxyClient.cpp
-@@ -402,6 +403,8 @@ UIProcess/FrameLoadState.cpp
+@@ -412,6 +413,8 @@ UIProcess/FrameLoadState.cpp
UIProcess/FrameProcess.cpp
UIProcess/GeolocationPermissionRequestManagerProxy.cpp
UIProcess/GeolocationPermissionRequestProxy.cpp
@@ -8377,7 +8333,7 @@ index 209c0c3ab2c3bdd0df08e4b6b8083943caa8815b..ddf661fe8f14923908bda6de57ed703b
UIProcess/LegacyGlobalSettings.cpp
UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp
UIProcess/MediaKeySystemPermissionRequestProxy.cpp
-@@ -409,10 +412,12 @@ UIProcess/ModelElementController.cpp
+@@ -419,10 +422,12 @@ UIProcess/ModelElementController.cpp
UIProcess/OverrideLanguages.cpp
UIProcess/PageClient.cpp
UIProcess/PageLoadState.cpp
@@ -8390,7 +8346,7 @@ index 209c0c3ab2c3bdd0df08e4b6b8083943caa8815b..ddf661fe8f14923908bda6de57ed703b
UIProcess/RemotePageDrawingAreaProxy.cpp
UIProcess/RemotePageFullscreenManagerProxy.cpp
UIProcess/RemotePagePlaybackSessionManagerProxy.cpp
-@@ -457,6 +462,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp
+@@ -467,6 +472,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp
UIProcess/WebPageDiagnosticLoggingClient.cpp
UIProcess/WebPageGroup.cpp
UIProcess/WebPageInjectedBundleClient.cpp
@@ -8399,8 +8355,8 @@ index 209c0c3ab2c3bdd0df08e4b6b8083943caa8815b..ddf661fe8f14923908bda6de57ed703b
UIProcess/WebPageProxy.cpp
UIProcess/WebPageProxyMessageReceiverRegistration.cpp
UIProcess/WebPageProxyTesting.cpp
-@@ -616,6 +623,9 @@ UIProcess/Inspector/WebPageDebuggable.cpp
- UIProcess/Inspector/WebPageInspectorController.cpp
+@@ -631,6 +638,9 @@ UIProcess/Inspector/WebPageInspectorController.cpp
+ UIProcess/Inspector/WebPageInspectorTargetProxy.cpp
UIProcess/Inspector/Agents/InspectorBrowserAgent.cpp
+UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp
@@ -8410,30 +8366,38 @@ index 209c0c3ab2c3bdd0df08e4b6b8083943caa8815b..ddf661fe8f14923908bda6de57ed703b
UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp
UIProcess/Media/MediaUsageManager.cpp
diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt
-index 50aa813e87673ff3f3c643dc2db924f5dcc1b613..cba747901f72fb63a6c3a0d1c08fd41fd7953827 100644
+index e3e1925996d74c6837aaf09e74f1253b0e7445dd..bad2a8f00722e766c6e1562a990e845e75041f04 100644
--- a/Source/WebKit/SourcesCocoa.txt
+++ b/Source/WebKit/SourcesCocoa.txt
-@@ -268,6 +268,7 @@ UIProcess/API/Cocoa/_WKArchiveExclusionRule.mm
- UIProcess/API/Cocoa/_WKAttachment.mm
- UIProcess/API/Cocoa/_WKAutomationSession.mm
- UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm
-+UIProcess/API/Cocoa/_WKBrowserInspector.mm
- UIProcess/API/Cocoa/_WKContentRuleListAction.mm
- UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm
- UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify
-@@ -466,6 +467,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm
- UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm
-
- UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm
-+UIProcess/Inspector/mac/ScreencastEncoderMac.mm
- UIProcess/Inspector/mac/WebInspectorUIProxyMac.mm
- UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm
- UIProcess/Inspector/mac/WKInspectorViewController.mm
+@@ -279,6 +279,7 @@ UIProcess/API/Cocoa/_WKArchiveExclusionRule.mm @nonARC
+ UIProcess/API/Cocoa/_WKAttachment.mm @nonARC
+ UIProcess/API/Cocoa/_WKAutomationSession.mm @nonARC
+ UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @nonARC
++UIProcess/API/Cocoa/_WKBrowserInspector.mm @nonARC
+ UIProcess/API/Cocoa/_WKContentRuleListAction.mm @nonARC
+ UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm @nonARC
+ UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @nonARC @no-unify
+@@ -518,6 +519,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm @nonARC
+ UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm @nonARC
+
+ UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @nonARC
++UIProcess/Inspector/mac/ScreencastEncoderMac.mm @nonARC
+ UIProcess/Inspector/mac/WebInspectorUIProxyMac.mm @nonARC
+ UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm @nonARC
+ UIProcess/Inspector/mac/WKInspectorViewController.mm @nonARC
diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt
-index b93e726f6694cf9b5232e364eceb300e22e00ac9..569b8847373c994d514ee315fdfda8281695c6a0 100644
+index 6d57dee8517770c8b353a092cd2b42bddd922636..212f0db2f01803823a6f52553681cc3e6f948ffd 100644
--- a/Source/WebKit/SourcesGTK.txt
+++ b/Source/WebKit/SourcesGTK.txt
-@@ -122,6 +122,7 @@ UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify
+@@ -53,6 +53,7 @@ NetworkProcess/soup/WebSocketTaskSoup.cpp
+ NetworkProcess/webrtc/LibWebRTCSocketClient.cpp
+ NetworkProcess/webrtc/NetworkRTCMonitor.cpp
+ NetworkProcess/webrtc/NetworkRTCProvider.cpp
++NetworkProcess/webrtc/NetworkRTCSharedMonitor.cpp
+
+ Platform/IPC/glib/ConnectionGLib.cpp
+
+@@ -126,6 +127,7 @@ UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify
UIProcess/API/glib/WebKitBackForwardList.cpp @no-unify
UIProcess/API/glib/WebKitBackForwardListItem.cpp @no-unify
UIProcess/API/glib/WebKitClipboardPermissionRequest.cpp @no-unify
@@ -8441,7 +8405,7 @@ index b93e726f6694cf9b5232e364eceb300e22e00ac9..569b8847373c994d514ee315fdfda828
UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify
UIProcess/API/glib/WebKitCookieManager.cpp @no-unify
UIProcess/API/glib/WebKitCredential.cpp @no-unify
-@@ -254,6 +255,7 @@ UIProcess/glib/DisplayVBlankMonitorDRM.cpp
+@@ -259,6 +261,7 @@ UIProcess/glib/DisplayVBlankMonitorDRM.cpp
UIProcess/glib/DisplayVBlankMonitorThreaded.cpp
UIProcess/glib/DisplayVBlankMonitorTimer.cpp
UIProcess/glib/FenceMonitor.cpp
@@ -8449,28 +8413,38 @@ index b93e726f6694cf9b5232e364eceb300e22e00ac9..569b8847373c994d514ee315fdfda828
UIProcess/glib/ScreenManager.cpp
UIProcess/glib/SystemSettingsManagerProxy.cpp
UIProcess/glib/WebPageProxyGLib.cpp
-@@ -271,6 +273,7 @@ UIProcess/gtk/DisplayX11.cpp @no-unify
+@@ -274,7 +277,6 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify
+ UIProcess/gtk/Display.cpp @no-unify
+ UIProcess/gtk/DisplayX11.cpp @no-unify
UIProcess/gtk/DisplayWayland.cpp @no-unify
- UIProcess/gtk/WebDateTimePickerGtk.cpp
+-UIProcess/gtk/WebDateTimePickerGtk.cpp
UIProcess/gtk/HardwareAccelerationManager.cpp
-+UIProcess/gtk/InspectorTargetProxyGtk.cpp
UIProcess/gtk/KeyBindingTranslator.cpp
UIProcess/gtk/PointerLockManager.cpp @no-unify
- UIProcess/gtk/PointerLockManagerWayland.cpp @no-unify
-@@ -284,6 +287,8 @@ UIProcess/gtk/ViewGestureControllerGtk.cpp
+@@ -289,6 +291,10 @@ UIProcess/gtk/ViewGestureControllerGtk.cpp
UIProcess/gtk/WebColorPickerGtk.cpp
UIProcess/gtk/WebContextMenuProxyGtk.cpp
UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp
++UIProcess/gtk/WebDateTimePickerGtk.cpp
+UIProcess/gtk/WebPageInspectorEmulationAgentGtk.cpp
+UIProcess/gtk/WebPageInspectorInputAgentGtk.cpp
++UIProcess/gtk/WebPageInspectorTargetProxyGtk.cpp
UIProcess/gtk/WebPageProxyGtk.cpp @no-unify
UIProcess/gtk/WebPasteboardProxyGtk.cpp
UIProcess/gtk/WebPopupMenuProxyGtk.cpp
diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt
-index 33853de0d6c3e3ed4329c6a4a7f49d9303367b99..a7a1363d7d9b6e8f073e0f3c01b29240dcafb5cd 100644
+index 3d8dc9293ce3ff609e14f6a06618dd6b8c406ee4..cd5c076432bd59610fb7174a06126d68d72b1c60 100644
--- a/Source/WebKit/SourcesWPE.txt
+++ b/Source/WebKit/SourcesWPE.txt
-@@ -123,6 +123,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify
+@@ -53,6 +53,7 @@ NetworkProcess/soup/WebSocketTaskSoup.cpp
+ NetworkProcess/webrtc/LibWebRTCSocketClient.cpp
+ NetworkProcess/webrtc/NetworkRTCMonitor.cpp
+ NetworkProcess/webrtc/NetworkRTCProvider.cpp
++NetworkProcess/webrtc/NetworkRTCSharedMonitor.cpp
+
+ Platform/IPC/android/ArgumentCodersAndroid.cpp
+
+@@ -129,6 +130,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
@@ -8478,7 +8452,7 @@ index 33853de0d6c3e3ed4329c6a4a7f49d9303367b99..a7a1363d7d9b6e8f073e0f3c01b29240
UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify
UIProcess/API/glib/WebKitCookieManager.cpp @no-unify
UIProcess/API/glib/WebKitCredential.cpp @no-unify
-@@ -156,6 +157,7 @@ UIProcess/API/glib/WebKitOptionMenu.cpp @no-unify
+@@ -162,6 +164,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
@@ -8486,7 +8460,7 @@ index 33853de0d6c3e3ed4329c6a4a7f49d9303367b99..a7a1363d7d9b6e8f073e0f3c01b29240
UIProcess/API/glib/WebKitPolicyDecision.cpp @no-unify
UIProcess/API/glib/WebKitPrivate.cpp @no-unify
UIProcess/API/glib/WebKitProtocolHandler.cpp @no-unify
-@@ -225,6 +227,7 @@ UIProcess/glib/DisplayVBlankMonitorDRM.cpp
+@@ -232,6 +235,7 @@ UIProcess/glib/DisplayVBlankMonitorDRM.cpp
UIProcess/glib/DisplayVBlankMonitorThreaded.cpp
UIProcess/glib/DisplayVBlankMonitorTimer.cpp
UIProcess/glib/FenceMonitor.cpp
@@ -8494,11 +8468,7 @@ index 33853de0d6c3e3ed4329c6a4a7f49d9303367b99..a7a1363d7d9b6e8f073e0f3c01b29240
UIProcess/glib/ScreenManager.cpp
UIProcess/glib/SystemSettingsManagerProxy.cpp
UIProcess/glib/WebPageProxyGLib.cpp
-@@ -257,9 +260,15 @@ UIProcess/soup/WebProcessPoolSoup.cpp
-
- UIProcess/wpe/AcceleratedBackingStore.cpp
- UIProcess/wpe/DisplayVBlankMonitorWPE.cpp
-+UIProcess/wpe/InspectorTargetProxyWPE.cpp
+@@ -267,6 +271,12 @@ UIProcess/wpe/DisplayVBlankMonitorWPE.cpp
UIProcess/wpe/ScreenManagerWPE.cpp
UIProcess/wpe/SystemSettingsManagerProxyWPE.cpp
UIProcess/wpe/WPEUtilities.cpp
@@ -8507,14 +8477,15 @@ index 33853de0d6c3e3ed4329c6a4a7f49d9303367b99..a7a1363d7d9b6e8f073e0f3c01b29240
+UIProcess/wpe/WebDateTimePickerWPE.cpp
+UIProcess/wpe/WebPageInspectorEmulationAgentWPE.cpp
+UIProcess/wpe/WebPageInspectorInputAgentWPE.cpp
++UIProcess/wpe/WebPageInspectorTargetProxyWPE.cpp
UIProcess/wpe/WebPageProxyWPE.cpp
UIProcess/wpe/WebPasteboardProxyWPE.cpp
UIProcess/wpe/WebPreferencesWPE.cpp
diff --git a/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp b/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
-index 7d9d8e51d0f4531602ab90d8097e0bc322d8ba51..0d8fe5bfe9eda08897dd5a3b340710ed0f3d0500 100644
+index e67ce2103b4f2f8b53ab8413541dfe5a8055f3f0..5aca33e2247686246480b743c19016388a854129 100644
--- a/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
+++ b/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
-@@ -273,6 +273,11 @@ RefPtr<WebPageProxy> PageConfiguration::protectedRelatedPage() const
+@@ -278,6 +278,11 @@ RefPtr<WebPageProxy> PageConfiguration::protectedRelatedPage() const
return relatedPage();
}
@@ -8527,10 +8498,10 @@ index 7d9d8e51d0f4531602ab90d8097e0bc322d8ba51..0d8fe5bfe9eda08897dd5a3b340710ed
{
return m_data.pageToCloneSessionStorageFrom.get();
diff --git a/Source/WebKit/UIProcess/API/APIPageConfiguration.h b/Source/WebKit/UIProcess/API/APIPageConfiguration.h
-index 9f241e19040ceeb2c525d2a58cfedd05da582427..0c79bc4e29952f3dd5ccb7522bf6a8f00dc662a6 100644
+index 5f5eb4cc17480ce91e74711c5248d62be2fffc1f..9993fcefd2fd4f4ac6384e82da1172f8d4dafa93 100644
--- a/Source/WebKit/UIProcess/API/APIPageConfiguration.h
+++ b/Source/WebKit/UIProcess/API/APIPageConfiguration.h
-@@ -160,6 +160,10 @@ public:
+@@ -164,6 +164,10 @@ public:
void setRelatedPage(WeakPtr<WebKit::WebPageProxy>&& relatedPage) { m_data.relatedPage = WTFMove(relatedPage); }
RefPtr<WebKit::WebPageProxy> protectedRelatedPage() const;
@@ -8541,7 +8512,7 @@ index 9f241e19040ceeb2c525d2a58cfedd05da582427..0c79bc4e29952f3dd5ccb7522bf6a8f0
WebKit::WebPageProxy* pageToCloneSessionStorageFrom() const;
void setPageToCloneSessionStorageFrom(WeakPtr<WebKit::WebPageProxy>&&);
-@@ -519,6 +523,7 @@ private:
+@@ -528,6 +532,7 @@ private:
#endif
RefPtr<WebKit::WebPageGroup> pageGroup;
WeakPtr<WebKit::WebPageProxy> relatedPage;
@@ -8550,7 +8521,7 @@ index 9f241e19040ceeb2c525d2a58cfedd05da582427..0c79bc4e29952f3dd5ccb7522bf6a8f0
WebCore::Site openedSite;
WTF::String openedMainFrameName;
diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
-index e256b905bf9727aa7c8a48012237a6a6bc9acdbc..4e855c441af6f235f0fd8dfdd57b9bd6e4646492 100644
+index c5f71591fa0cc654a597eb0e25c60b5f9632596c..3638376f2e8ddcf7fe70355e7cd1d70057f8907e 100644
--- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
+++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
@@ -52,6 +52,10 @@ Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::copy()
@@ -8565,7 +8536,7 @@ index e256b905bf9727aa7c8a48012237a6a6bc9acdbc..4e855c441af6f235f0fd8dfdd57b9bd6
copy->m_shouldTakeUIBackgroundAssertion = this->m_shouldTakeUIBackgroundAssertion;
copy->m_shouldCaptureDisplayInUIProcess = this->m_shouldCaptureDisplayInUIProcess;
diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
-index 2fe09a750bf32bd6f124603af08e16adba8a6c7c..5ca91400765fd53559b4f4cefa172b5a1f417196 100644
+index 24c73a26a542863f734cb698daeceadf693c70e0..871a97de130d0d15396a3716eca055334e31cae2 100644
--- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
+++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
@@ -96,6 +96,16 @@ public:
@@ -8585,7 +8556,7 @@ index 2fe09a750bf32bd6f124603af08e16adba8a6c7c..5ca91400765fd53559b4f4cefa172b5a
bool alwaysRunsAtBackgroundPriority() const { return m_alwaysRunsAtBackgroundPriority; }
void setAlwaysRunsAtBackgroundPriority(bool alwaysRunsAtBackgroundPriority) { m_alwaysRunsAtBackgroundPriority = alwaysRunsAtBackgroundPriority; }
-@@ -178,6 +188,10 @@ private:
+@@ -181,6 +191,10 @@ private:
bool m_ignoreSynchronousMessagingTimeoutsForTesting { false };
bool m_attrStyleEnabled { false };
bool m_shouldThrowExceptionForGlobalConstantRedeclaration { true };
@@ -8597,7 +8568,7 @@ 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 89357e7184a9d01f03e8bdf17c555ce94bcc39b3..d9a2d352f51eaebecaadd2bc59c27b3e1313f706 100644
+index 30465b8aabd1981298ffc42c4cb643bc40a625fa..4c0a1887f886c735b5b715dcc6739daf3ab5e857 100644
--- a/Source/WebKit/UIProcess/API/APIUIClient.h
+++ b/Source/WebKit/UIProcess/API/APIUIClient.h
@@ -116,6 +116,7 @@ public:
@@ -8607,7 +8578,7 @@ index 89357e7184a9d01f03e8bdf17c555ce94bcc39b3..d9a2d352f51eaebecaadd2bc59c27b3e
+ virtual void handleJavaScriptDialog(WebKit::WebPageProxy&, bool, const WTF::String&) { }
virtual void setStatusText(WebKit::WebPageProxy*, const WTF::String&) { }
- virtual void mouseDidMoveOverElement(WebKit::WebPageProxy&, const WebKit::WebHitTestResultData&, OptionSet<WebKit::WebEventModifier>, Object*) { }
+ virtual void mouseDidMoveOverElement(WebKit::WebPageProxy&, const WebKit::WebHitTestResultData&, OptionSet<WebKit::WebEventModifier>) { }
diff --git a/Source/WebKit/UIProcess/API/C/WKInspector.cpp b/Source/WebKit/UIProcess/API/C/WKInspector.cpp
index 1aa386d598a35dbda34161ed956d653a2da99bec..9aaeb894594f797931bac01314eb3e2ca8669855 100644
--- a/Source/WebKit/UIProcess/API/C/WKInspector.cpp
@@ -8652,10 +8623,10 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0
}
#endif
diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp
-index 9c51cbad3099f8e589262e8bfa320ef8e05fa1c1..cd914594389ee319f5f67082dd221fb7a7b2a3f6 100644
+index 357460fbf0ab78dd06a34af9270a046d1191980b..79cce3a4dbe20915a2b02db2828bd9d16173596c 100644
--- a/Source/WebKit/UIProcess/API/C/WKPage.cpp
+++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp
-@@ -1927,6 +1927,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
+@@ -1911,6 +1911,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
m_client.addMessageToConsole(toAPI(&page), toAPI(message.impl()), m_client.base.clientInfo);
}
@@ -8669,7 +8640,7 @@ index 9c51cbad3099f8e589262e8bfa320ef8e05fa1c1..cd914594389ee319f5f67082dd221fb7
void setStatusText(WebPageProxy* page, const String& text) final
{
if (!m_client.setStatusText)
-@@ -1964,6 +1971,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
+@@ -1948,6 +1955,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
{
if (!m_client.didNotHandleKeyEvent)
return;
@@ -8756,7 +8727,7 @@ index 2ce017d213d7875eee965e554af6befb5a3c3908..79b11310d358d3edc49e30420728e1eb
/*! @abstract A delegate to request permission for microphone audio and camera video access.
@param webView The web view invoking the delegate method.
diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h
-index 930357ac3469195e9f33d5ffce92777018bb0b13..f62555ec562f8416976d31692e8fb1751a04d458 100644
+index 47b1b5ed21a65035d9bef05a991845480cfa1e93..17bd5eeafa50f94062b6f2a1b178efbfd23722fc 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h
+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h
@@ -138,6 +138,8 @@ WK_CLASS_AVAILABLE(macos(10.11), ios(9.0))
@@ -8769,7 +8740,7 @@ index 930357ac3469195e9f33d5ffce92777018bb0b13..f62555ec562f8416976d31692e8fb175
NS_ASSUME_NONNULL_END
diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
-index e5c1fb49feda418fe4989474a7145016529409c5..ef1ffc4e07e9af85c50bb51d60d0af87c4352eeb 100644
+index 5b2e169144a7095dbb44a4d4f5d9779ab08a5c92..5793a58f259b57963463bc62450a5cb2a885da93 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
@@ -55,6 +55,7 @@
@@ -8923,7 +8894,7 @@ index 0000000000000000000000000000000000000000..69eb9c6aa30beb8ea21a0ef647e46304
+}
+@end
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
-index 7b6c36521ebd5afbd58454192c8dece450b2e90a..a4a0ca2f69b1cc59fccbc261e1dff4e2f15d6e86 100644
+index da15690a3d5a783a96aa5557676abeb7c349061d..cf3c06c2f1e9def8fa342019770f03d3673f41d8 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
@@ -67,6 +67,7 @@ WK_EXTERN WK_API_DEPRECATED("Creating and using multiple instances of WKProcessP
@@ -8935,7 +8906,7 @@ index 7b6c36521ebd5afbd58454192c8dece450b2e90a..a4a0ca2f69b1cc59fccbc261e1dff4e2
@property (nonatomic) BOOL processSwapsOnNavigationWithinSameNonHTTPFamilyProtocol WK_API_AVAILABLE(macos(12.0), ios(15.0));
@property (nonatomic) BOOL prewarmsProcessesAutomatically WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
-index 7d6be90da095403d61a44afbe8e08eb9569ecffc..c96e67fdd7887c18d150067cd94c99c62a4abfeb 100644
+index d12e529ffef1a56c0b451b9d78c5d4bf48be20c7..b2db01631e2511794a1511a2a8eacefa60fe407e 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
@@ -243,6 +243,16 @@ - (BOOL)processSwapsOnNavigation
@@ -9184,10 +9155,10 @@ 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 c17d1921232a7956c2ff786e5b5dca603b5f46fa..59f740194668b1fe3d4f16b1127947224c628b19 100644
+index 7649e25c72d68860639c609d1f7cc1a8a1908167..7f57f768d7075d95db4c6a02b52442a1d081c981 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp
-@@ -101,6 +101,10 @@ private:
+@@ -102,6 +102,10 @@ private:
page.makeViewBlankIfUnpaintedSinceLastLoadCommit();
webkitWebViewRunJavaScriptPrompt(m_webView, message.utf8(), defaultValue.utf8(), WTFMove(completionHandler));
}
@@ -9199,7 +9170,7 @@ index c17d1921232a7956c2ff786e5b5dca603b5f46fa..59f740194668b1fe3d4f16b112794722
bool canRunBeforeUnloadConfirmPanel() const final { return true; }
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
-index dca689a7ace576571ca8ceb0b51921857b68b64c..e321049561de548aa517df0a8d6f91e86889e8e1 100644
+index 364957d88a8eac8b4ac7d851cc19e3d73eaf9d54..b21d76dda85b1bed7b937d8c7a4af34b158099a9 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
@@ -430,10 +430,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa
@@ -9268,7 +9239,7 @@ 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 ea27692f82e791c65828f9e88b795f96a365fa09..f15ae92ac80fc785b9da9014ea0966e2a998ecc4 100644
+index 0342e8e8d333ebc7f8c77a0f93f409f29f3db306..200520c65f644930ae8b3edfbab2e384c1d9c517 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
@@ -40,6 +40,7 @@
@@ -9388,7 +9359,7 @@ index 4e16a2a088f6e48f43362850cc047da7de3c88ef..5ca5ae9572d2ed962d80a5dd67f8f379
bool webkitWebViewIsScriptDialogRunning(WebKitWebView*, WebKitScriptDialog*);
String webkitWebViewGetCurrentScriptDialogMessage(WebKitWebView*);
diff --git a/Source/WebKit/UIProcess/API/glib/webkit.h.in b/Source/WebKit/UIProcess/API/glib/webkit.h.in
-index 763cd55f7abca011ac8bc4fef7f233bf52854cda..bd43917b274bf19ff9f3d96b7e80e20710372cba 100644
+index f01ddc55dd7a09d975b937aa95d0a256c13d4995..bfbd8dc089048a34a75f7fe3457b40cd8bb97f5f 100644
--- a/Source/WebKit/UIProcess/API/glib/webkit.h.in
+++ b/Source/WebKit/UIProcess/API/glib/webkit.h.in
@@ -45,6 +45,7 @@
@@ -9538,7 +9509,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 da61eac252a18988d3d70a7f842e75d6b35c9b0d..3a2f4b339811c9cedd0de342d7593130699b0026 100644
+index da5d9873058905fc464c4793a352d69218f75538..20a4c43caa6571420370c1e0e1cbed45aaeb4198 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)
@@ -9916,10 +9887,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 b9346fab9e82ff29fc881f04b12cafa7af720877..2207a280d491df89b5832210ed4a7cfe541eb53d 100644
+index 495d3a628ca4d4988d1f31fc67a709f2b740da32..cda238e333dd668abbc8e22ce684b6d029a81e35 100644
--- a/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
+++ b/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
-@@ -289,6 +289,8 @@ public:
+@@ -297,6 +297,8 @@ public:
void didDestroyFrame(WebCore::FrameIdentifier);
@@ -9928,7 +9899,7 @@ index b9346fab9e82ff29fc881f04b12cafa7af720877..2207a280d491df89b5832210ed4a7cfe
RefPtr<WebPageProxy> webPageProxyForHandle(const String&);
String handleForWebFrameID(std::optional<WebCore::FrameIdentifier>);
String handleForWebPageProxy(const WebPageProxy&);
-@@ -340,7 +342,6 @@ private:
+@@ -348,7 +350,6 @@ private:
// Get base64-encoded PNG data from a bitmap.
static std::optional<String> platformGetBase64EncodedPNGData(WebCore::ShareableBitmap::Handle&&);
@@ -10114,7 +10085,7 @@ index 89d125f7742f81ead8c50f218ecb1771b8000636..baa6cf58ad502c6c033ee6293a6cc8d4
namespace WebKit {
diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
-index 13a5af461910a6875d18466115c3dea34891a0fa..44c5376282be9bc8ba49fe830c1c0a5c8b9c8103 100644
+index e545bda40ad736cbf5bc6daf4861f9fbe6bd6100..d2ee20c86125f61d52ca08e7d16441e8cc093c97 100644
--- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
+++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
@@ -105,6 +105,7 @@ private:
@@ -10125,7 +10096,7 @@ index 13a5af461910a6875d18466115c3dea34891a0fa..44c5376282be9bc8ba49fe830c1c0a5c
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;
-@@ -228,6 +229,7 @@ private:
+@@ -229,6 +230,7 @@ private:
bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1;
bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
bool webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler : 1;
@@ -10134,7 +10105,7 @@ index 13a5af461910a6875d18466115c3dea34891a0fa..44c5376282be9bc8ba49fe830c1c0a5c
bool webViewRequestStorageAccessPanelForDomainUnderCurrentDomainForQuirkDomainsCompletionHandler : 1;
bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
-index f9e39d7adef59446ddb76696835a633956a85f93..3c2fdd7b27a6da2cdc75c4754e41f33d18226073 100644
+index 3daa4d80bdbdd9c1e9ca74ba9f1c3217f6f4628f..9ee399d8417acca18c3e1fe55ccc88cac2a39c9b 100644
--- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
+++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
@@ -136,6 +136,7 @@ void UIDelegate::setDelegate(id<WKUIDelegate> delegate)
@@ -10145,7 +10116,7 @@ index f9e39d7adef59446ddb76696835a633956a85f93..3c2fdd7b27a6da2cdc75c4754e41f33d
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:)];
-@@ -502,6 +503,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St
+@@ -500,6 +501,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St
}).get()];
}
@@ -10162,7 +10133,7 @@ index f9e39d7adef59446ddb76696835a633956a85f93..3c2fdd7b27a6da2cdc75c4754e41f33d
{
RefPtr uiDelegate = m_uiDelegate.get();
diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
-index 11ff0246d535faf1d75779e3b2959b36096e8793..6282913dea0fc0c4ece3e729f6a4fa27edc4c04e 100644
+index 7587e1142a070da697953b79070174730d259e52..b1a440eec49540d30312b4d17da59e5159eeaa71 100644
--- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
+++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
@@ -44,7 +44,9 @@
@@ -10264,10 +10235,10 @@ index 11ff0246d535faf1d75779e3b2959b36096e8793..6282913dea0fc0c4ece3e729f6a4fa27
#if ENABLE(ATTACHMENT_ELEMENT)
diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
-index c742dd123d0df51dda15233b3b5b84d148f23b94..e8161d0567c67f9319e8ba54931cd40dcc43dd6d 100644
+index 7598f3e02823be871f4bf7f43171409a06aaac0e..f37ae417ee4cd8504cf7581afdcce6a5ca1fa5b9 100644
--- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
+++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
-@@ -443,7 +443,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
+@@ -449,7 +449,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
auto screenProperties = WebCore::collectScreenProperties();
parameters.screenProperties = WTFMove(screenProperties);
#if PLATFORM(MAC)
@@ -10276,7 +10247,7 @@ index c742dd123d0df51dda15233b3b5b84d148f23b94..e8161d0567c67f9319e8ba54931cd40d
#endif
#if PLATFORM(VISION)
-@@ -850,8 +850,8 @@ void WebProcessPool::registerNotificationObservers()
+@@ -859,8 +859,8 @@ void WebProcessPool::registerNotificationObservers()
}];
m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
@@ -10286,7 +10257,7 @@ index c742dd123d0df51dda15233b3b5b84d148f23b94..e8161d0567c67f9319e8ba54931cd40d
+ sendToAllProcesses(Messages::WebProcess::ScrollerStylePreferenceChanged(useOverlayScrollbars));
}];
- m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
+ m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSAppSingleton() queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
index c25814a7b7c26ad90c1b51ff10d334200da9472b..d9b6654e62a6766824a6df45b73408c3141e2893 100644
--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
@@ -10417,7 +10388,7 @@ index 61ce018548600fb7e4f3cdb3ee82b444d5b2429f..4e93f979cd98c36b24a08c00193b190a
#if !PLATFORM(WPE)
bool m_isBackingStoreDiscardable { true };
diff --git a/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp b/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp
-index bdc3efe299296ef6ef10d32672e22fba05ca230c..a24e9c7e4b0da65099326b6921ed03b4deb4cc86 100644
+index f84e75be2ecfd15ad97a45cac3a4bca4ec41faf2..73ef164a9eb25ae22032c35154d0c57a69e42ee9 100644
--- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp
+++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp
@@ -41,8 +41,10 @@
@@ -10512,7 +10483,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 8a40cba30a1f6ea119c5c77fa328491fabce1135..ccf3059e5487ffe2750ec7478082bab307dadd70 100644
+index 770377f456a8008b19acc3f11f03a6c088514b76..51b0f6c6de24d495fa8aafedfbbb059e03574ff9 100644
--- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.h
+++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.h
@@ -166,6 +166,7 @@ private:
@@ -10524,7 +10495,7 @@ index 8a40cba30a1f6ea119c5c77fa328491fabce1135..ccf3059e5487ffe2750ec7478082bab3
} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/DrawingAreaProxy.h b/Source/WebKit/UIProcess/DrawingAreaProxy.h
-index 75c5092b62c6911e0c2417549189667cd9e2cfb1..82d85bdbae12db42d583ebbce6c3fc1251239df9 100644
+index f78505520812f91ea9b96c6a6a071ec84850371d..d23fa735d38e77ff6da92a9a2bb3f972feade9be 100644
--- a/Source/WebKit/UIProcess/DrawingAreaProxy.h
+++ b/Source/WebKit/UIProcess/DrawingAreaProxy.h
@@ -96,6 +96,7 @@ public:
@@ -11618,105 +11589,11 @@ index 0000000000000000000000000000000000000000..e2ce910f3fd7f587add552275b7e7176
+};
+
+} // namespace WebKit
-diff --git a/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.cpp b/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.cpp
-index 76cc869ca4d5fc311040a285d50a44f00273fd63..633f8323697f0c2f30311a35ac3876bf8e03b741 100644
---- a/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.cpp
-+++ b/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.cpp
-@@ -28,7 +28,7 @@
-
- #include "MessageSenderInlines.h"
- #include "ProvisionalPageProxy.h"
--#include "WebFrameProxy.h"
-+#include "WebPageInspectorController.h"
- #include "WebPageInspectorTarget.h"
- #include "WebPageMessages.h"
- #include "WebPageProxy.h"
-@@ -46,13 +46,13 @@ std::unique_ptr<InspectorTargetProxy> InspectorTargetProxy::create(WebPageProxy&
- return makeUnique<InspectorTargetProxy>(page, targetId, type);
- }
-
--std::unique_ptr<InspectorTargetProxy> InspectorTargetProxy::create(ProvisionalPageProxy& provisionalPage, const String& targetId, Inspector::InspectorTargetType type)
-+std::unique_ptr<InspectorTargetProxy> InspectorTargetProxy::create(ProvisionalPageProxy& provisionalPage, const String& targetId)
- {
- RefPtr page = provisionalPage.page();
- if (!page)
- return nullptr;
-
-- auto target = InspectorTargetProxy::create(*page, targetId, type);
-+ auto target = InspectorTargetProxy::create(*page, targetId, Inspector::InspectorTargetType::Page);
- target->m_provisionalPage = provisionalPage;
- return target;
- }
-@@ -108,6 +108,31 @@ void InspectorTargetProxy::didCommitProvisionalTarget()
- m_provisionalPage = nullptr;
- }
-
-+void InspectorTargetProxy::willResume()
-+{
-+ if (m_page->hasRunningProcess())
-+ m_page->legacyMainFrameProcess().send(Messages::WebPage::ResumeInspectorIfPausedInNewWindow(), m_page->webPageIDInMainFrameProcess());
-+}
-+
-+void InspectorTargetProxy::activate(String& error)
-+{
-+ if (m_type != Inspector::InspectorTargetType::Page)
-+ return InspectorTarget::activate(error);
-+
-+ platformActivate(error);
-+}
-+
-+void InspectorTargetProxy::close(String& error, bool runBeforeUnload)
-+{
-+ if (m_type != Inspector::InspectorTargetType::Page)
-+ return InspectorTarget::close(error, runBeforeUnload);
-+
-+ if (runBeforeUnload)
-+ m_page->tryClose();
-+ else
-+ m_page->closePage();
-+}
-+
- bool InspectorTargetProxy::isProvisional() const
- {
- return !!m_provisionalPage;
-diff --git a/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.h b/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.h
-index edd6e7f1799279ed3d0eb81b6c2eef9f5b375134..d4231f84f3c52641f4d9e88559e8e1a4845b7163 100644
---- a/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.h
-+++ b/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.h
-@@ -38,12 +38,12 @@ class WebPageProxy;
- // NOTE: This UIProcess side InspectorTarget doesn't care about the frontend channel, since
- // any target -> frontend messages will be routed to the WebPageProxy with a targetId.
-
--class InspectorTargetProxy final : public Inspector::InspectorTarget {
-+class InspectorTargetProxy : public Inspector::InspectorTarget {
- WTF_MAKE_TZONE_ALLOCATED(InspectorTargetProxy);
- WTF_MAKE_NONCOPYABLE(InspectorTargetProxy);
- public:
- static std::unique_ptr<InspectorTargetProxy> create(WebPageProxy&, const String& targetId, Inspector::InspectorTargetType);
-- static std::unique_ptr<InspectorTargetProxy> create(ProvisionalPageProxy&, const String& targetId, Inspector::InspectorTargetType);
-+ static std::unique_ptr<InspectorTargetProxy> create(ProvisionalPageProxy&, const String& targetId);
- InspectorTargetProxy(WebPageProxy&, const String& targetId, Inspector::InspectorTargetType);
- ~InspectorTargetProxy() = default;
-
-@@ -56,8 +56,13 @@ public:
- void connect(Inspector::FrontendChannel::ConnectionType) override;
- void disconnect() override;
- void sendMessageToTargetBackend(const String&) override;
-+ void activate(String& error) override;
-+ void close(String& error, bool runBeforeUnload) override;
-
- private:
-+ void willResume() override;
-+ void platformActivate(String& error) const;
-+
- WeakRef<WebPageProxy> m_page;
- String m_identifier;
- Inspector::InspectorTargetType m_type;
diff --git a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
-index 187e59d58ba020cbac2246acc669ef95cafd75b4..bb2498bdb082721ce539dd935b5aebada963b1ba 100644
+index a0a119f4269ce96a61ce4f1c2f35745fc8291780..3684c1683d622f7e906863dcf90e307964a06e11 100644
--- a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
+++ b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
-@@ -26,14 +26,22 @@
+@@ -26,16 +26,24 @@
#include "config.h"
#include "WebPageInspectorController.h"
@@ -11727,11 +11604,13 @@ index 187e59d58ba020cbac2246acc669ef95cafd75b4..bb2498bdb082721ce539dd935b5aebad
+#include "InspectorDialogAgent.h"
+#include "InspectorScreencastAgent.h"
#include "ProvisionalPageProxy.h"
+ #include "WebFrameInspectorTargetProxy.h"
#include "WebFrameProxy.h"
#include "WebPageInspectorAgentBase.h"
+#include "WebPageInspectorEmulationAgent.h"
+#include "WebPageInspectorInputAgent.h"
#include "WebPageInspectorTarget.h"
+ #include "WebPageInspectorTargetProxy.h"
#include "WebPageProxy.h"
#include "WebsiteDataStore.h"
+#include <WebCore/ResourceError.h>
@@ -11739,7 +11618,7 @@ index 187e59d58ba020cbac2246acc669ef95cafd75b4..bb2498bdb082721ce539dd935b5aebad
#include <JavaScriptCore/InspectorAgentBase.h>
#include <JavaScriptCore/InspectorBackendDispatcher.h>
#include <JavaScriptCore/InspectorBackendDispatchers.h>
-@@ -53,34 +61,115 @@ static String getTargetID(const ProvisionalPageProxy& provisionalPage)
+@@ -55,34 +63,115 @@ static String getTargetID(const ProvisionalPageProxy& provisionalPage)
WTF_MAKE_TZONE_ALLOCATED_IMPL(WebPageInspectorController);
@@ -11774,9 +11653,7 @@ index 187e59d58ba020cbac2246acc669ef95cafd75b4..bb2498bdb082721ce539dd935b5aebad
}
void WebPageInspectorController::init()
- {
-- String pageTargetId = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageIDInMainFrameProcess());
-- createInspectorTarget(pageTargetId, Inspector::InspectorTargetType::Page);
++{
+ auto targetAgent = makeUnique<InspectorTargetAgent>(m_frontendRouter.get(), m_backendDispatcher.get());
+ m_targetAgent = targetAgent.get();
+ m_agents.append(WTFMove(targetAgent));
@@ -11795,13 +11672,13 @@ index 187e59d58ba020cbac2246acc669ef95cafd75b4..bb2498bdb082721ce539dd935b5aebad
+}
+
+void WebPageInspectorController::didInitializeWebPage()
-+{
-+ String pageTargetID = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageIDInMainFrameProcess());
+ {
+ String pageTargetId = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageIDInMainFrameProcess());
+ // Create target only after attaching to a Web Process first time. Before that
+ // we cannot event establish frontend connection.
-+ if (m_targets.contains(pageTargetID))
++ if (m_targets.contains(pageTargetId))
+ return;
-+ createInspectorTarget(pageTargetID, Inspector::InspectorTargetType::Page);
+ createWebPageInspectorTarget(pageTargetId, Inspector::InspectorTargetType::Page);
}
void WebPageInspectorController::pageClosed()
@@ -11862,7 +11739,7 @@ index 187e59d58ba020cbac2246acc669ef95cafd75b4..bb2498bdb082721ce539dd935b5aebad
}
bool WebPageInspectorController::hasLocalFrontend() const
-@@ -94,6 +183,14 @@ void WebPageInspectorController::connectFrontend(Inspector::FrontendChannel& fro
+@@ -96,6 +185,14 @@ void WebPageInspectorController::connectFrontend(Inspector::FrontendChannel& fro
bool connectingFirstFrontend = !m_frontendRouter->hasFrontends();
@@ -11877,7 +11754,7 @@ index 187e59d58ba020cbac2246acc669ef95cafd75b4..bb2498bdb082721ce539dd935b5aebad
m_frontendRouter->connectFrontend(frontendChannel);
if (connectingFirstFrontend)
-@@ -113,8 +210,10 @@ void WebPageInspectorController::disconnectFrontend(FrontendChannel& frontendCha
+@@ -115,8 +212,10 @@ void WebPageInspectorController::disconnectFrontend(FrontendChannel& frontendCha
m_frontendRouter->disconnectFrontend(frontendChannel);
bool disconnectingLastFrontend = !m_frontendRouter->hasFrontends();
@@ -11889,7 +11766,7 @@ index 187e59d58ba020cbac2246acc669ef95cafd75b4..bb2498bdb082721ce539dd935b5aebad
Ref inspectedPage = m_inspectedPage.get();
inspectedPage->didChangeInspectorFrontendCount(m_frontendRouter->frontendCount());
-@@ -138,6 +237,8 @@ void WebPageInspectorController::disconnectAllFrontends()
+@@ -140,6 +239,8 @@ void WebPageInspectorController::disconnectAllFrontends()
// Disconnect any remaining remote frontends.
m_frontendRouter->disconnectAllFrontends();
@@ -11898,7 +11775,7 @@ index 187e59d58ba020cbac2246acc669ef95cafd75b4..bb2498bdb082721ce539dd935b5aebad
Ref inspectedPage = m_inspectedPage.get();
inspectedPage->didChangeInspectorFrontendCount(m_frontendRouter->frontendCount());
-@@ -166,6 +267,66 @@ void WebPageInspectorController::setIndicating(bool indicating)
+@@ -168,6 +269,66 @@ void WebPageInspectorController::setIndicating(bool indicating)
}
#endif
@@ -11962,10 +11839,10 @@ index 187e59d58ba020cbac2246acc669ef95cafd75b4..bb2498bdb082721ce539dd935b5aebad
+ s_observer->didFailProvisionalLoad(m_inspectedPage, navigationID, error.localizedDescription());
+}
+
- void WebPageInspectorController::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type)
+ void WebPageInspectorController::createWebPageInspectorTarget(const String& targetId, Inspector::InspectorTargetType type)
{
- addTarget(InspectorTargetProxy::create(protectedInspectedPage(), targetId, type));
-@@ -185,6 +346,52 @@ void WebPageInspectorController::sendMessageToInspectorFrontend(const String& ta
+ addTarget(WebPageInspectorTargetProxy::create(protectedInspectedPage(), targetId, type));
+@@ -192,6 +353,52 @@ void WebPageInspectorController::sendMessageToInspectorFrontend(const String& ta
checkedTargetAgent()->sendMessageFromTargetToFrontend(targetId, message);
}
@@ -12018,26 +11895,27 @@ index 187e59d58ba020cbac2246acc669ef95cafd75b4..bb2498bdb082721ce539dd935b5aebad
bool WebPageInspectorController::shouldPauseLoading(const ProvisionalPageProxy& provisionalPage) const
{
if (!m_frontendRouter->hasFrontends())
-@@ -204,7 +411,7 @@ void WebPageInspectorController::setContinueLoadingCallback(const ProvisionalPag
+@@ -211,7 +418,7 @@ void WebPageInspectorController::setContinueLoadingCallback(const ProvisionalPag
void WebPageInspectorController::didCreateProvisionalPage(ProvisionalPageProxy& provisionalPage)
{
-- addTarget(InspectorTargetProxy::create(provisionalPage, getTargetID(provisionalPage), Inspector::InspectorTargetType::Page));
-+ addTarget(InspectorTargetProxy::create(provisionalPage, getTargetID(provisionalPage)));
+- addTarget(WebPageInspectorTargetProxy::create(provisionalPage, getTargetID(provisionalPage), Inspector::InspectorTargetType::Page));
++ addTarget(WebPageInspectorTargetProxy::create(provisionalPage, getTargetID(provisionalPage)));
}
void WebPageInspectorController::willDestroyProvisionalPage(const ProvisionalPageProxy& provisionalPage)
diff --git a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h
-index 0e6766e155e83f9f5fde89080448b3f08a3a27e5..de641a1629d40ed31b78502b1c9883beed12ba34 100644
+index 43345234f9bbcdfac9c532e6b7e972002ef59eff..2a6418236f1ab9848c6e2828937bd4e14a9ebe9c 100644
--- a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h
+++ b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h
-@@ -26,19 +26,39 @@
- #pragma once
+@@ -27,20 +27,40 @@
#include "InspectorTargetProxy.h"
+ #include "ProvisionalPageProxy.h"
+#include "ProcessTerminationReason.h"
#include <JavaScriptCore/InspectorAgentRegistry.h>
#include <JavaScriptCore/InspectorTargetAgent.h>
+ #include <WebCore/FrameIdentifier.h>
+#include <WebCore/NavigationIdentifier.h>
#include <WebCore/PageIdentifier.h>
#include <wtf/CheckedRef.h>
@@ -12071,8 +11949,8 @@ index 0e6766e155e83f9f5fde89080448b3f08a3a27e5..de641a1629d40ed31b78502b1c9883be
}
namespace WebKit {
-@@ -46,6 +66,23 @@ namespace WebKit {
- class InspectorBrowserAgent;
+@@ -49,6 +69,23 @@ class InspectorBrowserAgent;
+ class ProvisionalPageProxy;
struct WebPageAgentContext;
+class InspectorScreencastAgent;
@@ -12095,7 +11973,7 @@ index 0e6766e155e83f9f5fde89080448b3f08a3a27e5..de641a1629d40ed31b78502b1c9883be
class WebPageInspectorController {
WTF_MAKE_TZONE_ALLOCATED(WebPageInspectorController);
WTF_MAKE_NONCOPYABLE(WebPageInspectorController);
-@@ -54,7 +91,21 @@ public:
+@@ -57,7 +94,21 @@ public:
~WebPageInspectorController();
void init();
@@ -12117,7 +11995,7 @@ index 0e6766e155e83f9f5fde89080448b3f08a3a27e5..de641a1629d40ed31b78502b1c9883be
bool hasLocalFrontend() const;
-@@ -67,11 +118,27 @@ public:
+@@ -70,12 +121,28 @@ public:
#if ENABLE(REMOTE_INSPECTOR)
void setIndicating(bool);
#endif
@@ -12132,7 +12010,8 @@ index 0e6766e155e83f9f5fde89080448b3f08a3a27e5..de641a1629d40ed31b78502b1c9883be
+
+ void didFailProvisionalLoadForFrame(WebCore::NavigationIdentifier navigationID, const WebCore::ResourceError& error);
- void createInspectorTarget(const String& targetId, Inspector::InspectorTargetType);
+ void createWebPageInspectorTarget(const String& targetId, Inspector::InspectorTargetType);
+ void createWebFrameInspectorTarget(WebFrameProxy&, const String& targetId);
void destroyInspectorTarget(const String& targetId);
void sendMessageToInspectorFrontend(const String& targetId, const String& message);
@@ -12145,7 +12024,7 @@ index 0e6766e155e83f9f5fde89080448b3f08a3a27e5..de641a1629d40ed31b78502b1c9883be
bool shouldPauseLoading(const ProvisionalPageProxy&) const;
void setContinueLoadingCallback(const ProvisionalPageProxy&, WTF::Function<void()>&&);
-@@ -86,7 +153,7 @@ public:
+@@ -90,7 +157,7 @@ public:
void browserExtensionsDisabled(HashSet<String>&&);
private:
@@ -12154,7 +12033,7 @@ index 0e6766e155e83f9f5fde89080448b3f08a3a27e5..de641a1629d40ed31b78502b1c9883be
CheckedPtr<Inspector::InspectorTargetAgent> checkedTargetAgent() { return m_targetAgent; }
WebPageAgentContext webPageAgentContext();
void createLazyAgents();
-@@ -102,9 +169,16 @@ private:
+@@ -106,9 +173,16 @@ private:
CheckedPtr<Inspector::InspectorTargetAgent> m_targetAgent;
HashMap<String, std::unique_ptr<InspectorTargetProxy>> m_targets;
@@ -12171,6 +12050,80 @@ index 0e6766e155e83f9f5fde89080448b3f08a3a27e5..de641a1629d40ed31b78502b1c9883be
};
} // namespace WebKit
+diff --git a/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.cpp b/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.cpp
+index 1c393ce01ed94f96908c674f969c383d4ddc50d7..404e46f4786f54b946f254efa6f6b06cad765bf3 100644
+--- a/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.cpp
++++ b/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.cpp
+@@ -59,6 +59,11 @@ std::unique_ptr<WebPageInspectorTargetProxy> WebPageInspectorTargetProxy::create
+ return target;
+ }
+
++std::unique_ptr<WebPageInspectorTargetProxy> WebPageInspectorTargetProxy::create(ProvisionalPageProxy& provisionalPage, const String& targetId)
++{
++ return WebPageInspectorTargetProxy::create(provisionalPage, targetId, Inspector::InspectorTargetType::Page);
++}
++
+ WebPageInspectorTargetProxy::WebPageInspectorTargetProxy(WebPageProxy& page, const String& targetId, Inspector::InspectorTargetType type)
+ : InspectorTargetProxy(targetId, type)
+ , m_page(page)
+@@ -109,6 +114,31 @@ void WebPageInspectorTargetProxy::didCommitProvisionalTarget()
+ m_provisionalPage = nullptr;
+ }
+
++void WebPageInspectorTargetProxy::willResume()
++{
++ if (m_page->hasRunningProcess())
++ m_page->legacyMainFrameProcess().send(Messages::WebPage::ResumeInspectorIfPausedInNewWindow(), m_page->webPageIDInMainFrameProcess());
++}
++
++void WebPageInspectorTargetProxy::activate(String& error)
++{
++ if (type() != Inspector::InspectorTargetType::Page)
++ return InspectorTarget::activate(error);
++
++ platformActivate(error);
++}
++
++void WebPageInspectorTargetProxy::close(String& error, bool runBeforeUnload)
++{
++ if (type() != Inspector::InspectorTargetType::Page)
++ return InspectorTarget::close(error, runBeforeUnload);
++
++ if (runBeforeUnload)
++ m_page->tryClose();
++ else
++ m_page->closePage();
++}
++
+ bool WebPageInspectorTargetProxy::isProvisional() const
+ {
+ return !!m_provisionalPage;
+diff --git a/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.h b/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.h
+index 32e18c59ffdeae8564664dbc851ad1f26aebdfc4..ecc55f78d2deed7d7342ecbc90c2766adfb1799d 100644
+--- a/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.h
++++ b/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.h
+@@ -43,6 +43,7 @@ class WebPageInspectorTargetProxy final : public InspectorTargetProxy {
+ public:
+ static std::unique_ptr<WebPageInspectorTargetProxy> create(WebPageProxy&, const String& targetId, Inspector::InspectorTargetType);
+ static std::unique_ptr<WebPageInspectorTargetProxy> create(ProvisionalPageProxy&, const String& targetId, Inspector::InspectorTargetType);
++ static std::unique_ptr<WebPageInspectorTargetProxy> create(ProvisionalPageProxy&, const String& targetId);
+ WebPageInspectorTargetProxy(WebPageProxy&, const String& targetId, Inspector::InspectorTargetType);
+ ~WebPageInspectorTargetProxy() = default;
+
+@@ -52,8 +53,13 @@ public:
+ void connect(Inspector::FrontendChannel::ConnectionType) override;
+ void disconnect() override;
+ void sendMessageToTargetBackend(const String&) override;
++ void activate(String& error) override;
++ void close(String& error, bool runBeforeUnload) override;
+
+ private:
++ void willResume() override;
++ void platformActivate(String& error) const;
++
+ WeakRef<WebPageProxy> m_page;
+ WeakPtr<ProvisionalPageProxy> m_provisionalPage;
+ };
diff --git a/Source/WebKit/UIProcess/Inspector/mac/ScreencastEncoderMac.mm b/Source/WebKit/UIProcess/Inspector/mac/ScreencastEncoderMac.mm
new file mode 100644
index 0000000000000000000000000000000000000000..6a04ee480bc3a8270a7de20b1cd0da718242b4c1
@@ -13676,10 +13629,10 @@ index 0000000000000000000000000000000000000000..af71e4077eb0c6f95396de7bfef89a3e
+
+#endif // ENABLE(REMOTE_INSPECTOR)
diff --git a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
-index 2f2a79c4780491bb12741cc1e5fabcc37f33310a..09a92636f4bb6b0cf3d86b310c544b23c4d981c1 100644
+index b16dfdb4a9d5d30a0e7e4185261646c2f2b598eb..eb2498f8d174b574c5ae9015d2080b6f08714d4d 100644
--- a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
+++ b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
-@@ -168,6 +168,13 @@ void ProcessLauncher::launchProcess()
+@@ -164,6 +164,13 @@ void ProcessLauncher::launchProcess()
nargs++;
}
#endif
@@ -13693,7 +13646,7 @@ index 2f2a79c4780491bb12741cc1e5fabcc37f33310a..09a92636f4bb6b0cf3d86b310c544b23
WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN // GTK/WPE port
-@@ -188,6 +195,10 @@ void ProcessLauncher::launchProcess()
+@@ -181,6 +188,10 @@ void ProcessLauncher::launchProcess()
if (configureJSCForTesting)
argv[i++] = const_cast<char*>("--configure-jsc-for-testing");
#endif
@@ -13732,7 +13685,7 @@ index 6723ee0d9943be07bc8ad09d2b678838aca968df..0d7fb3c7b1a4c877a2ff2f2189d12c7d
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 840ce36d9401a3b997d0a3b6f9cc1f1528cb92fb..9a30a5ada8821c8b5de53cb20b1ea2785621e6b0 100644
+index 5eb9a2c8ffee283bd4cf23b32a3319d21c675299..d0d864d4b1e098b7b909afb0055a4c88b354ae59 100644
--- a/Source/WebKit/UIProcess/PageClient.h
+++ b/Source/WebKit/UIProcess/PageClient.h
@@ -74,6 +74,11 @@
@@ -13898,7 +13851,7 @@ index 0000000000000000000000000000000000000000..f855bb5ff6e91cc3383fb9a96d32392f
+
+#endif // ENABLE(FULLSCREEN_API)
diff --git a/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp b/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp
-index 493bde430bef5c064ff6807296ad088d8dee1a72..9b6dbc259e150fba3ba5fb4b488d91e3fb16be7e 100644
+index 39a815b0819e99e9575d8f3deec07affd2e9c404..5c9196627dd1bcdbf80fb41c09d77fb21bb2fa44 100644
--- a/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp
+++ b/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp
@@ -25,6 +25,7 @@
@@ -13909,6 +13862,26 @@ index 493bde430bef5c064ff6807296ad088d8dee1a72..9b6dbc259e150fba3ba5fb4b488d91e3
#include "FrameProcess.h"
#include "ProvisionalFrameCreationParameters.h"
+diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.h b/Source/WebKit/UIProcess/ProvisionalPageProxy.h
+index eb26056800aaec0f2919438d97ffceb72e70fc31..4e53ec412c541efbf9a5cdb0311adf56cceaca1e 100644
+--- a/Source/WebKit/UIProcess/ProvisionalPageProxy.h
++++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.h
+@@ -34,6 +34,7 @@
+ #include "WebFramePolicyListenerProxy.h"
+ #include "WebPageProxyIdentifier.h"
+ #include "WebPageProxyMessageReceiverRegistration.h"
++#include "WebsiteDataStore.h"
+ #include <WebCore/DiagnosticLoggingClient.h>
+ #include <WebCore/FrameIdentifier.h>
+ #include <WebCore/FrameLoaderClient.h>
+@@ -74,7 +75,6 @@ class WebBackForwardListItem;
+ class WebFrameProxy;
+ class WebPageProxy;
+ class WebProcessProxy;
+-class WebsiteDataStore;
+
+ struct FrameInfoData;
+ struct NavigationActionData;
diff --git a/Source/WebKit/UIProcess/RemoteInspectorPipe.cpp b/Source/WebKit/UIProcess/RemoteInspectorPipe.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2d2e6bb485c9a95b871d9545b8720cfd061dd789
@@ -14215,6 +14188,18 @@ index 0000000000000000000000000000000000000000..23626aa70d5a14e6484c81e05b146b37
+} // namespace WebKit
+
+#endif // ENABLE(REMOTE_INSPECTOR)
+diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteScrollingTreeMac.mm b/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteScrollingTreeMac.mm
+index b3557b3f7ff2283113191f61b5a5ea1fce8065e2..1ded8a28fcd870b0bae4965d60a56c1d582077b9 100644
+--- a/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteScrollingTreeMac.mm
++++ b/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteScrollingTreeMac.mm
+@@ -46,6 +46,7 @@
+ #import <pal/spi/cocoa/QuartzCoreSPI.h>
+ #import <wtf/SetForScope.h>
+ #import <wtf/TZoneMallocInlines.h>
++#import <wtf/SetForScope.h>
+ #import <wtf/text/TextStream.h>
+
+ namespace WebKit {
diff --git a/Source/WebKit/UIProcess/RemotePagePlaybackSessionManagerProxy.h b/Source/WebKit/UIProcess/RemotePagePlaybackSessionManagerProxy.h
index 3f6cd845733e2e8f5e25c318e7ab54f77032d4cf..e4399bfd734a28ef5df5ec855b7c78b46634c91d 100644
--- a/Source/WebKit/UIProcess/RemotePagePlaybackSessionManagerProxy.h
@@ -14233,7 +14218,7 @@ index 3f6cd845733e2e8f5e25c318e7ab54f77032d4cf..e4399bfd734a28ef5df5ec855b7c78b4
class RemotePagePlaybackSessionManagerProxy : public IPC::MessageReceiver, public RefCounted<RemotePagePlaybackSessionManagerProxy> {
diff --git a/Source/WebKit/UIProcess/RemotePageProxy.cpp b/Source/WebKit/UIProcess/RemotePageProxy.cpp
-index 22c8a561850249008f998405712e88f1c2229336..70e7f76c32af780642d254003ee834204784694f 100644
+index 75cbe6ba806eb865a83119b2a15a6a86dd632c59..a21c6d7f4dab3ab2456ffc3c7b558464268295a6 100644
--- a/Source/WebKit/UIProcess/RemotePageProxy.cpp
+++ b/Source/WebKit/UIProcess/RemotePageProxy.cpp
@@ -37,6 +37,7 @@
@@ -14259,18 +14244,6 @@ 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
@@ -14283,6 +14256,20 @@ index 697a350812e1bf73dd44cc3d723a6a291f9d59d1..a8e1edd710d88f48632d51fd05aa9647
WebPageProxy* page() const { return m_page.get(); }
RefPtr<WebPageProxy> protectedPage() const;
+diff --git a/Source/WebKit/UIProcess/WebFrameProxy.cpp b/Source/WebKit/UIProcess/WebFrameProxy.cpp
+index 5fdb94c7c596bf6fc32c1dc29544a7b662bed349..dcb9a97492039ea8bc5006635c07f509eb93ca3a 100644
+--- a/Source/WebKit/UIProcess/WebFrameProxy.cpp
++++ b/Source/WebKit/UIProcess/WebFrameProxy.cpp
+@@ -183,6 +183,9 @@ void WebFrameProxy::webProcessWillShutDown()
+ for (auto& childFrame : std::exchange(m_childFrames, { }))
+ childFrame->webProcessWillShutDown();
+
++ if (RefPtr page = m_page.get())
++ page->inspectorController().destroyInspectorTarget(WebFrameInspectorTarget::toTargetID(frameID()));
++
+ m_page = nullptr;
+
+ if (RefPtr activeListener = m_activeListener) {
diff --git a/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.cpp b/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..058b9a31fc23cc36a228ef63cc89a80ccf3fa62e
@@ -14532,7 +14519,7 @@ index 0000000000000000000000000000000000000000..14db923537ba3cad1961a748ae5e1d66
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..dc8d041e863fa9f4522a5c48d2d8bccd32c12c42
+index 0000000000000000000000000000000000000000..6552cca25752823321adf0aea2b46a2df90a3ec1
--- /dev/null
+++ b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp
@@ -0,0 +1,394 @@
@@ -14727,7 +14714,7 @@ index 0000000000000000000000000000000000000000..dc8d041e863fa9f4522a5c48d2d8bccd
+ bool eventIsSystemKey = false;
+ if (isSystemKey)
+ eventIsSystemKey = *isSystemKey;
-+ WallTime timestamp = WallTime::now();
++ MonotonicTime timestamp = MonotonicTime::now();
+
+ // cancel any active drag on Escape
+ if (eventType == WebEventType::KeyDown && key == "Escape"_s && m_page.cancelDragIfNeeded()) {
@@ -14819,7 +14806,7 @@ index 0000000000000000000000000000000000000000..dc8d041e863fa9f4522a5c48d2d8bccd
+ UNUSED_VARIABLE(eventClickCount);
+ platformDispatchMouseEvent(type, x, y, WTFMove(modifiers), button, WTFMove(clickCount), eventButtons);
+#elif PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)
-+ WallTime timestamp = WallTime::now();
++ MonotonicTime timestamp = MonotonicTime::now();
+ NativeWebMouseEvent event(
+ eventType,
+ eventButton,
@@ -14891,7 +14878,7 @@ index 0000000000000000000000000000000000000000..dc8d041e863fa9f4522a5c48d2d8bccd
+ touchPoints.append(WebPlatformTouchPoint(id, state, position, position, radius, rotationAngle, force));
+ }
+
-+ WebTouchEvent touchEvent({WebEventType::TouchStart, eventModifiers, WallTime::now()}, WTFMove(touchPoints), {}, {});
++ WebTouchEvent touchEvent({WebEventType::TouchStart, eventModifiers, MonotonicTime::now()}, WTFMove(touchPoints), {}, {});
+ m_page.legacyMainFrameProcess().sendWithAsyncReply(Messages::WebPage::TouchEvent(touchEvent), [callback] (std::optional<WebEventType> eventType, bool) {
+ if (!eventType) {
+ callback->sendFailure("Failed to dispatch touch event."_s);
@@ -14920,7 +14907,7 @@ index 0000000000000000000000000000000000000000..dc8d041e863fa9f4522a5c48d2d8bccd
+ x = clampToInteger(roundf(x * totalScale));
+ y = clampToInteger(roundf(y * totalScale));
+
-+ WallTime timestamp = WallTime::now();
++ MonotonicTime timestamp = MonotonicTime::now();
+ WebCore::FloatSize delta = {-eventDeltaX, -eventDeltaY};
+ WebCore::FloatSize wheelTicks = delta;
+ wheelTicks.scale(1.0f / WebCore::Scrollbar::pixelsPerLineStep());
@@ -14932,7 +14919,7 @@ index 0000000000000000000000000000000000000000..dc8d041e863fa9f4522a5c48d2d8bccd
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/WebPageInspectorInputAgent.h b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.h
new file mode 100644
-index 0000000000000000000000000000000000000000..1afb1a81f0da0d35cf2e9375e691b016eeebe10b
+index 0000000000000000000000000000000000000000..1430b24f8d4b992ccd637ef6ff6a27e961e914de
--- /dev/null
+++ b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.h
@@ -0,0 +1,87 @@
@@ -15004,7 +14991,7 @@ index 0000000000000000000000000000000000000000..1afb1a81f0da0d35cf2e9375e691b016
+ void dispatchWheelEvent(int x, int y, std::optional<int>&& modifiers, std::optional<int>&& deltaX, std::optional<int>&& deltaY, Ref<DispatchWheelEventCallback>&& callback) override;
+
+private:
-+ void platformDispatchKeyEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, Vector<String>& commands, WallTime timestamp);
++ void platformDispatchKeyEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, Vector<String>& commands, MonotonicTime timestamp);
+#if PLATFORM(MAC)
+ void platformDispatchMouseEvent(const String& type, int x, int y, std::optional<int>&& modifier, const String& button, std::optional<int>&& clickCount, unsigned short buttons);
+#endif
@@ -15024,10 +15011,10 @@ index 0000000000000000000000000000000000000000..1afb1a81f0da0d35cf2e9375e691b016
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
-index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77e449676e 100644
+index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc115017379a 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
-@@ -208,6 +208,7 @@
+@@ -210,6 +210,7 @@
#include <WebCore/CaptureDeviceManager.h>
#include <WebCore/CaptureDeviceWithCapabilities.h>
#include <WebCore/ChromeClient.h>
@@ -15035,7 +15022,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
#include <WebCore/CompositionHighlight.h>
#include <WebCore/CrossSiteNavigationDataTransfer.h>
#include <WebCore/CryptoKey.h>
-@@ -220,6 +221,7 @@
+@@ -222,6 +223,7 @@
#include <WebCore/DigitalCredentialsProtocols.h>
#include <WebCore/DigitalCredentialsRequestData.h>
#include <WebCore/DigitalCredentialsResponseData.h>
@@ -15043,7 +15030,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
#include <WebCore/DragController.h>
#include <WebCore/DragData.h>
#include <WebCore/ElementContext.h>
-@@ -244,6 +246,7 @@
+@@ -245,6 +247,7 @@
#include <WebCore/ModalContainerTypes.h>
#include <WebCore/NotImplemented.h>
#include <WebCore/OrganizationStorageAccessPromptQuirk.h>
@@ -15051,10 +15038,10 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
#include <WebCore/PerformanceLoggingClient.h>
#include <WebCore/PermissionDescriptor.h>
#include <WebCore/PermissionState.h>
-@@ -252,10 +255,13 @@
- #include <WebCore/PublicSuffixStore.h>
+@@ -254,10 +257,13 @@
#include <WebCore/Quirks.h>
#include <WebCore/RealtimeMediaSourceCenter.h>
+ #include <WebCore/ReferrerPolicy.h>
+#include <WebCore/RegistrableDomain.h>
#include <WebCore/RemoteUserInputEventData.h>
#include <WebCore/RenderEmbeddedObject.h>
@@ -15065,7 +15052,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
#include <WebCore/SerializedCryptoKeyWrap.h>
#include <WebCore/SerializedScriptValue.h>
#include <WebCore/ShareData.h>
-@@ -346,7 +352,7 @@
+@@ -345,7 +351,7 @@
#include "ViewSnapshotStore.h"
#endif
@@ -15074,19 +15061,10 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
#include <WebCore/SelectionData.h>
#endif
-@@ -476,6 +482,8 @@ static constexpr Seconds tryCloseTimeoutDelay = 50_ms;
- static constexpr Seconds audibleActivityClearDelay = 10_s;
- #endif
-
-+using namespace WebCore;
-+
- DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, webPageProxyCounter, ("WebPageProxy"));
+@@ -1016,6 +1022,10 @@ WebPageProxy::~WebPageProxy()
- #if PLATFORM(COCOA)
-@@ -1007,6 +1015,10 @@ WebPageProxy::~WebPageProxy()
- #endif
-
- internals().updatePlayingMediaDidChangeTimer.stop();
+ ASSERT(webPageProxyMap().get(m_identifier) == this);
+ webPageProxyMap().remove(m_identifier);
+
+#if PLATFORM(COCOA)
+ releaseInspectorDragPasteboard();
@@ -15094,7 +15072,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
}
Ref<WebPageProxy> WebPageProxy::Internals::protectedPage() const
-@@ -1591,7 +1603,7 @@ void WebPageProxy::didAttachToRunningProcess()
+@@ -1593,7 +1603,7 @@ void WebPageProxy::didAttachToRunningProcess()
#if ENABLE(FULLSCREEN_API)
ASSERT(!m_fullScreenManager);
@@ -15103,7 +15081,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
#endif
#if ENABLE(VIDEO_PRESENTATION_MODE)
ASSERT(!m_playbackSessionManager);
-@@ -1755,6 +1767,7 @@ void WebPageProxy::initializeWebPage(const Site& site, WebCore::SandboxFlags eff
+@@ -1757,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);
@@ -15111,7 +15089,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
#if ENABLE(WINDOW_PROXY_PROPERTY_ACCESS_NOTIFICATION)
internals().frameLoadStateObserver = WebPageProxyFrameLoadStateObserver::create();
-@@ -2037,6 +2050,21 @@ Ref<WebProcessProxy> WebPageProxy::ensureProtectedRunningProcess()
+@@ -2071,6 +2082,21 @@ Ref<WebProcessProxy> WebPageProxy::ensureProtectedRunningProcess()
return ensureRunningProcess();
}
@@ -15133,7 +15111,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
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)
-@@ -2156,11 +2184,29 @@ void WebPageProxy::loadRequestWithNavigationShared(Ref<WebProcessProxy>&& proces
+@@ -2190,11 +2216,29 @@ void WebPageProxy::loadRequestWithNavigationShared(Ref<WebProcessProxy>&& proces
navigation->setIsLoadedWithNavigationShared(true);
protectedProcess->markProcessAsRecentlyUsed();
@@ -15167,8 +15145,8 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
});
}
-@@ -2716,6 +2762,63 @@ void WebPageProxy::setControlledByAutomation(bool controlled)
- protectedWebsiteDataStore()->protectedNetworkProcess()->send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0);
+@@ -2757,6 +2801,63 @@ RefPtr<WebAutomationSession> WebPageProxy::activeAutomationSession() const
+ return m_configuration->processPool().automationSession();
}
+void WebPageProxy::setAuthCredentialsForAutomation(std::optional<WebCore::Credential>&& credentials, std::optional<URL>&& origin)
@@ -15231,7 +15209,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
void WebPageProxy::createInspectorTarget(IPC::Connection& connection, const String& targetId, Inspector::InspectorTargetType type)
{
MESSAGE_CHECK_BASE(!targetId.isEmpty(), connection);
-@@ -3003,6 +3106,24 @@ void WebPageProxy::updateActivityState(OptionSet<ActivityState> flagsToUpdate)
+@@ -3044,6 +3145,24 @@ void WebPageProxy::updateActivityState(OptionSet<ActivityState> flagsToUpdate)
bool wasVisible = isViewVisible();
RefPtr pageClient = this->pageClient();
internals().activityState.remove(flagsToUpdate);
@@ -15256,7 +15234,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
if (flagsToUpdate & ActivityState::IsFocused && pageClient->isViewFocused())
internals().activityState.add(ActivityState::IsFocused);
if (flagsToUpdate & ActivityState::WindowIsActive && pageClient->isViewWindowActive())
-@@ -3769,7 +3890,7 @@ void WebPageProxy::performDragOperation(DragData& dragData, const String& dragSt
+@@ -3809,7 +3928,7 @@ void WebPageProxy::performDragOperation(DragData& dragData, const String& dragSt
if (!hasRunningProcess())
return;
@@ -15265,7 +15243,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
URL url { dragData.asURL() };
if (url.protocolIsFile())
protectedLegacyMainFrameProcess()->assumeReadAccessToBaseURL(*this, url.string(), [] { });
-@@ -3797,6 +3918,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
+@@ -3837,6 +3956,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
if (!hasRunningProcess())
return;
@@ -15274,7 +15252,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
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;
-@@ -3808,7 +3931,7 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
+@@ -3848,7 +3969,7 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
dragData.setClientPosition(remoteUserInputEventData->transformedPoint);
performDragControllerAction(action, dragData, remoteUserInputEventData->targetFrameID);
};
@@ -15283,7 +15261,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
ASSERT(dragData.platformData());
sendWithAsyncReplyToProcessContainingFrame(frameID, Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags()), WTFMove(completionHandler));
#else
-@@ -3843,17 +3966,36 @@ void WebPageProxy::didPerformDragControllerAction(std::optional<WebCore::DragOpe
+@@ -3883,17 +4004,36 @@ void WebPageProxy::didPerformDragControllerAction(std::optional<WebCore::DragOpe
setDragCaretRect(insertionRect);
if (RefPtr pageClient = this->pageClient())
pageClient->didPerformDragControllerAction();
@@ -15323,7 +15301,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
didStartDrag();
}
#endif
-@@ -3874,6 +4016,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo
+@@ -3914,6 +4054,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo
setDragCaretRect({ });
}
@@ -15348,7 +15326,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
void WebPageProxy::didStartDrag()
{
if (!hasRunningProcess())
-@@ -3881,6 +4041,26 @@ void WebPageProxy::didStartDrag()
+@@ -3921,6 +4079,26 @@ void WebPageProxy::didStartDrag()
discardQueuedMouseEvents();
send(Messages::WebPage::DidStartDrag());
@@ -15375,7 +15353,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
}
void WebPageProxy::dragCancelled()
-@@ -4052,26 +4232,47 @@ void WebPageProxy::processNextQueuedMouseEvent()
+@@ -4092,26 +4270,47 @@ void WebPageProxy::processNextQueuedMouseEvent()
process->startResponsivenessTimer();
}
@@ -15435,8 +15413,8 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
}
void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function<void ()>&& action)
-@@ -4269,6 +4470,8 @@ void WebPageProxy::wheelEventHandlingCompleted(bool wasHandled)
-
+@@ -4309,6 +4508,8 @@ void WebPageProxy::wheelEventHandlingCompleted(bool wasHandled)
+
if (RefPtr automationSession = m_configuration->processPool().automationSession())
automationSession->wheelEventsFlushedForPage(*this);
+
@@ -15444,7 +15422,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
}
void WebPageProxy::cacheWheelEventScrollingAccelerationCurve(const NativeWebWheelEvent& nativeWheelEvent)
-@@ -4405,7 +4608,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b)
+@@ -4444,7 +4645,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b)
void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent)
{
@@ -15453,15 +15431,15 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
for (auto& touchPoint : touchStartEvent.touchPoints()) {
auto location = touchPoint.locationInRootView();
auto update = [this, location](TrackingType& trackingType, EventTrackingRegions::EventType eventType) {
-@@ -5104,6 +5307,7 @@ Ref<WebPageProxy> WebPageProxy::navigationOriginatingPage(const FrameInfoData& f
+@@ -5163,6 +5364,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)
+ void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, std::optional<std::pair<Ref<API::WebsitePolicies>, Ref<WebProcessProxy>>>&& websitePoliciesAndProcess, Ref<API::NavigationAction>&& navigationAction, WillContinueLoadInNewProcess willContinueLoadInNewProcess, std::optional<SandboxExtension::Handle> sandboxExtensionHandle, std::optional<PolicyDecisionConsoleMessage>&& consoleMessage, CompletionHandler<void(PolicyDecision&&)>&& completionHandler)
{
+ m_inspectorController->didReceivePolicyDecision(action, navigation ? std::optional { navigation->navigationID() } : std::nullopt);
if (!hasRunningProcess())
return completionHandler(PolicyDecision { });
-@@ -6118,6 +6322,7 @@ void WebPageProxy::viewScaleFactorDidChange(IPC::Connection& connection, double
+@@ -6174,6 +6376,7 @@ void WebPageProxy::viewScaleFactorDidChange(IPC::Connection& connection, double
MESSAGE_CHECK_BASE(scaleFactorIsValid(scaleFactor), connection);
if (!legacyMainFrameProcess().hasConnection(connection))
return;
@@ -15469,7 +15447,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
forEachWebContentProcess([&] (auto& process, auto pageID) {
if (&process == &legacyMainFrameProcess())
-@@ -6769,6 +6974,7 @@ void WebPageProxy::didDestroyNavigationShared(Ref<WebProcessProxy>&& process, We
+@@ -6836,6 +7039,7 @@ void WebPageProxy::didDestroyNavigationShared(Ref<WebProcessProxy>&& process, We
RefPtr protectedPageClient { pageClient() };
m_navigationState->didDestroyNavigation(process->coreProcessIdentifier(), navigationID);
@@ -15477,7 +15455,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
}
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)
-@@ -7126,6 +7332,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref<WebProcessProxy>&& p
+@@ -7202,6 +7406,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref<WebProcessProxy>&& p
m_failingProvisionalLoadURL = { };
@@ -15486,7 +15464,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
// 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;
-@@ -8665,6 +8873,8 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
+@@ -8779,6 +8985,8 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
if (RefPtr page = originatingFrameInfo->page())
openerAppInitiatedState = page->lastNavigationWasAppInitiated();
@@ -15495,7 +15473,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
auto completionHandler = [
this,
protectedThis = Ref { *this },
-@@ -8749,6 +8959,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
+@@ -8865,6 +9073,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
configuration->setOpenedMainFrameName(openedMainFrameName);
if (!protectedPreferences()->siteIsolationEnabled())
configuration->setRelatedPage(*this);
@@ -15503,7 +15481,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
if (RefPtr openerFrame = WebFrameProxy::webFrame(originatingFrameInfoData.frameID); navigationActionData.hasOpener && openerFrame) {
configuration->setOpenerInfo({ {
-@@ -8778,6 +8989,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
+@@ -8894,6 +9103,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
void WebPageProxy::showPage()
{
m_uiClient->showPage(this);
@@ -15511,7 +15489,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
}
bool WebPageProxy::hasOpenedPage() const
-@@ -8916,6 +9128,10 @@ void WebPageProxy::closePage()
+@@ -9032,6 +9242,10 @@ void WebPageProxy::closePage()
if (isClosed())
return;
@@ -15522,7 +15500,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:");
if (RefPtr pageClient = this->pageClient())
pageClient->clearAllEditCommands();
-@@ -8954,6 +9170,8 @@ void WebPageProxy::runJavaScriptAlert(IPC::Connection& connection, FrameIdentifi
+@@ -9070,6 +9284,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 {
@@ -15531,7 +15509,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
page.m_uiClient->runJavaScriptAlert(page, WTFMove(message), frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable {
reply();
completion();
-@@ -8976,6 +9194,8 @@ void WebPageProxy::runJavaScriptConfirm(IPC::Connection& connection, FrameIdenti
+@@ -9092,6 +9308,8 @@ void WebPageProxy::runJavaScriptConfirm(IPC::Connection& connection, FrameIdenti
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->willShowJavaScriptDialog(*this, message, std::nullopt);
}
@@ -15540,7 +15518,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
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 {
-@@ -9000,6 +9220,8 @@ void WebPageProxy::runJavaScriptPrompt(IPC::Connection& connection, FrameIdentif
+@@ -9116,6 +9334,8 @@ void WebPageProxy::runJavaScriptPrompt(IPC::Connection& connection, FrameIdentif
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->willShowJavaScriptDialog(*this, message, defaultValue);
}
@@ -15549,7 +15527,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
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 {
-@@ -9142,6 +9364,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(IPC::Connection& connection, Fram
+@@ -9252,6 +9472,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(IPC::Connection& connection, Fram
return;
}
}
@@ -15558,7 +15536,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
// Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer.
webProcess->stopResponsivenessTimer();
-@@ -9787,6 +10011,11 @@ void WebPageProxy::resourceLoadDidCompleteWithError(ResourceLoadInfo&& loadInfo,
+@@ -9897,6 +10119,11 @@ void WebPageProxy::resourceLoadDidCompleteWithError(ResourceLoadInfo&& loadInfo,
}
#if ENABLE(FULLSCREEN_API)
@@ -15570,7 +15548,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
WebFullScreenManagerProxy* WebPageProxy::fullScreenManager()
{
return m_fullScreenManager.get();
-@@ -9919,6 +10148,17 @@ void WebPageProxy::requestDOMPasteAccess(IPC::Connection& connection, DOMPasteAc
+@@ -10029,6 +10256,17 @@ void WebPageProxy::requestDOMPasteAccess(IPC::Connection& connection, DOMPasteAc
}
}
@@ -15588,7 +15566,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
protectedPageClient()->requestDOMPasteAccess(pasteAccessCategory, requiresInteraction, elementRect, originIdentifier, WTFMove(completionHandler));
}
-@@ -10930,6 +11170,8 @@ void WebPageProxy::mouseEventHandlingCompleted(std::optional<WebEventType> event
+@@ -11064,6 +11302,8 @@ void WebPageProxy::mouseEventHandlingCompleted(std::optional<WebEventType> event
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->mouseEventsFlushedForPage(*this);
didFinishProcessingAllPendingMouseEvents();
@@ -15597,7 +15575,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
}
}
-@@ -10965,6 +11207,7 @@ void WebPageProxy::keyEventHandlingCompleted(std::optional<WebEventType> eventTy
+@@ -11099,6 +11339,7 @@ void WebPageProxy::keyEventHandlingCompleted(std::optional<WebEventType> eventTy
if (!canProcessMoreKeyEvents) {
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->keyboardEventsFlushedForPage(*this);
@@ -15605,7 +15583,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
}
}
-@@ -11399,7 +11642,10 @@ void WebPageProxy::dispatchProcessDidTerminate(WebProcessProxy& process, Process
+@@ -11533,7 +11774,10 @@ void WebPageProxy::dispatchProcessDidTerminate(WebProcessProxy& process, Process
if (protectedPreferences()->siteIsolationEnabled())
protectedBrowsingContextGroup()->processDidTerminate(*this, process);
@@ -15617,16 +15595,16 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
if (m_loaderClient)
handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this);
else
-@@ -12060,6 +12306,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
-
+@@ -12195,6 +12439,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
parameters.httpsUpgradeEnabled = preferences->upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false;
- parameters.allowJSHandleInPageContentWorld = m_configuration->allowJSHandleInPageContentWorld();
-+
+ parameters.allowPostingLegacySynchronousMessages = m_configuration->allowPostingLegacySynchronousMessages();
+
+ parameters.shouldPauseInInspectorWhenShown = m_inspectorController->shouldPauseInInspectorWhenShown();
-
++
#if ENABLE(APP_HIGHLIGHTS)
parameters.appHighlightsVisible = appHighlightsVisibility() ? HighlightVisibility::Visible : HighlightVisibility::Hidden;
-@@ -12222,8 +12470,47 @@ void WebPageProxy::allowGamepadAccess()
+ #endif
+@@ -12368,8 +12614,47 @@ void WebPageProxy::allowGamepadAccess()
#endif // ENABLE(GAMEPAD)
@@ -15674,7 +15652,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) {
m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) {
if (shouldAllowLegacyTLS)
-@@ -12319,6 +12606,12 @@ void WebPageProxy::requestGeolocationPermissionForFrame(IPC::Connection& connect
+@@ -12465,6 +12750,12 @@ void WebPageProxy::requestGeolocationPermissionForFrame(IPC::Connection& connect
request->deny();
};
@@ -15687,7 +15665,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
// 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
-@@ -12385,6 +12678,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
+@@ -12531,6 +12822,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
shouldChangeDeniedToPrompt = false;
if (sessionID().isEphemeral()) {
@@ -15700,7 +15678,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
completionHandler(shouldChangeDeniedToPrompt ? PermissionState::Prompt : PermissionState::Denied);
return;
}
-@@ -12399,6 +12698,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
+@@ -12545,6 +12842,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
return;
}
@@ -15714,7 +15692,7 @@ index 562c341402b4fc434c868b291f7e9f8b24bd4df8..b1d1ab5ab4ace57ea81355db8e188c77
completionHandler(shouldChangeDeniedToPrompt ? PermissionState::Prompt : PermissionState::Denied);
return;
diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
-index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453c61783ae 100644
+index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191030c1b39 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.h
+++ b/Source/WebKit/UIProcess/WebPageProxy.h
@@ -28,6 +28,7 @@
@@ -15746,7 +15724,7 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
namespace API {
class Attachment;
-@@ -114,6 +129,7 @@ class DragData;
+@@ -115,6 +130,7 @@ class DragData;
class Exception;
class FloatPoint;
class FloatQuad;
@@ -15754,8 +15732,8 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
class FloatRect;
class FloatSize;
class FontAttributeChanges;
-@@ -764,6 +780,8 @@ public:
- void setControlledByAutomation(bool);
+@@ -773,6 +789,8 @@ public:
+ RefPtr<WebAutomationSession> activeAutomationSession() const;
WebPageInspectorController& inspectorController() { return m_inspectorController.get(); }
+ InspectorDialogAgent* inspectorDialogAgent() { return m_inspectorDialogAgent; }
@@ -15763,7 +15741,7 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
#if PLATFORM(IOS_FAMILY)
void showInspectorIndication();
-@@ -797,6 +815,7 @@ public:
+@@ -806,6 +824,7 @@ public:
bool hasSleepDisabler() const;
#if ENABLE(FULLSCREEN_API)
@@ -15771,7 +15749,7 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
WebFullScreenManagerProxy* fullScreenManager();
RefPtr<WebFullScreenManagerProxy> protectedFullScreenManager();
void setFullScreenClientForTesting(std::unique_ptr<WebKit::WebFullScreenManagerProxyClient>&&);
-@@ -889,6 +908,12 @@ public:
+@@ -898,6 +917,12 @@ public:
void setPageLoadStateObserver(RefPtr<PageLoadStateObserverBase>&&);
@@ -15781,10 +15759,10 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
+ void setActiveForAutomation(std::optional<bool> active);
+ void logToStderr(const String& str);
+
- void initializeWebPage(const WebCore::Site&, WebCore::SandboxFlags);
+ void initializeWebPage(const WebCore::Site&, WebCore::SandboxFlags, WebCore::ReferrerPolicy);
void setDrawingArea(RefPtr<DrawingAreaProxy>&&);
-@@ -920,6 +945,8 @@ public:
+@@ -929,6 +954,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, bool isRequestFromClientOrUserInput = true);
@@ -15793,7 +15771,7 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
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);
-@@ -1012,6 +1039,7 @@ public:
+@@ -1021,6 +1048,7 @@ public:
PageClient* pageClient() const;
RefPtr<PageClient> protectedPageClient() const;
@@ -15801,7 +15779,7 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
void setViewNeedsDisplay(const WebCore::Region&);
void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, WebCore::ScrollIsAnimated);
-@@ -1663,10 +1691,13 @@ public:
+@@ -1674,10 +1702,13 @@ public:
void didStartDrag();
void dragCancelled();
void setDragCaretRect(const WebCore::IntRect&);
@@ -15815,7 +15793,7 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
#endif
#if PLATFORM(GTK) || PLATFORM(WPE)
void startDrag(WebCore::SelectionData&&, OptionSet<WebCore::DragOperation>, std::optional<WebCore::ShareableBitmapHandle>&& dragImage, WebCore::IntPoint&& dragImageHotspot);
-@@ -1674,6 +1705,9 @@ public:
+@@ -1685,6 +1716,9 @@ public:
#if ENABLE(MODEL_PROCESS)
void modelDragEnded(const WebCore::NodeIdentifier);
#endif
@@ -15825,7 +15803,7 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
#endif
void processDidBecomeUnresponsive();
-@@ -1921,6 +1955,7 @@ public:
+@@ -1930,6 +1964,7 @@ public:
void setViewportSizeForCSSViewportUnits(const WebCore::FloatSize&);
WebCore::FloatSize viewportSizeForCSSViewportUnits() const;
@@ -15833,7 +15811,7 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
void didReceiveAuthenticationChallengeProxy(Ref<AuthenticationChallengeProxy>&&, NegotiatedLegacyTLS);
void negotiatedLegacyTLS();
void didNegotiateModernTLS(const URL&);
-@@ -1953,6 +1988,8 @@ public:
+@@ -1962,6 +1997,8 @@ public:
#if PLATFORM(COCOA) || PLATFORM(GTK)
RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&);
RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&, ForceSoftwareCapturingViewportSnapshot);
@@ -15842,7 +15820,7 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
#endif
void serializeAndWrapCryptoKey(IPC::Connection&, WebCore::CryptoKeyData&&, CompletionHandler<void(std::optional<Vector<uint8_t>>&&)>&&);
-@@ -3001,6 +3038,7 @@ private:
+@@ -3012,6 +3049,7 @@ private:
RefPtr<API::Navigation> launchProcessForReload();
void requestNotificationPermission(const String& originString, CompletionHandler<void(bool allowed)>&&);
@@ -15850,7 +15828,7 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
void didChangeContentSize(const WebCore::IntSize&);
void didChangeIntrinsicContentSize(const WebCore::IntSize&);
-@@ -3526,8 +3564,10 @@ private:
+@@ -3541,8 +3579,10 @@ private:
String m_openedMainFrameName;
RefPtr<WebInspectorUIProxy> m_inspector;
@@ -15861,7 +15839,7 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
RefPtr<WebFullScreenManagerProxy> m_fullScreenManager;
std::unique_ptr<API::FullscreenClient> m_fullscreenClient;
#endif
-@@ -3725,6 +3765,22 @@ private:
+@@ -3743,6 +3783,22 @@ private:
std::optional<WebCore::DragOperation> m_currentDragOperation;
bool m_currentDragIsOverFileInput { false };
unsigned m_currentDragNumberOfFilesToBeAccepted { 0 };
@@ -15884,7 +15862,7 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
#endif
bool m_mainFrameHasHorizontalScrollbar { false };
-@@ -3897,6 +3953,10 @@ private:
+@@ -3913,6 +3969,10 @@ private:
RefPtr<API::Object> messageBody;
};
Vector<InjectedBundleMessage> m_pendingInjectedBundleMessages;
@@ -15896,18 +15874,18 @@ index 5f12f747f3f7adea0c385b1609019bef2999ce1e..da1f2559e995cfdf97803c77627fa453
#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 78928579347f7b44e1be855ef68e5521326f5d27..d1e5761093a8eb24424e9f37ea71dbadcf375d38 100644
+index 0e03626bb05e7d28b053bca6524c51c962d05050..fb5e6ff170dd0f163b0803183a49bff9239480eb 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.messages.in
+++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in
@@ -35,6 +35,7 @@ messages -> WebPageProxy {
RunJavaScriptConfirm(WebCore::FrameIdentifier frameID, struct WebKit::FrameInfoData frameInfo, String message) -> (bool result) Synchronous
RunJavaScriptPrompt(WebCore::FrameIdentifier frameID, struct WebKit::FrameInfoData frameInfo, String message, String defaultValue) -> (String result) Synchronous
- MouseDidMoveOverElement(struct WebKit::WebHitTestResultData hitTestResultData, OptionSet<WebKit::WebEventModifier> modifiers, WebKit::UserData userData)
+ MouseDidMoveOverElement(struct WebKit::WebHitTestResultData hitTestResultData, OptionSet<WebKit::WebEventModifier> modifiers)
+ LogToStderr(String text)
DidReceiveEventIPC(enum:uint8_t WebKit::WebEventType eventType, bool handled, struct std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData)
SetCursor(WebCore::Cursor cursor)
-@@ -335,6 +336,10 @@ messages -> WebPageProxy {
+@@ -332,6 +333,10 @@ messages -> WebPageProxy {
StartDrag(WebCore::SelectionData selectionData, OptionSet<WebCore::DragOperation> dragOperationMask, std::optional<WebCore::ShareableBitmapHandle> dragImage, WebCore::IntPoint dragImageHotspot)
#endif
@@ -15919,10 +15897,10 @@ index 78928579347f7b44e1be855ef68e5521326f5d27..d1e5761093a8eb24424e9f37ea71dbad
WillReceiveEditDragSnapshot()
DidReceiveEditDragSnapshot(RefPtr<WebCore::TextIndicator> textIndicator)
diff --git a/Source/WebKit/UIProcess/WebProcessCache.cpp b/Source/WebKit/UIProcess/WebProcessCache.cpp
-index b660187624f7a1aad8f86088f000a2a6b28d52f8..13444a265d2635083bece831e4cf7c0df944a712 100644
+index 2f731b7a81c5aef52bc3542fad9a958ae1629298..56d3681fbefe55417e388f27b4b7a5a28cfc4f9d 100644
--- a/Source/WebKit/UIProcess/WebProcessCache.cpp
+++ b/Source/WebKit/UIProcess/WebProcessCache.cpp
-@@ -100,6 +100,10 @@ bool WebProcessCache::canCacheProcess(WebProcessProxy& process) const
+@@ -111,6 +111,10 @@ bool WebProcessCache::canCacheProcess(WebProcessProxy& process) const
return false;
}
@@ -15934,10 +15912,10 @@ index b660187624f7a1aad8f86088f000a2a6b28d52f8..13444a265d2635083bece831e4cf7c0d
}
diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
-index 3b4a8bd84890e0724d4e6323bfe399a19f5abcc9..c3ad63ee402eb53aa5dacf10fd1fdf955292f7b3 100644
+index 22c373f5888aabdaa20aadbcba1aefdbc783dc25..0ce3b02ceca179b47fe91c4dba5225d52e3f2c7b 100644
--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
-@@ -441,10 +441,10 @@ void WebProcessPool::setAutomationClient(std::unique_ptr<API::AutomationClient>&
+@@ -429,10 +429,10 @@ void WebProcessPool::setAutomationClient(std::unique_ptr<API::AutomationClient>&
void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
{
@@ -15950,7 +15928,7 @@ index 3b4a8bd84890e0724d4e6323bfe399a19f5abcc9..c3ad63ee402eb53aa5dacf10fd1fdf95
#if ENABLE(GPU_PROCESS)
if (RefPtr gpuProcess = GPUProcessProxy::singletonIfCreated())
-@@ -452,9 +452,10 @@ void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
+@@ -440,9 +440,10 @@ void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
#endif
#if USE(SOUP)
for (Ref networkProcess : NetworkProcessProxy::allNetworkProcesses())
@@ -15962,7 +15940,7 @@ index 3b4a8bd84890e0724d4e6323bfe399a19f5abcc9..c3ad63ee402eb53aa5dacf10fd1fdf95
void WebProcessPool::fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)
{
-@@ -1001,7 +1002,7 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
+@@ -1002,7 +1003,7 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
#endif
parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
@@ -15972,10 +15950,10 @@ index 3b4a8bd84890e0724d4e6323bfe399a19f5abcc9..c3ad63ee402eb53aa5dacf10fd1fdf95
parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure());
diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp
-index da8a47cf02d65b8ed8969abeb3783e5766ee0d3a..8e93c8f7028bc7707bbca7a7ac42990a797c3abf 100644
+index 749651e725c4485514ab2b17f78bb2e03d865e10..e50620b733cea8055e02aca6196287efeba56d96 100644
--- a/Source/WebKit/UIProcess/WebProcessProxy.cpp
+++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp
-@@ -207,6 +207,11 @@ Vector<Ref<WebProcessProxy>> WebProcessProxy::allProcesses()
+@@ -209,6 +209,11 @@ Vector<Ref<WebProcessProxy>> WebProcessProxy::allProcesses()
});
}
@@ -15987,7 +15965,7 @@ index da8a47cf02d65b8ed8969abeb3783e5766ee0d3a..8e93c8f7028bc7707bbca7a7ac42990a
RefPtr<WebProcessProxy> WebProcessProxy::processForIdentifier(ProcessIdentifier identifier)
{
return allProcessMap().get(identifier);
-@@ -531,6 +536,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt
+@@ -534,6 +539,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt
if (WebKit::isInspectorProcessPool(protectedProcessPool()))
launchOptions.extraInitializationData.add<HashTranslatorASCIILiteral>("inspector-process"_s, "1"_s);
@@ -16015,10 +15993,10 @@ index da8a47cf02d65b8ed8969abeb3783e5766ee0d3a..8e93c8f7028bc7707bbca7a7ac42990a
if (isPrewarmed())
diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h
-index 43998d80778262987ebeb21afdae7a6f5cb9a8f6..fbb50218cbeb07953790c85c5e4f2618b3f08b35 100644
+index 35bfcf566f59ebd82525b5dc75e6782a624e485c..7f761e12fe836ad9dd54a77343f223bbdec92a44 100644
--- a/Source/WebKit/UIProcess/WebProcessProxy.h
+++ b/Source/WebKit/UIProcess/WebProcessProxy.h
-@@ -186,6 +186,7 @@ public:
+@@ -193,6 +193,7 @@ public:
static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, NOESCAPE const Function<void(WebPageProxy&)>&);
static Vector<std::pair<WebCore::ProcessIdentifier, WebCore::RegistrableDomain>> allowedFirstPartiesForCookies();
@@ -16027,10 +16005,10 @@ index 43998d80778262987ebeb21afdae7a6f5cb9a8f6..fbb50218cbeb07953790c85c5e4f2618
void initializeWebProcess(WebProcessCreationParameters&&);
diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
-index 90b0872f0cf72f353ef14aa9d465460717d60daa..cc1b971dba3c37d30c01cde04151c5529222e627 100644
+index 9c3fc4c42aa0369937dc6ba34bdbb2ee4db6dcfb..8d36b66176c4c94af03611a599ae111430852d96 100644
--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
-@@ -321,15 +321,10 @@ SOAuthorizationCoordinator& WebsiteDataStore::soAuthorizationCoordinator(const W
+@@ -320,15 +320,10 @@ SOAuthorizationCoordinator& WebsiteDataStore::soAuthorizationCoordinator(const W
static Ref<NetworkProcessProxy> networkProcessForSession(PAL::SessionID sessionID)
{
@@ -16049,7 +16027,7 @@ index 90b0872f0cf72f353ef14aa9d465460717d60daa..cc1b971dba3c37d30c01cde04151c552
#else
UNUSED_PARAM(sessionID);
return NetworkProcessProxy::ensureDefaultNetworkProcess();
-@@ -2061,6 +2056,15 @@ void WebsiteDataStore::setCacheModelSynchronouslyForTesting(CacheModel cacheMode
+@@ -2085,6 +2080,15 @@ void WebsiteDataStore::setCacheModelSynchronouslyForTesting(CacheModel cacheMode
processPool->setCacheModelSynchronouslyForTesting(cacheModel);
}
@@ -16065,7 +16043,7 @@ index 90b0872f0cf72f353ef14aa9d465460717d60daa..cc1b971dba3c37d30c01cde04151c552
Vector<WebsiteDataStoreParameters> WebsiteDataStore::parametersFromEachWebsiteDataStore()
{
return WTF::map(allDataStores(), [](auto& entry) {
-@@ -2504,6 +2508,12 @@ void WebsiteDataStore::originDirectoryForTesting(WebCore::ClientOrigin&& origin,
+@@ -2519,6 +2523,12 @@ void WebsiteDataStore::originDirectoryForTesting(WebCore::ClientOrigin&& origin,
protectedNetworkProcess()->websiteDataOriginDirectoryForTesting(m_sessionID, WTFMove(origin), type, WTFMove(completionHandler));
}
@@ -16079,7 +16057,7 @@ index 90b0872f0cf72f353ef14aa9d465460717d60daa..cc1b971dba3c37d30c01cde04151c552
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 aad3f23761bef4b75b414606df5f09fd19657fe5..d8cf70a7944e0916fb13efd571992d2462309dad 100644
+index 428e7bf7c1804e635312c6ee3fda1c29c1a61a5e..b497045e01412826d3a4116577472e4f8b9b6f95 100644
--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
@@ -98,6 +98,7 @@ class DeviceIdHashSaltStorage;
@@ -16113,7 +16091,7 @@ index aad3f23761bef4b75b414606df5f09fd19657fe5..d8cf70a7944e0916fb13efd571992d24
class WebsiteDataStore : public API::ObjectImpl<API::Object::Type::WebsiteDataStore>, public CanMakeWeakPtr<WebsiteDataStore> {
public:
static Ref<WebsiteDataStore> defaultDataStore();
-@@ -321,8 +331,10 @@ public:
+@@ -324,8 +334,10 @@ public:
#if USE(SOUP)
void setPersistentCredentialStorageEnabled(bool);
bool persistentCredentialStorageEnabled() const { return m_persistentCredentialStorageEnabled && isPersistent(); }
@@ -16124,7 +16102,7 @@ index aad3f23761bef4b75b414606df5f09fd19657fe5..d8cf70a7944e0916fb13efd571992d24
void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&);
const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; }
void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType);
-@@ -419,6 +431,12 @@ public:
+@@ -421,6 +433,12 @@ public:
static const String& defaultBaseDataDirectory();
#endif
@@ -16137,7 +16115,7 @@ index aad3f23761bef4b75b414606df5f09fd19657fe5..d8cf70a7944e0916fb13efd571992d24
void resetQuota(CompletionHandler<void()>&&);
void resetStoragePersistedState(CompletionHandler<void()>&&);
#if PLATFORM(IOS_FAMILY)
-@@ -616,7 +634,9 @@ private:
+@@ -623,7 +641,9 @@ private:
#if USE(SOUP)
bool m_persistentCredentialStorageEnabled { true };
@@ -16148,7 +16126,7 @@ index aad3f23761bef4b75b414606df5f09fd19657fe5..d8cf70a7944e0916fb13efd571992d24
WebCore::SoupNetworkProxySettings m_networkProxySettings;
String m_cookiePersistentStoragePath;
SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite };
-@@ -643,6 +663,10 @@ private:
+@@ -650,6 +670,10 @@ private:
const RefPtr<API::HTTPCookieStore> m_cookieStore;
RefPtr<NetworkProcessProxy> m_networkProcess;
@@ -16467,7 +16445,7 @@ index 0000000000000000000000000000000000000000..68bc7b610703bfcd3eff0d1c032092f6
+
+#endif // ENABLE(REMOTE_INSPECTOR)
diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-index 044ddc0c3e957b4d6634de3710e9d1d55082be3f..a6a8854fd6076347f3f5540d2177006a94bfa530 100644
+index 212f082e04070610eda84021d673b7c7a95aabf8..7d6219192016964ea6a5f6d380f2ee6f3dd2ced0 100644
--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
@@ -126,6 +126,8 @@ static OptionSet<AvailableInputDevices> availableInputDevices()
@@ -16480,7 +16458,7 @@ index 044ddc0c3e957b4d6634de3710e9d1d55082be3f..a6a8854fd6076347f3f5540d2177006a
return AvailableInputDevices::Touchscreen;
#else
diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp
-index 8345d7f789d15be44e8ffb742ade501f95e011f9..5c354920d64d691ab87251966ff4912d19ee85a2 100644
+index 7a8478ed880bdb584b54c250b250f2805000f4aa..5d7b63ba6fbb5426f5746b36ef6ccfa4bb6c9592 100644
--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp
+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp
@@ -848,4 +848,30 @@ RefPtr<NativeImage> AcceleratedBackingStore::bufferAsNativeImageForTesting() con
@@ -16614,10 +16592,10 @@ index 349cd3d9efd7a921560fa2f1a9e1a2238e415938..9df937535595281039660b060c7fba22
GtkFontRendering fontRendering;
diff --git a/Source/WebKit/UIProcess/gtk/WebPageInspectorEmulationAgentGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPageInspectorEmulationAgentGtk.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..6d763018a12b3d7cd33af84b23f4340cea194bce
+index 0000000000000000000000000000000000000000..61d5b3f7f453fc67e6440da545fb5b4ae63ff64d
--- /dev/null
+++ b/Source/WebKit/UIProcess/gtk/WebPageInspectorEmulationAgentGtk.cpp
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2019 Microsoft Corporation.
+ *
@@ -16701,7 +16679,9 @@ index 0000000000000000000000000000000000000000..6d763018a12b3d7cd33af84b23f4340c
+ height += windowAllocation.height - viewAllocation.height;
+
+ if (auto* drawingArea = static_cast<DrawingAreaProxyCoordinatedGraphics*>(m_page.drawingArea())) {
-+ bool didNotHaveInitialAllocation = !windowAllocation.width && !windowAllocation.height;
++ bool didNotHaveInitialAllocation = (!windowAllocation.width && !windowAllocation.height) ||
++ // Default size for new windows from browser_window_init in Tools/MiniBrowser/gtk/BrowserWindow.c.
++ (windowAllocation.width == 1024 && windowAllocation.height == 768);
+ // The callback can only be called if the page is still alive, so we can safely capture `this`.
+ drawingArea->waitForSizeUpdate([this, callback = WTFMove(callback), didNotHaveInitialAllocation, viewSize](const DrawingAreaProxyCoordinatedGraphics& drawingArea) mutable {
+#if USE(GTK4)
@@ -16739,7 +16719,7 @@ index 0000000000000000000000000000000000000000..6d763018a12b3d7cd33af84b23f4340c
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/gtk/WebPageInspectorInputAgentGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPageInspectorInputAgentGtk.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..36ab6e9aec9f8d79fb13a8a49beadaafb3da58f5
+index 0000000000000000000000000000000000000000..1cfdb88580573649d816a875b51ebe650c091170
--- /dev/null
+++ b/Source/WebKit/UIProcess/gtk/WebPageInspectorInputAgentGtk.cpp
@@ -0,0 +1,76 @@
@@ -16792,7 +16772,7 @@ index 0000000000000000000000000000000000000000..36ab6e9aec9f8d79fb13a8a49beadaaf
+ return state;
+}
+
-+void WebPageInspectorInputAgent::platformDispatchKeyEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, Vector<String>& macCommands, WallTime timestamp)
++void WebPageInspectorInputAgent::platformDispatchKeyEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, Vector<String>& macCommands, MonotonicTime timestamp)
+{
+ Vector<String> commands;
+ const guint keyVal = WebCore::PlatformKeyboardEvent::gdkKeyCodeForWindowsKeyCode(windowsVirtualKeyCode);
@@ -16819,6 +16799,60 @@ index 0000000000000000000000000000000000000000..36ab6e9aec9f8d79fb13a8a49beadaaf
+}
+
+} // namespace WebKit
+diff --git a/Source/WebKit/UIProcess/gtk/WebPageInspectorTargetProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPageInspectorTargetProxyGtk.cpp
+new file mode 100644
+index 0000000000000000000000000000000000000000..1230758b42b5affc40b85ca98ed4af7547342588
+--- /dev/null
++++ b/Source/WebKit/UIProcess/gtk/WebPageInspectorTargetProxyGtk.cpp
+@@ -0,0 +1,48 @@
++/*
++ * Copyright (C) 2019 Microsoft Corporation.
++ *
++ * 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
++ * OWNER OR 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 "WebPageInspectorTargetProxy.h"
++
++#include "WebPageProxy.h"
++#include <WebCore/GtkUtilities.h>
++#include <gtk/gtk.h>
++
++namespace WebKit {
++
++void WebPageInspectorTargetProxy::platformActivate(String& error) const
++{
++#if USE(GTK4)
++ GtkWidget* parent = GTK_WIDGET(gtk_widget_get_root(m_page->viewWidget()));
++#else
++ GtkWidget* parent = gtk_widget_get_toplevel(m_page->viewWidget());
++#endif
++ if (WebCore::widgetIsOnscreenToplevelWindow(parent))
++ gtk_window_present(GTK_WINDOW(parent));
++ else
++ error = "The view is not on screen"_s;
++}
++
++} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp
index e4f31f89b42bc7884da760a18150bd1274d0383d..b2390de63e48a8a48a798199aa99203ef9390451 100644
--- a/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp
@@ -17109,10 +17143,10 @@ index 06d85d02ad62fdfaf211deb534126b0a5e966493..ab16123d697e7dab5907e4e5d4386cb8
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 59d3be9ffe66bcaf64687a69c00b077279ec1304..be0176b59dab6c2cdf279f0aa4e2ed8e26e9fbc7 100644
+index 8b6e600a9b85e37c19bdddde5b32666a2179e14b..56c2b8949b2fb027ec40374d8eb2c2577da0c302 100644
--- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
+++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
-@@ -107,6 +107,13 @@ namespace WebKit {
+@@ -108,6 +108,13 @@ namespace WebKit {
using namespace WebCore;
@@ -17126,7 +17160,7 @@ index 59d3be9ffe66bcaf64687a69c00b077279ec1304..be0176b59dab6c2cdf279f0aa4e2ed8e
PageClientImpl::PageClientImpl(NSView *view, WKWebView *webView)
: PageClientImplCocoa(webView)
, m_view(view)
-@@ -162,6 +169,9 @@ NSWindow *PageClientImpl::activeWindow() const
+@@ -163,6 +170,9 @@ NSWindow *PageClientImpl::activeWindow() const
bool PageClientImpl::isViewWindowActive()
{
@@ -17136,7 +17170,7 @@ index 59d3be9ffe66bcaf64687a69c00b077279ec1304..be0176b59dab6c2cdf279f0aa4e2ed8e
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer));
RetainPtr activeViewWindow = activeWindow();
return activeViewWindow.get().isKeyWindow || (activeViewWindow && [NSApp keyWindow] == activeViewWindow.get());
-@@ -169,6 +179,9 @@ bool PageClientImpl::isViewWindowActive()
+@@ -170,6 +180,9 @@ bool PageClientImpl::isViewWindowActive()
bool PageClientImpl::isViewFocused()
{
@@ -17146,7 +17180,7 @@ index 59d3be9ffe66bcaf64687a69c00b077279ec1304..be0176b59dab6c2cdf279f0aa4e2ed8e
// FIXME: This is called from the WebPageProxy constructor before we have a WebViewImpl.
// Once WebViewImpl and PageClient merge, this won't be a problem.
if (CheckedPtr impl = m_impl.get())
-@@ -192,6 +205,9 @@ void PageClientImpl::makeFirstResponder()
+@@ -193,6 +206,9 @@ void PageClientImpl::makeFirstResponder()
bool PageClientImpl::isViewVisible(NSView *view, NSWindow *viewWindow)
{
@@ -17156,7 +17190,7 @@ index 59d3be9ffe66bcaf64687a69c00b077279ec1304..be0176b59dab6c2cdf279f0aa4e2ed8e
auto windowIsOccluded = [&]()->bool {
return m_impl && m_impl->windowOcclusionDetectionEnabled() && (viewWindow.occlusionState & NSWindowOcclusionStateVisible) != NSWindowOcclusionStateVisible;
};
-@@ -279,7 +295,8 @@ void PageClientImpl::didRelaunchProcess()
+@@ -280,7 +296,8 @@ void PageClientImpl::didRelaunchProcess()
void PageClientImpl::preferencesDidChange()
{
@@ -17166,7 +17200,7 @@ index 59d3be9ffe66bcaf64687a69c00b077279ec1304..be0176b59dab6c2cdf279f0aa4e2ed8e
}
void PageClientImpl::toolTipChanged(const String& oldToolTip, const String& newToolTip)
-@@ -489,6 +506,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
+@@ -494,6 +511,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled)
{
@@ -17175,7 +17209,7 @@ index 59d3be9ffe66bcaf64687a69c00b077279ec1304..be0176b59dab6c2cdf279f0aa4e2ed8e
checkedImpl()->doneWithKeyEvent(event.nativeEvent(), eventWasHandled);
}
-@@ -508,6 +527,8 @@ void PageClientImpl::computeHasVisualSearchResults(const URL& imageURL, Shareabl
+@@ -513,6 +532,8 @@ void PageClientImpl::computeHasVisualSearchResults(const URL& imageURL, Shareabl
RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy& page)
{
@@ -17184,7 +17218,7 @@ index 59d3be9ffe66bcaf64687a69c00b077279ec1304..be0176b59dab6c2cdf279f0aa4e2ed8e
return WebPopupMenuProxyMac::create(m_view.get().get(), page.checkedPopupMenuClient().get());
}
-@@ -633,6 +654,12 @@ CALayer *PageClientImpl::footerBannerLayer() const
+@@ -638,6 +659,12 @@ CALayer *PageClientImpl::footerBannerLayer() const
return m_impl->footerBannerLayer();
}
@@ -17197,7 +17231,7 @@ index 59d3be9ffe66bcaf64687a69c00b077279ec1304..be0176b59dab6c2cdf279f0aa4e2ed8e
RefPtr<ViewSnapshot> PageClientImpl::takeViewSnapshot(std::optional<WebCore::IntRect>&&)
{
return checkedImpl()->takeViewSnapshot();
-@@ -844,6 +871,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR
+@@ -849,6 +876,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR
#endif // ENABLE(FULLSCREEN_API)
@@ -17211,7 +17245,7 @@ index 59d3be9ffe66bcaf64687a69c00b077279ec1304..be0176b59dab6c2cdf279f0aa4e2ed8e
void PageClientImpl::navigationGestureDidBegin()
{
checkedImpl()->dismissContentRelativeChildWindowsWithAnimation(true);
-@@ -1024,6 +1058,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c
+@@ -1029,6 +1063,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c
bool PageClientImpl::windowIsFrontWindowUnderMouse(const NativeWebMouseEvent& event)
{
@@ -17244,18 +17278,6 @@ index f46895285dbc84c624537a194814c18f771a0c08..29ef9e5afa13b8d2b47b7f2dd4ce3784
}
+#endif
-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 <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
@@ -17281,10 +17303,10 @@ index a3c53c0bf913385d4d2d92900360d5f7d75927f8..e5570ef599ff1b59224648c353f8ab16
bool showAfterPostProcessingContextData();
diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
-index 273569e22d7c39c451fa39b21d4a0672b04773ad..84632cafb18c3d0f5367ba771daea12e30b2110a 100644
+index 14ced1d7fee6409e39301c9bf6d589a733b16afe..4bd68c01564c3d3828e45bce68529c5ea284a1a9 100644
--- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
+++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
-@@ -527,6 +527,12 @@ RetainPtr<NSMenuItem> WebContextMenuProxyMac::createShareMenuItem(ShareMenuItemT
+@@ -521,6 +521,12 @@ RetainPtr<NSMenuItem> WebContextMenuProxyMac::createShareMenuItem(ShareMenuItemT
}
#endif
@@ -17349,7 +17371,7 @@ index 0000000000000000000000000000000000000000..6113f4cd60a5d72b8ead61176cb43200
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/mac/WebPageInspectorInputAgentMac.mm b/Source/WebKit/UIProcess/mac/WebPageInspectorInputAgentMac.mm
new file mode 100644
-index 0000000000000000000000000000000000000000..dd52991f936aa1c046b404801ee97237d0a55748
+index 0000000000000000000000000000000000000000..2db75618ed4a975cc158dd21a9744a78f696a7ae
--- /dev/null
+++ b/Source/WebKit/UIProcess/mac/WebPageInspectorInputAgentMac.mm
@@ -0,0 +1,135 @@
@@ -17457,7 +17479,7 @@ index 0000000000000000000000000000000000000000..dd52991f936aa1c046b404801ee97237
+ m_page.handleMouseEvent(nativeEvent);
+}
+
-+void WebPageInspectorInputAgent::platformDispatchKeyEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, Vector<String>& commands, WallTime timestamp)
++void WebPageInspectorInputAgent::platformDispatchKeyEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, Vector<String>& commands, MonotonicTime timestamp)
+{
+ Vector<WebCore::KeypressCommand> macCommands;
+ for (const String& command : commands) {
@@ -17488,20 +17510,56 @@ 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/WebPageInspectorTargetProxyMac.mm b/Source/WebKit/UIProcess/mac/WebPageInspectorTargetProxyMac.mm
+new file mode 100644
+index 0000000000000000000000000000000000000000..c58e17e9095c73eb9670ca55e5465b0d3afd6223
+--- /dev/null
++++ b/Source/WebKit/UIProcess/mac/WebPageInspectorTargetProxyMac.mm
+@@ -0,0 +1,42 @@
++/*
++ * Copyright (C) 2019 Microsoft Corporation.
++ *
++ * 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
++ * OWNER OR 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.
++ */
++
++#import "config.h"
++#import "WebPageInspectorTargetProxy.h"
++#import "WebPageProxy.h"
++
++#if PLATFORM(MAC)
++
++namespace WebKit {
++
++void WebPageInspectorTargetProxy::platformActivate(String& error) const
++{
++ NSWindow* window = m_page->platformWindow();
++ [window makeKeyAndOrderFront:nil];
++}
++
++} // namespace WebKit
++
++#endif
diff --git a/Source/WebKit/UIProcess/mac/WebViewImpl.h b/Source/WebKit/UIProcess/mac/WebViewImpl.h
-index e621bbe3154ae0406e3617d82345a2428ba11583..d11ba4f513a3b558ef996c3247f04cb5a0b498ad 100644
+index 62b5fc6f5e08c4192774f659f2589085e7f8b5ed..58576d276501e29afc0e77ff5b32b645ec433108 100644
--- a/Source/WebKit/UIProcess/mac/WebViewImpl.h
+++ b/Source/WebKit/UIProcess/mac/WebViewImpl.h
@@ -34,6 +34,7 @@
@@ -17512,7 +17570,7 @@ index e621bbe3154ae0406e3617d82345a2428ba11583..d11ba4f513a3b558ef996c3247f04cb5
#include <WebCore/FocusDirection.h>
#include <WebCore/KeypressCommand.h>
#include <WebCore/PlatformPlaybackSessionInterface.h>
-@@ -572,6 +573,9 @@ public:
+@@ -579,6 +580,9 @@ public:
void provideDataForPasteboard(NSPasteboard *, NSString *type);
NSArray *namesOfPromisedFilesDroppedAtDestination(NSURL *dropDestination);
@@ -17523,10 +17581,10 @@ index e621bbe3154ae0406e3617d82345a2428ba11583..d11ba4f513a3b558ef996c3247f04cb5
RefPtr<ViewSnapshot> takeViewSnapshot(ForceSoftwareCapturingViewportSnapshot);
void saveBackForwardSnapshotForCurrentItem();
diff --git a/Source/WebKit/UIProcess/mac/WebViewImpl.mm b/Source/WebKit/UIProcess/mac/WebViewImpl.mm
-index e4a353131f828e0cce9f909a5feab718c1fa194d..be4338ae49c58c8570cf3921209ed903b4e114fa 100644
+index 65e89d47c58ba4449b72db525153313ab41bcc85..df70a7c2beda025db41651d558c1978d65632710 100644
--- a/Source/WebKit/UIProcess/mac/WebViewImpl.mm
+++ b/Source/WebKit/UIProcess/mac/WebViewImpl.mm
-@@ -2488,6 +2488,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace()
+@@ -2497,6 +2497,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace()
if (!m_colorSpace)
m_colorSpace = [NSColorSpace sRGBColorSpace];
}
@@ -17538,7 +17596,7 @@ index e4a353131f828e0cce9f909a5feab718c1fa194d..be4338ae49c58c8570cf3921209ed903
ASSERT(m_colorSpace);
return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] };
-@@ -4723,6 +4728,17 @@ static RetainPtr<CGImageRef> takeWindowSnapshot(CGSWindowID windowID, bool captu
+@@ -4777,6 +4782,17 @@ static RetainPtr<CGImageRef> takeWindowSnapshot(CGSWindowID windowID, bool captu
return WebCore::cgWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions);
}
@@ -17898,7 +17956,7 @@ index 0000000000000000000000000000000000000000..df55ee613ec085cb85ed12b45deff3a1
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/win/WebPageInspectorInputAgentWin.cpp b/Source/WebKit/UIProcess/win/WebPageInspectorInputAgentWin.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..8b474c730139b44a13c9d5b2d13ee20403e3e7f3
+index 0000000000000000000000000000000000000000..36fc7af8eb98b3f70d255ee858dccf580fae6679
--- /dev/null
+++ b/Source/WebKit/UIProcess/win/WebPageInspectorInputAgentWin.cpp
@@ -0,0 +1,55 @@
@@ -17937,7 +17995,7 @@ index 0000000000000000000000000000000000000000..8b474c730139b44a13c9d5b2d13ee204
+
+namespace WebKit {
+
-+void WebPageInspectorInputAgent::platformDispatchKeyEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, Vector<String>& macCommands, WallTime timestamp)
++void WebPageInspectorInputAgent::platformDispatchKeyEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, Vector<String>& macCommands, MonotonicTime timestamp)
+{
+ NativeWebKeyboardEvent event(
+ type,
@@ -17957,27 +18015,14 @@ index 0000000000000000000000000000000000000000..8b474c730139b44a13c9d5b2d13ee204
+}
+
+} // namespace WebKit
-diff --git a/Source/WebKit/UIProcess/win/WebView.cpp b/Source/WebKit/UIProcess/win/WebView.cpp
-index bf8a0718e74bf9b1243dcb4bb504310e9ebbd6c2..33b865af669a3db4e3b23874f86cafa9794a71b7 100644
---- a/Source/WebKit/UIProcess/win/WebView.cpp
-+++ b/Source/WebKit/UIProcess/win/WebView.cpp
-@@ -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);
-- m_viewSize = expandedIntSize(FloatSize(LOWORD(lParam), HIWORD(lParam)) / intrinsicDeviceScaleFactor);
-+ m_viewSize = expandedIntSize(FloatSize(LOWORD(lParam), HIWORD(lParam)));
-
- if (m_page && m_page->drawingArea()) {
- // FIXME specify correctly layerPosition.
-diff --git a/Source/WebKit/UIProcess/wpe/InspectorTargetProxyWPE.cpp b/Source/WebKit/UIProcess/wpe/InspectorTargetProxyWPE.cpp
+diff --git a/Source/WebKit/UIProcess/win/WebPageInspectorTargetProxyWin.cpp b/Source/WebKit/UIProcess/win/WebPageInspectorTargetProxyWin.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..24da079059ed4a45131e18d7fbf56a29a54bd513
+index 0000000000000000000000000000000000000000..5b3222e904d3f56d8606b1f1158b2947263eac44
--- /dev/null
-+++ b/Source/WebKit/UIProcess/wpe/InspectorTargetProxyWPE.cpp
-@@ -0,0 +1,40 @@
++++ b/Source/WebKit/UIProcess/win/WebPageInspectorTargetProxyWin.cpp
+@@ -0,0 +1,36 @@
+/*
-+ * Copyright (C) 2019 Microsoft Corporation.
++ * Copyright (C) 2020 Microsoft Corporation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
@@ -18002,20 +18047,29 @@ index 0000000000000000000000000000000000000000..24da079059ed4a45131e18d7fbf56a29
+ */
+
+#include "config.h"
-+#include "InspectorTargetProxy.h"
-+
++#include "WebPageInspectorTargetProxy.h"
+#include "WebPageProxy.h"
-+#include <wpe/wpe.h>
+
+namespace WebKit {
+
-+void InspectorTargetProxy::platformActivate(String& error) const
++void WebPageInspectorTargetProxy::platformActivate(String& error) const
+{
-+ struct wpe_view_backend* backend = m_page->viewBackend();
-+ wpe_view_backend_add_activity_state(backend, wpe_view_activity_state_visible | wpe_view_activity_state_focused | wpe_view_activity_state_in_window);
+}
+
+} // namespace WebKit
+diff --git a/Source/WebKit/UIProcess/win/WebView.cpp b/Source/WebKit/UIProcess/win/WebView.cpp
+index 22124ffc5c0daf37be6ac7d115d587925613b4cd..83fbf4182132b87c0b90416e5cd83372e6c2b99f 100644
+--- a/Source/WebKit/UIProcess/win/WebView.cpp
++++ b/Source/WebKit/UIProcess/win/WebView.cpp
+@@ -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);
+- m_viewSize = expandedIntSize(FloatSize(LOWORD(lParam), HIWORD(lParam)) / intrinsicDeviceScaleFactor);
++ m_viewSize = expandedIntSize(FloatSize(LOWORD(lParam), HIWORD(lParam)));
+
+ if (m_page && m_page->drawingArea()) {
+ // FIXME specify correctly layerPosition.
diff --git a/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.cpp b/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7df77e30c2e7303dc6aaad560434e5b8e35f4f3c
@@ -18436,7 +18490,7 @@ index 0000000000000000000000000000000000000000..182398f24909cbc42cac897d66546991
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/wpe/WebPageInspectorInputAgentWPE.cpp b/Source/WebKit/UIProcess/wpe/WebPageInspectorInputAgentWPE.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..a7d88f8c745f95af21db71dcfce368ba4832a328
+index 0000000000000000000000000000000000000000..c6af56767484e2889208c96d454a0924f290ba9c
--- /dev/null
+++ b/Source/WebKit/UIProcess/wpe/WebPageInspectorInputAgentWPE.cpp
@@ -0,0 +1,55 @@
@@ -18475,7 +18529,7 @@ index 0000000000000000000000000000000000000000..a7d88f8c745f95af21db71dcfce368ba
+
+namespace WebKit {
+
-+void WebPageInspectorInputAgent::platformDispatchKeyEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, Vector<String>& macCommands, WallTime timestamp)
++void WebPageInspectorInputAgent::platformDispatchKeyEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, Vector<String>& macCommands, MonotonicTime timestamp)
+{
+ NativeWebKeyboardEvent event(
+ type,
@@ -18495,6 +18549,52 @@ index 0000000000000000000000000000000000000000..a7d88f8c745f95af21db71dcfce368ba
+}
+
+} // namespace WebKit
+diff --git a/Source/WebKit/UIProcess/wpe/WebPageInspectorTargetProxyWPE.cpp b/Source/WebKit/UIProcess/wpe/WebPageInspectorTargetProxyWPE.cpp
+new file mode 100644
+index 0000000000000000000000000000000000000000..83148bef5b410a70c29bbaf30bb833b9f033ae9a
+--- /dev/null
++++ b/Source/WebKit/UIProcess/wpe/WebPageInspectorTargetProxyWPE.cpp
+@@ -0,0 +1,40 @@
++/*
++ * Copyright (C) 2019 Microsoft Corporation.
++ *
++ * 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
++ * OWNER OR 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 "WebPageInspectorTargetProxy.h"
++
++#include "WebPageProxy.h"
++#include <wpe/wpe.h>
++
++namespace WebKit {
++
++void WebPageInspectorTargetProxy::platformActivate(String& error) const
++{
++ struct wpe_view_backend* backend = m_page->viewBackend();
++ wpe_view_backend_add_activity_state(backend, wpe_view_activity_state_visible | wpe_view_activity_state_focused | wpe_view_activity_state_in_window);
++}
++
++} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/wpe/WebPreferencesWPE.cpp b/Source/WebKit/UIProcess/wpe/WebPreferencesWPE.cpp
index 9b688ad328317fea4fd96ce66e9714bad8f0f937..402a36a9c565e13ec298aa7f014f0d9208ebddb7 100644
--- a/Source/WebKit/UIProcess/wpe/WebPreferencesWPE.cpp
@@ -18511,10 +18611,10 @@ index 9b688ad328317fea4fd96ce66e9714bad8f0f937..402a36a9c565e13ec298aa7f014f0d92
} // namespace WebKit
diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
-index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab89706eb8301 100644
+index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2ff404e2b8 100644
--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
-@@ -1562,6 +1562,7 @@
+@@ -1499,6 +1499,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 */; };
@@ -18522,7 +18622,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
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 */; };
-@@ -2350,6 +2351,18 @@
+@@ -2281,6 +2282,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 */; };
@@ -18535,13 +18635,13 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
+ D71A944C237239FB002C4D9E /* BrowserInspectorPipe.h in Headers */ = {isa = PBXBuildFile; fileRef = D71A944B237239FB002C4D9E /* BrowserInspectorPipe.h */; };
+ D76D6888238DBD81008D314B /* InspectorDialogAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = D76D6887238DBD80008D314B /* InspectorDialogAgent.h */; };
+ D79902B1236E9404005D6F7E /* WebPageInspectorEmulationAgentMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = D79902AE236E9404005D6F7E /* WebPageInspectorEmulationAgentMac.mm */; };
-+ D79902B2236E9404005D6F7E /* InspectorTargetProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = D79902AF236E9404005D6F7E /* InspectorTargetProxyMac.mm */; };
++ D79902B2236E9404005D6F7E /* WebPageInspectorTargetProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = D79902AF236E9404005D6F7E /* WebPageInspectorTargetProxyMac.mm */; };
+ D79902B3236E9404005D6F7E /* WebPageInspectorInputAgentMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = D79902B0236E9404005D6F7E /* WebPageInspectorInputAgentMac.mm */; };
+ D7EB04E72372A73B00F744CE /* InspectorPlaywrightAgentClientMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = D7EB04E62372A73B00F744CE /* InspectorPlaywrightAgentClientMac.mm */; };
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, ); }; };
-@@ -2450,6 +2463,8 @@
+@@ -2381,6 +2394,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 */; };
@@ -18550,7 +18650,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
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 */; };
-@@ -2489,6 +2504,9 @@
+@@ -2424,6 +2439,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 */; };
@@ -18560,7 +18660,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
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, ); }; };
-@@ -6469,6 +6487,7 @@
+@@ -6446,6 +6464,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>"; };
@@ -18568,7 +18668,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
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>"; };
-@@ -8205,6 +8224,19 @@
+@@ -8213,6 +8232,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>"; };
@@ -18582,13 +18682,13 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
+ D71A944B237239FB002C4D9E /* BrowserInspectorPipe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BrowserInspectorPipe.h; sourceTree = "<group>"; };
+ D76D6887238DBD80008D314B /* InspectorDialogAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDialogAgent.h; sourceTree = "<group>"; };
+ D79902AE236E9404005D6F7E /* WebPageInspectorEmulationAgentMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPageInspectorEmulationAgentMac.mm; sourceTree = "<group>"; };
-+ D79902AF236E9404005D6F7E /* InspectorTargetProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InspectorTargetProxyMac.mm; sourceTree = "<group>"; };
++ D79902AF236E9404005D6F7E /* WebPageInspectorTargetProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPageInspectorTargetProxyMac.mm; sourceTree = "<group>"; };
+ D79902B0236E9404005D6F7E /* WebPageInspectorInputAgentMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPageInspectorInputAgentMac.mm; sourceTree = "<group>"; };
+ D7EB04E62372A73B00F744CE /* InspectorPlaywrightAgentClientMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InspectorPlaywrightAgentClientMac.mm; sourceTree = "<group>"; };
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>"; };
-@@ -8382,6 +8414,8 @@
+@@ -8393,6 +8425,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>"; };
@@ -18597,7 +18697,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
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>"; };
-@@ -8435,6 +8469,14 @@
+@@ -8454,6 +8488,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>"; };
@@ -18612,7 +18712,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
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>"; };
-@@ -8898,6 +8940,7 @@
+@@ -8928,6 +8970,7 @@
3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */,
3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */,
7B9FC5BB28A5233B007570E7 /* libWebKitPlatform.a in Frameworks */,
@@ -18620,7 +18720,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */,
37694525184FC6B600CDE21F /* Security.framework in Frameworks */,
37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */,
-@@ -12121,6 +12164,7 @@
+@@ -12215,6 +12258,7 @@
99788ACA1F421DCA00C08000 /* _WKAutomationSessionConfiguration.mm */,
990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */,
990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */,
@@ -18628,7 +18728,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
5C4609E222430E4C009943C2 /* _WKContentRuleListAction.h */,
5C4609E322430E4D009943C2 /* _WKContentRuleListAction.mm */,
5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */,
-@@ -13515,6 +13559,7 @@
+@@ -13636,6 +13680,7 @@
E34B110C27C46BC6006D2F2E /* libWebCoreTestShim.dylib */,
E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */,
DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */,
@@ -18636,7 +18736,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
57A9FF15252C6AEF006A2040 /* libWTF.a */,
5750F32A2032D4E500389347 /* LocalAuthentication.framework */,
570DAAB0230273D200E8FC04 /* NearField.framework */,
-@@ -14101,6 +14146,12 @@
+@@ -14232,6 +14277,12 @@
children = (
9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */,
9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */,
@@ -18649,7 +18749,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
);
path = Agents;
sourceTree = "<group>";
-@@ -14109,6 +14160,7 @@
+@@ -14240,6 +14291,7 @@
isa = PBXGroup;
children = (
A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */,
@@ -18657,7 +18757,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */,
99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */,
99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */,
-@@ -14869,6 +14921,7 @@
+@@ -15007,6 +15059,7 @@
E1513C65166EABB200149FCB /* AuxiliaryProcessProxy.h */,
46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */,
46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */,
@@ -18665,7 +18765,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
5C6D69352AC3935D0099BDAF /* BrowsingContextGroup.cpp */,
5C6D69362AC3935D0099BDAF /* BrowsingContextGroup.h */,
5CA98549210BEB5A0057EB6B /* BrowsingWarning.h */,
-@@ -14893,6 +14946,8 @@
+@@ -15031,6 +15084,8 @@
BC06F43912DBCCFB002D78DE /* GeolocationPermissionRequestProxy.cpp */,
BC06F43812DBCCFB002D78DE /* GeolocationPermissionRequestProxy.h */,
2DD5A72A1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h */,
@@ -18674,7 +18774,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */,
5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */,
31607F3819627002009B87DA /* LegacySessionStateCoding.h */,
-@@ -14923,6 +14978,7 @@
+@@ -15061,6 +15116,7 @@
4683569B21E81CC7006E27A3 /* ProvisionalPageProxy.cpp */,
4683569A21E81CC7006E27A3 /* ProvisionalPageProxy.h */,
411B89CB27B2B89600F9EBD3 /* QueryPermissionResultCallback.h */,
@@ -18682,7 +18782,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
5CCB54DC2A4FEA6A0005FAA8 /* RemotePageDrawingAreaProxy.cpp */,
5CCB54DB2A4FEA6A0005FAA8 /* RemotePageDrawingAreaProxy.h */,
FABBBC802D35AC6800820017 /* RemotePageFullscreenManagerProxy.cpp */,
-@@ -15030,6 +15086,8 @@
+@@ -15170,6 +15226,8 @@
BC7B6204129A0A6700D174A4 /* WebPageGroup.h */,
2D9EA3101A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp */,
2D9EA30E1A96CBFF002D2807 /* WebPageInjectedBundleClient.h */,
@@ -18691,7 +18791,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
9B7F8A502C785725000057F3 /* WebPageLoadTiming.h */,
BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */,
BC032DCB10F4389F0058C15A /* WebPageProxy.h */,
-@@ -15216,6 +15274,7 @@
+@@ -15354,6 +15412,7 @@
BC646C1911DD399F006455B0 /* WKBackForwardListItemRef.h */,
BC646C1611DD399F006455B0 /* WKBackForwardListRef.cpp */,
BC646C1711DD399F006455B0 /* WKBackForwardListRef.h */,
@@ -18699,17 +18799,17 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
BCB9E24A1120E15C00A137E0 /* WKContext.cpp */,
BCB9E2491120E15C00A137E0 /* WKContext.h */,
1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */,
-@@ -15794,6 +15853,9 @@
+@@ -15935,6 +15994,9 @@
07EF07592745A8160066EA04 /* DisplayCaptureSessionManager.h */,
07EF07582745A8160066EA04 /* DisplayCaptureSessionManager.mm */,
7AFA6F682A9F57C50055322A /* DisplayLinkMac.cpp */,
+ D71A94302370E025002C4D9E /* InspectorPlaywrightAgentClientMac.h */,
+ D7EB04E62372A73B00F744CE /* InspectorPlaywrightAgentClientMac.mm */,
-+ D79902AF236E9404005D6F7E /* InspectorTargetProxyMac.mm */,
++ D79902AF236E9404005D6F7E /* WebPageInspectorTargetProxyMac.mm */,
1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */,
0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */,
0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */,
-@@ -15817,6 +15879,8 @@
+@@ -15958,6 +16020,8 @@
E568B92120A3AC6A00E3C856 /* WebDataListSuggestionsDropdownMac.mm */,
E55CD20124D09F1F0042DB9C /* WebDateTimePickerMac.h */,
E55CD20224D09F1F0042DB9C /* WebDateTimePickerMac.mm */,
@@ -18718,7 +18818,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
BC857E8512B71EBB00EDEB2E /* WebPageProxyMac.mm */,
BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */,
BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */,
-@@ -16923,6 +16987,7 @@
+@@ -17065,6 +17129,7 @@
99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */,
990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */,
990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */,
@@ -18726,7 +18826,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */,
5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */,
9B4CE9512CD99B7C00351173 /* _WKContentWorldConfiguration.h in Headers */,
-@@ -17242,6 +17307,7 @@
+@@ -17386,6 +17451,7 @@
E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */,
4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */,
1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */,
@@ -18734,7 +18834,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
5CA9854A210BEB640057EB6B /* BrowsingWarning.h in Headers */,
A7E69BCC2B2117A100D43D3F /* BufferAndBackendInfo.h in Headers */,
BC3065FA1259344E00E71278 /* CacheModel.h in Headers */,
-@@ -17425,7 +17491,11 @@
+@@ -17569,7 +17635,11 @@
BC14DF77120B5B7900826C0C /* InjectedBundleScriptWorld.h in Headers */,
CE550E152283752200D28791 /* InsertTextOptions.h in Headers */,
9197940523DBC4BB00257892 /* InspectorBrowserAgent.h in Headers */,
@@ -18746,15 +18846,15 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */,
C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */,
2D4D2C811DF60BF3002EB10C /* InteractionInformationRequest.h in Headers */,
-@@ -17685,6 +17755,7 @@
- 0F6E7C532C4C386800F1DB85 /* RemoteDisplayListRecorderMessages.h in Headers */,
- F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */,
+@@ -17833,6 +17903,7 @@
+ 0F6E7C532C4C386800F1DB85 /* RemoteGraphicsContextMessages.h in Headers */,
+ F451C0FE2703B263002BA03B /* RemoteGraphicsContextProxy.h in Headers */,
A78A5FE42B0EB39E005036D3 /* RemoteImageBufferSetIdentifier.h in Headers */,
+ D71A943A2370F061002C4D9E /* RemoteInspectorPipe.h in Headers */,
2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */,
2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */,
1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */,
-@@ -17740,6 +17811,7 @@
+@@ -17889,6 +17960,7 @@
E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */,
E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */,
7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */,
@@ -18762,7 +18862,7 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
6D4DF20C2D824242001F964C /* ScreenTimeWebsiteDataSupport.h in Headers */,
463BB93A2B9D08D80098C5C3 /* ScriptMessageHandlerIdentifier.h in Headers */,
F4E28A362C923814008120DD /* ScriptTrackingPrivacyFilter.h in Headers */,
-@@ -18106,6 +18178,8 @@
+@@ -18260,6 +18332,8 @@
939EF87029D112EE00F23AEE /* WebPageInlines.h in Headers */,
9197940823DBC4CB00257892 /* WebPageInspectorAgentBase.h in Headers */,
A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */,
@@ -18771,12 +18871,12 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
A543E30C215C8A8D00279CD9 /* WebPageInspectorTarget.h in Headers */,
A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */,
A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */,
-@@ -20746,7 +20820,43 @@
+@@ -20917,7 +20991,43 @@
522F792928D50EBB0069B45B /* HidService.mm in Sources */,
2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */,
2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */,
+ D7EB04E72372A73B00F744CE /* InspectorPlaywrightAgentClientMac.mm in Sources */,
-+ D79902B2236E9404005D6F7E /* InspectorTargetProxyMac.mm in Sources */,
++ D79902B2236E9404005D6F7E /* WebPageInspectorTargetProxyMac.mm in Sources */,
+ 1CC94E532AC92F190045F269 /* JSWebExtensionAPIAction.mm in Sources */,
+ 1C2B4D4B2A819D0D00C528A1 /* JSWebExtensionAPIAlarms.mm in Sources */,
+ 1C8ECFEA2AFC7DCB007BAA62 /* JSWebExtensionAPICommands.mm in Sources */,
@@ -18812,10 +18912,10 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
+ 337042022B58A0B70077FF78 /* JSWebExtensionAPIWebRequestEvent.mm in Sources */,
+ 1C5ACFA62A96F8C400C041C0 /* JSWebExtensionAPIWindows.mm in Sources */,
+ 1C5ACFA72A96F8C400C041C0 /* JSWebExtensionAPIWindowsEvent.mm in Sources */,
- 1C5DC45F2909B05A0061EC62 /* JSWebExtensionWrapperCocoa.mm in Sources */,
C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */,
C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */,
-@@ -21148,6 +21258,8 @@
+ 41A0EB142641714900794471 /* LibWebRTCCodecsProxy.mm in Sources */,
+@@ -21258,6 +21368,8 @@
078B04A02CF18EAB00B453A6 /* WebPage+NavigationPreferences.swift in Sources */,
071467782DFE84E500F77867 /* WebPage+Transferable.swift in Sources */,
07CB79962CE9435700199C49 /* WebPage.swift in Sources */,
@@ -18823,9 +18923,9 @@ index 4a60ae331da2220209411fb34e9b5ee60e3171aa..13cadd4f6c6177121799653ed7bab897
+ D79902B3236E9404005D6F7E /* WebPageInspectorInputAgentMac.mm in Sources */,
7CE9CE101FA0767A000177DE /* WebPageUpdatePreferences.cpp in Sources */,
079A4DA12D72CC0D00CA387F /* WebPageWebView.swift in Sources */,
- CA2506A82DD65327001D1954 /* WebPageWebViewAdditions.swift in Sources */,
+ 7CEB00DD1FA69ABE0065473B /* WebPreferencesFeatures.cpp in Sources */,
diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
-index c445673e74cb8a98ffdf478325305432914f2f7a..5bcbaa36a7b191b480b9983aaf58b11410671dff 100644
+index 717468dc02f8f50567a8e421eb5a2b5a28d63411..6c6a06b93f6ef26e7b5acd73f89f9d515a99c5af 100644
--- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
+++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
@@ -272,6 +272,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
@@ -18840,7 +18940,7 @@ index c445673e74cb8a98ffdf478325305432914f2f7a..5bcbaa36a7b191b480b9983aaf58b114
#if ENABLE(PDFJS)
if (tryLoadingUsingPDFJSHandler(resourceLoader, trackingParameters))
return;
-@@ -286,12 +291,16 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
+@@ -293,12 +298,16 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
}
if (InspectorInstrumentationWebKit::shouldInterceptRequest(resourceLoader)) {
@@ -18863,7 +18963,7 @@ index c445673e74cb8a98ffdf478325305432914f2f7a..5bcbaa36a7b191b480b9983aaf58b114
}
WEBLOADERSTRATEGY_RELEASE_LOG_FORWARDABLE(WEBLOADERSTRATEGY_SCHEDULELOAD);
-@@ -416,7 +425,7 @@ static void addParametersShared(const LocalFrame* frame, NetworkResourceLoadPara
+@@ -425,7 +434,7 @@ static void addParametersShared(const LocalFrame* frame, NetworkResourceLoadPara
parameters.linkPreconnectEarlyHintsEnabled = mainFrame->settings().linkPreconnectEarlyHintsEnabled();
}
@@ -18872,7 +18972,7 @@ index c445673e74cb8a98ffdf478325305432914f2f7a..5bcbaa36a7b191b480b9983aaf58b114
{
auto identifier = *resourceLoader.identifier();
-@@ -428,10 +437,10 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -437,10 +446,10 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
&& resourceLoader.frameLoader()->notifier().isInitialRequestIdentifier(identifier)
? MainFrameMainResource::Yes : MainFrameMainResource::No;
if (!page->allowsLoadFromURL(request.url(), mainFrameMainResource)) {
@@ -18885,7 +18985,7 @@ index c445673e74cb8a98ffdf478325305432914f2f7a..5bcbaa36a7b191b480b9983aaf58b114
}
}
-@@ -441,14 +450,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -450,14 +459,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);
@@ -18900,7 +19000,7 @@ index c445673e74cb8a98ffdf478325305432914f2f7a..5bcbaa36a7b191b480b9983aaf58b114
loadParameters.identifier = identifier;
loadParameters.parentPID = legacyPresentingApplicationPID();
loadParameters.contentSniffingPolicy = contentSniffingPolicy;
-@@ -532,14 +533,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -541,14 +542,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
if (loadParameters.options.mode != FetchOptions::Mode::Navigate) {
ASSERT(loadParameters.sourceOrigin);
@@ -18918,9 +19018,9 @@ index c445673e74cb8a98ffdf478325305432914f2f7a..5bcbaa36a7b191b480b9983aaf58b114
loadParameters.isMainFrameNavigation = isMainFrameNavigation;
if (loadParameters.isMainFrameNavigation && document)
-@@ -590,6 +588,25 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
- if (RefPtr frameLoader = resourceLoader.frameLoader())
- loadParameters.requiredCookiesVersion = frameLoader->requiredCookiesVersion();
+@@ -602,6 +600,25 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+ if (CachedResourceHandle handle = resourceLoader.cachedResource())
+ loadParameters.isInitiatorPrefetch = handle->type() == CachedResource::Type::LinkPrefetch;
+ return true;
+}
@@ -18944,7 +19044,7 @@ index c445673e74cb8a98ffdf478325305432914f2f7a..5bcbaa36a7b191b480b9983aaf58b114
std::optional<NetworkResourceLoadIdentifier> existingNetworkResourceLoadIdentifierToResume;
if (loadParameters.isMainFrameNavigation)
existingNetworkResourceLoadIdentifierToResume = std::exchange(m_existingNetworkResourceLoadIdentifierToResume, std::nullopt);
-@@ -604,7 +621,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -617,7 +634,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
}
auto loader = WebResourceLoader::create(resourceLoader, trackingParameters);
@@ -18953,7 +19053,7 @@ index c445673e74cb8a98ffdf478325305432914f2f7a..5bcbaa36a7b191b480b9983aaf58b114
}
void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader)
-@@ -1022,7 +1039,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier
+@@ -1035,7 +1052,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier
bool WebLoaderStrategy::isOnLine() const
{
@@ -18962,7 +19062,7 @@ index c445673e74cb8a98ffdf478325305432914f2f7a..5bcbaa36a7b191b480b9983aaf58b114
}
void WebLoaderStrategy::addOnlineStateChangeListener(Function<void(bool)>&& listener)
-@@ -1048,6 +1065,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet
+@@ -1061,6 +1078,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet
void WebLoaderStrategy::setOnLineState(bool isOnLine)
{
@@ -18974,7 +19074,7 @@ index c445673e74cb8a98ffdf478325305432914f2f7a..5bcbaa36a7b191b480b9983aaf58b114
if (m_isOnLine == isOnLine)
return;
-@@ -1056,6 +1078,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine)
+@@ -1069,6 +1091,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine)
listener(isOnLine);
}
@@ -18988,7 +19088,7 @@ index c445673e74cb8a98ffdf478325305432914f2f7a..5bcbaa36a7b191b480b9983aaf58b114
{
WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::SetCaptureExtraNetworkLoadMetricsEnabled(enabled), 0);
diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h
-index af1f8eb6b578367e8cb818b1c6020377c5a07a37..41f1a38348b11aa0d99fc9fa429fe6b88b41dbab 100644
+index 2c63aa572dda8af5d9b33b9636c33f04172563ae..1b30460e13a334b43be2b6b0f58a88b2f307cd30 100644
--- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h
+++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h
@@ -26,6 +26,7 @@
@@ -18999,7 +19099,7 @@ index af1f8eb6b578367e8cb818b1c6020377c5a07a37..41f1a38348b11aa0d99fc9fa429fe6b8
#include "WebResourceLoader.h"
#include <WebCore/LoaderStrategy.h>
#include <WebCore/ResourceError.h>
-@@ -96,6 +97,9 @@ public:
+@@ -97,6 +98,9 @@ public:
bool isOnLine() const final;
void addOnlineStateChangeListener(Function<void(bool)>&&) final;
void setOnLineState(bool);
@@ -19009,7 +19109,7 @@ index af1f8eb6b578367e8cb818b1c6020377c5a07a37..41f1a38348b11aa0d99fc9fa429fe6b8
void setExistingNetworkResourceLoadIdentifierToResume(std::optional<NetworkResourceLoadIdentifier> existingNetworkResourceLoadIdentifierToResume) { m_existingNetworkResourceLoadIdentifierToResume = existingNetworkResourceLoadIdentifierToResume; }
-@@ -164,6 +168,7 @@ private:
+@@ -165,6 +169,7 @@ private:
Vector<Function<void(bool)>> m_onlineStateChangeListeners;
std::optional<NetworkResourceLoadIdentifier> m_existingNetworkResourceLoadIdentifierToResume;
bool m_isOnLine { true };
@@ -19018,7 +19118,7 @@ index af1f8eb6b578367e8cb818b1c6020377c5a07a37..41f1a38348b11aa0d99fc9fa429fe6b8
} // namespace WebKit
diff --git a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
-index 9e8966c65c8c0327b437446b749fe8c22c493e27..9f5afce37925d609f48febcd0054e2d8c0768c89 100644
+index 46c2cccc74f7d650a2c2624aa5bb72a93206b9bc..74c1bc4de3d3ab304c7faebebe1ada62a81ff660 100644
--- a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
+++ b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
@@ -204,9 +204,6 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
@@ -19041,19 +19141,19 @@ index 9e8966c65c8c0327b437446b749fe8c22c493e27..9f5afce37925d609f48febcd0054e2d8
}
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
-index a3c66b8d8ae186866f984436460f32d5d6f4a347..ad99b0de84c581b369df06a27bac6edaf56b80cb 100644
+index 69ad1034b9f01a8582c84841f0e44fadc12a6367..af0f824672baec478b17b8c8f53dd2df56bd731a 100644
--- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
-@@ -539,6 +539,9 @@ void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel lev
+@@ -494,6 +494,9 @@ void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel lev
if (!page)
return;
+ if (level == MessageLevel::Error)
+ page->send(Messages::WebPageProxy::LogToStderr(message));
+
- // FIXME: Remove this after rdar://143399667 is fixed.
+ #if !PLATFORM(COCOA)
page->injectedBundleUIClient().willAddMessageToConsole(page.get(), source, level, message, lineNumber, columnNumber, sourceID);
-
+ #endif
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebDragClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebDragClient.cpp
index 771f8c77b51976e3aa332fa10befd9fd5b258edc..f46b5bf3a6d5a1cb832b602e0c024dbde808b7b9 100644
--- a/Source/WebKit/WebProcess/WebCoreSupport/WebDragClient.cpp
@@ -19158,7 +19258,7 @@ index 0000000000000000000000000000000000000000..741ef5b11fe8718529105339cda0fab5
+
+#endif // ENABLE(DRAG_SUPPORT)
diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
-index f3fad38c1e055231a008724c50312248bcaccbaf..5c6f7c4f260904cc3c88c2c28e626d90432c0ac6 100644
+index 4c4daaa62270c3236ee0f3352076c740968dcd89..780ddeb80f18eb8e314867a6c49a19fd0e9354a9 100644
--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
@@ -39,6 +39,7 @@
@@ -19166,7 +19266,7 @@ index f3fad38c1e055231a008724c50312248bcaccbaf..5c6f7c4f260904cc3c88c2c28e626d90
#include "WebProcess.h"
#include <WebCore/GraphicsContext.h>
+#include <WebCore/InspectorController.h>
- #include <WebCore/LocalFrame.h>
+ #include <WebCore/LocalFrameInlines.h>
#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
@@ -19232,10 +19332,10 @@ index a7ad18fc1201e5de2cc1528539a765599ecfc41e..ebea233bc54ab6e56fb7093ff63e2368
WebCookieJar();
diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
-index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace4680bc5ae0 100644
+index dfeb32a72c1954e4ae456ed89c4fe7b44c533875..3278fd1b672ea8b406e415cce31995fefefaac83 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
-@@ -247,6 +247,7 @@
+@@ -249,6 +249,7 @@
#include <WebCore/ImageAnalysisQueue.h>
#include <WebCore/ImageOverlay.h>
#include <WebCore/InspectorController.h>
@@ -19243,7 +19343,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
#include <WebCore/JSDOMExceptionHandling.h>
#include <WebCore/JSNode.h>
#include <WebCore/KeyboardEvent.h>
-@@ -1178,6 +1179,12 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
+@@ -1185,6 +1186,12 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
setLinkDecorationFilteringData(WTFMove(parameters.linkDecorationFilteringData));
setAllowedQueryParametersForAdvancedPrivacyProtections(WTFMove(parameters.allowedQueryParametersForAdvancedPrivacyProtections));
#endif
@@ -19256,7 +19356,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
if (parameters.windowFeatures) {
page->applyWindowFeatures(*parameters.windowFeatures);
page->chrome().show();
-@@ -2114,6 +2121,22 @@ void WebPage::loadDidCommitInAnotherProcess(WebCore::FrameIdentifier frameID, st
+@@ -2115,6 +2122,22 @@ void WebPage::loadDidCommitInAnotherProcess(WebCore::FrameIdentifier frameID, st
frame->loadDidCommitInAnotherProcess(layerHostingContextIdentifier);
}
@@ -19279,7 +19379,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
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);
-@@ -2314,7 +2337,9 @@ void WebPage::stopLoading()
+@@ -2315,7 +2338,9 @@ void WebPage::stopLoading()
void WebPage::stopLoadingDueToProcessSwap()
{
SetForScope isStoppingLoadingDueToProcessSwap(m_isStoppingLoadingDueToProcessSwap, true);
@@ -19289,7 +19389,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
}
bool WebPage::defersLoading() const
-@@ -2890,7 +2915,7 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum
+@@ -2891,7 +2916,7 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum
#if PLATFORM(IOS_FAMILY)
if (m_viewportConfiguration.setViewportArguments(viewportArguments))
viewportConfigurationChanged();
@@ -19298,7 +19398,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
// Adjust view dimensions when using fixed layout.
RefPtr localMainFrame = this->localMainFrame();
RefPtr view = localMainFrame ? localMainFrame->view() : nullptr;
-@@ -3682,6 +3707,13 @@ void WebPage::flushDeferredScrollEvents()
+@@ -3689,6 +3714,13 @@ void WebPage::flushDeferredScrollEvents()
protectedCorePage()->flushDeferredScrollEvents();
}
@@ -19312,7 +19412,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
void WebPage::flushDeferredDidReceiveMouseEvent()
{
if (auto info = std::exchange(m_deferredDidReceiveMouseEvent, std::nullopt))
-@@ -3956,6 +3988,97 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent, CompletionHandler<void
+@@ -3959,6 +3991,97 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent, CompletionHandler<void
completionHandler(touchEvent.type(), handled);
}
@@ -19338,7 +19438,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
+ WebPlatformTouchPoint::State state = WebPlatformTouchPoint::State::Pressed;
+ touchPoints.append(WebPlatformTouchPoint(id, state, screenPosition, position, radius, rotationAngle, force));
+
-+ WebTouchEvent touchEvent({WebEventType::TouchStart, eventModifiers, WallTime::now()}, WTFMove(touchPoints), {}, {});
++ WebTouchEvent touchEvent({WebEventType::TouchStart, eventModifiers, MonotonicTime::now()}, WTFMove(touchPoints), {}, {});
+
+ CurrentEvent currentEvent(touchEvent);
+ handled = handleTouchEvent(m_page->mainFrame().frameID(), touchEvent, m_page.get()).value_or(false);
@@ -19348,7 +19448,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
+ WebPlatformTouchPoint::State state = WebPlatformTouchPoint::State::Released;
+ touchPoints.append(WebPlatformTouchPoint(id, state, screenPosition, position, radius, rotationAngle, force));
+
-+ WebTouchEvent touchEvent({WebEventType::TouchEnd, eventModifiers, WallTime::now()}, WTFMove(touchPoints), {}, {});
++ WebTouchEvent touchEvent({WebEventType::TouchEnd, eventModifiers, MonotonicTime::now()}, WTFMove(touchPoints), {}, {});
+
+ CurrentEvent currentEvent(touchEvent);
+ handled = handleTouchEvent(m_page->mainFrame().frameID(), touchEvent, m_page.get()).value_or(false) || handled;
@@ -19378,7 +19478,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
+ PlatformEvent::Type::MouseMoved,
+ 0,
+ modifiers,
-+ WallTime::now(),
++ MonotonicTime::now(),
+ force,
+ syntheticClickType
+ ));
@@ -19389,7 +19489,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
+ PlatformEvent::Type::MousePressed,
+ 1,
+ modifiers,
-+ WallTime::now(),
++ MonotonicTime::now(),
+ force,
+ syntheticClickType
+ ));
@@ -19400,7 +19500,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
+ PlatformEvent::Type::MouseReleased,
+ 1,
+ modifiers,
-+ WallTime::now(),
++ MonotonicTime::now(),
+ force,
+ syntheticClickType
+ ));
@@ -19410,7 +19510,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
#endif
void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint)
-@@ -4044,6 +4167,16 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m
+@@ -4047,6 +4170,16 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m
m_inspectorTargetController->sendMessageToTargetBackend(targetId, message);
}
@@ -19427,7 +19527,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
void WebPage::insertNewlineInQuotedContent()
{
RefPtr frame = corePage()->focusController().focusedOrMainFrame();
-@@ -4287,6 +4420,7 @@ void WebPage::setMainFrameDocumentVisualUpdatesAllowed(bool allowed)
+@@ -4290,6 +4423,7 @@ void WebPage::setMainFrameDocumentVisualUpdatesAllowed(bool allowed)
void WebPage::show()
{
send(Messages::WebPageProxy::ShowPage());
@@ -19435,7 +19535,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
}
void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension)
-@@ -5508,7 +5642,7 @@ RefPtr<NotificationPermissionRequestManager> WebPage::protectedNotificationPermi
+@@ -5489,7 +5623,7 @@ RefPtr<NotificationPermissionRequestManager> WebPage::protectedNotificationPermi
#if ENABLE(DRAG_SUPPORT)
@@ -19444,10 +19544,10 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
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)
-@@ -8028,6 +8162,10 @@ void WebPage::didCommitLoad(WebFrame* frame)
- m_needsFixedContainerEdgesUpdate = true;
+@@ -8217,6 +8351,10 @@ void WebPage::didCommitLoad(WebFrame* frame)
- flushDeferredDidReceiveMouseEvent();
+ if (frame && frame->isMainFrame())
+ m_networkResourceRequestIdentifiersForPageLoadTiming.clear();
+// Playwright begin
+ if (frame->isMainFrame())
+ send(Messages::WebPageProxy::ViewScaleFactorDidChange(viewScaleFactor()));
@@ -19455,7 +19555,7 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
}
void WebPage::didFinishDocumentLoad(WebFrame& frame)
-@@ -8337,6 +8475,9 @@ Ref<DocumentLoader> WebPage::createDocumentLoader(LocalFrame& frame, ResourceReq
+@@ -8526,6 +8664,9 @@ Ref<DocumentLoader> WebPage::createDocumentLoader(LocalFrame& frame, ResourceReq
m_allowsContentJavaScriptFromMostRecentNavigation = m_internals->pendingWebsitePolicies->allowsContentJavaScript;
WebsitePoliciesData::applyToDocumentLoader(*std::exchange(m_internals->pendingWebsitePolicies, std::nullopt), documentLoader);
}
@@ -19466,10 +19566,10 @@ index 504f82d3895a6389ed6f2375942ee0df7eef0595..100e1126196fe8c795f1822eb5bace46
return documentLoader;
diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
-index 302e2b70e2e181e4883a90945770162b2e873eaf..d5c5e96f65253e2a7251981a2e8d9a43b7be6e6d 100644
+index 0577245e9f59eb2cb5875be0edcfa28c464d16aa..e24ca4acfde65e2da499e834212290ba2253123c 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
-@@ -46,6 +46,7 @@
+@@ -47,6 +47,7 @@
#include <WebCore/NodeIdentifier.h>
#include <WebCore/NowPlayingMetadataObserver.h>
#include <WebCore/OwnerPermissionsPolicyData.h>
@@ -19477,7 +19577,7 @@ index 302e2b70e2e181e4883a90945770162b2e873eaf..d5c5e96f65253e2a7251981a2e8d9a43
#include <WebCore/PageIdentifier.h>
#include <WebCore/PageOverlay.h>
#include <WebCore/PlatformLayerIdentifier.h>
-@@ -1316,11 +1317,11 @@ public:
+@@ -1321,11 +1322,11 @@ public:
void clearSelection();
void restoreSelectionInFocusedEditableElement();
@@ -19491,7 +19591,7 @@ index 302e2b70e2e181e4883a90945770162b2e873eaf..d5c5e96f65253e2a7251981a2e8d9a43
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
-@@ -1338,6 +1339,9 @@ public:
+@@ -1343,6 +1344,9 @@ public:
#if ENABLE(MODEL_PROCESS)
void modelDragEnded(WebCore::NodeIdentifier);
#endif
@@ -19501,7 +19601,7 @@ index 302e2b70e2e181e4883a90945770162b2e873eaf..d5c5e96f65253e2a7251981a2e8d9a43
#endif
#if ENABLE(MODEL_PROCESS)
-@@ -1424,8 +1428,11 @@ public:
+@@ -1444,8 +1448,11 @@ public:
void gestureEvent(WebCore::FrameIdentifier, const WebGestureEvent&, CompletionHandler<void(std::optional<WebEventType>, bool, std::optional<WebCore::RemoteUserInputEventData>)>&&);
#endif
@@ -19514,7 +19614,7 @@ index 302e2b70e2e181e4883a90945770162b2e873eaf..d5c5e96f65253e2a7251981a2e8d9a43
void dynamicViewportSizeUpdate(const DynamicViewportSizeUpdate&);
bool scaleWasSetByUIProcess() const { return m_scaleWasSetByUIProcess; }
void willStartUserTriggeredZooming();
-@@ -1587,6 +1594,8 @@ public:
+@@ -1607,6 +1614,8 @@ public:
void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType);
void disconnectInspector(const String& targetId);
void sendMessageToTargetBackend(const String& targetId, const String& message);
@@ -19523,7 +19623,7 @@ index 302e2b70e2e181e4883a90945770162b2e873eaf..d5c5e96f65253e2a7251981a2e8d9a43
void insertNewlineInQuotedContent();
-@@ -2012,6 +2021,7 @@ public:
+@@ -2031,6 +2040,7 @@ public:
void showContextMenuFromFrame(const FrameInfoData&, const ContextMenuContextData&, const UserData&);
#endif
void loadRequest(LoadParameters&&);
@@ -19531,7 +19631,7 @@ index 302e2b70e2e181e4883a90945770162b2e873eaf..d5c5e96f65253e2a7251981a2e8d9a43
void setObscuredContentInsets(const WebCore::FloatBoxExtent&);
-@@ -2223,6 +2233,7 @@ private:
+@@ -2255,6 +2265,7 @@ private:
void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled);
#elif ENABLE(TOUCH_EVENTS)
void touchEvent(const WebTouchEvent&, CompletionHandler<void(std::optional<WebEventType>, bool)>&&);
@@ -19539,7 +19639,7 @@ index 302e2b70e2e181e4883a90945770162b2e873eaf..d5c5e96f65253e2a7251981a2e8d9a43
#endif
void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&);
-@@ -3004,6 +3015,7 @@ private:
+@@ -3035,6 +3046,7 @@ private:
bool m_isAppNapEnabled { true };
Markable<WebCore::NavigationIdentifier> m_pendingNavigationID;
@@ -19548,7 +19648,7 @@ index 302e2b70e2e181e4883a90945770162b2e873eaf..d5c5e96f65253e2a7251981a2e8d9a43
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 c39f816831ea04bb7d070e81891b933307c3a62f..228a2020c40a94133699bd2a1433daca568a8d38 100644
+index 961e4cde3b7f7dcfeed3826cbece0700c63e6fc5..97ba51f4608de657d9f7475d2d5b26a08c553426 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
@@ -61,10 +61,13 @@ messages -> WebPage WantsAsyncDispatchMessage {
@@ -19615,10 +19715,10 @@ index c39f816831ea04bb7d070e81891b933307c3a62f..228a2020c40a94133699bd2a1433daca
RequestDragStart(std::optional<WebCore::FrameIdentifier> remoteFrameID, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet<WebCore::DragSourceAction> allowedActionsMask) -> (struct WebKit::DragInitiationResult result)
RequestAdditionalItemsForDragSession(std::optional<WebCore::FrameIdentifier> rootFrameID, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet<WebCore::DragSourceAction> allowedActionsMask) -> (struct WebKit::DragInitiationResult result)
diff --git a/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp b/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp
-index 40ec42bb4f998774a2ce4a19e82f68512ad2ebb8..080794e14bfbb3a336d8a89791baee0e1aec3c75 100644
+index 907f750f7e6c9c3d2b15a7eafd5480a6582b3a69..0163098c7ea168b985ee92f9dbf0b31c502bf6b8 100644
--- a/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp
+++ b/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp
-@@ -210,16 +210,23 @@ String WebPage::platformUserAgent(const URL& url) const
+@@ -211,16 +211,23 @@ String WebPage::platformUserAgent(const URL& url) const
bool WebPage::hoverSupportedByPrimaryPointingDevice() const
{
@@ -19642,7 +19742,7 @@ index 40ec42bb4f998774a2ce4a19e82f68512ad2ebb8..080794e14bfbb3a336d8a89791baee0e
const auto& primaryPointingDevice = WebProcess::singleton().primaryPointingDevice();
if (primaryPointingDevice == AvailableInputDevices::Mouse)
return PointerCharacteristics::Fine;
-@@ -230,6 +237,9 @@ std::optional<PointerCharacteristics> WebPage::pointerCharacteristicsOfPrimaryPo
+@@ -231,6 +238,9 @@ std::optional<PointerCharacteristics> WebPage::pointerCharacteristicsOfPrimaryPo
OptionSet<PointerCharacteristics> WebPage::pointerCharacteristicsOfAllAvailablePointingDevices() const
{
@@ -19653,10 +19753,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 d228567dab3bece6f0f640122df955debbb20645..8abfdcceff676c32b149d34654ccb133d0b20b6d 100644
+index 12c8c15f4e02fe442110815bfb37a3433e2f7e78..21504a7d64e4313cfe86c85e60a0ec2879d36087 100644
--- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
+++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
-@@ -709,21 +709,37 @@ String WebPage::platformUserAgent(const URL&) const
+@@ -703,21 +703,37 @@ String WebPage::platformUserAgent(const URL&) const
bool WebPage::hoverSupportedByPrimaryPointingDevice() const
{
@@ -19745,10 +19845,10 @@ index ea3a03b5ee6d4ecadd771314c6059268db917087..91be6f4c687157afcfdaa431d7a1a6ff
}
diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp
-index f718a75783df828282cebdb35ba6ef7aaafceaab..f2c23623972f5f05fe358968d45712de95e78287 100644
+index f0544767cec6c08f3a8ff7da1c7df40ad10488e7..2345e5dc795240cd963e1c56f7da2a1c38503425 100644
--- a/Source/WebKit/WebProcess/WebProcess.cpp
+++ b/Source/WebKit/WebProcess/WebProcess.cpp
-@@ -93,6 +93,7 @@
+@@ -94,6 +94,7 @@
#include "WebsiteData.h"
#include "WebsiteDataStoreParameters.h"
#include "WebsiteDataType.h"
@@ -19756,7 +19856,7 @@ index f718a75783df828282cebdb35ba6ef7aaafceaab..f2c23623972f5f05fe358968d45712de
#include <JavaScriptCore/JSLock.h>
#include <JavaScriptCore/MemoryStatistics.h>
#include <JavaScriptCore/WasmFaultSignalHandler.h>
-@@ -389,6 +390,14 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
+@@ -391,6 +392,14 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
{
JSC::Options::AllowUnfinalizedAccessScope scope;
JSC::Options::allowNonSPTagging() = false;
@@ -19771,7 +19871,7 @@ index f718a75783df828282cebdb35ba6ef7aaafceaab..f2c23623972f5f05fe358968d45712de
JSC::Options::notifyOptionsChanged();
}
-@@ -396,6 +405,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
+@@ -398,6 +407,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
platformInitializeProcess(parameters);
updateCPULimit();
@@ -19780,7 +19880,7 @@ index f718a75783df828282cebdb35ba6ef7aaafceaab..f2c23623972f5f05fe358968d45712de
}
void WebProcess::initializeConnection(IPC::Connection* connection)
-@@ -1000,6 +1011,8 @@ void WebProcess::createWebPage(PageIdentifier pageID, WebPageCreationParameters&
+@@ -1002,6 +1013,8 @@ void WebProcess::createWebPage(PageIdentifier pageID, WebPageCreationParameters&
accessibilityRelayProcessSuspended(false);
}
ASSERT(result.iterator->value);
@@ -19790,10 +19890,10 @@ index f718a75783df828282cebdb35ba6ef7aaafceaab..f2c23623972f5f05fe358968d45712de
void WebProcess::removeWebPage(PageIdentifier pageID)
diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
-index 1e94fdb5528a634e1766b92f687c5d4f3b360a08..48633d0eef6b94013ad08b655b6f631df9e6144b 100644
+index 50897a0f972d994224ceada9dfeb5c95c12cfd69..fde414357c688fe3b26eba1f2157bd8e295e2589 100644
--- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
-@@ -4220,7 +4220,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
+@@ -4210,7 +4210,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
_private->handlingMouseDownEvent = NO;
}
@@ -19803,10 +19903,10 @@ index 1e94fdb5528a634e1766b92f687c5d4f3b360a08..48633d0eef6b94013ad08b655b6f631d
- (void)touch:(WebEvent *)event
{
diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
-index 0a8524884313332dbfbacf5e76faffaa20615e04..a1123977f9a775d067dacac6f18a7923d30174c2 100644
+index db58f96c27158f1234477f90d47a98911af98d95..c2091651640b081c266486fd8a50a414ff246f4b 100644
--- a/Source/WebKitLegacy/mac/WebView/WebView.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
-@@ -3972,7 +3972,7 @@ + (void)_doNotStartObservingNetworkReachability
+@@ -3929,7 +3929,7 @@ + (void)_doNotStartObservingNetworkReachability
}
#endif // PLATFORM(IOS_FAMILY)
@@ -19815,7 +19915,7 @@ index 0a8524884313332dbfbacf5e76faffaa20615e04..a1123977f9a775d067dacac6f18a7923
- (NSArray *)_touchEventRegions
{
-@@ -4014,7 +4014,7 @@ - (NSArray *)_touchEventRegions
+@@ -3971,7 +3971,7 @@ - (NSArray *)_touchEventRegions
}).autorelease();
}
@@ -19858,13 +19958,13 @@ index 0000000000000000000000000000000000000000..a9db9ec38d05e36517414248237e885b
+ LIBVPX_LIBRARIES
+)
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index cca9439b5b8b47d7ad594fb52169732b8fe04dcb..a35b4483dfe7f38d40d9754ad808797080bbff14 100644
+index a47bbb70db0ef0688d63ada76eddc2cf382685cf..a19dfc1206a89e940105c3a77b4479f45a28c139 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")
# Update Source/WTF/wtf/Platform.h to match required GLib versions.
- find_package(GLIB 2.70.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
+ find_package(GLib 2.70.0 REQUIRED COMPONENTS GioUnix Thread Module)
+
+set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
@@ -19917,11 +20017,11 @@ index cca9439b5b8b47d7ad594fb52169732b8fe04dcb..a35b4483dfe7f38d40d9754ad8087970
WEBKIT_OPTION_DEPEND(ENABLE_WEBXR ENABLE_GAMEPAD)
diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
-index 0f218a220f020c02da23801959bbd7e72225117e..64800eeb278be31595b13b0a0a9ecf23a4ed5f0c 100644
+index 9303f05609cef53f6fccb0b3d8d42213efabec79..aced5eff5e07ba8de1ca7835f1decb4a0690cf10 100644
--- a/Source/cmake/OptionsWPE.cmake
+++ b/Source/cmake/OptionsWPE.cmake
-@@ -27,6 +27,9 @@ if (ANDROID)
- find_package(Android REQUIRED COMPONENTS Android Log)
+@@ -33,6 +33,9 @@ else ()
+ set(ENABLE_MEDIA_SESSION_DEFAULT ON)
endif ()
+set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
@@ -19930,7 +20030,7 @@ index 0f218a220f020c02da23801959bbd7e72225117e..64800eeb278be31595b13b0a0a9ecf23
WEBKIT_OPTION_BEGIN()
SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
-@@ -86,6 +89,22 @@ else ()
+@@ -92,6 +95,22 @@ else ()
WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SKIA PRIVATE OFF)
endif ()
@@ -19953,7 +20053,7 @@ index 0f218a220f020c02da23801959bbd7e72225117e..64800eeb278be31595b13b0a0a9ecf23
# 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.
-@@ -121,6 +140,11 @@ WEBKIT_OPTION_DEPEND(USE_QT6 ENABLE_WPE_PLATFORM)
+@@ -127,6 +146,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)
@@ -19966,7 +20066,7 @@ index 0f218a220f020c02da23801959bbd7e72225117e..64800eeb278be31595b13b0a0a9ecf23
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 4bf1704596f5555a9e23939873525d96d803ff80..e3710ad8b4100c4f30f84c3364230c6ef51575d6 100644
+index 38684436bf8272f2e6d05681e7b1cb257479e877..20007a8425728241a8b039570c61dd2be703b818 100644
--- a/Source/cmake/OptionsWin.cmake
+++ b/Source/cmake/OptionsWin.cmake
@@ -55,6 +55,10 @@ find_package(ZLIB 1.2.11 REQUIRED)
@@ -19980,7 +20080,7 @@ index 4bf1704596f5555a9e23939873525d96d803ff80..e3710ad8b4100c4f30f84c3364230c6e
WEBKIT_OPTION_BEGIN()
# FIXME: Most of these options should not be public.
-@@ -112,6 +116,14 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
+@@ -113,6 +117,14 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
SET_AND_EXPOSE_TO_BUILD(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS ON)
SET_AND_EXPOSE_TO_BUILD(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS ON)
@@ -19996,7 +20096,7 @@ index 4bf1704596f5555a9e23939873525d96d803ff80..e3710ad8b4100c4f30f84c3364230c6e
set(USE_ANGLE_EGL ON)
diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
-index 77a292fb8b15af7bc544de6e0307f11106cfd161..872541a17703827da5020df4129a65b3dd9d8e80 100644
+index 692287a5dc9380b9f09fcf4638c4b73bc6003f4c..5cddb30b6c2df2d56a80a459776206e8d688f5c6 100644
--- a/Source/cmake/WebKitCompilerFlags.cmake
+++ b/Source/cmake/WebKitCompilerFlags.cmake
@@ -122,7 +122,7 @@ macro(WEBKIT_ADD_TARGET_CXX_FLAGS _target)
@@ -20005,9 +20105,9 @@ index 77a292fb8b15af7bc544de6e0307f11106cfd161..872541a17703827da5020df4129a65b3
-option(DEVELOPER_MODE_FATAL_WARNINGS "Build with warnings as errors if DEVELOPER_MODE is also enabled" ON)
+option(DEVELOPER_MODE_FATAL_WARNINGS "Build with warnings as errors if DEVELOPER_MODE is also enabled" OFF)
+ set(DEVELOPER_MODE_CXX_FLAGS)
if (DEVELOPER_MODE AND DEVELOPER_MODE_FATAL_WARNINGS)
if (MSVC)
- set(FATAL_WARNINGS_FLAG /WX)
diff --git a/Tools/DumpRenderTree/DerivedSources.make b/Tools/DumpRenderTree/DerivedSources.make
index 576835410df6deac60f0158f1d2d1ef1e5f4c78d..9b492cfe5fef8de340a80f2af70a7d68672ef2e4 100644
--- a/Tools/DumpRenderTree/DerivedSources.make
@@ -20023,10 +20123,10 @@ index 576835410df6deac60f0158f1d2d1ef1e5f4c78d..9b492cfe5fef8de340a80f2af70a7d68
WEB_PREFERENCES_GENERATED_FILES = \
TestOptionsGeneratedWebKitLegacyKeyMapping.cpp \
diff --git a/Tools/MiniBrowser/gtk/BrowserTab.c b/Tools/MiniBrowser/gtk/BrowserTab.c
-index 6d48c378699e87f55bbd2550d4971a295b831a24..efb0d8e1e0f7db5d4ce81bc58a97e6c4034ff0b3 100644
+index a7d4d6ce8ee32140eb188610fbd0996921dc7168..9ecb09431c5d427e6a878f1da7f010ea9faeb8be 100644
--- a/Tools/MiniBrowser/gtk/BrowserTab.c
+++ b/Tools/MiniBrowser/gtk/BrowserTab.c
-@@ -117,19 +117,38 @@ static void isLoadingChanged(WebKitWebView *webView, GParamSpec *paramSpec, Brow
+@@ -118,19 +118,38 @@ static void isLoadingChanged(WebKitWebView *webView, GParamSpec *paramSpec, Brow
}
}
@@ -20069,7 +20169,7 @@ index 6d48c378699e87f55bbd2550d4971a295b831a24..efb0d8e1e0f7db5d4ce81bc58a97e6c4
return TRUE;
}
-@@ -180,6 +199,11 @@ static void loadChanged(WebKitWebView *webView, WebKitLoadEvent loadEvent, Brows
+@@ -181,6 +200,11 @@ static void loadChanged(WebKitWebView *webView, WebKitLoadEvent loadEvent, Brows
#endif
}
@@ -20081,7 +20181,7 @@ index 6d48c378699e87f55bbd2550d4971a295b831a24..efb0d8e1e0f7db5d4ce81bc58a97e6c4
static GtkWidget *createInfoBarQuestionMessage(const char *title, const char *text)
{
GtkWidget *dialog = gtk_info_bar_new_with_buttons("No", GTK_RESPONSE_NO, "Yes", GTK_RESPONSE_YES, NULL);
-@@ -746,6 +770,7 @@ static void browserTabConstructed(GObject *gObject)
+@@ -805,6 +829,7 @@ static void browserTabConstructed(GObject *gObject)
g_signal_connect(tab->webView, "notify::is-loading", G_CALLBACK(isLoadingChanged), tab);
g_signal_connect(tab->webView, "decide-policy", G_CALLBACK(decidePolicy), tab);
g_signal_connect(tab->webView, "load-changed", G_CALLBACK(loadChanged), tab);
@@ -20089,7 +20189,7 @@ index 6d48c378699e87f55bbd2550d4971a295b831a24..efb0d8e1e0f7db5d4ce81bc58a97e6c4
g_signal_connect(tab->webView, "load-failed-with-tls-errors", G_CALLBACK(loadFailedWithTLSerrors), tab);
g_signal_connect(tab->webView, "permission-request", G_CALLBACK(decidePermissionRequest), tab);
g_signal_connect(tab->webView, "run-color-chooser", G_CALLBACK(runColorChooserCallback), tab);
-@@ -798,6 +823,9 @@ static char *getInternalURI(const char *uri)
+@@ -860,6 +885,9 @@ static char *getInternalURI(const char *uri)
if (g_str_has_prefix(uri, "about:") && !g_str_equal(uri, "about:blank"))
return g_strconcat(BROWSER_ABOUT_SCHEME, uri + strlen ("about"), NULL);
@@ -20411,7 +20511,7 @@ index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec9
g_clear_object(&interfaceSettings);
diff --git a/Tools/MiniBrowser/wpe/main.cpp b/Tools/MiniBrowser/wpe/main.cpp
-index abc3c2e649f13c0843f74214f79f2a5ea5e826c1..7a2993feb2c5017ca08572a35a74bca7c01f87e9 100644
+index 3f0a7b883e30c982c68d53ab09ae36c54ea40030..0fc2fa2b8c9c3b0af7de861f681734f87e16dcc6 100644
--- a/Tools/MiniBrowser/wpe/main.cpp
+++ b/Tools/MiniBrowser/wpe/main.cpp
@@ -52,6 +52,9 @@ static gboolean headlessMode;
@@ -20434,7 +20534,7 @@ index abc3c2e649f13c0843f74214f79f2a5ea5e826c1..7a2993feb2c5017ca08572a35a74bca7
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, nullptr, "[URL]" },
{ nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
};
-@@ -295,15 +301,38 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul
+@@ -302,15 +308,38 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul
g_main_loop_quit(data->mainLoop);
}
@@ -20475,7 +20575,7 @@ index abc3c2e649f13c0843f74214f79f2a5ea5e826c1..7a2993feb2c5017ca08572a35a74bca7
{
auto backend = createViewBackend(defaultWindowWidthLegacyAPI, defaultWindowHeightLegacyAPI);
WebKitWebViewBackend* viewBackend = nullptr;
-@@ -318,12 +347,27 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
+@@ -325,12 +354,27 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
}, backend.release());
}
@@ -20509,7 +20609,7 @@ index abc3c2e649f13c0843f74214f79f2a5ea5e826c1..7a2993feb2c5017ca08572a35a74bca7
#if ENABLE_WPE_PLATFORM
if (auto* wpeView = webkit_web_view_get_wpe_view(newWebView)) {
-@@ -335,9 +379,13 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
+@@ -342,9 +386,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);
@@ -20525,7 +20625,7 @@ index abc3c2e649f13c0843f74214f79f2a5ea5e826c1..7a2993feb2c5017ca08572a35a74bca7
return newWebView;
}
-@@ -425,13 +473,105 @@ void loadConfigFile(WPESettings* settings)
+@@ -432,13 +480,105 @@ void loadConfigFile(WPESettings* settings)
}
#endif
@@ -20632,7 +20732,7 @@ index abc3c2e649f13c0843f74214f79f2a5ea5e826c1..7a2993feb2c5017ca08572a35a74bca7
webkit_network_session_set_itp_enabled(networkSession, enableITP);
if (proxy) {
-@@ -458,10 +598,18 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -465,10 +605,18 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
webkit_cookie_manager_set_persistent_storage(cookieManager, cookiesFile, storageType);
}
}
@@ -20653,7 +20753,7 @@ index abc3c2e649f13c0843f74214f79f2a5ea5e826c1..7a2993feb2c5017ca08572a35a74bca7
webkit_website_data_manager_set_itp_enabled(manager, enableITP);
if (proxy) {
-@@ -492,6 +640,7 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -499,6 +647,7 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
}
#endif
@@ -20661,7 +20761,7 @@ index abc3c2e649f13c0843f74214f79f2a5ea5e826c1..7a2993feb2c5017ca08572a35a74bca7
WebKitUserContentManager* userContentManager = nullptr;
if (contentFilter) {
GFile* contentFilterFile = g_file_new_for_commandline_arg(contentFilter);
-@@ -570,6 +719,15 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -577,6 +726,15 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
"autoplay", WEBKIT_AUTOPLAY_ALLOW,
nullptr);
@@ -20677,7 +20777,7 @@ index abc3c2e649f13c0843f74214f79f2a5ea5e826c1..7a2993feb2c5017ca08572a35a74bca7
auto* webView = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW,
"backend", viewBackend,
"web-context", webContext,
-@@ -616,12 +774,16 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -623,12 +781,16 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
}
#endif
@@ -20696,7 +20796,7 @@ index abc3c2e649f13c0843f74214f79f2a5ea5e826c1..7a2993feb2c5017ca08572a35a74bca7
g_hash_table_add(openViews, webView);
WebKitColor color;
-@@ -629,16 +791,11 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -636,16 +798,11 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
webkit_web_view_set_background_color(webView, &color);
if (uriArguments) {
@@ -20718,7 +20818,7 @@ index abc3c2e649f13c0843f74214f79f2a5ea5e826c1..7a2993feb2c5017ca08572a35a74bca7
webkit_web_view_load_uri(webView, "https://wpewebkit.org");
g_object_unref(webContext);
-@@ -735,8 +892,14 @@ int main(int argc, char *argv[])
+@@ -742,8 +899,14 @@ int main(int argc, char *argv[])
}
}
@@ -20761,10 +20861,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 0d0c43579d26bb9738300a3b6bd142b4a0f424be..ac0e2abe9d1ad3bac7b855eeb50fed5de96cf4ad 100644
+index 763464258cd174b858fe04e00c21a87d5a644c8d..cbe6d4dde62803d491bb8f1818d54d7b40ecb718 100644
--- a/Tools/WebKitTestRunner/TestController.cpp
+++ b/Tools/WebKitTestRunner/TestController.cpp
-@@ -735,6 +735,7 @@ PlatformWebView* TestController::createOtherPlatformWebView(PlatformWebView* par
+@@ -763,6 +763,7 @@ PlatformWebView* TestController::createOtherPlatformWebView(PlatformWebView* par
nullptr, // requestStorageAccessConfirm
nullptr, // shouldAllowDeviceOrientationAndMotionAccess
nullptr, // runWebAuthenticationPanel
@@ -20772,7 +20872,7 @@ index 0d0c43579d26bb9738300a3b6bd142b4a0f424be..ac0e2abe9d1ad3bac7b855eeb50fed5d
nullptr, // decidePolicyForSpeechRecognitionPermissionRequest
nullptr, // decidePolicyForMediaKeySystemPermissionRequest
nullptr, // queryPermission
-@@ -1218,6 +1219,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)
+@@ -1241,6 +1242,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)
nullptr, // requestStorageAccessConfirm
shouldAllowDeviceOrientationAndMotionAccess,
runWebAuthenticationPanel,
@@ -20781,10 +20881,10 @@ index 0d0c43579d26bb9738300a3b6bd142b4a0f424be..ac0e2abe9d1ad3bac7b855eeb50fed5d
decidePolicyForMediaKeySystemPermissionRequest,
queryPermission,
diff --git a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
-index 9419696018c076d0e5b4ef04ea7c58be9504cd96..06c537e3c022517449068a11ea59400413e8f4dc 100644
+index b5e56675d2005f78dfd7def861601c63398c069d..038e763aa8dead3e570f9dd0bdcc5a7aa7734436 100644
--- a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
+++ b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
-@@ -961,4 +961,51 @@ void EventSenderProxy::waitForPendingMouseEvents()
+@@ -967,4 +967,51 @@ void EventSenderProxy::waitForPendingMouseEvents()
}
}
@@ -20837,7 +20937,7 @@ index 9419696018c076d0e5b4ef04ea7c58be9504cd96..06c537e3c022517449068a11ea594004
+
} // namespace WTR
diff --git a/Tools/jhbuild/jhbuild-minimal.modules b/Tools/jhbuild/jhbuild-minimal.modules
-index 3a0b7425900b14ce2aa0d48aa914cd69bff1f332..0ce07cc1368c6f521b51d6300dca9c4d078beef3 100644
+index 5af40246b94fb365453f94f8b1b2ba29f3a84b20..91e6e4600557e8dcd4cd886fa1316f63a4c81138 100644
--- a/Tools/jhbuild/jhbuild-minimal.modules
+++ b/Tools/jhbuild/jhbuild-minimal.modules
@@ -67,8 +67,8 @@