Skip to content

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

chore: update browser_patches to b4f706670 (#35634)

Max Schmittcd0b0531651c
diff --git a/browser_patches/firefox/UPSTREAM_CONFIG.sh b/browser_patches/firefox/UPSTREAM_CONFIG.sh
index 2b6979cfab..5ae9758e38 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/gecko-dev"
BASE_BRANCH="release"
-BASE_REVISION="4764531b2bb14867dde520d74f6a3c88690e0751"
+BASE_REVISION="5e1efb776a56e399f6810204a2eca13f18a3eba6"
diff --git a/browser_patches/firefox/juggler/NetworkObserver.js b/browser_patches/firefox/juggler/NetworkObserver.js
index 2ee5996068..3fc9368d81 100644
--- a/browser_patches/firefox/juggler/NetworkObserver.js
+++ b/browser_patches/firefox/juggler/NetworkObserver.js
@@ -204,11 +204,13 @@ class NetworkRequest {
this._interceptedChannel.synthesizeHeader(header.name, header.value);
if (header.name.toLowerCase() === 'set-cookie') {
Services.cookies.QueryInterface(Ci.nsICookieService);
- Services.cookies.setCookieStringFromHttp(this.httpChannel.URI, header.value, this.httpChannel);
+ for (const cookieString of header.value.split('\n'))
+ Services.cookies.setCookieStringFromHttp(this.httpChannel.URI, cookieString, this.httpChannel);
}
}
const synthesized = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(Ci.nsIStringInputStream);
- synthesized.data = base64body ? atob(base64body) : '';
+ if (base64body)
+ synthesized.setByteStringData(atob(base64body));
this._interceptedChannel.startSynthesizedResponse(synthesized, null, null, '', false);
this._interceptedChannel.finishSynthesizedResponse();
this._interceptedChannel = undefined;
@@ -870,7 +872,7 @@ function setPostData(httpChannel, postData, headers) {
return;
const synthesized = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(Ci.nsIStringInputStream);
const body = atob(postData);
- synthesized.setData(body, body.length);
+ synthesized.setByteStringData(body);
const overriddenHeader = (lowerCaseName) => {
if (headers) {
@@ -902,7 +904,7 @@ function convertString(s, source, dest) {
const is = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(
Ci.nsIStringInputStream
);
- is.setData(s, s.length);
+ is.setByteStringData(s);
const listener = Cc["@mozilla.org/network/stream-loader;1"].createInstance(
Ci.nsIStreamLoader
);
diff --git a/browser_patches/firefox/juggler/TargetRegistry.js b/browser_patches/firefox/juggler/TargetRegistry.js
index fb6280faeb..2ffb53390d 100644
--- a/browser_patches/firefox/juggler/TargetRegistry.js
+++ b/browser_patches/firefox/juggler/TargetRegistry.js
@@ -22,6 +22,8 @@ const ALL_PERMISSIONS = [
];
let globalTabAndWindowActivationChain = Promise.resolve();
+// This is a workaround for https://github.com/microsoft/playwright/issues/34586
+let globalNewPageChain = Promise.resolve();
class DownloadInterceptor {
constructor(registry) {
@@ -308,55 +310,59 @@ class TargetRegistry {
}
async newPage({browserContextId}) {
- const browserContext = this.browserContextForId(browserContextId);
- const features = "chrome,dialog=no,all";
- // See _callWithURIToLoad in browser.js for the structure of window.arguments
- // window.arguments[1]: unused (bug 871161)
- // [2]: referrerInfo (nsIReferrerInfo)
- // [3]: postData (nsIInputStream)
- // [4]: allowThirdPartyFixup (bool)
- // [5]: userContextId (int)
- // [6]: originPrincipal (nsIPrincipal)
- // [7]: originStoragePrincipal (nsIPrincipal)
- // [8]: triggeringPrincipal (nsIPrincipal)
- // [9]: allowInheritPrincipal (bool)
- // [10]: csp (nsIContentSecurityPolicy)
- // [11]: nsOpenWindowInfo
- const args = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
- const urlSupports = Cc["@mozilla.org/supports-string;1"].createInstance(
- Ci.nsISupportsString
- );
- urlSupports.data = 'about:blank';
- args.appendElement(urlSupports); // 0
- args.appendElement(undefined); // 1
- args.appendElement(undefined); // 2
- args.appendElement(undefined); // 3
- args.appendElement(undefined); // 4
- const userContextIdSupports = Cc[
- "@mozilla.org/supports-PRUint32;1"
- ].createInstance(Ci.nsISupportsPRUint32);
- userContextIdSupports.data = browserContext.userContextId;
- args.appendElement(userContextIdSupports); // 5
- args.appendElement(undefined); // 6
- args.appendElement(undefined); // 7
- args.appendElement(Services.scriptSecurityManager.getSystemPrincipal()); // 8
-
- const window = Services.ww.openWindow(null, AppConstants.BROWSER_CHROME_URL, '_blank', features, args);
- await waitForWindowReady(window);
- if (window.gBrowser.browsers.length !== 1)
- throw new Error(`Unexpected number of tabs in the new window: ${window.gBrowser.browsers.length}`);
- const browser = window.gBrowser.browsers[0];
- let target = this._browserToTarget.get(browser);
- while (!target) {
- await helper.awaitEvent(this, TargetRegistry.Events.TargetCreated);
- target = this._browserToTarget.get(browser);
- }
- browser.focus();
- if (browserContext.crossProcessCookie.settings.timezoneId) {
- if (await target.hasFailedToOverrideTimezone())
- throw new Error('Failed to override timezone');
- }
- return target.id();
+ const result = globalNewPageChain.then(async () => {
+ const browserContext = this.browserContextForId(browserContextId);
+ const features = "chrome,dialog=no,all";
+ // See _callWithURIToLoad in browser.js for the structure of window.arguments
+ // window.arguments[1]: unused (bug 871161)
+ // [2]: referrerInfo (nsIReferrerInfo)
+ // [3]: postData (nsIInputStream)
+ // [4]: allowThirdPartyFixup (bool)
+ // [5]: userContextId (int)
+ // [6]: originPrincipal (nsIPrincipal)
+ // [7]: originStoragePrincipal (nsIPrincipal)
+ // [8]: triggeringPrincipal (nsIPrincipal)
+ // [9]: allowInheritPrincipal (bool)
+ // [10]: csp (nsIContentSecurityPolicy)
+ // [11]: nsOpenWindowInfo
+ const args = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
+ const urlSupports = Cc["@mozilla.org/supports-string;1"].createInstance(
+ Ci.nsISupportsString
+ );
+ urlSupports.data = 'about:blank';
+ args.appendElement(urlSupports); // 0
+ args.appendElement(undefined); // 1
+ args.appendElement(undefined); // 2
+ args.appendElement(undefined); // 3
+ args.appendElement(undefined); // 4
+ const userContextIdSupports = Cc[
+ "@mozilla.org/supports-PRUint32;1"
+ ].createInstance(Ci.nsISupportsPRUint32);
+ userContextIdSupports.data = browserContext.userContextId;
+ args.appendElement(userContextIdSupports); // 5
+ args.appendElement(undefined); // 6
+ args.appendElement(undefined); // 7
+ args.appendElement(Services.scriptSecurityManager.getSystemPrincipal()); // 8
+
+ const window = Services.ww.openWindow(null, AppConstants.BROWSER_CHROME_URL, '_blank', features, args);
+ await waitForWindowReady(window);
+ if (window.gBrowser.browsers.length !== 1)
+ throw new Error(`Unexpected number of tabs in the new window: ${window.gBrowser.browsers.length}`);
+ const browser = window.gBrowser.browsers[0];
+ let target = this._browserToTarget.get(browser);
+ while (!target) {
+ await helper.awaitEvent(this, TargetRegistry.Events.TargetCreated);
+ target = this._browserToTarget.get(browser);
+ }
+ browser.focus();
+ if (browserContext.crossProcessCookie.settings.timezoneId) {
+ if (await target.hasFailedToOverrideTimezone())
+ throw new Error('Failed to override timezone');
+ }
+ return target.id();
+ });
+ globalNewPageChain = result.catch(error => { /* swallow errors to keep chain running */ });
+ return result;
}
targets() {
@@ -501,6 +507,7 @@ class PageTarget {
this.updateEmulatedMedia(browsingContext);
this.updateColorSchemeOverride(browsingContext);
this.updateReducedMotionOverride(browsingContext);
+ this.updateContrastOverride(browsingContext);
this.updateForcedColorsOverride(browsingContext);
this.updateForceOffline(browsingContext);
this.updateCacheDisabled(browsingContext);
@@ -640,6 +647,15 @@ class PageTarget {
(browsingContext || this._linkedBrowser.browsingContext).prefersReducedMotionOverride = this.reducedMotion || this._browserContext.reducedMotion || 'none';
}
+ setContrast(contrast) {
+ this.contrast = fromProtocolContrast(contrast);
+ this.updateContrastOverride();
+ }
+
+ updateContrastOverride(browsingContext = undefined) {
+ (browsingContext || this._linkedBrowser.browsingContext).prefersContrastOverride = this.contrast || this._browserContext.contrast || 'none';
+ }
+
setForcedColors(forcedColors) {
this.forcedColors = fromProtocolForcedColors(forcedColors);
this.updateForcedColorsOverride();
@@ -875,6 +891,14 @@ function fromProtocolReducedMotion(reducedMotion) {
throw new Error('Unknown reduced motion: ' + reducedMotion);
}
+function fromProtocolContrast(contrast) {
+ if (contrast === 'more' || contrast === 'less' || contrast === 'custom' || contrast === 'no-preference')
+ return contrast;
+ if (contrast === null)
+ return undefined;
+ throw new Error('Unknown contrast: ' + contrast);
+}
+
function fromProtocolForcedColors(forcedColors) {
if (forcedColors === 'active' || forcedColors === 'none')
return forcedColors;
@@ -915,6 +939,7 @@ class BrowserContext {
this.colorScheme = 'none';
this.forcedColors = 'none';
this.reducedMotion = 'none';
+ this.contrast = 'none';
this.videoRecordingOptions = undefined;
this.crossProcessCookie = {
initScripts: [],
@@ -941,6 +966,12 @@ class BrowserContext {
page.updateReducedMotionOverride();
}
+ setContrast(contrast) {
+ this.contrast = fromProtocolContrast(contrast);
+ for (const page of this.pages)
+ page.updateContrastOverride();
+ }
+
setForcedColors(forcedColors) {
this.forcedColors = fromProtocolForcedColors(forcedColors);
for (const page of this.pages)
diff --git a/browser_patches/firefox/juggler/protocol/BrowserHandler.js b/browser_patches/firefox/juggler/protocol/BrowserHandler.js
index 6a4688e541..e92b6dfefe 100644
--- a/browser_patches/firefox/juggler/protocol/BrowserHandler.js
+++ b/browser_patches/firefox/juggler/protocol/BrowserHandler.js
@@ -219,6 +219,10 @@ class BrowserHandler {
await this._targetRegistry.browserContextForId(browserContextId).setForcedColors(nullToUndefined(forcedColors));
}
+ async ['Browser.setContrast']({browserContextId, contrast}) {
+ await this._targetRegistry.browserContextForId(browserContextId).setContrast(nullToUndefined(contrast));
+ }
+
async ['Browser.setVideoRecordingOptions']({browserContextId, options}) {
await this._targetRegistry.browserContextForId(browserContextId).setVideoRecordingOptions(options);
}
diff --git a/browser_patches/firefox/juggler/protocol/PageHandler.js b/browser_patches/firefox/juggler/protocol/PageHandler.js
index e8367070a8..5892c88603 100644
--- a/browser_patches/firefox/juggler/protocol/PageHandler.js
+++ b/browser_patches/firefox/juggler/protocol/PageHandler.js
@@ -302,10 +302,11 @@ class PageHandler {
return await this._contentPage.send('setFileInputFiles', options);
}
- async ['Page.setEmulatedMedia']({colorScheme, type, reducedMotion, forcedColors}) {
+ async ['Page.setEmulatedMedia']({colorScheme, type, reducedMotion, forcedColors, contrast}) {
this._pageTarget.setColorScheme(colorScheme || null);
this._pageTarget.setReducedMotion(reducedMotion || null);
this._pageTarget.setForcedColors(forcedColors || null);
+ this._pageTarget.setContrast(contrast || null);
this._pageTarget.setEmulatedMedia(type);
}
diff --git a/browser_patches/firefox/juggler/protocol/Protocol.js b/browser_patches/firefox/juggler/protocol/Protocol.js
index 6fa3dc8555..f18dff61bf 100644
--- a/browser_patches/firefox/juggler/protocol/Protocol.js
+++ b/browser_patches/firefox/juggler/protocol/Protocol.js
@@ -463,6 +463,12 @@ const Browser = {
forcedColors: t.Nullable(t.Enum(['active', 'none'])),
},
},
+ 'setContrast': {
+ params: {
+ browserContextId: t.Optional(t.String),
+ contrast: t.Nullable(t.Enum(['less', 'more', 'custom', 'no-preference'])),
+ },
+ },
'setVideoRecordingOptions': {
params: {
browserContextId: t.Optional(t.String),
@@ -809,6 +815,7 @@ const Page = {
colorScheme: t.Optional(t.Enum(['dark', 'light', 'no-preference'])),
reducedMotion: t.Optional(t.Enum(['reduce', 'no-preference'])),
forcedColors: t.Optional(t.Enum(['active', 'none'])),
+ contrast: t.Optional(t.Enum(['less', 'more', 'custom', 'no-preference'])),
},
},
'setCacheDisabled': {
diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff
index 9fecd89256..094a734019 100644
--- a/browser_patches/firefox/patches/bootstrap.diff
+++ b/browser_patches/firefox/patches/bootstrap.diff
@@ -1,5 +1,5 @@
diff --git a/accessible/base/NotificationController.h b/accessible/base/NotificationController.h
-index 137963f1170927ae0262e0dc26ef721d496376f4..41fa27bc4a3da41814a7f326792990df3424e81f 100644
+index 1bcd464d3bd6b8465f78c62b074b0d57dbc6a082..f878ac9db2d800542dabcc2f48e8ae4727ec4b9a 100644
--- a/accessible/base/NotificationController.h
+++ b/accessible/base/NotificationController.h
@@ -244,6 +244,8 @@ class NotificationController final : public EventQueue,
@@ -106,7 +106,7 @@ index 213a99ed433d5219c2b9a64baad82d14cdbcd432..ee4f6484cdfe80899c28a1d9607494e5
browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/allegro-pl.ico
browser/defaults/settings/main/search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index 90c2e7a69076df56392f6d14aacadada7f413e89..9ed24d7d690eca04ef07e9715444227ecf32a008 100644
+index beae3018bb533529555496433b90403827ba07fc..3f3c750f4cef768b5429492c0077616505262cb9 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -196,6 +196,9 @@
@@ -167,10 +167,10 @@ index d49c6fbf1bf83b832795fa674f6b41f223eef812..7ea3540947ff5f61b15f27fbf4b95564
const transportProvider = {
setListener(upgradeListener) {
diff --git a/docshell/base/BrowsingContext.cpp b/docshell/base/BrowsingContext.cpp
-index b30dab9ecdee37d7db842acaad30ded30fc326b2..534a89916e34f3d4d960dfcf660c38e2d1000e0c 100644
+index 28e9d14bd7979798025f9fc30d9a45527488c34c..d6abf1c3e7e2b2cdfd51351ced4aa6fb0d51327b 100644
--- a/docshell/base/BrowsingContext.cpp
+++ b/docshell/base/BrowsingContext.cpp
-@@ -106,8 +106,11 @@ struct ParamTraits<mozilla::dom::DisplayMode>
+@@ -106,8 +106,15 @@ struct ParamTraits<mozilla::dom::DisplayMode>
template <>
struct ParamTraits<mozilla::dom::PrefersColorSchemeOverride>
@@ -181,13 +181,26 @@ index b30dab9ecdee37d7db842acaad30ded30fc326b2..534a89916e34f3d4d960dfcf660c38e2
+template <>
+struct ParamTraits<mozilla::dom::PrefersReducedMotionOverride>
+ : public mozilla::dom::WebIDLEnumSerializer<mozilla::dom::PrefersReducedMotionOverride> {};
++
++template <>
++struct ParamTraits<mozilla::dom::PrefersContrastOverride>
++ : public mozilla::dom::WebIDLEnumSerializer<mozilla::dom::PrefersContrastOverride> {};
template <>
struct ParamTraits<mozilla::dom::ForcedColorsOverride>
-@@ -2887,6 +2890,23 @@ void BrowsingContext::DidSet(FieldIndex<IDX_ForcedColorsOverride>,
+@@ -2887,6 +2894,32 @@ void BrowsingContext::DidSet(FieldIndex<IDX_ForcedColorsOverride>,
PresContextAffectingFieldChanged();
}
++void BrowsingContext::DidSet(FieldIndex<IDX_PrefersContrastOverride>,
++ dom::PrefersContrastOverride aOldValue) {
++ MOZ_ASSERT(IsTop());
++ if (PrefersContrastOverride() == aOldValue) {
++ return;
++ }
++ PresContextAffectingFieldChanged();
++}
++
+void BrowsingContext::DidSet(FieldIndex<IDX_PrefersReducedMotionOverride>,
+ dom::PrefersReducedMotionOverride aOldValue) {
+ MOZ_ASSERT(IsTop());
@@ -209,7 +222,7 @@ index b30dab9ecdee37d7db842acaad30ded30fc326b2..534a89916e34f3d4d960dfcf660c38e2
nsString&& aOldValue) {
MOZ_ASSERT(IsTop());
diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h
-index e0310bbed02a805a247e04bdc88ae142bcbe5637..19fe77791b055f7f907a0ab00b03e100a0aac1e8 100644
+index 13815ddf7e13825970cafda19ca24412a5150b53..71c7ae2fce1d92614a60b2aba85bbd70629f682f 100644
--- a/docshell/base/BrowsingContext.h
+++ b/docshell/base/BrowsingContext.h
@@ -203,10 +203,10 @@ struct EmbedderColorSchemes {
@@ -225,27 +238,51 @@ index e0310bbed02a805a247e04bdc88ae142bcbe5637..19fe77791b055f7f907a0ab00b03e100
FIELD(EmbedderElementType, Maybe<nsString>) \
FIELD(MessageManagerGroup, nsString) \
FIELD(MaxTouchPointsOverride, uint8_t) \
-@@ -246,6 +246,8 @@ struct EmbedderColorSchemes {
+@@ -246,6 +246,9 @@ struct EmbedderColorSchemes {
* <browser> embedder element. */ \
FIELD(EmbedderColorSchemes, EmbedderColorSchemes) \
FIELD(DisplayMode, dom::DisplayMode) \
+ /* playwright addition */ \
+ FIELD(PrefersReducedMotionOverride, dom::PrefersReducedMotionOverride) \
++ FIELD(PrefersContrastOverride, dom::PrefersContrastOverride) \
/* The number of entries added to the session history because of this \
* browsing context. */ \
FIELD(HistoryEntryCount, uint32_t) \
-@@ -947,6 +949,10 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -948,6 +951,14 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
return GetForcedColorsOverride();
}
+ dom::PrefersReducedMotionOverride PrefersReducedMotionOverride() const {
+ return GetPrefersReducedMotionOverride();
+ }
++
++ dom::PrefersContrastOverride PrefersContrastOverride() const {
++ return GetPrefersContrastOverride();
++ }
+
bool IsInBFCache() const;
bool AllowJavascript() const { return GetAllowJavascript(); }
-@@ -1128,6 +1134,15 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -1107,6 +1118,11 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+ return IsTop();
+ }
+
++ bool CanSet(FieldIndex<IDX_PrefersContrastOverride>,
++ dom::PrefersContrastOverride, ContentParent*) {
++ return IsTop();
++ }
++
+ bool CanSet(FieldIndex<IDX_ForcedColorsOverride>, dom::ForcedColorsOverride,
+ ContentParent*) {
+ return IsTop();
+@@ -1125,10 +1141,22 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+ void DidSet(FieldIndex<IDX_ForcedColorsOverride>,
+ dom::ForcedColorsOverride aOldValue);
+
++ void DidSet(FieldIndex<IDX_PrefersContrastOverride>,
++ dom::PrefersContrastOverride aOldValue);
++
+ template <typename Callback>
void WalkPresContexts(Callback&&);
void PresContextAffectingFieldChanged();
@@ -262,7 +299,7 @@ index e0310bbed02a805a247e04bdc88ae142bcbe5637..19fe77791b055f7f907a0ab00b03e100
bool CanSet(FieldIndex<IDX_SuspendMediaWhenInactive>, bool, ContentParent*) {
diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
-index e73d56380ff6802103896bd63d2e11c26c8ee3f5..2ce283bcc4e6690a26a6483b6b50b24093797e45 100644
+index 671a12de84d3b01c4331dbbb2fac050ce061cda1..afcd95e77185e6d606503b7c01d6ab48cc236cc8 100644
--- a/docshell/base/CanonicalBrowsingContext.cpp
+++ b/docshell/base/CanonicalBrowsingContext.cpp
@@ -323,6 +323,8 @@ void CanonicalBrowsingContext::ReplacedBy(
@@ -274,7 +311,7 @@ index e73d56380ff6802103896bd63d2e11c26c8ee3f5..2ce283bcc4e6690a26a6483b6b50b240
// Propagate some settings on BrowsingContext replacement so they're not lost
// on bfcached navigations. These are important for GeckoView (see bug
-@@ -1608,6 +1610,12 @@ void CanonicalBrowsingContext::LoadURI(nsIURI* aURI,
+@@ -1600,6 +1602,12 @@ void CanonicalBrowsingContext::LoadURI(nsIURI* aURI,
return;
}
@@ -288,7 +325,7 @@ index e73d56380ff6802103896bd63d2e11c26c8ee3f5..2ce283bcc4e6690a26a6483b6b50b240
}
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
-index 4851148d889bdfc12a4b9a463c05d3fb9f1f593f..9f4e3fd0cdfc66b49b1650a05f4b296603846d84 100644
+index f3069febc1bd9f3ff6acbe162b5475963e004e6c..65ab560c9f13c837c9ed6af15704738700b0e14f 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -15,6 +15,12 @@
@@ -336,7 +373,7 @@ index 4851148d889bdfc12a4b9a463c05d3fb9f1f593f..9f4e3fd0cdfc66b49b1650a05f4b2966
#include "nsNetCID.h"
#include "nsNetUtil.h"
#include "nsObjectLoadingContent.h"
-@@ -347,6 +357,13 @@ nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext,
+@@ -347,6 +357,14 @@ nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext,
mAllowDNSPrefetch(true),
mAllowWindowControl(true),
mCSSErrorReportingEnabled(false),
@@ -347,10 +384,11 @@ index 4851148d889bdfc12a4b9a463c05d3fb9f1f593f..9f4e3fd0cdfc66b49b1650a05f4b2966
+ mDisallowBFCache(false),
+ mReducedMotionOverride(REDUCED_MOTION_OVERRIDE_NONE),
+ mForcedColorsOverride(FORCED_COLORS_OVERRIDE_NO_OVERRIDE),
++ mContrastOverride(CONTRAST_OVERRIDE_NONE),
mAllowAuth(mItemType == typeContent),
mAllowKeywordFixup(false),
mDisableMetaRefreshWhenInactive(false),
-@@ -3019,6 +3036,214 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) {
+@@ -3019,6 +3037,232 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) {
return NS_OK;
}
@@ -560,12 +598,30 @@ index 4851148d889bdfc12a4b9a463c05d3fb9f1f593f..9f4e3fd0cdfc66b49b1650a05f4b2966
+ return NS_OK;
+}
+
++NS_IMETHODIMP
++nsDocShell::GetContrastOverride(ContrastOverride* aContrastOverride) {
++ *aContrastOverride = GetRootDocShell()->mContrastOverride;
++ return NS_OK;
++}
++
++NS_IMETHODIMP
++nsDocShell::SetContrastOverride(ContrastOverride aContrastOverride) {
++ mContrastOverride = aContrastOverride;
++ RefPtr<nsPresContext> presContext = GetPresContext();
++ if (presContext) {
++ presContext->MediaFeatureValuesChanged(
++ {MediaFeatureChangeReason::SystemMetricsChange},
++ MediaFeatureChangePropagation::JustThisDocument);
++ }
++ return NS_OK;
++}
++
+// =============== Juggler End =======================
+
NS_IMETHODIMP
nsDocShell::GetIsNavigating(bool* aOut) {
*aOut = mIsNavigating;
-@@ -4695,7 +4920,7 @@ nsDocShell::GetVisibility(bool* aVisibility) {
+@@ -4715,7 +4959,7 @@ nsDocShell::GetVisibility(bool* aVisibility) {
}
void nsDocShell::ActivenessMaybeChanged() {
@@ -574,7 +630,7 @@ index 4851148d889bdfc12a4b9a463c05d3fb9f1f593f..9f4e3fd0cdfc66b49b1650a05f4b2966
if (RefPtr<PresShell> presShell = GetPresShell()) {
presShell->ActivenessMaybeChanged();
}
-@@ -6619,6 +6844,10 @@ bool nsDocShell::CanSavePresentation(uint32_t aLoadType,
+@@ -6639,6 +6883,10 @@ bool nsDocShell::CanSavePresentation(uint32_t aLoadType,
return false; // no entry to save into
}
@@ -585,7 +641,7 @@ index 4851148d889bdfc12a4b9a463c05d3fb9f1f593f..9f4e3fd0cdfc66b49b1650a05f4b2966
MOZ_ASSERT(!mozilla::SessionHistoryInParent(),
"mOSHE cannot be non-null with SHIP");
nsCOMPtr<nsIDocumentViewer> viewer = mOSHE->GetDocumentViewer();
-@@ -8352,6 +8581,12 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) {
+@@ -8377,6 +8625,12 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) {
true, // aForceNoOpener
getter_AddRefs(newBC));
MOZ_ASSERT(!newBC);
@@ -598,7 +654,7 @@ index 4851148d889bdfc12a4b9a463c05d3fb9f1f593f..9f4e3fd0cdfc66b49b1650a05f4b2966
return rv;
}
-@@ -9506,6 +9741,16 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
+@@ -9531,6 +9785,16 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
nsINetworkPredictor::PREDICT_LOAD, attrs, nullptr);
nsCOMPtr<nsIRequest> req;
@@ -615,7 +671,7 @@ index 4851148d889bdfc12a4b9a463c05d3fb9f1f593f..9f4e3fd0cdfc66b49b1650a05f4b2966
rv = DoURILoad(aLoadState, aCacheKey, getter_AddRefs(req));
if (NS_SUCCEEDED(rv)) {
-@@ -12708,6 +12953,9 @@ class OnLinkClickEvent : public Runnable {
+@@ -12733,6 +12997,9 @@ class OnLinkClickEvent : public Runnable {
mHandler->OnLinkClickSync(mContent, mLoadState, mNoOpenerImplied,
mTriggeringPrincipal);
}
@@ -625,7 +681,7 @@ index 4851148d889bdfc12a4b9a463c05d3fb9f1f593f..9f4e3fd0cdfc66b49b1650a05f4b2966
return NS_OK;
}
-@@ -12794,6 +13042,8 @@ nsresult nsDocShell::OnLinkClick(
+@@ -12819,6 +13086,8 @@ nsresult nsDocShell::OnLinkClick(
nsCOMPtr<nsIRunnable> ev = new OnLinkClickEvent(
this, aContent, loadState, noOpenerImplied, aTriggeringPrincipal);
@@ -635,7 +691,7 @@ index 4851148d889bdfc12a4b9a463c05d3fb9f1f593f..9f4e3fd0cdfc66b49b1650a05f4b2966
}
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
-index 888741f8490d6f0e885ed0ce73115c16e7bbe821..0958824d57a082fecae6dde1eb568f457c42f443 100644
+index 888741f8490d6f0e885ed0ce73115c16e7bbe821..9cb32a1ec61bc4cb67f5fc5bb1fa723055bb1eaa 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -15,6 +15,7 @@
@@ -679,7 +735,7 @@ index 888741f8490d6f0e885ed0ce73115c16e7bbe821..0958824d57a082fecae6dde1eb568f45
// 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
-@@ -1282,6 +1295,16 @@ class nsDocShell final : public nsDocLoader,
+@@ -1282,6 +1295,17 @@ class nsDocShell final : public nsDocLoader,
bool mAllowDNSPrefetch : 1;
bool mAllowWindowControl : 1;
bool mCSSErrorReportingEnabled : 1;
@@ -692,12 +748,13 @@ index 888741f8490d6f0e885ed0ce73115c16e7bbe821..0958824d57a082fecae6dde1eb568f45
+ RefPtr<nsGeolocationService> mGeolocationServiceOverride;
+ ReducedMotionOverride mReducedMotionOverride;
+ ForcedColorsOverride mForcedColorsOverride;
++ ContrastOverride mContrastOverride;
+
bool mAllowAuth : 1;
bool mAllowKeywordFixup : 1;
bool mDisableMetaRefreshWhenInactive : 1;
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
-index 84e821e33e8164829dfee4f05340784e189b90ee..397742551b98d0d9e6fcf94f55efda5ea628b9ac 100644
+index 84e821e33e8164829dfee4f05340784e189b90ee..aa690eb747cb73bc6bff40a62546037c2e64c485 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -44,6 +44,7 @@ interface nsIURI;
@@ -708,7 +765,7 @@ index 84e821e33e8164829dfee4f05340784e189b90ee..397742551b98d0d9e6fcf94f55efda5e
interface nsIEditor;
interface nsIEditingSession;
interface nsIInputStream;
-@@ -719,6 +720,36 @@ interface nsIDocShell : nsIDocShellTreeItem
+@@ -719,6 +720,45 @@ interface nsIDocShell : nsIDocShellTreeItem
*/
void synchronizeLayoutHistoryState();
@@ -740,16 +797,25 @@ index 84e821e33e8164829dfee4f05340784e189b90ee..397742551b98d0d9e6fcf94f55efda5e
+ };
+ [infallible] attribute nsIDocShell_ForcedColorsOverride forcedColorsOverride;
+
++ cenum ContrastOverride : 8 {
++ CONTRAST_OVERRIDE_LESS,
++ CONTRAST_OVERRIDE_MORE,
++ CONTRAST_OVERRIDE_CUSTOM,
++ CONTRAST_OVERRIDE_NO_PREFERENCE,
++ CONTRAST_OVERRIDE_NONE, /* This clears the override. */
++ };
++ [infallible] attribute nsIDocShell_ContrastOverride contrastOverride;
++
+ void setGeolocationOverride(in nsIDOMGeoPosition position);
+
/**
* 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 8680bd4e64abc48233b5babb3b4123fea0e76f3b..44ea1267771cd925df74c716cc26d7ab51b2b985 100644
+index 46de7024c0e148c5bc9b90553f0ab7c961acdaae..4ce29d24b940940ba7eefab60ac2be55bb888f78 100644
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
-@@ -3741,6 +3741,9 @@ void Document::SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages) {
+@@ -3765,6 +3765,9 @@ void Document::SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages) {
}
void Document::ApplySettingsFromCSP(bool aSpeculative) {
@@ -759,7 +825,7 @@ index 8680bd4e64abc48233b5babb3b4123fea0e76f3b..44ea1267771cd925df74c716cc26d7ab
nsresult rv = NS_OK;
if (!aSpeculative) {
// 1) apply settings from regular CSP
-@@ -3798,6 +3801,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) {
+@@ -3822,6 +3825,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) {
MOZ_ASSERT(!mScriptGlobalObject,
"CSP must be initialized before mScriptGlobalObject is set!");
@@ -771,7 +837,7 @@ index 8680bd4e64abc48233b5babb3b4123fea0e76f3b..44ea1267771cd925df74c716cc26d7ab
// If this is a data document - no need to set CSP.
if (mLoadedAsData) {
return NS_OK;
-@@ -4605,6 +4613,10 @@ bool Document::HasFocus(ErrorResult& rv) const {
+@@ -4629,6 +4637,10 @@ bool Document::HasFocus(ErrorResult& rv) const {
return false;
}
@@ -782,7 +848,7 @@ index 8680bd4e64abc48233b5babb3b4123fea0e76f3b..44ea1267771cd925df74c716cc26d7ab
if (!fm->IsInActiveWindow(bc)) {
return false;
}
-@@ -19488,6 +19500,35 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
+@@ -19580,6 +19592,35 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
return PreferenceSheet::PrefsFor(*this).mColorScheme;
}
@@ -819,10 +885,10 @@ index 8680bd4e64abc48233b5babb3b4123fea0e76f3b..44ea1267771cd925df74c716cc26d7ab
if (!sLoadingForegroundTopLevelContentDocument) {
return false;
diff --git a/dom/base/Document.h b/dom/base/Document.h
-index ee5800c51cacc7ac3517c03274ed4e0a35e57f9f..91a8ea64eb40dc0e642e8ab515b78c93e11d7d5a 100644
+index 7eb244d65eb55322fb16ed185be83cb731fc268c..3cfb3c17c1a769e4d0fc3fa76288c570822dc48f 100644
--- a/dom/base/Document.h
+++ b/dom/base/Document.h
-@@ -4123,6 +4123,8 @@ class Document : public nsINode,
+@@ -4134,6 +4134,8 @@ class Document : public nsINode,
// color-scheme meta tag.
ColorScheme DefaultColorScheme() const;
@@ -895,10 +961,10 @@ index 6abf6cef230c97815f17f6b7abf9f1b1de274a6f..46ead1f32e0d710b5b32e61dff72a4f7
dom::MediaCapabilities* MediaCapabilities();
dom::MediaSession* MediaSession();
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
-index 13ba7fa81c67f41e419a13c74f9c382193e0eb27..f438d58b594e1434d090eecc89accc66b9f62fcd 100644
+index 3793f9845d12dc6d88604c43baca744fe559ed21..6f2ec74a8613b72be0ed27cb566bfdbc388a692b 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
-@@ -8773,7 +8773,8 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -8740,7 +8740,8 @@ nsresult nsContentUtils::SendMouseEvent(
bool aIgnoreRootScrollFrame, float aPressure,
unsigned short aInputSourceArg, uint32_t aIdentifier, bool aToWindow,
PreventDefaultResult* aPreventDefault, bool aIsDOMEventSynthesized,
@@ -908,7 +974,7 @@ index 13ba7fa81c67f41e419a13c74f9c382193e0eb27..f438d58b594e1434d090eecc89accc66
nsPoint offset;
nsCOMPtr<nsIWidget> widget = GetWidget(aPresShell, &offset);
if (!widget) return NS_ERROR_FAILURE;
-@@ -8781,6 +8782,7 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -8748,6 +8749,7 @@ nsresult nsContentUtils::SendMouseEvent(
EventMessage msg;
Maybe<WidgetMouseEvent::ExitFrom> exitFrom;
bool contextMenuKey = false;
@@ -916,7 +982,7 @@ index 13ba7fa81c67f41e419a13c74f9c382193e0eb27..f438d58b594e1434d090eecc89accc66
if (aType.EqualsLiteral("mousedown")) {
msg = eMouseDown;
} else if (aType.EqualsLiteral("mouseup")) {
-@@ -8806,6 +8808,12 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -8773,6 +8775,12 @@ nsresult nsContentUtils::SendMouseEvent(
msg = eMouseHitTest;
} else if (aType.EqualsLiteral("MozMouseExploreByTouch")) {
msg = eMouseExploreByTouch;
@@ -929,7 +995,7 @@ index 13ba7fa81c67f41e419a13c74f9c382193e0eb27..f438d58b594e1434d090eecc89accc66
} else {
return NS_ERROR_FAILURE;
}
-@@ -8816,7 +8824,14 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -8783,7 +8791,14 @@ nsresult nsContentUtils::SendMouseEvent(
Maybe<WidgetPointerEvent> pointerEvent;
Maybe<WidgetMouseEvent> mouseEvent;
@@ -945,7 +1011,7 @@ index 13ba7fa81c67f41e419a13c74f9c382193e0eb27..f438d58b594e1434d090eecc89accc66
MOZ_ASSERT(!aIsWidgetEventSynthesized,
"The event shouldn't be dispatched as a synthesized event");
if (MOZ_UNLIKELY(aIsWidgetEventSynthesized)) {
-@@ -8835,8 +8850,11 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -8802,8 +8817,11 @@ nsresult nsContentUtils::SendMouseEvent(
contextMenuKey ? WidgetMouseEvent::eContextMenuKey
: WidgetMouseEvent::eNormal);
}
@@ -957,7 +1023,7 @@ index 13ba7fa81c67f41e419a13c74f9c382193e0eb27..f438d58b594e1434d090eecc89accc66
mouseOrPointerEvent.pointerId = aIdentifier;
mouseOrPointerEvent.mModifiers = GetWidgetModifiers(aModifiers);
mouseOrPointerEvent.mButton = aButton;
-@@ -8849,6 +8867,8 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -8816,6 +8834,8 @@ nsresult nsContentUtils::SendMouseEvent(
mouseOrPointerEvent.mClickCount = aClickCount;
mouseOrPointerEvent.mFlags.mIsSynthesizedForTests = aIsDOMEventSynthesized;
mouseOrPointerEvent.mExitFrom = exitFrom;
@@ -967,10 +1033,10 @@ index 13ba7fa81c67f41e419a13c74f9c382193e0eb27..f438d58b594e1434d090eecc89accc66
nsPresContext* presContext = aPresShell->GetPresContext();
if (!presContext) return NS_ERROR_FAILURE;
diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
-index a1efe3efc7f48f9ff8e2b1a1a50e5dd7bf81f263..caf55fa9dae74ce4ce9ad0369c8cfc8eea061778 100644
+index ed822f10425272124dd33a74d1cdac5011b1ba6a..0f29ce787f9cebc068d2e5faa9907d52b177283a 100644
--- a/dom/base/nsContentUtils.h
+++ b/dom/base/nsContentUtils.h
-@@ -3033,7 +3033,8 @@ class nsContentUtils {
+@@ -3019,7 +3019,8 @@ class nsContentUtils {
int32_t aModifiers, bool aIgnoreRootScrollFrame, float aPressure,
unsigned short aInputSourceArg, uint32_t aIdentifier, bool aToWindow,
mozilla::PreventDefaultResult* aPreventDefault,
@@ -981,10 +1047,10 @@ index a1efe3efc7f48f9ff8e2b1a1a50e5dd7bf81f263..caf55fa9dae74ce4ce9ad0369c8cfc8e
static void FirePageShowEventForFrameLoaderSwap(
nsIDocShellTreeItem* aItem,
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
-index aae46b9bd2e7756fc025c0597db221c579cac679..5e8ae13a9d1747312cd7df9d80cbb1677530465c 100644
+index fe23028691d0d06f6b036fd9da2c466730f58cb7..40cfc256510cbddea50574b531ce4369462fd956 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
-@@ -686,6 +686,26 @@ nsDOMWindowUtils::GetPresShellId(uint32_t* aPresShellId) {
+@@ -710,6 +710,26 @@ nsDOMWindowUtils::GetPresShellId(uint32_t* aPresShellId) {
return NS_ERROR_FAILURE;
}
@@ -1011,7 +1077,7 @@ index aae46b9bd2e7756fc025c0597db221c579cac679..5e8ae13a9d1747312cd7df9d80cbb167
NS_IMETHODIMP
nsDOMWindowUtils::SendMouseEvent(
const nsAString& aType, float aX, float aY, int32_t aButton,
-@@ -700,7 +720,7 @@ nsDOMWindowUtils::SendMouseEvent(
+@@ -724,7 +744,7 @@ nsDOMWindowUtils::SendMouseEvent(
aOptionalArgCount >= 7 ? aIdentifier : DEFAULT_MOUSE_POINTER_ID, false,
aPreventDefault, aOptionalArgCount >= 4 ? aIsDOMEventSynthesized : true,
aOptionalArgCount >= 5 ? aIsWidgetEventSynthesized : false,
@@ -1020,7 +1086,7 @@ index aae46b9bd2e7756fc025c0597db221c579cac679..5e8ae13a9d1747312cd7df9d80cbb167
}
NS_IMETHODIMP
-@@ -718,7 +738,7 @@ nsDOMWindowUtils::SendMouseEventToWindow(
+@@ -742,7 +762,7 @@ nsDOMWindowUtils::SendMouseEventToWindow(
aOptionalArgCount >= 7 ? aIdentifier : DEFAULT_MOUSE_POINTER_ID, true,
nullptr, aOptionalArgCount >= 4 ? aIsDOMEventSynthesized : true,
aOptionalArgCount >= 5 ? aIsWidgetEventSynthesized : false,
@@ -1029,7 +1095,7 @@ index aae46b9bd2e7756fc025c0597db221c579cac679..5e8ae13a9d1747312cd7df9d80cbb167
}
NS_IMETHODIMP
-@@ -727,13 +747,13 @@ nsDOMWindowUtils::SendMouseEventCommon(
+@@ -751,13 +771,13 @@ nsDOMWindowUtils::SendMouseEventCommon(
int32_t aClickCount, int32_t aModifiers, bool aIgnoreRootScrollFrame,
float aPressure, unsigned short aInputSourceArg, uint32_t aPointerId,
bool aToWindow, bool* aPreventDefault, bool aIsDOMEventSynthesized,
@@ -1059,10 +1125,10 @@ index 47ff326b202266b1d7d6af8bdfb72776df8a6a93..b8e084b0c788c46345b1455b8257f171
MOZ_CAN_RUN_SCRIPT
nsresult SendTouchEventCommon(
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
-index 54cf5e2647a8fa097481e972e0ab67928b2abc8b..37ff283278cebc0e058b0345a157036283847de8 100644
+index a1d3ae3f3cb8d916a9a8bcca4cb515a2ab496ccb..72326b41064f6a86d76aba7b1902851e966365a8 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
-@@ -1712,6 +1712,10 @@ Maybe<uint64_t> nsFocusManager::SetFocusInner(Element* aNewContent,
+@@ -1719,6 +1719,10 @@ Maybe<uint64_t> nsFocusManager::SetFocusInner(Element* aNewContent,
(GetActiveBrowsingContext() == newRootBrowsingContext);
}
@@ -1073,7 +1139,7 @@ index 54cf5e2647a8fa097481e972e0ab67928b2abc8b..37ff283278cebc0e058b0345a1570362
// Exit fullscreen if a website focuses another window
if (StaticPrefs::full_screen_api_exit_on_windowRaise() &&
!isElementInActiveWindow && (aFlags & FLAG_RAISE)) {
-@@ -2297,6 +2301,7 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
+@@ -2304,6 +2308,7 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
bool aIsLeavingDocument, bool aAdjustWidget,
bool aRemainActive, Element* aElementToFocus,
uint64_t aActionId) {
@@ -1081,7 +1147,7 @@ index 54cf5e2647a8fa097481e972e0ab67928b2abc8b..37ff283278cebc0e058b0345a1570362
LOGFOCUS(("<<Blur begin actionid: %" PRIu64 ">>", aActionId));
// hold a reference to the focused content, which may be null
-@@ -2343,6 +2348,11 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
+@@ -2350,6 +2355,11 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
return true;
}
@@ -1093,7 +1159,7 @@ index 54cf5e2647a8fa097481e972e0ab67928b2abc8b..37ff283278cebc0e058b0345a1570362
// Keep a ref to presShell since dispatching the DOM event may cause
// the document to be destroyed.
RefPtr<PresShell> presShell = docShell->GetPresShell();
-@@ -3020,7 +3030,9 @@ void nsFocusManager::RaiseWindow(nsPIDOMWindowOuter* aWindow,
+@@ -3064,7 +3074,9 @@ void nsFocusManager::RaiseWindow(nsPIDOMWindowOuter* aWindow,
}
}
@@ -1105,7 +1171,7 @@ index 54cf5e2647a8fa097481e972e0ab67928b2abc8b..37ff283278cebc0e058b0345a1570362
// 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 d8ba9e36c98197a7dd7e1b0781f2477c451fc5fd..f3b5b0417ed9433678c7379d304de263c7bc1f80 100644
+index 4d0483fb6cc4b7ed6cc9633c72413017e7b49249..9eb60397c94f567cc76fcbeec4585bf92b2fd0f7 100644
--- a/dom/base/nsGlobalWindowOuter.cpp
+++ b/dom/base/nsGlobalWindowOuter.cpp
@@ -2516,10 +2516,16 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument,
@@ -1162,10 +1228,10 @@ index d4347e7a508742986f634e97394a9e3dd435d170..5088520537c8c5c6cc79c1dffd91a68d
// Outer windows only.
virtual void EnsureSizeAndPositionUpToDate() override;
diff --git a/dom/base/nsINode.cpp b/dom/base/nsINode.cpp
-index 855ba87b5b6db67d7dd207cb54001190c494c61a..f96eb49056dafcbd0ca244dac6d1d4a38e7819ce 100644
+index 4c1efbb1edf0e7d34a333e2724baf055eefa7e6e..c5d64fba742187c8ebaad8f45e868ab65722d07a 100644
--- a/dom/base/nsINode.cpp
+++ b/dom/base/nsINode.cpp
-@@ -1438,6 +1438,61 @@ void nsINode::GetBoxQuadsFromWindowOrigin(const BoxQuadOptions& aOptions,
+@@ -1437,6 +1437,61 @@ void nsINode::GetBoxQuadsFromWindowOrigin(const BoxQuadOptions& aOptions,
mozilla::GetBoxQuadsFromWindowOrigin(this, aOptions, aResult, aRv);
}
@@ -1271,10 +1337,10 @@ index f32e21752d5013bf143eb45391ab9218debab08e..83763d2354dade2f8d2b7930ba18ae91
static bool DumpEnabled();
diff --git a/dom/chrome-webidl/BrowsingContext.webidl b/dom/chrome-webidl/BrowsingContext.webidl
-index 28e8d8cb9c61ff8362b2d191d47c3630d2cb0b34..0058e60aaab21f8003bbe1bf3f271c63ed78f29a 100644
+index 28e8d8cb9c61ff8362b2d191d47c3630d2cb0b34..58c12d597978100507dbc21e88c49c5642a3ba1f 100644
--- a/dom/chrome-webidl/BrowsingContext.webidl
+++ b/dom/chrome-webidl/BrowsingContext.webidl
-@@ -61,6 +61,15 @@ enum ForcedColorsOverride {
+@@ -61,6 +61,26 @@ enum ForcedColorsOverride {
"active",
};
@@ -1286,22 +1352,72 @@ index 28e8d8cb9c61ff8362b2d191d47c3630d2cb0b34..0058e60aaab21f8003bbe1bf3f271c63
+ "reduce",
+ "no-preference",
+};
++
++/**
++ * CSS prefers-contrast values.
++ */
++enum PrefersContrastOverride {
++ "none",
++ "no-preference",
++ "more",
++ "less",
++ "custom",
++};
+
/**
* Allowed overrides of platform/pref default behaviour for touch events.
*/
-@@ -220,6 +229,9 @@ interface BrowsingContext {
+@@ -220,6 +240,12 @@ interface BrowsingContext {
// Forced-colors simulation, for DevTools
[SetterThrows] attribute ForcedColorsOverride forcedColorsOverride;
+ // Reduced-Motion simulation, for DevTools.
+ [SetterThrows] attribute PrefersReducedMotionOverride prefersReducedMotionOverride;
++
++ // Contrast simulation, for DevTools.
++ [SetterThrows] attribute PrefersContrastOverride prefersContrastOverride;
+
/**
* A unique identifier for the browser element that is hosting this
* BrowsingContext tree. Every BrowsingContext in the element's tree will
+diff --git a/dom/fetch/Fetch.cpp b/dom/fetch/Fetch.cpp
+index a030f3f07b9f4a676f87ac482507056bc911edf5..68bd39affdbbe2e35fdac62b1e159ebc7ffd031c 100644
+--- a/dom/fetch/Fetch.cpp
++++ b/dom/fetch/Fetch.cpp
+@@ -689,6 +689,12 @@ already_AddRefed<Promise> FetchRequest(nsIGlobalObject* aGlobal,
+ ipcArgs.hasCSPEventListener() = false;
+ ipcArgs.isWorkerRequest() = false;
+
++ /* --> Playwright: associate keep-alive fetch with the window */
++ BrowsingContext* bc = window ? window->GetBrowsingContext() : nullptr;
++ if (bc)
++ ipcArgs.associatedBrowsingContextID() = bc->Id();
++ /* <-- Playwright */
++
+ actor->DoFetchOp(ipcArgs);
+
+ mozilla::glean::networking::fetch_keepalive_request_count.Get("main"_ns)
+diff --git a/dom/fetch/FetchService.cpp b/dom/fetch/FetchService.cpp
+index 6fc05bf6cc8341e7cfac63789b79f610bdbe9641..112db3c2e6d2f854103ddacde896904018f5ea90 100644
+--- a/dom/fetch/FetchService.cpp
++++ b/dom/fetch/FetchService.cpp
+@@ -265,6 +265,14 @@ RefPtr<FetchServicePromises> FetchService::FetchInstance::Fetch() {
+ false // IsTrackingFetch
+ );
+
++ /* --> Playwright: associate keep-alive fetch with the window */
++ if (mArgsType == FetchArgsType::MainThreadFetch) {
++ auto& args = mArgs.as<MainThreadFetchArgs>();
++ mFetchDriver->SetAssociatedBrowsingContextID(
++ args.mAssociatedBrowsingContextID);
++ }
++ /* <-- Playwright */
++
+ 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 6a624e4c0f5fb8ffff06419a29f6e6acc6108773..370625634f7846d0545ec7ee964d7fa1a15b3ac0 100644
+index e67cb4efce43b42fa876c906f7f1927c65d34ea7..a42da20dc6aaa1915c611d4bc339a8db974c75eb 100644
--- a/dom/geolocation/Geolocation.cpp
+++ b/dom/geolocation/Geolocation.cpp
@@ -29,6 +29,7 @@
@@ -1400,10 +1516,10 @@ index 992de29b5d2d09c19e55ebb2502215ec9d05a171..cdc20567b693283b0fd5a5923f7ea542
~Geolocation();
diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp
-index 4b6686880b9fca9bb7c08e850918a4c0f15dac88..825a006b05947ede8ffdfefa4cd12dd5663fb98f 100644
+index 2e6ef116be73d0794683189c07afc8a629859154..33f4add0cb7736edd416d31d0feca4fd5afc4526 100644
--- a/dom/html/HTMLInputElement.cpp
+++ b/dom/html/HTMLInputElement.cpp
-@@ -62,6 +62,7 @@
+@@ -64,6 +64,7 @@
#include "mozilla/dom/Document.h"
#include "mozilla/dom/HTMLDataListElement.h"
#include "mozilla/dom/HTMLOptionElement.h"
@@ -1426,7 +1542,7 @@ index 4b6686880b9fca9bb7c08e850918a4c0f15dac88..825a006b05947ede8ffdfefa4cd12dd5
return NS_OK;
}
diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl
-index b4d065ff3197404f92e099afea9a0dcb4ff79bf1..59448d3c4f1054a8a1c8cb415f36fdeb2983040d 100644
+index 8ddde6e5de319142ce0898dc3667c08f1f24cce9..9e530a727f06b924e3d0bcf4ba52507231778257 100644
--- a/dom/interfaces/base/nsIDOMWindowUtils.idl
+++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
@@ -374,6 +374,26 @@ interface nsIDOMWindowUtils : nsISupports {
@@ -1457,10 +1573,10 @@ index b4d065ff3197404f92e099afea9a0dcb4ff79bf1..59448d3c4f1054a8a1c8cb415f36fdeb
* touchstart, touchend, touchmove, and touchcancel
*
diff --git a/dom/ipc/BrowserChild.cpp b/dom/ipc/BrowserChild.cpp
-index 067e8551685497a8d7681296bbb7d7eae1d7587b..5667fbbfff99b77992eac181304093d8afbff367 100644
+index 93f20a36acef74947d5377df5ff916546218d8b8..22b706b985d22a8c0c278a12ab4944e26ded51a4 100644
--- a/dom/ipc/BrowserChild.cpp
+++ b/dom/ipc/BrowserChild.cpp
-@@ -1674,6 +1674,21 @@ void BrowserChild::HandleRealMouseButtonEvent(const WidgetMouseEvent& aEvent,
+@@ -1676,6 +1676,21 @@ void BrowserChild::HandleRealMouseButtonEvent(const WidgetMouseEvent& aEvent,
if (postLayerization) {
postLayerization->Register();
}
@@ -1730,7 +1846,7 @@ index 3b39538e51840cd9b1685b2efd2ff2e9ec83608a..c7bf4f2d53b58bbacb22b3ebebf6f3fc
return aGlobalOrNull;
diff --git a/dom/security/nsCSPUtils.cpp b/dom/security/nsCSPUtils.cpp
-index 8c4364190dadd1a58bfd99e2c0dae1524a4e2c0c..ffadb3b4665a804320724b5a12e09cb29ef31498 100644
+index 32a8d9496e674e752dd3ac41afc7f22ed534dce3..e57690654be4ae18f14d3171fa4eab9ec8aa991f 100644
--- a/dom/security/nsCSPUtils.cpp
+++ b/dom/security/nsCSPUtils.cpp
@@ -23,6 +23,7 @@
@@ -1777,10 +1893,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 996b5699166711901ff0d11fe64352b6c9c97d1e..5b08ea6145e6052058a55d6a678fd7539f70baa1 100644
+index f528bec20afef533e4c6b99c5e9d1680fd0b636e..a0d22d38657f672d865f35c02975e7b611571353 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
-@@ -1005,7 +1005,7 @@ void PrefLanguagesChanged(const char* /* aPrefName */, void* /* aClosure */) {
+@@ -1027,7 +1027,7 @@ void PrefLanguagesChanged(const char* /* aPrefName */, void* /* aClosure */) {
AssertIsOnMainThread();
nsTArray<nsString> languages;
@@ -1789,7 +1905,7 @@ index 996b5699166711901ff0d11fe64352b6c9c97d1e..5b08ea6145e6052058a55d6a678fd753
RuntimeService* runtime = RuntimeService::GetService();
if (runtime) {
-@@ -1193,8 +1193,7 @@ bool RuntimeService::RegisterWorker(WorkerPrivate& aWorkerPrivate) {
+@@ -1215,8 +1215,7 @@ bool RuntimeService::RegisterWorker(WorkerPrivate& aWorkerPrivate) {
}
// The navigator overridden properties should have already been read.
@@ -1799,7 +1915,7 @@ index 996b5699166711901ff0d11fe64352b6c9c97d1e..5b08ea6145e6052058a55d6a678fd753
mNavigatorPropertiesLoaded = true;
}
-@@ -1815,6 +1814,13 @@ void RuntimeService::PropagateStorageAccessPermissionGranted(
+@@ -1837,6 +1836,13 @@ void RuntimeService::PropagateStorageAccessPermissionGranted(
}
}
@@ -1813,7 +1929,7 @@ index 996b5699166711901ff0d11fe64352b6c9c97d1e..5b08ea6145e6052058a55d6a678fd753
template <typename Func>
void RuntimeService::BroadcastAllWorkers(const Func& aFunc) {
AssertIsOnMainThread();
-@@ -2340,6 +2346,14 @@ void PropagateStorageAccessPermissionGrantedToWorkers(
+@@ -2362,6 +2368,14 @@ void PropagateStorageAccessPermissionGrantedToWorkers(
}
}
@@ -2156,10 +2272,10 @@ index 4bfd336ddcbee8004ac538ca7b7d8216d04a61c3..cd22351c4aeacea8afc9828972222aca
// No boxes to return
return;
diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
-index c533494e49d59904b839ea770475ec726c4c897e..1da4eeb774dadb4e3463cbeb17d857ccb6ef76ea 100644
+index ede24b9c7ac3569d6467ac88bc491d2987ac0bca..a45ebcdf3a3caaad15a8dff0b8ebbec971aac8a6 100644
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
-@@ -11278,7 +11278,9 @@ bool PresShell::ComputeActiveness() const {
+@@ -11265,7 +11265,9 @@ bool PresShell::ComputeActiveness() const {
if (!browserChild->IsVisible()) {
MOZ_LOG(gLog, LogLevel::Debug,
(" > BrowserChild %p is not visible", browserChild));
@@ -2171,7 +2287,7 @@ index c533494e49d59904b839ea770475ec726c4c897e..1da4eeb774dadb4e3463cbeb17d857cc
// 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 1fba8697d48f35e20a69ff861f5da9689c6d6769..77d0de76f346c0563d9b74b667c8400e26a98694 100644
+index b9f06daa19e5aecb976ad198990a315bc39f736d..1600435c406e2e652abdab72a7947add7266c75a 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -708,6 +708,10 @@ bool nsLayoutUtils::AllowZoomingForDocument(
@@ -2185,7 +2301,7 @@ index 1fba8697d48f35e20a69ff861f5da9689c6d6769..77d0de76f346c0563d9b74b667c8400e
// True if we allow zooming for all documents on this platform, or if we are
// in RDM.
BrowsingContext* bc = aDocument->GetBrowsingContext();
-@@ -9709,6 +9713,9 @@ void nsLayoutUtils::ComputeSystemFont(nsFont* aSystemFont,
+@@ -9748,6 +9752,9 @@ void nsLayoutUtils::ComputeSystemFont(nsFont* aSystemFont,
/* static */
bool nsLayoutUtils::ShouldHandleMetaViewport(const Document* aDocument) {
@@ -2196,10 +2312,10 @@ index 1fba8697d48f35e20a69ff861f5da9689c6d6769..77d0de76f346c0563d9b74b667c8400e
return StaticPrefs::dom_meta_viewport_enabled() || (bc && bc->InRDMPane());
}
diff --git a/layout/style/GeckoBindings.h b/layout/style/GeckoBindings.h
-index acb5b24776c8591933d1abcbcc7b254cf2ceb4e4..191ddd1f43bd704294727555c3d5137d69c1460c 100644
+index 3f97c46ee5721c9f5bb9b86e2c0ece552ed00568..52f6c4d600baccc846503373af3476816f4c9fdc 100644
--- a/layout/style/GeckoBindings.h
+++ b/layout/style/GeckoBindings.h
-@@ -593,6 +593,7 @@ float Gecko_MediaFeatures_GetResolution(const mozilla::dom::Document*);
+@@ -595,6 +595,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*);
@@ -2208,7 +2324,7 @@ index acb5b24776c8591933d1abcbcc7b254cf2ceb4e4..191ddd1f43bd704294727555c3d5137d
const mozilla::dom::Document*);
mozilla::StylePrefersColorScheme Gecko_MediaFeatures_PrefersColorScheme(
diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp
-index ca382a3cfba8ce5839890d6e4cb3cf9789287e3b..b1f1b579d7609c6ab93cc0bc52417ea54ab4aeed 100644
+index ca382a3cfba8ce5839890d6e4cb3cf9789287e3b..5800fc23dc77ee5764beddd6fa48a7fd701d2939 100644
--- a/layout/style/nsMediaFeatures.cpp
+++ b/layout/style/nsMediaFeatures.cpp
@@ -264,11 +264,7 @@ bool Gecko_MediaFeatures_MatchesPlatform(StylePlatform aPlatform) {
@@ -2224,6 +2340,27 @@ index ca382a3cfba8ce5839890d6e4cb3cf9789287e3b..b1f1b579d7609c6ab93cc0bc52417ea5
}
bool Gecko_MediaFeatures_PrefersReducedTransparency(const Document* aDocument) {
+@@ -293,6 +289,20 @@ StylePrefersColorScheme Gecko_MediaFeatures_PrefersColorScheme(
+ // as a signal.
+ StylePrefersContrast Gecko_MediaFeatures_PrefersContrast(
+ const Document* aDocument) {
++ if (auto* bc = aDocument->GetBrowsingContext()) {
++ switch (bc->Top()->PrefersContrastOverride()) {
++ case dom::PrefersContrastOverride::No_preference:
++ return StylePrefersContrast::NoPreference;
++ case dom::PrefersContrastOverride::Less:
++ return StylePrefersContrast::Less;
++ case dom::PrefersContrastOverride::More:
++ return StylePrefersContrast::More;
++ case dom::PrefersContrastOverride::Custom:
++ return StylePrefersContrast::Custom;
++ }
++ }
++
++
+ if (aDocument->ShouldResistFingerprinting(RFPTarget::CSSPrefersContrast)) {
+ return StylePrefersContrast::NoPreference;
+ }
diff --git a/netwerk/base/LoadInfo.cpp b/netwerk/base/LoadInfo.cpp
index 06acdc629c2b6ee0e29c50d8edc5a96d343b1ef2..6c263edf54117fd9cbf4a77abc396f1238730880 100644
--- a/netwerk/base/LoadInfo.cpp
@@ -2289,10 +2426,10 @@ index 5984a0a196615cca5544de052874cbb163a8233b..3617816a06651ae65c214ebd5f0affed
} // namespace net
} // namespace mozilla
diff --git a/netwerk/base/nsILoadInfo.idl b/netwerk/base/nsILoadInfo.idl
-index 50dfc8767a99eef5e8748d648995f3cd7cc81a73..32a171eac26376144482bc7d90e8662a0e719f47 100644
+index 2d77b8aa8799ec6bb7f38722e837d070f9057ea6..0261e58afd17c78a1484ec55e45bf34442929200 100644
--- a/netwerk/base/nsILoadInfo.idl
+++ b/netwerk/base/nsILoadInfo.idl
-@@ -1616,4 +1616,6 @@ interface nsILoadInfo : nsISupports
+@@ -1609,4 +1609,6 @@ interface nsILoadInfo : nsISupports
* When true, this load will never be upgraded to HTTPS.
*/
[infallible] attribute boolean skipHTTPSUpgrade;
@@ -2312,10 +2449,10 @@ index 7f91d2df6f8bb4020c75c132dc8f6bf26625fa1e..ba6569f4be8fc54ec96ee44d5de45a09
/**
* Set the status and reason for the forthcoming synthesized response.
diff --git a/netwerk/ipc/DocumentLoadListener.cpp b/netwerk/ipc/DocumentLoadListener.cpp
-index 8b392845d07f50dddf016770836107614b6b9753..b0817d1b660dbb2dd856daf30ec9ec0fcb3d2aeb 100644
+index cdf9ad443ebf49eabc362fd555ae54c09502395c..8bca3d81fef7b59334b2ab0cdccdd80ef19c675d 100644
--- a/netwerk/ipc/DocumentLoadListener.cpp
+++ b/netwerk/ipc/DocumentLoadListener.cpp
-@@ -172,6 +172,7 @@ static auto CreateDocumentLoadInfo(CanonicalBrowsingContext* aBrowsingContext,
+@@ -175,6 +175,7 @@ static auto CreateDocumentLoadInfo(CanonicalBrowsingContext* aBrowsingContext,
loadInfo->SetTextDirectiveUserActivation(
aLoadState->GetTextDirectiveUserActivation());
loadInfo->SetIsMetaRefresh(aLoadState->IsMetaRefresh());
@@ -2324,10 +2461,10 @@ index 8b392845d07f50dddf016770836107614b6b9753..b0817d1b660dbb2dd856daf30ec9ec0f
return loadInfo.forget();
}
diff --git a/netwerk/protocol/http/InterceptedHttpChannel.cpp b/netwerk/protocol/http/InterceptedHttpChannel.cpp
-index b7c129dcc21cb5d5478765f6aa06ed047aee6de0..6f3881c002c5f6d3e48865d253515ffd4d24bcf6 100644
+index 6d8d65c9335583d28aa3be8c05c065fa5aede908..6ab815111954b53b4dc722a1babe6b49a78bbedc 100644
--- a/netwerk/protocol/http/InterceptedHttpChannel.cpp
+++ b/netwerk/protocol/http/InterceptedHttpChannel.cpp
-@@ -726,6 +726,14 @@ NS_IMPL_ISUPPORTS(ResetInterceptionHeaderVisitor, nsIHttpHeaderVisitor)
+@@ -727,6 +727,14 @@ NS_IMPL_ISUPPORTS(ResetInterceptionHeaderVisitor, nsIHttpHeaderVisitor)
} // anonymous namespace
@@ -2342,7 +2479,7 @@ index b7c129dcc21cb5d5478765f6aa06ed047aee6de0..6f3881c002c5f6d3e48865d253515ffd
NS_IMETHODIMP
InterceptedHttpChannel::ResetInterception(bool aBypass) {
INTERCEPTED_LOG(("InterceptedHttpChannel::ResetInterception [%p] bypass: %s",
-@@ -1139,11 +1147,18 @@ InterceptedHttpChannel::OnStartRequest(nsIRequest* aRequest) {
+@@ -1140,11 +1148,18 @@ InterceptedHttpChannel::OnStartRequest(nsIRequest* aRequest) {
GetCallback(mProgressSink);
}
@@ -2377,10 +2514,10 @@ index d05b06c3f9ddba3b40d5969730474eaf0d843cb1..9b2cc35c504e1044ac681c62c107f8fe
nsCOMPtr<nsIContentSecurityPolicy> preloadCsp = mDocument->GetPreloadCsp();
if (!preloadCsp) {
diff --git a/security/manager/ssl/nsCertOverrideService.cpp b/security/manager/ssl/nsCertOverrideService.cpp
-index b2e328e7c7d7a89be34b84fd176c306a3620c77c..54f24b213bcdc78c702e15d4d45a3943bc082281 100644
+index 1b9f32fc97bf3c5000db95567eaab85b518fe03a..3a39859d58b05b373e9db7ebb2b7ae37166d74e7 100644
--- a/security/manager/ssl/nsCertOverrideService.cpp
+++ b/security/manager/ssl/nsCertOverrideService.cpp
-@@ -439,7 +439,12 @@ nsCertOverrideService::HasMatchingOverride(
+@@ -433,7 +433,12 @@ nsCertOverrideService::HasMatchingOverride(
bool disableAllSecurityCheck = false;
{
MutexAutoLock lock(mMutex);
@@ -2394,7 +2531,7 @@ index b2e328e7c7d7a89be34b84fd176c306a3620c77c..54f24b213bcdc78c702e15d4d45a3943
}
if (disableAllSecurityCheck) {
*aIsTemporary = false;
-@@ -651,14 +656,24 @@ static bool IsDebugger() {
+@@ -645,14 +650,24 @@ static bool IsDebugger() {
NS_IMETHODIMP
nsCertOverrideService::
@@ -2450,7 +2587,7 @@ index 6dfd07d6b676a99993408921de8dea9d561f201d..e3c6794363cd6336effbeac83a179f37
readonly attribute boolean securityCheckDisabled;
};
diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs
-index 12fef6cde815a9301944c399a58f27a7e4c4d5d7..0f7f06d1002a089547d1b15d7d8ddf264f28b529 100644
+index d3643aedf21a26594268a47bc0f6ac53e3977f75..795c6f3b28278b9f65a596799d4e424880fcffa7 100644
--- a/services/settings/Utils.sys.mjs
+++ b/services/settings/Utils.sys.mjs
@@ -97,7 +97,7 @@ const _cdnURLs = {};
@@ -2504,10 +2641,10 @@ index 8b975a8b11bcf2eabbb7fa51a431ff99ff69a5bc..0eeb5924c43a21b8561dd4b68fa89228
if (provider.failed) {
diff --git a/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp b/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
-index 77496e700eebbf286e8c5175ea1f77f8576fde1f..3d13e9b316284eaef5d4c82087117020ca8aba71 100644
+index cb235ed5b39fe5092a17b12976121ee3952d2062..649bba4c0faab1745f3040eba5925ef48b8f34f9 100644
--- a/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
+++ b/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
-@@ -488,7 +488,7 @@ void PopulateLanguages() {
+@@ -489,7 +489,7 @@ void PopulateLanguages() {
// sufficient to only collect this information as the other properties are
// just reformats of Navigator::GetAcceptLanguages.
nsTArray<nsString> languages;
@@ -2517,10 +2654,10 @@ index 77496e700eebbf286e8c5175ea1f77f8576fde1f..3d13e9b316284eaef5d4c82087117020
for (const auto& language : languages) {
diff --git a/toolkit/components/startup/nsAppStartup.cpp b/toolkit/components/startup/nsAppStartup.cpp
-index 9297e5eacd65658289dda764ad39e182c22d192b..15926f106850637a5bbd27e56834dc5c82791250 100644
+index dc0826f72134b91482e30d183ddf52e95146e12f..119a324e162b6965ddd3d6b2d53bd2856a174452 100644
--- a/toolkit/components/startup/nsAppStartup.cpp
+++ b/toolkit/components/startup/nsAppStartup.cpp
-@@ -365,7 +365,7 @@ nsAppStartup::Quit(uint32_t aMode, int aExitCode, bool* aUserAllowedQuit) {
+@@ -361,7 +361,7 @@ nsAppStartup::Quit(uint32_t aMode, int aExitCode, bool* aUserAllowedQuit) {
nsCOMPtr<nsISimpleEnumerator> windowEnumerator;
nsCOMPtr<nsIWindowMediator> mediator(
do_GetService(NS_WINDOWMEDIATOR_CONTRACTID));
@@ -2562,10 +2699,10 @@ index 585a957fd8a1467dc262bd1ca2058584fd8762c9..16ad38c3b7d753c386e091af700d1beb
/**
diff --git a/toolkit/mozapps/update/UpdateService.sys.mjs b/toolkit/mozapps/update/UpdateService.sys.mjs
-index eeec31f4d77de0f9622692eeb761392ed54b90ad..8907773fb6212f4e9cc184f87b840c91a0db67b6 100644
+index b050236a46af8dc5f1b72559065c813db9343088..85873915d92d49fddff3b7c4330cbe2d39719f39 100644
--- a/toolkit/mozapps/update/UpdateService.sys.mjs
+++ b/toolkit/mozapps/update/UpdateService.sys.mjs
-@@ -3811,6 +3811,8 @@ export class UpdateService {
+@@ -3752,6 +3752,8 @@ export class UpdateService {
}
get disabledForTesting() {
@@ -2587,10 +2724,10 @@ index c50b7f3932e18da9fad4b673e353974a001e78c4..708e0d75594ddcd62276d4e08c4bd5c6
]
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 795fc8669cc6f03a57139745f58963ffefe5aeff..46651bb0b53be9a522e1deb90140bf386a9f8b51 100644
+index 7a16ea20770dd945e743871e15e5b02da4842c60..e608a81c3b069b4a020da2d7807556975f603d33 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -5633,7 +5633,10 @@ nsresult XREMain::XRE_mainRun() {
+@@ -5669,7 +5669,10 @@ nsresult XREMain::XRE_mainRun() {
if (!AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownConfirmed)) {
#ifdef XP_MACOSX
@@ -2655,7 +2792,7 @@ index e5cc386651e192710b61858ab5625c97a02b92da..e560ad4fef232a26ce1e1b244f4ccea0
// nsDocumentViewer::LoadComplete that doesn't do various things
// that are not relevant here because this wasn't an actual
diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp
-index c4dc15918032a34d8be9f1cda94a9375466980f6..20756dc9166f9665d408cd007e9df55b5937b73c 100644
+index 418902fc1d00a2f0bc06bd68402e8bb342485c0a..101a7b63128743862d404c3fcadaa2aa886a7f8a 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -112,6 +112,7 @@
@@ -2666,7 +2803,7 @@ index c4dc15918032a34d8be9f1cda94a9375466980f6..20756dc9166f9665d408cd007e9df55b
#include "mozilla/Preferences.h"
#include "mozilla/ipc/URIUtils.h"
-@@ -864,6 +865,12 @@ NS_IMETHODIMP nsExternalHelperAppService::ApplyDecodingForExtension(
+@@ -865,6 +866,12 @@ NS_IMETHODIMP nsExternalHelperAppService::ApplyDecodingForExtension(
return NS_OK;
}
@@ -2679,7 +2816,7 @@ index c4dc15918032a34d8be9f1cda94a9375466980f6..20756dc9166f9665d408cd007e9df55b
nsresult nsExternalHelperAppService::GetFileTokenForPath(
const char16_t* aPlatformAppPath, nsIFile** aFile) {
nsDependentString platformAppPath(aPlatformAppPath);
-@@ -1485,7 +1492,12 @@ nsresult nsExternalAppHandler::SetUpTempFile(nsIChannel* aChannel) {
+@@ -1486,7 +1493,12 @@ nsresult nsExternalAppHandler::SetUpTempFile(nsIChannel* aChannel) {
// Strip off the ".part" from mTempLeafName
mTempLeafName.Truncate(mTempLeafName.Length() - std::size(".part") + 1);
@@ -2692,7 +2829,7 @@ index c4dc15918032a34d8be9f1cda94a9375466980f6..20756dc9166f9665d408cd007e9df55b
mSaver =
do_CreateInstance(NS_BACKGROUNDFILESAVERSTREAMLISTENER_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
-@@ -1671,7 +1683,36 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
+@@ -1672,7 +1684,36 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
return NS_OK;
}
@@ -2730,7 +2867,7 @@ index c4dc15918032a34d8be9f1cda94a9375466980f6..20756dc9166f9665d408cd007e9df55b
if (NS_FAILED(rv)) {
nsresult transferError = rv;
-@@ -1732,6 +1773,9 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
+@@ -1733,6 +1774,9 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
bool alwaysAsk = true;
mMimeInfo->GetAlwaysAskBeforeHandling(&alwaysAsk);
@@ -2740,7 +2877,7 @@ index c4dc15918032a34d8be9f1cda94a9375466980f6..20756dc9166f9665d408cd007e9df55b
if (alwaysAsk) {
// But we *don't* ask if this mimeInfo didn't come from
// our user configuration datastore and the user has said
-@@ -2248,6 +2292,16 @@ nsExternalAppHandler::OnSaveComplete(nsIBackgroundFileSaver* aSaver,
+@@ -2249,6 +2293,16 @@ nsExternalAppHandler::OnSaveComplete(nsIBackgroundFileSaver* aSaver,
NotifyTransfer(aStatus);
}
@@ -2757,7 +2894,7 @@ index c4dc15918032a34d8be9f1cda94a9375466980f6..20756dc9166f9665d408cd007e9df55b
return NS_OK;
}
-@@ -2731,6 +2785,15 @@ NS_IMETHODIMP nsExternalAppHandler::Cancel(nsresult aReason) {
+@@ -2732,6 +2786,15 @@ NS_IMETHODIMP nsExternalAppHandler::Cancel(nsresult aReason) {
}
}
@@ -2868,10 +3005,10 @@ index 1c25e9d9a101233f71e92288a0f93125b81ac1c5..22cf67b0f6e3ddd2b3ed725a314ba6a9
}
#endif
diff --git a/widget/MouseEvents.h b/widget/MouseEvents.h
-index c4e510441cf6329b2ad898034fbe39fa1a701ad4..e34d797ee3e3f2985e6d4472afce133e97a0caa4 100644
+index 5ca1a6fa13233b1bd00ee0467732c5875c51d343..0d3b8ebe127e59516802e8819f4bbed961f0992b 100644
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
-@@ -363,6 +363,9 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
+@@ -368,6 +368,9 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
// Otherwise, this must be 0.
uint32_t mClickCount = 0;
@@ -2881,7 +3018,7 @@ index c4e510441cf6329b2ad898034fbe39fa1a701ad4..e34d797ee3e3f2985e6d4472afce133e
// Whether the event should ignore scroll frame bounds during dispatch.
bool mIgnoreRootScrollFrame = false;
-@@ -386,6 +389,7 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
+@@ -391,6 +394,7 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
mContextMenuTrigger = aEvent.mContextMenuTrigger;
mExitFrom = aEvent.mExitFrom;
mClickCount = aEvent.mClickCount;
@@ -2953,7 +3090,7 @@ index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce805
}
if (aEvent.IsMeta()) {
diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
-index ad56ab325bb3b3c348259f852453eec1190d892b..272731c25d19e83a2da988ec3176e5227dc4da5b 100644
+index f4bded345e95674c66e4d4ad56b50844fce0871b..321e22d334a8bbc6057ee78e77e139a2804b2403 100644
--- a/widget/gtk/nsFilePicker.cpp
+++ b/widget/gtk/nsFilePicker.cpp
@@ -21,6 +21,7 @@
@@ -3114,7 +3251,7 @@ index facd2bc65afab8ec1aa322faa20a67464964dfb9..d6dea95472bec6006411753c3dfdab2e
} // namespace widget
diff --git a/widget/headless/HeadlessWidget.cpp b/widget/headless/HeadlessWidget.cpp
-index b8b3f6a09f3fd480f67c28a2d3c6daa960946324..8b9ea637e18c404254ca8a72dabf860452699096 100644
+index daa2d455374fd9f75a5c6ac9f7b91696d88b065c..f45184137b52db0a5774bf3365b15f784532fbdf 100644
--- a/widget/headless/HeadlessWidget.cpp
+++ b/widget/headless/HeadlessWidget.cpp
@@ -111,6 +111,8 @@ void HeadlessWidget::Destroy() {
@@ -3126,7 +3263,7 @@ index b8b3f6a09f3fd480f67c28a2d3c6daa960946324..8b9ea637e18c404254ca8a72dabf8604
nsBaseWidget::OnDestroy();
nsBaseWidget::Destroy();
-@@ -591,5 +593,14 @@ nsresult HeadlessWidget::SynthesizeNativeTouchpadPan(
+@@ -593,5 +595,14 @@ nsresult HeadlessWidget::SynthesizeNativeTouchpadPan(
return NS_OK;
}
@@ -3142,10 +3279,10 @@ index b8b3f6a09f3fd480f67c28a2d3c6daa960946324..8b9ea637e18c404254ca8a72dabf8604
} // namespace widget
} // namespace mozilla
diff --git a/widget/headless/HeadlessWidget.h b/widget/headless/HeadlessWidget.h
-index f07f7284495cf5e48409866aaef6fd4d529568be..daefaa8f58c3c8392ce229c814807bc5fff77dc7 100644
+index 39833c28e40c61e354119cde429b8389056bafac..a638fb7520b857219ce58fcbf9ca0ed939528924 100644
--- a/widget/headless/HeadlessWidget.h
+++ b/widget/headless/HeadlessWidget.h
-@@ -136,6 +136,9 @@ class HeadlessWidget : public nsBaseWidget {
+@@ -132,6 +132,9 @@ class HeadlessWidget final : public nsBaseWidget {
int32_t aModifierFlags,
nsIObserver* aObserver) override;
diff --git a/browser_patches/firefox/preferences/playwright.cfg b/browser_patches/firefox/preferences/playwright.cfg
index db47c4f0c3..b5c5e2254c 100644
--- a/browser_patches/firefox/preferences/playwright.cfg
+++ b/browser_patches/firefox/preferences/playwright.cfg
@@ -8,6 +8,10 @@ pref("dom.input_events.security.minTimeElapsedInMS", 0);
pref("dom.iframe_lazy_loading.enabled", false);
+// This setting is experimental and is only enabled on early betas.
+// Disable it unconditionally since it breaks proxy tests.
+pref("dom.security.https_first", false);
+
pref("datareporting.policy.dataSubmissionEnabled", false);
pref("datareporting.policy.dataSubmissionPolicyAccepted", false);
pref("datareporting.policy.dataSubmissionPolicyBypassNotification", true);
diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh
index ddac1019b9..2cb5272893 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="71b1107b4656f116936a278cb4948cc2db56998c"
+BASE_REVISION="ba8bcf39b0a89706b998447abba82590ad50fc36"
diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff
index a067098b83..a94e5b5ffa 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 37aca585f67028500a828354396c9e59ccfe273d..f32c64abe10c08b44a75b4682ab2885a4d258799 100644
+index b52d8892843f6b934081c0e0b9f93264626937b5..d076e8ad848680e0a0b7790ff4b11bb768c72523 100644
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
-@@ -1402,22 +1402,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS
+@@ -1401,21 +1401,26 @@ set(JavaScriptCore_INSPECTOR_DOMAINS
${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json
@@ -10,7 +10,6 @@ index 37aca585f67028500a828354396c9e59ccfe273d..f32c64abe10c08b44a75b4682ab2885a
${JAVASCRIPTCORE_DIR}/inspector/protocol/DOM.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/DOMDebugger.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/DOMStorage.json
- ${JAVASCRIPTCORE_DIR}/inspector/protocol/Database.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/Debugger.json
+ ${JAVASCRIPTCORE_DIR}/inspector/protocol/Emulation.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/GenericTypes.json
@@ -31,10 +30,10 @@ index 37aca585f67028500a828354396c9e59ccfe273d..f32c64abe10c08b44a75b4682ab2885a
${JAVASCRIPTCORE_DIR}/inspector/protocol/ServiceWorker.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/Target.json
diff --git a/Source/JavaScriptCore/DerivedSources-input.xcfilelist b/Source/JavaScriptCore/DerivedSources-input.xcfilelist
-index 7b9566ebe6355e6cb853e59a478a17a29953e856..a8d3266e69c4700a8b5ed806f456e8d1bc3194b9 100644
+index a92c371597d3af93bc7dd936efb1046ad899eaec..dc94df080778cb9b38b6a9cc3213d922505ff323 100644
--- a/Source/JavaScriptCore/DerivedSources-input.xcfilelist
+++ b/Source/JavaScriptCore/DerivedSources-input.xcfilelist
-@@ -100,21 +100,26 @@ $(PROJECT_DIR)/inspector/protocol/CPUProfiler.json
+@@ -99,20 +99,25 @@ $(PROJECT_DIR)/inspector/protocol/CPUProfiler.json
$(PROJECT_DIR)/inspector/protocol/CSS.json
$(PROJECT_DIR)/inspector/protocol/Canvas.json
$(PROJECT_DIR)/inspector/protocol/Console.json
@@ -42,7 +41,6 @@ index 7b9566ebe6355e6cb853e59a478a17a29953e856..a8d3266e69c4700a8b5ed806f456e8d1
$(PROJECT_DIR)/inspector/protocol/DOM.json
$(PROJECT_DIR)/inspector/protocol/DOMDebugger.json
$(PROJECT_DIR)/inspector/protocol/DOMStorage.json
- $(PROJECT_DIR)/inspector/protocol/Database.json
$(PROJECT_DIR)/inspector/protocol/Debugger.json
+$(PROJECT_DIR)/inspector/protocol/Emulation.json
$(PROJECT_DIR)/inspector/protocol/GenericTypes.json
@@ -62,10 +60,10 @@ index 7b9566ebe6355e6cb853e59a478a17a29953e856..a8d3266e69c4700a8b5ed806f456e8d1
$(PROJECT_DIR)/inspector/protocol/Security.json
$(PROJECT_DIR)/inspector/protocol/ServiceWorker.json
diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make
-index 103f0b77b93558944be1770a00e1a149d7257812..a580b33ea9a7f2f74547f77c1dab4caa019dce81 100644
+index 706f3548b9a40b323d49af7d61f5bc59692a0da6..c2b49f4b97f34e512442c1a790ba794df2ae26cd 100644
--- a/Source/JavaScriptCore/DerivedSources.make
+++ b/Source/JavaScriptCore/DerivedSources.make
-@@ -303,22 +303,27 @@ INSPECTOR_DOMAINS := \
+@@ -302,21 +302,26 @@ INSPECTOR_DOMAINS := \
$(JavaScriptCore)/inspector/protocol/CSS.json \
$(JavaScriptCore)/inspector/protocol/Canvas.json \
$(JavaScriptCore)/inspector/protocol/Console.json \
@@ -73,7 +71,6 @@ index 103f0b77b93558944be1770a00e1a149d7257812..a580b33ea9a7f2f74547f77c1dab4caa
$(JavaScriptCore)/inspector/protocol/DOM.json \
$(JavaScriptCore)/inspector/protocol/DOMDebugger.json \
$(JavaScriptCore)/inspector/protocol/DOMStorage.json \
- $(JavaScriptCore)/inspector/protocol/Database.json \
$(JavaScriptCore)/inspector/protocol/Debugger.json \
+ $(JavaScriptCore)/inspector/protocol/Emulation.json \
$(JavaScriptCore)/inspector/protocol/GenericTypes.json \
@@ -1218,10 +1215,10 @@ index 3d032713a7f3bb9645bfc7d42455a0494b5376c0..913dda5e90b86cc5f8e4ca6881f6db57
}
diff --git a/Source/JavaScriptCore/inspector/protocol/Playwright.json b/Source/JavaScriptCore/inspector/protocol/Playwright.json
new file mode 100644
-index 0000000000000000000000000000000000000000..978d6f92b18498633c982969299f068332eb2884
+index 0000000000000000000000000000000000000000..440dd95173e066a886de120fb3dab7597d85feb6
--- /dev/null
+++ b/Source/JavaScriptCore/inspector/protocol/Playwright.json
-@@ -0,0 +1,307 @@
+@@ -0,0 +1,315 @@
+{
+ "domain": "Playwright",
+ "availability": ["web"],
@@ -1397,6 +1394,14 @@ index 0000000000000000000000000000000000000000..978d6f92b18498633c982969299f0683
+ ]
+ },
+ {
++ "name": "setPageZoomFactor",
++ "description": "Changes page zoom factor.",
++ "parameters": [
++ { "name": "pageProxyId", "$ref": "PageProxyID", "description": "Unique identifier of the page proxy." },
++ { "name": "zoomFactor", "type": "number" }
++ ]
++ },
++ {
+ "name": "getAllCookies",
+ "description": "Returns all cookies in the given browser context.",
+ "async": true,
@@ -1692,7 +1697,7 @@ index 24891ad836086fd23024fcb4d08ca63f6974c812..29f4b6b1923383fec7a99d28a4e815dc
private:
enum ArgumentRequirement { ArgumentRequired, ArgumentNotRequired };
diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt
-index d21b38eb4e5f27c12ca755799669883e71ce6de2..89cebf78b4599e5595ba570286a82e6aaa0f0f38 100644
+index 2ccb951b0cf57707b68ce5e971c5e191b91f2bd0..6ff141b41f4b6c279c367ad66d5c2b6adede8646 100644
--- a/Source/ThirdParty/libwebrtc/CMakeLists.txt
+++ b/Source/ThirdParty/libwebrtc/CMakeLists.txt
@@ -532,6 +532,11 @@ set(webrtc_SOURCES
@@ -1715,7 +1720,7 @@ index d21b38eb4e5f27c12ca755799669883e71ce6de2..89cebf78b4599e5595ba570286a82e6a
Source/webrtc/api/video_codecs/scalability_mode.cc
Source/webrtc/api/video_codecs/scalability_mode_helper.cc
Source/webrtc/api/video_codecs/sdp_video_format.cc
-@@ -2354,6 +2358,11 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE
+@@ -2350,6 +2354,11 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE
Source/third_party/libsrtp/config
Source/third_party/libsrtp/crypto/include
Source/third_party/libsrtp/include
@@ -1762,10 +1767,10 @@ index 6c754858a3ea883a65ad022ce16b6c45ae65ee35..15f968472712e1a2a88672ed290b103c
+_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 635e7cd52a3eae41c82d989cda47563d0750dab5..8a10d9970972598bf270e12cce5fd55066c8fede 100644
+index 2c30b5b08d589c82def812fb881a63cb6e49e7b4..c76a8a2963923bf54c3d134aa2594150c43a4b3c 100644
--- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
+++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
-@@ -35,6 +35,20 @@
+@@ -55,6 +55,20 @@
};
/* End PBXAggregateTarget section */
@@ -1786,7 +1791,7 @@ index 635e7cd52a3eae41c82d989cda47563d0750dab5..8a10d9970972598bf270e12cce5fd550
/* 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, ); }; };
-@@ -5618,6 +5632,13 @@
+@@ -5772,6 +5786,13 @@
remoteGlobalIDString = DDF30D0527C5C003006A526F;
remoteInfo = absl;
};
@@ -1800,7 +1805,7 @@ index 635e7cd52a3eae41c82d989cda47563d0750dab5..8a10d9970972598bf270e12cce5fd550
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
-@@ -23874,6 +23895,7 @@
+@@ -24241,6 +24262,7 @@
);
dependencies = (
410B3827292B73E90003E515 /* PBXTargetDependency */,
@@ -1808,7 +1813,7 @@ index 635e7cd52a3eae41c82d989cda47563d0750dab5..8a10d9970972598bf270e12cce5fd550
DD2E76E827C6B69A00F2A74C /* PBXTargetDependency */,
CDEBB4CC24C01AB400ADBD44 /* PBXTargetDependency */,
411ED040212E0811004320BA /* PBXTargetDependency */,
-@@ -23956,6 +23978,7 @@
+@@ -24334,6 +24356,7 @@
4460B8B92B155B6A00392062 /* vp9_qp_parser_fuzzer */,
444A6EF02AEADFC9005FE121 /* vp9_replay_fuzzer */,
44945C512B9BA1C300447FFD /* webm_fuzzer */,
@@ -1816,7 +1821,7 @@ index 635e7cd52a3eae41c82d989cda47563d0750dab5..8a10d9970972598bf270e12cce5fd550
);
};
/* End PBXProject section */
-@@ -24059,6 +24082,23 @@
+@@ -24437,6 +24460,23 @@
shellPath = /bin/sh;
shellScript = "[ -z \"${WK_DERIVED_SDK_HEADERS_DIR}\" -o -d \"${WK_DERIVED_SDK_HEADERS_DIR}\" ] && touch \"${SCRIPT_OUTPUT_FILE_0}\"\n";
};
@@ -1840,7 +1845,7 @@ index 635e7cd52a3eae41c82d989cda47563d0750dab5..8a10d9970972598bf270e12cce5fd550
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
-@@ -26874,6 +26914,11 @@
+@@ -27400,6 +27440,11 @@
target = DDF30D0527C5C003006A526F /* absl */;
targetProxy = DD2E76E727C6B69A00F2A74C /* PBXContainerItemProxy */;
};
@@ -1852,7 +1857,7 @@ index 635e7cd52a3eae41c82d989cda47563d0750dab5..8a10d9970972598bf270e12cce5fd550
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
-@@ -27449,6 +27494,27 @@
+@@ -28167,6 +28212,27 @@
};
name = Production;
};
@@ -1880,7 +1885,7 @@ index 635e7cd52a3eae41c82d989cda47563d0750dab5..8a10d9970972598bf270e12cce5fd550
FB39D0711200ED9200088E69 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */;
-@@ -27751,6 +27817,16 @@
+@@ -28549,6 +28615,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
@@ -1898,7 +1903,7 @@ index 635e7cd52a3eae41c82d989cda47563d0750dab5..8a10d9970972598bf270e12cce5fd550
isa = XCConfigurationList;
buildConfigurations = (
diff --git a/Source/ThirdParty/skia/CMakeLists.txt b/Source/ThirdParty/skia/CMakeLists.txt
-index b7e56daffbaac1c8c5bc94bd76826fea1826918b..5365dbfeae72ce5dc6be37e2f07a973bccddfd78 100644
+index 74b12c3ccae8b65ad3a35063bece92a9ecb27cbe..1656508a1c5a2103b2bab3068305c6bdba7f0208 100644
--- a/Source/ThirdParty/skia/CMakeLists.txt
+++ b/Source/ThirdParty/skia/CMakeLists.txt
@@ -10,6 +10,8 @@ if (USE_SKIA_ENCODERS)
@@ -1910,7 +1915,7 @@ index b7e56daffbaac1c8c5bc94bd76826fea1826918b..5365dbfeae72ce5dc6be37e2f07a973b
if (ANDROID)
find_package(EXPAT REQUIRED)
endif ()
-@@ -1054,6 +1056,7 @@ endif ()
+@@ -947,6 +949,7 @@ endif ()
target_link_libraries(Skia PRIVATE
JPEG::JPEG
PNG::PNG
@@ -1919,10 +1924,10 @@ index b7e56daffbaac1c8c5bc94bd76826fea1826918b..5365dbfeae72ce5dc6be37e2f07a973b
WEBKIT_ADD_TARGET_CXX_FLAGS(Skia
diff --git a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
-index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed6021684077078903bf422d 100644
+index 02d962ba310f7e231c84657823766c834ae5b6a6..44587b824e07c1d8a9fa99b32a02da0ddd2ca52c 100644
--- a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
+++ b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
-@@ -628,6 +628,7 @@ ApplePayEnabled:
+@@ -602,6 +602,7 @@ ApplePayEnabled:
richJavaScript: true
# FIXME: This is on by default in WebKit2 PLATFORM(COCOA). Perhaps we should consider turning it on for WebKitLegacy as well.
@@ -1930,7 +1935,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
AsyncClipboardAPIEnabled:
type: bool
status: mature
-@@ -638,7 +639,7 @@ AsyncClipboardAPIEnabled:
+@@ -612,7 +613,7 @@ AsyncClipboardAPIEnabled:
default: false
WebKit:
"PLATFORM(COCOA) || PLATFORM(GTK)" : true
@@ -1939,7 +1944,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
WebCore:
default: false
-@@ -883,13 +884,10 @@ BlobFileAccessEnforcementEnabled:
+@@ -871,13 +872,10 @@ BlobFileAccessEnforcementEnabled:
sharedPreferenceForWebProcess: true
defaultValue:
WebKitLegacy:
@@ -1953,7 +1958,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
default: false
BlobRegistryTopOriginPartitioningEnabled:
-@@ -2257,6 +2255,7 @@ CrossOriginEmbedderPolicyEnabled:
+@@ -2270,6 +2268,7 @@ CrossOriginEmbedderPolicyEnabled:
WebCore:
default: false
@@ -1961,7 +1966,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
CrossOriginOpenerPolicyEnabled:
type: bool
status: stable
-@@ -2297,7 +2296,7 @@ CustomPasteboardDataEnabled:
+@@ -2310,7 +2309,7 @@ CustomPasteboardDataEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -1969,8 +1974,8 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
+ "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)": true
default: false
- DNSPrefetchingEnabled:
-@@ -2342,6 +2341,7 @@ DOMAudioSessionFullEnabled:
+ DOMAudioSessionEnabled:
+@@ -2343,6 +2342,7 @@ DOMAudioSessionFullEnabled:
WebCore:
default: false
@@ -1978,7 +1983,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
DOMPasteAccessRequestsEnabled:
type: bool
status: internal
-@@ -2353,7 +2353,7 @@ DOMPasteAccessRequestsEnabled:
+@@ -2354,7 +2354,7 @@ DOMPasteAccessRequestsEnabled:
default: false
WebKit:
"PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(VISION)": true
@@ -1987,6 +1992,28 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
WebCore:
default: false
+@@ -2420,10 +2420,10 @@ DataListElementEnabled:
+ WebKitLegacy:
+ default: false
+ WebKit:
+- "(PLATFORM(COCOA) && !PLATFORM(WATCHOS)) || PLATFORM(GTK)": true
++ "(PLATFORM(COCOA) && !PLATFORM(WATCHOS)) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)": true
+ default: false
+ WebCore:
+- "(PLATFORM(COCOA) && !PLATFORM(WATCHOS)) || PLATFORM(GTK)": true
++ "(PLATFORM(COCOA) && !PLATFORM(WATCHOS)) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)": true
+ default: false
+ sharedPreferenceForWebProcess: true
+
+@@ -2436,7 +2436,7 @@ DataTransferItemsEnabled:
+ WebKitLegacy:
+ default: true
+ WebKit:
+- "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)": true
++ "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)": true
+ default: false
+ WebCore:
+ default: false
@@ -2691,7 +2691,7 @@ DirectoryUploadEnabled:
WebKitLegacy:
default: false
@@ -1996,7 +2023,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
default: false
WebCore:
default: false
-@@ -3144,10 +3144,10 @@ FullScreenEnabled:
+@@ -3143,10 +3143,10 @@ FullScreenEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -2009,7 +2036,43 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
default: false
sharedPreferenceForWebProcess: true
-@@ -3852,6 +3852,7 @@ InspectorAttachmentSide:
+@@ -3707,7 +3707,7 @@ InputTypeColorEnabled:
+ WebKitLegacy:
+ default: false
+ WebKit:
+- "PLATFORM(COCOA) && !PLATFORM(WATCHOS) || PLATFORM(GTK)": true
++ "PLATFORM(COCOA) && !PLATFORM(WATCHOS) || PLATFORM(GTK) || PLATFORM(WPE)": true
+ default: false
+ WebCore:
+ default: false
+@@ -3740,7 +3740,7 @@ InputTypeDateEnabled:
+ "PLATFORM(IOS_FAMILY)": true
+ default: false
+ WebKit:
+- "PLATFORM(COCOA) || PLATFORM(GTK)": true
++ "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)": true
+ default: false
+ WebCore:
+ default: false
+@@ -3756,7 +3756,7 @@ InputTypeDateTimeLocalEnabled:
+ "PLATFORM(IOS_FAMILY)": true
+ default: false
+ WebKit:
+- "PLATFORM(COCOA) || PLATFORM(GTK)": true
++ "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)": true
+ default: false
+ WebCore:
+ default: false
+@@ -3788,7 +3788,7 @@ InputTypeTimeEnabled:
+ "PLATFORM(IOS_FAMILY)": true
+ default: false
+ WebKit:
+- "PLATFORM(COCOA) || PLATFORM(GTK)": true
++ "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)": true
+ default: false
+ WebCore:
+ default: false
+@@ -3836,6 +3836,7 @@ InspectorAttachmentSide:
WebKit:
default: 0
@@ -2017,7 +2080,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
InspectorStartsAttached:
type: bool
status: embedder
-@@ -3859,7 +3860,7 @@ InspectorStartsAttached:
+@@ -3843,7 +3844,7 @@ InspectorStartsAttached:
exposed: [ WebKit ]
defaultValue:
WebKit:
@@ -2026,31 +2089,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
InspectorWindowFrame:
type: String
-@@ -4210,9 +4211,10 @@ LayoutViewportHeightExpansionFactor:
- WebCore:
- default: 0
-
-+# Playwright: disable setting.
- LazyIframeLoadingEnabled:
- type: bool
-- status: stable
-+ status: preview
- category: html
- humanReadableName: "Lazy iframe loading"
- humanReadableDescription: "Enable lazy iframe loading support"
-@@ -4220,9 +4222,9 @@ LazyIframeLoadingEnabled:
- WebKitLegacy:
- default: true
- WebKit:
-- default: true
-+ default: false
- WebCore:
-- default: true
-+ default: false
-
- LazyImageLoadingEnabled:
- type: bool
-@@ -5781,7 +5783,7 @@ PermissionsAPIEnabled:
+@@ -5778,7 +5779,7 @@ PermissionsAPIEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -2059,7 +2098,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
default: false
WebCore:
default: false
-@@ -5844,6 +5846,19 @@ PitchCorrectionAlgorithm:
+@@ -5841,6 +5842,19 @@ PitchCorrectionAlgorithm:
WebCore:
default: MediaPlayerEnums::PitchCorrectionAlgorithm::BestAllAround
@@ -2079,7 +2118,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
PointerLockOptionsEnabled:
type: bool
status: stable
-@@ -6435,7 +6450,7 @@ ScreenOrientationAPIEnabled:
+@@ -6420,7 +6434,7 @@ ScreenOrientationAPIEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -2088,7 +2127,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
WebCore:
default: false
sharedPreferenceForWebProcess: true
-@@ -7849,6 +7864,7 @@ UseCGDisplayListsForDOMRendering:
+@@ -7879,6 +7893,7 @@ UseCGDisplayListsForDOMRendering:
default: true
sharedPreferenceForWebProcess: true
@@ -2096,7 +2135,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
UseGPUProcessForCanvasRenderingEnabled:
type: bool
status: stable
-@@ -7861,7 +7877,7 @@ UseGPUProcessForCanvasRenderingEnabled:
+@@ -7891,7 +7906,7 @@ UseGPUProcessForCanvasRenderingEnabled:
defaultValue:
WebKit:
"ENABLE(GPU_PROCESS_BY_DEFAULT)": true
@@ -2105,7 +2144,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
default: false
UseGPUProcessForDOMRenderingEnabled:
-@@ -7906,6 +7922,7 @@ UseGPUProcessForMediaEnabled:
+@@ -7936,6 +7951,7 @@ UseGPUProcessForMediaEnabled:
sharedPreferenceForWebProcess: true
mediaPlaybackRelated: true
@@ -2113,7 +2152,7 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
UseGPUProcessForWebGLEnabled:
type: bool
status: internal
-@@ -7917,7 +7934,7 @@ UseGPUProcessForWebGLEnabled:
+@@ -7947,7 +7963,7 @@ UseGPUProcessForWebGLEnabled:
default: false
WebKit:
"ENABLE(GPU_PROCESS_BY_DEFAULT) && ENABLE(GPU_PROCESS_WEBGL_BY_DEFAULT)": true
@@ -2123,10 +2162,10 @@ index a18d2cc93197ef89e9148907cdc47cf7c4359085..d377bee3c2c192e1ed60216840770789
WebCore:
"ENABLE(GPU_PROCESS_BY_DEFAULT) && ENABLE(GPU_PROCESS_WEBGL_BY_DEFAULT)": true
diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h
-index 960b0ee2c7d012bb2ce8f8d22d0cc43176e6285d..9bc7ad7d36dfe90d296143567252bece6f1d56fb 100644
+index d86540738b2e5e66811b67dd07889c6188126dd7..128f697e7a46b2c6af7716933ee8845228eaba0e 100644
--- a/Source/WTF/wtf/PlatformEnable.h
+++ b/Source/WTF/wtf/PlatformEnable.h
-@@ -409,7 +409,7 @@
+@@ -385,7 +385,7 @@
// ORIENTATION_EVENTS should never get enabled on Desktop, only Mobile.
#if !defined(ENABLE_ORIENTATION_EVENTS)
@@ -2135,7 +2174,7 @@ index 960b0ee2c7d012bb2ce8f8d22d0cc43176e6285d..9bc7ad7d36dfe90d296143567252bece
#endif
#if !defined(ENABLE_OVERFLOW_SCROLLING_TOUCH)
-@@ -514,7 +514,7 @@
+@@ -502,7 +502,7 @@
#endif
#if !defined(ENABLE_TOUCH_EVENTS)
@@ -2145,10 +2184,10 @@ index 960b0ee2c7d012bb2ce8f8d22d0cc43176e6285d..9bc7ad7d36dfe90d296143567252bece
#if !defined(ENABLE_TOUCH_ACTION_REGIONS)
diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h
-index e744e5190e18a46421335614ba7e46abd9321ede..3da0354adfac2df0570273859448435a0ecfc869 100644
+index bacd225fea9dc695e021649fc6d74012e300be27..9e5497d6f0ecca35bbb5fc2a53f36ee8a3b39435 100644
--- a/Source/WTF/wtf/PlatformEnableCocoa.h
+++ b/Source/WTF/wtf/PlatformEnableCocoa.h
-@@ -808,7 +808,7 @@
+@@ -813,7 +813,7 @@
#endif
#if !defined(ENABLE_SEC_ITEM_SHIM)
@@ -2158,10 +2197,10 @@ index e744e5190e18a46421335614ba7e46abd9321ede..3da0354adfac2df0570273859448435a
#if !defined(ENABLE_SERVER_PRECONNECT)
diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
-index 26ff5ab72c69aa405a6834b4ba1a6192f3030f2f..8c60bc012661a840bea7524b454c92c67fdd6919 100644
+index 93e12dd54312a4c8479687b9f175c948250339f8..b39779453f1d51c302e5c5a39d58594a63eb22a2 100644
--- a/Source/WTF/wtf/PlatformHave.h
+++ b/Source/WTF/wtf/PlatformHave.h
-@@ -1230,7 +1230,8 @@
+@@ -1220,7 +1220,8 @@
#endif
#if PLATFORM(MAC)
@@ -2188,10 +2227,10 @@ index 007b8fe3292f326504013be8198ae020f7aacf35..1c722c473732ffe05fdb61010fa4417e
namespace Unicode {
diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
-index 18d8c41490fb662d6f5bfb14689469d53244fb82..73ce4360870e6053f79a0c6d6055ffd17da9f7b7 100644
+index 6b62ff89947f5a393ee50381af9f6ddfecc91037..202376ddb4a475a23e0379e26f866451c6e184ba 100644
--- a/Source/WebCore/DerivedSources.make
+++ b/Source/WebCore/DerivedSources.make
-@@ -1218,6 +1218,10 @@ JS_BINDING_IDLS := \
+@@ -1221,6 +1221,10 @@ JS_BINDING_IDLS := \
$(WebCore)/dom/SubscriberCallback.idl \
$(WebCore)/dom/SubscriptionObserver.idl \
$(WebCore)/dom/SubscriptionObserverCallback.idl \
@@ -2202,7 +2241,7 @@ index 18d8c41490fb662d6f5bfb14689469d53244fb82..73ce4360870e6053f79a0c6d6055ffd1
$(WebCore)/dom/Text.idl \
$(WebCore)/dom/TextDecoder.idl \
$(WebCore)/dom/TextDecoderStream.idl \
-@@ -1812,9 +1816,6 @@ JS_BINDING_IDLS := \
+@@ -1821,9 +1825,6 @@ JS_BINDING_IDLS := \
ADDITIONAL_BINDING_IDLS = \
DocumentTouch.idl \
GestureEvent.idl \
@@ -2213,10 +2252,10 @@ index 18d8c41490fb662d6f5bfb14689469d53244fb82..73ce4360870e6053f79a0c6d6055ffd1
vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS)
diff --git a/Source/WebCore/Modules/geolocation/Geolocation.cpp b/Source/WebCore/Modules/geolocation/Geolocation.cpp
-index 90bf15adb6a36e190f68448a125b5446a0674631..d64af222f0c824a7cd719e250c1023071465d24e 100644
+index d66eb4a0c175ab495ef10bd393115165b5545fc2..cd89bd44bd2a8b3036c3446c01475bf726a3a18a 100644
--- a/Source/WebCore/Modules/geolocation/Geolocation.cpp
+++ b/Source/WebCore/Modules/geolocation/Geolocation.cpp
-@@ -360,8 +360,9 @@ bool Geolocation::shouldBlockGeolocationRequests()
+@@ -361,8 +361,9 @@ bool Geolocation::shouldBlockGeolocationRequests()
bool isSecure = SecurityOrigin::isSecure(document->url()) || document->isSecureContext();
bool hasMixedContent = !document->foundMixedContent().isEmpty();
bool isLocalOrigin = securityOrigin()->isLocal();
@@ -2277,10 +2316,10 @@ index 7bbcd501126a7b83986f5d1f5a077779441dc1fe..13e68ac853603d8e7da1b42f5c8073eb
set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/wpe/RenderThemeWPE.cpp)
diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
-index 79893c978df4277dacc7a90f9b0bca73cee6458a..949f92cc972e59af642e548b00d6788568513fa0 100644
+index 7cd931c48dd3c7c4cc6136c91692054ca98e6ddf..e32cfb28521033f1713bd963ba9825a9500f4fc9 100644
--- a/Source/WebCore/SourcesCocoa.txt
+++ b/Source/WebCore/SourcesCocoa.txt
-@@ -728,3 +728,9 @@ testing/cocoa/WebViewVisualIdentificationOverlay.mm
+@@ -733,3 +733,9 @@ testing/cocoa/WebViewVisualIdentificationOverlay.mm
platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify
platform/graphics/cocoa/GraphicsContextGLCocoa.mm @no-unify
platform/graphics/cv/GraphicsContextGLCVCocoa.mm @no-unify
@@ -2291,10 +2330,10 @@ index 79893c978df4277dacc7a90f9b0bca73cee6458a..949f92cc972e59af642e548b00d67885
+JSTouchList.cpp
+// Playwright end
diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt
-index 5838137f6ae130f6ce1e97942078641096d406b6..fcdc7611e36297c1b836ccf44a073781a04809ff 100644
+index 9cc9f51e48b3058ea29da389629c021bcf05e202..978ac405073534ba6fa79f483d885643a4722fd8 100644
--- a/Source/WebCore/SourcesGTK.txt
+++ b/Source/WebCore/SourcesGTK.txt
-@@ -113,3 +113,10 @@ platform/unix/LoggingUnix.cpp
+@@ -112,3 +112,10 @@ platform/unix/LoggingUnix.cpp
platform/unix/SharedMemoryUnix.cpp
platform/xdg/MIMETypeRegistryXdg.cpp
@@ -2306,7 +2345,7 @@ index 5838137f6ae130f6ce1e97942078641096d406b6..fcdc7611e36297c1b836ccf44a073781
+JSSpeechSynthesisEventInit.cpp
+// Playwright: end.
diff --git a/Source/WebCore/SourcesWPE.txt b/Source/WebCore/SourcesWPE.txt
-index 3c68a8ed10cd24cffd26b4b70c3adad8eb6ba91f..b36dee714fdceba5248922bfb6d2046922ca6b34 100644
+index f785335022a20f31c8941c0aabd8895a17f71a3e..a3516d2db0cef38b3257b4b8653711f90f24c257 100644
--- a/Source/WebCore/SourcesWPE.txt
+++ b/Source/WebCore/SourcesWPE.txt
@@ -46,6 +46,8 @@ editing/libwpe/EditorLibWPE.cpp
@@ -2318,7 +2357,7 @@ index 3c68a8ed10cd24cffd26b4b70c3adad8eb6ba91f..b36dee714fdceba5248922bfb6d20469
page/linux/ResourceUsageOverlayLinux.cpp
page/linux/ResourceUsageThreadLinux.cpp
-@@ -90,6 +92,17 @@ platform/text/LocaleICU.cpp
+@@ -89,6 +91,17 @@ platform/text/LocaleICU.cpp
platform/unix/LoggingUnix.cpp
platform/unix/SharedMemoryUnix.cpp
@@ -2337,12 +2376,12 @@ index 3c68a8ed10cd24cffd26b4b70c3adad8eb6ba91f..b36dee714fdceba5248922bfb6d20469
+JSSpeechSynthesisEventInit.cpp
+// Playwright: end.
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
-index c10b3c0d8d918e2ca0c33e4820b492465ef2fd97..51a6ace79f76cfbee26c96fc75cd9b5c71ba243c 100644
+index d58402bdd7423c3274088b4e35a22922a107062a..4dc6b7adcaf5a34ffbe0b4aad5552a17daa926e7 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
-@@ -6358,6 +6358,13 @@
- EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; };
+@@ -6404,6 +6404,13 @@
EE0C7E042CE845CB0043DAF8 /* CSSPositionTryRule.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0C7E002CE845CB0043DAF8 /* CSSPositionTryRule.h */; };
+ EE0D3C492D2F4B4C00072978 /* StageModeOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0D3C482D2F4AE600072978 /* StageModeOperations.h */; settings = {ATTRIBUTES = (Private, ); }; };
EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ F050E16823AC9C080011CE47 /* PlatformTouchEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F050E16623AC9C070011CE47 /* PlatformTouchEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ F050E16A23AD660C0011CE47 /* Touch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F050E16923AD660C0011CE47 /* Touch.cpp */; };
@@ -2354,7 +2393,7 @@ index c10b3c0d8d918e2ca0c33e4820b492465ef2fd97..51a6ace79f76cfbee26c96fc75cd9b5c
F12171F616A8CF0B000053CA /* WebVTTElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F12171F416A8BC63000053CA /* WebVTTElement.h */; };
F32BDCD92363AACA0073B6AE /* UserGestureEmulationScope.h in Headers */ = {isa = PBXBuildFile; fileRef = F32BDCD72363AACA0073B6AE /* UserGestureEmulationScope.h */; };
F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */ = {isa = PBXBuildFile; fileRef = F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
-@@ -20908,6 +20915,14 @@
+@@ -21038,6 +21045,14 @@
EE7A169F2C607BFA0057B563 /* StartViewTransitionOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StartViewTransitionOptions.h; sourceTree = "<group>"; };
EFB7287B2124C73D005C2558 /* CanvasActivityRecord.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasActivityRecord.cpp; sourceTree = "<group>"; };
EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasActivityRecord.h; sourceTree = "<group>"; };
@@ -2369,7 +2408,7 @@ index c10b3c0d8d918e2ca0c33e4820b492465ef2fd97..51a6ace79f76cfbee26c96fc75cd9b5c
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>"; };
-@@ -28654,6 +28669,11 @@
+@@ -28800,6 +28815,11 @@
BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */,
2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */,
2D4F96F21A1ECC240098BF88 /* TextIndicator.h */,
@@ -2381,7 +2420,7 @@ index c10b3c0d8d918e2ca0c33e4820b492465ef2fd97..51a6ace79f76cfbee26c96fc75cd9b5c
F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */,
F4E1965F21F26E4E00285078 /* UndoItem.cpp */,
2ECDBAD521D8906300F00ECD /* UndoItem.h */,
-@@ -35537,6 +35557,8 @@
+@@ -35771,6 +35791,8 @@
29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */,
1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */,
1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */,
@@ -2390,7 +2429,7 @@ index c10b3c0d8d918e2ca0c33e4820b492465ef2fd97..51a6ace79f76cfbee26c96fc75cd9b5c
FE3DC9932D0C063C0021B6FC /* PlatformTZoneImpls.cpp */,
0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */,
935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */,
-@@ -38326,6 +38348,7 @@
+@@ -38569,6 +38591,7 @@
AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */,
6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */,
6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */,
@@ -2398,7 +2437,7 @@ index c10b3c0d8d918e2ca0c33e4820b492465ef2fd97..51a6ace79f76cfbee26c96fc75cd9b5c
7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */,
7CE7FA591EF882300060C9D6 /* DocumentTouch.h */,
A8185F3209765765005826D9 /* DocumentType.cpp */,
-@@ -43197,6 +43220,8 @@
+@@ -43482,6 +43505,8 @@
F4E90A3C2B52038E002DA469 /* PlatformTextAlternatives.h in Headers */,
0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */,
074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */,
@@ -2407,7 +2446,7 @@ index c10b3c0d8d918e2ca0c33e4820b492465ef2fd97..51a6ace79f76cfbee26c96fc75cd9b5c
CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */,
CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */,
CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */,
-@@ -44527,6 +44552,7 @@
+@@ -44827,6 +44852,7 @@
0F54DD081881D5F5003EEDBB /* Touch.h in Headers */,
71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */,
0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */,
@@ -2415,7 +2454,7 @@ index c10b3c0d8d918e2ca0c33e4820b492465ef2fd97..51a6ace79f76cfbee26c96fc75cd9b5c
0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */,
070334D71459FFD5008D8D45 /* TrackBase.h in Headers */,
BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */,
-@@ -45707,6 +45733,8 @@
+@@ -46007,6 +46033,8 @@
2D22830323A8470700364B7E /* CursorMac.mm in Sources */,
5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */,
07E4BDBF2A3A5FAB000D5509 /* DictationCaretAnimator.cpp in Sources */,
@@ -2424,7 +2463,7 @@ index c10b3c0d8d918e2ca0c33e4820b492465ef2fd97..51a6ace79f76cfbee26c96fc75cd9b5c
7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */,
4667EA3E2968D9DA00BAB1E2 /* GameControllerHapticEffect.mm in Sources */,
46FE73D32968E52000B8064C /* GameControllerHapticEngines.mm in Sources */,
-@@ -45798,6 +45826,9 @@
+@@ -46098,6 +46126,9 @@
CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */,
BE39137129B267F500FA5D4F /* TextTransformCocoa.cpp in Sources */,
51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */,
@@ -2435,7 +2474,7 @@ index c10b3c0d8d918e2ca0c33e4820b492465ef2fd97..51a6ace79f76cfbee26c96fc75cd9b5c
538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */,
538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */,
diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
-index f9800e07148d1c3b269a129d90147a1763aa2119..d9e2a2a01162c1b4106b06281dc1c61fbe11ea13 100644
+index c6efab7897b328d46bfbca84f84fca8ad39bff48..bc5826d14817244396ddae91e57dde1312a4407e 100644
--- a/Source/WebCore/accessibility/AccessibilityObject.cpp
+++ b/Source/WebCore/accessibility/AccessibilityObject.cpp
@@ -70,6 +70,7 @@
@@ -2446,7 +2485,7 @@ index f9800e07148d1c3b269a129d90147a1763aa2119..d9e2a2a01162c1b4106b06281dc1c61f
#include "LocalFrame.h"
#include "LocalizedStrings.h"
#include "MathMLNames.h"
-@@ -3963,7 +3964,12 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const
+@@ -3987,7 +3988,12 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const
if (roleValue() == AccessibilityRole::ApplicationDialog)
return AccessibilityObjectInclusion::IncludeObject;
@@ -2461,10 +2500,10 @@ index f9800e07148d1c3b269a129d90147a1763aa2119..d9e2a2a01162c1b4106b06281dc1c61f
bool AccessibilityObject::isWithinHiddenWebArea() const
diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
-index 9470f5d46c83bb5d0c4f65b75e6a18a7dfaefccb..79eed13cfdf942a04d41032622fad89231a64e9b 100644
+index 0a0523ff37b7a51dc2152f074fb57b17883bd80f..715881ff75557f4e9165b521061e4b7a35286eba 100644
--- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
+++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
-@@ -186,6 +186,8 @@ namespace WebCore {
+@@ -187,6 +187,8 @@ namespace WebCore {
macro(DelayNode) \
macro(DeprecationReportBody) \
macro(DigitalCredential) \
@@ -2501,10 +2540,10 @@ index 83e2a42d3f09289d61217f63a121611a92aae85d..f4dfda8e9dc1dd9ad221272f09e1bd7f
case ForcedAccessibilityValue::On:
return true;
diff --git a/Source/WebCore/dom/DataTransfer.cpp b/Source/WebCore/dom/DataTransfer.cpp
-index a3c4d925cded155b15360793d54c57ca54fa2986..80773b244e3ee7aa7e585617c408f7d851154e7f 100644
+index c6f2dca0d4aede2bea015d1cca45dff434425938..e6f41af39befe69f47d0e0953f7d689c338ca184 100644
--- a/Source/WebCore/dom/DataTransfer.cpp
+++ b/Source/WebCore/dom/DataTransfer.cpp
-@@ -520,6 +520,14 @@ Ref<DataTransfer> DataTransfer::createForDrag(const Document& document)
+@@ -523,6 +523,14 @@ Ref<DataTransfer> DataTransfer::createForDrag(const Document& document)
return adoptRef(*new DataTransfer(StoreMode::ReadWrite, Pasteboard::createForDragAndDrop(PagePasteboardContext::create(document.pageID())), Type::DragAndDropData));
}
@@ -2520,7 +2559,7 @@ index a3c4d925cded155b15360793d54c57ca54fa2986..80773b244e3ee7aa7e585617c408f7d8
{
auto dataTransfer = adoptRef(*new DataTransfer(StoreMode::ReadWrite, makeUnique<StaticPasteboard>(), Type::DragAndDropData));
diff --git a/Source/WebCore/dom/DataTransfer.h b/Source/WebCore/dom/DataTransfer.h
-index 6327b8ff7709ed58bfd8140e59af87cb3a1f2b51..562812425187e2bae137abb4903a1497d6c4fbab 100644
+index 34ef2f454a732d39acae04987584cab5638b8c60..5e7b788612718dffe3423c89d96141b5b53621fb 100644
--- a/Source/WebCore/dom/DataTransfer.h
+++ b/Source/WebCore/dom/DataTransfer.h
@@ -92,6 +92,9 @@ public:
@@ -2594,16 +2633,15 @@ index 9b344003de17b96d8b9ca8c7f32143a27543b1ea..2208a3f2b7d930bcd291e65b474d4c30
] partial interface Element {
// Returns Promise<undefined> if PointerLockOptionsEnabled Runtime Flag is set, otherwise returns undefined.
diff --git a/Source/WebCore/dom/PointerEvent.cpp b/Source/WebCore/dom/PointerEvent.cpp
-index 2a728c134f837ee36c033971e1c47792f4a3caf2..b1ecb3b2dd2efc43d679bb0f678457188cb2cb3a 100644
+index e0a0916f197cd80b728b89f95fb240374acdb78a..54eb987c3b53784263de9bdc2ee05c6ca8d68f53 100644
--- a/Source/WebCore/dom/PointerEvent.cpp
+++ b/Source/WebCore/dom/PointerEvent.cpp
-@@ -27,10 +27,13 @@
- #include "PointerEvent.h"
+@@ -28,9 +28,12 @@
#include "EventNames.h"
+ #include "MouseEventTypes.h"
+#include "MouseEvent.h"
#include "Node.h"
- #include "PlatformMouseEvent.h"
+#include "PlatformTouchEvent.h"
#include "PointerEventTypeNames.h"
#include <wtf/TZoneMallocInlines.h>
@@ -2730,7 +2768,7 @@ index 7813532cc52d582c42aebc979a1ecd1137765f08..c01cbd53ad2430a6ffab9a80fc73e74a
#endif // USE(LIBWPE)
diff --git a/Source/WebCore/html/FileInputType.cpp b/Source/WebCore/html/FileInputType.cpp
-index 26e7ca561e3923e2b11da48e777348d3928bff53..a151c289dcd1aef5e0f26faaa7785137296829b8 100644
+index 28d2a4af93da12474d1b699f6f0c46522514e3bb..0f20c78e509cce10e4179a1be91173b3de16db10 100644
--- a/Source/WebCore/html/FileInputType.cpp
+++ b/Source/WebCore/html/FileInputType.cpp
@@ -37,6 +37,7 @@
@@ -2753,7 +2791,7 @@ index 26e7ca561e3923e2b11da48e777348d3928bff53..a151c289dcd1aef5e0f26faaa7785137
if (!UserGestureIndicator::processingUserGesture())
return;
-@@ -348,7 +354,9 @@ void FileInputType::setFiles(RefPtr<FileList>&& files, RequestIcon shouldRequest
+@@ -345,7 +351,9 @@ void FileInputType::setFiles(RefPtr<FileList>&& files, RequestIcon shouldRequest
pathsChanged = true;
else {
for (unsigned i = 0; i < length; ++i) {
@@ -2765,10 +2803,10 @@ index 26e7ca561e3923e2b11da48e777348d3928bff53..a151c289dcd1aef5e0f26faaa7785137
break;
}
diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
-index ee592715641d111078aec266c9b35c0eea9a6f48..bc403a764837abce3c7771c31c4909b6c0de211e 100644
+index 79d7f4b39f4bc4ec2535bb355e567e39bc1f9ffa..6d1c4513780476767b4c51c8dcd3afd30088176d 100644
--- a/Source/WebCore/inspector/InspectorController.cpp
+++ b/Source/WebCore/inspector/InspectorController.cpp
-@@ -300,6 +300,8 @@ void InspectorController::disconnectFrontend(FrontendChannel& frontendChannel)
+@@ -295,6 +295,8 @@ void InspectorController::disconnectFrontend(FrontendChannel& frontendChannel)
// Unplug all instrumentations since they aren't needed now.
InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
@@ -2777,7 +2815,7 @@ index ee592715641d111078aec266c9b35c0eea9a6f48..bc403a764837abce3c7771c31c4909b6
}
m_inspectorClient->frontendCountChanged(m_frontendRouter->frontendCount());
-@@ -319,6 +321,8 @@ void InspectorController::disconnectAllFrontends()
+@@ -314,6 +316,8 @@ void InspectorController::disconnectAllFrontends()
// The frontend should call setInspectorFrontendClient(nullptr) under closeWindow().
ASSERT(!m_inspectorFrontendClient);
@@ -2786,7 +2824,7 @@ index ee592715641d111078aec266c9b35c0eea9a6f48..bc403a764837abce3c7771c31c4909b6
if (!m_frontendRouter->hasFrontends())
return;
-@@ -402,8 +406,8 @@ void InspectorController::inspect(Node* node)
+@@ -397,8 +401,8 @@ void InspectorController::inspect(Node* node)
if (!enabled())
return;
@@ -2797,7 +2835,7 @@ index ee592715641d111078aec266c9b35c0eea9a6f48..bc403a764837abce3c7771c31c4909b6
ensureDOMAgent().inspect(node);
}
-@@ -546,4 +550,34 @@ void InspectorController::didComposite(LocalFrame& frame)
+@@ -541,4 +545,34 @@ void InspectorController::didComposite(LocalFrame& frame)
InspectorInstrumentation::didComposite(frame);
}
@@ -2866,10 +2904,10 @@ index 4f5c1e836876710a554455ec53733f72db63de58..774c4a66af84664a7a83ba0790d147f7
} // namespace WebCore
diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp
-index 98e75f2aec7f7defae1e0260f0a563517a61940e..64e9b1713e600a6aa3f02c2c4c70190240881270 100644
+index 7e789f4b0704d574b3bf180b2417822d9ee33994..80e6b4bc7810af19265d24e0de861c8ea2728999 100644
--- a/Source/WebCore/inspector/InspectorInstrumentation.cpp
+++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp
-@@ -598,6 +598,12 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i
+@@ -583,6 +583,12 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i
pageAgent->applyUserAgentOverride(userAgent);
}
@@ -2882,7 +2920,7 @@ index 98e75f2aec7f7defae1e0260f0a563517a61940e..64e9b1713e600a6aa3f02c2c4c701902
void InspectorInstrumentation::applyEmulatedMediaImpl(InstrumentingAgents& instrumentingAgents, AtomString& media)
{
if (auto* pageAgent = instrumentingAgents.enabledPageAgent())
-@@ -681,6 +687,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen
+@@ -666,6 +672,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen
consoleAgent->didFailLoading(identifier, error); // This should come AFTER resource notification, front-end relies on this.
}
@@ -2895,7 +2933,7 @@ index 98e75f2aec7f7defae1e0260f0a563517a61940e..64e9b1713e600a6aa3f02c2c4c701902
void InspectorInstrumentation::willLoadXHRSynchronouslyImpl(InstrumentingAgents& instrumentingAgents)
{
if (auto* networkAgent = instrumentingAgents.enabledNetworkAgent())
-@@ -713,20 +725,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents&
+@@ -698,20 +710,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents&
void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
{
@@ -2919,7 +2957,7 @@ index 98e75f2aec7f7defae1e0260f0a563517a61940e..64e9b1713e600a6aa3f02c2c4c701902
}
void InspectorInstrumentation::frameDetachedFromParentImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
-@@ -809,12 +818,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins
+@@ -791,12 +800,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins
pageDOMDebuggerAgent->frameDocumentUpdated(frame);
}
@@ -2932,7 +2970,7 @@ index 98e75f2aec7f7defae1e0260f0a563517a61940e..64e9b1713e600a6aa3f02c2c4c701902
void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
{
if (frame.isMainFrame()) {
-@@ -845,10 +848,10 @@ void InspectorInstrumentation::frameStoppedLoadingImpl(InstrumentingAgents& inst
+@@ -827,10 +830,10 @@ void InspectorInstrumentation::frameStoppedLoadingImpl(InstrumentingAgents& inst
inspectorPageAgent->frameStoppedLoading(frame);
}
@@ -2945,7 +2983,7 @@ index 98e75f2aec7f7defae1e0260f0a563517a61940e..64e9b1713e600a6aa3f02c2c4c701902
}
void InspectorInstrumentation::frameClearedScheduledNavigationImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
-@@ -863,6 +866,12 @@ void InspectorInstrumentation::accessibilitySettingsDidChangeImpl(InstrumentingA
+@@ -845,6 +848,12 @@ void InspectorInstrumentation::accessibilitySettingsDidChangeImpl(InstrumentingA
inspectorPageAgent->accessibilitySettingsDidChange();
}
@@ -2958,7 +2996,7 @@ index 98e75f2aec7f7defae1e0260f0a563517a61940e..64e9b1713e600a6aa3f02c2c4c701902
#if ENABLE(DARK_MODE_CSS)
void InspectorInstrumentation::defaultAppearanceDidChangeImpl(InstrumentingAgents& instrumentingAgents)
{
-@@ -915,6 +924,12 @@ void InspectorInstrumentation::interceptResponseImpl(InstrumentingAgents& instru
+@@ -897,6 +906,12 @@ void InspectorInstrumentation::interceptResponseImpl(InstrumentingAgents& instru
networkAgent->interceptResponse(response, identifier, WTFMove(handler));
}
@@ -2971,7 +3009,7 @@ index 98e75f2aec7f7defae1e0260f0a563517a61940e..64e9b1713e600a6aa3f02c2c4c701902
// JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes.
static bool isConsoleAssertMessage(MessageSource source, MessageType type)
{
-@@ -1051,6 +1066,12 @@ void InspectorInstrumentation::consoleStopRecordingCanvasImpl(InstrumentingAgent
+@@ -1015,6 +1030,12 @@ void InspectorInstrumentation::consoleStopRecordingCanvasImpl(InstrumentingAgent
canvasAgent->consoleStopRecordingCanvas(context);
}
@@ -2981,10 +3019,10 @@ index 98e75f2aec7f7defae1e0260f0a563517a61940e..64e9b1713e600a6aa3f02c2c4c701902
+ pageRuntimeAgent->bindingCalled(globalObject, name, arg);
+}
+
- void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents& instrumentingAgents, Database& database)
+ void InspectorInstrumentation::didDispatchDOMStorageEventImpl(InstrumentingAgents& instrumentingAgents, const String& key, const String& oldValue, const String& newValue, StorageType storageType, const SecurityOrigin& securityOrigin)
{
- if (auto* databaseAgent = instrumentingAgents.enabledDatabaseAgent())
-@@ -1357,6 +1378,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins
+ if (auto* domStorageAgent = instrumentingAgents.enabledDOMStorageAgent())
+@@ -1305,6 +1326,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins
layerTreeAgent->renderLayerDestroyed(renderLayer);
}
@@ -3021,7 +3059,7 @@ index 98e75f2aec7f7defae1e0260f0a563517a61940e..64e9b1713e600a6aa3f02c2c4c701902
InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(WorkerOrWorkletGlobalScope& globalScope)
{
return globalScope.inspectorController().m_instrumentingAgents;
-@@ -1373,6 +1424,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page)
+@@ -1321,6 +1372,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page)
return page.inspectorController().m_instrumentingAgents.get();
}
@@ -3036,7 +3074,7 @@ index 98e75f2aec7f7defae1e0260f0a563517a61940e..64e9b1713e600a6aa3f02c2c4c701902
{
// Using RefPtr makes us hit the m_inRemovedLastRefFunction assert.
diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h
-index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821befb7818c5b 100644
+index c338ad466f69c4b03121e0b17fbc9a4729654aff..6139fb2b5e0364bce1a5720200943f3005f541c3 100644
--- a/Source/WebCore/inspector/InspectorInstrumentation.h
+++ b/Source/WebCore/inspector/InspectorInstrumentation.h
@@ -31,6 +31,7 @@
@@ -3047,7 +3085,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
#include "CSSSelector.h"
#include "CanvasBase.h"
#include "CanvasRenderingContext.h"
-@@ -45,6 +46,7 @@
+@@ -44,6 +45,7 @@
#include "LocalFrame.h"
#include "LocalFrameView.h"
#include "Page.h"
@@ -3055,7 +3093,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
#include "ResourceLoader.h"
#include "ResourceLoaderIdentifier.h"
#include "StorageArea.h"
-@@ -78,6 +80,7 @@ class DOMWrapperWorld;
+@@ -77,6 +79,7 @@ class DOMWrapperWorld;
class Document;
class DocumentLoader;
class EventListener;
@@ -3063,7 +3101,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
class HTTPHeaderMap;
class InspectorTimelineAgent;
class InstrumentingAgents;
-@@ -193,6 +196,7 @@ public:
+@@ -194,6 +197,7 @@ public:
static void didRecalculateStyle(Document&);
static void didScheduleStyleRecalculation(Document&);
static void applyUserAgentOverride(LocalFrame&, String&);
@@ -3071,7 +3109,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
static void applyEmulatedMedia(LocalFrame&, AtomString&);
static void flexibleBoxRendererBeganLayout(const RenderObject&);
-@@ -205,6 +209,7 @@ public:
+@@ -206,6 +210,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&);
@@ -3079,7 +3117,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
static void willSendRequest(ServiceWorkerGlobalScope&, ResourceLoaderIdentifier, ResourceRequest&);
static void didReceiveResourceResponse(ServiceWorkerGlobalScope&, ResourceLoaderIdentifier, const ResourceResponse&);
-@@ -231,13 +236,13 @@ public:
+@@ -232,13 +237,13 @@ public:
static void frameDetachedFromParent(LocalFrame&);
static void didCommitLoad(LocalFrame&, DocumentLoader*);
static void frameDocumentUpdated(LocalFrame&);
@@ -3095,7 +3133,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
#if ENABLE(DARK_MODE_CSS)
static void defaultAppearanceDidChange(Page&);
#endif
-@@ -248,6 +253,7 @@ public:
+@@ -249,6 +254,7 @@ public:
static bool shouldInterceptResponse(const LocalFrame&, const ResourceResponse&);
static void interceptRequest(ResourceLoader&, Function<void(const ResourceRequest&)>&&);
static void interceptResponse(const LocalFrame&, const ResourceResponse&, ResourceLoaderIdentifier, CompletionHandler<void(const ResourceResponse&, RefPtr<FragmentedSharedBuffer>)>&&);
@@ -3103,15 +3141,15 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
static void addMessageToConsole(Page&, std::unique_ptr<Inspector::ConsoleMessage>);
static void addMessageToConsole(WorkerOrWorkletGlobalScope&, std::unique_ptr<Inspector::ConsoleMessage>);
-@@ -269,6 +275,7 @@ public:
- static void stopProfiling(Page&, JSC::JSGlobalObject*, const String& title);
+@@ -270,6 +276,7 @@ public:
+ static void stopProfiling(Page&, const String& title);
static void consoleStartRecordingCanvas(CanvasRenderingContext&, JSC::JSGlobalObject&, JSC::JSObject* options);
static void consoleStopRecordingCanvas(CanvasRenderingContext&);
+ static void bindingCalled(Page& , JSC::JSGlobalObject*, const String& name, const String& arg);
- static void performanceMark(ScriptExecutionContext&, const String&, std::optional<MonotonicTime>, LocalFrame*);
+ static void performanceMark(ScriptExecutionContext&, const String&, std::optional<MonotonicTime>);
-@@ -327,6 +334,12 @@ public:
+@@ -323,6 +330,12 @@ public:
static void layerTreeDidChange(Page*);
static void renderLayerDestroyed(Page*, const RenderLayer&);
@@ -3124,7 +3162,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
static void frontendCreated();
static void frontendDeleted();
static bool hasFrontends() { return InspectorInstrumentationPublic::hasFrontends(); }
-@@ -343,6 +356,8 @@ public:
+@@ -339,6 +352,8 @@ public:
static void registerInstrumentingAgents(InstrumentingAgents&);
static void unregisterInstrumentingAgents(InstrumentingAgents&);
@@ -3133,7 +3171,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
private:
static void didClearWindowObjectInWorldImpl(InstrumentingAgents&, LocalFrame&, DOMWrapperWorld&);
static bool isDebuggerPausedImpl(InstrumentingAgents&);
-@@ -422,6 +437,7 @@ private:
+@@ -418,6 +433,7 @@ private:
static void didRecalculateStyleImpl(InstrumentingAgents&);
static void didScheduleStyleRecalculationImpl(InstrumentingAgents&, Document&);
static void applyUserAgentOverrideImpl(InstrumentingAgents&, String&);
@@ -3141,7 +3179,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
static void applyEmulatedMediaImpl(InstrumentingAgents&, AtomString&);
static void flexibleBoxRendererBeganLayoutImpl(InstrumentingAgents&, const RenderObject&);
-@@ -436,6 +452,7 @@ private:
+@@ -432,6 +448,7 @@ private:
static void didReceiveDataImpl(InstrumentingAgents&, ResourceLoaderIdentifier, const SharedBuffer*, int encodedDataLength);
static void didFinishLoadingImpl(InstrumentingAgents&, ResourceLoaderIdentifier, DocumentLoader*, const NetworkLoadMetrics&, ResourceLoader*);
static void didFailLoadingImpl(InstrumentingAgents&, ResourceLoaderIdentifier, DocumentLoader*, const ResourceError&);
@@ -3149,7 +3187,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
static void willLoadXHRSynchronouslyImpl(InstrumentingAgents&);
static void didLoadXHRSynchronouslyImpl(InstrumentingAgents&);
static void scriptImportedImpl(InstrumentingAgents&, ResourceLoaderIdentifier, const String& sourceString);
-@@ -446,13 +463,13 @@ private:
+@@ -442,13 +459,13 @@ private:
static void frameDetachedFromParentImpl(InstrumentingAgents&, LocalFrame&);
static void didCommitLoadImpl(InstrumentingAgents&, LocalFrame&, DocumentLoader*);
static void frameDocumentUpdatedImpl(InstrumentingAgents&, LocalFrame&);
@@ -3165,7 +3203,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
#if ENABLE(DARK_MODE_CSS)
static void defaultAppearanceDidChangeImpl(InstrumentingAgents&);
#endif
-@@ -463,6 +480,7 @@ private:
+@@ -459,6 +476,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>)>&&);
@@ -3173,15 +3211,15 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
static void addMessageToConsoleImpl(InstrumentingAgents&, std::unique_ptr<Inspector::ConsoleMessage>);
-@@ -479,6 +497,7 @@ private:
- static void stopProfilingImpl(InstrumentingAgents&, JSC::JSGlobalObject*, const String& title);
+@@ -473,6 +491,7 @@ private:
+ static void stopProfilingImpl(InstrumentingAgents&, const String& title);
static void consoleStartRecordingCanvasImpl(InstrumentingAgents&, CanvasRenderingContext&, JSC::JSGlobalObject&, JSC::JSObject* options);
static void consoleStopRecordingCanvasImpl(InstrumentingAgents&, CanvasRenderingContext&);
+ static void bindingCalledImpl(InstrumentingAgents&, JSC::JSGlobalObject*, const String& name, const String& arg);
- static void performanceMarkImpl(InstrumentingAgents&, const String& label, std::optional<MonotonicTime>, LocalFrame*);
+ static void performanceMarkImpl(InstrumentingAgents&, const String& label, std::optional<MonotonicTime>);
-@@ -537,6 +556,12 @@ private:
+@@ -526,6 +545,12 @@ private:
static void layerTreeDidChangeImpl(InstrumentingAgents&);
static void renderLayerDestroyedImpl(InstrumentingAgents&, const RenderLayer&);
@@ -3194,7 +3232,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
static InstrumentingAgents& instrumentingAgents(Page&);
static InstrumentingAgents& instrumentingAgents(WorkerOrWorkletGlobalScope&);
static InstrumentingAgents& instrumentingAgents(ServiceWorkerGlobalScope&);
-@@ -1070,6 +1095,13 @@ inline void InspectorInstrumentation::applyUserAgentOverride(LocalFrame& frame,
+@@ -1071,6 +1096,13 @@ inline void InspectorInstrumentation::applyUserAgentOverride(LocalFrame& frame,
applyUserAgentOverrideImpl(*agents, userAgent);
}
@@ -3208,7 +3246,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
inline void InspectorInstrumentation::applyEmulatedMedia(LocalFrame& frame, AtomString& media)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
-@@ -1172,6 +1204,13 @@ inline void InspectorInstrumentation::didFailLoading(ServiceWorkerGlobalScope& g
+@@ -1173,6 +1205,13 @@ inline void InspectorInstrumentation::didFailLoading(ServiceWorkerGlobalScope& g
didFailLoadingImpl(instrumentingAgents(globalScope), identifier, nullptr, error);
}
@@ -3222,7 +3260,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
inline void InspectorInstrumentation::continueAfterXFrameOptionsDenied(LocalFrame& frame, ResourceLoaderIdentifier identifier, DocumentLoader& loader, const ResourceResponse& response)
{
// Treat the same as didReceiveResponse.
-@@ -1262,13 +1301,6 @@ inline void InspectorInstrumentation::frameDocumentUpdated(LocalFrame& frame)
+@@ -1263,13 +1302,6 @@ inline void InspectorInstrumentation::frameDocumentUpdated(LocalFrame& frame)
frameDocumentUpdatedImpl(*agents, frame);
}
@@ -3236,7 +3274,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
inline void InspectorInstrumentation::frameStartedLoading(LocalFrame& frame)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
-@@ -1290,11 +1322,11 @@ inline void InspectorInstrumentation::frameStoppedLoading(LocalFrame& frame)
+@@ -1291,11 +1323,11 @@ inline void InspectorInstrumentation::frameStoppedLoading(LocalFrame& frame)
frameStoppedLoadingImpl(*agents, frame);
}
@@ -3250,7 +3288,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
}
inline void InspectorInstrumentation::frameClearedScheduledNavigation(Frame& frame)
-@@ -1310,6 +1342,13 @@ inline void InspectorInstrumentation::accessibilitySettingsDidChange(Page& page)
+@@ -1311,6 +1343,13 @@ inline void InspectorInstrumentation::accessibilitySettingsDidChange(Page& page)
accessibilitySettingsDidChangeImpl(instrumentingAgents(page));
}
@@ -3264,7 +3302,7 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
#if ENABLE(DARK_MODE_CSS)
inline void InspectorInstrumentation::defaultAppearanceDidChange(Page& page)
{
-@@ -1362,6 +1401,13 @@ inline void InspectorInstrumentation::interceptResponse(const LocalFrame& frame,
+@@ -1363,6 +1402,13 @@ inline void InspectorInstrumentation::interceptResponse(const LocalFrame& frame,
interceptResponseImpl(*agents, response, identifier, WTFMove(handler));
}
@@ -3275,11 +3313,11 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
+ setStoppingLoadingDueToProcessSwapImpl(*agents, value);
+}
+
- inline void InspectorInstrumentation::didOpenDatabase(Database& database)
+ 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());
-@@ -1698,6 +1744,11 @@ inline void InspectorInstrumentation::performanceMark(ScriptExecutionContext& co
- performanceMarkImpl(*agents, label, WTFMove(startTime), frame);
+@@ -1679,6 +1725,11 @@ inline void InspectorInstrumentation::performanceMark(ScriptExecutionContext& co
+ performanceMarkImpl(*agents, label, WTFMove(startTime));
}
+inline void InspectorInstrumentation::bindingCalled(Page& page, JSC::JSGlobalObject* globalObject, const String& name, const String& arg)
@@ -3287,10 +3325,10 @@ index 81d38dfe2e63476b86b87fccc3544090454ae683..7dfb4d6ed4a795bae882e70c80821bef
+ bindingCalledImpl(instrumentingAgents(page), globalObject, name, arg);
+}
+
- inline void InspectorInstrumentation::didRequestAnimationFrame(Document& document, int callbackId)
+ inline void InspectorInstrumentation::didRequestAnimationFrame(ScriptExecutionContext& scriptExecutionContext, int callbackId)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
-@@ -1754,6 +1805,42 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren
+@@ -1735,6 +1786,42 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren
renderLayerDestroyedImpl(*agents, renderLayer);
}
@@ -3386,34 +3424,33 @@ index c028341e84e59a6b1b16107fd74feb21f70b12ab..d385418ac34e8f315f201801a2c65226
+
}
diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
-index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da0729510cbf 100644
+index a477bad0c14c9304b9c2f03aa4e690e8b27a7756..fcb712a41223ec4698337a8b17999e0ca049ae40 100644
--- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
+++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
-@@ -55,6 +55,7 @@
- #include "ContainerNode.h"
+@@ -56,6 +56,7 @@
#include "Cookie.h"
#include "CookieJar.h"
+ #include "CustomElementRegistry.h"
+#include "DirectoryFileListCreator.h"
#include "DOMEditor.h"
#include "DOMException.h"
#include "DOMPatchSupport.h"
-@@ -65,10 +66,15 @@
+@@ -67,9 +68,14 @@
#include "Event.h"
#include "EventListener.h"
#include "EventNames.h"
+#include "File.h"
+#include <FileChooser.h>
+#include "FileList.h"
- #include "FrameTree.h"
- #include "FullscreenManager.h"
+#include "FloatQuad.h"
+ #include "FrameTree.h"
#include "HTMLElement.h"
#include "HTMLFrameOwnerElement.h"
+#include "HTMLInputElement.h"
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
#include "HTMLScriptElement.h"
-@@ -102,12 +108,14 @@
+@@ -103,12 +109,14 @@
#include "Pasteboard.h"
#include "PseudoElement.h"
#include "RenderGrid.h"
@@ -3428,7 +3465,7 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
#include "StaticNodeList.h"
#include "StyleProperties.h"
#include "StyleResolver.h"
-@@ -149,7 +157,8 @@ using namespace HTMLNames;
+@@ -150,7 +158,8 @@ using namespace HTMLNames;
static const size_t maxTextSize = 10000;
static const UChar horizontalEllipsisUChar[] = { horizontalEllipsis, 0 };
@@ -3438,7 +3475,7 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
{
if (!colorObject)
return std::nullopt;
-@@ -168,7 +177,7 @@ static std::optional<Color> parseColor(RefPtr<JSON::Object>&& colorObject)
+@@ -169,7 +178,7 @@ static std::optional<Color> parseColor(RefPtr<JSON::Object>&& colorObject)
static std::optional<Color> parseRequiredConfigColor(const String& fieldName, JSON::Object& configObject)
{
@@ -3447,7 +3484,7 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
}
static Color parseOptionalConfigColor(const String& fieldName, JSON::Object& configObject)
-@@ -195,6 +204,20 @@ static bool parseQuad(Ref<JSON::Array>&& quadArray, FloatQuad* quad)
+@@ -196,6 +205,20 @@ static bool parseQuad(Ref<JSON::Array>&& quadArray, FloatQuad* quad)
return true;
}
@@ -3468,7 +3505,7 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
class RevalidateStyleAttributeTask final : public CanMakeCheckedPtr<RevalidateStyleAttributeTask> {
WTF_MAKE_TZONE_ALLOCATED(RevalidateStyleAttributeTask);
WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(RevalidateStyleAttributeTask);
-@@ -475,6 +498,20 @@ Node* InspectorDOMAgent::assertNode(Inspector::Protocol::ErrorString& errorStrin
+@@ -476,6 +499,20 @@ Node* InspectorDOMAgent::assertNode(Inspector::Protocol::ErrorString& errorStrin
return node.get();
}
@@ -3489,7 +3526,7 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
Document* InspectorDOMAgent::assertDocument(Inspector::Protocol::ErrorString& errorString, Inspector::Protocol::DOM::NodeId nodeId)
{
RefPtr node = assertNode(errorString, nodeId);
-@@ -1549,16 +1586,7 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::highlightNode(std::o
+@@ -1550,16 +1587,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;
@@ -3507,7 +3544,7 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
if (!node)
return makeUnexpected(errorString);
-@@ -1813,15 +1841,155 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::setInspectedNode(Ins
+@@ -1814,15 +1842,159 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::setInspectedNode(Ins
return { };
}
@@ -3517,13 +3554,17 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
+ return containingView.convertToRootView(point - toFloatSize(containingView.documentScrollPositionRelativeToViewOrigin()));
+}
+
-+static void frameQuadToViewport(LocalFrameView& containingView, FloatQuad& quad, float pageScaleFactor)
++static void frameQuadToViewport(LocalFrameView& containingView, FloatQuad& quad, Page& inspectedPage)
+{
++ float pageScaleFactor = inspectedPage.pageScaleFactor();
++ auto mainFrame = inspectedPage.localMainFrame();
++ float scale = pageScaleFactor * mainFrame->pageZoomFactor();
++
+ // Return css (not dip) coordinates by scaling back.
-+ quad.setP1(contentsToRootView(containingView, quad.p1()).scaled(1 / pageScaleFactor));
-+ quad.setP2(contentsToRootView(containingView, quad.p2()).scaled(1 / pageScaleFactor));
-+ quad.setP3(contentsToRootView(containingView, quad.p3()).scaled(1 / pageScaleFactor));
-+ quad.setP4(contentsToRootView(containingView, quad.p4()).scaled(1 / pageScaleFactor));
++ quad.setP1(contentsToRootView(containingView, quad.p1()).scaled(1 / scale));
++ quad.setP2(contentsToRootView(containingView, quad.p2()).scaled(1 / scale));
++ quad.setP3(contentsToRootView(containingView, quad.p3()).scaled(1 / scale));
++ quad.setP4(contentsToRootView(containingView, quad.p4()).scaled(1 / scale));
+}
+
+static Ref<Inspector::Protocol::DOM::Quad> buildObjectForQuad(const FloatQuad& quad)
@@ -3581,7 +3622,7 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
+ if (!node)
+ return makeUnexpected("Node not found"_s);
+
-+ m_inspectedPage.isolatedUpdateRendering();
++ m_inspectedPage->isolatedUpdateRendering();
+ if (!node->isConnected())
+ return makeUnexpected("Node is detached from document"_s);
+
@@ -3627,7 +3668,7 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
+ return makeUnexpected("Node not found"_s);
+
+ // Ensure quads are up to date.
-+ m_inspectedPage.isolatedUpdateRendering();
++ m_inspectedPage->isolatedUpdateRendering();
+
+ LocalFrameView* containingView = node->document().view();
+ if (!containingView)
@@ -3636,7 +3677,7 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
+ Vector<FloatQuad> quads;
+ CollectQuads(node, quads);
+ for (auto& quad : quads)
-+ frameQuadToViewport(*containingView, quad, m_inspectedPage.pageScaleFactor());
++ frameQuadToViewport(*containingView, quad, m_inspectedPage.get());
+ return buildArrayOfQuads(quads);
+}
+
@@ -3666,7 +3707,7 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
if (!object)
return makeUnexpected("Missing injected script for given nodeId"_s);
-@@ -3087,7 +3255,7 @@ Inspector::Protocol::ErrorStringOr<Inspector::Protocol::DOM::NodeId> InspectorDO
+@@ -3088,7 +3260,7 @@ Inspector::Protocol::ErrorStringOr<Inspector::Protocol::DOM::NodeId> InspectorDO
return makeUnexpected("Missing node for given path"_s);
}
@@ -3675,7 +3716,7 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
{
Document* document = &node->document();
if (auto* templateHost = document->templateDocumentHost())
-@@ -3096,12 +3264,18 @@ RefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNod
+@@ -3097,12 +3269,18 @@ RefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNod
if (!frame)
return nullptr;
@@ -3697,7 +3738,7 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
}
Node* InspectorDOMAgent::scriptValueAsNode(JSC::JSValue value)
-@@ -3209,4 +3383,89 @@ Inspector::Protocol::ErrorStringOr<Ref<Inspector::Protocol::DOM::MediaStats>> In
+@@ -3210,4 +3388,89 @@ Inspector::Protocol::ErrorStringOr<Ref<Inspector::Protocol::DOM::MediaStats>> In
#endif
}
@@ -3788,7 +3829,7 @@ index f671c06ea5c75e6f4df338ac6c404533a04a3cfd..0d6e106c19063b0ffaeca1cc6830da07
+
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.h b/Source/WebCore/inspector/agents/InspectorDOMAgent.h
-index ab0499c5e381855f55fa89227f4da05c7bcf40b1..e506a903ba60173b47135d5b18cfa0d3cdd8783e 100644
+index 0d1406e0a1d061e2336bbd49c56328ce93351f14..4187fb453adebfd98f91ebbf99e38a072ef8942b 100644
--- a/Source/WebCore/inspector/agents/InspectorDOMAgent.h
+++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.h
@@ -59,6 +59,7 @@ namespace WebCore {
@@ -3861,7 +3902,7 @@ index ab0499c5e381855f55fa89227f4da05c7bcf40b1..e506a903ba60173b47135d5b18cfa0d3
void discardBindings();
diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
-index 3c4c9d809004f683d1248be257980bbbc522d132..cfa772a5caa5f0a7db07dc853036e21db2bb9814 100644
+index 6db0a3c6a46a4be5cb6f9f0e6fcbc61ac552e438..cae87102e8228cb944cec4a6ebe83b7d3a0e29bc 100644
--- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
+++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
@@ -59,6 +59,7 @@
@@ -4017,7 +4058,7 @@ index eda400879afb10b687fcbb317c9fdbb3be9c94cd..f3a382c44b53e6b1507fc046e22bff68
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
-index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e3527edffdf2 100644
+index 322ae350279461c5c213a760444580421cb89682..6fc187ab25a6c76c41880fdf63acda1f9bb132cc 100644
--- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
+++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
@@ -32,19 +32,27 @@
@@ -4048,7 +4089,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
#include "HTMLNames.h"
#include "ImageBuffer.h"
#include "InspectorClient.h"
-@@ -57,8 +65,12 @@
+@@ -57,24 +65,38 @@
#include "MIMETypeRegistry.h"
#include "MemoryCache.h"
#include "Page.h"
@@ -4060,8 +4101,10 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+#include "SimpleRange.h"
#include "ScriptController.h"
#include "ScriptSourceCode.h"
++#include "ScrollingCoordinator.h"
#include "SecurityOrigin.h"
-@@ -67,14 +79,23 @@
+ #include "Settings.h"
+ #include "ShouldPartitionCookie.h"
#include "StyleScope.h"
#include "Theme.h"
#include <pal/text/TextEncoding.h>
@@ -4085,7 +4128,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
#include <wtf/text/StringBuilder.h>
#if ENABLE(APPLICATION_MANIFEST)
-@@ -96,6 +117,11 @@ using namespace Inspector;
+@@ -96,6 +118,11 @@ using namespace Inspector;
WTF_MAKE_TZONE_ALLOCATED_IMPL(InspectorPageAgent);
@@ -4097,7 +4140,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
static bool decodeBuffer(std::span<const uint8_t> buffer, const String& textEncodingName, String* result)
{
if (buffer.data()) {
-@@ -348,6 +374,7 @@ InspectorPageAgent::InspectorPageAgent(PageAgentContext& context, InspectorClien
+@@ -348,6 +375,7 @@ InspectorPageAgent::InspectorPageAgent(PageAgentContext& context, InspectorClien
, m_frontendDispatcher(makeUnique<Inspector::PageFrontendDispatcher>(context.frontendRouter))
, m_backendDispatcher(Inspector::PageBackendDispatcher::create(context.backendDispatcher, this))
, m_inspectedPage(context.inspectedPage)
@@ -4105,7 +4148,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
, m_client(client)
, m_overlay(overlay)
{
-@@ -377,12 +404,20 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::enable()
+@@ -377,12 +405,20 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::enable()
defaultUserPreferencesDidChange();
@@ -4126,13 +4169,13 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
setShowPaintRects(false);
#if !PLATFORM(IOS_FAMILY)
-@@ -435,6 +470,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::reload(std::optiona
+@@ -435,6 +471,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::reload(std::optiona
return { };
}
+Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::goBack()
+{
-+ if (!m_inspectedPage.backForward().goBack())
++ if (!m_inspectedPage->backForward().goBack())
+ return makeUnexpected("Failed to go back"_s);
+
+ return { };
@@ -4140,7 +4183,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+
+Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::goForward()
+{
-+ if (!m_inspectedPage.backForward().goForward())
++ if (!m_inspectedPage->backForward().goForward())
+ return makeUnexpected("Failed to go forward"_s);
+
+ return { };
@@ -4148,8 +4191,8 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+
Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::navigate(const String& url)
{
- RefPtr localMainFrame = m_inspectedPage.localMainFrame();
-@@ -461,6 +512,13 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideUserAgent(c
+ RefPtr localMainFrame = m_inspectedPage->localMainFrame();
+@@ -461,6 +513,13 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideUserAgent(c
return { };
}
@@ -4162,8 +4205,8 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+
Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Inspector::Protocol::Page::Setting setting, std::optional<bool>&& value)
{
- auto& inspectedPageSettings = m_inspectedPage.settings();
-@@ -474,6 +532,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+ auto& inspectedPageSettings = m_inspectedPage->settings();
+@@ -474,6 +533,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
inspectedPageSettings.setAuthorAndUserStylesEnabledInspectorOverride(value);
return { };
@@ -4176,7 +4219,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
case Inspector::Protocol::Page::Setting::ICECandidateFilteringEnabled:
inspectedPageSettings.setICECandidateFilteringEnabledInspectorOverride(value);
return { };
-@@ -500,6 +564,45 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+@@ -500,6 +565,39 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
m_client->setDeveloperPreferenceOverride(InspectorClient::DeveloperPreference::NeedsSiteSpecificQuirks, value);
return { };
@@ -4193,17 +4236,11 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+#endif
+
+ case Protocol::Page::Setting::InputTypeMonthEnabled:
-+// Playwright client sends it even if it's not supported.
-+#if ENABLE(INPUT_TYPE_MONTH)
+ inspectedPageSettings.setInputTypeMonthEnabled(value.value_or(false));
-+#endif
+ return { };
+
+ case Protocol::Page::Setting::InputTypeWeekEnabled:
-+// Playwright client sends it even if it's not supported.
-+#if ENABLE(INPUT_TYPE_WEEK)
+ inspectedPageSettings.setInputTypeWeekEnabled(value.value_or(false));
-+#endif
+ return { };
+
+ case Protocol::Page::Setting::FixedBackgroundsPaintRelativeToDocument:
@@ -4222,7 +4259,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
case Inspector::Protocol::Page::Setting::ScriptEnabled:
inspectedPageSettings.setScriptEnabledInspectorOverride(value);
return { };
-@@ -512,6 +615,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+@@ -512,6 +610,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
inspectedPageSettings.setShowRepaintCounterInspectorOverride(value);
return { };
@@ -4235,7 +4272,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
case Inspector::Protocol::Page::Setting::WebSecurityEnabled:
inspectedPageSettings.setWebSecurityEnabledInspectorOverride(value);
return { };
-@@ -919,15 +1028,16 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setShowPaintRects(b
+@@ -919,15 +1023,16 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setShowPaintRects(b
return { };
}
@@ -4257,7 +4294,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
}
void InspectorPageAgent::frameNavigated(LocalFrame& frame)
-@@ -935,13 +1045,38 @@ void InspectorPageAgent::frameNavigated(LocalFrame& frame)
+@@ -935,13 +1040,38 @@ void InspectorPageAgent::frameNavigated(LocalFrame& frame)
m_frontendDispatcher->frameNavigated(buildObjectForFrame(&frame));
}
@@ -4299,7 +4336,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
}
Frame* InspectorPageAgent::frameForId(const Inspector::Protocol::Network::FrameId& frameId)
-@@ -953,20 +1088,21 @@ String InspectorPageAgent::frameId(Frame* frame)
+@@ -953,20 +1083,21 @@ String InspectorPageAgent::frameId(Frame* frame)
{
if (!frame)
return emptyString();
@@ -4329,7 +4366,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
}
LocalFrame* InspectorPageAgent::assertFrame(Inspector::Protocol::ErrorString& errorString, const Inspector::Protocol::Network::FrameId& frameId)
-@@ -977,11 +1113,6 @@ LocalFrame* InspectorPageAgent::assertFrame(Inspector::Protocol::ErrorString& er
+@@ -977,11 +1108,6 @@ LocalFrame* InspectorPageAgent::assertFrame(Inspector::Protocol::ErrorString& er
return frame;
}
@@ -4341,7 +4378,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
void InspectorPageAgent::frameStartedLoading(LocalFrame& frame)
{
m_frontendDispatcher->frameStartedLoading(frameId(&frame));
-@@ -992,9 +1123,9 @@ void InspectorPageAgent::frameStoppedLoading(LocalFrame& frame)
+@@ -992,9 +1118,9 @@ void InspectorPageAgent::frameStoppedLoading(LocalFrame& frame)
m_frontendDispatcher->frameStoppedLoading(frameId(&frame));
}
@@ -4353,7 +4390,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
}
void InspectorPageAgent::frameClearedScheduledNavigation(Frame& frame)
-@@ -1041,6 +1172,12 @@ void InspectorPageAgent::defaultUserPreferencesDidChange()
+@@ -1041,6 +1167,12 @@ void InspectorPageAgent::defaultUserPreferencesDidChange()
m_frontendDispatcher->defaultUserPreferencesDidChange(WTFMove(defaultUserPreferences));
}
@@ -4366,7 +4403,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
#if ENABLE(DARK_MODE_CSS)
void InspectorPageAgent::defaultAppearanceDidChange()
{
-@@ -1054,6 +1191,9 @@ void InspectorPageAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapp
+@@ -1054,6 +1186,9 @@ void InspectorPageAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapp
return;
if (m_bootstrapScript.isEmpty())
@@ -4376,7 +4413,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
return;
frame.script().evaluateIgnoringException(ScriptSourceCode(m_bootstrapScript, JSC::SourceTaintedOrigin::Untainted, URL { "web-inspector://bootstrap.js"_str }));
-@@ -1101,6 +1241,51 @@ void InspectorPageAgent::didRecalculateStyle()
+@@ -1101,6 +1236,51 @@ void InspectorPageAgent::didRecalculateStyle()
protectedOverlay()->update();
}
@@ -4428,7 +4465,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
Ref<Inspector::Protocol::Page::Frame> InspectorPageAgent::buildObjectForFrame(LocalFrame* frame)
{
ASSERT_ARG(frame, frame);
-@@ -1194,6 +1379,12 @@ void InspectorPageAgent::applyUserAgentOverride(String& userAgent)
+@@ -1194,6 +1374,12 @@ void InspectorPageAgent::applyUserAgentOverride(String& userAgent)
userAgent = m_userAgentOverride;
}
@@ -4441,7 +4478,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
void InspectorPageAgent::applyEmulatedMedia(AtomString& media)
{
if (!m_emulatedMedia.isEmpty())
-@@ -1221,11 +1412,13 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotNode(Insp
+@@ -1221,11 +1407,13 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotNode(Insp
return snapshot->toDataURL("image/png"_s, std::nullopt, PreserveResolution::Yes);
}
@@ -4455,24 +4492,24 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+ options.flags.add(SnapshotFlags::OmitDeviceScaleFactor);
IntRect rectangle(x, y, width, height);
- RefPtr localMainFrame = m_inspectedPage.localMainFrame();
-@@ -1239,6 +1432,43 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int
+ RefPtr localMainFrame = m_inspectedPage->localMainFrame();
+@@ -1239,6 +1427,43 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int
return snapshot->toDataURL("image/png"_s, std::nullopt, PreserveResolution::Yes);
}
+Protocol::ErrorStringOr<void> InspectorPageAgent::setForcedColors(std::optional<Protocol::Page::ForcedColors>&& forcedColors)
+{
+ if (!forcedColors) {
-+ m_inspectedPage.setUseForcedColorsOverride(std::nullopt);
++ m_inspectedPage->setUseForcedColorsOverride(std::nullopt);
+ return { };
+ }
+
+ switch (*forcedColors) {
+ case Protocol::Page::ForcedColors::Active:
-+ m_inspectedPage.setUseForcedColorsOverride(true);
++ m_inspectedPage->setUseForcedColorsOverride(true);
+ return { };
+ case Protocol::Page::ForcedColors::None:
-+ m_inspectedPage.setUseForcedColorsOverride(false);
++ m_inspectedPage->setUseForcedColorsOverride(false);
+ return { };
+ }
+
@@ -4492,7 +4529,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+Protocol::ErrorStringOr<void> InspectorPageAgent::setTouchEmulationEnabled(bool enabled)
+{
+ setScreenHasTouchDeviceOverride(enabled);
-+ m_inspectedPage.settings().setTouchEventDOMAttributesEnabled(enabled);
++ m_inspectedPage->settings().setTouchEventDOMAttributesEnabled(enabled);
+ return { };
+}
+
@@ -4500,7 +4537,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
#if ENABLE(WEB_ARCHIVE) && USE(CF)
Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
{
-@@ -1255,7 +1485,6 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
+@@ -1255,7 +1480,6 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
}
#endif
@@ -4508,7 +4545,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverride(std::optional<int>&& width, std::optional<int>&& height)
{
if (width.has_value() != height.has_value())
-@@ -1273,6 +1502,498 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverri
+@@ -1273,6 +1497,498 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverri
localMainFrame->setOverrideScreenSize(FloatSize(width.value_or(0), height.value_or(0)));
return { };
}
@@ -4517,7 +4554,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+Protocol::ErrorStringOr<void> InspectorPageAgent::insertText(const String& text)
+{
+ UserGestureIndicator indicator { IsProcessingUserGesture::Yes };
-+ RefPtr frame = m_inspectedPage.checkedFocusController()->focusedOrMainFrame();
++ RefPtr frame = m_inspectedPage->checkedFocusController()->focusedOrMainFrame();
+ if (!frame)
+ return { };
+
@@ -4525,7 +4562,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+ frame->editor().confirmComposition(text);
+ } else {
+ Document* focusedDocument = frame->document();
-+ TypingCommand::insertText(*focusedDocument, text, { });
++ TypingCommand::insertText(*focusedDocument, text, nullptr, { });
+ }
+ return { };
+}
@@ -4913,7 +4950,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+ if (!WebCore::AXObjectCache::accessibilityEnabled())
+ WebCore::AXObjectCache::enableAccessibility();
+
-+ auto* localMainFrame = dynamicDowncast<LocalFrame>(m_inspectedPage.mainFrame());
++ auto* localMainFrame = dynamicDowncast<LocalFrame>(m_inspectedPage->mainFrame());
+ if (!localMainFrame)
+ return makeUnexpected("No local main frame"_s);
+
@@ -4925,7 +4962,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+ if (!axObjectCache)
+ return makeUnexpected("No AXObjectCache for main document"_s);
+
-+ AXCoreObject* axObject = axObjectCache->rootObject();
++ AXCoreObject* axObject = axObjectCache->rootObjectForFrame(*localMainFrame);
+ if (!axObject)
+ return makeUnexpected("No AXObject for main document"_s);
+
@@ -4952,7 +4989,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+
+Protocol::ErrorStringOr<void> InspectorPageAgent::setDefaultBackgroundColorOverride(RefPtr<JSON::Object>&& color)
+{
-+ auto* localFrame = dynamicDowncast<LocalFrame>(m_inspectedPage.mainFrame());
++ auto* localFrame = dynamicDowncast<LocalFrame>(m_inspectedPage->mainFrame());
+ LocalFrameView* view = localFrame ? localFrame->view() : nullptr;
+ if (!view)
+ return makeUnexpected("Internal error: No frame view to set color two"_s);
@@ -4979,7 +5016,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+
+void InspectorPageAgent::ensureUserWorldsExistInAllFrames(const Vector<DOMWrapperWorld*>& worlds)
+{
-+ for (Frame* frame = &m_inspectedPage.mainFrame(); frame; frame = frame->tree().traverseNext()) {
++ for (Frame* frame = &m_inspectedPage->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ auto* localFrame = dynamicDowncast<LocalFrame>(frame);
+ for (auto* world : worlds)
+ localFrame->windowProxy().jsWindowProxy(*world)->window();
@@ -5000,7 +5037,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
+
+Protocol::ErrorStringOr<void> InspectorPageAgent::updateScrollingState()
+{
-+ auto* scrollingCoordinator = m_inspectedPage.scrollingCoordinator();
++ auto* scrollingCoordinator = m_inspectedPage->scrollingCoordinator();
+ if (!scrollingCoordinator)
+ return {};
+ scrollingCoordinator->commitTreeStateIfNeeded();
@@ -5009,7 +5046,7 @@ index 8cd529462736f59fa7b24bdb887faf61e88036dd..25df35396b5fd35a9431e8d47168e352
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.h b/Source/WebCore/inspector/agents/InspectorPageAgent.h
-index c72739aab6ddb20cac65cbe82a14a38d860ae0bd..502b0acd85fe625c13b45f287e38493a772fac1b 100644
+index 7daa8d1d5c96afe1829aa21ccb8ed1b8ebcc3861..da57245795d7cb287daaaaf5d09a523c0f88fcc7 100644
--- a/Source/WebCore/inspector/agents/InspectorPageAgent.h
+++ b/Source/WebCore/inspector/agents/InspectorPageAgent.h
@@ -32,8 +32,10 @@
@@ -5137,7 +5174,7 @@ index c72739aab6ddb20cac65cbe82a14a38d860ae0bd..502b0acd85fe625c13b45f287e38493a
@@ -173,17 +205,22 @@ private:
RefPtr<Inspector::PageBackendDispatcher> m_backendDispatcher;
- Page& m_inspectedPage;
+ WeakRef<Page> m_inspectedPage;
+ Inspector::InjectedScriptManager& m_injectedScriptManager;
InspectorClient* m_client { nullptr };
WeakRef<InspectorOverlay> m_overlay;
@@ -5159,7 +5196,7 @@ index c72739aab6ddb20cac65cbe82a14a38d860ae0bd..502b0acd85fe625c13b45f287e38493a
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp b/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp
-index fe77f9c4f424a9bbf5cdd6c0721a368767aa374c..0a76877d74a791cd1659c173221ee18cf7bb9fb7 100644
+index 0cc351959aaa96bd427ecbf75dd2ba51e730fc30..fb2b6c842a2e2b819ce746403e33550c0d4e2440 100644
--- a/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp
+++ b/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp
@@ -34,6 +34,7 @@
@@ -5223,7 +5260,7 @@ index fe77f9c4f424a9bbf5cdd6c0721a368767aa374c..0a76877d74a791cd1659c173221ee18c
+
+static void addBindingToFrame(LocalFrame& frame, const String& name)
+{
-+ JSC::JSGlobalObject* globalObject = frame.script().globalObject(mainThreadNormalWorld());
++ JSC::JSGlobalObject* globalObject = frame.script().globalObject(mainThreadNormalWorldSingleton());
+ auto& vm = globalObject->vm();
+ JSC::JSLockHolder lock(vm);
+ globalObject->putDirectNativeFunction(vm, globalObject, JSC::Identifier::fromString(vm, name), 1, bindingCallback, JSC::ImplementationVisibility::Public, JSC::NoIntrinsic, JSC::attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
@@ -5234,7 +5271,7 @@ index fe77f9c4f424a9bbf5cdd6c0721a368767aa374c..0a76877d74a791cd1659c173221ee18c
+ if (!m_bindingNames.add(name).isNewEntry)
+ return {};
+
-+ m_inspectedPage.forEachLocalFrame([&](LocalFrame& frame) {
++ m_inspectedPage->forEachLocalFrame([&](LocalFrame& frame) {
+ if (!frame.script().canExecuteScripts(ReasonForCallingCanExecuteScripts::NotAboutToExecuteScript))
+ return;
+
@@ -5283,7 +5320,7 @@ index fe77f9c4f424a9bbf5cdd6c0721a368767aa374c..0a76877d74a791cd1659c173221ee18c
@@ -142,9 +224,6 @@ void PageRuntimeAgent::reportExecutionContextCreation()
return;
- m_inspectedPage.forEachLocalFrame([&](LocalFrame& frame) {
+ m_inspectedPage->forEachLocalFrame([&](LocalFrame& frame) {
- if (!frame.script().canExecuteScripts(ReasonForCallingCanExecuteScripts::NotAboutToExecuteScript))
- return;
-
@@ -5291,7 +5328,7 @@ index fe77f9c4f424a9bbf5cdd6c0721a368767aa374c..0a76877d74a791cd1659c173221ee18c
// Always send the main world first.
diff --git a/Source/WebCore/inspector/agents/page/PageRuntimeAgent.h b/Source/WebCore/inspector/agents/page/PageRuntimeAgent.h
-index b70ca7636463b9199bcbb21bfea055870ba33b34..25fdc23bfb71985fe1af04bddc360d118f329afe 100644
+index ab49ddd13fc6e1ed967cf501afb0230c1e795159..5ea038212cedc1a7b250588b616225edad6f643c 100644
--- a/Source/WebCore/inspector/agents/page/PageRuntimeAgent.h
+++ b/Source/WebCore/inspector/agents/page/PageRuntimeAgent.h
@@ -38,6 +38,7 @@
@@ -5319,7 +5356,7 @@ index b70ca7636463b9199bcbb21bfea055870ba33b34..25fdc23bfb71985fe1af04bddc360d11
@@ -77,6 +81,7 @@ private:
InstrumentingAgents& m_instrumentingAgents;
- Page& m_inspectedPage;
+ WeakRef<Page> m_inspectedPage;
+ HashSet<String> m_bindingNames;
};
@@ -5347,25 +5384,25 @@ index 8fb27c1045b8073d1487d5b61ccdec23a395bfd1..5008052f587ca4ba90da973c539188de
protected:
static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No);
diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
-index 5aac9a91d7049e7ae7e3f98023db100b53db0e8d..dd4b841a49a8087aa2573ffd725a6351380a3724 100644
+index 858e5866d005b40ce61b79c607c4e5530f23f582..ec3d856897d821aeb4ba8616598932b19b1bcf3f 100644
--- a/Source/WebCore/loader/DocumentLoader.cpp
+++ b/Source/WebCore/loader/DocumentLoader.cpp
-@@ -767,8 +767,10 @@ void DocumentLoader::willSendRequest(ResourceRequest&& newRequest, const Resourc
+@@ -773,8 +773,10 @@ void DocumentLoader::willSendRequest(ResourceRequest&& newRequest, const Resourc
if (!didReceiveRedirectResponse)
return completionHandler(WTFMove(newRequest));
-+ InspectorInstrumentation::willCheckNavigationPolicy(*m_frame);
- auto navigationPolicyCompletionHandler = [this, protectedThis = Ref { *this }, protectedFrame = Ref { *m_frame }, completionHandler = WTFMove(completionHandler)] (ResourceRequest&& request, WeakPtr<FormState>&&, NavigationPolicyDecision navigationPolicyDecision) mutable {
++ InspectorInstrumentation::willCheckNavigationPolicy(*frame);
+ auto navigationPolicyCompletionHandler = [this, protectedThis = Ref { *this }, frame, completionHandler = WTFMove(completionHandler)] (ResourceRequest&& request, WeakPtr<FormState>&&, NavigationPolicyDecision navigationPolicyDecision) mutable {
m_waitingForNavigationPolicy = false;
-+ InspectorInstrumentation::didCheckNavigationPolicy(protectedFrame.get(), navigationPolicyDecision != NavigationPolicyDecision::ContinueLoad);
++ InspectorInstrumentation::didCheckNavigationPolicy(*frame, navigationPolicyDecision != NavigationPolicyDecision::ContinueLoad);
switch (navigationPolicyDecision) {
case NavigationPolicyDecision::IgnoreLoad:
case NavigationPolicyDecision::LoadWillContinueInAnotherProcess:
-@@ -1558,11 +1560,17 @@ void DocumentLoader::detachFromFrame(LoadWillContinueInAnotherProcess loadWillCo
+@@ -1573,11 +1575,17 @@ void DocumentLoader::detachFromFrame(LoadWillContinueInAnotherProcess loadWillCo
if (auto navigationID = std::exchange(m_navigationID, { }))
- m_frame->loader().client().documentLoaderDetached(*navigationID, loadWillContinueInAnotherProcess);
+ frame->loader().client().documentLoaderDetached(*navigationID, loadWillContinueInAnotherProcess);
-- InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
+- InspectorInstrumentation::loaderDetachedFromFrame(*frame, *this);
-
observeFrame(nullptr);
}
@@ -5382,23 +5419,23 @@ index 5aac9a91d7049e7ae7e3f98023db100b53db0e8d..dd4b841a49a8087aa2573ffd725a6351
{
m_navigationID = navigationID;
diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h
-index 710b76ba378d0242be7b9fb469203fcd9ec18252..23ebc0f38d5a5a19b23c748149fbbc8aa36059df 100644
+index 564f944a63868ced85f3c412a4df6dce8d257929..b2228742433ef7f478c20328e62e159d6a051b10 100644
--- a/Source/WebCore/loader/DocumentLoader.h
+++ b/Source/WebCore/loader/DocumentLoader.h
-@@ -218,6 +218,8 @@ public:
+@@ -224,6 +224,8 @@ public:
WEBCORE_EXPORT virtual void detachFromFrame(LoadWillContinueInAnotherProcess);
+ void replacedByFragmentNavigation(LocalFrame&);
+
WEBCORE_EXPORT FrameLoader* frameLoader() const;
- RefPtr<FrameLoader> protectedFrameLoader() const;
+ 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 dee3c2e19c47f3451a2a1f52c101064dcd74c8e1..891f10b1871118cadaec7abc0a61016547b93b9f 100644
+index 7073bb8cdc33fcffd7864505cc9dbeb96202e140..d7bf4bb0695d20eb8e479a703a331ba345fb213b 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
-@@ -1322,6 +1322,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr<SerializedScriptValue> stat
+@@ -1319,6 +1319,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr<SerializedScriptValue> stat
}
m_client->dispatchDidNavigateWithinPage();
@@ -5442,7 +5479,7 @@ index dee3c2e19c47f3451a2a1f52c101064dcd74c8e1..891f10b1871118cadaec7abc0a610165
}
void FrameLoader::dispatchOnloadEvents()
-@@ -3655,6 +3664,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error, LoadWill
+@@ -3638,6 +3647,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error, LoadWill
checkCompleted();
if (frame->page())
checkLoadComplete(loadWillContinueInAnotherProcess);
@@ -5451,7 +5488,7 @@ index dee3c2e19c47f3451a2a1f52c101064dcd74c8e1..891f10b1871118cadaec7abc0a610165
}
void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, const SecurityOrigin* requesterOrigin, bool shouldContinue, NavigationHistoryBehavior historyHandling)
-@@ -4538,9 +4549,6 @@ String FrameLoader::referrer() const
+@@ -4522,9 +4533,6 @@ String FrameLoader::referrer() const
void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
{
@@ -5461,7 +5498,7 @@ index dee3c2e19c47f3451a2a1f52c101064dcd74c8e1..891f10b1871118cadaec7abc0a610165
Vector<Ref<DOMWrapperWorld>> worlds;
ScriptController::getAllWorlds(worlds);
for (auto& world : worlds)
-@@ -4550,13 +4558,12 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
+@@ -4534,13 +4542,12 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world)
{
Ref frame = m_frame.get();
@@ -5482,7 +5519,7 @@ index dee3c2e19c47f3451a2a1f52c101064dcd74c8e1..891f10b1871118cadaec7abc0a610165
InspectorInstrumentation::didClearWindowObjectInWorld(frame, world);
}
diff --git a/Source/WebCore/loader/LoaderStrategy.h b/Source/WebCore/loader/LoaderStrategy.h
-index 91340dc21042f545592b442bc42dbceed06219b2..f3591fe333761b10a25ddaf4a4f8d72170dfe336 100644
+index 1b34dfdd2a8e56beab49591a3517aba02c510ee6..768b895c132b73d935198cbfc2126a227a656b46 100644
--- a/Source/WebCore/loader/LoaderStrategy.h
+++ b/Source/WebCore/loader/LoaderStrategy.h
@@ -86,6 +86,7 @@ public:
@@ -5494,7 +5531,7 @@ index 91340dc21042f545592b442bc42dbceed06219b2..f3591fe333761b10a25ddaf4a4f8d721
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 9c950ef94e1f1257ade5560b2ac2c8f57d15c352..79d0034559c5ec7e1a9ee26452a87a2e73d52ca4 100644
+index 5f70f737d06ced029e3b86a4dc93fd49e8ff4cae..15e6c42cbd4733b526493c3c7dfbea62e70ddb0c 100644
--- a/Source/WebCore/loader/NavigationScheduler.cpp
+++ b/Source/WebCore/loader/NavigationScheduler.cpp
@@ -806,7 +806,7 @@ void NavigationScheduler::startTimer()
@@ -5529,12 +5566,12 @@ index 171c80cd90bdc8cc16c5e037b25f07faef0dec4e..0869f1be1699dd1548a2e4df6612d7ff
}
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
-index 2b96086b987dca1f53d68599afa751ba84a083f9..2a44a06c6d5a462f76d39c7100ffc495dd874c81 100644
+index 6fc201b47f8bb970faba58fa195cc2964b42e45c..f77592b2664d435e00bcf83820e4e8ccb110aeb6 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
-@@ -1158,8 +1158,11 @@ ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requ
+@@ -1166,8 +1166,11 @@ ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requ
- request.updateReferrerPolicy(document() ? document()->referrerPolicy() : ReferrerPolicy::Default);
+ request.updateReferrerPolicy(document ? document->referrerPolicy() : ReferrerPolicy::Default);
- if (InspectorInstrumentation::willIntercept(frame.ptr(), request.resourceRequest()))
- request.setCachingPolicy(CachingPolicy::DisallowCaching);
@@ -5546,7 +5583,7 @@ index 2b96086b987dca1f53d68599afa751ba84a083f9..2a44a06c6d5a462f76d39c7100ffc495
if (RefPtr documentLoader = m_documentLoader.get()) {
bool madeHTTPS { request.resourceRequest().wasSchemeOptimisticallyUpgraded() };
-@@ -1785,8 +1788,9 @@ Vector<Ref<SVGImage>> CachedResourceLoader::allCachedSVGImages() const
+@@ -1801,8 +1804,9 @@ Vector<Ref<SVGImage>> CachedResourceLoader::allCachedSVGImages() const
ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::preload(CachedResource::Type type, CachedResourceRequest&& request)
{
@@ -5556,13 +5593,13 @@ index 2b96086b987dca1f53d68599afa751ba84a083f9..2a44a06c6d5a462f76d39c7100ffc495
+ // if (InspectorInstrumentation::willIntercept(protectedFrame().get(), request.resourceRequest()))
+ // return makeUnexpected(ResourceError { errorDomainWebKitInternal, 0, request.resourceRequest().url(), "Inspector intercept"_s });
- ASSERT(m_document);
- if (request.charset().isEmpty() && m_document && (type == CachedResource::Type::Script || type == CachedResource::Type::CSSStyleSheet))
+ RefPtr document = m_document.get();
+ ASSERT(document);
diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h
-index 87eea1d9d7205eff67801b59345a0c3aa097eda1..4d17e0234a86f22abf874c6b08386b5410d2f771 100644
+index 5352cc44f68f9038f7bd64214853fae160f9ba9d..76a9c273cd758af99c2ed4645876b594c55b0ea1 100644
--- a/Source/WebCore/page/ChromeClient.h
+++ b/Source/WebCore/page/ChromeClient.h
-@@ -352,7 +352,7 @@ public:
+@@ -362,7 +362,7 @@ public:
#endif
#if ENABLE(ORIENTATION_EVENTS)
@@ -5570,12 +5607,12 @@ index 87eea1d9d7205eff67801b59345a0c3aa097eda1..4d17e0234a86f22abf874c6b08386b54
+ virtual IntDegrees deviceOrientation() const { return 0; }
#endif
- #if ENABLE(INPUT_TYPE_COLOR)
+ virtual RefPtr<ColorChooser> createColorChooser(ColorChooserClient&, const Color&) = 0;
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
-index 27a216f1047914aef7ebfe50e2273368da439d49..4de0ff57188dbbfe73da33f49a6c6e5dbb178194 100644
+index 408ddc7c6541d80568d126ea5ecdb17caf7b10d3..d588b0c5003f8e39cb03cbf28258b7657d86a04f 100644
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
-@@ -4454,6 +4454,12 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr
+@@ -4462,6 +4462,12 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr
if (!document)
return false;
@@ -5588,7 +5625,7 @@ index 27a216f1047914aef7ebfe50e2273368da439d49..4de0ff57188dbbfe73da33f49a6c6e5d
dragState().dataTransfer = DataTransfer::createForDrag(*document);
auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No;
-@@ -5040,6 +5046,7 @@ static HitTestResult hitTestResultInFrame(LocalFrame* frame, const LayoutPoint&
+@@ -5053,6 +5059,7 @@ static HitTestResult hitTestResultInFrame(LocalFrame* frame, const LayoutPoint&
return result;
}
@@ -5596,7 +5633,7 @@ index 27a216f1047914aef7ebfe50e2273368da439d49..4de0ff57188dbbfe73da33f49a6c6e5d
HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
{
Ref frame = m_frame.get();
-@@ -5114,7 +5121,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve
+@@ -5126,7 +5133,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve
// Increment the platform touch id by 1 to avoid storing a key of 0 in the hashmap.
unsigned touchPointTargetKey = point.id() + 1;
@@ -5605,7 +5642,7 @@ index 27a216f1047914aef7ebfe50e2273368da439d49..4de0ff57188dbbfe73da33f49a6c6e5d
bool pointerCancelled = false;
#endif
RefPtr<EventTarget> touchTarget;
-@@ -5161,7 +5168,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve
+@@ -5173,7 +5180,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve
// we also remove it from the map.
touchTarget = m_originatingTouchPointTargets.take(touchPointTargetKey);
@@ -5614,7 +5651,7 @@ index 27a216f1047914aef7ebfe50e2273368da439d49..4de0ff57188dbbfe73da33f49a6c6e5d
HitTestResult result = hitTestResultAtPoint(pagePoint, hitType | HitTestRequest::Type::AllowChildFrameContent);
pointerTarget = result.targetElement();
pointerCancelled = (pointerTarget != touchTarget);
-@@ -5184,7 +5191,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve
+@@ -5196,7 +5203,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve
if (!targetFrame)
continue;
@@ -5623,7 +5660,7 @@ index 27a216f1047914aef7ebfe50e2273368da439d49..4de0ff57188dbbfe73da33f49a6c6e5d
// 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) {
-@@ -5274,6 +5281,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve
+@@ -5286,6 +5293,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve
return swallowedEvent;
}
@@ -5632,7 +5669,7 @@ index 27a216f1047914aef7ebfe50e2273368da439d49..4de0ff57188dbbfe73da33f49a6c6e5d
#if ENABLE(TOUCH_EVENTS)
diff --git a/Source/WebCore/page/FocusController.cpp b/Source/WebCore/page/FocusController.cpp
-index 1e2dd0f272078b2b4cbc11957f2458088b4c99c4..e736ffb95a51650c8365a55251ca692b152223ca 100644
+index 676ca3ed5df66159852331a1373cdef66295fd3f..ed0dbb2445822df19e3d013e1ebe2cbaaa8d20eb 100644
--- a/Source/WebCore/page/FocusController.cpp
+++ b/Source/WebCore/page/FocusController.cpp
@@ -586,13 +586,14 @@ bool FocusController::relinquishFocusToChrome(FocusDirection direction)
@@ -5653,7 +5690,7 @@ index 1e2dd0f272078b2b4cbc11957f2458088b4c99c4..e736ffb95a51650c8365a55251ca692b
}
diff --git a/Source/WebCore/page/FrameSnapshotting.cpp b/Source/WebCore/page/FrameSnapshotting.cpp
-index 0c099f95827d6f9fe307704ef9d7754fbb3d24f7..f14fd4dba17985d51d824a9b7c32853a33f4008a 100644
+index 0c099f95827d6f9fe307704ef9d7754fbb3d24f7..8e36dd7dca078f2de0c1733c8d462d17b2a3d5c4 100644
--- a/Source/WebCore/page/FrameSnapshotting.cpp
+++ b/Source/WebCore/page/FrameSnapshotting.cpp
@@ -111,7 +111,7 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
@@ -5665,21 +5702,16 @@ index 0c099f95827d6f9fe307704ef9d7754fbb3d24f7..f14fd4dba17985d51d824a9b7c32853a
if (options.flags.contains(SnapshotFlags::PaintWith3xBaseScale))
scaleFactor = 3;
-@@ -129,7 +129,13 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
- if (!buffer)
+@@ -130,6 +130,8 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
return nullptr;
-+#if !PLATFORM(MAC)
-+ buffer->context().scale(scaleFactor);
-+#endif
-+
buffer->context().translate(-imageRect.location());
+ if (coordinateSpace != LocalFrameView::ViewCoordinates)
+ buffer->context().scale(1 / frame.page()->pageScaleFactor());
if (!clipRects.isEmpty()) {
Path clipPath;
-@@ -138,7 +144,10 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
+@@ -138,7 +140,10 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
buffer->context().clipPath(clipPath);
}
@@ -5704,7 +5736,7 @@ index 3ab70c27fef52f5d933cd2338a7c2f96e2debc88..39fc13df5ce132f8d028cd5039c607fe
struct SnapshotOptions {
diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp
-index 7cffefe901da03913b16cbe560234ebf97ae7dc6..c6694621e0d39974785fbc5472708551b915f75b 100644
+index adc6185687b6fcee3a49819d0149cde24a4485bf..a33e5db46933c514abce86e3f264de9b7e7c20d9 100644
--- a/Source/WebCore/page/History.cpp
+++ b/Source/WebCore/page/History.cpp
@@ -32,6 +32,7 @@
@@ -5725,7 +5757,7 @@ index 7cffefe901da03913b16cbe560234ebf97ae7dc6..c6694621e0d39974785fbc5472708551
}
diff --git a/Source/WebCore/page/LocalFrame.cpp b/Source/WebCore/page/LocalFrame.cpp
-index 4af71417f15e0d93366168e3c22442a67c3dc77c..c002ef7b769b4b7e1d63d7c5ba42bedaef3f4035 100644
+index 090657b2602a09708b6b859952b466fcca07f174..ce5df33671b65494c0d222ed9086d7fe828f3702 100644
--- a/Source/WebCore/page/LocalFrame.cpp
+++ b/Source/WebCore/page/LocalFrame.cpp
@@ -41,6 +41,7 @@
@@ -5752,7 +5784,7 @@ index 4af71417f15e0d93366168e3c22442a67c3dc77c..c002ef7b769b4b7e1d63d7c5ba42beda
#include "NodeTraversal.h"
#include "Page.h"
#include "ProcessSyncClient.h"
-@@ -200,6 +203,7 @@ LocalFrame::LocalFrame(Page& page, ClientCreator&& clientCreator, FrameIdentifie
+@@ -202,6 +205,7 @@ LocalFrame::LocalFrame(Page& page, ClientCreator&& clientCreator, FrameIdentifie
void LocalFrame::init()
{
@@ -5760,7 +5792,7 @@ index 4af71417f15e0d93366168e3c22442a67c3dc77c..c002ef7b769b4b7e1d63d7c5ba42beda
protectedLoader()->init();
}
-@@ -421,7 +425,7 @@ void LocalFrame::orientationChanged()
+@@ -431,7 +435,7 @@ void LocalFrame::orientationChanged()
IntDegrees LocalFrame::orientation() const
{
if (RefPtr page = this->page())
@@ -5769,7 +5801,7 @@ index 4af71417f15e0d93366168e3c22442a67c3dc77c..c002ef7b769b4b7e1d63d7c5ba42beda
return 0;
}
#endif // ENABLE(ORIENTATION_EVENTS)
-@@ -1428,6 +1432,364 @@ void LocalFrame::showResourceMonitoringError()
+@@ -1501,6 +1505,364 @@ void LocalFrame::reportResourceMonitoringWarning()
#endif
@@ -6135,7 +6167,7 @@ index 4af71417f15e0d93366168e3c22442a67c3dc77c..c002ef7b769b4b7e1d63d7c5ba42beda
#undef FRAME_RELEASE_LOG_ERROR
diff --git a/Source/WebCore/page/LocalFrame.h b/Source/WebCore/page/LocalFrame.h
-index 3611617df72251227ebd6a2f8c32bc9ab3da48aa..9b59492c8846cd8e91e58602010eb39b103747b7 100644
+index 82f67e2e21e64b95800696a6bb22f15298866979..26a1bc0736e00964a5beb151bb53c430c36e029d 100644
--- a/Source/WebCore/page/LocalFrame.h
+++ b/Source/WebCore/page/LocalFrame.h
@@ -28,8 +28,10 @@
@@ -6159,7 +6191,7 @@ index 3611617df72251227ebd6a2f8c32bc9ab3da48aa..9b59492c8846cd8e91e58602010eb39b
class LocalFrame final : public Frame {
public:
-@@ -226,10 +228,6 @@ public:
+@@ -227,10 +229,6 @@ public:
WEBCORE_EXPORT DataDetectionResultsStorage& dataDetectionResults();
#endif
@@ -6170,7 +6202,7 @@ index 3611617df72251227ebd6a2f8c32bc9ab3da48aa..9b59492c8846cd8e91e58602010eb39b
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);
-@@ -237,6 +235,10 @@ public:
+@@ -238,6 +236,10 @@ public:
WEBCORE_EXPORT Node* nodeRespondingToScrollWheelEvents(const FloatPoint& viewportLocation);
WEBCORE_EXPORT Node* approximateNodeAtViewportLocationLegacy(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation);
@@ -6181,7 +6213,7 @@ index 3611617df72251227ebd6a2f8c32bc9ab3da48aa..9b59492c8846cd8e91e58602010eb39b
WEBCORE_EXPORT NSArray *wordsInCurrentParagraph() const;
WEBCORE_EXPORT CGRect renderRectForPoint(CGPoint, bool* isReplaced, float* fontSize) const;
-@@ -304,6 +306,7 @@ public:
+@@ -305,6 +307,7 @@ public:
WEBCORE_EXPORT FloatSize screenSize() const;
void setOverrideScreenSize(FloatSize&&);
@@ -6189,7 +6221,7 @@ index 3611617df72251227ebd6a2f8c32bc9ab3da48aa..9b59492c8846cd8e91e58602010eb39b
void selfOnlyRef();
void selfOnlyDeref();
-@@ -371,7 +374,6 @@ private:
+@@ -373,7 +376,6 @@ private:
#if ENABLE(DATA_DETECTION)
std::unique_ptr<DataDetectionResultsStorage> m_dataDetectionResults;
#endif
@@ -6197,7 +6229,7 @@ index 3611617df72251227ebd6a2f8c32bc9ab3da48aa..9b59492c8846cd8e91e58602010eb39b
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);
-@@ -379,6 +381,7 @@ private:
+@@ -381,6 +383,7 @@ private:
enum class ShouldFindRootEditableElement : bool { No, Yes };
Node* qualifyingNodeAtViewportLocation(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, const NodeQualifier&, ShouldApproximate, ShouldFindRootEditableElement = ShouldFindRootEditableElement::Yes);
@@ -6206,10 +6238,10 @@ index 3611617df72251227ebd6a2f8c32bc9ab3da48aa..9b59492c8846cd8e91e58602010eb39b
ViewportArguments m_viewportArguments;
diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
-index 7cd56bf4f7fd05b85e61c26dbf1403e17c041867..0152d48d65ed21173df99ebec3e5abe29f7e6b2e 100644
+index 916d2cc402fb668d19143022b5e3c58838a8920d..0f389d033511bdc7ef92fb4bd8a7525f92a23daa 100644
--- a/Source/WebCore/page/Page.cpp
+++ b/Source/WebCore/page/Page.cpp
-@@ -637,6 +637,45 @@ void Page::setOverrideViewportArguments(const std::optional<ViewportArguments>&
+@@ -655,6 +655,45 @@ void Page::setOverrideViewportArguments(const std::optional<ViewportArguments>&
localTopDocument->updateViewportArguments();
}
@@ -6255,7 +6287,7 @@ index 7cd56bf4f7fd05b85e61c26dbf1403e17c041867..0152d48d65ed21173df99ebec3e5abe2
ScrollingCoordinator* Page::scrollingCoordinator()
{
if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) {
-@@ -4126,6 +4165,26 @@ void Page::setUseDarkAppearanceOverride(std::optional<bool> valueOverride)
+@@ -4211,6 +4250,26 @@ void Page::setUseDarkAppearanceOverride(std::optional<bool> valueOverride)
appearanceDidChange();
}
@@ -6283,11 +6315,11 @@ index 7cd56bf4f7fd05b85e61c26dbf1403e17c041867..0152d48d65ed21173df99ebec3e5abe2
{
if (insets == m_fullscreenInsets)
diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
-index 7a117d8981605065213f521200776f8373439400..694fffe20f596f8e9c655181ed2b5917949859d7 100644
+index 11c3b26d33342999041fb464ad487cd7dc0e6891..41bfb065fe96f08c21f296e2565770dbf81d163e 100644
--- a/Source/WebCore/page/Page.h
+++ b/Source/WebCore/page/Page.h
-@@ -364,6 +364,9 @@ public:
- const std::optional<ViewportArguments>& overrideViewportArguments() const { return m_overrideViewportArguments; }
+@@ -365,6 +365,9 @@ public:
+ const ViewportArguments* overrideViewportArguments() const { return m_overrideViewportArguments.get(); }
WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional<ViewportArguments>&);
+ WEBCORE_EXPORT FloatSize screenSize();
@@ -6295,8 +6327,8 @@ index 7a117d8981605065213f521200776f8373439400..694fffe20f596f8e9c655181ed2b5917
+
static void refreshPlugins(bool reload);
WEBCORE_EXPORT PluginData& pluginData();
- void clearPluginData();
-@@ -454,6 +457,10 @@ public:
+ WEBCORE_EXPORT Ref<PluginData> protectedPluginData();
+@@ -462,6 +465,10 @@ public:
#if ENABLE(DRAG_SUPPORT)
DragController& dragController() { return m_dragController.get(); }
const DragController& dragController() const { return m_dragController.get(); }
@@ -6307,7 +6339,7 @@ index 7a117d8981605065213f521200776f8373439400..694fffe20f596f8e9c655181ed2b5917
#endif
FocusController& focusController() const { return *m_focusController; }
WEBCORE_EXPORT CheckedRef<FocusController> checkedFocusController() const;
-@@ -639,6 +646,10 @@ public:
+@@ -647,6 +654,10 @@ public:
WEBCORE_EXPORT void setUseColorAppearance(bool useDarkAppearance, bool useElevatedUserInterfaceLevel);
bool defaultUseDarkAppearance() const { return m_useDarkAppearance; }
void setUseDarkAppearanceOverride(std::optional<bool>);
@@ -6318,7 +6350,7 @@ index 7a117d8981605065213f521200776f8373439400..694fffe20f596f8e9c655181ed2b5917
#if ENABLE(TEXT_AUTOSIZING)
float textAutosizingWidth() const { return m_textAutosizingWidth; }
-@@ -1094,6 +1105,11 @@ public:
+@@ -1116,6 +1127,11 @@ public:
WEBCORE_EXPORT void setInteractionRegionsEnabled(bool);
#endif
@@ -6330,17 +6362,17 @@ index 7a117d8981605065213f521200776f8373439400..694fffe20f596f8e9c655181ed2b5917
#if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY)
DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); }
#endif
-@@ -1358,6 +1374,9 @@ private:
+@@ -1392,6 +1408,9 @@ private:
#if ENABLE(DRAG_SUPPORT)
- UniqueRef<DragController> m_dragController;
+ const UniqueRef<DragController> m_dragController;
+#if PLATFORM(MAC)
+ String m_overrideDragPasteboardName;
+#endif
#endif
std::unique_ptr<FocusController> m_focusController;
#if ENABLE(CONTEXT_MENUS)
-@@ -1435,6 +1454,8 @@ private:
+@@ -1469,6 +1488,8 @@ private:
bool m_useElevatedUserInterfaceLevel { false };
bool m_useDarkAppearance { false };
std::optional<bool> m_useDarkAppearanceOverride;
@@ -6349,10 +6381,10 @@ index 7a117d8981605065213f521200776f8373439400..694fffe20f596f8e9c655181ed2b5917
#if ENABLE(TEXT_AUTOSIZING)
float m_textAutosizingWidth { 0 };
-@@ -1615,6 +1636,11 @@ private:
+@@ -1651,6 +1672,11 @@ private:
#endif
- std::optional<ViewportArguments> m_overrideViewportArguments;
+ std::unique_ptr<ViewportArguments> m_overrideViewportArguments;
+ std::optional<FloatSize> m_overrideScreenSize;
+
+#if ENABLE(ORIENTATION_EVENTS)
@@ -6362,7 +6394,7 @@ index 7a117d8981605065213f521200776f8373439400..694fffe20f596f8e9c655181ed2b5917
#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 585c224c08f5a8f8d8e660fa627c264f3386d1ef..26a58fb2fa2a15468a70912f879fe01f4915d0ca 100644
+index 33ef23f456d389c876f7d66732a1ae9bb2ed7662..f0d38ba2208975e9a31f634096caf20ecb7340be 100644
--- a/Source/WebCore/page/PageConsoleClient.cpp
+++ b/Source/WebCore/page/PageConsoleClient.cpp
@@ -456,4 +456,9 @@ Ref<Page> PageConsoleClient::protectedPage() const
@@ -6388,10 +6420,10 @@ index 153fc36199f26adbfb61cbef6744ffe31a68b951..cc667e06700013fd5e994467e19536d2
Ref<Page> protectedPage() const;
diff --git a/Source/WebCore/page/PointerCaptureController.cpp b/Source/WebCore/page/PointerCaptureController.cpp
-index 671c31a3af5253634ffd9a55b99aa9462f4e5f9a..faea774b6987408fac036fd19c8f1cefffa917b1 100644
+index ad7f92bf398348be7823247931ce71d5a1c2296e..accabfd4f44199f026ca7bb9ea058bfe3d0ad8f8 100644
--- a/Source/WebCore/page/PointerCaptureController.cpp
+++ b/Source/WebCore/page/PointerCaptureController.cpp
-@@ -204,7 +204,7 @@ bool PointerCaptureController::preventsCompatibilityMouseEventsForIdentifier(Poi
+@@ -205,7 +205,7 @@ bool PointerCaptureController::preventsCompatibilityMouseEventsForIdentifier(Poi
return capturingData && capturingData->preventsCompatibilityMouseEvents;
}
@@ -6400,7 +6432,7 @@ index 671c31a3af5253634ffd9a55b99aa9462f4e5f9a..faea774b6987408fac036fd19c8f1cef
static bool hierarchyHasCapturingEventListeners(Element* target, const AtomString& eventName)
{
for (RefPtr<ContainerNode> currentNode = target; currentNode; currentNode = currentNode->parentInComposedTree()) {
-@@ -554,7 +554,7 @@ void PointerCaptureController::cancelPointer(PointerID pointerId, const IntPoint
+@@ -555,7 +555,7 @@ void PointerCaptureController::cancelPointer(PointerID pointerId, const IntPoint
capturingData->pendingTargetOverride = nullptr;
capturingData->state = CapturingData::State::Cancelled;
@@ -6410,7 +6442,7 @@ index 671c31a3af5253634ffd9a55b99aa9462f4e5f9a..faea774b6987408fac036fd19c8f1cef
#endif
diff --git a/Source/WebCore/page/PointerCaptureController.h b/Source/WebCore/page/PointerCaptureController.h
-index 9245baa0c317bb3dfa8a2a1666953d320cb85ee1..55445eb29e095ef4b6d6918728885a267a3b8183 100644
+index b7e3f7cbd54e6ba9419de1bbf70594f3c2771d41..abb08ab5f5a979d7a40af30a27fddfe163db2b12 100644
--- a/Source/WebCore/page/PointerCaptureController.h
+++ b/Source/WebCore/page/PointerCaptureController.h
@@ -60,7 +60,7 @@ public:
@@ -6482,10 +6514,10 @@ index 24ed7c019bea4df52f2883db0e40bdbc2dc74ebd..a788f534d9e0e8124153c7f380b4fdb2
}
diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
-index a67def78b37298d5efa0b14f337f58471c895169..ddfc9ae5b8391df70b3c6a4be2bcae6ae32b2b7c 100644
+index 51933cf69017936dfa08823d4a1a778d3d64db71..2101a8ab75fc7adf5ebcbf245e2083a2b750271b 100644
--- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
+++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
-@@ -347,6 +347,8 @@ bool ContentSecurityPolicy::allowContentSecurityPolicySourceStarToMatchAnyProtoc
+@@ -348,6 +348,8 @@ bool ContentSecurityPolicy::allowContentSecurityPolicySourceStarToMatchAnyProtoc
template<typename Predicate, typename... Args>
typename std::enable_if<!std::is_convertible<Predicate, ContentSecurityPolicy::ViolatedDirectiveCallback>::value, bool>::type ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, Predicate&& predicate, Args&&... args) const
{
@@ -6494,7 +6526,7 @@ index a67def78b37298d5efa0b14f337f58471c895169..ddfc9ae5b8391df70b3c6a4be2bcae6a
bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly;
for (auto& policy : m_policies) {
if (policy->isReportOnly() != isReportOnly)
-@@ -360,6 +362,8 @@ typename std::enable_if<!std::is_convertible<Predicate, ContentSecurityPolicy::V
+@@ -361,6 +363,8 @@ typename std::enable_if<!std::is_convertible<Predicate, ContentSecurityPolicy::V
template<typename Predicate, typename... Args>
bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, ViolatedDirectiveCallback&& callback, Predicate&& predicate, Args&&... args) const
{
@@ -6503,9 +6535,9 @@ index a67def78b37298d5efa0b14f337f58471c895169..ddfc9ae5b8391df70b3c6a4be2bcae6a
bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly;
bool isAllowed = true;
for (auto& policy : m_policies) {
-@@ -376,6 +380,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
+@@ -377,6 +381,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
template<typename Predicate, typename... Args>
- bool ContentSecurityPolicy::allPoliciesAllow(ViolatedDirectiveCallback&& callback, Predicate&& predicate, Args&&... args) const
+ bool ContentSecurityPolicy::allPoliciesAllow(NOESCAPE const ViolatedDirectiveCallback& callback, Predicate&& predicate, Args&&... args) const
{
+ if (InspectorInstrumentation::shouldBypassCSP(m_scriptExecutionContext.get()))
+ return true;
@@ -6644,7 +6676,7 @@ index 2ebb3221cb3818f20abc7b7c3307ea7644f49d49..e0bffb6f5adee0b0a202340f633c2def
bool m_disallowFileAccess { false };
};
diff --git a/Source/WebCore/platform/DragImage.cpp b/Source/WebCore/platform/DragImage.cpp
-index c359242a7967dab94b8dc3c276a6df5473527145..64b0c6a0bfdf27a0305c25e8b8e0cda637450aa4 100644
+index 2f4e02e783ac512aeb76e0abe7e253b57bfda937..94e0c9335720324a746f300a26b17a28eedf2197 100644
--- a/Source/WebCore/platform/DragImage.cpp
+++ b/Source/WebCore/platform/DragImage.cpp
@@ -280,7 +280,7 @@ DragImage::~DragImage()
@@ -6751,10 +6783,10 @@ index 63ffd6ca32c3baee03db2a9419c4f7e9de45388a..c60c7a8d1f110472117c8c4e969fd05f
#endif
diff --git a/Source/WebCore/platform/PlatformScreen.cpp b/Source/WebCore/platform/PlatformScreen.cpp
-index ae46341ba71c7f6df7c607bd852338cdb7f83fe1..a11db190d86f5e3ec4c7cee6c5b3ea93f2380646 100644
+index ef0abc9a93e878897ffc9d2497a3da0fca5b37b7..8868e20e3720ce33d3148cea5c3bcdaf2ff2c4e5 100644
--- a/Source/WebCore/platform/PlatformScreen.cpp
+++ b/Source/WebCore/platform/PlatformScreen.cpp
-@@ -73,3 +73,25 @@ const ScreenData* screenData(PlatformDisplayID screenDisplayID)
+@@ -85,3 +85,25 @@ OptionSet<ContentsFormat> screenContentsFormatsForTesting()
} // namespace WebCore
#endif // PLATFORM(COCOA) || PLATFORM(GTK) || (PLATFORM(WPE) && ENABLE(WPE_PLATFORM))
@@ -6781,10 +6813,10 @@ index ae46341ba71c7f6df7c607bd852338cdb7f83fe1..a11db190d86f5e3ec4c7cee6c5b3ea93
+} // namespace WebCore
+#endif
diff --git a/Source/WebCore/platform/PlatformScreen.h b/Source/WebCore/platform/PlatformScreen.h
-index 6ffb85dbfcc01be76ef498f4f7478747912ca7d7..a6e0a3347e36a01b9aeca524747d14ff63f4c529 100644
+index dfef4ecbfb44cc985d1d26eaceae855cb427c002..665da262aeb6524f48b2de2418a474a65d0ef754 100644
--- a/Source/WebCore/platform/PlatformScreen.h
+++ b/Source/WebCore/platform/PlatformScreen.h
-@@ -154,12 +154,16 @@ WEBCORE_EXPORT float screenScaleFactor(UIScreen * = nullptr);
+@@ -160,12 +160,16 @@ WEBCORE_EXPORT float screenScaleFactor(UIScreen * = nullptr);
#endif
#if ENABLE(TOUCH_EVENTS)
@@ -7777,7 +7809,7 @@ index a8674916429908cabb86bd95dc5b3da217e1556b..6a464e2b0c1c45cd4e8effba678b8dde
{
switch (val) {
diff --git a/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp b/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp
-index 64afe805b4418d9e57cc7a2704498a97162b93ab..86c385359352853d2884226f478168f890b0c8f0 100644
+index 065c1b362537547bc732bd9ded7e801ddf938ef8..448321a8388b7075173061caf8c9b272997e02fd 100644
--- a/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp
+++ b/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp
@@ -31,10 +31,18 @@
@@ -7799,7 +7831,7 @@ index 64afe805b4418d9e57cc7a2704498a97162b93ab..86c385359352853d2884226f478168f8
PlatformPasteboard::PlatformPasteboard(const String&)
: m_pasteboard(wpe_pasteboard_get_singleton())
{
-@@ -54,72 +62,26 @@ void PlatformPasteboard::performAsDataOwner(DataOwnerType, Function<void()>&& ac
+@@ -54,72 +62,26 @@ void PlatformPasteboard::performAsDataOwner(DataOwnerType, NOESCAPE Function<voi
void PlatformPasteboard::getTypes(Vector<String>& types) const
{
@@ -7898,10 +7930,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 f14a54120d571c14bb7a721a377a57131760cfca..832b6710f726d4d8a8ccaa35b2f634a7d5604ccb 100644
+index 8c57734966ccfaf38dbb7fd956e71f3d3f65a477..594e5031caba89142535a16c2fb132bb878aab21 100644
--- a/Source/WebCore/platform/network/NetworkStorageSession.h
+++ b/Source/WebCore/platform/network/NetworkStorageSession.h
-@@ -195,6 +195,7 @@ public:
+@@ -200,6 +200,7 @@ public:
NetworkingContext* context() const;
#endif
@@ -7910,7 +7942,7 @@ index f14a54120d571c14bb7a721a377a57131760cfca..832b6710f726d4d8a8ccaa35b2f634a7
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 774748f1bb47fdefa53b820db5fc891077125de7..4f9220dace7d300d2326692383944f3a560d8cb8 100644
+index bc4d0a6059710f349685b9782079e17f19e289fa..f15d5944bf4259248c1dcc11bd536e5398cb7f03 100644
--- a/Source/WebCore/platform/network/ResourceResponseBase.cpp
+++ b/Source/WebCore/platform/network/ResourceResponseBase.cpp
@@ -78,6 +78,7 @@ ResourceResponseBase::ResourceResponseBase(std::optional<ResourceResponseData> d
@@ -7921,7 +7953,7 @@ index 774748f1bb47fdefa53b820db5fc891077125de7..4f9220dace7d300d2326692383944f3a
, m_networkLoadMetrics(data && data->networkLoadMetrics ? Box<NetworkLoadMetrics>::create(*data->networkLoadMetrics) : Box<NetworkLoadMetrics> { })
, m_certificateInfo(data ? data->certificateInfo : std::nullopt)
, m_httpStatusCode(data ? data->httpStatusCode : 0)
-@@ -901,6 +902,7 @@ std::optional<ResourceResponseData> ResourceResponseBase::getResponseData() cons
+@@ -904,6 +905,7 @@ std::optional<ResourceResponseData> ResourceResponseBase::getResponseData() cons
String { m_httpStatusText },
String { m_httpVersion },
HTTPHeaderMap { m_httpHeaderFields },
@@ -7929,7 +7961,7 @@ index 774748f1bb47fdefa53b820db5fc891077125de7..4f9220dace7d300d2326692383944f3a
m_networkLoadMetrics ? std::optional(*m_networkLoadMetrics) : std::nullopt,
m_source,
m_type,
-@@ -974,6 +976,11 @@ std::optional<WebCore::ResourceResponseData> Coder<WebCore::ResourceResponseData
+@@ -979,6 +981,11 @@ std::optional<WebCore::ResourceResponseData> Coder<WebCore::ResourceResponseData
if (!httpHeaderFields)
return std::nullopt;
@@ -7941,7 +7973,7 @@ index 774748f1bb47fdefa53b820db5fc891077125de7..4f9220dace7d300d2326692383944f3a
std::optional<short> httpStatusCode;
decoder >> httpStatusCode;
if (!httpStatusCode)
-@@ -1028,6 +1035,7 @@ std::optional<WebCore::ResourceResponseData> Coder<WebCore::ResourceResponseData
+@@ -1038,6 +1045,7 @@ std::optional<WebCore::ResourceResponseData> Coder<WebCore::ResourceResponseData
WTFMove(*httpStatusText),
WTFMove(*httpVersion),
WTFMove(*httpHeaderFields),
@@ -7950,10 +7982,10 @@ index 774748f1bb47fdefa53b820db5fc891077125de7..4f9220dace7d300d2326692383944f3a
*source,
*type,
diff --git a/Source/WebCore/platform/network/ResourceResponseBase.h b/Source/WebCore/platform/network/ResourceResponseBase.h
-index ec38706084d826ae14aefc6febba137d3e51f1a6..01a916a312e99e405d3098b3df78ee000f55f74a 100644
+index be9d60dc24eec83f9b7fad5c9bbcdffc2cbd3bb4..9fe86dc133adb69e21a1e9067ea0b2a130f3def6 100644
--- a/Source/WebCore/platform/network/ResourceResponseBase.h
+++ b/Source/WebCore/platform/network/ResourceResponseBase.h
-@@ -254,6 +254,11 @@ protected:
+@@ -256,6 +256,11 @@ protected:
String m_httpStatusText;
String m_httpVersion;
HTTPHeaderMap m_httpHeaderFields;
@@ -7965,16 +7997,16 @@ index ec38706084d826ae14aefc6febba137d3e51f1a6..01a916a312e99e405d3098b3df78ee00
Box<NetworkLoadMetrics> m_networkLoadMetrics;
mutable std::optional<CertificateInfo> m_certificateInfo;
-@@ -294,7 +299,7 @@ struct ResourceResponseData {
+@@ -297,7 +302,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, ResourceResponseBaseSource source, ResourceResponseBaseType type, ResourceResponseBaseTainting tainting, bool isRedirected, UsedLegacyTLS usedLegacyTLS, WasPrivateRelayed wasPrivateRelayed, 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, ResourceResponseBaseSource source, ResourceResponseBaseType type, ResourceResponseBaseTainting tainting, bool isRedirected, UsedLegacyTLS usedLegacyTLS, WasPrivateRelayed wasPrivateRelayed, 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)
++ 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)
: url(WTFMove(url))
, mimeType(WTFMove(mimeType))
, expectedContentLength(expectedContentLength)
-@@ -303,6 +308,7 @@ struct ResourceResponseData {
+@@ -306,6 +311,7 @@ struct ResourceResponseData {
, httpStatusText(WTFMove(httpStatusText))
, httpVersion(WTFMove(httpVersion))
, httpHeaderFields(WTFMove(httpHeaderFields))
@@ -7982,7 +8014,7 @@ index ec38706084d826ae14aefc6febba137d3e51f1a6..01a916a312e99e405d3098b3df78ee00
, networkLoadMetrics(WTFMove(networkLoadMetrics))
, source(source)
, type(type)
-@@ -325,6 +331,7 @@ struct ResourceResponseData {
+@@ -329,6 +335,7 @@ struct ResourceResponseData {
String httpStatusText;
String httpVersion;
HTTPHeaderMap httpHeaderFields;
@@ -7991,10 +8023,10 @@ index ec38706084d826ae14aefc6febba137d3e51f1a6..01a916a312e99e405d3098b3df78ee00
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 52c078b497e11adc41e2e31a09ebf2f052b6f272..051b5fe3f42eb72ff478693b1d9a74b251332840 100644
+index ab7a9d832f0573bd402c5643d3eee3aa3e3b33c6..7dcb122411c4b6bf45c05e3a6edf7b133c5d9e9e 100644
--- a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
+++ b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
-@@ -536,6 +536,22 @@ bool NetworkStorageSession::setCookieFromDOM(const URL& firstParty, const SameSi
+@@ -552,6 +552,22 @@ bool NetworkStorageSession::setCookieFromDOM(const URL& firstParty, const SameSi
return false;
}
@@ -8111,7 +8143,7 @@ index 2d7a77d759aaea9a541030af5e6015a8ed9c97a4..a0c947d325c984045dbbdf2580d19a32
WEBCORE_EXPORT void send(CurlStreamID, UniqueArray<uint8_t>&&, size_t);
diff --git a/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp b/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp
-index 7567442a6bdccbe755b2cf5e3fa42265a065a9e1..4886cf0b5a6bc0b8a270d763ad481f5bc6f0d1c2 100644
+index b422dee5926a14aab7a20ea4de9d51080b2b3fea..d5735a2097e18f5c94fa0695fde6ff7a4ffda823 100644
--- a/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp
+++ b/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp
@@ -135,6 +135,12 @@ void NetworkStorageSession::setCookieAcceptPolicy(CookieAcceptPolicy policy) con
@@ -8128,11 +8160,11 @@ index 7567442a6bdccbe755b2cf5e3fa42265a065a9e1..4886cf0b5a6bc0b8a270d763ad481f5b
{
switch (cookieDatabase().acceptPolicy()) {
diff --git a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
-index 98285739dff7050e61611a23075599dcbe259d6a..b05dd64c53accd98dbb9e9e467aae3e07de7b974 100644
+index c191cdc193019db8efc2c597bb3c87b3a318bcd6..35ad719201c4505c43c20701dffce0adcfb241f6 100644
--- a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
+++ b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
-@@ -424,6 +424,26 @@ void NetworkStorageSession::replaceCookies(const Vector<Cookie>& cookies)
- g_signal_emit(jar, signalId, 0);
+@@ -528,6 +528,26 @@ void NetworkStorageSession::replaceCookies(const Vector<Cookie>& cookies)
+ g_signal_emit(jar, signalId, 0, nullptr, nullptr);
}
+void NetworkStorageSession::setCookiesFromResponse(const URL& firstParty, const SameSiteInfo&, const URL& url, const String& setCookieValue)
@@ -8159,7 +8191,7 @@ index 98285739dff7050e61611a23075599dcbe259d6a..b05dd64c53accd98dbb9e9e467aae3e0
{
GUniquePtr<SoupCookie> targetCookie(cookie.toSoupCookie());
diff --git a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp b/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
-index 9af57876ef4adddcf713392a3946efc30e75d3b7..956859daed43591ee52b20b2dfa6d381b812fbda 100644
+index bbcc12d58f7b5df3462c93617f6ef19eef403cf2..b255b05da89248a99ff11965ceae840ef45b9fab 100644
--- a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
+++ b/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
@@ -40,6 +40,7 @@
@@ -8398,7 +8430,7 @@ index 0000000000000000000000000000000000000000..fbd32d390129129fd5b213f7f9c3e96b
+}
diff --git a/Source/WebCore/platform/wpe/DragImageWPE.cpp b/Source/WebCore/platform/wpe/DragImageWPE.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..a2454253889d4c7d5129c2d7895c089f54bc2e3d
+index 0000000000000000000000000000000000000000..5a20bfaacd42d27bee5f843483d6b60d9dee9dbd
--- /dev/null
+++ b/Source/WebCore/platform/wpe/DragImageWPE.cpp
@@ -0,0 +1,73 @@
@@ -8451,7 +8483,7 @@ index 0000000000000000000000000000000000000000..a2454253889d4c7d5129c2d7895c089f
+ return image;
+}
+
-+DragImageRef createDragImageFromImage(Image* image, ImageOrientation)
++DragImageRef createDragImageFromImage(Image* image, ImageOrientation, GraphicsClient*, float)
+{
+ return image->currentNativeImage()->platformImage();
+}
@@ -8743,10 +8775,10 @@ index 0000000000000000000000000000000000000000..a76b583a1e65cd6999fab4784c22dd9c
+
+} // namespace WebCore
diff --git a/Source/WebCore/rendering/RenderTextControl.cpp b/Source/WebCore/rendering/RenderTextControl.cpp
-index 9d3de8e13762a270bc60d4201e8f35b62c908cbd..0e3eb8955cb8c751a600a0cce7690504899cbea8 100644
+index 015f1d0d829c0a1ef2c0cc137eb4967fa7bfe67a..25a6d41d2e08d50004749298f9555024a895b61c 100644
--- a/Source/WebCore/rendering/RenderTextControl.cpp
+++ b/Source/WebCore/rendering/RenderTextControl.cpp
-@@ -223,13 +223,13 @@ void RenderTextControl::layoutExcludedChildren(bool relayoutChildren)
+@@ -228,13 +228,13 @@ void RenderTextControl::layoutExcludedChildren(RelayoutChildren relayoutChildren
}
}
@@ -8762,12 +8794,12 @@ index 9d3de8e13762a270bc60d4201e8f35b62c908cbd..0e3eb8955cb8c751a600a0cce7690504
{
auto innerText = innerTextElement();
diff --git a/Source/WebCore/rendering/RenderTextControl.h b/Source/WebCore/rendering/RenderTextControl.h
-index 8ff886aec15c960e06408f638892579a6c3f4879..a5f8889818e456504c82a99994dcf4b21774b99d 100644
+index faf34133df0bf205072145ffbab8163b93d3c874..fdc4554952e0e33f8827bb3d00c827dec966ad15 100644
--- a/Source/WebCore/rendering/RenderTextControl.h
+++ b/Source/WebCore/rendering/RenderTextControl.h
-@@ -37,9 +37,9 @@ public:
-
+@@ -38,9 +38,9 @@ public:
WEBCORE_EXPORT HTMLTextFormControlElement& textFormControlElement() const;
+ WEBCORE_EXPORT Ref<HTMLTextFormControlElement> protectedTextFormControlElement() const;
-#if PLATFORM(IOS_FAMILY)
bool canScroll() const;
@@ -8800,7 +8832,7 @@ index db95c8273bd0deb3f903a45d02fc07bbbd8ab305..bf88228b4c838b90d11d430cc9429d51
WorkerOrWorkletGlobalScope& m_globalScope;
};
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
-index fe493f26a5a49b6ec9404105e8012291e3c37aab..9dbd5fcbac6d48fe92e5f7d9174192517e31a015 100644
+index e185fc809df730737ff85c349ad17dce10d246f0..b1ccbc16b185ac76ecffb753b6aed2ae1eb8e39a 100644
--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
@@ -96,6 +96,8 @@
@@ -8812,7 +8844,7 @@ index fe493f26a5a49b6ec9404105e8012291e3c37aab..9dbd5fcbac6d48fe92e5f7d917419251
#endif
#if ENABLE(APPLE_PAY_REMOTE_UI)
-@@ -1148,6 +1150,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID)
+@@ -1232,6 +1234,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID)
storageSession->clearPageSpecificDataForResourceLoadStatistics(pageID);
}
@@ -8828,7 +8860,7 @@ index fe493f26a5a49b6ec9404105e8012291e3c37aab..9dbd5fcbac6d48fe92e5f7d917419251
{
if (auto* storageSession = protectedNetworkProcess()->storageSession(m_sessionID))
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
-index 7d2ad64026a920e5007965c2096d202ad611efa5..db7aa5bc9aa34ba43e5254b72d2d2bcf4eafeacc 100644
+index 706ceb9edc7de45d731db75c656a7a9ad5780cbe..49a6735a5936a8b6daab556a7df89b254157e14f 100644
--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
@@ -380,6 +380,8 @@ private:
@@ -8841,7 +8873,7 @@ index 7d2ad64026a920e5007965c2096d202ad611efa5..db7aa5bc9aa34ba43e5254b72d2d2bcf
void logUserInteraction(RegistrableDomain&&);
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
-index 580195a8f0e1fc690ecab8903bca002496a8822f..ce9ec7f6f668d46f6a14889f081dfc485a56e215 100644
+index a8f2e3cd5cef58c0e390a9cc8c3d18c9d24ffbda..fdbc166682cd3ec9fdbba737757331e46fd93364 100644
--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
@@ -80,6 +80,8 @@ messages -> NetworkConnectionToWebProcess WantsDispatchMessage {
@@ -8854,10 +8886,10 @@ index 580195a8f0e1fc690ecab8903bca002496a8822f..ce9ec7f6f668d46f6a14889f081dfc48
LogUserInteraction(WebCore::RegistrableDomain domain)
ResourceLoadStatisticsUpdated(Vector<WebCore::ResourceLoadStatistics> statistics) -> ()
diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
-index d0fd9b84a4bd5ba0e81fde94d5f2200cf664d278..3696082965d7b51ac5404f4411ed9d2fb1b30a7e 100644
+index 40718b455299eb28978d999d2088579564b06fd4..9ada150a661beda8b4411c5b6e669c72e0895a75 100644
--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
-@@ -645,6 +645,12 @@ void NetworkProcess::registrableDomainsExemptFromWebsiteDataDeletion(PAL::Sessio
+@@ -653,6 +653,12 @@ void NetworkProcess::registrableDomainsExemptFromWebsiteDataDeletion(PAL::Sessio
completionHandler({ });
}
@@ -8871,7 +8903,7 @@ index d0fd9b84a4bd5ba0e81fde94d5f2200cf664d278..3696082965d7b51ac5404f4411ed9d2f
{
if (auto* session = networkSession(sessionID)) {
diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
-index 2f73648e4ddbf622b5ed52e25cbd6835fa706048..d0f354db52d964f75cf20767d29549fa0bdfbff9 100644
+index c6b478b2564a0fb550118e43a9749101c2aa7361..2a45c0dc4e3947b84ed1da124c02ccfff7834cbb 100644
--- a/Source/WebKit/NetworkProcess/NetworkProcess.h
+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
@@ -84,6 +84,7 @@ class SessionID;
@@ -8882,7 +8914,7 @@ index 2f73648e4ddbf622b5ed52e25cbd6835fa706048..d0f354db52d964f75cf20767d29549fa
class CurlProxySettings;
class ProtectionSpace;
class NetworkStorageSession;
-@@ -227,6 +228,9 @@ public:
+@@ -234,6 +235,9 @@ public:
void registrableDomainsWithLastAccessedTime(PAL::SessionID, CompletionHandler<void(std::optional<HashMap<RegistrableDomain, WallTime>>)>&&);
void registrableDomainsExemptFromWebsiteDataDeletion(PAL::SessionID, CompletionHandler<void(HashSet<RegistrableDomain>)>&&);
@@ -8893,10 +8925,10 @@ index 2f73648e4ddbf622b5ed52e25cbd6835fa706048..d0f354db52d964f75cf20767d29549fa
void clearUserInteraction(PAL::SessionID, RegistrableDomain&&, CompletionHandler<void()>&&);
void deleteAndRestrictWebsiteDataForRegistrableDomains(PAL::SessionID, OptionSet<WebsiteDataType>, RegistrableDomainsToDeleteOrRestrictWebsiteDataFor&&, CompletionHandler<void(HashSet<RegistrableDomain>&&)>&&);
diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
-index ef4f18038deef8bbed0d24507048050a19e6351a..b2961f2ac65cc44505e7ea6d191ab3b5ec8165db 100644
+index 24124fdb6ad7f5447345764a8481342557ceba8e..204e00738921f21e70af8398a9350cd49a4640ce 100644
--- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
+++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
-@@ -86,6 +86,8 @@ messages -> NetworkProcess : AuxiliaryProcess WantsAsyncDispatchMessage {
+@@ -90,6 +90,8 @@ messages -> NetworkProcess : AuxiliaryProcess WantsAsyncDispatchMessage {
SetInspectionForServiceWorkersAllowed(PAL::SessionID sessionID, bool inspectable)
@@ -8906,10 +8938,10 @@ index ef4f18038deef8bbed0d24507048050a19e6351a..b2961f2ac65cc44505e7ea6d191ab3b5
ClearUserInteraction(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> ()
DumpResourceLoadStatistics(PAL::SessionID sessionID) -> (String dumpedStatistics)
diff --git a/Source/WebKit/NetworkProcess/NetworkSession.h b/Source/WebKit/NetworkProcess/NetworkSession.h
-index 53acfd4c7c13b7595a7be3f13f5edac01f82b891..319386e3c6a1f760d548385859c2f0410f2727a5 100644
+index 679cf1fc291f262f90d42f5d597361c67eb0f4c0..527015014b15f9efca45dd054f541b4be416eafe 100644
--- a/Source/WebKit/NetworkProcess/NetworkSession.h
+++ b/Source/WebKit/NetworkProcess/NetworkSession.h
-@@ -205,6 +205,9 @@ public:
+@@ -207,6 +207,9 @@ public:
void lowMemoryHandler(WTF::Critical);
@@ -8919,7 +8951,7 @@ index 53acfd4c7c13b7595a7be3f13f5edac01f82b891..319386e3c6a1f760d548385859c2f041
void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); }
void addNavigationPreloaderTask(ServiceWorkerFetchTask&);
ServiceWorkerFetchTask* navigationPreloaderTaskFromFetchIdentifier(WebCore::FetchIdentifier);
-@@ -328,6 +331,7 @@ protected:
+@@ -343,6 +346,7 @@ protected:
bool m_privateClickMeasurementDebugModeEnabled { false };
std::optional<WebCore::PrivateClickMeasurement> m_ephemeralMeasurement;
bool m_isRunningEphemeralMeasurementTest { false };
@@ -8928,22 +8960,23 @@ index 53acfd4c7c13b7595a7be3f13f5edac01f82b891..319386e3c6a1f760d548385859c2f041
HashSet<Ref<NetworkResourceLoader>> m_keptAliveLoads;
diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
-index 2a7bf5142aea077a0686c66d6fc0b2430be18c98..2640236a871e5a6455b32716d84711098802813b 100644
+index 0d2fcd76b91d7f9afa8c2378ab1109f12386a6c2..ff01afba3686fd8f81e1ad914f0171d3fd40e0fb 100644
--- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
-@@ -773,6 +773,8 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didRece
+@@ -805,6 +805,8 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didRece
if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) {
sessionCocoa->setClientAuditToken(challenge);
+ if (sessionCocoa->ignoreCertificateErrors())
+ return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
- NSURLSessionTaskTransactionMetrics *metrics = task._incompleteTaskMetrics.transactionMetrics.lastObject;
- auto tlsVersion = (tls_protocol_version_t)metrics.negotiatedTLSProtocolVersion.unsignedShortValue;
-@@ -1124,6 +1126,13 @@ - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)data
+ negotiatedLegacyTLS = checkForLegacyTLS(task._incompleteTaskMetrics.transactionMetrics.lastObject);
+ if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes && task._preconnect)
+@@ -1146,6 +1148,14 @@ - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)data
resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics()));
-
+ resourceResponse.setProxyName(WTFMove(proxyName));
++
+ __block WebCore::HTTPHeaderMap requestHeaders;
+ NSURLSessionTaskTransactionMetrics *m = dataTask._incompleteTaskMetrics.transactionMetrics.lastObject;
+ [m.request.allHTTPHeaderFields enumerateKeysAndObjectsUsingBlock:^(NSString *name, NSString *value, BOOL *) {
@@ -8955,7 +8988,7 @@ index 2a7bf5142aea077a0686c66d6fc0b2430be18c98..2640236a871e5a6455b32716d8471109
#if !LOG_DISABLED
LOG(NetworkSession, "%llu didReceiveResponse completionHandler (%d)", taskIdentifier, policyAction);
diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
-index 1e1c7897c858ddd5a1c69a4d5942102f5649ef14..1d2a4835905018a39bc33488e9bc1450cb728179 100644
+index 50cd0b45a2fa5be6f217b686b2ff703b74c06078..c2d6b10762def97a222197d1e6f45d31d3b7a49b 100644
--- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
+++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
@@ -80,10 +80,18 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas
@@ -9045,7 +9078,7 @@ index 1e1c7897c858ddd5a1c69a4d5942102f5649ef14..1d2a4835905018a39bc33488e9bc1450
if (m_state != State::Suspended) {
m_state = State::Suspended;
diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h
-index 0f7c70e405d00416c9e5e58f9c56423a4cf3947c..b730722c5bdb3949bedc1a578089bb3ea2d4af67 100644
+index fc4d15308fcb12b084a65d058aec9e67fcf6021f..b1a689989c68798e6308b1da7b3bd7c066497114 100644
--- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h
+++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h
@@ -28,6 +28,7 @@
@@ -9086,12 +9119,12 @@ index 0f7c70e405d00416c9e5e58f9c56423a4cf3947c..b730722c5bdb3949bedc1a578089bb3e
bool m_blockingCookies { false };
diff --git a/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp
-index 49685c872d0fb042a401612201a7448af6f1ac8b..e98efc1c2e7e5a85980c8d39afcb600a1f6c5d23 100644
+index a6f84189b7163563874a148c9bf1c8afb42bb446..8b5db0010c4be8e24efd121e4ccba0568e6f4bed 100644
--- a/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp
+++ b/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp
@@ -68,7 +68,7 @@ void NetworkSessionCurl::clearAlternativeServices(WallTime)
- std::unique_ptr<WebSocketTask> NetworkSessionCurl::createWebSocketTask(WebPageProxyIdentifier webPageProxyID, std::optional<FrameIdentifier>, std::optional<PageIdentifier>, NetworkSocketChannel& channel, const WebCore::ResourceRequest& request, const String& protocol, const WebCore::ClientOrigin& clientOrigin, bool, bool, OptionSet<WebCore::AdvancedPrivacyProtections>, ShouldRelaxThirdPartyCookieBlocking, StoredCredentialsPolicy)
+ std::unique_ptr<WebSocketTask> NetworkSessionCurl::createWebSocketTask(WebPageProxyIdentifier webPageProxyID, std::optional<FrameIdentifier>, std::optional<PageIdentifier>, NetworkSocketChannel& channel, const WebCore::ResourceRequest& request, const String& protocol, const WebCore::ClientOrigin& clientOrigin, bool, bool, OptionSet<WebCore::AdvancedPrivacyProtections>, StoredCredentialsPolicy)
{
- return makeUnique<WebSocketTask>(channel, webPageProxyID, request, protocol, clientOrigin);
+ return makeUnique<WebSocketTask>(channel, webPageProxyID, request, protocol, ignoreCertificateErrors(), clientOrigin);
@@ -9135,7 +9168,7 @@ index 1853b717d021c5ec5c79abb61bec684460646a7a..625b921890a75c521bdf6fc3a5fd4bf3
didFail(WTFMove(errorReason));
});
diff --git a/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.h b/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.h
-index 70c88bf553159e26e63c6dc735ae2bb4358df698..967b2c849206784efe3b0d9a2364cd3e7600b1f9 100644
+index 0ef9f38c7662f922b7a8e4da81613799b0fddc68..45704b96df02cead2f21fd948455502793a1508c 100644
--- a/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.h
+++ b/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.h
@@ -55,7 +55,7 @@ class WebSocketTask : public CanMakeWeakPtr<WebSocketTask>, public CanMakeChecke
@@ -9175,7 +9208,7 @@ index a6d86f1388e8cae7c3939d1ecffb2c46eb5054c5..9e11224335211908fe8bf14edc4c22e9
;; 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 d781f70f2c31ff5631773684893a40d738bd9856..6270cfd7707a190f123b9750a31162fbc64c3086 100644
+index 4fd4b7c714f0c6364f7c239b9e25af3428ffd1fd..56d6e55721c077a34dee36ea7043395331d453bb 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)
@@ -9197,7 +9230,7 @@ index d781f70f2c31ff5631773684893a40d738bd9856..6270cfd7707a190f123b9750a31162fb
if (!error)
return true;
diff --git a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp
-index 599c405513ee38c74da12c01dafc23c6ece86aa0..5af7dc9306d211a5cff1736013716b08933e2278 100644
+index c0c9bf6f4f1879efb8dfdd24951ef67ae373fa2f..48aeb8ac1324a58dc59bdb125c8ec4e317e24fd2 100644
--- a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp
+++ b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp
@@ -100,6 +100,11 @@ void NetworkSessionSoup::clearCredentials(WallTime)
@@ -9236,10 +9269,10 @@ index 599c405513ee38c74da12c01dafc23c6ece86aa0..5af7dc9306d211a5cff1736013716b08
}
diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index 945c0ce1def2b3ed580e2f497b2347a8b2cebbac..722b30d805b005229b38fe4ef2c53c06b8fb2f24 100644
+index 2f33b1c02a7d0e352a5662c19b44cfa7a161b8f5..263d65ba51319116f161db5918439c081cde43fd 100644
--- a/Source/WebKit/PlatformGTK.cmake
+++ b/Source/WebKit/PlatformGTK.cmake
-@@ -328,6 +328,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
+@@ -320,6 +320,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
${GSTREAMER_PBUTILS_INCLUDE_DIRS}
${GTK_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
@@ -9249,7 +9282,7 @@ index 945c0ce1def2b3ed580e2f497b2347a8b2cebbac..722b30d805b005229b38fe4ef2c53c06
)
list(APPEND WebKit_INTERFACE_INCLUDE_DIRECTORIES
-@@ -364,6 +367,9 @@ if (USE_LIBWEBRTC)
+@@ -356,6 +359,9 @@ if (USE_LIBWEBRTC)
list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
"${THIRDPARTY_DIR}/libwebrtc/Source/"
"${THIRDPARTY_DIR}/libwebrtc/Source/webrtc"
@@ -9259,7 +9292,7 @@ index 945c0ce1def2b3ed580e2f497b2347a8b2cebbac..722b30d805b005229b38fe4ef2c53c06
)
endif ()
-@@ -415,6 +421,12 @@ else ()
+@@ -407,6 +413,12 @@ else ()
set(WebKitGTK_ENUM_HEADER_TEMPLATE ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in)
endif ()
@@ -9273,10 +9306,10 @@ index 945c0ce1def2b3ed580e2f497b2347a8b2cebbac..722b30d805b005229b38fe4ef2c53c06
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 3c5bdcf25c6f9c0c86d0c4550d5dc7486f99d703..259fce0cf15b4263148f6f6da59161001875b465 100644
+index 8376382ba17ea308210e2a46a60a90a2da2d013c..7935f07612a7ce44cae17e4a8650dcee36ceb49b 100644
--- a/Source/WebKit/PlatformWPE.cmake
+++ b/Source/WebKit/PlatformWPE.cmake
-@@ -117,6 +117,8 @@ list(APPEND WebKit_SERIALIZATION_IN_FILES
+@@ -114,6 +114,8 @@ list(APPEND WebKit_SERIALIZATION_IN_FILES
Shared/glib/UserMessage.serialization.in
Shared/soup/WebCoreArgumentCodersSoup.serialization.in
@@ -9285,7 +9318,7 @@ index 3c5bdcf25c6f9c0c86d0c4550d5dc7486f99d703..259fce0cf15b4263148f6f6da5916100
)
list(APPEND WebKit_DERIVED_SOURCES
-@@ -221,6 +223,7 @@ set(WPE_API_HEADER_TEMPLATES
+@@ -213,6 +215,7 @@ set(WPE_API_HEADER_TEMPLATES
${WEBKIT_DIR}/UIProcess/API/glib/WebKitWindowProperties.h.in
${WEBKIT_DIR}/UIProcess/API/glib/WebKitWebsitePolicies.h.in
${WEBKIT_DIR}/UIProcess/API/glib/webkit.h.in
@@ -9293,7 +9326,7 @@ index 3c5bdcf25c6f9c0c86d0c4550d5dc7486f99d703..259fce0cf15b4263148f6f6da5916100
)
if (ENABLE_2022_GLIB_API)
-@@ -430,7 +433,16 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
+@@ -423,7 +426,16 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
@@ -9418,19 +9451,6 @@ index e0e9b52c43ee0742f705159c1369f2938b9c4956..05fa7d93a721f200143e9d3ac45a75ce
list(APPEND WebProcess_SOURCES
WebProcess/EntryPoint/win/WebProcessMain.cpp
-diff --git a/Source/WebKit/Scripts/generate-unified-sources.sh b/Source/WebKit/Scripts/generate-unified-sources.sh
-index 666b9f0669ad6e7d9050ec5b7a7d67ac533be363..d50f0eb91074b6263be5805fd89818a3573cf0ef 100755
---- a/Source/WebKit/Scripts/generate-unified-sources.sh
-+++ b/Source/WebKit/Scripts/generate-unified-sources.sh
-@@ -18,7 +18,7 @@ if [ $# -eq 0 ]; then
- echo "Using unified source list files: Sources.txt, SourcesCocoa.txt, Platform/Sources.txt, Platform/SourcesCocoa.txt"
- fi
-
--UnifiedSourceCppFileCount=137
-+UnifiedSourceCppFileCount=139
- UnifiedSourceCFileCount=0
- UnifiedSourceMmFileCount=80
-
diff --git a/Source/WebKit/Shared/AuxiliaryProcess.h b/Source/WebKit/Shared/AuxiliaryProcess.h
index 4510beb0b7403138abef4c9b5e892271fe8beaab..dae8f31ef187d7b086dd84d7e356839dc2811154 100644
--- a/Source/WebKit/Shared/AuxiliaryProcess.h
@@ -9500,18 +9520,10 @@ index c72c9733800b6f836c4d3ccb0b50d40c3ee83067..e2955ddebe388d886ca43d733dce0eb5
#if USE(APPKIT)
diff --git a/Source/WebKit/Shared/NativeWebMouseEvent.h b/Source/WebKit/Shared/NativeWebMouseEvent.h
-index e33858caab024b20217304209d7bf428e3335653..4026f6244889e5a0ee85edb72696d0be20ba531d 100644
+index a39b6dd673e1639f9fe64c23dd054f0ff57f7464..4026f6244889e5a0ee85edb72696d0be20ba531d 100644
--- a/Source/WebKit/Shared/NativeWebMouseEvent.h
+++ b/Source/WebKit/Shared/NativeWebMouseEvent.h
-@@ -31,6 +31,7 @@
- #if USE(APPKIT)
- #include <wtf/RetainPtr.h>
- OBJC_CLASS NSView;
-+OBJC_CLASS NSEvent;
- #endif
-
- #if PLATFORM(GTK)
-@@ -86,6 +87,11 @@ public:
+@@ -87,6 +87,11 @@ public:
NativeWebMouseEvent(HWND, UINT message, WPARAM, LPARAM, bool, float deviceScaleFactor);
#endif
@@ -9551,10 +9563,10 @@ index ea1eb9f00feaaecf73bdddc37c904e88f43bfa85..8a631e5293a11abd650958baad4e9678
#endif
};
diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
-index fda0fedd6538fa8d239775da0949d907f235be33..a8218678e5a0ffab6828529395bbd783b955b256 100644
+index db25c4a2dbb7fd8f9e0885757655eed1ebf64d35..1c21752b0f3710d7dfb0c70421c17de740274439 100644
--- a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
+++ b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
-@@ -2764,6 +2764,9 @@ class WebCore::AuthenticationChallenge {
+@@ -2814,6 +2814,9 @@ class WebCore::AuthenticationChallenge {
class WebCore::DragData {
#if PLATFORM(COCOA)
String pasteboardName();
@@ -9564,7 +9576,7 @@ index fda0fedd6538fa8d239775da0949d907f235be33..a8218678e5a0ffab6828529395bbd783
#endif
WebCore::IntPoint clientPosition();
WebCore::IntPoint globalPosition();
-@@ -3562,6 +3565,7 @@ enum class WebCore::WasPrivateRelayed : bool;
+@@ -3621,6 +3624,7 @@ enum class WebCore::WasPrivateRelayed : bool;
String httpStatusText;
String httpVersion;
WebCore::HTTPHeaderMap httpHeaderFields;
@@ -9690,30 +9702,30 @@ index fd4722dd38df74f259d8add02025549022a0a205..e1c33f6d766707170935b3e77e81098c
void setPosition(const WebCore::IntPoint& position) { m_position = position; }
const WebCore::IntPoint& globalPosition() const { return m_globalPosition; }
diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h
-index 8b5cedc5b433d8b7c1cdadf8206bd7b446ae7c21..9a8ac919d38ce51ffb1e0aeda9f23ce587736dd8 100644
+index 95aa13fdc5bd9d5ece8f3ff4279c0ebe03f3cdef..bde8a24fcce390b859f6241c9816eb6430376d6b 100644
--- a/Source/WebKit/Shared/WebPageCreationParameters.h
+++ b/Source/WebKit/Shared/WebPageCreationParameters.h
-@@ -306,6 +306,8 @@ struct WebPageCreationParameters {
+@@ -309,6 +309,8 @@ struct WebPageCreationParameters {
+ WebCore::ShouldRelaxThirdPartyCookieBlocking shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No };
bool httpsUpgradeEnabled { true };
-
-+ bool shouldPauseInInspectorWhenShown { false };
+
- #if PLATFORM(IOS) || PLATFORM(VISION)
- bool allowsDeprecatedSynchronousXMLHttpRequestDuringUnload { false };
- #endif
++ bool shouldPauseInInspectorWhenShown { false };
+
+ #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 bf9888a54cfe4fe5f2dee954b82fa9301498175b..85a2c43977be2751a61a9594c53270fb1bb26b4f 100644
+index 0c9594c44a6f1962642835b221b1c27d15cc33d7..b6898b100be0fe64aba87305711846f066bf9459 100644
--- a/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
+++ b/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
-@@ -226,6 +226,8 @@ enum class WebCore::UserInterfaceLayoutDirection : bool;
+@@ -229,6 +229,8 @@ enum class WebCore::UserInterfaceLayoutDirection : bool;
bool httpsUpgradeEnabled;
+ bool shouldPauseInInspectorWhenShown;
+
- #if PLATFORM(IOS) || PLATFORM(VISION)
- bool allowsDeprecatedSynchronousXMLHttpRequestDuringUnload;
+ #if ENABLE(APP_HIGHLIGHTS)
+ WebCore::HighlightVisibility appHighlightsVisible;
#endif
diff --git a/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp b/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp
index 40d482a1860598391363027e63b010b3ce32b014..e654ae5e7c54b788badd463b1f2b653160d0370e 100644
@@ -9808,7 +9820,7 @@ index 0000000000000000000000000000000000000000..f4f09d171ebf9774b3f8744751d220d3
+ bool canSmartReplace()
+}
diff --git a/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp b/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp
-index f931d51a7b1818155729d5622038c442bba53cc0..d7c1ce87abca61fb5b72368376352ce93744a9a1 100644
+index 7fcd22cd2172cd7fa77aee12ad5cfcf7a435abba..bc822b40eea889fb0499dd4e78f89f04d87c64a1 100644
--- a/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp
+++ b/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp
@@ -40,6 +40,15 @@
@@ -9839,10 +9851,10 @@ index f931d51a7b1818155729d5622038c442bba53cc0..d7c1ce87abca61fb5b72368376352ce9
}
diff --git a/Source/WebKit/Shared/win/AuxiliaryProcessMainWin.cpp b/Source/WebKit/Shared/win/AuxiliaryProcessMainWin.cpp
-index 9edb5fbcd103cd8d1b224dfd60ac88aabe9626d2..9ed392ae3809f8bda92a2765ffadc643f23fe856 100644
+index 053e9336017d8818b3cbea79ce7c145fd5c46274..5632498d6ef875df80fc68ec206a9d08e5d05a6f 100644
--- a/Source/WebKit/Shared/win/AuxiliaryProcessMainWin.cpp
+++ b/Source/WebKit/Shared/win/AuxiliaryProcessMainWin.cpp
-@@ -41,6 +41,10 @@ bool AuxiliaryProcessMainCommon::parseCommandLine(int argc, char** argv)
+@@ -47,6 +47,10 @@ bool AuxiliaryProcessMainCommon::parseCommandLine(int argc, char** argv)
m_parameters.connectionIdentifier = IPC::Connection::Identifier { reinterpret_cast<HANDLE>(parseIntegerAllowingTrailingJunk<uint64_t>(StringView::fromLatin1(argv[++i])).value_or(0)) };
else if (!strcmp(argv[i], "-processIdentifier") && i + 1 < argc)
m_parameters.processIdentifier = ObjectIdentifier<WebCore::ProcessIdentifierType>(parseIntegerAllowingTrailingJunk<uint64_t>(StringView::fromLatin1(argv[++i])).value_or(0));
@@ -9854,7 +9866,7 @@ index 9edb5fbcd103cd8d1b224dfd60ac88aabe9626d2..9ed392ae3809f8bda92a2765ffadc643
JSC::Config::configureForTesting();
else if (!strcmp(argv[i], "-disable-jit"))
diff --git a/Source/WebKit/Shared/win/WebEventFactory.cpp b/Source/WebKit/Shared/win/WebEventFactory.cpp
-index a1044685ff596361f14f418a1d1f0b133dee385a..2916a6f8e0c370b860ea45106c34d8dd82547f93 100644
+index 23ec85c142892f8f9bee7d063c3ff0cafe6c53a5..4f0021ad12ded82b7ac958fc6c752410ce2ac764 100644
--- a/Source/WebKit/Shared/win/WebEventFactory.cpp
+++ b/Source/WebKit/Shared/win/WebEventFactory.cpp
@@ -484,7 +484,7 @@ WebKeyboardEvent WebEventFactory::createWebKeyboardEvent(HWND hwnd, UINT message
@@ -9867,10 +9879,10 @@ index a1044685ff596361f14f418a1d1f0b133dee385a..2916a6f8e0c370b860ea45106c34d8dd
#endif // ENABLE(TOUCH_EVENTS)
diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt
-index 63be8e6480621c508443ba589342034a8cd64523..57b13efa8198ffa203510642b2db8aae526f5030 100644
+index 1a8bb4ce0d39f7d03264bb010be3158f3bd87000..34e2d4d603fae0acc8ace9afb8e3ff549e87bf07 100644
--- a/Source/WebKit/Sources.txt
+++ b/Source/WebKit/Sources.txt
-@@ -384,6 +384,7 @@ Shared/XR/XRDeviceProxy.cpp
+@@ -389,6 +389,7 @@ Shared/XR/XRDeviceProxy.cpp
UIProcess/AuxiliaryProcessProxy.cpp
UIProcess/BackgroundProcessResponsivenessTimer.cpp
UIProcess/BrowsingContextGroup.cpp
@@ -9878,7 +9890,7 @@ index 63be8e6480621c508443ba589342034a8cd64523..57b13efa8198ffa203510642b2db8aae
UIProcess/DeviceIdHashSaltStorage.cpp
UIProcess/DisplayLink.cpp
UIProcess/DisplayLinkProcessProxyClient.cpp
-@@ -393,16 +394,20 @@ UIProcess/FrameLoadState.cpp
+@@ -398,16 +399,20 @@ UIProcess/FrameLoadState.cpp
UIProcess/FrameProcess.cpp
UIProcess/GeolocationPermissionRequestManagerProxy.cpp
UIProcess/GeolocationPermissionRequestProxy.cpp
@@ -9897,9 +9909,9 @@ index 63be8e6480621c508443ba589342034a8cd64523..57b13efa8198ffa203510642b2db8aae
UIProcess/ProvisionalPageProxy.cpp
+UIProcess/RemoteInspectorPipe.cpp
UIProcess/RemotePageDrawingAreaProxy.cpp
+ UIProcess/RemotePageFullscreenManagerProxy.cpp
UIProcess/RemotePageProxy.cpp
- UIProcess/ResponsivenessTimer.cpp
-@@ -444,6 +449,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp
+@@ -450,6 +455,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp
UIProcess/WebPageDiagnosticLoggingClient.cpp
UIProcess/WebPageGroup.cpp
UIProcess/WebPageInjectedBundleClient.cpp
@@ -9908,7 +9920,7 @@ index 63be8e6480621c508443ba589342034a8cd64523..57b13efa8198ffa203510642b2db8aae
UIProcess/WebPageProxy.cpp
UIProcess/WebPageProxyMessageReceiverRegistration.cpp
UIProcess/WebPageProxyTesting.cpp
-@@ -588,7 +595,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp
+@@ -596,7 +603,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp
UIProcess/Inspector/WebPageDebuggable.cpp
UIProcess/Inspector/WebPageInspectorController.cpp
@@ -9921,7 +9933,7 @@ index 63be8e6480621c508443ba589342034a8cd64523..57b13efa8198ffa203510642b2db8aae
UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp
UIProcess/Media/MediaUsageManager.cpp
diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt
-index 703fed777c597c14e0794270747c771627118460..a521863925b7392e1172f62d818bde3e4d66850c 100644
+index 19e2664300bd081ae5124d6b08055c028f04ebb2..5b851c95b75262264dec59503b74c2548b9ee737 100644
--- a/Source/WebKit/SourcesCocoa.txt
+++ b/Source/WebKit/SourcesCocoa.txt
@@ -270,6 +270,7 @@ UIProcess/API/Cocoa/_WKArchiveExclusionRule.mm
@@ -9932,7 +9944,7 @@ index 703fed777c597c14e0794270747c771627118460..a521863925b7392e1172f62d818bde3e
UIProcess/API/Cocoa/_WKContentRuleListAction.mm
UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm
UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify
-@@ -464,6 +465,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm
+@@ -467,6 +468,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm
UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm
UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm
@@ -9941,7 +9953,7 @@ index 703fed777c597c14e0794270747c771627118460..a521863925b7392e1172f62d818bde3e
UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm
UIProcess/Inspector/mac/WKInspectorViewController.mm
diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt
-index 39c4934ff42c3854a5c4acf379812d3f8d55832f..0fcdeea00c863c6b72469b3f4cd8561f0d7113c5 100644
+index 3c8d209cba714f7df7c1e78d951886692ca58b09..2d893bdc430f9e81a3369a9470d21134aa63c9a1 100644
--- a/Source/WebKit/SourcesGTK.txt
+++ b/Source/WebKit/SourcesGTK.txt
@@ -122,6 +122,7 @@ UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify
@@ -9978,7 +9990,7 @@ index 39c4934ff42c3854a5c4acf379812d3f8d55832f..0fcdeea00c863c6b72469b3f4cd8561f
UIProcess/gtk/WebPasteboardProxyGtk.cpp
UIProcess/gtk/WebPopupMenuProxyGtk.cpp
diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt
-index 3eaaa65a91fb381bd7366e36c147e0cba64358d4..645f0c98e248de12731c2bdf693eaef614535b3f 100644
+index 42931a643d8ff85469b5e162a42e9a09a8bdca3f..f962949675b8de7b79e6d56bb8bb3f342b39dfe8 100644
--- a/Source/WebKit/SourcesWPE.txt
+++ b/Source/WebKit/SourcesWPE.txt
@@ -124,6 +124,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify
@@ -9997,15 +10009,7 @@ index 3eaaa65a91fb381bd7366e36c147e0cba64358d4..645f0c98e248de12731c2bdf693eaef6
UIProcess/API/glib/WebKitPolicyDecision.cpp @no-unify
UIProcess/API/glib/WebKitPrivate.cpp @no-unify
UIProcess/API/glib/WebKitProtocolHandler.cpp @no-unify
-@@ -193,6 +195,7 @@ UIProcess/API/soup/HTTPCookieStoreSoup.cpp
- UIProcess/API/wpe/InputMethodFilterWPE.cpp @no-unify
- UIProcess/API/wpe/PageClientImpl.cpp @no-unify
- UIProcess/API/wpe/WebKitColor.cpp @no-unify
-+UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.cpp @no-unify
- UIProcess/API/wpe/WebKitInputMethodContextWPE.cpp @no-unify
- UIProcess/API/wpe/WebKitInputMethodContextImplWPE.cpp @no-unify
- UIProcess/API/wpe/WebKitPopupMenu.cpp @no-unify
-@@ -221,6 +224,7 @@ UIProcess/glib/DisplayVBlankMonitor.cpp
+@@ -221,6 +223,7 @@ UIProcess/glib/DisplayVBlankMonitor.cpp
UIProcess/glib/DisplayVBlankMonitorDRM.cpp
UIProcess/glib/DisplayVBlankMonitorTimer.cpp
UIProcess/glib/FenceMonitor.cpp
@@ -10013,7 +10017,7 @@ index 3eaaa65a91fb381bd7366e36c147e0cba64358d4..645f0c98e248de12731c2bdf693eaef6
UIProcess/glib/ScreenManager.cpp
UIProcess/glib/SystemSettingsManagerProxy.cpp
UIProcess/glib/WebPageProxyGLib.cpp
-@@ -254,8 +258,13 @@ UIProcess/linux/MemoryPressureMonitor.cpp
+@@ -254,8 +257,14 @@ UIProcess/linux/MemoryPressureMonitor.cpp
UIProcess/soup/WebProcessPoolSoup.cpp
UIProcess/wpe/AcceleratedBackingStoreDMABuf.cpp
@@ -10021,6 +10025,7 @@ index 3eaaa65a91fb381bd7366e36c147e0cba64358d4..645f0c98e248de12731c2bdf693eaef6
UIProcess/wpe/ScreenManagerWPE.cpp
UIProcess/wpe/SystemSettingsManagerProxyWPE.cpp
+UIProcess/wpe/WebColorPickerWPE.cpp
++UIProcess/wpe/WebDataListSuggestionsDropdownWPE.cpp
+UIProcess/wpe/WebDateTimePickerWPE.cpp
+UIProcess/wpe/WebPageInspectorEmulationAgentWPE.cpp
+UIProcess/wpe/WebPageInspectorInputAgentWPE.cpp
@@ -10037,10 +10042,10 @@ index 3eaaa65a91fb381bd7366e36c147e0cba64358d4..645f0c98e248de12731c2bdf693eaef6
WebProcess/WebPage/AcceleratedSurface.cpp
diff --git a/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp b/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
-index bbd1b64631ed858686e118c94a5b44ef2bacc3f8..491e888db9e696ac65528ebd05a38224d9140b2f 100644
+index 0f27d0e97c1039ad5c95086c0e7eb72f4fe85db1..9ca848d9e0c78bce8b77721debf18deba76f4b2c 100644
--- a/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
+++ b/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
-@@ -255,6 +255,11 @@ WebPageProxy* PageConfiguration::relatedPage() const
+@@ -275,6 +275,11 @@ WebPageProxy* PageConfiguration::relatedPage() const
return m_data.relatedPage.get();
}
@@ -10053,10 +10058,10 @@ index bbd1b64631ed858686e118c94a5b44ef2bacc3f8..491e888db9e696ac65528ebd05a38224
{
return m_data.pageToCloneSessionStorageFrom.get();
diff --git a/Source/WebKit/UIProcess/API/APIPageConfiguration.h b/Source/WebKit/UIProcess/API/APIPageConfiguration.h
-index d4cc6c31b1cb6483cd1ac5d90762c4a2ad7c905a..2322900ab0c068d28f975bef27dac02b4469aef0 100644
+index ba3fed377d5f2a799fbf7b38a5bc2f03efbe7535..e4c41d0a444d12f80d0402591dfa39e8e68e4fd0 100644
--- a/Source/WebKit/UIProcess/API/APIPageConfiguration.h
+++ b/Source/WebKit/UIProcess/API/APIPageConfiguration.h
-@@ -156,6 +156,10 @@ public:
+@@ -160,6 +160,10 @@ public:
WebKit::WebPageProxy* relatedPage() const;
void setRelatedPage(WeakPtr<WebKit::WebPageProxy>&& relatedPage) { m_data.relatedPage = WTFMove(relatedPage); }
@@ -10067,7 +10072,7 @@ index d4cc6c31b1cb6483cd1ac5d90762c4a2ad7c905a..2322900ab0c068d28f975bef27dac02b
WebKit::WebPageProxy* pageToCloneSessionStorageFrom() const;
void setPageToCloneSessionStorageFrom(WeakPtr<WebKit::WebPageProxy>&&);
-@@ -507,6 +511,7 @@ private:
+@@ -518,6 +522,7 @@ private:
#endif
RefPtr<WebKit::WebPageGroup> pageGroup;
WeakPtr<WebKit::WebPageProxy> relatedPage;
@@ -10123,7 +10128,7 @@ index d2e8261c6db000aa41697b3bb50e2bea149edcdf..500c38b81d6804f64ff891e32b2c72ed
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 2972dde456001f5443142513711549297eff9b10..a71d47c77a1167863232f2e7d76381b3e87c4af3 100644
+index fdfb6489e3b5f8b70da8918e72612c74ada771f6..fe58191302f84065523d048463b0b6b2fe71c394 100644
--- a/Source/WebKit/UIProcess/API/APIUIClient.h
+++ b/Source/WebKit/UIProcess/API/APIUIClient.h
@@ -115,6 +115,7 @@ public:
@@ -10178,10 +10183,10 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0
}
#endif
diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp
-index bae7c5eb3879237a34a1abb249bf312822d59569..f905369dec97083ce4d4d60b838a63e56be36d77 100644
+index 2e9502e5767eb93b7a2d6488a113e69f953f3e4a..56969ab93991ef77dc020e0d3f7b7e4e71324416 100644
--- a/Source/WebKit/UIProcess/API/C/WKPage.cpp
+++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp
-@@ -1801,6 +1801,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
+@@ -1899,6 +1899,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
completionHandler(String());
}
@@ -10195,7 +10200,7 @@ index bae7c5eb3879237a34a1abb249bf312822d59569..f905369dec97083ce4d4d60b838a63e5
void setStatusText(WebPageProxy* page, const String& text) final
{
if (!m_client.setStatusText)
-@@ -1830,6 +1837,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
+@@ -1928,6 +1935,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
{
if (!m_client.didNotHandleKeyEvent)
return;
@@ -10265,7 +10270,7 @@ index 1484f064ec89ee8c25c35df9f0a4462896699415..0622f4d5fc9144b9059395d9d0730a4a
// Version 15.
WKPageDecidePolicyForSpeechRecognitionPermissionRequestCallback decidePolicyForSpeechRecognitionPermissionRequest;
diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm b/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
-index 93882c7e4c9873fce79af428ceaa73a4eca851cb..9d6f85a1ee633bdd6589fe9fae74d6f9ebff6e08 100644
+index 53350803b70ce91ba7d326b94435f7cbca375afa..4595ba4208f1a2e7864b2b0ed6e66db42c2d00a6 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
+++ b/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
@@ -712,6 +712,16 @@ - (void)_setMediaCaptureRequiresSecureConnection:(BOOL)requiresSecureConnection
@@ -10286,7 +10291,7 @@ index 93882c7e4c9873fce79af428ceaa73a4eca851cb..9d6f85a1ee633bdd6589fe9fae74d6f9
{
return _preferences->inactiveMediaCaptureStreamRepromptIntervalInMinutes();
diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
-index 31de8ef3d986a5c391e1fb045268e95d5eefaf11..690cb85ab84d7ad2818ba4c362c8f0f25e25c1e1 100644
+index 34d46d52f796ed9b06fafabd03864229cdd307ab..a74a1ea9f9a55421bd569d958d7c0baa8618ca6d 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
+++ b/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
@@ -119,6 +119,7 @@ typedef NS_ENUM(NSInteger, _WKPitchCorrectionAlgorithm) {
@@ -10328,7 +10333,7 @@ index eff4cf557033561ab20762d93a58c2d71f5505f0..9418e2c51e50190dee2b5d7c854eacea
NS_ASSUME_NONNULL_END
diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
-index 29f1855ec5009fecf05e3c3fda2d38845973c085..279b05f40b2d446bb7bedbcab4239e2f72656cd2 100644
+index 97a87094e648a15e2501fb39a46bf0fbb4cb50d9..b08c212a0372175859645f7dba0c704fe865451c 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
@@ -55,6 +55,7 @@
@@ -10339,7 +10344,7 @@ index 29f1855ec5009fecf05e3c3fda2d38845973c085..279b05f40b2d446bb7bedbcab4239e2f
#import <WebCore/Credential.h>
#import <WebCore/RegistrableDomain.h>
#import <WebCore/ResourceResponse.h>
-@@ -496,6 +497,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple
+@@ -552,6 +553,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple
});
}
@@ -10523,18 +10528,6 @@ index 4974e14214e2bb3e982325b885bab33e54f83998..cacdf8c71fab248d38d2faf03f7affdc
typedef NS_ENUM(NSInteger, _WKUserStyleLevel) {
_WKUserStyleUserLevel,
-diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushDaemonConnection.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushDaemonConnection.mm
-index 8cd456770de0cd073370e97155b90eda3e7480a5..8e3975ae1fe673bd39facbfe787f143b80e24fb6 100644
---- a/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushDaemonConnection.mm
-+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushDaemonConnection.mm
-@@ -32,6 +32,7 @@
- #import "WKSecurityOriginInternal.h"
- #import "WebPushDaemonConnectionConfiguration.h"
- #import "_WKNotificationDataInternal.h"
-+#import "_WKWebPushMessageInternal.h"
- #import "_WKWebPushSubscriptionDataInternal.h"
- #import <WebCore/ExceptionData.h>
- #import <WebCore/PushPermissionState.h>
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushSubscriptionData.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushSubscriptionData.mm
index 0a78daba00961bf10564a0b53067960b71d8b61d..696408b77c82e205a134edf2ee17ff971af226f3 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushSubscriptionData.mm
@@ -10767,10 +10760,10 @@ index 9b6d8db85df969e609de036fac67374226ecd48e..2b293d5f24e562f06859432580f2cdfe
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 b41b2938110b41a024b98215e2af31d960f1b936..502319020e384ee91b5367b10f48c71ff907560b 100644
+index 5479cf466e1ba77ede37ff980e78bee85bbb094c..224c04a4bd9de6ad5661b15071c1267a57430547 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
-@@ -422,10 +422,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa
+@@ -423,10 +423,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa
}
}
@@ -10790,7 +10783,7 @@ index b41b2938110b41a024b98215e2af31d960f1b936..502319020e384ee91b5367b10f48c71f
GUniquePtr<char> bundleFilename(g_build_filename(injectedBundleDirectory(), INJECTED_BUNDLE_FILENAME, nullptr));
WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object);
-@@ -484,6 +493,8 @@ static void webkitWebContextConstructed(GObject* object)
+@@ -485,6 +494,8 @@ static void webkitWebContextConstructed(GObject* object)
static void webkitWebContextDispose(GObject* object)
{
@@ -10799,7 +10792,7 @@ index b41b2938110b41a024b98215e2af31d960f1b936..502319020e384ee91b5367b10f48c71f
WebKitWebContextPrivate* priv = WEBKIT_WEB_CONTEXT(object)->priv;
if (!priv->clientsDetached) {
priv->clientsDetached = true;
-@@ -945,6 +956,11 @@ WebKitNetworkSession* webkit_web_context_get_network_session_for_automation(WebK
+@@ -946,6 +957,11 @@ WebKitNetworkSession* webkit_web_context_get_network_session_for_automation(WebK
return nullptr;
#endif
}
@@ -10836,10 +10829,10 @@ index c1945fbe717a42afc1f51d64a80c7de3fa9009ba..ab63fe19b00ecbd64c9421e6eecad3e2
#endif
+int webkitWebContextExistingCount();
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
-index 8f1821a8547e6f28032ba49a5f47344b916cd802..2dc19565002f98528b11b2d7a4fecd9ebb1a2b77 100644
+index 7d8de31fc7e373871e89ab41fc8f3a63fceea1c6..7d2785ed1798bd661d0f98e5ab68037d3cd02c51 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
-@@ -36,6 +36,7 @@
+@@ -37,6 +37,7 @@
#include "WebContextMenuItem.h"
#include "WebContextMenuItemData.h"
#include "WebFrameProxy.h"
@@ -10847,7 +10840,7 @@ index 8f1821a8547e6f28032ba49a5f47344b916cd802..2dc19565002f98528b11b2d7a4fecd9e
#include "WebKitAuthenticationRequestPrivate.h"
#include "WebKitBackForwardListPrivate.h"
#include "WebKitContextMenuClient.h"
-@@ -149,6 +150,7 @@ enum {
+@@ -150,6 +151,7 @@ enum {
CLOSE,
SCRIPT_DIALOG,
@@ -10855,7 +10848,7 @@ index 8f1821a8547e6f28032ba49a5f47344b916cd802..2dc19565002f98528b11b2d7a4fecd9e
DECIDE_POLICY,
PERMISSION_REQUEST,
-@@ -517,6 +519,16 @@ GRefPtr<WebKitOptionMenu> WebKitWebViewClient::showOptionMenu(WebKitPopupMenu& p
+@@ -518,6 +520,16 @@ GRefPtr<WebKitOptionMenu> WebKitWebViewClient::showOptionMenu(WebKitPopupMenu& p
void WebKitWebViewClient::frameDisplayed(WKWPE::View&)
{
@@ -10872,7 +10865,7 @@ index 8f1821a8547e6f28032ba49a5f47344b916cd802..2dc19565002f98528b11b2d7a4fecd9e
{
SetForScope inFrameDisplayedGuard(m_webView->priv->inFrameDisplayed, true);
for (const auto& callback : m_webView->priv->frameDisplayedCallbacks) {
-@@ -533,6 +545,18 @@ void WebKitWebViewClient::frameDisplayed(WKWPE::View&)
+@@ -534,6 +546,18 @@ void WebKitWebViewClient::frameDisplayed(WKWPE::View&)
}
}
@@ -10891,7 +10884,7 @@ index 8f1821a8547e6f28032ba49a5f47344b916cd802..2dc19565002f98528b11b2d7a4fecd9e
void WebKitWebViewClient::willStartLoad(WKWPE::View&)
{
webkitWebViewWillStartLoad(m_webView);
-@@ -619,7 +643,7 @@ static gboolean webkitWebViewDecidePolicy(WebKitWebView*, WebKitPolicyDecision*
+@@ -620,7 +644,7 @@ static gboolean webkitWebViewDecidePolicy(WebKitWebView*, WebKitPolicyDecision*
static gboolean webkitWebViewPermissionRequest(WebKitWebView*, WebKitPermissionRequest* request)
{
@@ -10900,7 +10893,7 @@ index 8f1821a8547e6f28032ba49a5f47344b916cd802..2dc19565002f98528b11b2d7a4fecd9e
if (WEBKIT_IS_POINTER_LOCK_PERMISSION_REQUEST(request)) {
webkit_permission_request_allow(request);
return TRUE;
-@@ -942,6 +966,10 @@ static void webkitWebViewConstructed(GObject* object)
+@@ -943,6 +967,10 @@ static void webkitWebViewConstructed(GObject* object)
priv->websitePolicies = adoptGRef(webkit_website_policies_new());
Ref configuration = priv->relatedView && priv->relatedView->priv->configurationForNextRelatedView ? priv->relatedView->priv->configurationForNextRelatedView.releaseNonNull() : webkitWebViewCreatePageConfiguration(webView);
@@ -10911,7 +10904,7 @@ index 8f1821a8547e6f28032ba49a5f47344b916cd802..2dc19565002f98528b11b2d7a4fecd9e
webkitWebViewCreatePage(webView, WTFMove(configuration));
webkitWebContextWebViewCreated(priv->context.get(), webView);
-@@ -1981,6 +2009,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
+@@ -1982,6 +2010,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
G_TYPE_BOOLEAN, 1,
WEBKIT_TYPE_SCRIPT_DIALOG);
@@ -10927,7 +10920,7 @@ index 8f1821a8547e6f28032ba49a5f47344b916cd802..2dc19565002f98528b11b2d7a4fecd9e
/**
* WebKitWebView::decide-policy:
* @web_view: the #WebKitWebView on which the signal is emitted
-@@ -2766,6 +2803,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const
+@@ -2767,6 +2804,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const
webkit_script_dialog_unref(webView->priv->currentScriptDialog);
}
@@ -10976,10 +10969,10 @@ index 763cd55f7abca011ac8bc4fef7f233bf52854cda..bd43917b274bf19ff9f3d96b7e80e207
#include <@API_INCLUDE_PREFIX@/WebKitClipboardPermissionRequest.h>
#include <@API_INCLUDE_PREFIX@/WebKitColorChooserRequest.h>
diff --git a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
-index ebd7d55886465375c70fb3265f6655fe43c62966..b5d2169c2b76474f12038727a66cf69e5ed23ebd 100644
+index 986edbe2d0b6ff2ed5717a14a71f26c973604f0c..c688cc026456686a54916857ba0396702ebf4a1e 100644
--- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
+++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
-@@ -268,6 +268,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool
+@@ -270,6 +270,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool
{
if (wasEventHandled || event.type() != WebEventType::KeyDown || !event.nativeEvent())
return;
@@ -10988,7 +10981,7 @@ index ebd7d55886465375c70fb3265f6655fe43c62966..b5d2169c2b76474f12038727a66cf69e
// Always consider arrow keys as handled, otherwise the GtkWindow key bindings will move the focus.
guint keyval;
-@@ -366,9 +368,9 @@ void PageClientImpl::selectionDidChange()
+@@ -362,9 +364,9 @@ void PageClientImpl::selectionDidChange()
webkitWebViewSelectionDidChange(WEBKIT_WEB_VIEW(m_viewWidget));
}
@@ -11001,11 +10994,11 @@ index ebd7d55886465375c70fb3265f6655fe43c62966..b5d2169c2b76474f12038727a66cf69e
void PageClientImpl::didChangeContentSize(const IntSize& size)
diff --git a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h
-index 536e66027bdcfec08e28503d3dd715e3c51a2c9f..2cfba18152fd87c10e1bb7630515a677799f1bbc 100644
+index bd11269e156a92ce0e44cab3da4e4adde5142f64..1761d7541f226232b16ba8da3a6d609280037389 100644
--- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h
+++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h
-@@ -109,7 +109,7 @@ private:
- #endif
+@@ -104,7 +104,7 @@ private:
+ RefPtr<WebDataListSuggestionsDropdown> createDataListSuggestionsDropdown(WebPageProxy&) override;
Ref<WebCore::ValidationBubble> createValidationBubble(const String& message, const WebCore::ValidationBubble::Settings&) final;
void selectionDidChange() override;
- RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&) override;
@@ -11114,10 +11107,10 @@ index 496079da90993ac37689b060b69ecd4a67c2b6a8..af30181ca922f16c0f6e245c70e5ce7d
G_BEGIN_DECLS
diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
-index 1d118b75a4be169d624ac18b50b13096bf7e1f36..29e48279f82dfaf83016c97349b284d054e1b956 100644
+index 597dcdbd94e8899f60fc9a0566698fd142170926..8d7f77586e25d299c3043128536fd3801eccde4a 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)
+@@ -2873,6 +2873,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase)
#endif
}
@@ -11129,7 +11122,7 @@ index 1d118b75a4be169d624ac18b50b13096bf7e1f36..29e48279f82dfaf83016c97349b284d0
void webkitWebViewBaseEnterAcceleratedCompositingMode(WebKitWebViewBase* webkitWebViewBase, const LayerTreeContext& layerTreeContext)
{
ASSERT(webkitWebViewBase->priv->acceleratedBackingStore);
-@@ -2940,12 +2945,12 @@ void webkitWebViewBasePageClosed(WebKitWebViewBase* webkitWebViewBase)
+@@ -2929,12 +2934,12 @@ void webkitWebViewBasePageClosed(WebKitWebViewBase* webkitWebViewBase)
webkitWebViewBase->priv->acceleratedBackingStore->update({ });
}
@@ -11145,7 +11138,7 @@ index 1d118b75a4be169d624ac18b50b13096bf7e1f36..29e48279f82dfaf83016c97349b284d0
#if !USE(GTK4)
diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
-index cfd4310b3c775e662b4d643d4f2edda56e101b58..65dc3319a8031b478b0faca89276f9dfed28c55f 100644
+index 3b8ca9470bab69dc26313111a79f954b10b30bf4..5c056dd6734f42d24bc168b4f5ba436584b3f7a8 100644
--- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
+++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
@@ -27,6 +27,7 @@
@@ -11203,24 +11196,23 @@ index 7636ad733e7be66a74f8fede966b0acb905a5842..cf54287353d1e529c6765e3caf8d283a
virtual void didChangePageID(WKWPE::View&) { }
virtual void didReceiveUserMessage(WKWPE::View&, WebKit::UserMessage&&, CompletionHandler<void(WebKit::UserMessage&&)>&& completionHandler) { completionHandler(WebKit::UserMessage()); }
diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
-index 97b321f1d8bb33175f963af0f6ffe741b50e28e6..d03085cbaad14e3ed88817bf5f26facbe9a24538 100644
+index 76f77a9a50f721e2d71def6ca5c81ad68274653a..c9b583bd70d87586fd7ea727c20ada6f01dffb72 100644
--- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
+++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
-@@ -34,9 +34,13 @@
- #include "TouchGestureController.h"
+@@ -35,9 +35,12 @@
#include "WPEWebViewLegacy.h"
#include "WPEWebViewPlatform.h"
+ #include "WebColorPicker.h"
+#include "WebColorPickerWPE.h"
+#include "WebDateTimePickerWPE.h"
#include "WebContextMenuProxy.h"
#include "WebContextMenuProxyWPE.h"
-+#include "WebKitDataListSuggestionsDropdown.h"
+ #include "WebDataListSuggestionsDropdown.h"
++#include "WebDataListSuggestionsDropdownWPE.h"
+ #include "WebDateTimePicker.h"
#include "WebKitPopupMenu.h"
-+#include "WebColorPicker.h"
#include <WebCore/ActivityState.h>
- #include <WebCore/Cursor.h>
- #include <WebCore/DOMPasteAccess.h>
-@@ -52,6 +56,12 @@
+@@ -55,6 +58,12 @@
#include <wpe/wpe-platform.h>
#endif
@@ -11233,7 +11225,26 @@ index 97b321f1d8bb33175f963af0f6ffe741b50e28e6..d03085cbaad14e3ed88817bf5f26facb
namespace WebKit {
WTF_MAKE_TZONE_ALLOCATED_IMPL(PageClientImpl);
-@@ -487,6 +497,64 @@ void PageClientImpl::selectionDidChange()
+@@ -299,14 +308,14 @@ Ref<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& pa
+ }
+ #endif
+
+-RefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy&, const WebCore::Color& intialColor, const WebCore::IntRect&, ColorControlSupportsAlpha supportsAlpha, Vector<WebCore::Color>&&)
++RefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy& page, const WebCore::Color& intialColor, const WebCore::IntRect& rect, ColorControlSupportsAlpha supportsAlpha, Vector<WebCore::Color>&&)
+ {
+- return nullptr;
++ return WebColorPickerWPE::create(page, intialColor, rect);
+ }
+
+-RefPtr<WebDataListSuggestionsDropdown> PageClientImpl::createDataListSuggestionsDropdown(WebPageProxy&)
++RefPtr<WebKit::WebDataListSuggestionsDropdown> PageClientImpl::createDataListSuggestionsDropdown(WebKit::WebPageProxy& page)
+ {
+- return nullptr;
++ return WebDataListSuggestionsDropdownWPE::create(page);
+ }
+
+ RefPtr<WebDateTimePicker> PageClientImpl::createDateTimePicker(WebPageProxy& page)
+@@ -518,6 +527,64 @@ void PageClientImpl::selectionDidChange()
m_view.selectionDidChange();
}
@@ -11298,22 +11309,10 @@ index 97b321f1d8bb33175f963af0f6ffe741b50e28e6..d03085cbaad14e3ed88817bf5f26facb
WebKitWebResourceLoadManager* PageClientImpl::webResourceLoadManager()
{
return m_view.webResourceLoadManager();
-@@ -497,4 +565,23 @@ void PageClientImpl::callAfterNextPresentationUpdate(CompletionHandler<void()>&&
+@@ -528,4 +595,11 @@ void PageClientImpl::callAfterNextPresentationUpdate(CompletionHandler<void()>&&
m_view.callAfterNextPresentationUpdate(WTFMove(callback));
}
-+#if ENABLE(DATALIST_ELEMENT)
-+RefPtr<WebKit::WebDataListSuggestionsDropdown> PageClientImpl::createDataListSuggestionsDropdown(WebKit::WebPageProxy& page)
-+{
-+ return WebKitDataListSuggestionsDropdown::create(page);
-+}
-+#endif
-+
-+RefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy* page, const WebCore::Color& color, const WebCore::IntRect& rect, ColorControlSupportsAlpha, Vector<WebCore::Color>&&)
-+{
-+ return WebColorPickerWPE::create(*page, color, rect);
-+}
-+
+#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
+RefPtr<WebDateTimePicker> PageClientImpl::createDateTimePicker(WebPageProxy& page)
+{
@@ -11323,10 +11322,10 @@ index 97b321f1d8bb33175f963af0f6ffe741b50e28e6..d03085cbaad14e3ed88817bf5f26facb
+
} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
-index 353515ae3a699d85314a924ba6fc4e9610ade23b..8a541023be8549e2c1fced51af6ed03dcd67fc6f 100644
+index c9b5db9dc3005f78212b295ecbf1eac95b24f2dd..c15b6879d6167ec8b4bbe4b1deeb12eb38fe2e10 100644
--- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
+++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
-@@ -170,9 +170,24 @@ private:
+@@ -181,9 +181,17 @@ private:
void didChangeWebPageID() const override;
void selectionDidChange() override;
@@ -11338,20 +11337,13 @@ index 353515ae3a699d85314a924ba6fc4e9610ade23b..8a541023be8549e2c1fced51af6ed03d
+#endif
WebKitWebResourceLoadManager* webResourceLoadManager() override;
-+#if ENABLE(DATALIST_ELEMENT)
-+ RefPtr<WebKit::WebDataListSuggestionsDropdown> createDataListSuggestionsDropdown(WebKit::WebPageProxy& page) override;
-+#endif
-+
-+#if ENABLE(INPUT_TYPE_COLOR)
-+ RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&, ColorControlSupportsAlpha, Vector<WebCore::Color>&&) override;
-+#endif
+#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
+ RefPtr<WebDateTimePicker> createDateTimePicker(WebPageProxy&) override;
+#endif
+
WKWPE::View& m_view;
- };
-
+ #if ENABLE(FULLSCREEN_API)
+ std::unique_ptr<WebFullScreenManagerProxyClient> m_fullscreenClientForTesting;
diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitBrowserInspector.h b/Source/WebKit/UIProcess/API/wpe/WebKitBrowserInspector.h
new file mode 100644
index 0000000000000000000000000000000000000000..273c5105cdf1638955cea01128c9bbab3e64436c
@@ -11439,131 +11431,6 @@ index 0000000000000000000000000000000000000000..273c5105cdf1638955cea01128c9bbab
+G_END_DECLS
+
+#endif
-diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.cpp b/Source/WebKit/UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.cpp
-new file mode 100644
-index 0000000000000000000000000000000000000000..afafef2b7fb433e006b1763e653e200bc80edcbd
---- /dev/null
-+++ b/Source/WebKit/UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.cpp
-@@ -0,0 +1,58 @@
-+/*
-+ * Copyright (C) 2019 Igalia S.L.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ * THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "config.h"
-+#include "WebKitDataListSuggestionsDropdown.h"
-+
-+#if ENABLE(DATALIST_ELEMENT)
-+
-+#include "WebPageProxy.h"
-+
-+namespace WebKit {
-+
-+WebKitDataListSuggestionsDropdown::WebKitDataListSuggestionsDropdown(WebPageProxy& page)
-+ : WebDataListSuggestionsDropdown(page)
-+{
-+}
-+
-+WebKitDataListSuggestionsDropdown::~WebKitDataListSuggestionsDropdown()
-+{
-+}
-+
-+void WebKitDataListSuggestionsDropdown::show(WebCore::DataListSuggestionInformation&& information)
-+{
-+}
-+
-+void WebKitDataListSuggestionsDropdown::handleKeydownWithIdentifier(const String& key)
-+{
-+}
-+
-+void WebKitDataListSuggestionsDropdown::close()
-+{
-+}
-+
-+} // namespace WebKit
-+
-+#endif // ENABLE(DATALIST_ELEMENT)
-diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.h b/Source/WebKit/UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.h
-new file mode 100644
-index 0000000000000000000000000000000000000000..0a099832c3dd959f456fcae49a1d62a9477d2758
---- /dev/null
-+++ b/Source/WebKit/UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.h
-@@ -0,0 +1,55 @@
-+/*
-+ * Copyright (C) 2019 Igalia S.L.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ * THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#pragma once
-+
-+#if ENABLE(DATALIST_ELEMENT)
-+
-+#include "WebDataListSuggestionsDropdown.h"
-+
-+namespace WebKit {
-+
-+class WebPageProxy;
-+
-+class WebKitDataListSuggestionsDropdown final : public WebDataListSuggestionsDropdown {
-+public:
-+ static Ref<WebKitDataListSuggestionsDropdown> create(WebPageProxy& page)
-+ {
-+ return adoptRef(*new WebKitDataListSuggestionsDropdown(page));
-+ }
-+
-+ ~WebKitDataListSuggestionsDropdown();
-+
-+private:
-+ WebKitDataListSuggestionsDropdown(WebPageProxy&);
-+
-+ void show(WebCore::DataListSuggestionInformation&&) final;
-+ void handleKeydownWithIdentifier(const String&) final;
-+ void close() final;
-+};
-+
-+} // namespace WebKit
-+
-+#endif // ENABLE(DATALIST_ELEMENT)
diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp
index 763bda5b29304f7ed7133c0a8158e6c8b94c5ea1..8ed962e8c1af62b9b73a68348d0d88765429861d 100644
--- a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp
@@ -11658,10 +11525,10 @@ index 2f1182cb91a00353eace0b71612df096391c2450..d71d7fc724b046fab41285bb8f390cb6
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 62250eac7b9d4e38b3d9ccad743daaf1627ff017..218f379aea078cfa27c0af5a963a2d3dcbcbc66a 100644
+index 8c97bd6e955005ba6246715aac63c4d675f5a713..1440dd5233d20ada05fee01a1916ad784a745214 100644
--- a/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
+++ b/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
-@@ -270,6 +270,8 @@ public:
+@@ -279,6 +279,8 @@ public:
void didDestroyFrame(WebCore::FrameIdentifier);
@@ -11670,7 +11537,7 @@ index 62250eac7b9d4e38b3d9ccad743daaf1627ff017..218f379aea078cfa27c0af5a963a2d3d
private:
RefPtr<WebPageProxy> webPageProxyForHandle(const String&);
String handleForWebPageProxy(const WebPageProxy&);
-@@ -320,7 +322,6 @@ private:
+@@ -329,7 +331,6 @@ private:
// Get base64-encoded PNG data from a bitmap.
static std::optional<String> platformGetBase64EncodedPNGData(WebCore::ShareableBitmap::Handle&&);
@@ -11679,10 +11546,10 @@ index 62250eac7b9d4e38b3d9ccad743daaf1627ff017..218f379aea078cfa27c0af5a963a2d3d
// Save base64-encoded file contents to a local file path and return the path.
// This reuses the basename of the remote file path so that the filename exposed to DOM API remains the same.
diff --git a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
-index 9d98e6bf5266ed4cafd77f646be8bdaeefc33cd3..c9a3288d9c0f6d3c735f6d79b70eb852f95602e8 100644
+index 601d3874b710ca87c18a2dbcfbfb7368ac61d602..26c9ae063679b6f97be8c6cce8432aad3e90b3a4 100644
--- a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
+++ b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
-@@ -169,7 +169,11 @@ void AuxiliaryProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& lau
+@@ -172,7 +172,11 @@ void AuxiliaryProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& lau
launchOptions.processCmdPrefix = String::fromUTF8(processCmdPrefix);
#endif // ENABLE(DEVELOPER_MODE) && (PLATFORM(GTK) || PLATFORM(WPE))
@@ -11695,7 +11562,7 @@ index 9d98e6bf5266ed4cafd77f646be8bdaeefc33cd3..c9a3288d9c0f6d3c735f6d79b70eb852
platformGetLaunchOptions(launchOptions);
}
diff --git a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h
-index a8ee41c1155989a57a5c0bd09c5144e8103c7c7c..172d567478e36d275a23ae3db82281f4a7af5c26 100644
+index eed9d40f00e29fd1e36a2c7893639544439e53ce..eeb0b85018d13f46279eb5b9d281fdc34de92e02 100644
--- a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h
+++ b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h
@@ -296,13 +296,16 @@ protected:
@@ -11717,10 +11584,10 @@ index a8ee41c1155989a57a5c0bd09c5144e8103c7c7c..172d567478e36d275a23ae3db82281f4
// Connection::Client
diff --git a/Source/WebKit/UIProcess/BackingStore.h b/Source/WebKit/UIProcess/BackingStore.h
-index f72e17dc0973d4523c4b29a14754ec6d6036e06f..153f7b8495404513e20db757c0269f9e3c4d0e2d 100644
+index 945c62704e0b25f04e9ee4be88b21f88aeda8bd9..409c1c560b2462bf59f19dfee7941748b54fd22c 100644
--- a/Source/WebKit/UIProcess/BackingStore.h
+++ b/Source/WebKit/UIProcess/BackingStore.h
-@@ -69,6 +69,7 @@ public:
+@@ -67,6 +67,7 @@ public:
float deviceScaleFactor() const { return m_deviceScaleFactor; }
void paint(PlatformPaintContextPtr, const WebCore::IntRect&);
@@ -11840,7 +11707,7 @@ index 0000000000000000000000000000000000000000..cd66887de171cda7d15a8e4dc6dbff63
+
+#endif // ENABLE(REMOTE_INSPECTOR)
diff --git a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.h b/Source/WebKit/UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.h
-index 1eb07a8bfadb2c4477698940b9429eefacc7d059..30e8b82bb1d8ca88ec5af80580c0ca751d10485f 100644
+index 89d125f7742f81ead8c50f218ecb1771b8000636..baa6cf58ad502c6c033ee6293a6cc8d4ce608e7b 100644
--- a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.h
+++ b/Source/WebKit/UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.h
@@ -25,6 +25,7 @@
@@ -11852,7 +11719,7 @@ index 1eb07a8bfadb2c4477698940b9429eefacc7d059..30e8b82bb1d8ca88ec5af80580c0ca75
namespace WebKit {
diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
-index 47da0ee168267f6a4a27602ea0c3cffdeb0a8a44..70eef746a34ebc037e56b4a81675e1184a37d178 100644
+index 8d9915d0802f215ea2a3e298b8653636338250b9..50e0ad091bcfc6356708ccfaf242787188e49a82 100644
--- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
+++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
@@ -102,6 +102,7 @@ private:
@@ -11872,10 +11739,10 @@ index 47da0ee168267f6a4a27602ea0c3cffdeb0a8a44..70eef746a34ebc037e56b4a81675e118
bool webViewRequestStorageAccessPanelForDomainUnderCurrentDomainForQuirkDomainsCompletionHandler : 1;
bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
-index de8a55897d3fd5bcb31d15b4eec187ebeaac21e6..fb5855993c24d2d5c766660435bd545dd39a59b0 100644
+index da5818f79cb0f7a384af46f4d39eae4d2cf573df..44bf65e9a20428656d7eac39b9470c72e97987cf 100644
--- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
+++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
-@@ -134,6 +134,7 @@ void UIDelegate::setDelegate(id <WKUIDelegate> delegate)
+@@ -135,6 +135,7 @@ void UIDelegate::setDelegate(id <WKUIDelegate> delegate)
m_delegateMethods.webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:)];
m_delegateMethods.webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:)];
m_delegateMethods.webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:)];
@@ -11883,7 +11750,7 @@ index de8a55897d3fd5bcb31d15b4eec187ebeaac21e6..fb5855993c24d2d5c766660435bd545d
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:)];
-@@ -465,6 +466,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St
+@@ -466,6 +467,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St
}).get()];
}
@@ -11900,7 +11767,7 @@ index de8a55897d3fd5bcb31d15b4eec187ebeaac21e6..fb5855993c24d2d5c766660435bd545d
{
RefPtr uiDelegate = m_uiDelegate.get();
diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
-index 064f96db74bdf0df821846540d18e4792f3b2963..e4a0316168f739ef5b667006ceaf00ff30341e6c 100644
+index c0c9d8098ce76a6c2f7860165f990a854fbcc0e9..082322d49bf84f3b15e66c9cb89125d64f16d80a 100644
--- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
+++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
@@ -42,7 +42,9 @@
@@ -11913,7 +11780,7 @@ index 064f96db74bdf0df821846540d18e4792f3b2963..e4a0316168f739ef5b667006ceaf00ff
#import "PlatformXRSystem.h"
#import "PlaybackSessionManagerProxy.h"
#import "QuickLookThumbnailLoader.h"
-@@ -322,11 +324,86 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting()
+@@ -326,11 +328,86 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting()
void WebPageProxy::startDrag(const DragItem& dragItem, ShareableBitmap::Handle&& dragImageHandle)
{
@@ -12002,10 +11869,10 @@ index 064f96db74bdf0df821846540d18e4792f3b2963..e4a0316168f739ef5b667006ceaf00ff
#if ENABLE(ATTACHMENT_ELEMENT)
diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
-index c16012314db5eee29263ea19d7627eaf3d9cfe79..7544eecb359d3263e2d3222658687fcfebb07af6 100644
+index d14a7dfa79daabce7bd835aa76625937e6107aad..0907c8ac8e9407231df5661180d3766b5c263dfd 100644
--- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
+++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
-@@ -437,7 +437,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
+@@ -432,7 +432,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
auto screenProperties = WebCore::collectScreenProperties();
parameters.screenProperties = WTFMove(screenProperties);
#if PLATFORM(MAC)
@@ -12014,7 +11881,7 @@ index c16012314db5eee29263ea19d7627eaf3d9cfe79..7544eecb359d3263e2d3222658687fcf
#endif
#if (PLATFORM(IOS) || PLATFORM(VISION)) && HAVE(AGX_COMPILER_SERVICE)
-@@ -832,8 +832,8 @@ void WebProcessPool::registerNotificationObservers()
+@@ -841,8 +841,8 @@ void WebProcessPool::registerNotificationObservers()
}];
m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
@@ -12026,7 +11893,7 @@ index c16012314db5eee29263ea19d7627eaf3d9cfe79..7544eecb359d3263e2d3222658687fcf
m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
-index 9aeeff96ce40d58fe51124275b8fb60e8609d254..4840c7bb5c1ca1380205fd0167870b81bf3d873d 100644
+index 9b45c78e2fd36e825c4e67d8e824771128c8fe15..9f748e729fce8103278b3888552d5c374ed6bc67 100644
--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
@@ -33,6 +33,7 @@
@@ -12062,8 +11929,8 @@ index 9aeeff96ce40d58fe51124275b8fb60e8609d254..4840c7bb5c1ca1380205fd0167870b81
namespace WebKit {
using namespace WebCore;
-@@ -180,6 +190,11 @@ void DrawingAreaProxyCoordinatedGraphics::deviceScaleFactorDidChange(CompletionH
- completionHandler();
+@@ -182,6 +192,11 @@ void DrawingAreaProxyCoordinatedGraphics::deviceScaleFactorDidChange(CompletionH
+ sendWithAsyncReply(Messages::DrawingArea::SetDeviceScaleFactor(m_webPageProxy->deviceScaleFactor()), WTFMove(completionHandler));
}
+void DrawingAreaProxyCoordinatedGraphics::waitForSizeUpdate(Function<void (const DrawingAreaProxyCoordinatedGraphics&)>&& callback)
@@ -12074,7 +11941,7 @@ index 9aeeff96ce40d58fe51124275b8fb60e8609d254..4840c7bb5c1ca1380205fd0167870b81
void DrawingAreaProxyCoordinatedGraphics::setBackingStoreIsDiscardable(bool isBackingStoreDiscardable)
{
#if !PLATFORM(WPE)
-@@ -241,6 +256,45 @@ void DrawingAreaProxyCoordinatedGraphics::updateAcceleratedCompositingMode(uint6
+@@ -243,6 +258,45 @@ void DrawingAreaProxyCoordinatedGraphics::updateAcceleratedCompositingMode(uint6
updateAcceleratedCompositingMode(layerTreeContext);
}
@@ -12120,7 +11987,7 @@ index 9aeeff96ce40d58fe51124275b8fb60e8609d254..4840c7bb5c1ca1380205fd0167870b81
bool DrawingAreaProxyCoordinatedGraphics::alwaysUseCompositing() const
{
if (!m_webPageProxy)
-@@ -308,6 +362,12 @@ void DrawingAreaProxyCoordinatedGraphics::didUpdateGeometry()
+@@ -310,6 +364,12 @@ void DrawingAreaProxyCoordinatedGraphics::didUpdateGeometry()
// we need to resend the new size here.
if (m_lastSentSize != m_size)
sendUpdateGeometry();
@@ -12186,7 +12053,7 @@ index 9c2bde0db0e4032a32e6ae02dc45af335df92f7a..7ae72e6c791c264ea7e0db4c93a0422b
} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp b/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp
-index 8fe224d8c374d0a7cabb1cbf02b678061e58bacf..89be23d0d8759097c0d6b2c9bf9df614ddc278a5 100644
+index 5d0385c213e4951ca9bec3c17bd2135887348cb0..634193dc71e82245b5017709bb93cfb5fdfede83 100644
--- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp
+++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp
@@ -41,8 +41,10 @@
@@ -12200,18 +12067,18 @@ index 8fe224d8c374d0a7cabb1cbf02b678061e58bacf..89be23d0d8759097c0d6b2c9bf9df614
#if PLATFORM(MAC)
#include <pal/spi/mac/QuarantineSPI.h>
-@@ -66,7 +68,10 @@ DownloadProxy::DownloadProxy(DownloadProxyMap& downloadProxyMap, WebsiteDataStor
+@@ -89,7 +91,10 @@ DownloadProxy::DownloadProxy(DownloadProxyMap& downloadProxyMap, WebsiteDataStor
#if HAVE(MODERN_DOWNLOADPROGRESS)
, m_assertion(ProcessAssertion::create(getCurrentProcessID(), "WebKit DownloadProxy DecideDestination"_s, ProcessAssertionType::FinishTaskInterruptable))
#endif
+ , m_uuid(createVersion4UUIDString())
{
+ if (auto* instrumentation = m_dataStore->downloadInstrumentation())
-+ instrumentation->downloadCreated(m_uuid, m_request, frameInfoData, originatingPage, this);
++ instrumentation->downloadCreated(m_uuid, m_request, m_frameInfo->frameInfoData(), originatingPage, this);
}
DownloadProxy::~DownloadProxy()
-@@ -86,12 +91,15 @@ void DownloadProxy::cancel(CompletionHandler<void(API::Data*)>&& completionHandl
+@@ -109,12 +114,15 @@ void DownloadProxy::cancel(CompletionHandler<void(API::Data*)>&& completionHandl
{
m_downloadIsCancelled = true;
if (m_dataStore) {
@@ -12228,7 +12095,7 @@ index 8fe224d8c374d0a7cabb1cbf02b678061e58bacf..89be23d0d8759097c0d6b2c9bf9df614
if (RefPtr downloadProxyMap = protectedThis->m_downloadProxyMap.get())
downloadProxyMap->downloadFinished(*protectedThis);
});
-@@ -163,6 +171,33 @@ void DownloadProxy::decideDestinationWithSuggestedFilename(const WebCore::Resour
+@@ -186,6 +194,33 @@ void DownloadProxy::decideDestinationWithSuggestedFilename(const WebCore::Resour
suggestedFilename = m_suggestedFilename;
suggestedFilename = MIMETypeRegistry::appendFileExtensionIfNecessary(suggestedFilename, response.mimeType());
@@ -12262,7 +12129,7 @@ index 8fe224d8c374d0a7cabb1cbf02b678061e58bacf..89be23d0d8759097c0d6b2c9bf9df614
protectedClient()->decideDestinationWithSuggestedFilename(*this, response, ResourceResponseBase::sanitizeSuggestedFilename(suggestedFilename), [this, protectedThis = Ref { *this }, completionHandler = WTFMove(completionHandler)] (AllowOverwrite allowOverwrite, String destination) mutable {
SandboxExtension::Handle sandboxExtensionHandle;
if (!destination.isNull()) {
-@@ -227,6 +262,8 @@ void DownloadProxy::didFinish()
+@@ -250,6 +285,8 @@ void DownloadProxy::didFinish()
m_client->didFinish(*this);
if (m_downloadIsCancelled)
return;
@@ -12271,7 +12138,7 @@ index 8fe224d8c374d0a7cabb1cbf02b678061e58bacf..89be23d0d8759097c0d6b2c9bf9df614
// This can cause the DownloadProxy object to be deleted.
if (RefPtr downloadProxyMap = m_downloadProxyMap.get())
-@@ -241,6 +278,8 @@ void DownloadProxy::didFail(const ResourceError& error, std::span<const uint8_t>
+@@ -264,6 +301,8 @@ void DownloadProxy::didFail(const ResourceError& error, std::span<const uint8_t>
m_legacyResumeData = createData(resumeData);
m_client->didFail(*this, error, m_legacyResumeData.get());
@@ -12281,7 +12148,7 @@ index 8fe224d8c374d0a7cabb1cbf02b678061e58bacf..89be23d0d8759097c0d6b2c9bf9df614
// 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 5c48a4c5f1747687ef5dace933feae900b02991e..1e85682f2f4351d2c2da955dd36abf95303320a6 100644
+index d82b401d7d58a34fadd38c61ef3b0f521ed432e4..9403574a7d238282998065729ec9e9d165c37f2f 100644
--- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.h
+++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.h
@@ -166,6 +166,7 @@ private:
@@ -13130,7 +12997,7 @@ index 0000000000000000000000000000000000000000..f53bb59c65a4ced0360e473fb9ed9a36
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..760f6ab8714c45f0019e583970767ea40e35d818
+index 0000000000000000000000000000000000000000..bec42378013c93ee6bd37f62a1d6a1c68d167fa3
--- /dev/null
+++ b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp
@@ -0,0 +1,443 @@
@@ -13453,7 +13320,7 @@ index 0000000000000000000000000000000000000000..760f6ab8714c45f0019e583970767ea4
+ memset(&cfg, 0, sizeof(cfg));
+ vpx_codec_err_t error = vpx_codec_enc_config_default(codec_interface, &cfg, 0);
+ if (error) {
-+ errorString = makeString("Failed to get default codec config: "_s, span(vpx_codec_err_to_string(error)));
++ errorString = makeString("Failed to get default codec config: "_s, unsafeSpan(vpx_codec_err_to_string(error)));
+ return nullptr;
+ }
+
@@ -13465,13 +13332,13 @@ index 0000000000000000000000000000000000000000..760f6ab8714c45f0019e583970767ea4
+
+ ScopedVpxCodec codec(new vpx_codec_ctx_t);
+ if (vpx_codec_enc_init(codec.get(), codec_interface, &cfg, 0)) {
-+ errorString = makeString("Failed to initialize encoder: "_s, span(vpx_codec_error(codec.get())));
++ errorString = makeString("Failed to initialize encoder: "_s, unsafeSpan(vpx_codec_error(codec.get())));
+ return nullptr;
+ }
+
+ FILE* file = fopen(filePath.utf8().data(), "wb");
+ if (!file) {
-+ errorString = makeString("Failed to open file '"_s, filePath, "' for writing: "_s, span(strerror(errno)));
++ errorString = makeString("Failed to open file '"_s, filePath, "' for writing: "_s, unsafeSpan(strerror(errno)));
+ return nullptr;
+ }
+
@@ -13894,14 +13761,15 @@ index edd6e7f1799279ed3d0eb81b6c2eef9f5b375134..d4231f84f3c52641f4d9e88559e8e1a4
String m_identifier;
Inspector::InspectorTargetType m_type;
diff --git a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
-index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49bdaee439a 100644
+index e4f2f719746ed69b1226be2d47b16666f2067772..96956711b594d80ea9cbdce11a6f62b2992530aa 100644
--- a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
+++ b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
-@@ -26,13 +26,21 @@
+@@ -26,13 +26,22 @@
#include "config.h"
#include "WebPageInspectorController.h"
+#include "APINavigation.h"
++#include "APIPageConfiguration.h"
#include "APIUIClient.h"
#include "InspectorBrowserAgent.h"
+#include "InspectorDialogAgent.h"
@@ -13919,7 +13787,7 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
#include <JavaScriptCore/InspectorAgentBase.h>
#include <JavaScriptCore/InspectorBackendDispatcher.h>
#include <JavaScriptCore/InspectorBackendDispatchers.h>
-@@ -52,34 +60,121 @@ static String getTargetID(const ProvisionalPageProxy& provisionalPage)
+@@ -52,34 +61,115 @@ static String getTargetID(const ProvisionalPageProxy& provisionalPage)
WTF_MAKE_TZONE_ALLOCATED_IMPL(WebPageInspectorController);
@@ -13955,6 +13823,8 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
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));
@@ -13970,15 +13840,9 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
+ m_agents.append(WTFMove(screencastAgent));
+ if (s_observer)
+ s_observer->didCreateInspectorController(m_inspectedPage);
++}
+
-+ // window.open will create page with already running process.
-+ if (!m_inspectedPage->hasRunningProcess())
-+ return;
- String pageTargetId = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageIDInMainFrameProcess());
- createInspectorTarget(pageTargetId, Inspector::InspectorTargetType::Page);
- }
-
-+void WebPageInspectorController::didFinishAttachingToWebProcess()
++void WebPageInspectorController::didInitializeWebPage()
+{
+ String pageTargetID = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageIDInMainFrameProcess());
+ // Create target only after attaching to a Web Process first time. Before that
@@ -13986,8 +13850,8 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
+ if (m_targets.contains(pageTargetID))
+ return;
+ createInspectorTarget(pageTargetID, Inspector::InspectorTargetType::Page);
-+}
-+
+ }
+
void WebPageInspectorController::pageClosed()
{
+ String pageTargetId = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageIDInMainFrameProcess());
@@ -14046,7 +13910,7 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
}
bool WebPageInspectorController::hasLocalFrontend() const
-@@ -93,6 +188,17 @@ void WebPageInspectorController::connectFrontend(Inspector::FrontendChannel& fro
+@@ -93,6 +183,17 @@ void WebPageInspectorController::connectFrontend(Inspector::FrontendChannel& fro
bool connectingFirstFrontend = !m_frontendRouter->hasFrontends();
@@ -14064,7 +13928,7 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
m_frontendRouter->connectFrontend(frontendChannel);
if (connectingFirstFrontend)
-@@ -112,8 +218,10 @@ void WebPageInspectorController::disconnectFrontend(FrontendChannel& frontendCha
+@@ -112,8 +213,10 @@ void WebPageInspectorController::disconnectFrontend(FrontendChannel& frontendCha
m_frontendRouter->disconnectFrontend(frontendChannel);
bool disconnectingLastFrontend = !m_frontendRouter->hasFrontends();
@@ -14076,7 +13940,7 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
auto inspectedPage = protectedInspectedPage();
inspectedPage->didChangeInspectorFrontendCount(m_frontendRouter->frontendCount());
-@@ -137,6 +245,8 @@ void WebPageInspectorController::disconnectAllFrontends()
+@@ -137,6 +240,8 @@ void WebPageInspectorController::disconnectAllFrontends()
// Disconnect any remaining remote frontends.
m_frontendRouter->disconnectAllFrontends();
@@ -14085,7 +13949,7 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
auto inspectedPage = protectedInspectedPage();
inspectedPage->didChangeInspectorFrontendCount(m_frontendRouter->frontendCount());
-@@ -165,6 +275,75 @@ void WebPageInspectorController::setIndicating(bool indicating)
+@@ -165,6 +270,75 @@ void WebPageInspectorController::setIndicating(bool indicating)
}
#endif
@@ -14161,7 +14025,7 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
void WebPageInspectorController::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type)
{
addTarget(InspectorTargetProxy::create(protectedInspectedPage(), targetId, type));
-@@ -184,6 +363,48 @@ void WebPageInspectorController::sendMessageToInspectorFrontend(const String& ta
+@@ -184,6 +358,52 @@ void WebPageInspectorController::sendMessageToInspectorFrontend(const String& ta
m_targetAgent->sendMessageFromTargetToFrontend(targetId, message);
}
@@ -14191,7 +14055,11 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
+ if (!m_frontendRouter->hasFrontends())
+ return false;
+
-+ if (!m_inspectedPage->isPageOpenedByDOMShowingInitialEmptyDocument())
++ // Only pause if the page was opened by window.open() or new tab navigation.
++ // We cannot use isPageOpenedByDOMShowingInitialEmptyDocument() here because
++ // this method maybe called from WebPageProxy::initializeWebPage and setOpenedByDOM
++ // is called after the page is initialized.
++ if (!m_inspectedPage->configuration().windowFeatures())
+ return false;
+
+ // The method is called from WebPageProxy::initializePage and the
@@ -14210,7 +14078,7 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
bool WebPageInspectorController::shouldPauseLoading(const ProvisionalPageProxy& provisionalPage) const
{
if (!m_frontendRouter->hasFrontends())
-@@ -203,7 +424,7 @@ void WebPageInspectorController::setContinueLoadingCallback(const ProvisionalPag
+@@ -203,7 +423,7 @@ void WebPageInspectorController::setContinueLoadingCallback(const ProvisionalPag
void WebPageInspectorController::didCreateProvisionalPage(ProvisionalPageProxy& provisionalPage)
{
@@ -14219,7 +14087,7 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
}
void WebPageInspectorController::willDestroyProvisionalPage(const ProvisionalPageProxy& provisionalPage)
-@@ -287,4 +508,30 @@ void WebPageInspectorController::browserExtensionsDisabled(HashSet<String>&& ext
+@@ -287,4 +507,29 @@ void WebPageInspectorController::browserExtensionsDisabled(HashSet<String>&& ext
m_enabledBrowserAgent->extensionsDisabled(WTFMove(extensionIDs));
}
@@ -14239,9 +14107,8 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
+ m_inspectedPage->preferences().setJavaScriptCanOpenWindowsAutomatically(true);
+
+ // Enable media stream.
-+ if (!m_inspectedPage->preferences().mediaStreamEnabled()) {
++ if (!m_inspectedPage->preferences().mediaDevicesEnabled()) {
+ m_inspectedPage->preferences().setMediaDevicesEnabled(true);
-+ m_inspectedPage->preferences().setMediaStreamEnabled(true);
+ m_inspectedPage->preferences().setPeerConnectionEnabled(true);
+ }
+
@@ -14251,7 +14118,7 @@ index e4f2f719746ed69b1226be2d47b16666f2067772..c0e4452b9c8e286e1944b47e46acf49b
+
} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h
-index 29457fc3c76c963bf50b44c011f64398efbae676..b931b09dbf2768bdfa49633fc6329fb49b09205a 100644
+index 29457fc3c76c963bf50b44c011f64398efbae676..3e098aae8cd02d26aa32a6e15ed16e95695afaf7 100644
--- a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h
+++ b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h
@@ -26,19 +26,43 @@
@@ -14326,7 +14193,7 @@ index 29457fc3c76c963bf50b44c011f64398efbae676..b931b09dbf2768bdfa49633fc6329fb4
~WebPageInspectorController();
void init();
-+ void didFinishAttachingToWebProcess();
++ void didInitializeWebPage();
+
+ static void setObserver(WebPageInspectorControllerObserver*);
+ static WebPageInspectorControllerObserver* observer();
@@ -14639,10 +14506,10 @@ index 0000000000000000000000000000000000000000..d0e11ed81a6257c011df23d5870da740
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..f7b2ecd583cd1eb5bb9e81becdfe07f5a855f2a9
+index 0000000000000000000000000000000000000000..7535756c45428e307e27807d31884ae6c5216543
--- /dev/null
+++ b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp
-@@ -0,0 +1,1006 @@
+@@ -0,0 +1,1011 @@
+/*
+ * Copyright (C) 2019 Microsoft Corporation.
+ *
@@ -15398,6 +15265,16 @@ index 0000000000000000000000000000000000000000..f7b2ecd583cd1eb5bb9e81becdfe07f5
+ return { };
+}
+
++Inspector::Protocol::ErrorStringOr<void> InspectorPlaywrightAgent::setPageZoomFactor(const String& pageProxyID, double zoomFactor)
++{
++ auto* pageProxyChannel = m_pageProxyChannels.get(pageProxyID);
++ if (!pageProxyChannel)
++ return makeUnexpected("Unknown pageProxyID"_s);
++
++ pageProxyChannel->page().setPageZoomFactor(zoomFactor);
++ return { };
++}
++
+void InspectorPlaywrightAgent::getAllCookies(const String& browserContextID, Ref<GetAllCookiesCallback>&& callback) {
+ String errorString;
+ BrowserContext* browserContext = lookupBrowserContext(errorString, browserContextID);
@@ -15412,12 +15289,7 @@ index 0000000000000000000000000000000000000000..f7b2ecd583cd1eb5bb9e81becdfe07f5
+ return;
+ auto cookies = JSON::ArrayOf<Inspector::Protocol::Playwright::Cookie>::create();
+
-+// Soup returns cookies in the reverse order.
-+#if USE(SOUP)
-+ for (const auto& cookie : makeReversedRange(allCookies))
-+#else
+ for (const auto& cookie : allCookies)
-+#endif
+ cookies->addItem(buildObjectForCookie(cookie));
+ callback->sendSuccess(WTFMove(cookies));
+ });
@@ -15651,10 +15523,10 @@ index 0000000000000000000000000000000000000000..f7b2ecd583cd1eb5bb9e81becdfe07f5
+#endif // ENABLE(REMOTE_INSPECTOR)
diff --git a/Source/WebKit/UIProcess/InspectorPlaywrightAgent.h b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.h
new file mode 100644
-index 0000000000000000000000000000000000000000..2cd467df987e1679ff8918c2867bf253ce105b8c
+index 0000000000000000000000000000000000000000..f9185788a118f57e98bec149909a206dc1aa5d99
--- /dev/null
+++ b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.h
-@@ -0,0 +1,140 @@
+@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2019 Microsoft Corporation.
+ *
@@ -15757,6 +15629,7 @@ index 0000000000000000000000000000000000000000..2cd467df987e1679ff8918c2867bf253
+ Inspector::Protocol::ErrorStringOr<void> grantFileReadAccess(const String& pageProxyID, Ref<JSON::Array>&& paths) override;
+ void takePageScreenshot(const String& pageProxyID, int x, int y, int width, int height, std::optional<bool>&& omitDeviceScaleFactor, Ref<TakePageScreenshotCallback>&&) override;
+ Inspector::Protocol::ErrorStringOr<void> setIgnoreCertificateErrors(const String& browserContextID, bool ignore) override;
++ Inspector::Protocol::ErrorStringOr<void> setPageZoomFactor(const String& pageProxyID, double zoomFactor) override;
+
+ void getAllCookies(const String& browserContextID, Ref<GetAllCookiesCallback>&&) override;
+ void setCookies(const String& browserContextID, Ref<JSON::Array>&& in_cookies, Ref<SetCookiesCallback>&&) override;
@@ -15875,7 +15748,7 @@ index 0000000000000000000000000000000000000000..e7a3dcc533294bb6e12f65d79b5b716b
+
+#endif // ENABLE(REMOTE_INSPECTOR)
diff --git a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
-index e0c2996d93c2fe483024e13fb5b50a93a4e38150..6af596bd81076961f4e7e750d18c8b9dfd84f467 100644
+index 9959b634faa60d620d4aac6635b31914bb063979..a8a38fe41b5fdc2836d068cc69940a5b21876e8d 100644
--- a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
+++ b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
@@ -168,6 +168,13 @@ void ProcessLauncher::launchProcess()
@@ -15892,7 +15765,7 @@ index e0c2996d93c2fe483024e13fb5b50a93a4e38150..6af596bd81076961f4e7e750d18c8b9d
WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN // GTK/WPE port
-@@ -186,6 +193,10 @@ void ProcessLauncher::launchProcess()
+@@ -188,6 +195,10 @@ void ProcessLauncher::launchProcess()
if (configureJSCForTesting)
argv[i++] = const_cast<char*>("--configure-jsc-for-testing");
#endif
@@ -15904,7 +15777,7 @@ index e0c2996d93c2fe483024e13fb5b50a93a4e38150..6af596bd81076961f4e7e750d18c8b9d
WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
diff --git a/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp b/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp
-index fac881d7c3d44758591d7a9f392a3992ce9f9a72..35eba5a0b31fc6e2d6e5c05c9f866c03d2e1c7d0 100644
+index a108acd8a4503a07309fe8c54afc80b0f4175eae..1421d9a761042c31a6ecf3cc78ce3f0e96109abe 100644
--- a/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp
+++ b/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp
@@ -91,14 +91,21 @@ void ProcessLauncher::launchProcess()
@@ -15931,10 +15804,10 @@ index fac881d7c3d44758591d7a9f392a3992ce9f9a72..35eba5a0b31fc6e2d6e5c05c9f866c03
BOOL result = ::CreateProcess(0, commandLine.data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation);
diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h
-index e978cabad88aeb44a8722f0df7eed9cff0320653..c1753b243bf51870aa4a1b3d3a1163bd8310596d 100644
+index a5e7596eea86c6b7bdecf0a3adc906c3007a2f5d..2507c278685870936a6a26e9dd0d3474bcde51bc 100644
--- a/Source/WebKit/UIProcess/PageClient.h
+++ b/Source/WebKit/UIProcess/PageClient.h
-@@ -74,6 +74,11 @@
+@@ -75,6 +75,11 @@
#include <WebCore/PlatformTextAlternatives.h>
#endif
@@ -15946,7 +15819,7 @@ index e978cabad88aeb44a8722f0df7eed9cff0320653..c1753b243bf51870aa4a1b3d3a1163bd
OBJC_CLASS AVPlayerViewController;
OBJC_CLASS CALayer;
OBJC_CLASS NSFileWrapper;
-@@ -95,6 +100,12 @@ OBJC_CLASS WKView;
+@@ -96,6 +101,12 @@ OBJC_CLASS WKView;
#endif
#endif
@@ -15959,7 +15832,7 @@ index e978cabad88aeb44a8722f0df7eed9cff0320653..c1753b243bf51870aa4a1b3d3a1163bd
namespace API {
class Attachment;
class HitTestResult;
-@@ -373,7 +384,20 @@ public:
+@@ -376,7 +387,20 @@ public:
virtual void selectionDidChange() = 0;
#endif
@@ -15983,10 +15856,10 @@ index e978cabad88aeb44a8722f0df7eed9cff0320653..c1753b243bf51870aa4a1b3d3a1163bd
diff --git a/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.cpp b/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..d365dfd28dcc5d101b4d3859302b1bfe75f01a55
+index 0000000000000000000000000000000000000000..95b682567eba682f927317cd3327a531358dfebc
--- /dev/null
+++ b/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.cpp
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2023 Microsoft Corporation.
+ *
@@ -16028,17 +15901,24 @@ index 0000000000000000000000000000000000000000..d365dfd28dcc5d101b4d3859302b1bfe
+{
+}
+
-+void PlaywrightFullScreenManagerProxyClient::enterFullScreen()
++void PlaywrightFullScreenManagerProxyClient::enterFullScreen(WebCore::FloatSize, CompletionHandler<void(bool)>&& completionHandler)
+{
-+ m_pageProxy.fullScreenManager()->willEnterFullScreen();
-+ m_pageProxy.fullScreenManager()->didEnterFullScreen();
++ completionHandler(true);
+}
+
-+void PlaywrightFullScreenManagerProxyClient::exitFullScreen()
++void PlaywrightFullScreenManagerProxyClient::exitFullScreen(CompletionHandler<void()>&& completionHandler)
+{
-+ m_pageProxy.fullScreenManager()->willExitFullScreen();
-+ m_pageProxy.fullScreenManager()->didExitFullScreen();
++ completionHandler();
++}
++
++void PlaywrightFullScreenManagerProxyClient::beganEnterFullScreen(const WebCore::IntRect&, const WebCore::IntRect&, CompletionHandler<void(bool)>&& completionHandler)
++{
++ completionHandler(true);
++}
+
++void PlaywrightFullScreenManagerProxyClient::beganExitFullScreen(const WebCore::IntRect&, const WebCore::IntRect&, CompletionHandler<void()>&& completionHandler)
++{
++ completionHandler();
+}
+
+} // namespace WebKit
@@ -16046,7 +15926,7 @@ index 0000000000000000000000000000000000000000..d365dfd28dcc5d101b4d3859302b1bfe
+#endif // ENABLE(FULLSCREEN_API)
diff --git a/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.h b/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.h
new file mode 100644
-index 0000000000000000000000000000000000000000..3c8fd0549f1847515d35092f0f49b0602be86819
+index 0000000000000000000000000000000000000000..a8a92a6c5f4b03724decc97828291f6f27cfc6aa
--- /dev/null
+++ b/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.h
@@ -0,0 +1,56 @@
@@ -16094,10 +15974,10 @@ index 0000000000000000000000000000000000000000..3c8fd0549f1847515d35092f0f49b060
+private:
+ void closeFullScreenManager() override { }
+ bool isFullScreen() override { return m_isFullScreen; }
-+ void enterFullScreen() override;
-+ void exitFullScreen() override;
-+ void beganEnterFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) override { }
-+ void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) override { }
++ void enterFullScreen(WebCore::FloatSize mediaDimensions, CompletionHandler<void(bool)>&&) override;
++ void exitFullScreen(CompletionHandler<void()>&&) override;
++ void beganEnterFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame, CompletionHandler<void(bool)>&&) override;
++ void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame, CompletionHandler<void()>&&) override;
+
+ WebPageProxy& m_pageProxy;
+ bool m_isFullScreen { false };
@@ -16107,7 +15987,7 @@ index 0000000000000000000000000000000000000000..3c8fd0549f1847515d35092f0f49b060
+
+#endif // ENABLE(FULLSCREEN_API)
diff --git a/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp b/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp
-index 949c12f22544a17e9047def6f1ddf6a6e6fc1adc..bfd4d442f971e3956ed6d6962f7a570ff0a0755c 100644
+index 3399db4087c395fbc516cc90f20f70d535a31c65..ec217611aa4a5823567c5cde84a211a2dcfb26be 100644
--- a/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp
+++ b/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp
@@ -25,6 +25,7 @@
@@ -16425,18 +16305,6 @@ index 0000000000000000000000000000000000000000..6d04f9290135069359ce6bf872654648
+} // namespace WebKit
+
+#endif // ENABLE(REMOTE_INSPECTOR)
-diff --git a/Source/WebKit/UIProcess/RemotePageProxy.cpp b/Source/WebKit/UIProcess/RemotePageProxy.cpp
-index eae3ae7fdac55067463e1571068ec8cf25408bd9..707e9feec18d94c3a14b49e5826cab1026ff234a 100644
---- a/Source/WebKit/UIProcess/RemotePageProxy.cpp
-+++ b/Source/WebKit/UIProcess/RemotePageProxy.cpp
-@@ -44,6 +44,7 @@
- #include "WebProcessActivityState.h"
- #include "WebProcessMessages.h"
- #include "WebProcessProxy.h"
-+#include "WebProcessMessages.h"
- #include <WebCore/RemoteUserInputEventData.h>
- #include <wtf/TZoneMallocInlines.h>
-
diff --git a/Source/WebKit/UIProcess/WebContextMenuProxy.h b/Source/WebKit/UIProcess/WebContextMenuProxy.h
index c951d8577473371d8eb59ad651451737349c4389..b38cd0967ae45733a94594fd25900ddc1d49c3f6 100644
--- a/Source/WebKit/UIProcess/WebContextMenuProxy.h
@@ -16698,7 +16566,7 @@ index 0000000000000000000000000000000000000000..d00d00ce8fd800dc1497b36b8a495c5b
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..447af997796cf74a2c6259f16aad4da5581254f9
+index 0000000000000000000000000000000000000000..6cb20d95c1cd8682b025cfdf4ac74f49fd8e9cda
--- /dev/null
+++ b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp
@@ -0,0 +1,394 @@
@@ -16969,7 +16837,7 @@ index 0000000000000000000000000000000000000000..447af997796cf74a2c6259f16aad4da5
+ m_mouseCallbacks->append(WTFMove(callback));
+
+ // Convert css coordinates to view coordinates (dip).
-+ double totalScale = m_page.pageScaleFactor() * m_page.viewScaleFactor();
++ double totalScale = m_page.pageScaleFactor() * m_page.viewScaleFactor() * m_page.pageZoomFactor();
+ x = clampToInteger(roundf(x * totalScale));
+ y = clampToInteger(roundf(y * totalScale));
+ eventDeltaX = clampToInteger(roundf(eventDeltaX * totalScale));
@@ -17082,7 +16950,7 @@ index 0000000000000000000000000000000000000000..447af997796cf74a2c6259f16aad4da5
+ m_wheelCallbacks->append(WTFMove(callback));
+
+ // Convert css coordinates to view coordinates (dip).
-+ double totalScale = m_page.pageScaleFactor() * m_page.viewScaleFactor();
++ double totalScale = m_page.pageScaleFactor() * m_page.viewScaleFactor() * m_page.pageZoomFactor();
+ x = clampToInteger(roundf(x * totalScale));
+ y = clampToInteger(roundf(y * totalScale));
+
@@ -17190,10 +17058,10 @@ index 0000000000000000000000000000000000000000..26a2a3c0791c334f811ec99a630314f8
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
-index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b913064f8ae471 100644
+index 92eef3dd76340b6f1761c0bfbe6e7a0896f532f2..daae2e0dfdddf8d44b075b2ddc6c65861c1847e8 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
-@@ -199,12 +199,14 @@
+@@ -200,6 +200,7 @@
#include <WebCore/ArchiveError.h>
#include <WebCore/BitmapImage.h>
#include <WebCore/CaptureDeviceManager.h>
@@ -17201,14 +17069,15 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
#include <WebCore/CompositionHighlight.h>
#include <WebCore/CrossSiteNavigationDataTransfer.h>
#include <WebCore/DOMPasteAccess.h>
- #include <WebCore/DeprecatedGlobalSettings.h>
- #include <WebCore/DiagnosticLoggingClient.h>
- #include <WebCore/DiagnosticLoggingKeys.h>
+@@ -210,6 +211,7 @@
+ #include <WebCore/DigitalCredentialRequestOptions.h>
+ #include <WebCore/DigitalCredentialsRequestData.h>
+ #include <WebCore/DigitalCredentialsResponseData.h>
+#include <WebCore/DiagnosticLoggingResultType.h>
#include <WebCore/DragController.h>
#include <WebCore/DragData.h>
#include <WebCore/ElementContext.h>
-@@ -227,6 +229,7 @@
+@@ -233,6 +235,7 @@
#include <WebCore/ModalContainerTypes.h>
#include <WebCore/NotImplemented.h>
#include <WebCore/OrganizationStorageAccessPromptQuirk.h>
@@ -17216,7 +17085,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
#include <WebCore/PerformanceLoggingClient.h>
#include <WebCore/PermissionDescriptor.h>
#include <WebCore/PermissionState.h>
-@@ -234,10 +237,13 @@
+@@ -240,10 +243,13 @@
#include <WebCore/PublicSuffixStore.h>
#include <WebCore/Quirks.h>
#include <WebCore/RealtimeMediaSourceCenter.h>
@@ -17230,7 +17099,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
#include <WebCore/SerializedCryptoKeyWrap.h>
#include <WebCore/SerializedScriptValue.h>
#include <WebCore/ShareData.h>
-@@ -324,6 +330,9 @@
+@@ -330,6 +336,9 @@
#if USE(GBM)
#include "AcceleratedBackingStoreDMABuf.h"
#endif
@@ -17240,7 +17109,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
#include <WebCore/SelectionData.h>
#endif
-@@ -452,6 +461,8 @@ static constexpr Seconds tryCloseTimeoutDelay = 50_ms;
+@@ -455,6 +464,8 @@ static constexpr Seconds tryCloseTimeoutDelay = 50_ms;
static constexpr Seconds audibleActivityClearDelay = 10_s;
#endif
@@ -17249,10 +17118,10 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, webPageProxyCounter, ("WebPageProxy"));
#if PLATFORM(COCOA)
-@@ -939,6 +950,10 @@ WebPageProxy::~WebPageProxy()
- if (RefPtr gpuProcess = GPUProcessProxy::singletonIfCreated())
- gpuProcess->setPresentingApplicationAuditToken(m_legacyMainFrameProcess->coreProcessIdentifier(), m_webPageID, std::nullopt);
+@@ -966,6 +977,10 @@ WebPageProxy::~WebPageProxy()
#endif
+
+ internals().updatePlayingMediaDidChangeTimer.stop();
+
+#if PLATFORM(COCOA)
+ releaseInspectorDragPasteboard();
@@ -17260,15 +17129,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
}
Ref<WebPageProxy> WebPageProxy::Internals::protectedPage() const
-@@ -1515,6 +1530,7 @@ void WebPageProxy::finishAttachingToWebProcess(const Site& site, ProcessLaunchRe
- if (RefPtr pageClient = this->pageClient())
- pageClient->didRelaunchProcess();
- protectedPageLoadState()->didSwapWebProcesses();
-+ m_inspectorController->didFinishAttachingToWebProcess();
- }
-
- void WebPageProxy::didAttachToRunningProcess()
-@@ -1523,7 +1539,7 @@ void WebPageProxy::didAttachToRunningProcess()
+@@ -1548,7 +1563,7 @@ void WebPageProxy::didAttachToRunningProcess()
#if ENABLE(FULLSCREEN_API)
ASSERT(!m_fullScreenManager);
@@ -17277,7 +17138,15 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
#endif
#if ENABLE(VIDEO_PRESENTATION_MODE)
ASSERT(!m_playbackSessionManager);
-@@ -1989,6 +2005,21 @@ Ref<WebProcessProxy> WebPageProxy::ensureProtectedRunningProcess()
+@@ -1714,6 +1729,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, *m_drawingArea, m_mainFrame->frameID(), std::nullopt)), 0);
++ m_inspectorController->didInitializeWebPage();
+
+ #if ENABLE(WINDOW_PROXY_PROPERTY_ACCESS_NOTIFICATION)
+ internals().frameLoadStateObserver = makeUniqueWithoutRefCountedCheck<WebPageProxyFrameLoadStateObserver>(*this);
+@@ -2006,6 +2022,21 @@ Ref<WebProcessProxy> WebPageProxy::ensureProtectedRunningProcess()
return ensureRunningProcess();
}
@@ -17299,7 +17168,18 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
RefPtr<API::Navigation> WebPageProxy::loadRequest(WebCore::ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, IsPerformingHTTPFallback isPerformingHTTPFallback, std::unique_ptr<NavigationActionData>&& lastNavigationAction, API::Object* userData)
{
if (m_isClosed)
-@@ -2086,11 +2117,29 @@ void WebPageProxy::loadRequestWithNavigationShared(Ref<WebProcessProxy>&& proces
+@@ -2062,8 +2093,8 @@ void WebPageProxy::loadRequestWithNavigationShared(Ref<WebProcessProxy>&& proces
+
+ auto url = request.url();
+ #if PLATFORM(COCOA)
+- bool urlIsInvalidButNotNull = !url.isValid() && !url.isNull();
+- if (urlIsInvalidButNotNull && WTF::linkedOnOrAfterSDKWithBehavior(SDKAlignedBehavior::ConvertsInvalidURLsToNull)) {
++ bool urlIsInvalidButNotEmpty = !url.isValid() && !url.isEmpty();
++ if (urlIsInvalidButNotEmpty && WTF::linkedOnOrAfterSDKWithBehavior(SDKAlignedBehavior::ConvertsInvalidURLsToNull)) {
+ RunLoop::protectedMain()->dispatch([weakThis = WeakPtr { *this }, request, navigation = Ref { navigation }] {
+ RefPtr protectedThis = weakThis.get();
+ if (!protectedThis)
+@@ -2116,11 +2147,29 @@ void WebPageProxy::loadRequestWithNavigationShared(Ref<WebProcessProxy>&& proces
navigation->setIsLoadedWithNavigationShared(true);
protectedProcess->markProcessAsRecentlyUsed();
@@ -17333,7 +17213,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
});
}
-@@ -2634,6 +2683,61 @@ void WebPageProxy::setControlledByAutomation(bool controlled)
+@@ -2671,6 +2720,61 @@ void WebPageProxy::setControlledByAutomation(bool controlled)
protectedWebsiteDataStore()->protectedNetworkProcess()->send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0);
}
@@ -17395,7 +17275,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
void WebPageProxy::createInspectorTarget(IPC::Connection& connection, const String& targetId, Inspector::InspectorTargetType type)
{
MESSAGE_CHECK_BASE(!targetId.isEmpty(), connection);
-@@ -2886,6 +2990,24 @@ void WebPageProxy::updateActivityState(OptionSet<ActivityState> flagsToUpdate)
+@@ -2924,6 +3028,24 @@ void WebPageProxy::updateActivityState(OptionSet<ActivityState> flagsToUpdate)
bool wasVisible = isViewVisible();
RefPtr pageClient = this->pageClient();
internals().activityState.remove(flagsToUpdate);
@@ -17420,7 +17300,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
if (flagsToUpdate & ActivityState::IsFocused && pageClient->isViewFocused())
internals().activityState.add(ActivityState::IsFocused);
if (flagsToUpdate & ActivityState::WindowIsActive && pageClient->isViewWindowActive())
-@@ -3654,7 +3776,7 @@ void WebPageProxy::performDragOperation(DragData& dragData, const String& dragSt
+@@ -3706,7 +3828,7 @@ void WebPageProxy::performDragOperation(DragData& dragData, const String& dragSt
if (!hasRunningProcess())
return;
@@ -17429,7 +17309,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
URL url { dragData.asURL() };
if (url.protocolIsFile())
protectedLegacyMainFrameProcess()->assumeReadAccessToBaseURL(*this, url.string(), [] { });
-@@ -3682,6 +3804,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
+@@ -3734,6 +3856,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
if (!hasRunningProcess())
return;
@@ -17438,7 +17318,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
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;
-@@ -3693,7 +3817,7 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
+@@ -3745,7 +3869,7 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
dragData.setClientPosition(remoteUserInputEventData->transformedPoint);
performDragControllerAction(action, dragData, remoteUserInputEventData->targetFrameID);
};
@@ -17447,7 +17327,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
ASSERT(dragData.platformData());
sendWithAsyncReplyToProcessContainingFrame(frameID, Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags()), WTFMove(completionHandler));
#else
-@@ -3728,14 +3852,35 @@ void WebPageProxy::didPerformDragControllerAction(std::optional<WebCore::DragOpe
+@@ -3780,14 +3904,35 @@ void WebPageProxy::didPerformDragControllerAction(std::optional<WebCore::DragOpe
setDragCaretRect(insertionRect);
if (RefPtr pageClient = this->pageClient())
pageClient->didPerformDragControllerAction();
@@ -17487,7 +17367,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
}
didStartDrag();
}
-@@ -3757,6 +3902,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo
+@@ -3809,6 +3954,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo
setDragCaretRect({ });
}
@@ -17512,7 +17392,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
void WebPageProxy::didStartDrag()
{
if (!hasRunningProcess())
-@@ -3764,6 +3927,26 @@ void WebPageProxy::didStartDrag()
+@@ -3816,6 +3979,26 @@ void WebPageProxy::didStartDrag()
discardQueuedMouseEvents();
send(Messages::WebPage::DidStartDrag());
@@ -17539,7 +17419,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
}
void WebPageProxy::dragCancelled()
-@@ -3911,26 +4094,47 @@ void WebPageProxy::processNextQueuedMouseEvent()
+@@ -3981,26 +4164,47 @@ void WebPageProxy::processNextQueuedMouseEvent()
process->startResponsivenessTimer();
}
@@ -17599,16 +17479,16 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
}
void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function<void ()>&& action)
-@@ -4099,6 +4303,8 @@ void WebPageProxy::wheelEventHandlingCompleted(bool wasHandled)
+@@ -4197,6 +4401,8 @@ void WebPageProxy::wheelEventHandlingCompleted(bool wasHandled)
- if (RefPtr automationSession = protectedConfiguration()->processPool().automationSession())
+ if (RefPtr automationSession = m_configuration->processPool().automationSession())
automationSession->wheelEventsFlushedForPage(*this);
+
+ m_inspectorController->didProcessAllPendingWheelEvents();
}
void WebPageProxy::cacheWheelEventScrollingAccelerationCurve(const NativeWebWheelEvent& nativeWheelEvent)
-@@ -4234,7 +4440,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b)
+@@ -4332,7 +4538,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b)
void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent)
{
@@ -17617,7 +17497,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
for (auto& touchPoint : touchStartEvent.touchPoints()) {
auto location = touchPoint.locationInRootView();
auto update = [this, location](TrackingType& trackingType, EventTrackingRegions::EventType eventType) {
-@@ -4861,6 +5067,7 @@ void WebPageProxy::receivedNavigationActionPolicyDecision(WebProcessProxy& proce
+@@ -4971,6 +5177,7 @@ void WebPageProxy::receivedNavigationActionPolicyDecision(WebProcessProxy& proce
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)
{
@@ -17625,7 +17505,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
if (!hasRunningProcess())
return completionHandler(PolicyDecision { });
-@@ -5857,6 +6064,7 @@ void WebPageProxy::viewScaleFactorDidChange(IPC::Connection& connection, double
+@@ -5967,6 +6174,7 @@ void WebPageProxy::viewScaleFactorDidChange(IPC::Connection& connection, double
MESSAGE_CHECK_BASE(scaleFactorIsValid(scaleFactor), connection);
if (!legacyMainFrameProcess().hasConnection(connection))
return;
@@ -17633,7 +17513,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
forEachWebContentProcess([&] (auto& process, auto pageID) {
if (&process == &legacyMainFrameProcess())
-@@ -6518,6 +6726,7 @@ void WebPageProxy::didDestroyNavigationShared(Ref<WebProcessProxy>&& process, We
+@@ -6609,6 +6817,7 @@ void WebPageProxy::didDestroyNavigationShared(Ref<WebProcessProxy>&& process, We
RefPtr protectedPageClient { pageClient() };
protectedNavigationState()->didDestroyNavigation(process->coreProcessIdentifier(), navigationID);
@@ -17641,7 +17521,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
}
void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, std::optional<WebCore::NavigationIdentifier> navigationID, URL&& url, URL&& unreachableURL, const UserData& userData, WallTime timestamp)
-@@ -6852,6 +7061,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref<WebProcessProxy>&& p
+@@ -6947,6 +7156,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref<WebProcessProxy>&& p
m_failingProvisionalLoadURL = { };
@@ -17650,7 +17530,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
// If the provisional page's load fails then we destroy the provisional page.
if (m_provisionalPage && m_provisionalPage->mainFrame() == &frame && willContinueLoading == WillContinueLoading::No)
m_provisionalPage = nullptr;
-@@ -8271,8 +8482,9 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
+@@ -8395,8 +8606,9 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
if (RefPtr page = originatingFrameInfo->page())
openerAppInitiatedState = page->lastNavigationWasAppInitiated();
@@ -17661,15 +17541,15 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
auto completionHandler = [
this,
protectedThis = Ref { *this },
-@@ -8341,6 +8553,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
- configuration->setInitialSandboxFlags(effectiveSandboxFlags);
- configuration->setWindowFeatures(WTFMove(windowFeatures));
+@@ -8469,6 +8681,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
configuration->setOpenedMainFrameName(openedMainFrameName);
+ if (!protectedPreferences()->siteIsolationEnabled())
+ configuration->setRelatedPage(*this);
+ configuration->setOpenerPageForInspector(*this);
if (RefPtr openerFrame = WebFrameProxy::webFrame(originatingFrameInfoData.frameID); navigationActionData.hasOpener && openerFrame) {
- configuration->setRelatedPage(*this);
-@@ -8365,6 +8578,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
+ configuration->setOpenerInfo({ {
+@@ -8491,6 +8704,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
void WebPageProxy::showPage()
{
m_uiClient->showPage(this);
@@ -17677,7 +17557,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
}
bool WebPageProxy::hasOpenedPage() const
-@@ -8479,6 +8693,10 @@ void WebPageProxy::closePage()
+@@ -8622,6 +8836,10 @@ void WebPageProxy::closePage()
if (isClosed())
return;
@@ -17688,7 +17568,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:");
if (RefPtr pageClient = this->pageClient())
pageClient->clearAllEditCommands();
-@@ -8517,6 +8735,8 @@ void WebPageProxy::runJavaScriptAlert(IPC::Connection& connection, FrameIdentifi
+@@ -8660,6 +8878,8 @@ void WebPageProxy::runJavaScriptAlert(IPC::Connection& connection, FrameIdentifi
}
runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler<void()>&& completion) mutable {
@@ -17697,7 +17577,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable {
reply();
completion();
-@@ -8539,6 +8759,8 @@ void WebPageProxy::runJavaScriptConfirm(IPC::Connection& connection, FrameIdenti
+@@ -8682,6 +8902,8 @@ void WebPageProxy::runJavaScriptConfirm(IPC::Connection& connection, FrameIdenti
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->willShowJavaScriptDialog(*this);
}
@@ -17706,7 +17586,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler<void()>&& completion) mutable {
page.m_uiClient->runJavaScriptConfirm(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](bool result) mutable {
-@@ -8563,6 +8785,8 @@ void WebPageProxy::runJavaScriptPrompt(IPC::Connection& connection, FrameIdentif
+@@ -8706,6 +8928,8 @@ void WebPageProxy::runJavaScriptPrompt(IPC::Connection& connection, FrameIdentif
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->willShowJavaScriptDialog(*this);
}
@@ -17715,7 +17595,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply), defaultValue](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler<void()>&& completion) mutable {
page.m_uiClient->runJavaScriptPrompt(page, message, defaultValue, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](auto& result) mutable {
-@@ -8692,6 +8916,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(IPC::Connection& connection, Fram
+@@ -8841,6 +9065,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(IPC::Connection& connection, Fram
return;
}
}
@@ -17724,7 +17604,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
// Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer.
protectedLegacyMainFrameProcess()->stopResponsivenessTimer();
-@@ -9260,6 +9486,11 @@ void WebPageProxy::resourceLoadDidCompleteWithError(ResourceLoadInfo&& loadInfo,
+@@ -9454,6 +9680,11 @@ void WebPageProxy::resourceLoadDidCompleteWithError(ResourceLoadInfo&& loadInfo,
}
#if ENABLE(FULLSCREEN_API)
@@ -17736,7 +17616,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
WebFullScreenManagerProxy* WebPageProxy::fullScreenManager()
{
return m_fullScreenManager.get();
-@@ -9370,6 +9601,17 @@ void WebPageProxy::requestDOMPasteAccess(IPC::Connection& connection, DOMPasteAc
+@@ -9576,6 +9807,17 @@ void WebPageProxy::requestDOMPasteAccess(DOMPasteAccessCategory pasteAccessCateg
}
}
@@ -17751,10 +17631,10 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
+ return;
+ }
+
- m_pageClient->requestDOMPasteAccess(pasteAccessCategory, requiresInteraction, elementRect, originIdentifier, WTFMove(completionHandler));
+ protectedPageClient()->requestDOMPasteAccess(pasteAccessCategory, requiresInteraction, elementRect, originIdentifier, WTFMove(completionHandler));
}
-@@ -10400,6 +10642,8 @@ void WebPageProxy::mouseEventHandlingCompleted(std::optional<WebEventType> event
+@@ -10605,6 +10847,8 @@ void WebPageProxy::mouseEventHandlingCompleted(std::optional<WebEventType> event
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->mouseEventsFlushedForPage(*this);
didFinishProcessingAllPendingMouseEvents();
@@ -17763,7 +17643,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
}
}
-@@ -10434,6 +10678,7 @@ void WebPageProxy::keyEventHandlingCompleted(std::optional<WebEventType> eventTy
+@@ -10640,6 +10884,7 @@ void WebPageProxy::keyEventHandlingCompleted(std::optional<WebEventType> eventTy
if (!canProcessMoreKeyEvents) {
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->keyboardEventsFlushedForPage(*this);
@@ -17771,9 +17651,9 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
}
}
-@@ -10857,7 +11102,10 @@ void WebPageProxy::dispatchProcessDidTerminate(WebProcessProxy& process, Process
- if (m_preferences->siteIsolationEnabled())
- m_browsingContextGroup->processDidTerminate(*this, process);
+@@ -11064,7 +11309,10 @@ void WebPageProxy::dispatchProcessDidTerminate(WebProcessProxy& process, Process
+ if (protectedPreferences()->siteIsolationEnabled())
+ protectedBrowsingContextGroup()->processDidTerminate(*this, process);
- bool handledByClient = false;
+ bool handledByClient = m_inspectorController->pageCrashed(reason);
@@ -17783,16 +17663,16 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
if (m_loaderClient)
handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this);
else
-@@ -11513,6 +11761,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
-
- parameters.httpsUpgradeEnabled = preferences->upgradeKnownHostsToHTTPSEnabled() ? configuration->httpsUpgradeEnabled() : false;
+@@ -11719,6 +11967,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
+ parameters.canUseCredentialStorage = m_canUseCredentialStorage;
-+ parameters.shouldPauseInInspectorWhenShown = m_inspectorController->shouldPauseInInspectorWhenShown();
+ parameters.httpsUpgradeEnabled = preferences->upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false;
+
- #if PLATFORM(IOS) || PLATFORM(VISION)
- // FIXME: This is also being passed over the to WebProcess via the PreferencesStore.
- parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload();
-@@ -11676,8 +11926,42 @@ void WebPageProxy::allowGamepadAccess()
++ parameters.shouldPauseInInspectorWhenShown = m_inspectorController->shouldPauseInInspectorWhenShown();
+
+ #if ENABLE(APP_HIGHLIGHTS)
+ parameters.appHighlightsVisible = appHighlightsVisibility() ? HighlightVisibility::Visible : HighlightVisibility::Hidden;
+@@ -11882,8 +12132,42 @@ void WebPageProxy::allowGamepadAccess()
#endif // ENABLE(GAMEPAD)
@@ -17835,7 +17715,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) {
m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) {
if (shouldAllowLegacyTLS)
-@@ -11772,6 +12056,12 @@ void WebPageProxy::requestGeolocationPermissionForFrame(IPC::Connection& connect
+@@ -11979,6 +12263,12 @@ void WebPageProxy::requestGeolocationPermissionForFrame(IPC::Connection& connect
request->deny();
};
@@ -17848,7 +17728,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
// 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
-@@ -11834,6 +12124,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
+@@ -12043,6 +12333,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
shouldChangeDeniedToPrompt = false;
if (sessionID().isEphemeral()) {
@@ -17861,7 +17741,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
completionHandler(shouldChangeDeniedToPrompt ? PermissionState::Prompt : PermissionState::Denied);
return;
}
-@@ -11848,6 +12144,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
+@@ -12057,6 +12353,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
return;
}
@@ -17875,7 +17755,7 @@ index 963ca0b7a50c8ded555090c68aaa6acec526f7f9..0d9e4394824a664a35b10db392b91306
completionHandler(shouldChangeDeniedToPrompt ? PermissionState::Prompt : PermissionState::Denied);
return;
diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
-index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c97515422 100644
+index 5eb0a3d277ecd9a0ea9c2e4f1223205bff9cb5a4..b770b73fb96af5dd106c8e66d02590c1650efbe6 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.h
+++ b/Source/WebKit/UIProcess/WebPageProxy.h
@@ -26,6 +26,7 @@
@@ -17884,9 +17764,9 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
#include "APIObject.h"
+#include "APIWebsitePolicies.h"
#include "MessageReceiver.h"
+ #include <WebCore/BoxExtents.h>
#include <WebCore/CryptoKeyData.h>
- #include <WebCore/FrameIdentifier.h>
-@@ -42,6 +43,20 @@
+@@ -44,6 +45,20 @@
#include <wtf/ProcessID.h>
#include <wtf/UniqueRef.h>
#include <wtf/WeakHashSet.h>
@@ -17907,7 +17787,7 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
#if USE(DICTATION_ALTERNATIVES)
#include <WebCore/PlatformTextAlternatives.h>
-@@ -126,6 +141,7 @@ class DragData;
+@@ -128,6 +143,7 @@ class DragData;
class Exception;
class FloatPoint;
class FloatQuad;
@@ -17915,15 +17795,7 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
class FloatRect;
class FloatSize;
class FontAttributeChanges;
-@@ -474,6 +490,7 @@ class WebExtensionController;
- class WebFramePolicyListenerProxy;
- class WebFrameProxy;
- class WebFullScreenManagerProxy;
-+class WebFullScreenManagerProxyClient;
- class WebInspectorUIProxy;
- class WebKeyboardEvent;
- class WebMouseEvent;
-@@ -707,6 +724,8 @@ public:
+@@ -729,6 +745,8 @@ public:
void setControlledByAutomation(bool);
WebPageInspectorController& inspectorController() { return *m_inspectorController; }
@@ -17932,15 +17804,15 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
#if PLATFORM(IOS_FAMILY)
void showInspectorIndication();
-@@ -741,6 +760,7 @@ public:
+@@ -763,6 +781,7 @@ public:
bool hasSleepDisabler() const;
#if ENABLE(FULLSCREEN_API)
+ void setFullScreenManagerClientOverride(std::unique_ptr<WebFullScreenManagerProxyClient>&&);
WebFullScreenManagerProxy* fullScreenManager();
+ void setFullScreenClientForTesting(std::unique_ptr<WebKit::WebFullScreenManagerProxyClient>&&);
- API::FullscreenClient& fullscreenClient() const { return *m_fullscreenClient; }
-@@ -830,6 +850,12 @@ public:
+@@ -853,6 +872,12 @@ public:
void setPageLoadStateObserver(RefPtr<PageLoadStateObserverBase>&&);
@@ -17953,7 +17825,7 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
void initializeWebPage(const WebCore::Site&, WebCore::SandboxFlags);
void setDrawingArea(RefPtr<DrawingAreaProxy>&&);
-@@ -861,6 +887,8 @@ public:
+@@ -884,6 +909,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);
@@ -17962,7 +17834,7 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
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);
-@@ -944,6 +972,7 @@ public:
+@@ -972,6 +999,7 @@ public:
PageClient* pageClient() const;
RefPtr<PageClient> protectedPageClient() const;
@@ -17970,7 +17842,7 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
void setViewNeedsDisplay(const WebCore::Region&);
void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, WebCore::ScrollIsAnimated);
-@@ -1566,14 +1595,20 @@ public:
+@@ -1609,14 +1637,20 @@ public:
void didStartDrag();
void dragCancelled();
void setDragCaretRect(const WebCore::IntRect&);
@@ -17992,7 +17864,7 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
#endif
void processDidBecomeUnresponsive();
-@@ -1822,6 +1857,7 @@ public:
+@@ -1869,6 +1903,7 @@ public:
void setViewportSizeForCSSViewportUnits(const WebCore::FloatSize&);
WebCore::FloatSize viewportSizeForCSSViewportUnits() const;
@@ -18000,7 +17872,7 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
void didReceiveAuthenticationChallengeProxy(Ref<AuthenticationChallengeProxy>&&, NegotiatedLegacyTLS);
void negotiatedLegacyTLS();
void didNegotiateModernTLS(const URL&);
-@@ -1855,6 +1891,8 @@ public:
+@@ -1902,6 +1937,8 @@ public:
#if PLATFORM(COCOA) || PLATFORM(GTK)
RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&);
RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&, ForceSoftwareCapturingViewportSnapshot);
@@ -18009,7 +17881,7 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
#endif
void wrapCryptoKey(Vector<uint8_t>&&, CompletionHandler<void(std::optional<Vector<uint8_t>>&&)>&&);
-@@ -2835,6 +2873,7 @@ private:
+@@ -2901,6 +2938,7 @@ private:
RefPtr<API::Navigation> launchProcessForReload();
void requestNotificationPermission(const String& originString, CompletionHandler<void(bool allowed)>&&);
@@ -18017,7 +17889,7 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
void didChangeContentSize(const WebCore::IntSize&);
void didChangeIntrinsicContentSize(const WebCore::IntSize&);
-@@ -3362,8 +3401,10 @@ private:
+@@ -3424,8 +3462,10 @@ RefPtr<SpeechRecognitionPermissionManager> protectedSpeechRecognitionPermissionM
String m_openedMainFrameName;
RefPtr<WebInspectorUIProxy> m_inspector;
@@ -18028,7 +17900,7 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
RefPtr<WebFullScreenManagerProxy> m_fullScreenManager;
std::unique_ptr<API::FullscreenClient> m_fullscreenClient;
#endif
-@@ -3562,6 +3603,22 @@ private:
+@@ -3622,6 +3662,22 @@ RefPtr<SpeechRecognitionPermissionManager> protectedSpeechRecognitionPermissionM
std::optional<WebCore::DragOperation> m_currentDragOperation;
bool m_currentDragIsOverFileInput { false };
unsigned m_currentDragNumberOfFilesToBeAccepted { 0 };
@@ -18051,7 +17923,7 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
#endif
bool m_mainFrameHasHorizontalScrollbar { false };
-@@ -3735,6 +3792,10 @@ private:
+@@ -3795,6 +3851,10 @@ RefPtr<SpeechRecognitionPermissionManager> protectedSpeechRecognitionPermissionM
RefPtr<API::Object> messageBody;
};
Vector<InjectedBundleMessage> m_pendingInjectedBundleMessages;
@@ -18063,7 +17935,7 @@ index b2c03a83961ca2dca8510461ab73693295f3c50a..94e859353dc61017f13d39227d256d6c
#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 68e7c4024aa81d9339c4d62feae9f6270af46db8..c312f7c5d9d06893f2dad30c87968fe5dffd880d 100644
+index d1b9a0bec55cf3c64792b6c0c527c973a6ef3cdd..4b132c98aabe3dffef13b01e6251bdb7305ce200 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.messages.in
+++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in
@@ -35,6 +35,7 @@ messages -> WebPageProxy {
@@ -18074,7 +17946,7 @@ index 68e7c4024aa81d9339c4d62feae9f6270af46db8..c312f7c5d9d06893f2dad30c87968fe5
DidReceiveEvent(enum:uint8_t WebKit::WebEventType eventType, bool handled, struct std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData)
SetCursor(WebCore::Cursor cursor)
-@@ -330,10 +331,14 @@ messages -> WebPageProxy {
+@@ -336,10 +337,14 @@ messages -> WebPageProxy {
StartDrag(struct WebCore::DragItem dragItem, WebCore::ShareableBitmapHandle dragImage)
SetPromisedDataForImage(String pasteboardName, WebCore::SharedMemory::Handle imageHandle, String filename, String extension, String title, String url, String visibleURL, WebCore::SharedMemory::Handle archiveHandle, String originIdentifier)
#endif
@@ -18091,10 +17963,10 @@ index 68e7c4024aa81d9339c4d62feae9f6270af46db8..c312f7c5d9d06893f2dad30c87968fe5
DidHandleDragStartRequest(bool started)
DidHandleAdditionalDragItemsRequest(bool added)
diff --git a/Source/WebKit/UIProcess/WebProcessCache.cpp b/Source/WebKit/UIProcess/WebProcessCache.cpp
-index 7211efa3028a16e070059251cd35cefa886f5d43..7aeab506c527d5ddcfa7f1e56749dca87ab7738e 100644
+index 9153b4da4d4f8de14f27e9ee2e8c89059e9573f5..035009bdcf5651aedd9604e47dc02fbfcccc62a9 100644
--- a/Source/WebKit/UIProcess/WebProcessCache.cpp
+++ b/Source/WebKit/UIProcess/WebProcessCache.cpp
-@@ -92,6 +92,10 @@ bool WebProcessCache::canCacheProcess(WebProcessProxy& process) const
+@@ -100,6 +100,10 @@ bool WebProcessCache::canCacheProcess(WebProcessProxy& process) const
return false;
}
@@ -18106,10 +17978,10 @@ index 7211efa3028a16e070059251cd35cefa886f5d43..7aeab506c527d5ddcfa7f1e56749dca8
}
diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
-index ab6e3d2220d2f02cce66a47ab0e2432685d0ce94..d5ec0bdb2b92137222a58ae3afda1e2dc5caca6b 100644
+index c035cc55b3810bef6d30b753ee325905d8fbc6ab..d129f7ebbf7a9a5e97e09fd7ce6e58040a960abc 100644
--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
-@@ -444,10 +444,10 @@ void WebProcessPool::setAutomationClient(std::unique_ptr<API::AutomationClient>&
+@@ -445,10 +445,10 @@ void WebProcessPool::setAutomationClient(std::unique_ptr<API::AutomationClient>&
void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
{
@@ -18122,7 +17994,7 @@ index ab6e3d2220d2f02cce66a47ab0e2432685d0ce94..d5ec0bdb2b92137222a58ae3afda1e2d
#if ENABLE(GPU_PROCESS)
if (RefPtr gpuProcess = GPUProcessProxy::singletonIfCreated())
-@@ -455,9 +455,10 @@ void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
+@@ -456,9 +456,10 @@ void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
#endif
#if USE(SOUP)
for (Ref networkProcess : NetworkProcessProxy::allNetworkProcesses())
@@ -18134,7 +18006,7 @@ index ab6e3d2220d2f02cce66a47ab0e2432685d0ce94..d5ec0bdb2b92137222a58ae3afda1e2d
void WebProcessPool::fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)
{
-@@ -943,7 +944,7 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
+@@ -947,7 +948,7 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
#endif
parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
@@ -18144,10 +18016,10 @@ index ab6e3d2220d2f02cce66a47ab0e2432685d0ce94..d5ec0bdb2b92137222a58ae3afda1e2d
parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument);
diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp
-index 31270a744c84c7e818bf42637658cd98db30f2b9..9e26b56dc40aeedc4afbb6cbe7b01f4cbcb32d0b 100644
+index 1ac3aeb44691040950f6992d77e6489d9c58744f..3b4ebb055f9d9e7b3c64bfbf830239a7d1baf770 100644
--- a/Source/WebKit/UIProcess/WebProcessProxy.cpp
+++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp
-@@ -194,6 +194,11 @@ Vector<Ref<WebProcessProxy>> WebProcessProxy::allProcesses()
+@@ -201,6 +201,11 @@ Vector<Ref<WebProcessProxy>> WebProcessProxy::allProcesses()
});
}
@@ -18159,7 +18031,7 @@ index 31270a744c84c7e818bf42637658cd98db30f2b9..9e26b56dc40aeedc4afbb6cbe7b01f4c
RefPtr<WebProcessProxy> WebProcessProxy::processForIdentifier(ProcessIdentifier identifier)
{
return allProcessMap().get(identifier);
-@@ -561,6 +566,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt
+@@ -568,6 +573,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt
if (WebKit::isInspectorProcessPool(protectedProcessPool()))
launchOptions.extraInitializationData.add<HashTranslatorASCIILiteral>("inspector-process"_s, "1"_s);
@@ -18187,19 +18059,19 @@ index 31270a744c84c7e818bf42637658cd98db30f2b9..9e26b56dc40aeedc4afbb6cbe7b01f4c
if (isPrewarmed())
diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h
-index ac12422e6b49f1c3b935e0c05ea569522d1a4206..555bd49e0fb59fd6fdc2cfd32dc7614a096b924f 100644
+index b82965d62515b10373be40b28e4ba567821d5994..e05268412a251474c64fc4b3bafa25363bc87057 100644
--- a/Source/WebKit/UIProcess/WebProcessProxy.h
+++ b/Source/WebKit/UIProcess/WebProcessProxy.h
-@@ -180,6 +180,7 @@ public:
+@@ -184,6 +184,7 @@ public:
- static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, const Function<void(WebPageProxy&)>&);
+ static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, NOESCAPE const Function<void(WebPageProxy&)>&);
static Vector<std::pair<WebCore::ProcessIdentifier, WebCore::RegistrableDomain>> allowedFirstPartiesForCookies();
+ static Vector<Ref<WebProcessProxy>> allProcessesForInspector();
void initializeWebProcess(WebProcessCreationParameters&&);
diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
-index 09058b732dd75484320bca2c939f139e5057c845..aa9ea426f635d768cd2c901cccda72e0bbd165c8 100644
+index 7b9780cb47d824cc47054333aad47754d6a0725c..34bb946afd3de5354e5a3759506537d2dd1af586 100644
--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
@@ -314,7 +314,8 @@ SOAuthorizationCoordinator& WebsiteDataStore::soAuthorizationCoordinator(const W
@@ -18212,7 +18084,7 @@ index 09058b732dd75484320bca2c939f139e5057c845..aa9ea426f635d768cd2c901cccda72e0
if (sessionID.isEphemeral()) {
// Reuse a previous persistent session network process for ephemeral sessions.
for (auto& dataStore : allDataStores().values()) {
-@@ -2354,6 +2355,12 @@ void WebsiteDataStore::originDirectoryForTesting(WebCore::ClientOrigin&& origin,
+@@ -2507,6 +2508,12 @@ void WebsiteDataStore::originDirectoryForTesting(WebCore::ClientOrigin&& origin,
protectedNetworkProcess()->websiteDataOriginDirectoryForTesting(m_sessionID, WTFMove(origin), type, WTFMove(completionHandler));
}
@@ -18226,10 +18098,10 @@ index 09058b732dd75484320bca2c939f139e5057c845..aa9ea426f635d768cd2c901cccda72e0
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 903223f1276b9e5440ce66ba941255272209203f..c0b9b92f361cdca7bcfd3a8eb554c3bb015aac45 100644
+index 0439774485211a729ccd8b0c041c41547ea28625..e09aff8b56357687de4a417b1bdd644907bb8c23 100644
--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
-@@ -101,6 +101,7 @@ class DeviceIdHashSaltStorage;
+@@ -98,6 +98,7 @@ class DeviceIdHashSaltStorage;
class DownloadProxy;
class NetworkProcessProxy;
class SOAuthorizationCoordinator;
@@ -18237,7 +18109,7 @@ index 903223f1276b9e5440ce66ba941255272209203f..c0b9b92f361cdca7bcfd3a8eb554c3bb
class VirtualAuthenticatorManager;
class WebPageProxy;
class WebProcessPool;
-@@ -116,12 +117,21 @@ enum class UnifiedOriginStorageLevel : uint8_t;
+@@ -113,6 +114,7 @@ enum class UnifiedOriginStorageLevel : uint8_t;
enum class WebsiteDataFetchOption : uint8_t;
enum class WebsiteDataType : uint32_t;
@@ -18245,8 +18117,9 @@ index 903223f1276b9e5440ce66ba941255272209203f..c0b9b92f361cdca7bcfd3a8eb554c3bb
struct ITPThirdPartyData;
struct NetworkProcessConnectionInfo;
struct WebPushMessage;
- struct WebsiteDataRecord;
- struct WebsiteDataStoreParameters;
+@@ -122,6 +124,14 @@ struct WebsiteDataStoreParameters;
+ enum RemoveDataTaskCounterType { };
+ using RemoveDataTaskCounter = RefCounter<RemoveDataTaskCounterType>;
+class DownloadInstrumentation {
+public:
@@ -18259,7 +18132,7 @@ index 903223f1276b9e5440ce66ba941255272209203f..c0b9b92f361cdca7bcfd3a8eb554c3bb
class WebsiteDataStore : public API::ObjectImpl<API::Object::Type::WebsiteDataStore>, public CanMakeWeakPtr<WebsiteDataStore> {
public:
static Ref<WebsiteDataStore> defaultDataStore();
-@@ -310,11 +320,13 @@ public:
+@@ -319,11 +329,13 @@ public:
const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; }
#endif
@@ -18274,7 +18147,7 @@ index 903223f1276b9e5440ce66ba941255272209203f..c0b9b92f361cdca7bcfd3a8eb554c3bb
void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&);
const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; }
void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType);
-@@ -404,6 +416,12 @@ public:
+@@ -420,6 +432,12 @@ public:
static const String& defaultBaseDataDirectory();
#endif
@@ -18287,7 +18160,7 @@ index 903223f1276b9e5440ce66ba941255272209203f..c0b9b92f361cdca7bcfd3a8eb554c3bb
void resetQuota(CompletionHandler<void()>&&);
void resetStoragePersistedState(CompletionHandler<void()>&&);
#if PLATFORM(IOS_FAMILY)
-@@ -589,9 +607,11 @@ private:
+@@ -614,9 +632,11 @@ private:
WebCore::CurlProxySettings m_proxySettings;
#endif
@@ -18300,7 +18173,7 @@ index 903223f1276b9e5440ce66ba941255272209203f..c0b9b92f361cdca7bcfd3a8eb554c3bb
WebCore::SoupNetworkProxySettings m_networkProxySettings;
String m_cookiePersistentStoragePath;
SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite };
-@@ -618,6 +638,10 @@ private:
+@@ -643,6 +663,10 @@ private:
RefPtr<API::HTTPCookieStore> m_cookieStore;
RefPtr<NetworkProcessProxy> m_networkProcess;
@@ -18649,10 +18522,10 @@ index 5529f52048b24290f424e877cd9dbfb890e02ffb..c2b76b6188dd9596c4a1f31c137daff7
virtual void unrealize() { };
virtual int renderHostFileDescriptor() { return -1; }
diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
-index 92d972eeef867b680ef0266d24f47827fe0d64b5..afb1e4d9dfae59be15692635e5334a5078bfef95 100644
+index 461ce4fddb98edbf06be61d4b47f3256439f70a8..64b0c2e09a1ae8487bc8b2610f209a228a6988f6 100644
--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
-@@ -811,4 +811,30 @@ RefPtr<WebCore::NativeImage> AcceleratedBackingStoreDMABuf::bufferAsNativeImageF
+@@ -812,4 +812,30 @@ RefPtr<WebCore::NativeImage> AcceleratedBackingStoreDMABuf::bufferAsNativeImageF
return m_committedBuffer->asNativeImageForTesting();
}
@@ -18684,7 +18557,7 @@ index 92d972eeef867b680ef0266d24f47827fe0d64b5..afb1e4d9dfae59be15692635e5334a50
+
} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h
-index 87275e2c71e934f76c979e30375e78763a476814..5776d81c12e653404c1c637d4d7060e9123f12e5 100644
+index aedb88b1031475a603b6d15eb4fc042153c9b8c1..e6aca4b0e577dd2c729d262ff9b3d4d8fb27ef23 100644
--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h
+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h
@@ -98,6 +98,7 @@ private:
@@ -18978,7 +18851,7 @@ index 0000000000000000000000000000000000000000..36ab6e9aec9f8d79fb13a8a49beadaaf
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp
-index 2a17b59c9be6ecc76b0ec0a16d9f4866dffa0bf4..0d5c58a88b0e5197254d0eb5bd6eee045d99d299 100644
+index cedf117035055756084863d1e8db8594e4a8b8d2..bae8c9d90d1f34324bbb98a52815af98d23e5257 100644
--- a/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp
+++ b/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp
@@ -78,8 +78,10 @@ void WebPasteboardProxy::setPrimarySelectionOwner(WebFrameProxy* frame)
@@ -19204,7 +19077,7 @@ index 0000000000000000000000000000000000000000..8adbd51bfecad2a273117588bf50f8f7
+
+#endif
diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h
-index c8ec967cdc8b32e7b9349460794c35b2c6b45d7f..a8ccc70d9f0defd9ac4e8c8f45064bc3b2b4bfac 100644
+index 51744982af6f55f269d407cfb82638a4eaba8a5c..3cb319ef5fd54de9397f8065a8b05ca7ff82ccee 100644
--- a/Source/WebKit/UIProcess/mac/PageClientImplMac.h
+++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.h
@@ -60,6 +60,8 @@ class PageClientImpl final : public PageClientImplCocoa
@@ -19226,8 +19099,8 @@ index c8ec967cdc8b32e7b9349460794c35b2c6b45d7f..a8ccc70d9f0defd9ac4e8c8f45064bc3
RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&) override;
RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&, ForceSoftwareCapturingViewportSnapshot) override;
void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) override;
-@@ -230,6 +235,10 @@ private:
- void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) override;
+@@ -228,6 +233,10 @@ private:
+ void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame, CompletionHandler<void()>&&) override;
#endif
+#if ENABLE(TOUCH_EVENTS)
@@ -19238,10 +19111,10 @@ index c8ec967cdc8b32e7b9349460794c35b2c6b45d7f..a8ccc70d9f0defd9ac4e8c8f45064bc3
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 dba9aae7c29f59127a80461aedc8ac10cc1cef66..addadd854c4fa5c999eb1ae865c8e31d2e37b03f 100644
+index 6f5fd6287d435161dd7a7269fccc32cada2aabd5..79f171aaba64bca6a6bc853edb5b77effbabf664 100644
--- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
+++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
-@@ -110,6 +110,13 @@ namespace WebKit {
+@@ -116,6 +116,13 @@ namespace WebKit {
using namespace WebCore;
@@ -19255,7 +19128,7 @@ index dba9aae7c29f59127a80461aedc8ac10cc1cef66..addadd854c4fa5c999eb1ae865c8e31d
PageClientImpl::PageClientImpl(NSView *view, WKWebView *webView)
: PageClientImplCocoa(webView)
, m_view(view)
-@@ -163,6 +170,9 @@ NSWindow *PageClientImpl::activeWindow() const
+@@ -169,6 +176,9 @@ NSWindow *PageClientImpl::activeWindow() const
bool PageClientImpl::isViewWindowActive()
{
@@ -19265,7 +19138,7 @@ index dba9aae7c29f59127a80461aedc8ac10cc1cef66..addadd854c4fa5c999eb1ae865c8e31d
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer));
NSWindow *activeViewWindow = activeWindow();
return activeViewWindow.isKeyWindow || (activeViewWindow && [NSApp keyWindow] == activeViewWindow);
-@@ -170,6 +180,9 @@ bool PageClientImpl::isViewWindowActive()
+@@ -176,6 +186,9 @@ bool PageClientImpl::isViewWindowActive()
bool PageClientImpl::isViewFocused()
{
@@ -19275,7 +19148,7 @@ index dba9aae7c29f59127a80461aedc8ac10cc1cef66..addadd854c4fa5c999eb1ae865c8e31d
// 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 (!m_impl)
-@@ -193,6 +206,9 @@ void PageClientImpl::makeFirstResponder()
+@@ -199,6 +212,9 @@ void PageClientImpl::makeFirstResponder()
bool PageClientImpl::isViewVisible()
{
@@ -19285,7 +19158,7 @@ index dba9aae7c29f59127a80461aedc8ac10cc1cef66..addadd854c4fa5c999eb1ae865c8e31d
NSView *activeView = this->activeView();
NSWindow *activeViewWindow = activeWindow();
-@@ -276,7 +292,8 @@ void PageClientImpl::didRelaunchProcess()
+@@ -282,7 +298,8 @@ void PageClientImpl::didRelaunchProcess()
void PageClientImpl::preferencesDidChange()
{
@@ -19295,7 +19168,7 @@ index dba9aae7c29f59127a80461aedc8ac10cc1cef66..addadd854c4fa5c999eb1ae865c8e31d
}
void PageClientImpl::toolTipChanged(const String& oldToolTip, const String& newToolTip)
-@@ -478,6 +495,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
+@@ -489,6 +506,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled)
{
@@ -19304,7 +19177,7 @@ index dba9aae7c29f59127a80461aedc8ac10cc1cef66..addadd854c4fa5c999eb1ae865c8e31d
m_impl->doneWithKeyEvent(event.nativeEvent(), eventWasHandled);
}
-@@ -497,6 +516,8 @@ void PageClientImpl::computeHasVisualSearchResults(const URL& imageURL, Shareabl
+@@ -508,6 +527,8 @@ void PageClientImpl::computeHasVisualSearchResults(const URL& imageURL, Shareabl
RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy& page)
{
@@ -19313,7 +19186,7 @@ index dba9aae7c29f59127a80461aedc8ac10cc1cef66..addadd854c4fa5c999eb1ae865c8e31d
return WebPopupMenuProxyMac::create(m_view, page.popupMenuClient());
}
-@@ -638,6 +659,12 @@ CALayer *PageClientImpl::footerBannerLayer() const
+@@ -643,6 +664,12 @@ CALayer *PageClientImpl::footerBannerLayer() const
return m_impl->footerBannerLayer();
}
@@ -19326,7 +19199,7 @@ index dba9aae7c29f59127a80461aedc8ac10cc1cef66..addadd854c4fa5c999eb1ae865c8e31d
RefPtr<ViewSnapshot> PageClientImpl::takeViewSnapshot(std::optional<WebCore::IntRect>&&)
{
return m_impl->takeViewSnapshot();
-@@ -833,6 +860,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR
+@@ -858,6 +885,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR
#endif // ENABLE(FULLSCREEN_API)
@@ -19340,7 +19213,7 @@ index dba9aae7c29f59127a80461aedc8ac10cc1cef66..addadd854c4fa5c999eb1ae865c8e31d
void PageClientImpl::navigationGestureDidBegin()
{
m_impl->dismissContentRelativeChildWindowsWithAnimation(true);
-@@ -1011,6 +1045,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c
+@@ -1036,6 +1070,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c
bool PageClientImpl::windowIsFrontWindowUnderMouse(const NativeWebMouseEvent& event)
{
@@ -19351,15 +19224,19 @@ index dba9aae7c29f59127a80461aedc8ac10cc1cef66..addadd854c4fa5c999eb1ae865c8e31d
}
diff --git a/Source/WebKit/UIProcess/mac/SecItemShimProxy.messages.in b/Source/WebKit/UIProcess/mac/SecItemShimProxy.messages.in
-index e0a61ae15b79e32701b2f4a2a6de6c105fb39446..1792da3491e88ee76a501f271938592de19f7ae4 100644
+index f46895285dbc84c624537a194814c18f771a0c08..29ef9e5afa13b8d2b47b7f2dd4ce37846b61c35f 100644
--- a/Source/WebKit/UIProcess/mac/SecItemShimProxy.messages.in
+++ b/Source/WebKit/UIProcess/mac/SecItemShimProxy.messages.in
-@@ -20,12 +20,12 @@
+@@ -20,6 +20,7 @@
# 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.
+#if ENABLE(SEC_ITEM_SHIM)
- [ExceptionForEnabledBy]
+ [
+ DispatchedFrom=Networking,
+ DispatchedTo=UI,
+@@ -27,9 +28,8 @@
+ ]
messages -> SecItemShimProxy {
-#if ENABLE(SEC_ITEM_SHIM)
@@ -19370,10 +19247,10 @@ index e0a61ae15b79e32701b2f4a2a6de6c105fb39446..1792da3491e88ee76a501f271938592d
}
+#endif
diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h
-index b668c229f2e8bd077b19a8a6344416098895f8a0..e9b67c72cfc91fec86887941a760f6899696624f 100644
+index 1904f5ddedb75ee74aa84154fb9af248646c2fa2..af987387cc6537c225dd80515560c840319157f2 100644
--- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h
+++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h
-@@ -80,6 +80,7 @@ private:
+@@ -81,6 +81,7 @@ private:
void show() override;
void showContextMenuWithItems(Vector<Ref<WebContextMenuItem>>&&) override;
void useContextMenuItems(Vector<Ref<WebContextMenuItem>>&&) override;
@@ -19382,10 +19259,10 @@ index b668c229f2e8bd077b19a8a6344416098895f8a0..e9b67c72cfc91fec86887941a760f689
bool showAfterPostProcessingContextData();
diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
-index 4abfcf22cbdce49e3e15993b07700866fa8e97f9..2a90b5d222ccdec8725c64f3102bebd870360fa9 100644
+index c962b29e655a421e3199505d2aa8546a83dbd583..85dc988495ba9b4eef48ee501afb5f854b687678 100644
--- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
+++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
-@@ -534,6 +534,12 @@ RetainPtr<NSMenuItem> WebContextMenuProxyMac::createShareMenuItem(ShareMenuItemT
+@@ -538,6 +538,12 @@ RetainPtr<NSMenuItem> WebContextMenuProxyMac::createShareMenuItem(ShareMenuItemT
}
#endif
@@ -19590,10 +19467,10 @@ index 0000000000000000000000000000000000000000..dd52991f936aa1c046b404801ee97237
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/mac/WebViewImpl.h b/Source/WebKit/UIProcess/mac/WebViewImpl.h
-index f519288e2a405f48d9224599eb678c919ff77af1..cc151e7b828536e9509bcb5fa23d19b4f2efc10f 100644
+index 13b4e79c748071d02fedd8bced9ef0304943c51d..5830a3a3145b103a041cd2ff6666f8eff7666e3b 100644
--- a/Source/WebKit/UIProcess/mac/WebViewImpl.h
+++ b/Source/WebKit/UIProcess/mac/WebViewImpl.h
-@@ -543,6 +543,9 @@ public:
+@@ -566,6 +566,9 @@ public:
void provideDataForPasteboard(NSPasteboard *, NSString *type);
NSArray *namesOfPromisedFilesDroppedAtDestination(NSURL *dropDestination);
@@ -19604,10 +19481,10 @@ index f519288e2a405f48d9224599eb678c919ff77af1..cc151e7b828536e9509bcb5fa23d19b4
RefPtr<ViewSnapshot> takeViewSnapshot(ForceSoftwareCapturingViewportSnapshot);
void saveBackForwardSnapshotForCurrentItem();
diff --git a/Source/WebKit/UIProcess/mac/WebViewImpl.mm b/Source/WebKit/UIProcess/mac/WebViewImpl.mm
-index 032961f58ab7990c8b353c0fcc849e8d03c145ac..04866658cbfbcf8dad31e51f94d0419a1466e62a 100644
+index 9fe23e004a89f08ca6583181b01a72b5025c1d93..3028a0946be2d5fe51d92fd1de5bc0668bbb55c8 100644
--- a/Source/WebKit/UIProcess/mac/WebViewImpl.mm
+++ b/Source/WebKit/UIProcess/mac/WebViewImpl.mm
-@@ -2390,6 +2390,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace()
+@@ -2415,6 +2415,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace()
if (!m_colorSpace)
m_colorSpace = [NSColorSpace sRGBColorSpace];
}
@@ -19619,7 +19496,7 @@ index 032961f58ab7990c8b353c0fcc849e8d03c145ac..04866658cbfbcf8dad31e51f94d0419a
ASSERT(m_colorSpace);
return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] };
-@@ -4528,6 +4533,17 @@ static RetainPtr<CGImageRef> takeWindowSnapshot(CGSWindowID windowID, bool captu
+@@ -4587,6 +4592,17 @@ static RetainPtr<CGImageRef> takeWindowSnapshot(CGSWindowID windowID, bool captu
return WebCore::cgWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions);
}
@@ -19841,10 +19718,10 @@ index 0000000000000000000000000000000000000000..135a60361fa8fbf907382625e7c8dd4e
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp b/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp
-index 3c95132b41b124e49f52e97ba2306614f46d53b9..115cfc4871aef732d5c57bae3b13818b67193cd5 100644
+index bae35256ed815f7dac0b11ae439531d4ef3cb108..81e063b50a0132f8b36f3461f95d2ce1968198f5 100644
--- a/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp
+++ b/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp
-@@ -114,5 +114,11 @@ WebContextMenuProxyWin::~WebContextMenuProxyWin()
+@@ -115,5 +115,11 @@ WebContextMenuProxyWin::~WebContextMenuProxyWin()
::DestroyMenu(m_menu);
}
@@ -19857,17 +19734,17 @@ index 3c95132b41b124e49f52e97ba2306614f46d53b9..115cfc4871aef732d5c57bae3b13818b
} // namespace WebKit
#endif // ENABLE(CONTEXT_MENUS)
diff --git a/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.h b/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.h
-index 0c80d970c3f9a987faf620081c909f6c7021970d..1467e5481f7417913c0d12a1cb492d02b2a7d1b7 100644
+index e7f71156d7a897ab477d0d7f167b2c2992cdb161..325d8813afff13d86a4892a8e99738f19c2729ac 100644
--- a/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.h
+++ b/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.h
-@@ -47,6 +47,7 @@ public:
+@@ -49,6 +49,7 @@ public:
private:
- WebContextMenuProxyWin(WebPageProxy&, ContextMenuContextData&&, const UserData&);
+ WebContextMenuProxyWin(WebPageProxy&, FrameInfoData&&, ContextMenuContextData&&, const UserData&);
void showContextMenuWithItems(Vector<Ref<WebContextMenuItem>>&&) override;
+ void hide() override;
HMENU m_menu;
- };
+ FrameInfoData m_frameInfo;
diff --git a/Source/WebKit/UIProcess/win/WebPageInspectorEmulationAgentWin.cpp b/Source/WebKit/UIProcess/win/WebPageInspectorEmulationAgentWin.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..df55ee613ec085cb85ed12b45deff3a1b046861c
@@ -19994,17 +19871,14 @@ index 0000000000000000000000000000000000000000..8b474c730139b44a13c9d5b2d13ee204
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/win/WebView.cpp b/Source/WebKit/UIProcess/win/WebView.cpp
-index 8b521de62266d4a7fad3624b548401a4c8056f9f..c6da98e334fbd090a8c63b690afb25697ac344d7 100644
+index 5180da3ec22d56e8a9520e31cad076d86ae5be9f..f01be74573843e7b374c34035c09f114bdc7349c 100644
--- a/Source/WebKit/UIProcess/win/WebView.cpp
+++ b/Source/WebKit/UIProcess/win/WebView.cpp
-@@ -556,9 +556,8 @@ LRESULT WebView::onSizeEvent(HWND hwnd, UINT, WPARAM, LPARAM lParam, bool& handl
- {
+@@ -576,7 +576,7 @@ LRESULT WebView::onSizeEvent(HWND hwnd, UINT, WPARAM, LPARAM lParam, bool& handl
+ float intrinsicDeviceScaleFactor = deviceScaleFactorForWindow(hwnd);
if (m_page)
- m_page->setIntrinsicDeviceScaleFactor(deviceScaleFactorForWindow(hwnd));
-- // If there are no m_page, use intrinsic device scale factor.
-- float deviceScaleFactor = m_page ? m_page->deviceScaleFactor() : deviceScaleFactorForWindow(hwnd);
-- m_viewSize = expandedIntSize(FloatSize(LOWORD(lParam), HIWORD(lParam)) / deviceScaleFactor);
-+
+ 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()) {
@@ -20057,10 +19931,10 @@ index 0000000000000000000000000000000000000000..24da079059ed4a45131e18d7fbf56a29
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.cpp b/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..adec63a0a9d6d67bdbdadb4024005ff97ce79d10
+index 0000000000000000000000000000000000000000..7df77e30c2e7303dc6aaad560434e5b8e35f4f3c
--- /dev/null
+++ b/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.cpp
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2015 Igalia S.L.
+ *
@@ -20089,8 +19963,6 @@ index 0000000000000000000000000000000000000000..adec63a0a9d6d67bdbdadb4024005ff9
+#include "config.h"
+#include "WebColorPickerWPE.h"
+
-+#if ENABLE(INPUT_TYPE_COLOR)
-+
+#include "WebPageProxy.h"
+
+namespace WebKit {
@@ -20120,14 +19992,12 @@ index 0000000000000000000000000000000000000000..adec63a0a9d6d67bdbdadb4024005ff9
+}
+
+} // namespace WebKit
-+
-+#endif // ENABLE(INPUT_TYPE_COLOR)
diff --git a/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.h b/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.h
new file mode 100644
-index 0000000000000000000000000000000000000000..7edc93b3873dd42a7f877626551ec994395baae9
+index 0000000000000000000000000000000000000000..da58334235809cfed62e90150784bf2506f7a8f2
--- /dev/null
+++ b/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.h
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2015 Igalia S.L.
+ *
@@ -20156,8 +20026,6 @@ index 0000000000000000000000000000000000000000..7edc93b3873dd42a7f877626551ec994
+#ifndef WebColorPickerWPE_h
+#define WebColorPickerWPE_h
+
-+#if ENABLE(INPUT_TYPE_COLOR)
-+
+#include "WebColorPicker.h"
+
+typedef struct _GtkColorChooser GtkColorChooser;
@@ -20183,8 +20051,125 @@ index 0000000000000000000000000000000000000000..7edc93b3873dd42a7f877626551ec994
+
+} // namespace WebKit
+
-+#endif // ENABLE(INPUT_TYPE_COLOR)
+#endif // WebColorPickerWPE_h
+diff --git a/Source/WebKit/UIProcess/wpe/WebDataListSuggestionsDropdownWPE.cpp b/Source/WebKit/UIProcess/wpe/WebDataListSuggestionsDropdownWPE.cpp
+new file mode 100644
+index 0000000000000000000000000000000000000000..694eb24db4a407553da12fb0a25d8963fd0ef6ac
+--- /dev/null
++++ b/Source/WebKit/UIProcess/wpe/WebDataListSuggestionsDropdownWPE.cpp
+@@ -0,0 +1,55 @@
++/*
++ * Copyright (C) 2019 Igalia S.L.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
++ * THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#include "config.h"
++#include "WebDataListSuggestionsDropdownWPE.h"
++
++#include "WebPageProxy.h"
++#include <WebCore/DataListSuggestionInformation.h>
++
++namespace WebKit {
++
++WebDataListSuggestionsDropdownWPE::WebDataListSuggestionsDropdownWPE(WebPageProxy& page)
++ : WebDataListSuggestionsDropdown(page)
++{
++}
++
++WebDataListSuggestionsDropdownWPE::~WebDataListSuggestionsDropdownWPE()
++{
++}
++
++void WebDataListSuggestionsDropdownWPE::show(WebCore::DataListSuggestionInformation&& information)
++{
++}
++
++void WebDataListSuggestionsDropdownWPE::handleKeydownWithIdentifier(const String& key)
++{
++}
++
++void WebDataListSuggestionsDropdownWPE::close()
++{
++}
++
++} // namespace WebKit
+diff --git a/Source/WebKit/UIProcess/wpe/WebDataListSuggestionsDropdownWPE.h b/Source/WebKit/UIProcess/wpe/WebDataListSuggestionsDropdownWPE.h
+new file mode 100644
+index 0000000000000000000000000000000000000000..5d4b0d204b7dc564564d2126e9f256fa4f4bd6f6
+--- /dev/null
++++ b/Source/WebKit/UIProcess/wpe/WebDataListSuggestionsDropdownWPE.h
+@@ -0,0 +1,51 @@
++/*
++ * Copyright (C) 2019 Igalia S.L.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
++ * THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#pragma once
++
++#include "WebDataListSuggestionsDropdown.h"
++
++namespace WebKit {
++
++class WebPageProxy;
++
++class WebDataListSuggestionsDropdownWPE final : public WebDataListSuggestionsDropdown {
++public:
++ static Ref<WebDataListSuggestionsDropdown> create(WebPageProxy& page)
++ {
++ return adoptRef(*new WebDataListSuggestionsDropdownWPE(page));
++ }
++
++ ~WebDataListSuggestionsDropdownWPE();
++
++private:
++ WebDataListSuggestionsDropdownWPE(WebPageProxy&);
++
++ void show(WebCore::DataListSuggestionInformation&&) final;
++ void handleKeydownWithIdentifier(const String&) final;
++ void close() final;
++};
++
++} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/wpe/WebDateTimePickerWPE.cpp b/Source/WebKit/UIProcess/wpe/WebDateTimePickerWPE.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a44463faf011fbab08f87bb7007a5e71c2a73758
@@ -20305,10 +20290,10 @@ index 0000000000000000000000000000000000000000..0c0e3fce33b06ee72c4c29d2a4abe964
+#endif // ENABLE(DATE_AND_TIME_INPUT_TYPES)
diff --git a/Source/WebKit/UIProcess/wpe/WebPageInspectorEmulationAgentWPE.cpp b/Source/WebKit/UIProcess/wpe/WebPageInspectorEmulationAgentWPE.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..5dc76aa302cb574307059e66a1b73730efe920da
+index 0000000000000000000000000000000000000000..182398f24909cbc42cac897d66546991f46c1d5d
--- /dev/null
+++ b/Source/WebKit/UIProcess/wpe/WebPageInspectorEmulationAgentWPE.cpp
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2019 Microsoft Corporation.
+ *
@@ -20337,6 +20322,7 @@ index 0000000000000000000000000000000000000000..5dc76aa302cb574307059e66a1b73730
+#include "config.h"
+#include "WebPageInspectorEmulationAgent.h"
+
++#include "DrawingAreaProxyCoordinatedGraphics.h"
+#include "WebPageProxy.h"
+#include <wpe/wpe.h>
+
@@ -20344,9 +20330,20 @@ index 0000000000000000000000000000000000000000..5dc76aa302cb574307059e66a1b73730
+
+void WebPageInspectorEmulationAgent::platformSetSize(int width, int height, Function<void (const String& error)>&& callback)
+{
++ WebCore::IntSize viewSize(width, height);
++ if (m_page.viewSize() == viewSize) {
++ callback(String());
++ return;
++ }
++
+ struct wpe_view_backend* backend = m_page.viewBackend();
-+ wpe_view_backend_dispatch_set_size(backend, width, height);
-+ callback(String());
++ wpe_view_backend_dispatch_set_size(backend, viewSize.width(), viewSize.height());
++ if (auto* drawingArea = static_cast<DrawingAreaProxyCoordinatedGraphics*>(m_page.drawingArea())) {
++ drawingArea->waitForSizeUpdate([callback = WTFMove(callback)](const DrawingAreaProxyCoordinatedGraphics&) mutable {
++ callback(String());
++ });
++ } else
++ callback(String());
+}
+
+} // namespace WebKit
@@ -20426,24 +20423,11 @@ index 9b688ad328317fea4fd96ce66e9714bad8f0f937..402a36a9c565e13ec298aa7f014f0d92
}
} // namespace WebKit
-diff --git a/Source/WebKit/UnifiedSources-output.xcfilelist b/Source/WebKit/UnifiedSources-output.xcfilelist
-index c103a90e720933a10b736194139973f16c33551a..d0985c9258b3e19701498f7cbf4d0add3c584b8c 100644
---- a/Source/WebKit/UnifiedSources-output.xcfilelist
-+++ b/Source/WebKit/UnifiedSources-output.xcfilelist
-@@ -55,6 +55,8 @@ $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/unified-sources/UnifiedSource134.cpp
- $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/unified-sources/UnifiedSource135.cpp
- $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/unified-sources/UnifiedSource136.cpp
- $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/unified-sources/UnifiedSource137.cpp
-+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/unified-sources/UnifiedSource138.cpp
-+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/unified-sources/UnifiedSource139.cpp
- $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/unified-sources/UnifiedSource14-mm.mm
- $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/unified-sources/UnifiedSource14.cpp
- $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/unified-sources/UnifiedSource15-mm.mm
diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
-index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f06450ee9 100644
+index 53f900a15956048fd25f9b0d54d6b74580612abb..133eaf568fa054d93ebf3a41e8f78b02fb0a39f7 100644
--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
-@@ -1527,6 +1527,7 @@
+@@ -1542,6 +1542,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 */; };
@@ -20451,7 +20435,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
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 */; };
-@@ -2301,6 +2302,18 @@
+@@ -2323,6 +2324,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 */; };
@@ -20470,7 +20454,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
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, ); }; };
-@@ -2392,6 +2405,8 @@
+@@ -2422,6 +2435,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 */; };
@@ -20479,26 +20463,17 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
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 */; };
-@@ -2415,6 +2430,9 @@
- EBA8D3B727A5E33F00CB7900 /* PushServiceConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = EBA8D3B127A5E33F00CB7900 /* PushServiceConnection.mm */; };
- EBDF51D12C8FBC4700EA1376 /* WebsitePushAndNotificationsEnabledPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = EBDF51CF2C8FBC4700EA1376 /* WebsitePushAndNotificationsEnabledPolicy.h */; };
+@@ -2447,6 +2462,9 @@
ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ EEFE72792D64FE5600DC6214 /* StageModeInteractionState.h in Headers */ = {isa = PBXBuildFile; fileRef = EEFE72782D64FE5600DC6214 /* StageModeInteractionState.h */; };
+ F404455C2D5CFB56000E587E /* AppKitSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = F404455A2D5CFB56000E587E /* AppKitSoftLink.h */; };
+ F303B849249A8D640031DE5C /* ScreencastEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = F303B848249A8D3A0031DE5C /* ScreencastEncoder.h */; };
+ F33C7AC7249AD79C0018BE41 /* libwebrtc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F33C7AC6249AD79C0018BE41 /* libwebrtc.dylib */; };
+ F3867F0A24607D4E008F0F31 /* InspectorScreencastAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3867F0424607D2B008F0F31 /* InspectorScreencastAgent.h */; };
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, ); }; };
-@@ -2518,6 +2536,8 @@
- FAE61CE82D0A5608000D238D /* UnifiedSource136.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAE61CE12D0A5606000D238D /* UnifiedSource136.cpp */; };
- FAE61CE92D0A5608000D238D /* UnifiedSource133.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAE61CE22D0A5607000D238D /* UnifiedSource133.cpp */; };
- FAE61CEA2D0A5608000D238D /* UnifiedSource137.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAE61CE32D0A5607000D238D /* UnifiedSource137.cpp */; };
-+ FAE61CED2D0A5608000D238D /* UnifiedSource138.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAE61CE62D0A5607000D238D /* UnifiedSource138.cpp */; };
-+ FAE61CEE2D0A5608000D238D /* UnifiedSource139.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAE61CE72D0A5607000D238D /* UnifiedSource139.cpp */; };
- FAE61CEB2D0A5608000D238D /* UnifiedSource135.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAE61CE42D0A5607000D238D /* UnifiedSource135.cpp */; };
- FAE61CEC2D0A5608000D238D /* UnifiedSource131.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAE61CE52D0A5607000D238D /* UnifiedSource131.cpp */; };
- FAF27D302D2851EB00F1F0BB /* CoreIPCPKSecureElementPass.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAF27D2F2D2850D400F1F0BB /* CoreIPCPKSecureElementPass.mm */; };
-@@ -6228,6 +6248,7 @@
+@@ -6307,6 +6325,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>"; };
@@ -20506,7 +20481,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
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>"; };
-@@ -7926,6 +7947,19 @@
+@@ -8025,6 +8044,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>"; };
@@ -20526,7 +20501,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
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>"; };
-@@ -8091,6 +8125,8 @@
+@@ -8198,6 +8230,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>"; };
@@ -20535,10 +20510,10 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
E5DEFA6726F8F42600AB68DB /* PhotosUISPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PhotosUISPI.h; sourceTree = "<group>"; };
EB0D312D275AE13300863D8F /* com.apple.webkit.webpushd.mac.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = com.apple.webkit.webpushd.mac.plist; sourceTree = "<group>"; };
EB0D312E275AE13300863D8F /* com.apple.webkit.webpushd.ios.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = com.apple.webkit.webpushd.ios.plist; sourceTree = "<group>"; };
-@@ -8124,6 +8160,14 @@
- ECA680D31E6904B500731D20 /* ExtraPrivateSymbolsForTAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtraPrivateSymbolsForTAPI.h; sourceTree = "<group>"; };
- ECBFC1DB1E6A4D66000300C7 /* ExtraPublicSymbolsForTAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtraPublicSymbolsForTAPI.h; sourceTree = "<group>"; };
+@@ -8234,6 +8268,14 @@
F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = "<group>"; };
+ 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>"; };
+ F303B847249A8D3A0031DE5C /* ScreencastEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScreencastEncoder.cpp; sourceTree = "<group>"; };
+ F303B848249A8D3A0031DE5C /* ScreencastEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreencastEncoder.h; sourceTree = "<group>"; };
+ F31E2DA424C76E4B004B2775 /* WebMFileWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMFileWriter.cpp; sourceTree = "<group>"; };
@@ -20550,16 +20525,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
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>"; };
-@@ -8351,6 +8395,8 @@
- FAE61CE32D0A5607000D238D /* UnifiedSource137.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource137.cpp; sourceTree = "<group>"; };
- FAE61CE42D0A5607000D238D /* UnifiedSource135.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource135.cpp; sourceTree = "<group>"; };
- FAE61CE52D0A5607000D238D /* UnifiedSource131.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource131.cpp; sourceTree = "<group>"; };
-+ FAE61CE62D0A5607000D238D /* UnifiedSource138.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource138.cpp; sourceTree = "<group>"; };
-+ FAE61CE72D0A5607000D238D /* UnifiedSource139.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource139.cpp; sourceTree = "<group>"; };
- FAF27D2E2D2850D400F1F0BB /* CoreIPCPKSecureElementPass.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreIPCPKSecureElementPass.h; sourceTree = "<group>"; };
- FAF27D2F2D2850D400F1F0BB /* CoreIPCPKSecureElementPass.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CoreIPCPKSecureElementPass.mm; sourceTree = "<group>"; };
- FED3C1DA1B447AE800E0EB7F /* APISerializedScriptValueCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = APISerializedScriptValueCocoa.mm; sourceTree = "<group>"; };
-@@ -8467,6 +8513,7 @@
+@@ -8592,6 +8634,7 @@
3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */,
3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */,
7B9FC5BB28A5233B007570E7 /* libWebKitPlatform.a in Frameworks */,
@@ -20567,16 +20533,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */,
37694525184FC6B600CDE21F /* Security.framework in Frameworks */,
37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */,
-@@ -11055,6 +11102,8 @@
- FAE61CE42D0A5607000D238D /* UnifiedSource135.cpp */,
- FAE61CE12D0A5606000D238D /* UnifiedSource136.cpp */,
- FAE61CE32D0A5607000D238D /* UnifiedSource137.cpp */,
-+ FAE61CE62D0A5607000D238D /* UnifiedSource138.cpp */,
-+ FAE61CE72D0A5607000D238D /* UnifiedSource139.cpp */,
- );
- path = "unified-sources";
- sourceTree = "<group>";
-@@ -11516,6 +11565,7 @@
+@@ -11661,6 +11704,7 @@
99788ACA1F421DCA00C08000 /* _WKAutomationSessionConfiguration.mm */,
990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */,
990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */,
@@ -20584,7 +20541,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
5C4609E222430E4C009943C2 /* _WKContentRuleListAction.h */,
5C4609E322430E4D009943C2 /* _WKContentRuleListAction.mm */,
5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */,
-@@ -12864,6 +12914,7 @@
+@@ -13028,6 +13072,7 @@
E34B110C27C46BC6006D2F2E /* libWebCoreTestShim.dylib */,
E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */,
DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */,
@@ -20592,7 +20549,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
57A9FF15252C6AEF006A2040 /* libWTF.a */,
5750F32A2032D4E500389347 /* LocalAuthentication.framework */,
570DAAB0230273D200E8FC04 /* NearField.framework */,
-@@ -13437,6 +13488,12 @@
+@@ -13609,6 +13654,12 @@
children = (
9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */,
9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */,
@@ -20605,7 +20562,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
);
path = Agents;
sourceTree = "<group>";
-@@ -13445,6 +13502,7 @@
+@@ -13617,6 +13668,7 @@
isa = PBXGroup;
children = (
A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */,
@@ -20613,7 +20570,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */,
99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */,
99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */,
-@@ -14162,6 +14220,7 @@
+@@ -14353,6 +14405,7 @@
E1513C65166EABB200149FCB /* AuxiliaryProcessProxy.h */,
46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */,
46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */,
@@ -20621,7 +20578,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
5C6D69352AC3935D0099BDAF /* BrowsingContextGroup.cpp */,
5C6D69362AC3935D0099BDAF /* BrowsingContextGroup.h */,
5CA98549210BEB5A0057EB6B /* BrowsingWarning.h */,
-@@ -14186,6 +14245,8 @@
+@@ -14377,6 +14430,8 @@
BC06F43912DBCCFB002D78DE /* GeolocationPermissionRequestProxy.cpp */,
BC06F43812DBCCFB002D78DE /* GeolocationPermissionRequestProxy.h */,
2DD5A72A1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h */,
@@ -20630,15 +20587,15 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */,
5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */,
31607F3819627002009B87DA /* LegacySessionStateCoding.h */,
-@@ -14219,6 +14280,7 @@
+@@ -14410,6 +14465,7 @@
1A0C227D2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm */,
1AEE57232409F142002005D6 /* QuickLookThumbnailLoader.h */,
1AEE57242409F142002005D6 /* QuickLookThumbnailLoader.mm */,
+ D71A94392370F060002C4D9E /* RemoteInspectorPipe.h */,
5CCB54DC2A4FEA6A0005FAA8 /* RemotePageDrawingAreaProxy.cpp */,
5CCB54DB2A4FEA6A0005FAA8 /* RemotePageDrawingAreaProxy.h */,
- 5C907E9A294D507100B3402D /* RemotePageProxy.cpp */,
-@@ -14319,6 +14381,8 @@
+ FABBBC802D35AC6800820017 /* RemotePageFullscreenManagerProxy.cpp */,
+@@ -14512,6 +14568,8 @@
BC7B6204129A0A6700D174A4 /* WebPageGroup.h */,
2D9EA3101A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp */,
2D9EA30E1A96CBFF002D2807 /* WebPageInjectedBundleClient.h */,
@@ -20647,7 +20604,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
9B7F8A502C785725000057F3 /* WebPageLoadTiming.h */,
BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */,
BC032DCB10F4389F0058C15A /* WebPageProxy.h */,
-@@ -14497,6 +14561,7 @@
+@@ -14690,6 +14748,7 @@
BC646C1911DD399F006455B0 /* WKBackForwardListItemRef.h */,
BC646C1611DD399F006455B0 /* WKBackForwardListRef.cpp */,
BC646C1711DD399F006455B0 /* WKBackForwardListRef.h */,
@@ -20655,7 +20612,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
BCB9E24A1120E15C00A137E0 /* WKContext.cpp */,
BCB9E2491120E15C00A137E0 /* WKContext.h */,
1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */,
-@@ -15074,6 +15139,9 @@
+@@ -15265,6 +15324,9 @@
07EF07592745A8160066EA04 /* DisplayCaptureSessionManager.h */,
07EF07582745A8160066EA04 /* DisplayCaptureSessionManager.mm */,
7AFA6F682A9F57C50055322A /* DisplayLinkMac.cpp */,
@@ -20665,7 +20622,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */,
0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */,
0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */,
-@@ -15097,6 +15165,8 @@
+@@ -15288,6 +15350,8 @@
E568B92120A3AC6A00E3C856 /* WebDataListSuggestionsDropdownMac.mm */,
E55CD20124D09F1F0042DB9C /* WebDateTimePickerMac.h */,
E55CD20224D09F1F0042DB9C /* WebDateTimePickerMac.mm */,
@@ -20674,7 +20631,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
BC857E8512B71EBB00EDEB2E /* WebPageProxyMac.mm */,
BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */,
BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */,
-@@ -16161,6 +16231,7 @@
+@@ -16361,6 +16425,7 @@
99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */,
990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */,
990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */,
@@ -20682,7 +20639,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */,
5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */,
9B4CE9512CD99B7C00351173 /* _WKContentWorldConfiguration.h in Headers */,
-@@ -16470,6 +16541,7 @@
+@@ -16669,6 +16734,7 @@
E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */,
4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */,
1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */,
@@ -20690,7 +20647,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
5CA9854A210BEB640057EB6B /* BrowsingWarning.h in Headers */,
A7E69BCC2B2117A100D43D3F /* BufferAndBackendInfo.h in Headers */,
BC3065FA1259344E00E71278 /* CacheModel.h in Headers */,
-@@ -16654,7 +16726,11 @@
+@@ -16853,7 +16919,11 @@
BC14DF77120B5B7900826C0C /* InjectedBundleScriptWorld.h in Headers */,
CE550E152283752200D28791 /* InsertTextOptions.h in Headers */,
9197940523DBC4BB00257892 /* InspectorBrowserAgent.h in Headers */,
@@ -20702,7 +20659,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */,
C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */,
2D4D2C811DF60BF3002EB10C /* InteractionInformationRequest.h in Headers */,
-@@ -16915,6 +16991,7 @@
+@@ -17115,6 +17185,7 @@
0F6E7C532C4C386800F1DB85 /* RemoteDisplayListRecorderMessages.h in Headers */,
F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */,
A78A5FE42B0EB39E005036D3 /* RemoteImageBufferSetIdentifier.h in Headers */,
@@ -20710,7 +20667,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */,
2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */,
1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */,
-@@ -16970,6 +17047,7 @@
+@@ -17170,6 +17241,7 @@
E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */,
E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */,
7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */,
@@ -20718,7 +20675,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
463BB93A2B9D08D80098C5C3 /* ScriptMessageHandlerIdentifier.h in Headers */,
F4E28A362C923814008120DD /* ScriptTelemetry.h in Headers */,
E4D54D0421F1D72D007E3C36 /* ScrollingTreeFrameScrollingNodeRemoteIOS.h in Headers */,
-@@ -17323,6 +17401,8 @@
+@@ -17530,6 +17602,8 @@
939EF87029D112EE00F23AEE /* WebPageInlines.h in Headers */,
9197940823DBC4CB00257892 /* WebPageInspectorAgentBase.h in Headers */,
A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */,
@@ -20727,7 +20684,7 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
A543E30C215C8A8D00279CD9 /* WebPageInspectorTarget.h in Headers */,
A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */,
A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */,
-@@ -19761,7 +19841,43 @@
+@@ -20064,7 +20138,43 @@
522F792928D50EBB0069B45B /* HidService.mm in Sources */,
2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */,
2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */,
@@ -20771,18 +20728,9 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
1C5DC45F2909B05A0061EC62 /* JSWebExtensionWrapperCocoa.mm in Sources */,
C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */,
C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */,
-@@ -20010,6 +20126,8 @@
- FAE61CEB2D0A5608000D238D /* UnifiedSource135.cpp in Sources */,
- FAE61CE82D0A5608000D238D /* UnifiedSource136.cpp in Sources */,
- FAE61CEA2D0A5608000D238D /* UnifiedSource137.cpp in Sources */,
-+ FAE61CED2D0A5608000D238D /* UnifiedSource138.cpp in Sources */,
-+ FAE61CEE2D0A5608000D238D /* UnifiedSource139.cpp in Sources */,
- 078B04442CF1149200B453A6 /* URLSchemeHandler.swift in Sources */,
- 078B04B62CF2B4D300B453A6 /* View+WebViewModifiers.swift in Sources */,
- 52CDC5C62731DA0D00A3E3EB /* VirtualAuthenticatorManager.cpp in Sources */,
-@@ -20117,6 +20235,8 @@
+@@ -20425,6 +20535,8 @@
+ 074E87E12CF8EA3D0059E469 /* WebPage+NavigationDeciding.swift in Sources */,
078B04A02CF18EAB00B453A6 /* WebPage+NavigationPreferences.swift in Sources */,
- 07A58C882D068CAE00CAB4ED /* WebPage+SwiftUI.swift in Sources */,
07CB79962CE9435700199C49 /* WebPage.swift in Sources */,
+ D79902B1236E9404005D6F7E /* WebPageInspectorEmulationAgentMac.mm in Sources */,
+ D79902B3236E9404005D6F7E /* WebPageInspectorInputAgentMac.mm in Sources */,
@@ -20790,10 +20738,10 @@ index 02610cb75b88760c441c0532a97fb0cb2eb838c6..01b5efc4a8013bef8e6bad79a0bb277f
7CEB00DD1FA69ABE0065473B /* WebPreferencesFeatures.cpp in Sources */,
7CF1907125338F3800ABE183 /* WebPreferencesGetterSetters.cpp in Sources */,
diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
-index 0037482f26f39ef4404dd660091b9be1c92c7b91..ae3523342a8cc44d9add5358171141b2d994a878 100644
+index ac0032c3bf918b6dcadd21c18700f1adb74e9a78..4f55fe73551265aa22f743e7ec006e2c9b213463 100644
--- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
+++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
-@@ -248,6 +248,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
+@@ -247,6 +247,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
}
#endif
@@ -20805,7 +20753,7 @@ index 0037482f26f39ef4404dd660091b9be1c92c7b91..ae3523342a8cc44d9add5358171141b2
#if ENABLE(PDFJS)
if (tryLoadingUsingPDFJSHandler(resourceLoader, trackingParameters))
return;
-@@ -257,12 +262,16 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
+@@ -256,12 +261,16 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
return;
if (InspectorInstrumentationWebKit::shouldInterceptRequest(resourceLoader)) {
@@ -20828,7 +20776,7 @@ index 0037482f26f39ef4404dd660091b9be1c92c7b91..ae3523342a8cc44d9add5358171141b2
}
WEBLOADERSTRATEGY_RELEASE_LOG_FORWARDABLE(WEBLOADERSTRATEGY_SCHEDULELOAD);
-@@ -382,7 +391,8 @@ static void addParametersShared(const LocalFrame* frame, NetworkResourceLoadPara
+@@ -383,7 +392,8 @@ static void addParametersShared(const LocalFrame* frame, NetworkResourceLoadPara
parameters.linkPreconnectEarlyHintsEnabled = mainFrame->settings().linkPreconnectEarlyHintsEnabled();
}
@@ -20838,8 +20786,12 @@ index 0037482f26f39ef4404dd660091b9be1c92c7b91..ae3523342a8cc44d9add5358171141b2
{
auto identifier = *resourceLoader.identifier();
-@@ -397,7 +407,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
- RunLoop::main().dispatch([resourceLoader = Ref { resourceLoader }, error = blockedError(request)] {
+@@ -395,10 +405,10 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+ && resourceLoader.frameLoader()->notifier().isInitialRequestIdentifier(identifier)
+ ? MainFrameMainResource::Yes : MainFrameMainResource::No;
+ if (!page->allowsLoadFromURL(request.url(), mainFrameMainResource)) {
+- RunLoop::protectedMain()->dispatch([resourceLoader = Ref { resourceLoader }, error = blockedError(request)] {
++ RunLoop::protectedMain()->dispatch([resourceLoader = Ref { resourceLoader }, error = platformStrategies()->loaderStrategy()->blockedError(request)] {
resourceLoader->didFail(error);
});
- return;
@@ -20847,7 +20799,7 @@ index 0037482f26f39ef4404dd660091b9be1c92c7b91..ae3523342a8cc44d9add5358171141b2
}
}
-@@ -407,7 +417,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -408,7 +418,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);
@@ -20855,7 +20807,7 @@ index 0037482f26f39ef4404dd660091b9be1c92c7b91..ae3523342a8cc44d9add5358171141b2
loadParameters.identifier = identifier;
loadParameters.webPageProxyID = trackingParameters.webPageProxyID;
loadParameters.webPageID = trackingParameters.pageID;
-@@ -497,14 +506,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -499,14 +508,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
if (loadParameters.options.mode != FetchOptions::Mode::Navigate) {
ASSERT(loadParameters.sourceOrigin);
@@ -20869,11 +20821,11 @@ index 0037482f26f39ef4404dd660091b9be1c92c7b91..ae3523342a8cc44d9add5358171141b2
}
- loadParameters.shouldRestrictHTTPResponseAccess = shouldPerformSecurityChecks();
-+ loadParameters.shouldRestrictHTTPResponseAccess = DeprecatedGlobalSettings::restrictedHTTPResponseAccess();
++ loadParameters.shouldRestrictHTTPResponseAccess = true;
loadParameters.isMainFrameNavigation = isMainFrameNavigation;
if (loadParameters.isMainFrameNavigation && document)
-@@ -545,6 +551,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -547,6 +553,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
}
ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials);
@@ -20891,7 +20843,7 @@ index 0037482f26f39ef4404dd660091b9be1c92c7b91..ae3523342a8cc44d9add5358171141b2
std::optional<NetworkResourceLoadIdentifier> existingNetworkResourceLoadIdentifierToResume;
if (loadParameters.isMainFrameNavigation)
-@@ -560,7 +577,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -562,7 +579,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
}
auto loader = WebResourceLoader::create(resourceLoader, trackingParameters);
@@ -20900,7 +20852,7 @@ index 0037482f26f39ef4404dd660091b9be1c92c7b91..ae3523342a8cc44d9add5358171141b2
}
void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader)
-@@ -970,7 +987,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier
+@@ -966,7 +983,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier
bool WebLoaderStrategy::isOnLine() const
{
@@ -20909,7 +20861,7 @@ index 0037482f26f39ef4404dd660091b9be1c92c7b91..ae3523342a8cc44d9add5358171141b2
}
void WebLoaderStrategy::addOnlineStateChangeListener(Function<void(bool)>&& listener)
-@@ -997,6 +1014,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet
+@@ -993,6 +1010,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet
void WebLoaderStrategy::setOnLineState(bool isOnLine)
{
@@ -20921,7 +20873,7 @@ index 0037482f26f39ef4404dd660091b9be1c92c7b91..ae3523342a8cc44d9add5358171141b2
if (m_isOnLine == isOnLine)
return;
-@@ -1005,6 +1027,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine)
+@@ -1001,6 +1023,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine)
listener(isOnLine);
}
@@ -20935,7 +20887,7 @@ index 0037482f26f39ef4404dd660091b9be1c92c7b91..ae3523342a8cc44d9add5358171141b2
{
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 a835521fae8043c1c3d6202288b0c3a9f92aa81b..0c8bee6c0a02e6adb1b9e56d77613253111fffd2 100644
+index dc88916914daebf7c421dc56c2be70fd47727a96..829fdad0490a5e4db8822fbc48c5f19a2c2e0703 100644
--- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h
+++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h
@@ -44,6 +44,7 @@ struct FetchOptions;
@@ -20956,7 +20908,7 @@ index a835521fae8043c1c3d6202288b0c3a9f92aa81b..0c8bee6c0a02e6adb1b9e56d77613253
void setExistingNetworkResourceLoadIdentifierToResume(std::optional<NetworkResourceLoadIdentifier> existingNetworkResourceLoadIdentifierToResume) { m_existingNetworkResourceLoadIdentifierToResume = existingNetworkResourceLoadIdentifierToResume; }
-@@ -149,6 +153,7 @@ private:
+@@ -164,6 +168,7 @@ private:
Vector<Function<void(bool)>> m_onlineStateChangeListeners;
std::optional<NetworkResourceLoadIdentifier> m_existingNetworkResourceLoadIdentifierToResume;
bool m_isOnLine { true };
@@ -20965,20 +20917,20 @@ index a835521fae8043c1c3d6202288b0c3a9f92aa81b..0c8bee6c0a02e6adb1b9e56d77613253
} // namespace WebKit
diff --git a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
-index 069e870734e40672966b7ee5853a5469de826c40..ddeca40ad670d397f07d9064cfe90caefcdaaa5a 100644
+index f0c21a35614b000e0a835ef4a4038feb0224842b..f9aecb9ed77192c00a3173521f72bd840ea6b571 100644
--- a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
+++ b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
-@@ -188,9 +188,6 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
- }
+@@ -202,9 +202,6 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
- m_coreLoader->didReceiveResponse(inspectorResponse, [this, protectedThis = WTFMove(protectedThis), interceptedRequestIdentifier, policyDecisionCompletionHandler = WTFMove(policyDecisionCompletionHandler), overrideData = WTFMove(overrideData)]() mutable {
+ coreLoader->didReceiveResponse(inspectorResponse, [this, protectedThis = Ref { *this }, interceptedRequestIdentifier, policyDecisionCompletionHandler = WTFMove(policyDecisionCompletionHandler), overrideData = WTFMove(overrideData)]() mutable {
+ RefPtr coreLoader = m_coreLoader;
- if (policyDecisionCompletionHandler)
- policyDecisionCompletionHandler();
-
- if (!m_coreLoader || !m_coreLoader->identifier()) {
+ if (!m_coreLoader || !coreLoader->identifier()) {
m_interceptController.continueResponse(interceptedRequestIdentifier);
return;
-@@ -208,6 +205,8 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
+@@ -221,6 +218,8 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
}
});
});
@@ -20988,10 +20940,10 @@ index 069e870734e40672966b7ee5853a5469de826c40..ddeca40ad670d397f07d9064cfe90cae
}
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
-index 5806d017fb7aedd8c6540c7868440f18994e6239..779ab16cd8004f47348c7e5acf6b18eeeefd7141 100644
+index 33b01034cea7fc023ba4bef55142ae2700d5e48c..0b0236832df43047a7808af0d422a4572231dc5e 100644
--- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
-@@ -481,6 +481,8 @@ void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel lev
+@@ -490,6 +490,8 @@ void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel lev
{
// Notify the bundle client.
auto page = protectedPage();
@@ -21154,7 +21106,7 @@ index 0000000000000000000000000000000000000000..226b3bf6bd83d2606a0aeb627ae9302f
+
+#endif // ENABLE(DRAG_SUPPORT)
diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
-index 85e70183ddc4805c835b4ffc5daf40ca930536de..2483f638a31d96345993f824a3b5967379bab103 100644
+index ac7fa01ba9a3828cf4c48cacc862aab95145093e..3246812f8ebb8833b2172f9f5f00dff6053387c9 100644
--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
@@ -39,6 +39,7 @@
@@ -21165,7 +21117,7 @@ index 85e70183ddc4805c835b4ffc5daf40ca930536de..2483f638a31d96345993f824a3b59673
#include <WebCore/LocalFrame.h>
#include <WebCore/LocalFrameView.h>
#include <WebCore/Page.h>
-@@ -565,6 +566,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay
+@@ -562,6 +563,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay
m_scrollOffset = IntSize();
m_displayTimer.stop();
m_isWaitingForDidUpdate = false;
@@ -21177,7 +21129,7 @@ index 85e70183ddc4805c835b4ffc5daf40ca930536de..2483f638a31d96345993f824a3b59673
}
void DrawingAreaCoordinatedGraphics::sendEnterAcceleratedCompositingModeIfNeeded()
-@@ -622,6 +628,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode()
+@@ -619,6 +625,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode()
// UI process, we still need to let it know about the new contents, so send an Update message.
send(Messages::DrawingAreaProxy::Update(0, WTFMove(updateInfo)));
}
@@ -21190,10 +21142,10 @@ index 85e70183ddc4805c835b4ffc5daf40ca930536de..2483f638a31d96345993f824a3b59673
void DrawingAreaCoordinatedGraphics::scheduleDisplay()
diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-index 815e10e285c0f88d7bc3a70fe71f07106873cb30..75cd3642c43c506afd814014f5d31dff8c260578 100644
+index f19473587ec9f1ce8fb2e249feaf1e45b0ec1b80..0908807628b0f96925d3b669b6962f3553f422ca 100644
--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-@@ -135,6 +135,7 @@ public:
+@@ -138,6 +138,7 @@ public:
#if PLATFORM(WPE) && USE(GBM) && ENABLE(WPE_PLATFORM)
void preferredBufferFormatsDidChange();
#endif
@@ -21201,26 +21153,8 @@ index 815e10e285c0f88d7bc3a70fe71f07106873cb30..75cd3642c43c506afd814014f5d31dff
private:
void updateRootLayer();
WebCore::FloatRect visibleContentsRect() const;
-diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp
-index 99cecc2252ea05a81acf42281225c7000cda0509..91c967238b6b359e1c96663d95550c5ba7728386 100644
---- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp
-+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp
-@@ -296,7 +296,13 @@ void ThreadedCompositor::renderLayerTree()
- // and similarly all GL operations are done inside that specific scope.
-
- if (needsResize)
-+#if PLATFORM(WPE)
-+ RunLoop::main().dispatch([this, protectedThis = Ref { *this }, viewportSize] {
-+ m_surface->clientResize(viewportSize);
-+ });
-+#else
- m_surface->clientResize(viewportSize);
-+#endif
-
- m_surface->willRenderFrame();
- RunLoop::main().dispatch([this, protectedThis = Ref { *this }] {
diff --git a/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp b/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp
-index 428e10e8311dfb3201439688f5ad35a4d609b95c..b03ccee5c7057875092607d01b72265d63a2cfd9 100644
+index 5ba445d43ad37ff55f239660cddeada7abe2a6e8..ee3bfd8a34d4e7ea4d632cd8524457f5fb57ef15 100644
--- a/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp
+++ b/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp
@@ -27,6 +27,7 @@
@@ -21246,10 +21180,10 @@ index 428e10e8311dfb3201439688f5ad35a4d609b95c..b03ccee5c7057875092607d01b72265d
{
if (m_hasRemovedMessageReceiver)
diff --git a/Source/WebKit/WebProcess/WebPage/DrawingArea.h b/Source/WebKit/WebProcess/WebPage/DrawingArea.h
-index a124c32b48b43f4f6b3d4e95f4a7ca6906412026..5583b767ff16f3af735ee0e657a816c0ccb2e298 100644
+index 6c61c9a0ee5b7a11408d5a0a06f37035e9601e25..a5ddf926e95182bd3575147aff2123f3e6a77109 100644
--- a/Source/WebKit/WebProcess/WebPage/DrawingArea.h
+++ b/Source/WebKit/WebProcess/WebPage/DrawingArea.h
-@@ -166,6 +166,9 @@ public:
+@@ -172,6 +172,9 @@ public:
virtual bool enterAcceleratedCompositingModeIfNeeded() = 0;
virtual void backgroundColorDidChange() { };
#endif
@@ -21260,7 +21194,7 @@ index a124c32b48b43f4f6b3d4e95f4a7ca6906412026..5583b767ff16f3af735ee0e657a816c0
#if PLATFORM(WPE) && USE(GBM) && ENABLE(WPE_PLATFORM)
virtual void preferredBufferFormatsDidChange() { }
diff --git a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp
-index 0fec14223997c3f22758e78bda6640dfa1865c65..31161fdf651dbacd18e9789218d797e0140ca781 100644
+index 70a6c3c9ed0fcf42393df2c0fb66eb50d290030d..06fb88ca78db70de4bd4ed9cdf33172bee1a958e 100644
--- a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp
+++ b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp
@@ -44,6 +44,7 @@
@@ -21271,7 +21205,7 @@ index 0fec14223997c3f22758e78bda6640dfa1865c65..31161fdf651dbacd18e9789218d797e0
#include <WebCore/ScriptTelemetryCategory.h>
#include <WebCore/Settings.h>
#include <WebCore/StorageSessionProvider.h>
-@@ -455,6 +456,12 @@ void WebCookieJar::removeChangeListener(const String& host, const WebCore::Cooki
+@@ -445,6 +446,12 @@ void WebCookieJar::setOptInCookiePartitioningEnabled(bool enabled)
}
#endif
@@ -21285,23 +21219,23 @@ index 0fec14223997c3f22758e78bda6640dfa1865c65..31161fdf651dbacd18e9789218d797e0
String WebCookieJar::cookiesInPartitionedCookieStorage(const WebCore::Document&, const URL&, const WebCore::SameSiteInfo&) const
diff --git a/Source/WebKit/WebProcess/WebPage/WebCookieJar.h b/Source/WebKit/WebProcess/WebPage/WebCookieJar.h
-index 001207c6c6a651707aa91899536b5cf715047e3f..afe3874d9c6b41f19af4144597557e2abd309f71 100644
+index f9c1d07d4e1f4b5421a627a179ed4f86cf1a1b92..9a8089ed85eebbfb8af0804dfbc0698bcb5993d6 100644
--- a/Source/WebKit/WebProcess/WebPage/WebCookieJar.h
+++ b/Source/WebKit/WebProcess/WebPage/WebCookieJar.h
-@@ -76,6 +76,8 @@ public:
+@@ -77,6 +77,8 @@ public:
void clearCache() final;
+ void setCookieFromResponse(WebCore::ResourceLoader&, const String& setCookieValue);
+
- private:
- WebCookieJar();
-
+ #if HAVE(ALLOW_ONLY_PARTITIONED_COOKIES)
+ void setOptInCookiePartitioningEnabled(bool);
+ #endif
diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
-index ad8d14f45c5b0719836f8d7faae07bfcac3823b8..50c20d09b7465b218ee3154377a0306c1cb279fe 100644
+index a790490171adbb2bd153e84f37df524099d11496..6aa0bc62374ce01171b04d7025105ba155ecaf80 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
-@@ -239,6 +239,7 @@
+@@ -241,6 +241,7 @@
#include <WebCore/ImageAnalysisQueue.h>
#include <WebCore/ImageOverlay.h>
#include <WebCore/InspectorController.h>
@@ -21309,7 +21243,7 @@ index ad8d14f45c5b0719836f8d7faae07bfcac3823b8..50c20d09b7465b218ee3154377a0306c
#include <WebCore/JSDOMExceptionHandling.h>
#include <WebCore/KeyboardEvent.h>
#include <WebCore/LegacySchemeRegistry.h>
-@@ -1137,6 +1138,12 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
+@@ -1156,6 +1157,12 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
setLinkDecorationFilteringData(WTFMove(parameters.linkDecorationFilteringData));
setAllowedQueryParametersForAdvancedPrivacyProtections(WTFMove(parameters.allowedQueryParametersForAdvancedPrivacyProtections));
#endif
@@ -21320,9 +21254,9 @@ index ad8d14f45c5b0719836f8d7faae07bfcac3823b8..50c20d09b7465b218ee3154377a0306c
+ if (parameters.shouldPauseInInspectorWhenShown)
+ m_page->inspectorController().pauseOnStart(parameters.windowFeatures ? InspectorController::PauseCondition::WHEN_CREATION_FINISHED : InspectorController::PauseCondition::WHEN_SHOWN);
if (parameters.windowFeatures) {
- m_page->applyWindowFeatures(*parameters.windowFeatures);
- m_page->chrome().show();
-@@ -2098,6 +2105,22 @@ void WebPage::loadDidCommitInAnotherProcess(WebCore::FrameIdentifier frameID, st
+ page->applyWindowFeatures(*parameters.windowFeatures);
+ page->chrome().show();
+@@ -2094,6 +2101,22 @@ void WebPage::loadDidCommitInAnotherProcess(WebCore::FrameIdentifier frameID, st
frame->loadDidCommitInAnotherProcess(layerHostingContextIdentifier);
}
@@ -21344,8 +21278,8 @@ index ad8d14f45c5b0719836f8d7faae07bfcac3823b8..50c20d09b7465b218ee3154377a0306c
+
void WebPage::loadRequest(LoadParameters&& loadParameters)
{
- WEBPAGE_RELEASE_LOG(Loading, "loadRequest: navigationID=%" PRIu64 ", shouldTreatAsContinuingLoad=%u, lastNavigationWasAppInitiated=%d, existingNetworkResourceLoadIdentifierToResume=%" PRIu64, loadParameters.navigationID ? loadParameters.navigationID->toUInt64() : 0, static_cast<unsigned>(loadParameters.shouldTreatAsContinuingLoad), loadParameters.request.isAppInitiated(), loadParameters.existingNetworkResourceLoadIdentifierToResume ? loadParameters.existingNetworkResourceLoadIdentifierToResume->toUInt64() : 0);
-@@ -2293,7 +2316,9 @@ void WebPage::stopLoading()
+ 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);
+@@ -2289,7 +2312,9 @@ void WebPage::stopLoading()
void WebPage::stopLoadingDueToProcessSwap()
{
SetForScope isStoppingLoadingDueToProcessSwap(m_isStoppingLoadingDueToProcessSwap, true);
@@ -21355,7 +21289,7 @@ index ad8d14f45c5b0719836f8d7faae07bfcac3823b8..50c20d09b7465b218ee3154377a0306c
}
bool WebPage::defersLoading() const
-@@ -2879,7 +2904,7 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum
+@@ -2865,7 +2890,7 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum
#if PLATFORM(IOS_FAMILY)
if (m_viewportConfiguration.setViewportArguments(viewportArguments))
viewportConfigurationChanged();
@@ -21364,8 +21298,8 @@ index ad8d14f45c5b0719836f8d7faae07bfcac3823b8..50c20d09b7465b218ee3154377a0306c
// Adjust view dimensions when using fixed layout.
RefPtr localMainFrame = this->localMainFrame();
RefPtr view = localMainFrame ? localMainFrame->view() : nullptr;
-@@ -3657,6 +3682,13 @@ void WebPage::flushDeferredScrollEvents()
- corePage()->flushDeferredScrollEvents();
+@@ -3652,6 +3677,13 @@ void WebPage::flushDeferredScrollEvents()
+ protectedCorePage()->flushDeferredScrollEvents();
}
+#if ENABLE(ORIENTATION_EVENTS)
@@ -21378,7 +21312,7 @@ index ad8d14f45c5b0719836f8d7faae07bfcac3823b8..50c20d09b7465b218ee3154377a0306c
void WebPage::flushDeferredDidReceiveMouseEvent()
{
if (auto info = std::exchange(m_deferredDidReceiveMouseEvent, std::nullopt))
-@@ -3918,6 +3950,97 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent, CompletionHandler<void
+@@ -3913,6 +3945,97 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent, CompletionHandler<void
completionHandler(touchEvent.type(), handled);
}
@@ -21476,7 +21410,7 @@ index ad8d14f45c5b0719836f8d7faae07bfcac3823b8..50c20d09b7465b218ee3154377a0306c
#endif
void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint)
-@@ -4006,6 +4129,16 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m
+@@ -4001,6 +4124,16 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m
m_inspectorTargetController->sendMessageToTargetBackend(targetId, message);
}
@@ -21492,8 +21426,8 @@ index ad8d14f45c5b0719836f8d7faae07bfcac3823b8..50c20d09b7465b218ee3154377a0306c
+
void WebPage::insertNewlineInQuotedContent()
{
- RefPtr frame = m_page->checkedFocusController()->focusedOrMainFrame();
-@@ -4247,6 +4380,7 @@ void WebPage::didCompletePageTransition()
+ RefPtr frame = protectedCorePage()->checkedFocusController()->focusedOrMainFrame();
+@@ -4251,6 +4384,7 @@ void WebPage::setMainFrameDocumentVisualUpdatesAllowed(bool allowed)
void WebPage::show()
{
send(Messages::WebPageProxy::ShowPage());
@@ -21501,7 +21435,7 @@ index ad8d14f45c5b0719836f8d7faae07bfcac3823b8..50c20d09b7465b218ee3154377a0306c
}
void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension)
-@@ -5417,7 +5551,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana
+@@ -5439,7 +5573,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana
#if ENABLE(DRAG_SUPPORT)
@@ -21510,7 +21444,7 @@ index ad8d14f45c5b0719836f8d7faae07bfcac3823b8..50c20d09b7465b218ee3154377a0306c
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)
-@@ -7879,6 +8013,10 @@ void WebPage::didCommitLoad(WebFrame* frame)
+@@ -7914,6 +8048,10 @@ void WebPage::didCommitLoad(WebFrame* frame)
#endif
flushDeferredDidReceiveMouseEvent();
@@ -21521,7 +21455,7 @@ index ad8d14f45c5b0719836f8d7faae07bfcac3823b8..50c20d09b7465b218ee3154377a0306c
}
void WebPage::didFinishDocumentLoad(WebFrame& frame)
-@@ -8186,6 +8324,9 @@ Ref<DocumentLoader> WebPage::createDocumentLoader(LocalFrame& frame, const Resou
+@@ -8233,6 +8371,9 @@ Ref<DocumentLoader> WebPage::createDocumentLoader(LocalFrame& frame, const Resou
WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_internals->pendingWebsitePolicies), documentLoader);
m_internals->pendingWebsitePolicies = std::nullopt;
}
@@ -21532,10 +21466,10 @@ index ad8d14f45c5b0719836f8d7faae07bfcac3823b8..50c20d09b7465b218ee3154377a0306c
return documentLoader;
diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
-index 931473cc7600a2600b0c002f8bd8ae823399691c..3955fa4feb65a8f622b4ebecb0edd56489a1a465 100644
+index 889f9a1c62a652c3de5e5edb14c9781932b8ef7b..1a708ef7835d63cdaf60db1eb4d5ade6808152b0 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
-@@ -42,6 +42,7 @@
+@@ -43,6 +43,7 @@
#include <WebCore/MediaKeySystemRequest.h>
#include <WebCore/NowPlayingMetadataObserver.h>
#include <WebCore/OwnerPermissionsPolicyData.h>
@@ -21543,7 +21477,7 @@ index 931473cc7600a2600b0c002f8bd8ae823399691c..3955fa4feb65a8f622b4ebecb0edd564
#include <WebCore/PageIdentifier.h>
#include <WebCore/PageOverlay.h>
#include <WebCore/PlatformLayerIdentifier.h>
-@@ -1265,11 +1266,11 @@ public:
+@@ -1256,11 +1257,11 @@ public:
void clearSelection();
void restoreSelectionInFocusedEditableElement();
@@ -21557,7 +21491,7 @@ index 931473cc7600a2600b0c002f8bd8ae823399691c..3955fa4feb65a8f622b4ebecb0edd564
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
-@@ -1284,6 +1285,9 @@ public:
+@@ -1275,6 +1276,9 @@ public:
void didStartDrag();
void dragCancelled();
OptionSet<WebCore::DragSourceAction> allowedDragSourceActions() const { return m_allowedDragSourceActions; }
@@ -21566,9 +21500,9 @@ index 931473cc7600a2600b0c002f8bd8ae823399691c..3955fa4feb65a8f622b4ebecb0edd564
+#endif
#endif
- void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&);
-@@ -1359,8 +1363,11 @@ public:
- void gestureEvent(WebCore::FrameIdentifier, const WebGestureEvent&);
+ #if ENABLE(MODEL_PROCESS)
+@@ -1361,8 +1365,11 @@ public:
+ void gestureEvent(WebCore::FrameIdentifier, const WebGestureEvent&, CompletionHandler<void(std::optional<WebEventType>, bool, std::optional<WebCore::RemoteUserInputEventData>)>&&);
#endif
-#if PLATFORM(IOS_FAMILY)
@@ -21580,7 +21514,7 @@ index 931473cc7600a2600b0c002f8bd8ae823399691c..3955fa4feb65a8f622b4ebecb0edd564
void dynamicViewportSizeUpdate(const DynamicViewportSizeUpdate&);
bool scaleWasSetByUIProcess() const { return m_scaleWasSetByUIProcess; }
void willStartUserTriggeredZooming();
-@@ -1510,6 +1517,8 @@ public:
+@@ -1513,6 +1520,8 @@ public:
void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType);
void disconnectInspector(const String& targetId);
void sendMessageToTargetBackend(const String& targetId, const String& message);
@@ -21589,15 +21523,15 @@ index 931473cc7600a2600b0c002f8bd8ae823399691c..3955fa4feb65a8f622b4ebecb0edd564
void insertNewlineInQuotedContent();
-@@ -1920,6 +1929,7 @@ public:
- void showContextMenuFromFrame(const WebCore::FrameIdentifier&, const ContextMenuContextData&, const UserData&);
+@@ -1930,6 +1939,7 @@ public:
+ void showContextMenuFromFrame(const FrameInfoData&, const ContextMenuContextData&, const UserData&);
#endif
void loadRequest(LoadParameters&&);
+ void loadRequestInFrameForInspector(LoadParameters&&, WebCore::FrameIdentifier);
- void setTopContentInset(float);
+ void setObscuredContentInsets(const WebCore::FloatBoxExtent&);
-@@ -2105,6 +2115,7 @@ private:
+@@ -2121,6 +2131,7 @@ private:
void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled);
#elif ENABLE(TOUCH_EVENTS)
void touchEvent(const WebTouchEvent&, CompletionHandler<void(std::optional<WebEventType>, bool)>&&);
@@ -21605,7 +21539,7 @@ index 931473cc7600a2600b0c002f8bd8ae823399691c..3955fa4feb65a8f622b4ebecb0edd564
#endif
void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&);
-@@ -2863,6 +2874,7 @@ private:
+@@ -2884,6 +2895,7 @@ private:
UserActivity m_userActivity;
Markable<WebCore::NavigationIdentifier> m_pendingNavigationID;
@@ -21614,7 +21548,7 @@ index 931473cc7600a2600b0c002f8bd8ae823399691c..3955fa4feb65a8f622b4ebecb0edd564
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 46c172ccd69d88d6dbc5d9cd946cd0e2045c69dd..26b47e43a543100a5d952120091726aae3661357 100644
+index d38d0ecfb0e77838cc6d24b199c8be5d30d13953..1b6ddebd36f1a53a1d34a9157dffc9e8147dae19 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
@@ -57,10 +57,13 @@ messages -> WebPage WantsAsyncDispatchMessage {
@@ -21648,15 +21582,15 @@ index 46c172ccd69d88d6dbc5d9cd946cd0e2045c69dd..26b47e43a543100a5d952120091726aa
#endif
CancelPointer(WebCore::PointerID pointerId, WebCore::IntPoint documentPoint)
-@@ -195,6 +200,7 @@ messages -> WebPage WantsAsyncDispatchMessage {
- CreateProvisionalFrame(struct WebKit::ProvisionalFrameCreationParameters creationParameters, WebCore::FrameIdentifier frameID)
+@@ -189,6 +194,7 @@ messages -> WebPage WantsAsyncDispatchMessage {
+ CreateProvisionalFrame(struct WebKit::ProvisionalFrameCreationParameters creationParameters)
DestroyProvisionalFrame(WebCore::FrameIdentifier frameID);
LoadDidCommitInAnotherProcess(WebCore::FrameIdentifier frameID, std::optional<WebCore::LayerHostingContextIdentifier> layerHostingContextIdentifier)
+ LoadRequestInFrameForInspector(struct WebKit::LoadParameters loadParameters, WebCore::FrameIdentifier frameID)
LoadRequestWaitingForProcessLaunch(struct WebKit::LoadParameters loadParameters, URL resourceDirectoryURL, WebKit::WebPageProxyIdentifier pageID, bool checkAssumedReadAccessToResourceURL)
LoadData(struct WebKit::LoadParameters loadParameters)
LoadSimulatedRequestAndResponse(struct WebKit::LoadParameters loadParameters, WebCore::ResourceResponse simulatedResponse)
-@@ -361,10 +367,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
+@@ -352,10 +358,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
RemoveLayerForFindOverlay() -> ()
# Drag and drop.
@@ -21669,8 +21603,8 @@ index 46c172ccd69d88d6dbc5d9cd946cd0e2045c69dd..26b47e43a543100a5d952120091726aa
PerformDragControllerAction(std::optional<WebCore::FrameIdentifier> frameID, enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData) -> (std::optional<WebCore::DragOperation> dragOperation, enum:uint8_t WebCore::DragHandlingMethod dragHandlingMethod, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, WebCore::IntRect insertionRect, WebCore::IntRect editableElementRect, struct std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData)
PerformDragOperation(WebCore::DragData dragData, WebKit::SandboxExtensionHandle sandboxExtensionHandle, Vector<WebKit::SandboxExtensionHandle> sandboxExtensionsForUpload) -> (bool handled)
#endif
-@@ -374,6 +380,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
- DragCancelled()
+@@ -371,6 +377,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
+ StageModeSessionDidEnd(std::optional<WebCore::ElementIdentifier> elementID)
#endif
+#if PLATFORM(MAC) && ENABLE(DRAG_SUPPORT)
@@ -21681,10 +21615,10 @@ index 46c172ccd69d88d6dbc5d9cd946cd0e2045c69dd..26b47e43a543100a5d952120091726aa
RequestDragStart(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet<WebCore::DragSourceAction> allowedActionsMask)
RequestAdditionalItemsForDragSession(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet<WebCore::DragSourceAction> allowedActionsMask)
diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
-index 0b583e682f64d0164def139cbd5c34597ce98db5..306263b5b96515100ecd6639b2566977958b0dea 100644
+index 740a118cfe40d803ecccbf2025efa7b813d9b918..c8acb88dd1f3b47332e3928035f74b8bd3c57049 100644
--- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
+++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
-@@ -798,21 +798,37 @@ String WebPage::platformUserAgent(const URL&) const
+@@ -696,21 +696,37 @@ String WebPage::platformUserAgent(const URL&) const
bool WebPage::hoverSupportedByPrimaryPointingDevice() const
{
@@ -21773,7 +21707,7 @@ index f17f5d719d892309ed9c7093384945866b5117b9..1dba47bbf0dbd0362548423a74b38034
}
diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp
-index 2aa5f4a4491d2ba9bae275308b3d669d9d0b3dfa..3e09cd6d639634ee368bfd699f5c597af9367707 100644
+index aeaaf015db254f2562085e003a84c29ea8636611..6779f7b116db8f9a0686bef70965cdf9a7d2d6f4 100644
--- a/Source/WebKit/WebProcess/WebProcess.cpp
+++ b/Source/WebKit/WebProcess/WebProcess.cpp
@@ -91,6 +91,7 @@
@@ -21784,7 +21718,7 @@ index 2aa5f4a4491d2ba9bae275308b3d669d9d0b3dfa..3e09cd6d639634ee368bfd699f5c597a
#include <JavaScriptCore/JSLock.h>
#include <JavaScriptCore/MemoryStatistics.h>
#include <JavaScriptCore/WasmFaultSignalHandler.h>
-@@ -376,6 +377,14 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
+@@ -378,6 +379,14 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
{
JSC::Options::AllowUnfinalizedAccessScope scope;
JSC::Options::allowNonSPTagging() = false;
@@ -21799,7 +21733,7 @@ index 2aa5f4a4491d2ba9bae275308b3d669d9d0b3dfa..3e09cd6d639634ee368bfd699f5c597a
JSC::Options::notifyOptionsChanged();
}
-@@ -383,6 +392,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
+@@ -385,6 +394,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
platformInitializeProcess(parameters);
updateCPULimit();
@@ -21808,7 +21742,7 @@ index 2aa5f4a4491d2ba9bae275308b3d669d9d0b3dfa..3e09cd6d639634ee368bfd699f5c597a
}
void WebProcess::initializeConnection(IPC::Connection* connection)
-@@ -937,6 +948,7 @@ void WebProcess::createWebPage(PageIdentifier pageID, WebPageCreationParameters&
+@@ -953,6 +964,7 @@ void WebProcess::createWebPage(PageIdentifier pageID, WebPageCreationParameters&
accessibilityRelayProcessSuspended(false);
}
ASSERT(result.iterator->value);
@@ -21817,7 +21751,7 @@ index 2aa5f4a4491d2ba9bae275308b3d669d9d0b3dfa..3e09cd6d639634ee368bfd699f5c597a
void WebProcess::removeWebPage(PageIdentifier pageID)
diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
-index 64e9b56bbc644c8ed1583cdbf41878738860292d..fe83a85ccf53ee33f5a6a7461b40078d77928b61 100644
+index 60dc8836dbd8ed1f3f4a2e476d91be6ca7ab0840..20dcdedb9e4eb742c213193eddaa947ac10ec219 100644
--- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
@@ -4223,7 +4223,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
@@ -21830,10 +21764,10 @@ index 64e9b56bbc644c8ed1583cdbf41878738860292d..fe83a85ccf53ee33f5a6a7461b40078d
- (void)touch:(WebEvent *)event
{
diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
-index 0a91e3dcd2071893d4a3f0bb42d43f1435c2d04b..be0037d7284f88c2fbd42070da4d6058408db3c4 100644
+index e3a23565b11b4dc4eafa3616e15d04e528de8f94..366cf2dd2348350b6dd133ce660ca5b1f73d88d3 100644
--- a/Source/WebKitLegacy/mac/WebView/WebView.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
-@@ -3986,7 +3986,7 @@ + (void)_doNotStartObservingNetworkReachability
+@@ -3991,7 +3991,7 @@ + (void)_doNotStartObservingNetworkReachability
}
#endif // PLATFORM(IOS_FAMILY)
@@ -21842,7 +21776,7 @@ index 0a91e3dcd2071893d4a3f0bb42d43f1435c2d04b..be0037d7284f88c2fbd42070da4d6058
- (NSArray *)_touchEventRegions
{
-@@ -4028,7 +4028,7 @@ - (NSArray *)_touchEventRegions
+@@ -4033,7 +4033,7 @@ - (NSArray *)_touchEventRegions
}).autorelease();
}
@@ -21883,20 +21817,21 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d
+ LIBVPX_LIBRARIES
+)
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 22894830f9eb1be8e2fd3d4fc04711aa49eca6a7..e49dcaf62241f53baf3911e2c40f07c96eb9f0db 100644
+index d46ee01c5af78d95469d7cfdb7144e8863f00d5a..4a6d5d34007183f28853e6c5192f282b3925a7ae 100644
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
-@@ -7,6 +7,9 @@ SET_PROJECT_VERSION(2 47 2)
-
+@@ -8,6 +8,10 @@ SET_PROJECT_VERSION(2 47 4)
set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
+ find_package(GLIB 2.70.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
++
+set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+
find_package(Cairo 1.16.0 REQUIRED)
find_package(LibGcrypt 1.7.0 REQUIRED)
find_package(Libtasn1 REQUIRED)
-@@ -22,6 +25,10 @@ find_package(ZLIB REQUIRED)
+@@ -23,6 +27,10 @@ find_package(ZLIB REQUIRED)
find_package(WebP REQUIRED COMPONENTS demux)
find_package(ATSPI 2.5.3)
@@ -21907,7 +21842,7 @@ index 22894830f9eb1be8e2fd3d4fc04711aa49eca6a7..e49dcaf62241f53baf3911e2c40f07c9
include(GStreamerDefinitions)
include(FindGLibCompileResources)
-@@ -69,6 +76,10 @@ WEBKIT_OPTION_DEFINE(USE_SYSTEM_UNIFDEF "Whether to use a system-provided unifde
+@@ -70,6 +78,10 @@ WEBKIT_OPTION_DEFINE(USE_SYSTEM_UNIFDEF "Whether to use a system-provided unifde
WEBKIT_OPTION_DEPEND(USE_SYSTEM_SYSPROF_CAPTURE USE_SYSPROF_CAPTURE)
@@ -21918,7 +21853,7 @@ index 22894830f9eb1be8e2fd3d4fc04711aa49eca6a7..e49dcaf62241f53baf3911e2c40f07c9
SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
if (DEVELOPER_MODE)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
-@@ -155,6 +166,20 @@ endif ()
+@@ -148,6 +160,20 @@ endif ()
WEBKIT_OPTION_DEPEND(ENABLE_GPU_PROCESS USE_GBM)
@@ -21940,10 +21875,10 @@ index 22894830f9eb1be8e2fd3d4fc04711aa49eca6a7..e49dcaf62241f53baf3911e2c40f07c9
# Finalize the value for all options. Do not attempt to use an option before
diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
-index c9b3bcd943d9df19f1b240b8b3704d51c5398411..51c1615a4caedc67675d0c6d49db4ef35f0ad403 100644
+index bb046a1110023fbd6641943d4b677d1fc68cdea5..d34028c618600a172225246db9286e2a7ab1b9eb 100644
--- a/Source/cmake/OptionsWPE.cmake
+++ b/Source/cmake/OptionsWPE.cmake
-@@ -21,6 +21,9 @@ find_package(WebP REQUIRED COMPONENTS demux)
+@@ -22,6 +22,9 @@ find_package(WebP REQUIRED COMPONENTS demux)
find_package(WPE REQUIRED)
find_package(ZLIB REQUIRED)
@@ -21953,7 +21888,7 @@ index c9b3bcd943d9df19f1b240b8b3704d51c5398411..51c1615a4caedc67675d0c6d49db4ef3
WEBKIT_OPTION_BEGIN()
SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
-@@ -84,6 +87,29 @@ if (WPE_VERSION VERSION_GREATER_EQUAL 1.13.90)
+@@ -84,6 +87,21 @@ if (WPE_VERSION VERSION_GREATER_EQUAL 1.13.90)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC ON)
endif ()
@@ -21966,16 +21901,8 @@ index c9b3bcd943d9df19f1b240b8b3704d51c5398411..51c1615a4caedc67675d0c6d49db4ef3
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DARK_MODE_CSS PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATE_AND_TIME_INPUT_TYPES PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON)
+# Playwright end.
@@ -21983,7 +21910,7 @@ index c9b3bcd943d9df19f1b240b8b3704d51c5398411..51c1615a4caedc67675d0c6d49db4ef3
# 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.
-@@ -119,6 +145,11 @@ WEBKIT_OPTION_DEPEND(USE_QT6 ENABLE_WPE_PLATFORM)
+@@ -119,6 +137,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)
@@ -21996,7 +21923,7 @@ index c9b3bcd943d9df19f1b240b8b3704d51c5398411..51c1615a4caedc67675d0c6d49db4ef3
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 82a672f6ab17b20b1f2ce373cb627905ada281b2..e72eb75475bc09eeb92bd0b8a207e704674ff5a5 100644
+index b43e68ea44419ed9ea7f539df747cff5d9e4bb36..f62b9a303ad3aba3f04220f1ca9dd208cf3380d4 100644
--- a/Source/cmake/OptionsWin.cmake
+++ b/Source/cmake/OptionsWin.cmake
@@ -76,6 +76,27 @@ find_package(ZLIB 1.2.11 REQUIRED)
@@ -22027,7 +21954,7 @@ index 82a672f6ab17b20b1f2ce373cb627905ada281b2..e72eb75475bc09eeb92bd0b8a207e704
WEBKIT_OPTION_BEGIN()
# FIXME: Most of these options should not be public.
-@@ -141,6 +162,14 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
+@@ -133,6 +154,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)
@@ -22778,7 +22705,7 @@ index 1067b31bc989748dfcc5502209d36d001b9b239e..7629263fb8bc93dca6dfc01c75eed8d2
+ add_subdirectory(Playwright/win)
+endif ()
diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
-index 470dcf1f4440f3db350fc416150a2e792a2777c7..31cbc0d22e63d054cf6edcc220a1c6b407cc1f24 100755
+index ad5ecfe242d13ef1b363215361ae15091a3ffd2a..417325f1742625caf6aff22c9d0b1f5ac061743b 100755
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -273,7 +273,7 @@ if (isAppleCocoaWebKit()) {
@@ -22806,10 +22733,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 a6dc6170c6cb9a6a21fc9abb11b90e3ca1ac3ebc..960d9432d52d5cabe75aca2bc036de248a149681 100644
+index ea8a7dc0d6b63e28ca39e8ecb77fa6c2c3889d32..b3c292fb5db977649e90fbc598626d27ab39a349 100644
--- a/Tools/WebKitTestRunner/TestController.cpp
+++ b/Tools/WebKitTestRunner/TestController.cpp
-@@ -984,6 +984,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)
+@@ -1087,6 +1087,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)
0, // requestStorageAccessConfirm
shouldAllowDeviceOrientationAndMotionAccess,
runWebAuthenticationPanel,
@@ -22818,7 +22745,7 @@ index a6dc6170c6cb9a6a21fc9abb11b90e3ca1ac3ebc..960d9432d52d5cabe75aca2bc036de24
decidePolicyForMediaKeySystemPermissionRequest,
queryPermission,
diff --git a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
-index c1381b06b378a5121be926b1dfda3e5509bcd051..773e5882b6f2269201ca49433d0b69866493118d 100644
+index 0435d345aadde9eaa3a4b7e8625e0872db8c1840..856c36909fd15a178bf1e929aec3d391196f7d36 100644
--- a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
+++ b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
@@ -961,4 +961,51 @@ void EventSenderProxy::waitForPendingMouseEvents()
diff --git a/browser_patches/winldd/EXPECTED_BUILDS b/browser_patches/winldd/EXPECTED_BUILDS
index 349b4249b6..cdead62b4c 100644
--- a/browser_patches/winldd/EXPECTED_BUILDS
+++ b/browser_patches/winldd/EXPECTED_BUILDS
@@ -1,2 +1 @@
winldd-win64.zip
-winldd-win64.tar.br