Skip to content

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

chore: roll browser patches (#38909)

Simon Knottd0b1fc27ccf8
diff --git a/browser_patches/firefox/UPSTREAM_CONFIG.sh b/browser_patches/firefox/UPSTREAM_CONFIG.sh
index 59bf574a1c..bde5d67eb0 100644
--- a/browser_patches/firefox/UPSTREAM_CONFIG.sh
+++ b/browser_patches/firefox/UPSTREAM_CONFIG.sh
@@ -1,3 +1,3 @@
REMOTE_URL="https://github.com/mozilla-firefox/firefox"
BASE_BRANCH="release"
-BASE_REVISION="e0df3d598dba47de812bb5144cbc187557377095"
+BASE_REVISION="d0f4d17d5aefe7ca5aa97afbcafcdc641cbd9f93"
diff --git a/browser_patches/firefox/juggler/NetworkObserver.js b/browser_patches/firefox/juggler/NetworkObserver.js
index 7fdc05a01a..2719cc1023 100644
--- a/browser_patches/firefox/juggler/NetworkObserver.js
+++ b/browser_patches/firefox/juggler/NetworkObserver.js
@@ -810,56 +810,6 @@ function overrideRequestHeaders(httpChannel, headers) {
appendExtraHTTPHeaders(httpChannel, headers);
}
-// Forbidden request headers according to https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_request_header
-// These headers cannot be set or modified programmatically.
-const FORBIDDEN_HEADER_NAMES = new Set([
- 'accept-charset',
- 'accept-encoding',
- 'access-control-request-headers',
- 'access-control-request-method',
- 'connection',
- 'content-length',
- 'cookie',
- 'date',
- 'dnt',
- 'expect',
- 'host',
- 'keep-alive',
- 'origin',
- 'referer',
- 'set-cookie',
- 'te',
- 'trailer',
- 'transfer-encoding',
- 'upgrade',
- 'via',
-]);
-
-// Forbidden method names for X-HTTP-Method-* headers
-const FORBIDDEN_METHODS = new Set(['CONNECT', 'TRACE', 'TRACK']);
-
-function isForbiddenHeader(name, value) {
- const lowerName = name.toLowerCase();
-
- if (FORBIDDEN_HEADER_NAMES.has(lowerName))
- return true;
-
- if (lowerName.startsWith('proxy-'))
- return true;
-
- if (lowerName.startsWith('sec-'))
- return true;
-
- if (lowerName === 'x-http-method' ||
- lowerName === 'x-http-method-override' ||
- lowerName === 'x-method-override') {
- if (value && FORBIDDEN_METHODS.has(value.toUpperCase()))
- return true;
- }
-
- return false;
-}
-
const redirectStatus = [301, 302, 303, 307, 308];
function filterHeadersForRedirect(headers, requestMethod, status) {
diff --git a/browser_patches/firefox/juggler/TargetRegistry.js b/browser_patches/firefox/juggler/TargetRegistry.js
index 55afdad864..fd7870d1c4 100644
--- a/browser_patches/firefox/juggler/TargetRegistry.js
+++ b/browser_patches/firefox/juggler/TargetRegistry.js
@@ -13,7 +13,6 @@ const Cr = Components.results;
const helper = new Helper();
const IDENTITY_NAME = 'JUGGLER ';
-const HUNDRED_YEARS = 60 * 60 * 24 * 365 * 100;
const ALL_PERMISSIONS = [
'geo',
@@ -364,10 +363,6 @@ export class TargetRegistry {
target = this._browserToTarget.get(browser);
}
browser.focus();
- if (browserContext.crossProcessCookie.settings.timezoneId) {
- if (await target.hasFailedToOverrideTimezone())
- throw new Error('Failed to override timezone');
- }
didCreateFirstPage = true;
return target.id();
}
@@ -508,6 +503,7 @@ export class PageTarget {
updateOverridesForBrowsingContext(browsingContext = undefined) {
this.updateTouchOverride(browsingContext);
this.updateUserAgent(browsingContext);
+ this.updateTimezoneOverride(browsingContext);
this.updatePlatform(browsingContext);
this.updateDPPXOverride(browsingContext);
this.updateZoom(browsingContext);
@@ -545,6 +541,10 @@ export class PageTarget {
(browsingContext || this._linkedBrowser.browsingContext).customUserAgent = this._browserContext.defaultUserAgent;
}
+ updateTimezoneOverride(browsingContext = undefined) {
+ (browsingContext || this._linkedBrowser.browsingContext).timezoneOverride = this._browserContext.timezoneOverride;
+ }
+
updatePlatform(browsingContext = undefined) {
(browsingContext || this._linkedBrowser.browsingContext).customPlatform = this._browserContext.defaultPlatform;
}
@@ -749,10 +749,6 @@ export class PageTarget {
await this._channel.connect('').send('applyContextSetting', { name, value }).catch(e => void e);
}
- async hasFailedToOverrideTimezone() {
- return await this._channel.connect('').send('hasFailedToOverrideTimezone').catch(e => true);
- }
-
async _startVideoRecording({width, height, dir}) {
// On Mac the window may not yet be visible when TargetCreated and its
// NSWindow.windowNumber may be -1, so we wait until the window is known
@@ -770,7 +766,7 @@ export class PageTarget {
const registry = this._registry;
const screencastClient = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIScreencastServiceClient]),
- screencastFrame(data, deviceWidth, deviceHeight) {
+ screencastFrame(data, deviceWidth, deviceHeight, timestamp) {
},
screencastStopped() {
registry.emit(TargetRegistry.Events.ScreencastStopped, sessionId);
@@ -810,9 +806,9 @@ export class PageTarget {
const self = this;
const screencastClient = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIScreencastServiceClient]),
- screencastFrame(data, deviceWidth, deviceHeight) {
+ screencastFrame(data, deviceWidth, deviceHeight, timestamp) {
if (self._screencastRecordingInfo)
- self.emit(PageTarget.Events.ScreencastFrame, { data, deviceWidth, deviceHeight });
+ self.emit(PageTarget.Events.ScreencastFrame, { data, deviceWidth, deviceHeight, timestamp });
},
screencastStopped() {
},
@@ -939,6 +935,7 @@ class BrowserContext {
this.defaultViewportSize = undefined;
this.deviceScaleFactor = undefined;
this.defaultUserAgent = null;
+ this.timezoneOverride = undefined;
this.defaultPlatform = null;
this.touchOverride = false;
this.forceOffline = false;
@@ -1035,6 +1032,14 @@ class BrowserContext {
page.updateUserAgent();
}
+ setTimezoneOverride(timezoneId) {
+ if (!Intl.supportedValuesOf("timeZone").includes(timezoneId))
+ throw new Error(`Invalid timezone ID: ${timezoneId}`);
+ this.timezoneOverride = timezoneId;
+ for (const page of this.pages)
+ page.updateTimezoneOverride();
+ }
+
setDefaultPlatform(platform) {
this.defaultPlatform = platform;
for (const page of this.pages)
@@ -1153,7 +1158,10 @@ class BrowserContext {
secure,
cookie.httpOnly || false,
cookie.expires === undefined || cookie.expires === -1 /* isSession */,
- cookie.expires === undefined ? Date.now() + HUNDRED_YEARS : cookie.expires * 1000,
+ // The XPCOM interface requires the expiry field even for session cookies.
+ // The expiry value must be passed in milliseconds and is capped at 400
+ // days.
+ cookie.expires === undefined ? Number.MAX_SAFE_INTEGER : Services.cookies.maybeCapExpiry(cookie.expires * 1000),
{ userContextId: this.userContextId || undefined } /* originAttributes */,
protocolToSameSite[cookie.sameSite],
Ci.nsICookie.SCHEME_UNSET
diff --git a/browser_patches/firefox/juggler/content/FrameTree.js b/browser_patches/firefox/juggler/content/FrameTree.js
index 09a95b3548..09d550958b 100644
--- a/browser_patches/firefox/juggler/content/FrameTree.js
+++ b/browser_patches/firefox/juggler/content/FrameTree.js
@@ -72,10 +72,6 @@ export class FrameTree {
helper.addObserver((browsingContext, topic, why) => {
this._onBrowsingContextDetached(browsingContext);
}, 'browsing-context-discarded'),
- helper.addObserver((subject, topic, eventInfo) => {
- const [type, jugglerEventId] = eventInfo.split(' ');
- this.emit(FrameTree.Events.InputEvent, { type, jugglerEventId: +(jugglerEventId ?? '0') });
- }, 'juggler-mouse-event-hit-renderer'),
helper.addProgressListener(webProgress, this, flags),
];
@@ -261,9 +257,7 @@ export class FrameTree {
mozSystemGroup: true,
capture: true,
};
- const emitInputEvent = (event) => this.emit(FrameTree.Events.InputEvent, { type: event.type, jugglerEventId: 0 });
- // Drag events are dispatched from content process, so these we don't see in the
- // `juggler-mouse-event-hit-renderer` instrumentation.
+ const emitInputEvent = (event) => this.emit(FrameTree.Events.InputEvent, { type: event.type });
this._dragEventListeners = [
helper.addEventListener(chromeEventHandler, 'dragstart', emitInputEvent, options),
helper.addEventListener(chromeEventHandler, 'dragover', emitInputEvent, options),
diff --git a/browser_patches/firefox/juggler/content/PageAgent.js b/browser_patches/firefox/juggler/content/PageAgent.js
index 2ff5e6b922..0a48ac3e4d 100644
--- a/browser_patches/firefox/juggler/content/PageAgent.js
+++ b/browser_patches/firefox/juggler/content/PageAgent.js
@@ -150,7 +150,6 @@ export class PageAgent {
dispatchTouchEvent: this._dispatchTouchEvent.bind(this),
dispatchTapEvent: this._dispatchTapEvent.bind(this),
getContentQuads: this._getContentQuads.bind(this),
- getFullAXTree: this._getFullAXTree.bind(this),
insertText: this._insertText.bind(this),
scrollIntoViewIfNeeded: this._scrollIntoViewIfNeeded.bind(this),
setFileInputFiles: this._setFileInputFiles.bind(this),
@@ -539,21 +538,23 @@ export class PageAgent {
if ((type === 'drop' && dropEffect !== 'none') || type === 'dragover') {
const win = this._frameTree.mainFrame().domWindow();
- win.windowUtils.jugglerSendMouseEvent(
+ win.synthesizeMouseEvent(
type,
x,
y,
- 0, /*button*/
- 0, /*clickCount*/
- modifiers,
- false /*aIgnoreRootScrollFrame*/,
- 0.0 /*pressure*/,
- 0 /*inputSource*/,
- true /*isDOMEventSynthesized*/,
- false /*isWidgetEventSynthesized*/,
- 0 /*buttons*/,
- win.windowUtils.DEFAULT_MOUSE_POINTER_ID /* pointerIdentifier */,
- false /*disablePointerEvent*/,
+ {
+ button: 0,
+ buttons: 0,
+ clickCount: 0,
+ modifiers,
+ pressure: 0.0,
+ inputSource: MouseEvent.MOZ_SOURCE_MOUSE,
+ },
+ {
+ ignoreRootScrollFrame: false,
+ isDOMEventSynthesized: true,
+ isWidgetEventSynthesized: false,
+ }
);
return;
}
@@ -581,131 +582,5 @@ export class PageAgent {
const badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
badptr.contents;
}
-
- async _getFullAXTree({objectId}) {
- let unsafeObject = null;
- if (objectId) {
- unsafeObject = this._frameTree.mainFrame().unsafeObject(objectId);
- if (!unsafeObject)
- throw new Error(`No object found for id "${objectId}"`);
- }
-
- const service = Cc["@mozilla.org/accessibilityService;1"]
- .getService(Ci.nsIAccessibilityService);
- const document = this._frameTree.mainFrame().domWindow().document;
- const docAcc = service.getAccessibleFor(document);
-
- while (docAcc.document.isUpdatePendingForJugglerAccessibility)
- await new Promise(x => this._frameTree.mainFrame().domWindow().requestAnimationFrame(x));
-
- async function waitForQuiet() {
- let state = {};
- docAcc.getState(state, {});
- if ((state.value & Ci.nsIAccessibleStates.STATE_BUSY) == 0)
- return;
- let resolve, reject;
- const promise = new Promise((x, y) => {resolve = x, reject = y});
- let eventObserver = {
- observe(subject, topic) {
- if (topic !== "accessible-event") {
- return;
- }
-
- // If event type does not match expected type, skip the event.
- let event = subject.QueryInterface(Ci.nsIAccessibleEvent);
- if (event.eventType !== Ci.nsIAccessibleEvent.EVENT_STATE_CHANGE) {
- return;
- }
-
- // If event's accessible does not match expected accessible,
- // skip the event.
- if (event.accessible !== docAcc) {
- return;
- }
-
- Services.obs.removeObserver(this, "accessible-event");
- resolve();
- },
- };
- Services.obs.addObserver(eventObserver, "accessible-event");
- return promise;
- }
- function buildNode(accElement) {
- let a = {}, b = {};
- accElement.getState(a, b);
- const tree = {
- role: service.getStringRole(accElement.role),
- name: accElement.name || '',
- };
- if (unsafeObject && unsafeObject === accElement.DOMNode)
- tree.foundObject = true;
- for (const userStringProperty of [
- 'value',
- 'description'
- ]) {
- tree[userStringProperty] = accElement[userStringProperty] || undefined;
- }
-
- const states = {};
- for (const name of service.getStringStates(a.value, b.value))
- states[name] = true;
- for (const name of ['selected',
- 'focused',
- 'pressed',
- 'focusable',
- 'required',
- 'invalid',
- 'modal',
- 'editable',
- 'busy',
- 'checked',
- 'multiselectable']) {
- if (states[name])
- tree[name] = true;
- }
-
- if (states['multi line'])
- tree['multiline'] = true;
- if (states['editable'] && states['readonly'])
- tree['readonly'] = true;
- if (states['checked'])
- tree['checked'] = true;
- if (states['mixed'])
- tree['checked'] = 'mixed';
- if (states['expanded'])
- tree['expanded'] = true;
- else if (states['collapsed'])
- tree['expanded'] = false;
- if (!states['enabled'])
- tree['disabled'] = true;
-
- const attributes = {};
- if (accElement.attributes) {
- for (const { key, value } of accElement.attributes.enumerate()) {
- attributes[key] = value;
- }
- }
- for (const numericalProperty of ['level']) {
- if (numericalProperty in attributes)
- tree[numericalProperty] = parseFloat(attributes[numericalProperty]);
- }
- for (const stringProperty of ['tag', 'roledescription', 'valuetext', 'orientation', 'autocomplete', 'keyshortcuts', 'haspopup']) {
- if (stringProperty in attributes)
- tree[stringProperty] = attributes[stringProperty];
- }
- const children = [];
-
- for (let child = accElement.firstChild; child; child = child.nextSibling) {
- children.push(buildNode(child));
- }
- if (children.length)
- tree.children = children;
- return tree;
- }
- await waitForQuiet();
- return {
- tree: buildNode(docAcc)
- };
- }
}
diff --git a/browser_patches/firefox/juggler/content/Runtime.js b/browser_patches/firefox/juggler/content/Runtime.js
index ad8720a1d3..81fc59e146 100644
--- a/browser_patches/firefox/juggler/content/Runtime.js
+++ b/browser_patches/firefox/juggler/content/Runtime.js
@@ -164,7 +164,7 @@ class Runtime {
emitEvent(this.events.onRuntimeError, {
executionContext,
message: message.errorMessage,
- stack: message.stack.toString(),
+ stack: message.stack ? message.stack.toString() : '',
});
}
},
diff --git a/browser_patches/firefox/juggler/content/main.js b/browser_patches/firefox/juggler/content/main.js
index 61e410630c..9eb07d399c 100644
--- a/browser_patches/firefox/juggler/content/main.js
+++ b/browser_patches/firefox/juggler/content/main.js
@@ -16,7 +16,7 @@ const {PageAgent} = ChromeUtils.importESModule('chrome://juggler/content/content
const helper = new Helper();
export function initialize(browsingContext, docShell) {
- const data = { channel: undefined, pageAgent: undefined, frameTree: undefined, failedToOverrideTimezone: false };
+ const data = { channel: undefined, pageAgent: undefined, frameTree: undefined, };
const applySetting = {
geolocation: (geolocation) => {
@@ -41,10 +41,6 @@ export function initialize(browsingContext, docShell) {
docShell.bypassCSPEnabled = bypassCSP;
},
- timezoneId: (timezoneId) => {
- data.failedToOverrideTimezone = !docShell.overrideTimezone(timezoneId);
- },
-
locale: (locale) => {
docShell.languageOverride = locale;
},
@@ -94,10 +90,6 @@ export function initialize(browsingContext, docShell) {
// noop, just a rountrip.
},
- hasFailedToOverrideTimezone() {
- return data.failedToOverrideTimezone;
- },
-
async awaitViewportDimensions({width, height}) {
await new Promise(resolve => {
const listeners = [];
diff --git a/browser_patches/firefox/juggler/protocol/BrowserHandler.js b/browser_patches/firefox/juggler/protocol/BrowserHandler.js
index 970d8f8822..5e7e5ec468 100644
--- a/browser_patches/firefox/juggler/protocol/BrowserHandler.js
+++ b/browser_patches/firefox/juggler/protocol/BrowserHandler.js
@@ -255,7 +255,7 @@ export class BrowserHandler {
}
async ['Browser.setTimezoneOverride']({browserContextId, timezoneId}) {
- await this._targetRegistry.browserContextForId(browserContextId).applySetting('timezoneId', nullToUndefined(timezoneId));
+ await this._targetRegistry.browserContextForId(browserContextId).setTimezoneOverride(timezoneId);
}
async ['Browser.setTouchOverride']({browserContextId, hasTouch}) {
diff --git a/browser_patches/firefox/juggler/protocol/PageHandler.js b/browser_patches/firefox/juggler/protocol/PageHandler.js
index 1dab7d8803..008087c1bc 100644
--- a/browser_patches/firefox/juggler/protocol/PageHandler.js
+++ b/browser_patches/firefox/juggler/protocol/PageHandler.js
@@ -294,10 +294,6 @@ export class PageHandler {
this._pageNetwork.fulfillInterceptedRequest(requestId, status, statusText, headers, base64body);
}
- async ['Accessibility.getFullAXTree'](params) {
- return await this._contentPage.send('getFullAXTree', params);
- }
-
async ['Page.setFileInputFiles'](options) {
return await this._contentPage.send('setFileInputFiles', options);
}
@@ -504,30 +500,30 @@ export class PageHandler {
if (win.windowUtils.flushApzRepaints())
await helper.awaitTopic('apz-repaints-flushed');
- const watcher = new EventWatcher(this._pageEventSink, types, this._pendingEventWatchers);
const promises = [];
for (const type of types) {
- // This dispatches to the renderer synchronously.
- const jugglerEventId = win.windowUtils.jugglerSendMouseEvent(
+ promises.push(new Promise(resolve => win.synthesizeMouseEvent(
type,
x + boundingBox.left,
y + boundingBox.top,
- button,
- clickCount,
- modifiers,
- false /* aIgnoreRootScrollFrame */,
- 0.0 /* pressure */,
- 0 /* inputSource */,
- true /* isDOMEventSynthesized */,
- false /* isWidgetEventSynthesized */,
- buttons,
- win.windowUtils.DEFAULT_MOUSE_POINTER_ID /* pointerIdentifier */,
- false /* disablePointerEvent */
- );
- promises.push(watcher.ensureEvent(type, eventObject => eventObject.jugglerEventId === jugglerEventId));
+ {
+ identifier: win.windowUtils.DEFAULT_MOUSE_POINTER_ID,
+ button,
+ buttons,
+ clickCount,
+ modifiers,
+ pressure: 0.0,
+ inputSource: MouseEvent.MOZ_SOURCE_MOUSE,
+ },
+ {
+ isDOMEventSynthesized: true,
+ isWidgetEventSynthesized: false,
+ isAsyncEnabled: false,
+ },
+ resolve
+ )));
}
await Promise.all(promises);
- await watcher.dispose();
};
// We must switch to proper tab in the tabbed browser so that
@@ -545,21 +541,23 @@ export class PageHandler {
// viewport coordinates, then move the mouse off from the Web Content.
// This way we can eliminate all the hover effects.
// NOTE: since this won't go inside the renderer, there's no need to wait for ACK.
- win.windowUtils.sendMouseEvent(
+ win.synthesizeMouseEvent(
'mousemove',
0 /* x */,
0 /* y */,
- button,
- clickCount,
- modifiers,
- false /* aIgnoreRootScrollFrame */,
- 0.0 /* pressure */,
- 0 /* inputSource */,
- true /* isDOMEventSynthesized */,
- false /* isWidgetEventSynthesized */,
- buttons,
- win.windowUtils.DEFAULT_MOUSE_POINTER_ID /* pointerIdentifier */,
- false /* disablePointerEvent */
+ {
+ identifier: win.windowUtils.DEFAULT_MOUSE_POINTER_ID,
+ button,
+ clickCount,
+ modifiers,
+ pressure: 0.0,
+ inputSource: MouseEvent.MOZ_SOURCE_MOUSE,
+ },
+ {
+ ignoreRootScrollFrame: false,
+ isDOMEventSynthesized: true,
+ isWidgetEventSynthesized: false,
+ },
);
return;
}
diff --git a/browser_patches/firefox/juggler/protocol/Protocol.js b/browser_patches/firefox/juggler/protocol/Protocol.js
index 4cb44d679c..e7400e4a9b 100644
--- a/browser_patches/firefox/juggler/protocol/Protocol.js
+++ b/browser_patches/firefox/juggler/protocol/Protocol.js
@@ -144,45 +144,6 @@ runtimeTypes.AuxData = {
name: t.Optional(t.String),
};
-const axTypes = {};
-axTypes.AXTree = {
- role: t.String,
- name: t.String,
- children: t.Optional(t.Array(t.Recursive(axTypes, 'AXTree'))),
-
- selected: t.Optional(t.Boolean),
- focused: t.Optional(t.Boolean),
- pressed: t.Optional(t.Boolean),
- focusable: t.Optional(t.Boolean),
- haspopup: t.Optional(t.String),
- required: t.Optional(t.Boolean),
- invalid: t.Optional(t.Boolean),
- modal: t.Optional(t.Boolean),
- editable: t.Optional(t.Boolean),
- busy: t.Optional(t.Boolean),
- multiline: t.Optional(t.Boolean),
- readonly: t.Optional(t.Boolean),
- checked: t.Optional(t.Enum(['mixed', true])),
- expanded: t.Optional(t.Boolean),
- disabled: t.Optional(t.Boolean),
- multiselectable: t.Optional(t.Boolean),
-
- value: t.Optional(t.String),
- description: t.Optional(t.String),
-
- roledescription: t.Optional(t.String),
- valuetext: t.Optional(t.String),
- orientation: t.Optional(t.String),
- autocomplete: t.Optional(t.String),
- keyshortcuts: t.Optional(t.String),
-
- level: t.Optional(t.Number),
-
- tag: t.Optional(t.String),
-
- foundObject: t.Optional(t.Boolean),
-}
-
const networkTypes = {};
networkTypes.HTTPHeader = {
@@ -772,6 +733,7 @@ const Page = {
data: t.String,
deviceWidth: t.Number,
deviceHeight: t.Number,
+ timestamp: t.Number,
},
},
@@ -1001,23 +963,6 @@ const Page = {
},
};
-
-const Accessibility = {
- targets: ['page'],
- types: axTypes,
- events: {},
- methods: {
- 'getFullAXTree': {
- params: {
- objectId: t.Optional(t.String),
- },
- returns: {
- tree: axTypes.AXTree
- },
- }
- }
-}
-
export const protocol = {
- domains: {Browser, Heap, Page, Runtime, Network, Accessibility},
+ domains: {Browser, Heap, Page, Runtime, Network},
};
diff --git a/browser_patches/firefox/juggler/screencast/HeadlessWindowCapturer.cpp b/browser_patches/firefox/juggler/screencast/HeadlessWindowCapturer.cpp
index 75200db359..960294819d 100644
--- a/browser_patches/firefox/juggler/screencast/HeadlessWindowCapturer.cpp
+++ b/browser_patches/firefox/juggler/screencast/HeadlessWindowCapturer.cpp
@@ -18,9 +18,9 @@ using namespace webrtc;
namespace mozilla {
-rtc::scoped_refptr<webrtc::VideoCaptureModuleEx> HeadlessWindowCapturer::Create(HeadlessWidget* headlessWindow) {
- return rtc::scoped_refptr<webrtc::VideoCaptureModuleEx>(
- new rtc::RefCountedObject<HeadlessWindowCapturer>(headlessWindow)
+webrtc::scoped_refptr<webrtc::VideoCaptureModuleEx> HeadlessWindowCapturer::Create(HeadlessWidget* headlessWindow) {
+ return webrtc::scoped_refptr<webrtc::VideoCaptureModuleEx>(
+ new webrtc::RefCountedObject<HeadlessWindowCapturer>(headlessWindow)
);
}
@@ -32,16 +32,16 @@ HeadlessWindowCapturer::~HeadlessWindowCapturer() {
}
-void HeadlessWindowCapturer::RegisterCaptureDataCallback(rtc::VideoSinkInterface<webrtc::VideoFrame>* dataCallback) {
- rtc::CritScope lock2(&_callBackCs);
+void HeadlessWindowCapturer::RegisterCaptureDataCallback(webrtc::VideoSinkInterface<webrtc::VideoFrame>* dataCallback) {
+ webrtc::CritScope lock2(&_callBackCs);
_dataCallBacks.insert(dataCallback);
}
void HeadlessWindowCapturer::RegisterCaptureDataCallback(webrtc::RawVideoSinkInterface* dataCallback) {
}
-void HeadlessWindowCapturer::DeRegisterCaptureDataCallback(rtc::VideoSinkInterface<webrtc::VideoFrame>* dataCallback) {
- rtc::CritScope lock2(&_callBackCs);
+void HeadlessWindowCapturer::DeRegisterCaptureDataCallback(webrtc::VideoSinkInterface<webrtc::VideoFrame>* dataCallback) {
+ webrtc::CritScope lock2(&_callBackCs);
auto it = _dataCallBacks.find(dataCallback);
if (it != _dataCallBacks.end()) {
_dataCallBacks.erase(it);
@@ -49,12 +49,12 @@ void HeadlessWindowCapturer::DeRegisterCaptureDataCallback(rtc::VideoSinkInterfa
}
void HeadlessWindowCapturer::RegisterRawFrameCallback(webrtc::RawFrameCallback* rawFrameCallback) {
- rtc::CritScope lock2(&_callBackCs);
+ webrtc::CritScope lock2(&_callBackCs);
_rawFrameCallbacks.insert(rawFrameCallback);
}
void HeadlessWindowCapturer::DeRegisterRawFrameCallback(webrtc::RawFrameCallback* rawFrameCallback) {
- rtc::CritScope lock2(&_callBackCs);
+ webrtc::CritScope lock2(&_callBackCs);
auto it = _rawFrameCallbacks.find(rawFrameCallback);
if (it != _rawFrameCallbacks.end()) {
_rawFrameCallbacks.erase(it);
@@ -62,7 +62,7 @@ void HeadlessWindowCapturer::DeRegisterRawFrameCallback(webrtc::RawFrameCallback
}
void HeadlessWindowCapturer::NotifyFrameCaptured(const webrtc::VideoFrame& frame) {
- rtc::CritScope lock2(&_callBackCs);
+ webrtc::CritScope lock2(&_callBackCs);
for (auto dataCallBack : _dataCallBacks)
dataCallBack->OnFrame(frame);
}
@@ -97,7 +97,7 @@ int32_t HeadlessWindowCapturer::StartCapture(const webrtc::VideoCaptureCapabilit
#endif
{
- rtc::CritScope lock2(&_callBackCs);
+ webrtc::CritScope lock2(&_callBackCs);
for (auto rawFrameCallback : _rawFrameCallbacks) {
rawFrameCallback->OnRawFrame(dataSurface->GetData(), dataSurface->Stride(), frameInfo);
}
@@ -107,7 +107,7 @@ int32_t HeadlessWindowCapturer::StartCapture(const webrtc::VideoCaptureCapabilit
int width = dataSurface->GetSize().width;
int height = dataSurface->GetSize().height;
- rtc::scoped_refptr<I420Buffer> buffer = I420Buffer::Create(width, height);
+ webrtc::scoped_refptr<I420Buffer> buffer = I420Buffer::Create(width, height);
gfx::DataSourceSurface::ScopedMap map(dataSurface.get(), gfx::DataSourceSurface::MapType::READ);
if (!map.IsMapped()) {
@@ -130,7 +130,7 @@ int32_t HeadlessWindowCapturer::StartCapture(const webrtc::VideoCaptureCapabilit
return;
}
- VideoFrame captureFrame(buffer, 0, rtc::TimeMillis(), kVideoRotation_0);
+ VideoFrame captureFrame(buffer, 0, webrtc::TimeMillis(), kVideoRotation_0);
NotifyFrameCaptured(captureFrame);
});
return 0;
diff --git a/browser_patches/firefox/juggler/screencast/HeadlessWindowCapturer.h b/browser_patches/firefox/juggler/screencast/HeadlessWindowCapturer.h
index cb1bcbbfd7..66538444d3 100644
--- a/browser_patches/firefox/juggler/screencast/HeadlessWindowCapturer.h
+++ b/browser_patches/firefox/juggler/screencast/HeadlessWindowCapturer.h
@@ -22,12 +22,12 @@ class HeadlessWidget;
class HeadlessWindowCapturer : public webrtc::VideoCaptureModuleEx {
public:
- static rtc::scoped_refptr<webrtc::VideoCaptureModuleEx> Create(mozilla::widget::HeadlessWidget*);
+ static webrtc::scoped_refptr<webrtc::VideoCaptureModuleEx> Create(mozilla::widget::HeadlessWidget*);
void RegisterCaptureDataCallback(
- rtc::VideoSinkInterface<webrtc::VideoFrame>* dataCallback) override;
+ webrtc::VideoSinkInterface<webrtc::VideoFrame>* dataCallback) override;
void DeRegisterCaptureDataCallback(
- rtc::VideoSinkInterface<webrtc::VideoFrame>* dataCallback) override;
+ webrtc::VideoSinkInterface<webrtc::VideoFrame>* dataCallback) override;
int32_t StopCaptureIfAllClientsClose() override;
void RegisterRawFrameCallback(webrtc::RawFrameCallback* rawFrameCallback) override;
@@ -57,8 +57,8 @@ class HeadlessWindowCapturer : public webrtc::VideoCaptureModuleEx {
void NotifyFrameCaptured(const webrtc::VideoFrame& frame);
RefPtr<mozilla::widget::HeadlessWidget> mWindow;
- rtc::RecursiveCriticalSection _callBackCs;
- std::set<rtc::VideoSinkInterface<webrtc::VideoFrame>*> _dataCallBacks;
+ webrtc::RecursiveCriticalSection _callBackCs;
+ std::set<webrtc::VideoSinkInterface<webrtc::VideoFrame>*> _dataCallBacks;
std::set<webrtc::RawFrameCallback*> _rawFrameCallbacks;
};
diff --git a/browser_patches/firefox/juggler/screencast/ScreencastEncoder.cpp b/browser_patches/firefox/juggler/screencast/ScreencastEncoder.cpp
index 701361add0..103a6b4b1b 100644
--- a/browser_patches/firefox/juggler/screencast/ScreencastEncoder.cpp
+++ b/browser_patches/firefox/juggler/screencast/ScreencastEncoder.cpp
@@ -122,7 +122,7 @@ void createImage(unsigned int width, unsigned int height,
class ScreencastEncoder::VPXFrame {
public:
- VPXFrame(rtc::scoped_refptr<webrtc::VideoFrameBuffer>&& buffer, const gfx::IntMargin& margin)
+ VPXFrame(webrtc::scoped_refptr<webrtc::VideoFrameBuffer>&& buffer, const gfx::IntMargin& margin)
: m_frameBuffer(std::move(buffer))
, m_margin(margin)
{ }
@@ -209,7 +209,7 @@ public:
}
private:
- rtc::scoped_refptr<webrtc::VideoFrameBuffer> m_frameBuffer;
+ webrtc::scoped_refptr<webrtc::VideoFrameBuffer> m_frameBuffer;
gfx::IntMargin m_margin;
TimeDuration m_duration;
};
diff --git a/browser_patches/firefox/juggler/screencast/moz.build b/browser_patches/firefox/juggler/screencast/moz.build
index f89c54e037..2d51827214 100644
--- a/browser_patches/firefox/juggler/screencast/moz.build
+++ b/browser_patches/firefox/juggler/screencast/moz.build
@@ -21,6 +21,7 @@ XPCOM_MANIFESTS += [
]
LOCAL_INCLUDES += [
+ "!/dist/include/libwebrtc_overrides",
'/dom/media/systemservices',
'/media/libyuv/libyuv/include',
'/third_party/abseil-cpp',
diff --git a/browser_patches/firefox/juggler/screencast/nsIScreencastService.idl b/browser_patches/firefox/juggler/screencast/nsIScreencastService.idl
index 16c94371ba..0fb00d58d1 100644
--- a/browser_patches/firefox/juggler/screencast/nsIScreencastService.idl
+++ b/browser_patches/firefox/juggler/screencast/nsIScreencastService.idl
@@ -9,7 +9,7 @@ interface nsIDocShell;
[scriptable, uuid(0b5d32c4-aeeb-11eb-8529-0242ac130003)]
interface nsIScreencastServiceClient : nsISupports
{
- void screencastFrame(in AString frame, in uint32_t deviceWidth, in uint32_t deviceHeight);
+ void screencastFrame(in AString frame, in uint32_t deviceWidth, in uint32_t deviceHeight, in double timestamp);
void screencastStopped();
};
diff --git a/browser_patches/firefox/juggler/screencast/nsScreencastService.cpp b/browser_patches/firefox/juggler/screencast/nsScreencastService.cpp
index fa9d1a965c..0da87e83eb 100644
--- a/browser_patches/firefox/juggler/screencast/nsScreencastService.cpp
+++ b/browser_patches/firefox/juggler/screencast/nsScreencastService.cpp
@@ -44,7 +44,7 @@ const int kMaxFramesInFlight = 1;
StaticRefPtr<nsScreencastService> gScreencastService;
-rtc::scoped_refptr<webrtc::VideoCaptureModuleEx> CreateWindowCapturer(nsIWidget* widget) {
+webrtc::scoped_refptr<webrtc::VideoCaptureModuleEx> CreateWindowCapturer(nsIWidget* widget) {
if (gfxPlatform::IsHeadless()) {
HeadlessWidget* headlessWidget = static_cast<HeadlessWidget*>(widget);
return HeadlessWindowCapturer::Create(headlessWidget);
@@ -58,7 +58,7 @@ rtc::scoped_refptr<webrtc::VideoCaptureModuleEx> CreateWindowCapturer(nsIWidget*
windowId.AppendPrintf("%" PRIuPTR, rawWindowId);
bool captureCursor = false;
static int moduleId = 0;
- return rtc::scoped_refptr<webrtc::VideoCaptureModuleEx>(webrtc::DesktopCaptureImpl::Create(++moduleId, windowId.get(), camera::CaptureDeviceType::Window, captureCursor));
+ return webrtc::scoped_refptr<webrtc::VideoCaptureModuleEx>(webrtc::DesktopCaptureImpl::Create(++moduleId, windowId.get(), camera::CaptureDeviceType::Window, captureCursor));
}
nsresult generateUid(nsString& uid) {
@@ -79,12 +79,12 @@ nsresult generateUid(nsString& uid) {
}
}
-class nsScreencastService::Session : public rtc::VideoSinkInterface<webrtc::VideoFrame>,
+class nsScreencastService::Session : public webrtc::VideoSinkInterface<webrtc::VideoFrame>,
public webrtc::RawFrameCallback {
Session(
nsIScreencastServiceClient* client,
nsIWidget* widget,
- rtc::scoped_refptr<webrtc::VideoCaptureModuleEx>&& capturer,
+ webrtc::scoped_refptr<webrtc::VideoCaptureModuleEx>&& capturer,
std::unique_ptr<ScreencastEncoder> encoder,
int width, int height,
int viewportWidth, int viewportHeight,
@@ -108,7 +108,7 @@ class nsScreencastService::Session : public rtc::VideoSinkInterface<webrtc::Vide
static RefPtr<Session> Create(
nsIScreencastServiceClient* client,
nsIWidget* widget,
- rtc::scoped_refptr<webrtc::VideoCaptureModuleEx>&& capturer,
+ webrtc::scoped_refptr<webrtc::VideoCaptureModuleEx>&& capturer,
std::unique_ptr<ScreencastEncoder> encoder,
int width, int height,
int viewportWidth, int viewportHeight,
@@ -117,7 +117,7 @@ class nsScreencastService::Session : public rtc::VideoSinkInterface<webrtc::Vide
return do_AddRef(new Session(client, widget, std::move(capturer), std::move(encoder), width, height, viewportWidth, viewportHeight, margin, jpegQuality));
}
- rtc::scoped_refptr<webrtc::VideoCaptureModuleEx> ReuseCapturer(nsIWidget* widget) {
+ webrtc::scoped_refptr<webrtc::VideoCaptureModuleEx> ReuseCapturer(nsIWidget* widget) {
if (mWidget == widget)
return mCaptureModule;
return nullptr;
@@ -197,6 +197,7 @@ class nsScreencastService::Session : public rtc::VideoSinkInterface<webrtc::Vide
if (mFramesInFlight.load() >= kMaxFramesInFlight)
return;
+ double timestamp = (TimeStamp::Now() - TimeStamp::ProcessCreation()).ToSeconds();
int screenshotWidth = pageWidth;
int screenshotHeight = pageHeight;
int screenshotTopMargin = mMargin.TopBottom();
@@ -278,18 +279,18 @@ class nsScreencastService::Session : public rtc::VideoSinkInterface<webrtc::Vide
mFramesInFlight.fetch_add(1);
NS_DispatchToMainThread(NS_NewRunnableFunction(
- "NotifyScreencastFrame", [this, protect = RefPtr{this}, base64, pageWidth, pageHeight]() -> void {
+ "NotifyScreencastFrame", [this, protect = RefPtr{this}, base64, pageWidth, pageHeight, timestamp]() -> void {
if (mStopped)
return;
NS_ConvertUTF8toUTF16 utf16(base64);
- mClient->ScreencastFrame(utf16, pageWidth, pageHeight);
+ mClient->ScreencastFrame(utf16, pageWidth, pageHeight, timestamp);
}));
}
private:
RefPtr<nsIScreencastServiceClient> mClient;
nsIWidget* mWidget;
- rtc::scoped_refptr<webrtc::VideoCaptureModuleEx> mCaptureModule;
+ webrtc::scoped_refptr<webrtc::VideoCaptureModuleEx> mCaptureModule;
std::unique_ptr<ScreencastEncoder> mEncoder;
uint32_t mJpegQuality;
bool mStopped = false;
@@ -332,7 +333,7 @@ nsresult nsScreencastService::StartVideoRecording(nsIScreencastServiceClient* aC
return NS_ERROR_UNEXPECTED;
nsIWidget* widget = view->GetWidget();
- rtc::scoped_refptr<webrtc::VideoCaptureModuleEx> capturer = nullptr;
+ webrtc::scoped_refptr<webrtc::VideoCaptureModuleEx> capturer = nullptr;
for (auto& it : mIdToSession) {
capturer = it.second->ReuseCapturer(widget);
if (capturer)
diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff
index 25c06cbe42..9db85abb41 100644
--- a/browser_patches/firefox/patches/bootstrap.diff
+++ b/browser_patches/firefox/patches/bootstrap.diff
@@ -1,50 +1,5 @@
-diff --git a/accessible/interfaces/nsIAccessibleDocument.idl b/accessible/interfaces/nsIAccessibleDocument.idl
-index 6c932c14a03e9cbf70723171dc9a1006bd2c017d..6312131c94c6d7e994a4a49dd64b2b4c5777251f 100644
---- a/accessible/interfaces/nsIAccessibleDocument.idl
-+++ b/accessible/interfaces/nsIAccessibleDocument.idl
-@@ -73,4 +73,9 @@ interface nsIAccessibleDocument : nsISupports
- * The BrowsingContext of this document.
- */
- readonly attribute BrowsingContext browsingContext;
-+
-+ /**
-+ * Return whether it is updating.
-+ */
-+ readonly attribute boolean isUpdatePendingForJugglerAccessibility;
- };
-diff --git a/accessible/xpcom/xpcAccessibleDocument.cpp b/accessible/xpcom/xpcAccessibleDocument.cpp
-index 3229ee415b93b9a47d7d40605ed7b509744c94ad..c2cc38ded257a02de8922312057892bf9d0cad7b 100644
---- a/accessible/xpcom/xpcAccessibleDocument.cpp
-+++ b/accessible/xpcom/xpcAccessibleDocument.cpp
-@@ -151,6 +151,13 @@ xpcAccessibleDocument::GetBrowsingContext(
- return NS_OK;
- }
-
-+NS_IMETHODIMP
-+xpcAccessibleDocument::GetIsUpdatePendingForJugglerAccessibility(bool* updating) {
-+ NS_ENSURE_ARG_POINTER(updating);
-+ *updating = Intl()->Controller()->IsUpdatePending();
-+ return NS_OK;
-+}
-+
- ////////////////////////////////////////////////////////////////////////////////
- // xpcAccessibleDocument
-
-diff --git a/accessible/xpcom/xpcAccessibleDocument.h b/accessible/xpcom/xpcAccessibleDocument.h
-index 9b6effc38fbecb50897a93b49c41d4453b10fb7f..939ff9615bd422eec186d8164e2ac7e643f39beb 100644
---- a/accessible/xpcom/xpcAccessibleDocument.h
-+++ b/accessible/xpcom/xpcAccessibleDocument.h
-@@ -48,6 +48,8 @@ class xpcAccessibleDocument : public xpcAccessibleHyperText,
- nsIAccessibleDocument** aDocument) final;
- NS_IMETHOD GetBrowsingContext(dom::BrowsingContext** aBrowsingContext) final;
-
-+ NS_IMETHOD GetIsUpdatePendingForJugglerAccessibility(bool* aUpdating) final;
-+
- /**
- * Return XPCOM wrapper for the internal accessible.
- */
diff --git a/browser/app/winlauncher/LauncherProcessWin.cpp b/browser/app/winlauncher/LauncherProcessWin.cpp
-index 8167d2b81c918e02ce757f7f448f22e07c29d140..3ae798880acfd8aa965ae08051f2f81855133711 100644
+index 9c991f1dd24e1e00d9073d3acaa21275be133ff2..d2ffc70ae4a3ab5a56cd660b1723bf90ae3df13b 100644
--- a/browser/app/winlauncher/LauncherProcessWin.cpp
+++ b/browser/app/winlauncher/LauncherProcessWin.cpp
@@ -23,6 +23,7 @@
@@ -55,7 +10,7 @@ index 8167d2b81c918e02ce757f7f448f22e07c29d140..3ae798880acfd8aa965ae08051f2f818
#include <windows.h>
#include <processthreadsapi.h>
-@@ -422,8 +423,18 @@ Maybe<int> LauncherMain(int& argc, wchar_t* argv[],
+@@ -414,8 +415,18 @@ Maybe<int> LauncherMain(int& argc, wchar_t* argv[]) {
HANDLE stdHandles[] = {::GetStdHandle(STD_INPUT_HANDLE),
::GetStdHandle(STD_OUTPUT_HANDLE),
::GetStdHandle(STD_ERROR_HANDLE)};
@@ -76,10 +31,10 @@ index 8167d2b81c918e02ce757f7f448f22e07c29d140..3ae798880acfd8aa965ae08051f2f818
DWORD creationFlags = CREATE_SUSPENDED | CREATE_UNICODE_ENVIRONMENT;
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
-index 6bbc4016cd6d56e8625e808b5070515a23de7600..2fb56fb1afa5b108a426737cb5e62dc42a199354 100644
+index 0e195e47d97b05caedeab65679e8e32a501ac629..d7ecbe4648684e9afa368c63da7795aef4494c9b 100644
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
-@@ -59,6 +59,12 @@ browser/chrome/browser/builtin-addons/webcompat/shims/empty-shim.txt
+@@ -61,6 +61,12 @@ browser/chrome/browser/builtin-addons/webcompat/shims/empty-shim.txt
removed-files
#endif
@@ -93,10 +48,10 @@ index 6bbc4016cd6d56e8625e808b5070515a23de7600..2fb56fb1afa5b108a426737cb5e62dc4
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 2b4d35e060dc592bb70a1f2b7ceee68616c8202b..323abfaee37445942f7678037dd5b53792dd5ed4 100644
+index bb06e9224a4e195122d8a47ccf97c3481342cf86..2dee940107ee17eca548ce15bd745450b9698ecf 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -183,6 +183,9 @@
+@@ -194,6 +194,9 @@
@RESPATH@/chrome/remote.manifest
#endif
@@ -154,10 +109,10 @@ index d49c6fbf1bf83b832795fa674f6b41f223eef812..7ea3540947ff5f61b15f27fbf4b95564
const transportProvider = {
setListener(upgradeListener) {
diff --git a/docshell/base/BrowsingContext.cpp b/docshell/base/BrowsingContext.cpp
-index 97334bee3a111a538779789d3495805cec8b1e9a..67d030f2adecd9acc62665e2a627123148aa927d 100644
+index 9140f33a8021db167530eb199d8b2ba41fc2532b..2068d8a35d33385532e9a5a795fbaabc22147efd 100644
--- a/docshell/base/BrowsingContext.cpp
+++ b/docshell/base/BrowsingContext.cpp
-@@ -110,8 +110,15 @@ struct ParamTraits<mozilla::dom::DisplayMode>
+@@ -117,8 +117,15 @@ struct ParamTraits<mozilla::dom::DisplayMode>
template <>
struct ParamTraits<mozilla::dom::PrefersColorSchemeOverride>
@@ -175,7 +130,7 @@ index 97334bee3a111a538779789d3495805cec8b1e9a..67d030f2adecd9acc62665e2a6271231
template <>
struct ParamTraits<mozilla::dom::ForcedColorsOverride>
-@@ -2950,6 +2957,32 @@ void BrowsingContext::DidSet(FieldIndex<IDX_LanguageOverride>,
+@@ -3337,6 +3344,32 @@ void BrowsingContext::DidSet(FieldIndex<IDX_LanguageOverride>,
});
}
@@ -208,7 +163,7 @@ index 97334bee3a111a538779789d3495805cec8b1e9a..67d030f2adecd9acc62665e2a6271231
void BrowsingContext::DidSet(FieldIndex<IDX_MediumOverride>,
nsString&& aOldValue) {
MOZ_ASSERT(IsTop());
-@@ -3290,7 +3323,7 @@ void BrowsingContext::SetGeolocationServiceOverride(
+@@ -3684,7 +3717,7 @@ void BrowsingContext::SetGeolocationServiceOverride(
if (aGeolocationOverride.WasPassed()) {
if (!mGeolocationServiceOverride) {
mGeolocationServiceOverride = new nsGeolocationService();
@@ -217,7 +172,7 @@ index 97334bee3a111a538779789d3495805cec8b1e9a..67d030f2adecd9acc62665e2a6271231
}
mGeolocationServiceOverride->Update(aGeolocationOverride.Value());
} else if (RefPtr<nsGeolocationService> serviceOverride =
-@@ -3793,6 +3826,23 @@ void BrowsingContext::DidSet(FieldIndex<IDX_IsUnderHiddenEmbedderElement>,
+@@ -4209,6 +4242,23 @@ void BrowsingContext::DidSet(FieldIndex<IDX_IsUnderHiddenEmbedderElement>,
}
}
@@ -242,23 +197,24 @@ index 97334bee3a111a538779789d3495805cec8b1e9a..67d030f2adecd9acc62665e2a6271231
for (auto* context = GetCurrentWindowContext(); context;
context = context->GetParentWindowContext()) {
diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h
-index b42c32133c6490755ae4e1c599255418e6443011..afa502833ba55c94dbd30726d37450c460a69e2b 100644
+index 2d3a14d59922045197e474f5d097d7e16ce6ad8c..a35557768e7ef980384595711aa1df6d8c27bbd0 100644
--- a/docshell/base/BrowsingContext.h
+++ b/docshell/base/BrowsingContext.h
-@@ -205,10 +205,10 @@ struct EmbedderColorSchemes {
+@@ -206,11 +206,11 @@ struct EmbedderColorSchemes {
FIELD(GVInaudibleAutoplayRequestStatus, GVAutoplayRequestStatus) \
/* ScreenOrientation-related APIs */ \
FIELD(CurrentOrientationAngle, float) \
- FIELD(CurrentOrientationType, mozilla::dom::OrientationType) \
+ FIELD(CurrentOrientationType, dom::OrientationType) \
FIELD(OrientationLock, mozilla::hal::ScreenOrientation) \
+ FIELD(HasOrientationOverride, bool) \
FIELD(UserAgentOverride, nsString) \
- FIELD(TouchEventsOverrideInternal, mozilla::dom::TouchEventsOverride) \
+ FIELD(TouchEventsOverrideInternal, dom::TouchEventsOverride) \
FIELD(EmbedderElementType, Maybe<nsString>) \
FIELD(MessageManagerGroup, nsString) \
FIELD(MaxTouchPointsOverride, uint8_t) \
-@@ -246,6 +246,9 @@ struct EmbedderColorSchemes {
+@@ -251,6 +251,9 @@ struct EmbedderColorSchemes {
* <browser> embedder element. */ \
FIELD(EmbedderColorSchemes, EmbedderColorSchemes) \
FIELD(DisplayMode, dom::DisplayMode) \
@@ -268,7 +224,7 @@ index b42c32133c6490755ae4e1c599255418e6443011..afa502833ba55c94dbd30726d37450c4
/* The number of entries added to the session history because of this \
* browsing context. */ \
FIELD(HistoryEntryCount, uint32_t) \
-@@ -975,6 +978,14 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -1041,6 +1044,14 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
return GetForcedColorsOverride();
}
@@ -283,7 +239,7 @@ index b42c32133c6490755ae4e1c599255418e6443011..afa502833ba55c94dbd30726d37450c4
bool IsInBFCache() const;
bool AllowJavascript() const { return GetAllowJavascript(); }
-@@ -1146,6 +1157,11 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -1220,6 +1231,11 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
return IsTop();
}
@@ -295,7 +251,7 @@ index b42c32133c6490755ae4e1c599255418e6443011..afa502833ba55c94dbd30726d37450c4
bool CanSet(FieldIndex<IDX_ForcedColorsOverride>, dom::ForcedColorsOverride,
ContentParent*) {
return IsTop();
-@@ -1164,12 +1180,24 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -1239,6 +1255,9 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
void DidSet(FieldIndex<IDX_ForcedColorsOverride>,
dom::ForcedColorsOverride aOldValue);
@@ -305,8 +261,9 @@ index b42c32133c6490755ae4e1c599255418e6443011..afa502833ba55c94dbd30726d37450c4
template <typename Callback>
void WalkPresContexts(Callback&&);
void PresContextAffectingFieldChanged();
+@@ -1247,6 +1266,15 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
- void DidSet(FieldIndex<IDX_LanguageOverride>, nsString&& aOldValue);
+ void DidSet(FieldIndex<IDX_TimezoneOverride>, nsString&& aOldValue);
+ bool CanSet(FieldIndex<IDX_PrefersReducedMotionOverride>,
+ dom::PrefersReducedMotionOverride, ContentParent*) {
@@ -320,7 +277,7 @@ index b42c32133c6490755ae4e1c599255418e6443011..afa502833ba55c94dbd30726d37450c4
void DidSet(FieldIndex<IDX_MediumOverride>, nsString&& aOldValue);
bool CanSet(FieldIndex<IDX_SuspendMediaWhenInactive>, bool, ContentParent*) {
-@@ -1360,6 +1388,8 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -1437,6 +1465,8 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
void DidSet(FieldIndex<IDX_IsUnderHiddenEmbedderElement>, bool aOldValue);
@@ -330,19 +287,19 @@ index b42c32133c6490755ae4e1c599255418e6443011..afa502833ba55c94dbd30726d37450c4
// process. Deprecated. New code that might use this should generally be moved
// to WindowContext or be settable only by the parent process.
diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
-index 4953744c3f627bb68b78606d8ae4bf6ab649398a..17c7cc94dafc76cd72aacddfd633b7df58eeae78 100644
+index 89dcc881f3dafe2a67321e2ee9d6347905bde4f6..a9e52c060826a5846a743e4ad960670d0093f668 100644
--- a/docshell/base/CanonicalBrowsingContext.cpp
+++ b/docshell/base/CanonicalBrowsingContext.cpp
-@@ -267,6 +267,8 @@ void CanonicalBrowsingContext::ReplacedBy(
+@@ -271,6 +271,8 @@ void CanonicalBrowsingContext::ReplacedBy(
txn.SetForceOffline(GetForceOffline());
txn.SetTopInnerSizeForRFP(GetTopInnerSizeForRFP());
txn.SetIPAddressSpace(GetIPAddressSpace());
+ txn.SetPrefersReducedMotionOverride(GetPrefersReducedMotionOverride());
+ txn.SetForcedColorsOverride(GetForcedColorsOverride());
- // Propagate some settings on BrowsingContext replacement so they're not lost
- // on bfcached navigations. These are important for GeckoView (see bug
-@@ -1705,6 +1707,12 @@ void CanonicalBrowsingContext::LoadURI(nsIURI* aURI,
+ if (!GetLanguageOverride().IsEmpty()) {
+ // Reapply language override to update the corresponding realm.
+@@ -1892,6 +1894,12 @@ void CanonicalBrowsingContext::LoadURI(nsIURI* aURI,
return;
}
@@ -356,7 +313,7 @@ index 4953744c3f627bb68b78606d8ae4bf6ab649398a..17c7cc94dafc76cd72aacddfd633b7df
}
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
-index bf702818cf4116ec1cd911b6e7b5f7ddafa3e508..d846e5f6f900d2d69228331b80031bd1c18b08ed 100644
+index 39a832eccf7e7c0b64b2deb1214f82e7533b249a..6bbb911f00d86340a912fe030ee87382fcd69464 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -16,6 +16,12 @@
@@ -419,7 +376,7 @@ index bf702818cf4116ec1cd911b6e7b5f7ddafa3e508..d846e5f6f900d2d69228331b80031bd1
mAllowAuth(mItemType == typeContent),
mAllowKeywordFixup(false),
mDisableMetaRefreshWhenInactive(false),
-@@ -3037,6 +3055,232 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) {
+@@ -3039,6 +3057,208 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) {
return NS_OK;
}
@@ -528,30 +485,6 @@ index bf702818cf4116ec1cd911b6e7b5f7ddafa3e508..d846e5f6f900d2d69228331b80031bd1
+}
+
+NS_IMETHODIMP
-+nsDocShell::OverrideTimezone(const nsAString& aTimezoneOverride,
-+ bool* aSuccess) {
-+ NS_ENSURE_ARG(aSuccess);
-+ NS_LossyConvertUTF16toASCII timeZoneId(aTimezoneOverride);
-+ *aSuccess = nsJSUtils::SetTimeZoneOverride(timeZoneId.get());
-+
-+ // Set TZ which affects localtime_s().
-+ auto setTimeZoneEnv = [](const char* value) {
-+#if defined(_WIN32)
-+ return _putenv_s("TZ", value) == 0;
-+#else
-+ return setenv("TZ", value, true) == 0;
-+#endif /* _WIN32 */
-+ };
-+ if (*aSuccess) {
-+ *aSuccess = setTimeZoneEnv(timeZoneId.get());
-+ if (!*aSuccess) {
-+ fprintf(stderr, "Failed to set 'TZ' to '%s'\n", timeZoneId.get());
-+ }
-+ }
-+ return NS_OK;
-+}
-+
-+NS_IMETHODIMP
+nsDocShell::GetFileInputInterceptionEnabled(bool* aEnabled) {
+ MOZ_ASSERT(aEnabled);
+ *aEnabled = GetRootDocShell()->mFileInputInterceptionEnabled;
@@ -652,7 +585,7 @@ index bf702818cf4116ec1cd911b6e7b5f7ddafa3e508..d846e5f6f900d2d69228331b80031bd1
NS_IMETHODIMP
nsDocShell::GetIsNavigating(bool* aOut) {
*aOut = mIsNavigating;
-@@ -4819,7 +5063,7 @@ nsDocShell::GetVisibility(bool* aVisibility) {
+@@ -4833,7 +5053,7 @@ nsDocShell::GetVisibility(bool* aVisibility) {
}
void nsDocShell::ActivenessMaybeChanged() {
@@ -661,7 +594,7 @@ index bf702818cf4116ec1cd911b6e7b5f7ddafa3e508..d846e5f6f900d2d69228331b80031bd1
if (RefPtr<PresShell> presShell = GetPresShell()) {
presShell->ActivenessMaybeChanged();
}
-@@ -6881,6 +7125,10 @@ bool nsDocShell::CanSavePresentation(uint32_t aLoadType,
+@@ -6908,6 +7128,10 @@ bool nsDocShell::CanSavePresentation(uint32_t aLoadType,
return false; // no entry to save into
}
@@ -672,7 +605,7 @@ index bf702818cf4116ec1cd911b6e7b5f7ddafa3e508..d846e5f6f900d2d69228331b80031bd1
MOZ_ASSERT(!mozilla::SessionHistoryInParent(),
"mOSHE cannot be non-null with SHIP");
nsCOMPtr<nsIDocumentViewer> viewer = mOSHE->GetDocumentViewer();
-@@ -8637,6 +8885,12 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) {
+@@ -8662,6 +8886,12 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) {
true, // aForceNoOpener
getter_AddRefs(newBC));
MOZ_ASSERT(!newBC);
@@ -685,7 +618,7 @@ index bf702818cf4116ec1cd911b6e7b5f7ddafa3e508..d846e5f6f900d2d69228331b80031bd1
return rv;
}
-@@ -9934,6 +10188,16 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
+@@ -9977,6 +10207,16 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
nsINetworkPredictor::PREDICT_LOAD, attrs, nullptr);
nsCOMPtr<nsIRequest> req;
@@ -702,7 +635,7 @@ index bf702818cf4116ec1cd911b6e7b5f7ddafa3e508..d846e5f6f900d2d69228331b80031bd1
rv = DoURILoad(aLoadState, aCacheKey, getter_AddRefs(req));
if (NS_SUCCEEDED(rv)) {
-@@ -13323,6 +13587,9 @@ class OnLinkClickEvent : public Runnable {
+@@ -13392,6 +13632,9 @@ class OnLinkClickEvent : public Runnable {
mHandler->OnLinkClickSync(mContent, mLoadState, mNoOpenerImplied,
mTriggeringPrincipal);
}
@@ -712,7 +645,7 @@ index bf702818cf4116ec1cd911b6e7b5f7ddafa3e508..d846e5f6f900d2d69228331b80031bd1
return NS_OK;
}
-@@ -13439,6 +13706,8 @@ nsresult nsDocShell::OnLinkClick(
+@@ -13508,6 +13751,8 @@ nsresult nsDocShell::OnLinkClick(
nsCOMPtr<nsIRunnable> ev = new OnLinkClickEvent(
this, aContent, loadState, noOpenerImplied, aTriggeringPrincipal);
@@ -722,7 +655,7 @@ index bf702818cf4116ec1cd911b6e7b5f7ddafa3e508..d846e5f6f900d2d69228331b80031bd1
}
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
-index 3050f0a5a10c7f49f56cf325cd8bfe5e6508b5be..a4f4895f69a2eaa55f3eeae77bd6a3fb29931ad4 100644
+index 4241fdd315fa92cdcbdcdffb052ac992c015a6be..0068a3258630be2b5edaf6cdb6c35cc9ba9f5a0f 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -16,6 +16,7 @@
@@ -733,7 +666,7 @@ index 3050f0a5a10c7f49f56cf325cd8bfe5e6508b5be..a4f4895f69a2eaa55f3eeae77bd6a3fb
#include "mozilla/dom/WindowProxyHolder.h"
#include "nsCOMPtr.h"
#include "nsCharsetSource.h"
-@@ -80,6 +81,7 @@ class nsCommandManager;
+@@ -81,6 +82,7 @@ class nsCommandManager;
class nsDocShellEditorData;
class nsDOMNavigationTiming;
class nsDSURIContentListener;
@@ -741,7 +674,7 @@ index 3050f0a5a10c7f49f56cf325cd8bfe5e6508b5be..a4f4895f69a2eaa55f3eeae77bd6a3fb
class nsGlobalWindowOuter;
class FramingChecker;
-@@ -410,6 +412,15 @@ class nsDocShell final : public nsDocLoader,
+@@ -413,6 +415,15 @@ class nsDocShell final : public nsDocLoader,
void SetWillChangeProcess() { mWillChangeProcess = true; }
bool WillChangeProcess() { return mWillChangeProcess; }
@@ -757,7 +690,7 @@ index 3050f0a5a10c7f49f56cf325cd8bfe5e6508b5be..a4f4895f69a2eaa55f3eeae77bd6a3fb
// Create a content viewer within this nsDocShell for the given
// `WindowGlobalChild` actor.
nsresult CreateDocumentViewerForActor(
-@@ -1036,6 +1047,8 @@ class nsDocShell final : public nsDocLoader,
+@@ -1051,6 +1062,8 @@ class nsDocShell final : public nsDocLoader,
bool CSSErrorReportingEnabled() const { return mCSSErrorReportingEnabled; }
@@ -766,7 +699,7 @@ index 3050f0a5a10c7f49f56cf325cd8bfe5e6508b5be..a4f4895f69a2eaa55f3eeae77bd6a3fb
// 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
-@@ -1355,6 +1368,17 @@ class nsDocShell final : public nsDocLoader,
+@@ -1380,6 +1393,17 @@ class nsDocShell final : public nsDocLoader,
bool mAllowDNSPrefetch : 1;
bool mAllowWindowControl : 1;
bool mCSSErrorReportingEnabled : 1;
@@ -785,7 +718,7 @@ index 3050f0a5a10c7f49f56cf325cd8bfe5e6508b5be..a4f4895f69a2eaa55f3eeae77bd6a3fb
bool mAllowKeywordFixup : 1;
bool mDisableMetaRefreshWhenInactive : 1;
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
-index 763c7adb5ab9e3e56d6f1608899f6622997f272a..4f77795b5ce1f8fff79581987e017165dbdcbc1e 100644
+index 888d99bae849fcd2988388489edcfc56443d3e23..9162631741cbed86322668d1e0e7dd43b6f19a42 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -44,6 +44,7 @@ interface nsIURI;
@@ -796,7 +729,7 @@ index 763c7adb5ab9e3e56d6f1608899f6622997f272a..4f77795b5ce1f8fff79581987e017165
interface nsIEditor;
interface nsIEditingSession;
interface nsIInputStream;
-@@ -719,6 +720,45 @@ interface nsIDocShell : nsIDocShellTreeItem
+@@ -719,6 +720,43 @@ interface nsIDocShell : nsIDocShellTreeItem
*/
void synchronizeLayoutHistoryState();
@@ -812,8 +745,6 @@ index 763c7adb5ab9e3e56d6f1608899f6622997f272a..4f77795b5ce1f8fff79581987e017165
+
+ attribute AString languageOverride;
+
-+ boolean overrideTimezone(in AString timezoneId);
-+
+ cenum ReducedMotionOverride : 8 {
+ REDUCED_MOTION_OVERRIDE_REDUCE,
+ REDUCED_MOTION_OVERRIDE_NO_PREFERENCE,
@@ -843,10 +774,10 @@ index 763c7adb5ab9e3e56d6f1608899f6622997f272a..4f77795b5ce1f8fff79581987e017165
* 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 40da41ae4ac7d8d61c664e25bec8a74091d8b3e0..50ee1170e6d5b261334c7baccc63ed492b86ec38 100644
+index 55d24fe16311a286813f7668a227d2ef0cc7e5d7..ec0fb7817b109c420c1fa7d732003717f786b87f 100644
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
-@@ -3799,6 +3799,9 @@ void Document::SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages) {
+@@ -3936,6 +3936,9 @@ void Document::SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages) {
}
void Document::ApplySettingsFromCSP(bool aSpeculative) {
@@ -856,7 +787,7 @@ index 40da41ae4ac7d8d61c664e25bec8a74091d8b3e0..50ee1170e6d5b261334c7baccc63ed49
nsresult rv = NS_OK;
if (!aSpeculative) {
nsIContentSecurityPolicy* csp = PolicyContainer::GetCSP(mPolicyContainer);
-@@ -3887,6 +3890,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) {
+@@ -4024,6 +4027,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) {
MOZ_ASSERT(mPolicyContainer,
"Policy container must be initialized before CSP!");
@@ -868,7 +799,7 @@ index 40da41ae4ac7d8d61c664e25bec8a74091d8b3e0..50ee1170e6d5b261334c7baccc63ed49
// If this is a data document - no need to set CSP.
if (mLoadedAsData) {
return NS_OK;
-@@ -4753,6 +4761,10 @@ bool Document::HasFocus(ErrorResult& rv) const {
+@@ -4890,6 +4898,10 @@ bool Document::HasFocus(ErrorResult& rv) const {
return false;
}
@@ -879,7 +810,7 @@ index 40da41ae4ac7d8d61c664e25bec8a74091d8b3e0..50ee1170e6d5b261334c7baccc63ed49
if (!fm->IsInActiveWindow(bc)) {
return false;
}
-@@ -20326,6 +20338,35 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
+@@ -20404,6 +20416,35 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
return PreferenceSheet::PrefsFor(*this).mColorScheme;
}
@@ -916,10 +847,10 @@ index 40da41ae4ac7d8d61c664e25bec8a74091d8b3e0..50ee1170e6d5b261334c7baccc63ed49
if (!sLoadingForegroundTopLevelContentDocument) {
return false;
diff --git a/dom/base/Document.h b/dom/base/Document.h
-index 20f726a52f9f3591502597e20eeb8c07fe35feb2..c46f58ac88d536850169e6c51b9cfcb871d36e70 100644
+index a5177d3453b17ff3e570c38ae46cf002508de09d..bc32af54996216d2855259c19b9840235fa95ec1 100644
--- a/dom/base/Document.h
+++ b/dom/base/Document.h
-@@ -4252,6 +4252,8 @@ class Document : public nsINode,
+@@ -4253,6 +4253,8 @@ class Document : public nsINode,
// color-scheme meta tag.
ColorScheme DefaultColorScheme() const;
@@ -929,10 +860,10 @@ index 20f726a52f9f3591502597e20eeb8c07fe35feb2..c46f58ac88d536850169e6c51b9cfcb8
static bool AutomaticStorageAccessPermissionCanBeGranted(
diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
-index 11a57adbb57b0adccf7ae491e7d7757f838bd9dc..e478244cedc2089fb99b3153d7493b7d36d72ea9 100644
+index 69c9557c0611b3d60d18ea00a7a9a1b3fbc2c5df..4a9122e8e83fd4fdbf19b6bb1276b8b8a811a181 100644
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
-@@ -347,14 +347,18 @@ void Navigator::GetAppName(nsAString& aAppName) const {
+@@ -339,14 +339,18 @@ void Navigator::GetAppName(nsAString& aAppName) const {
* for more detail.
*/
/* static */
@@ -953,7 +884,7 @@ index 11a57adbb57b0adccf7ae491e7d7757f838bd9dc..e478244cedc2089fb99b3153d7493b7d
// Split values on commas.
for (nsDependentSubstring lang :
-@@ -406,7 +410,13 @@ void Navigator::GetLanguage(nsAString& aLanguage) {
+@@ -398,7 +402,13 @@ void Navigator::GetLanguage(nsAString& aLanguage) {
}
void Navigator::GetLanguages(nsTArray<nsString>& aLanguages) {
@@ -968,7 +899,7 @@ index 11a57adbb57b0adccf7ae491e7d7757f838bd9dc..e478244cedc2089fb99b3153d7493b7d
// The returned value is cached by the binding code. The window listens to the
// accept languages change and will clear the cache when needed. It has to
-@@ -2315,7 +2325,8 @@ bool Navigator::Webdriver() {
+@@ -2317,7 +2327,8 @@ bool Navigator::Webdriver() {
}
#endif
@@ -979,7 +910,7 @@ index 11a57adbb57b0adccf7ae491e7d7757f838bd9dc..e478244cedc2089fb99b3153d7493b7d
AutoplayPolicy Navigator::GetAutoplayPolicy(AutoplayPolicyMediaType aType) {
diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h
-index 893947475fbb8688becb1c1495385e4048d4927d..dfb50acf689223fdab7ef6f42afbbd53341e1b0b 100644
+index 08e715a9d73f29d06fb0bfbc9cd881c0b18e8b17..3509280cc5ad8a2d36b208d195dfe5f28138fb0b 100644
--- a/dom/base/Navigator.h
+++ b/dom/base/Navigator.h
@@ -220,7 +220,7 @@ class Navigator final : public nsISupports, public nsWrapperCache {
@@ -992,17 +923,10 @@ index 893947475fbb8688becb1c1495385e4048d4927d..dfb50acf689223fdab7ef6f42afbbd53
dom::MediaCapabilities* MediaCapabilities();
dom::MediaSession* MediaSession();
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
-index 7703ab18c104848eab9377769641d3b60e9bcf8e..3028fc5a7e6c54a7f4455f135e889d038eed378d 100644
+index 4d501d3939ca580783e2efd323e7a5b5f3a64223..3dfd95f37d246ca5a22ca6f2189fb6affd5c0982 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
-@@ -9528,11 +9528,13 @@ nsresult nsContentUtils::SendMouseEvent(
- int32_t aClickCount, int32_t aModifiers, bool aIgnoreRootScrollFrame,
- float aPressure, unsigned short aInputSourceArg, uint32_t aIdentifier,
- bool aToWindow, bool* aPreventDefault, bool aIsDOMEventSynthesized,
-- bool aIsWidgetEventSynthesized) {
-+ bool aIsWidgetEventSynthesized,
-+ bool convertToPointer, uint32_t aJugglerEventId) {
- MOZ_ASSERT(aWidget);
+@@ -9567,6 +9567,7 @@ Result<bool, nsresult> nsContentUtils::SynthesizeMouseEvent(
EventMessage msg;
Maybe<WidgetMouseEvent::ExitFrom> exitFrom;
bool contextMenuKey = false;
@@ -1010,7 +934,7 @@ index 7703ab18c104848eab9377769641d3b60e9bcf8e..3028fc5a7e6c54a7f4455f135e889d03
if (aType.EqualsLiteral("mousedown")) {
msg = eMouseDown;
} else if (aType.EqualsLiteral("mouseup")) {
-@@ -9558,6 +9560,12 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -9593,13 +9594,26 @@ Result<bool, nsresult> nsContentUtils::SynthesizeMouseEvent(
msg = eMouseHitTest;
} else if (aType.EqualsLiteral("MozMouseExploreByTouch")) {
msg = eMouseExploreByTouch;
@@ -1021,9 +945,8 @@ index 7703ab18c104848eab9377769641d3b60e9bcf8e..3028fc5a7e6c54a7f4455f135e889d03
+ msg = eDrop;
+ isPWDragEventMessage = true;
} else {
- return NS_ERROR_FAILURE;
+ return Err(NS_ERROR_FAILURE);
}
-@@ -9568,7 +9576,14 @@ nsresult nsContentUtils::SendMouseEvent(
Maybe<WidgetPointerEvent> pointerEvent;
Maybe<WidgetMouseEvent> mouseEvent;
@@ -1032,135 +955,34 @@ index 7703ab18c104848eab9377769641d3b60e9bcf8e..3028fc5a7e6c54a7f4455f135e889d03
+
+ if (isPWDragEventMessage) {
+ pwDragEvent.emplace(true, msg, aWidget);
-+ pwDragEvent->mReason = aIsWidgetEventSynthesized
++ pwDragEvent->mReason = aOptions.mIsWidgetEventSynthesized
+ ? WidgetMouseEvent::eSynthesized
+ : WidgetMouseEvent::eReal;
+ } else if (IsPointerEventMessage(msg)) {
- MOZ_ASSERT(!aIsWidgetEventSynthesized,
- "The event shouldn't be dispatched as a synthesized event");
- if (MOZ_UNLIKELY(aIsWidgetEventSynthesized)) {
-@@ -9587,8 +9602,11 @@ nsresult nsContentUtils::SendMouseEvent(
- contextMenuKey ? WidgetMouseEvent::eContextMenuKey
- : WidgetMouseEvent::eNormal);
- }
-+
+ if (MOZ_UNLIKELY(aOptions.mIsWidgetEventSynthesized)) {
+ MOZ_ASSERT_UNREACHABLE(
+ "The event shouldn't be dispatched as a synthesized event");
+@@ -9627,6 +9641,7 @@ Result<bool, nsresult> nsContentUtils::SynthesizeMouseEvent(
+ mozilla::widget::AutoSynthesizedEventCallbackNotifier notifier(callback);
+
WidgetMouseEvent& mouseOrPointerEvent =
+ pwDragEvent.isSome() ? pwDragEvent.ref() :
pointerEvent.isSome() ? pointerEvent.ref() : mouseEvent.ref();
-+
- mouseOrPointerEvent.pointerId = aIdentifier;
- mouseOrPointerEvent.mModifiers = GetWidgetModifiers(aModifiers);
- mouseOrPointerEvent.mButton = aButton;
-@@ -9601,6 +9619,8 @@ nsresult nsContentUtils::SendMouseEvent(
- mouseOrPointerEvent.mClickCount = aClickCount;
- mouseOrPointerEvent.mFlags.mIsSynthesizedForTests = aIsDOMEventSynthesized;
+ mouseOrPointerEvent.pointerId = aMouseEventData.mIdentifier;
+ mouseOrPointerEvent.mModifiers =
+@@ -9648,6 +9663,7 @@ Result<bool, nsresult> nsContentUtils::SynthesizeMouseEvent(
+ aOptions.mIsDOMEventSynthesized;
mouseOrPointerEvent.mExitFrom = exitFrom;
-+ mouseOrPointerEvent.mJugglerEventId = aJugglerEventId;
-+ mouseOrPointerEvent.convertToPointer = convertToPointer;
+ mouseOrPointerEvent.mCallbackId = notifier.SaveCallback();
++ mouseOrPointerEvent.convertToPointer = aOptions.mJugglerConvertToPointer;
nsPresContext* presContext = aPresShell->GetPresContext();
- if (!presContext) return NS_ERROR_FAILURE;
-diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
-index a1b96bce18e1904f4068057defa26142ebe8874b..f2fc14da57cf08139723980dedc33f2d3a9a431b 100644
---- a/dom/base/nsContentUtils.h
-+++ b/dom/base/nsContentUtils.h
-@@ -3080,8 +3080,9 @@ class nsContentUtils {
- int32_t aButton, int32_t aButtons, int32_t aClickCount,
- int32_t aModifiers, bool aIgnoreRootScrollFrame, float aPressure,
- unsigned short aInputSourceArg, uint32_t aIdentifier, bool aToWindow,
-- bool* aPreventDefault, bool aIsDOMEventSynthesized,
-- bool aIsWidgetEventSynthesized);
-+ bool* aPreventDefault,
-+ bool aIsDOMEventSynthesized, bool aIsWidgetEventSynthesized,
-+ bool convertToPointer = true, uint32_t aJugglerEventId = 0);
-
- static void FirePageShowEventForFrameLoaderSwap(
- nsIDocShellTreeItem* aItem,
-diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
-index c6c5833cd29ef041da348d4398513bab7ef2f9aa..424cc396bfc211bc7debb3df203cfa26da7a4c55 100644
---- a/dom/base/nsDOMWindowUtils.cpp
-+++ b/dom/base/nsDOMWindowUtils.cpp
-@@ -707,6 +707,26 @@ nsDOMWindowUtils::GetPresShellId(uint32_t* aPresShellId) {
- return NS_ERROR_FAILURE;
- }
-
-+static uint32_t sJugglerEventId = 1000;
-+
-+NS_IMETHODIMP
-+nsDOMWindowUtils::JugglerSendMouseEvent(
-+ const nsAString& aType, float aX, float aY, int32_t aButton,
-+ int32_t aClickCount, int32_t aModifiers, bool aIgnoreRootScrollFrame,
-+ float aPressure, unsigned short aInputSourceArg,
-+ bool aIsDOMEventSynthesized, bool aIsWidgetEventSynthesized,
-+ int32_t aButtons, uint32_t aIdentifier, bool aDisablePointerEvent,
-+ uint32_t* aJugglerEventId) {
-+ *aJugglerEventId = ++sJugglerEventId;
-+ return SendMouseEventCommon(
-+ aType, aX, aY, aButton, aClickCount, aModifiers, aIgnoreRootScrollFrame,
-+ aPressure, aInputSourceArg,
-+ aIdentifier, false,
-+ nullptr, aIsDOMEventSynthesized,
-+ aIsWidgetEventSynthesized,
-+ aButtons, !aDisablePointerEvent, *aJugglerEventId);
-+}
-+
- NS_IMETHODIMP
- nsDOMWindowUtils::SendMouseEvent(
- const nsAString& aType, float aX, float aY, int32_t aButton,
-@@ -721,7 +741,7 @@ nsDOMWindowUtils::SendMouseEvent(
- aOptionalArgCount >= 7 ? aIdentifier : DEFAULT_MOUSE_POINTER_ID, false,
- aPreventDefault, aOptionalArgCount >= 4 ? aIsDOMEventSynthesized : true,
- aOptionalArgCount >= 5 ? aIsWidgetEventSynthesized : false,
-- aOptionalArgCount >= 6 ? aButtons : MOUSE_BUTTONS_NOT_SPECIFIED);
-+ aOptionalArgCount >= 6 ? aButtons : MOUSE_BUTTONS_NOT_SPECIFIED, true, 0);
- }
-
- NS_IMETHODIMP
-@@ -739,7 +759,7 @@ nsDOMWindowUtils::SendMouseEventToWindow(
- aOptionalArgCount >= 7 ? aIdentifier : DEFAULT_MOUSE_POINTER_ID, true,
- nullptr, aOptionalArgCount >= 4 ? aIsDOMEventSynthesized : true,
- aOptionalArgCount >= 5 ? aIsWidgetEventSynthesized : false,
-- aOptionalArgCount >= 6 ? aButtons : MOUSE_BUTTONS_NOT_SPECIFIED);
-+ aOptionalArgCount >= 6 ? aButtons : MOUSE_BUTTONS_NOT_SPECIFIED, 0);
- }
-
- NS_IMETHODIMP
-@@ -748,7 +768,7 @@ nsDOMWindowUtils::SendMouseEventCommon(
- int32_t aClickCount, int32_t aModifiers, bool aIgnoreRootScrollFrame,
- float aPressure, unsigned short aInputSourceArg, uint32_t aPointerId,
- bool aToWindow, bool* aPreventDefault, bool aIsDOMEventSynthesized,
-- bool aIsWidgetEventSynthesized, int32_t aButtons) {
-+ bool aIsWidgetEventSynthesized, int32_t aButtons, bool aConvertToPointer, uint32_t aJugglerEventId) {
- RefPtr<PresShell> presShell = GetPresShell();
- if (!presShell) {
- return NS_ERROR_FAILURE;
-@@ -765,7 +785,7 @@ nsDOMWindowUtils::SendMouseEventCommon(
- presShell, widget, aType, refPoint, aButton, aButtons, aClickCount,
- aModifiers, aIgnoreRootScrollFrame, aPressure, aInputSourceArg,
- aPointerId, aToWindow, aPreventDefault, aIsDOMEventSynthesized,
-- aIsWidgetEventSynthesized);
-+ aIsWidgetEventSynthesized, aConvertToPointer, aJugglerEventId);
- }
-
- NS_IMETHODIMP
-diff --git a/dom/base/nsDOMWindowUtils.h b/dom/base/nsDOMWindowUtils.h
-index 4553ad5e7696055e861be5f840f8ce2bc54a5b29..1afc16325fcb63a3e510bdc387c8386eccf5d48b 100644
---- a/dom/base/nsDOMWindowUtils.h
-+++ b/dom/base/nsDOMWindowUtils.h
-@@ -94,7 +94,7 @@ class nsDOMWindowUtils final : public nsIDOMWindowUtils,
- int32_t aClickCount, int32_t aModifiers, bool aIgnoreRootScrollFrame,
- float aPressure, unsigned short aInputSourceArg, uint32_t aIdentifier,
- bool aToWindow, bool* aPreventDefault, bool aIsDOMEventSynthesized,
-- bool aIsWidgetEventSynthesized, int32_t aButtons);
-+ bool aIsWidgetEventSynthesized, int32_t aButtons, bool aConvertToPointer = true, uint32_t aJugglerEventId = 0);
-
- MOZ_CAN_RUN_SCRIPT
- nsresult SendTouchEventCommon(
+ if (!presContext) {
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
-index 62c4bfb96dbb6e64aeadd9e45c296905b7956811..83f1e7303e2ebabfc73921d9bd27a255304a2ea4 100644
+index 08781fd524336130578b4c7fa9ee96654259ebb8..b0bbf96ab91a44ee4ef1e9bfb28b17e0ff537faf 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
-@@ -1717,6 +1717,10 @@ Maybe<uint64_t> nsFocusManager::SetFocusInner(Element* aNewContent,
+@@ -1767,6 +1767,10 @@ Maybe<uint64_t> nsFocusManager::SetFocusInner(Element* aNewContent,
(GetActiveBrowsingContext() == newRootBrowsingContext);
}
@@ -1171,7 +993,7 @@ index 62c4bfb96dbb6e64aeadd9e45c296905b7956811..83f1e7303e2ebabfc73921d9bd27a255
// Exit fullscreen if a website focuses another window
if (StaticPrefs::full_screen_api_exit_on_windowRaise() &&
!isElementInActiveWindow && (aFlags & FLAG_RAISE)) {
-@@ -2303,6 +2307,7 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
+@@ -2353,6 +2357,7 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
bool aIsLeavingDocument, bool aAdjustWidget,
bool aRemainActive, Element* aElementToFocus,
uint64_t aActionId) {
@@ -1179,7 +1001,7 @@ index 62c4bfb96dbb6e64aeadd9e45c296905b7956811..83f1e7303e2ebabfc73921d9bd27a255
LOGFOCUS(("<<Blur begin actionid: %" PRIu64 ">>", aActionId));
// hold a reference to the focused content, which may be null
-@@ -2346,6 +2351,11 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
+@@ -2396,6 +2401,11 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
return true;
}
@@ -1191,7 +1013,7 @@ index 62c4bfb96dbb6e64aeadd9e45c296905b7956811..83f1e7303e2ebabfc73921d9bd27a255
// Keep a ref to presShell since dispatching the DOM event may cause
// the document to be destroyed.
RefPtr<PresShell> presShell = docShell->GetPresShell();
-@@ -3046,7 +3056,9 @@ void nsFocusManager::RaiseWindow(nsPIDOMWindowOuter* aWindow,
+@@ -3094,7 +3104,9 @@ void nsFocusManager::RaiseWindow(nsPIDOMWindowOuter* aWindow,
}
}
@@ -1203,10 +1025,10 @@ index 62c4bfb96dbb6e64aeadd9e45c296905b7956811..83f1e7303e2ebabfc73921d9bd27a255
// 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 5e2844f6e65da71ca9e1dadb1a88a74ab45f485c..a8f033e17ffbc28261072d561c89914d4bd2e325 100644
+index bc578db43fc5311fb0ee423bf18446a156d28f84..e26964422e35455a390e46a8cb990f6a0e3a5509 100644
--- a/dom/base/nsGlobalWindowOuter.cpp
+++ b/dom/base/nsGlobalWindowOuter.cpp
-@@ -2511,10 +2511,16 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument,
+@@ -2516,10 +2516,16 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument,
}();
if (!isContentAboutBlankInChromeDocshell) {
@@ -1227,7 +1049,7 @@ index 5e2844f6e65da71ca9e1dadb1a88a74ab45f485c..a8f033e17ffbc28261072d561c89914d
}
}
-@@ -2634,6 +2640,19 @@ void nsGlobalWindowOuter::DispatchDOMWindowCreated() {
+@@ -2639,6 +2645,19 @@ void nsGlobalWindowOuter::DispatchDOMWindowCreated() {
}
}
@@ -1248,10 +1070,10 @@ index 5e2844f6e65da71ca9e1dadb1a88a74ab45f485c..a8f033e17ffbc28261072d561c89914d
void nsGlobalWindowOuter::SetDocShell(nsDocShell* aDocShell) {
diff --git a/dom/base/nsGlobalWindowOuter.h b/dom/base/nsGlobalWindowOuter.h
-index 1fbb506b07714f9ab2a2c9aff3683aa7fec4b156..42878f8f0c6365c7e2958a3b35fce0e7db9abfff 100644
+index f9568d471ae3b741bd251536afbe0fead2ef32fc..f289091fda0a83528e7e13cd39b3717794b0fb05 100644
--- a/dom/base/nsGlobalWindowOuter.h
+++ b/dom/base/nsGlobalWindowOuter.h
-@@ -318,6 +318,7 @@ class nsGlobalWindowOuter final : public mozilla::dom::EventTarget,
+@@ -316,6 +316,7 @@ class nsGlobalWindowOuter final : public mozilla::dom::EventTarget,
// Outer windows only.
void DispatchDOMWindowCreated();
@@ -1260,10 +1082,10 @@ index 1fbb506b07714f9ab2a2c9aff3683aa7fec4b156..42878f8f0c6365c7e2958a3b35fce0e7
// Outer windows only.
virtual void EnsureSizeAndPositionUpToDate() override;
diff --git a/dom/base/nsINode.cpp b/dom/base/nsINode.cpp
-index 7b8da8b4a5e8de02d0d2e1befc8407da88fbf890..533f3bf77e1ef78dd231ac899e3d8032938ea812 100644
+index 29336862ea9be2c5c870a7e7a55d9843bddedbbf..10126e613762585399597b1b9843ca019099e23a 100644
--- a/dom/base/nsINode.cpp
+++ b/dom/base/nsINode.cpp
-@@ -1500,6 +1500,61 @@ void nsINode::GetBoxQuadsFromWindowOrigin(const BoxQuadOptions& aOptions,
+@@ -1509,6 +1509,61 @@ void nsINode::GetBoxQuadsFromWindowOrigin(const BoxQuadOptions& aOptions,
mozilla::GetBoxQuadsFromWindowOrigin(this, aOptions, aResult, aRv);
}
@@ -1326,10 +1148,10 @@ index 7b8da8b4a5e8de02d0d2e1befc8407da88fbf890..533f3bf77e1ef78dd231ac899e3d8032
DOMQuad& aQuad, const GeometryNode& aFrom,
const ConvertCoordinateOptions& aOptions, CallerType aCallerType,
diff --git a/dom/base/nsINode.h b/dom/base/nsINode.h
-index c3d84856e1bc92caf0437be312ccdbf7a2726ba5..d81c8e7152ca79b0fbb1ebee0f6f3aa40d0f34e2 100644
+index 313d829a9a9da32a2fc2db6643e74c804322baed..f8c1f29a9a8a0dbafdc0ace13620671fd928808a 100644
--- a/dom/base/nsINode.h
+++ b/dom/base/nsINode.h
-@@ -2421,6 +2421,10 @@ class nsINode : public mozilla::dom::EventTarget {
+@@ -2499,6 +2499,10 @@ class nsINode : public mozilla::dom::EventTarget {
nsTArray<RefPtr<DOMQuad>>& aResult,
ErrorResult& aRv);
@@ -1340,36 +1162,8 @@ index c3d84856e1bc92caf0437be312ccdbf7a2726ba5..d81c8e7152ca79b0fbb1ebee0f6f3aa4
already_AddRefed<DOMQuad> ConvertQuadFromNode(
DOMQuad& aQuad, const TextOrElementOrDocument& aFrom,
const ConvertCoordinateOptions& aOptions, CallerType aCallerType,
-diff --git a/dom/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp
-index aed59277e27a5a90f4244dd4513f9b4feb5858c3..26750fa09bead1ffabb22482468dea5999899f18 100644
---- a/dom/base/nsJSUtils.cpp
-+++ b/dom/base/nsJSUtils.cpp
-@@ -151,6 +151,11 @@ bool nsJSUtils::GetEnvironmentChainForElement(JSContext* aCx, Element* aElement,
- return true;
- }
-
-+/* static */
-+bool nsJSUtils::SetTimeZoneOverride(const char* timezoneId) {
-+ return JS::SetTimeZoneOverride(timezoneId);
-+}
-+
- /* static */
- void nsJSUtils::ResetTimeZone() { JS::ResetTimeZone(); }
-
-diff --git a/dom/base/nsJSUtils.h b/dom/base/nsJSUtils.h
-index f32e21752d5013bf143eb45391ab9218debab08e..83763d2354dade2f8d2b7930ba18ae91c55133ad 100644
---- a/dom/base/nsJSUtils.h
-+++ b/dom/base/nsJSUtils.h
-@@ -75,6 +75,7 @@ class nsJSUtils {
- mozilla::dom::Element* aElement,
- JS::EnvironmentChain& aEnvChain);
-
-+ static bool SetTimeZoneOverride(const char* timezoneId);
- static void ResetTimeZone();
-
- static bool DumpEnabled();
diff --git a/dom/chrome-webidl/BrowsingContext.webidl b/dom/chrome-webidl/BrowsingContext.webidl
-index 6d150cc3ad77f694af5aa943c60eac37ba0733c0..9e68e18601cfb3e9e9c03b4bf0057c1a3d50a9d5 100644
+index 9730cea647caedaeca4dcbe703e209d79a3440a7..79da6984a47bcbbc9b9ae650f083ec3d7e4a838e 100644
--- a/dom/chrome-webidl/BrowsingContext.webidl
+++ b/dom/chrome-webidl/BrowsingContext.webidl
@@ -62,6 +62,26 @@ enum ForcedColorsOverride {
@@ -1399,7 +1193,7 @@ index 6d150cc3ad77f694af5aa943c60eac37ba0733c0..9e68e18601cfb3e9e9c03b4bf0057c1a
/**
* Allowed overrides of platform/pref default behaviour for touch events.
*/
-@@ -228,6 +248,12 @@ interface BrowsingContext {
+@@ -235,6 +255,12 @@ interface BrowsingContext {
// Forced-colors simulation, for DevTools
[SetterThrows] attribute ForcedColorsOverride forcedColorsOverride;
@@ -1413,10 +1207,10 @@ index 6d150cc3ad77f694af5aa943c60eac37ba0733c0..9e68e18601cfb3e9e9c03b4bf0057c1a
* 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 52cf33bfc863d5ef1d3ac889ddfba3023600d60a..ccb521f367b8ccc8c40d8bad78aa621ab1b074c0 100644
+index 31c317670b9748defb7cbf937eff73cdb8ea95d8..904d209e8fbc8b56ee5e6056fbad2b21290d1913 100644
--- a/dom/fetch/Fetch.cpp
+++ b/dom/fetch/Fetch.cpp
-@@ -704,6 +704,12 @@ already_AddRefed<Promise> FetchRequest(nsIGlobalObject* aGlobal,
+@@ -699,6 +699,12 @@ already_AddRefed<Promise> FetchRequest(nsIGlobalObject* aGlobal,
ipcArgs.hasCSPEventListener() = false;
ipcArgs.isWorkerRequest() = false;
@@ -1428,9 +1222,9 @@ index 52cf33bfc863d5ef1d3ac889ddfba3023600d60a..ccb521f367b8ccc8c40d8bad78aa621a
+
actor->DoFetchOp(ipcArgs);
- mozilla::glean::networking::fetch_keepalive_request_count.Get("main"_ns)
+ return p.forget();
diff --git a/dom/fetch/FetchService.cpp b/dom/fetch/FetchService.cpp
-index 1734429e8eeb155b742211ca58afcbeb73a8bf7c..15635a2e5c266f8085093a0d17288abe8ed54d9e 100644
+index 77460bfa970fdcc62d58c9dd00195fc92ffba3c2..09c2a98569238396a275f8da3f533f8b163517ff 100644
--- a/dom/fetch/FetchService.cpp
+++ b/dom/fetch/FetchService.cpp
@@ -268,6 +268,14 @@ RefPtr<FetchServicePromises> FetchService::FetchInstance::Fetch() {
@@ -1449,7 +1243,7 @@ index 1734429e8eeb155b742211ca58afcbeb73a8bf7c..15635a2e5c266f8085093a0d17288abe
auto& args = mArgs.as<WorkerFetchArgs>();
mFetchDriver->SetWorkerScript(args.mWorkerScript);
diff --git a/dom/geolocation/Geolocation.cpp b/dom/geolocation/Geolocation.cpp
-index 70ce9ce97c6d0ccba8b4129c55079cf9122e5b17..1c503c68c2c0949cfdaa18a76a263a81807952e1 100644
+index 224b0f421a746fa08f8c374c2b213f8581cb95b4..a79a0674587e8091c0e38e97919768c1b44370d5 100644
--- a/dom/geolocation/Geolocation.cpp
+++ b/dom/geolocation/Geolocation.cpp
@@ -394,7 +394,10 @@ nsGeolocationRequest::Allow(JS::Handle<JS::Value> aChoices) {
@@ -1514,10 +1308,10 @@ index 70ce9ce97c6d0ccba8b4129c55079cf9122e5b17..1c503c68c2c0949cfdaa18a76a263a81
if (XRE_IsContentProcess()) {
diff --git a/dom/geolocation/Geolocation.h b/dom/geolocation/Geolocation.h
-index 57814242d551774e81403b7fdc20c795deadb625..c48c1b19a8d5499784ffb7b50d5e88e40c7b2a05 100644
+index d46e2e88b121688f62bbd43755791a077cfa1fe8..e69d62ffb4e732137b7a0ec0385358f3347630f3 100644
--- a/dom/geolocation/Geolocation.h
+++ b/dom/geolocation/Geolocation.h
-@@ -67,7 +67,7 @@ class nsGeolocationService final : public nsIGeolocationUpdate,
+@@ -64,7 +64,7 @@ class nsGeolocationService final : public nsIGeolocationUpdate,
nsGeolocationService() = default;
@@ -1526,7 +1320,7 @@ index 57814242d551774e81403b7fdc20c795deadb625..c48c1b19a8d5499784ffb7b50d5e88e4
// Management of the Geolocation objects
void AddLocator(mozilla::dom::Geolocation* aLocator);
-@@ -92,6 +92,8 @@ class nsGeolocationService final : public nsIGeolocationUpdate,
+@@ -89,6 +89,8 @@ class nsGeolocationService final : public nsIGeolocationUpdate,
void UpdateAccuracy(bool aForceHigh = false);
bool HighAccuracyRequested();
@@ -1535,7 +1329,7 @@ index 57814242d551774e81403b7fdc20c795deadb625..c48c1b19a8d5499784ffb7b50d5e88e4
private:
~nsGeolocationService();
-@@ -118,6 +120,8 @@ class nsGeolocationService final : public nsIGeolocationUpdate,
+@@ -115,6 +117,8 @@ class nsGeolocationService final : public nsIGeolocationUpdate,
// Nothing() if not being started, or a boolean reflecting the requested
// accuracy.
mozilla::Maybe<bool> mStarting;
@@ -1545,18 +1339,18 @@ index 57814242d551774e81403b7fdc20c795deadb625..c48c1b19a8d5499784ffb7b50d5e88e4
namespace mozilla::dom {
diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp
-index 5b0228d4a61dfe2b95e7a3ce016217007e8dee12..b753b0fceeec3278cb026d9137aafab5fb6ef968 100644
+index be7606950b20e952b078e9fffbfc30994971306a..6b84281c80c3d68c42b008cc4650f00d88376617 100644
--- a/dom/html/HTMLInputElement.cpp
+++ b/dom/html/HTMLInputElement.cpp
-@@ -64,6 +64,7 @@
- #include "mozilla/dom/Document.h"
- #include "mozilla/dom/HTMLDataListElement.h"
- #include "mozilla/dom/HTMLOptionElement.h"
+@@ -60,6 +60,7 @@
+ #include "nsBaseCommandController.h"
+ #include "nsCRTGlue.h"
+ #include "nsColorControlFrame.h"
+#include "nsDocShell.h"
- #include "nsIFrame.h"
- #include "nsRangeFrame.h"
#include "nsError.h"
-@@ -817,6 +818,13 @@ nsresult HTMLInputElement::InitFilePicker(FilePickerType aType) {
+ #include "nsFileControlFrame.h"
+ #include "nsFocusManager.h"
+@@ -850,6 +851,13 @@ nsresult HTMLInputElement::InitFilePicker(FilePickerType aType) {
return NS_ERROR_FAILURE;
}
@@ -1570,79 +1364,8 @@ index 5b0228d4a61dfe2b95e7a3ce016217007e8dee12..b753b0fceeec3278cb026d9137aafab5
if (IsPickerBlocked(doc)) {
return NS_OK;
}
-diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl
-index 64a2dad65911395ea7eb8ded3374ae6bdd31cf3c..e333c802f8a9232e58d963e05187c0a1b30948f5 100644
---- a/dom/interfaces/base/nsIDOMWindowUtils.idl
-+++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
-@@ -390,6 +390,26 @@ cenum AsyncEnabledOption : 8 {
- ASYNC_ENABLED = 1
- };
-
-+ /**
-+ * Playwright: a separate method to dispatch mouse event with a
-+ * specific `jugglerEventId`.
-+ */
-+ [can_run_script]
-+ unsigned long jugglerSendMouseEvent(in AString aType,
-+ in float aX,
-+ in float aY,
-+ in long aButton,
-+ in long aClickCount,
-+ in long aModifiers,
-+ in boolean aIgnoreRootScrollFrame,
-+ in float aPressure,
-+ in unsigned short aInputSourceArg,
-+ in boolean aIsDOMEventSynthesized,
-+ in boolean aIsWidgetEventSynthesized,
-+ in long aButtons,
-+ in unsigned long aIdentifier,
-+ in boolean aDisablePointerEvent);
-+
- /** Synthesize a touch event. The event types supported are:
- * touchstart, touchend, touchmove, and touchcancel
- *
-diff --git a/dom/ipc/BrowserChild.cpp b/dom/ipc/BrowserChild.cpp
-index 780550d573644bcfe4a9bc03243aa4559a62d979..9ed69194ef329aad1e8a3e2c06041a443e4bc6ba 100644
---- a/dom/ipc/BrowserChild.cpp
-+++ b/dom/ipc/BrowserChild.cpp
-@@ -1744,6 +1744,21 @@ void BrowserChild::HandleRealMouseButtonEvent(const WidgetMouseEvent& aEvent,
- if (postLayerization) {
- postLayerization->Register();
- }
-+
-+ // Playwright: notify content that mouse event has been received and handled.
-+ nsCOMPtr<nsIObserverService> observerService =
-+ mozilla::services::GetObserverService();
-+ if (observerService && aEvent.mJugglerEventId) {
-+ if (aEvent.mMessage == eMouseUp) {
-+ observerService->NotifyObservers(nullptr, "juggler-mouse-event-hit-renderer", NS_ConvertASCIItoUTF16(nsPrintfCString("mouseup %" PRIu32, aEvent.mJugglerEventId)).get());
-+ } else if (aEvent.mMessage == eMouseDown) {
-+ observerService->NotifyObservers(nullptr, "juggler-mouse-event-hit-renderer", NS_ConvertASCIItoUTF16(nsPrintfCString("mousedown %" PRIu32, aEvent.mJugglerEventId)).get());
-+ } else if (aEvent.mMessage == eMouseMove) {
-+ observerService->NotifyObservers(nullptr, "juggler-mouse-event-hit-renderer", NS_ConvertASCIItoUTF16(nsPrintfCString("mousemove %" PRIu32, aEvent.mJugglerEventId)).get());
-+ } else if (aEvent.mMessage == eContextMenu) {
-+ observerService->NotifyObservers(nullptr, "juggler-mouse-event-hit-renderer", NS_ConvertASCIItoUTF16(nsPrintfCString("contextmenu %" PRIu32, aEvent.mJugglerEventId)).get());
-+ }
-+ }
- }
-
- mozilla::ipc::IPCResult BrowserChild::RecvNormalPriorityRealMouseButtonEvent(
-diff --git a/dom/ipc/CoalescedMouseData.cpp b/dom/ipc/CoalescedMouseData.cpp
-index 83aa0d08839f6fa5a150e5791b9b717e5aa9e751..fc1e1140ac7c6cda8cf116027c2fc2898dbe9d4b 100644
---- a/dom/ipc/CoalescedMouseData.cpp
-+++ b/dom/ipc/CoalescedMouseData.cpp
-@@ -72,6 +72,9 @@ bool CoalescedMouseData::CanCoalesce(const WidgetMouseEvent& aEvent,
- mCoalescedInputEvent->pointerId != aEvent.pointerId ||
- mCoalescedInputEvent->mButton != aEvent.mButton ||
- mCoalescedInputEvent->mButtons != aEvent.mButtons || mGuid != aGuid ||
-+ // `mJugglerEventId` is 0 for non-juggler events and a unique number for
-+ // juggler-emitted events.
-+ mCoalescedInputEvent->mJugglerEventId != aEvent.mJugglerEventId ||
- mInputBlockId != aInputBlockId) {
- return false;
- }
diff --git a/dom/media/systemservices/video_engine/desktop_capture_impl.cc b/dom/media/systemservices/video_engine/desktop_capture_impl.cc
-index db777994b583efc2a3533e7d4534fff894c733bb..eb317c19b2422bd983d5e132c9ee4dac31687428 100644
+index ad5f871cf65d86b24a6aef0a17ad227adbe0fb24..60ff2f79df8d824384a0b1768b163bda4fbc3148 100644
--- a/dom/media/systemservices/video_engine/desktop_capture_impl.cc
+++ b/dom/media/systemservices/video_engine/desktop_capture_impl.cc
@@ -53,9 +53,10 @@ namespace webrtc {
@@ -1652,9 +1375,9 @@ index db777994b583efc2a3533e7d4534fff894c733bb..eb317c19b2422bd983d5e132c9ee4dac
- const CaptureDeviceType aType) {
+ const CaptureDeviceType aType,
+ bool aCaptureCursor) {
- return new rtc::RefCountedObject<DesktopCaptureImpl>(aModuleId, aUniqueId,
-- aType);
-+ aType, aCaptureCursor);
+ return new webrtc::RefCountedObject<DesktopCaptureImpl>(aModuleId, aUniqueId,
+- aType);
++ aType, aCaptureCursor);
}
static DesktopCaptureOptions CreateDesktopCaptureOptions() {
@@ -1693,12 +1416,12 @@ index db777994b583efc2a3533e7d4534fff894c733bb..eb317c19b2422bd983d5e132c9ee4dac
}
+void DesktopCaptureImpl::RegisterRawFrameCallback(RawFrameCallback* rawFrameCallback) {
-+ rtc::CritScope lock(&mApiCs);
++ webrtc::CritScope lock(&mApiCs);
+ _rawFrameCallbacks.insert(rawFrameCallback);
+}
+
+void DesktopCaptureImpl::DeRegisterRawFrameCallback(RawFrameCallback* rawFrameCallback) {
-+ rtc::CritScope lock(&mApiCs);
++ webrtc::CritScope lock(&mApiCs);
+ auto it = _rawFrameCallbacks.find(rawFrameCallback);
+ if (it != _rawFrameCallbacks.end()) {
+ _rawFrameCallbacks.erase(it);
@@ -1724,7 +1447,7 @@ index db777994b583efc2a3533e7d4534fff894c733bb..eb317c19b2422bd983d5e132c9ee4dac
+ size_t videoFrameStride =
+ frameInfo.width * DesktopFrame::kBytesPerPixel;
+ {
-+ rtc::CritScope cs(&mApiCs);
++ webrtc::CritScope cs(&mApiCs);
+ for (auto rawFrameCallback : _rawFrameCallbacks) {
+ rawFrameCallback->OnRawFrame(videoFrame, videoFrameStride, frameInfo);
+ }
@@ -1734,7 +1457,7 @@ index db777994b583efc2a3533e7d4534fff894c733bb..eb317c19b2422bd983d5e132c9ee4dac
frameInfo.width * frameInfo.height * DesktopFrame::kBytesPerPixel;
diff --git a/dom/media/systemservices/video_engine/desktop_capture_impl.h b/dom/media/systemservices/video_engine/desktop_capture_impl.h
-index a76b7de569db1cb42728a5514fb80e5c46e0344e..3d61ad8d3aa4a7eaf96957dcd680e1e1ee8abdf4 100644
+index 498de96bf6961fa9ea9cbb8af74477abd063724b..967cc4d8dc07195f9bc2486340b5ed87003f0ecb 100644
--- a/dom/media/systemservices/video_engine/desktop_capture_impl.h
+++ b/dom/media/systemservices/video_engine/desktop_capture_impl.h
@@ -26,6 +26,7 @@
@@ -1794,7 +1517,7 @@ index a76b7de569db1cb42728a5514fb80e5c46e0344e..3d61ad8d3aa4a7eaf96957dcd680e1e1
CreateDeviceInfo(const int32_t aId,
@@ -66,6 +94,8 @@ class DesktopCaptureImpl : public DesktopCapturer::Callback,
void DeRegisterCaptureDataCallback(
- rtc::VideoSinkInterface<VideoFrame>* aCallback) override;
+ webrtc::VideoSinkInterface<VideoFrame>* aCallback) override;
int32_t StopCaptureIfAllClientsClose() override;
+ void RegisterRawFrameCallback(RawFrameCallback* rawFrameCallback) override;
+ void DeRegisterRawFrameCallback(RawFrameCallback* rawFrameCallback) override;
@@ -1816,7 +1539,7 @@ index a76b7de569db1cb42728a5514fb80e5c46e0344e..3d61ad8d3aa4a7eaf96957dcd680e1e1
void UpdateOnThread(int aFramerate);
void ShutdownOnThread();
+
-+ rtc::RecursiveCriticalSection mApiCs;
++ webrtc::RecursiveCriticalSection mApiCs;
+ std::set<RawFrameCallback*> _rawFrameCallbacks;
// DesktopCapturer::Callback interface.
void OnCaptureResult(DesktopCapturer::Result aResult,
@@ -1831,10 +1554,10 @@ index a76b7de569db1cb42728a5514fb80e5c46e0344e..3d61ad8d3aa4a7eaf96957dcd680e1e1
const nsCOMPtr<nsISerialEventTarget> mControlThread;
// Set in StartCapture.
diff --git a/dom/script/ScriptSettings.cpp b/dom/script/ScriptSettings.cpp
-index d5964b27e9c99af76fe3f4076322592a9370c2d0..da217e2c1fbd9ca02e50ff74dde028189a216a6d 100644
+index 25779e9d7e26b7c385259dc30ceed802a5954b9f..c799c3b1d83fc2572435f3f156c6e4ccbc3396ca 100644
--- a/dom/script/ScriptSettings.cpp
+++ b/dom/script/ScriptSettings.cpp
-@@ -150,6 +150,30 @@ ScriptSettingsStackEntry::~ScriptSettingsStackEntry() {
+@@ -151,6 +151,30 @@ ScriptSettingsStackEntry::~ScriptSettingsStackEntry() {
MOZ_ASSERT_IF(mGlobalObject, mGlobalObject->HasJSGlobal());
}
@@ -1865,7 +1588,7 @@ index d5964b27e9c99af76fe3f4076322592a9370c2d0..da217e2c1fbd9ca02e50ff74dde02818
// If the entry or incumbent global ends up being something that the subject
// principal doesn't subsume, we don't want to use it. This never happens on
// the web, but can happen with asymmetric privilege relationships (i.e.
-@@ -177,7 +201,7 @@ static nsIGlobalObject* ClampToSubject(nsIGlobalObject* aGlobalOrNull) {
+@@ -178,7 +202,7 @@ static nsIGlobalObject* ClampToSubject(nsIGlobalObject* aGlobalOrNull) {
NS_ENSURE_TRUE(globalPrin, GetCurrentGlobal());
if (!nsContentUtils::SubjectPrincipalOrSystemIfNativeCaller()
->SubsumesConsideringDomain(globalPrin)) {
@@ -1875,17 +1598,17 @@ index d5964b27e9c99af76fe3f4076322592a9370c2d0..da217e2c1fbd9ca02e50ff74dde02818
return aGlobalOrNull;
diff --git a/dom/security/nsCSPUtils.cpp b/dom/security/nsCSPUtils.cpp
-index 8b68f22ae64d19165bf4b3c58aea8f5c237ba351..c3733bfa4ed550c98ab5f72c406cd6d01a621aca 100644
+index fb7533f06411d871de7e238ffdbb8bff1be6877c..420383cefa0a06c0cbe287ec3fa20e20b227f425 100644
--- a/dom/security/nsCSPUtils.cpp
+++ b/dom/security/nsCSPUtils.cpp
-@@ -24,6 +24,7 @@
+@@ -33,6 +33,7 @@
#include "nsSandboxFlags.h"
#include "nsServiceManagerUtils.h"
#include "nsWhitespaceTokenizer.h"
+#include "nsDocShell.h"
- #include "mozilla/Assertions.h"
- #include "mozilla/Components.h"
+ using namespace mozilla;
+ using mozilla::dom::SRIMetadata;
@@ -136,6 +137,11 @@ void CSP_ApplyMetaCSPToDoc(mozilla::dom::Document& aDoc,
return;
}
@@ -1921,11 +1644,23 @@ index aee376e971ae01ac1e512c3920b115bfaf06afa8..1701311534bf77e6cd9bafc0e3a28361
/* getBoxQuadsFromWindowOrigin is similar to getBoxQuads, but the
* returned quads are further translated relative to the window
* origin -- which is not the layout origin. Further translation
+diff --git a/dom/webidl/Window.webidl b/dom/webidl/Window.webidl
+index fa3ab3709806de414ddcb50607f2a47c61b08ad5..6f2c86e29ad74c29f35fbafc59048ec0ea0e4b2b 100644
+--- a/dom/webidl/Window.webidl
++++ b/dom/webidl/Window.webidl
+@@ -424,6 +424,7 @@ dictionary SynthesizeMouseEventOptions {
+ // Set this to true to ensure that the event is dispatched to this DOM window
+ // or one of its children.
+ boolean toWindow = false;
++ boolean jugglerConvertToPointer = true;
+ };
+
+ // Mozilla-specific stuff
diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
-index 83cef5b52b8f5c3168cd1d59266b4149425647fd..a80e89ec26a7e049c8ed84687ba2cd49597be05f 100644
+index 86384aab8c9dc32f48b73efe6c8c5fe2964554a0..4706d7e7605d3f4227de61b1ed474e2d67a5d1ee 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
-@@ -1082,7 +1082,7 @@ void PrefLanguagesChanged(const char* /* aPrefName */, void* /* aClosure */) {
+@@ -1119,7 +1119,7 @@ void PrefLanguagesChanged(const char* /* aPrefName */, void* /* aClosure */) {
AssertIsOnMainThread();
nsTArray<nsString> languages;
@@ -1934,7 +1669,7 @@ index 83cef5b52b8f5c3168cd1d59266b4149425647fd..a80e89ec26a7e049c8ed84687ba2cd49
RuntimeService* runtime = RuntimeService::GetService();
if (runtime) {
-@@ -1272,8 +1272,7 @@ bool RuntimeService::RegisterWorker(WorkerPrivate& aWorkerPrivate) {
+@@ -1309,8 +1309,7 @@ bool RuntimeService::RegisterWorker(WorkerPrivate& aWorkerPrivate) {
}
// The navigator overridden properties should have already been read.
@@ -1944,7 +1679,7 @@ index 83cef5b52b8f5c3168cd1d59266b4149425647fd..a80e89ec26a7e049c8ed84687ba2cd49
mNavigatorPropertiesLoaded = true;
}
-@@ -1901,6 +1900,13 @@ void RuntimeService::PropagateStorageAccessPermissionGranted(
+@@ -1938,6 +1937,13 @@ void RuntimeService::PropagateStorageAccessPermissionGranted(
}
}
@@ -1958,7 +1693,7 @@ index 83cef5b52b8f5c3168cd1d59266b4149425647fd..a80e89ec26a7e049c8ed84687ba2cd49
template <typename Func>
void RuntimeService::BroadcastAllWorkers(const Func& aFunc) {
AssertIsOnMainThread();
-@@ -2451,6 +2457,14 @@ void PropagateStorageAccessPermissionGrantedToWorkers(
+@@ -2500,6 +2506,14 @@ void PropagateStorageAccessPermissionGrantedToWorkers(
}
}
@@ -1974,10 +1709,10 @@ index 83cef5b52b8f5c3168cd1d59266b4149425647fd..a80e89ec26a7e049c8ed84687ba2cd49
MOZ_ASSERT(!NS_IsMainThread());
MOZ_ASSERT(aCx);
diff --git a/dom/workers/RuntimeService.h b/dom/workers/RuntimeService.h
-index 6d75c6708bcb999dc1dc3b0172afa14136110bc6..809d0ef80ffe793beff5d3c11bf6bf7912385e99 100644
+index a77a2105534b6ab0f0521a3d657ab3e26b82df25..1f8e3cdaa6545da00349864e2aeb5588c94f39b8 100644
--- a/dom/workers/RuntimeService.h
+++ b/dom/workers/RuntimeService.h
-@@ -115,6 +115,8 @@ class RuntimeService final : public nsIObserver {
+@@ -113,6 +113,8 @@ class RuntimeService final : public nsIObserver {
void PropagateStorageAccessPermissionGranted(
const nsPIDOMWindowInner& aWindow);
@@ -2000,10 +1735,10 @@ index af8d36c0d72683712a3fee22661f8c3279e103db..6b3a967c9acde2c81ab38148d4b1ac12
bool IsWorkerGlobal(JSObject* global);
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
-index 06083bb8f9546be06fa0b5c78d4e005a1617e51b..1753896265c1701ad50425c565f8d44392d0afb9 100644
+index 9908807353b0912d4f2c728c57b7ebd0c93c20d7..f346becf0cd66690199948d767e253cc0126b4ae 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
-@@ -738,6 +738,18 @@ class UpdateContextOptionsRunnable final : public WorkerControlRunnable {
+@@ -742,6 +742,18 @@ class UpdateContextOptionsRunnable final : public WorkerControlRunnable {
}
};
@@ -2022,7 +1757,7 @@ index 06083bb8f9546be06fa0b5c78d4e005a1617e51b..1753896265c1701ad50425c565f8d443
class UpdateLanguagesRunnable final : public WorkerThreadRunnable {
nsTArray<nsString> mLanguages;
-@@ -2334,6 +2346,16 @@ void WorkerPrivate::UpdateContextOptions(
+@@ -2351,6 +2363,16 @@ void WorkerPrivate::UpdateContextOptions(
}
}
@@ -2039,7 +1774,7 @@ index 06083bb8f9546be06fa0b5c78d4e005a1617e51b..1753896265c1701ad50425c565f8d443
void WorkerPrivate::UpdateLanguages(const nsTArray<nsString>& aLanguages) {
AssertIsOnParentThread();
-@@ -5996,6 +6018,15 @@ void WorkerPrivate::UpdateContextOptionsInternal(
+@@ -6021,6 +6043,15 @@ void WorkerPrivate::UpdateContextOptionsInternal(
}
}
@@ -2056,10 +1791,10 @@ index 06083bb8f9546be06fa0b5c78d4e005a1617e51b..1753896265c1701ad50425c565f8d443
const nsTArray<nsString>& aLanguages) {
WorkerGlobalScope* globalScope = GlobalScope();
diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h
-index 15c819c84fa934e25517ac8f55fd39ef8ba46986..fe01e09abcf2315abe41a3d19418c4e0f8c7df2b 100644
+index ecb4fdbb280b47252231e60d79461cd92c23fc7e..b066c081cade79d5b517d1b179901d5da6ad0b87 100644
--- a/dom/workers/WorkerPrivate.h
+++ b/dom/workers/WorkerPrivate.h
-@@ -457,6 +457,8 @@ class WorkerPrivate final
+@@ -463,6 +463,8 @@ class WorkerPrivate final
void UpdateContextOptionsInternal(JSContext* aCx,
const JS::ContextOptions& aContextOptions);
@@ -2068,7 +1803,7 @@ index 15c819c84fa934e25517ac8f55fd39ef8ba46986..fe01e09abcf2315abe41a3d19418c4e0
void UpdateLanguagesInternal(const nsTArray<nsString>& aLanguages);
void UpdateJSWorkerMemoryParameterInternal(JSContext* aCx, JSGCParamKey key,
-@@ -1103,6 +1105,8 @@ class WorkerPrivate final
+@@ -1110,6 +1112,8 @@ class WorkerPrivate final
void UpdateContextOptions(const JS::ContextOptions& aContextOptions);
@@ -2077,58 +1812,6 @@ index 15c819c84fa934e25517ac8f55fd39ef8ba46986..fe01e09abcf2315abe41a3d19418c4e0
void UpdateLanguages(const nsTArray<nsString>& aLanguages);
void UpdateJSWorkerMemoryParameter(JSGCParamKey key, Maybe<uint32_t> value);
-diff --git a/intl/components/src/TimeZone.cpp b/intl/components/src/TimeZone.cpp
-index 7a069ef0c59895cf1f8dc35d612f1494c9c9f1ef..5b09dfdcc5323def65c35b0696141b44eef9dcda 100644
---- a/intl/components/src/TimeZone.cpp
-+++ b/intl/components/src/TimeZone.cpp
-@@ -16,6 +16,7 @@
-
- namespace mozilla::intl {
-
-+
- /* static */
- Result<UniquePtr<TimeZone>, ICUError> TimeZone::TryCreate(
- Maybe<Span<const char16_t>> aTimeZoneOverride) {
-@@ -318,6 +319,13 @@ static ICUResult SetDefaultTimeZone(TimeZoneIdentifierVector& timeZone) {
- }
- #endif
-
-+bool TimeZone::IsValidTimeZoneId(const char* timeZoneId) {
-+ // Validate timezone id.
-+ mozilla::UniquePtr<icu::TimeZone> timeZone(icu::TimeZone::createTimeZone(
-+ icu::UnicodeString(timeZoneId, -1, US_INV)));
-+ return timeZone && *timeZone != icu::TimeZone::getUnknown();
-+}
-+
- Result<bool, ICUError> TimeZone::SetDefaultTimeZone(
- Span<const char> aTimeZone) {
- #if MOZ_INTL_USE_ICU_CPP_TIMEZONE
-diff --git a/intl/components/src/TimeZone.h b/intl/components/src/TimeZone.h
-index 89770839ae108b5f3462a7f20684fdb72c4ab2fb..a7e40d6b7c33c234b41e586eac573ba4ce3a7d18 100644
---- a/intl/components/src/TimeZone.h
-+++ b/intl/components/src/TimeZone.h
-@@ -191,6 +191,8 @@ class TimeZone final {
- return FillBufferWithICUCall(aBuffer, ucal_getHostTimeZone);
- }
-
-+ static bool IsValidTimeZoneId(const char* timeZoneId);
-+
- /**
- * Set the default time zone.
- */
-diff --git a/js/public/Date.h b/js/public/Date.h
-index 523e84c8c93f4221701f90f2e8ee146ec8e1adbd..98d5b1176e5378431b859a2dbd4d4e778d236e78 100644
---- a/js/public/Date.h
-+++ b/js/public/Date.h
-@@ -55,6 +55,8 @@ namespace JS {
- */
- extern JS_PUBLIC_API void ResetTimeZone();
-
-+extern JS_PUBLIC_API bool SetTimeZoneOverride(const char* timezoneId);
-+
- class ClippedTime;
- inline ClippedTime TimeClip(double time);
-
diff --git a/js/src/debugger/Object.cpp b/js/src/debugger/Object.cpp
index 2d177b5aade6d158e9ae62d317d5155b72cdcf84..28af5d41eb06d4b33cd5f86484dc29c923308835 100644
--- a/js/src/debugger/Object.cpp
@@ -2146,109 +1829,17 @@ index 2d177b5aade6d158e9ae62d317d5155b72cdcf84..28af5d41eb06d4b33cd5f86484dc29c9
}
diff --git a/js/src/vm/DateTime.cpp b/js/src/vm/DateTime.cpp
-index cc366b4cc411ed8de972811237563edb376355e3..adf727cf80fadebce3be9301752dc1d0b9ee35b9 100644
+index 5f329ff0f6818ad989e205b84b3fbc86bb183a33..35cfd531b6be5128256bdfe8ec8ddb248cacc045 100644
--- a/js/src/vm/DateTime.cpp
+++ b/js/src/vm/DateTime.cpp
-@@ -188,6 +188,11 @@ void js::DateTimeInfo::internalResetTimeZone(ResetTimeZoneMode mode) {
- }
- }
-
-+void js::DateTimeInfo::internalSetTimeZoneOverride(std::string timeZone) {
-+ timeZoneOverride_ = std::move(timeZone);
-+ internalResetTimeZone(ResetTimeZoneMode::ResetEvenIfOffsetUnchanged);
-+}
-+
- void js::DateTimeInfo::updateTimeZone() {
- MOZ_ASSERT(timeZoneStatus_ != TimeZoneStatus::Valid);
-
-@@ -556,10 +561,24 @@ void js::ResetTimeZoneInternal(ResetTimeZoneMode mode) {
- js::DateTimeInfo::resetTimeZone(mode);
- }
-
-+void js::SetTimeZoneOverrideInternal(std::string timeZone) {
-+ auto guard = js::DateTimeInfo::instance->lock();
-+ guard->internalSetTimeZoneOverride(timeZone);
-+}
-+
- JS_PUBLIC_API void JS::ResetTimeZone() {
- js::ResetTimeZoneInternal(js::ResetTimeZoneMode::ResetEvenIfOffsetUnchanged);
- }
-
-+JS_PUBLIC_API bool JS::SetTimeZoneOverride(const char* timeZoneId) {
-+ if (!mozilla::intl::TimeZone::IsValidTimeZoneId(timeZoneId)) {
-+ fprintf(stderr, "Invalid timezone id: %s\n", timeZoneId);
-+ return false;
-+ }
-+ js::SetTimeZoneOverrideInternal(std::string(timeZoneId));
-+ return true;
-+}
-+
- #if JS_HAS_INTL_API
- # if defined(XP_WIN)
- static bool IsOlsonCompatibleWindowsTimeZoneId(std::string_view tz) {
-@@ -773,6 +792,15 @@ static bool ReadTimeZoneLink(std::string_view tz,
-
- void js::DateTimeInfo::internalResyncICUDefaultTimeZone() {
+@@ -815,7 +815,6 @@ void js::DateTimeInfo::internalResyncICUDefaultTimeZone() {
#if JS_HAS_INTL_API
-+ if (!timeZoneOverride_.empty()) {
-+ mozilla::Span<const char> tzid = mozilla::Span(timeZoneOverride_.data(), timeZoneOverride_.length());
-+ auto result = mozilla::intl::TimeZone::SetDefaultTimeZone(tzid);
-+ if (result.isErr()) {
-+ fprintf(stderr, "ERROR: failed to setup default time zone\n");
-+ }
-+ return;
-+ }
-+
- // In the future we should not be setting a default ICU time zone at all,
- // instead all accesses should go through the appropriate DateTimeInfo
- // instance depending on the resist fingerprinting status. For now we return
-@@ -784,7 +812,6 @@ void js::DateTimeInfo::internalResyncICUDefaultTimeZone() {
-
if (const char* tzenv = std::getenv("TZ")) {
std::string_view tz(tzenv);
-
mozilla::Span<const char> tzid;
# if defined(XP_WIN)
-diff --git a/js/src/vm/DateTime.h b/js/src/vm/DateTime.h
-index 7be5b49afdce8e761af05dfbd48f3cb22e9ce318..3899c7988959f11bbadd0c005462acb979823fd1 100644
---- a/js/src/vm/DateTime.h
-+++ b/js/src/vm/DateTime.h
-@@ -75,6 +75,8 @@ using TimeZoneIdentifierVector =
- SystemAllocPolicy>;
- #endif
-
-+extern void SetTimeZoneOverrideInternal(std::string timeZone);
-+
- /**
- * Stores date/time information, particularly concerning the current local
- * time zone, and implements a small cache for daylight saving time offset
-@@ -258,6 +260,7 @@ class DateTimeInfo {
- private:
- // The method below should only be called via js::ResetTimeZoneInternal().
- friend void js::ResetTimeZoneInternal(ResetTimeZoneMode);
-+ friend void js::SetTimeZoneOverrideInternal(std::string);
-
- static void resetTimeZone(ResetTimeZoneMode mode) {
- {
-@@ -362,6 +365,8 @@ class DateTimeInfo {
- JS::UniqueChars locale_;
- JS::UniqueTwoByteChars standardName_;
- JS::UniqueTwoByteChars daylightSavingsName_;
-+
-+ std::string timeZoneOverride_;
- #else
- // Restrict the data-time range to the minimum required time_t range as
- // specified in POSIX. Most operating systems support 64-bit time_t
-@@ -377,6 +382,8 @@ class DateTimeInfo {
-
- void internalResetTimeZone(ResetTimeZoneMode mode);
-
-+ void internalSetTimeZoneOverride(std::string timeZone);
-+
- void updateTimeZone();
-
- void internalResyncICUDefaultTimeZone();
diff --git a/layout/base/GeometryUtils.cpp b/layout/base/GeometryUtils.cpp
index 67673c5c306e7237613b0560c7b3f888bd6ad1b8..fe4a278dad4b1747b41b5a824978636a70a9dea8 100644
--- a/layout/base/GeometryUtils.cpp
@@ -2301,10 +1892,10 @@ index 67673c5c306e7237613b0560c7b3f888bd6ad1b8..fe4a278dad4b1747b41b5a824978636a
// No boxes to return
return;
diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
-index 26119628ab4839858733ce39c6c9ef2970092b49..a9c4dbc4936755fd25b8528511e9a4c62695de89 100644
+index 157bfaacad6ea7477f96daf77a45d770100d9b9f..783311ffa4291c76578ca278a98fd77a0761391b 100644
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
-@@ -12150,7 +12150,9 @@ bool PresShell::ComputeActiveness() const {
+@@ -12456,7 +12456,9 @@ bool PresShell::ComputeActiveness() const {
if (!browserChild->IsVisible()) {
MOZ_LOG(gLog, LogLevel::Debug,
(" > BrowserChild %p is not visible", browserChild));
@@ -2316,7 +1907,7 @@ index 26119628ab4839858733ce39c6c9ef2970092b49..a9c4dbc4936755fd25b8528511e9a4c6
// 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 ee4e4b7e04f0f949b0afc7e8097711fcefe8b3c3..3af1d380d514b70392d1daaa4bc623afd7a570e6 100644
+index eb2c7147415e8ee37b4e998e76344a8ffbe5c93b..4af37692bab68bb66221f8d59ece26e04762a73d 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -707,6 +707,10 @@ bool nsLayoutUtils::AllowZoomingForDocument(
@@ -2330,7 +1921,7 @@ index ee4e4b7e04f0f949b0afc7e8097711fcefe8b3c3..3af1d380d514b70392d1daaa4bc623af
// True if we allow zooming for all documents on this platform, or if we are
// in RDM.
BrowsingContext* bc = aDocument->GetBrowsingContext();
-@@ -9772,6 +9776,9 @@ void nsLayoutUtils::ComputeSystemFont(nsFont* aSystemFont,
+@@ -9764,6 +9768,9 @@ void nsLayoutUtils::ComputeSystemFont(nsFont* aSystemFont,
/* static */
bool nsLayoutUtils::ShouldHandleMetaViewport(const Document* aDocument) {
@@ -2341,22 +1932,22 @@ index ee4e4b7e04f0f949b0afc7e8097711fcefe8b3c3..3af1d380d514b70392d1daaa4bc623af
return StaticPrefs::dom_meta_viewport_enabled() || (bc && bc->InRDMPane());
}
diff --git a/layout/style/GeckoBindings.h b/layout/style/GeckoBindings.h
-index 9527443c79077e0a728d78c3184ab7319f1c9efd..4e193ed114b4f70fb72bea928709fc7723f35b88 100644
+index 79a93cb336beaf073f6d3a4e9da1366d275cb11e..9d21add386a8eacd56d30fb090757b3dd931469a 100644
--- a/layout/style/GeckoBindings.h
+++ b/layout/style/GeckoBindings.h
-@@ -593,6 +593,7 @@ float Gecko_MediaFeatures_GetResolution(const mozilla::dom::Document*);
- bool Gecko_MediaFeatures_PrefersReducedMotion(const mozilla::dom::Document*);
+@@ -592,6 +592,7 @@ bool Gecko_MediaFeatures_PrefersReducedMotion(const mozilla::dom::Document*);
bool Gecko_MediaFeatures_PrefersReducedTransparency(
const mozilla::dom::Document*);
+ bool Gecko_MediaFeatures_MacRTL(const mozilla::dom::Document*);
+bool Gecko_MediaFeatures_ForcedColors(const mozilla::dom::Document*);
mozilla::StylePrefersContrast Gecko_MediaFeatures_PrefersContrast(
const mozilla::dom::Document*);
mozilla::StylePrefersColorScheme Gecko_MediaFeatures_PrefersColorScheme(
diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp
-index 21bcc8e890a0d3f3e86b5ea6eed79d017dd2fb76..eefc7d5c934f03b4a9213dafcbb65dd32b695622 100644
+index 4c3d47252f4f58ef5535ee6bcf27a0fe0472dc87..aacc2f40bfe24705322af0ff78006228f5f920fc 100644
--- a/layout/style/nsMediaFeatures.cpp
+++ b/layout/style/nsMediaFeatures.cpp
-@@ -268,11 +268,7 @@ bool Gecko_MediaFeatures_MatchesPlatform(StylePlatform aPlatform) {
+@@ -267,11 +267,7 @@ bool Gecko_MediaFeatures_MatchesPlatform(StylePlatform aPlatform) {
}
bool Gecko_MediaFeatures_PrefersReducedMotion(const Document* aDocument) {
@@ -2369,7 +1960,7 @@ index 21bcc8e890a0d3f3e86b5ea6eed79d017dd2fb76..eefc7d5c934f03b4a9213dafcbb65dd3
}
bool Gecko_MediaFeatures_PrefersReducedTransparency(const Document* aDocument) {
-@@ -297,6 +293,20 @@ StylePrefersColorScheme Gecko_MediaFeatures_PrefersColorScheme(
+@@ -301,6 +297,20 @@ bool Gecko_MediaFeatures_MacRTL(const Document* aDocument) {
// as a signal.
StylePrefersContrast Gecko_MediaFeatures_PrefersContrast(
const Document* aDocument) {
@@ -2391,20 +1982,20 @@ index 21bcc8e890a0d3f3e86b5ea6eed79d017dd2fb76..eefc7d5c934f03b4a9213dafcbb65dd3
return StylePrefersContrast::NoPreference;
}
diff --git a/netwerk/base/LoadInfo.cpp b/netwerk/base/LoadInfo.cpp
-index e5cf36273d5790de2c80acb42a6ee181bdb66f08..0523a37fc19b470e3817ae61c912a3dc54fc57a6 100644
+index e7b0d4faf9f5d7444b8e4fb7c70c993a6a8010f1..63f6b3a970a50ece9f0857d29fad35d92d453fdd 100644
--- a/netwerk/base/LoadInfo.cpp
+++ b/netwerk/base/LoadInfo.cpp
-@@ -801,7 +801,8 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
- rhs.mHasInjectedCookieForCookieBannerHandling),
+@@ -750,7 +750,8 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
+ mInterceptionInfo(rhs.mInterceptionInfo),
mSchemelessInput(rhs.mSchemelessInput),
- mHttpsUpgradeTelemetry(rhs.mHttpsUpgradeTelemetry),
-- mIsNewWindowTarget(rhs.mIsNewWindowTarget) {
-+ mIsNewWindowTarget(rhs.mIsNewWindowTarget),
+ mUserNavigationInvolvement(rhs.mUserNavigationInvolvement),
+- mSkipHTTPSUpgrade(rhs.mSkipHTTPSUpgrade) {
++ mSkipHTTPSUpgrade(rhs.mSkipHTTPSUpgrade),
+ mJugglerLoadIdentifier(rhs.mJugglerLoadIdentifier) {
}
LoadInfo::LoadInfo(
-@@ -2778,4 +2779,16 @@ void LoadInfo::UpdateParentAddressSpaceInfo() {
+@@ -2094,4 +2095,16 @@ void LoadInfo::UpdateParentAddressSpaceInfo() {
}
}
@@ -2422,12 +2013,12 @@ index e5cf36273d5790de2c80acb42a6ee181bdb66f08..0523a37fc19b470e3817ae61c912a3dc
+
} // namespace mozilla::net
diff --git a/netwerk/base/LoadInfo.h b/netwerk/base/LoadInfo.h
-index 6547d451f3a764c8860dd0c19b5b490caecbf0af..feccce92e3769b8e9a3a4926cca9b85fccda86a5 100644
+index 383d6f1f807c7fa445169a4746251932d8e065d8..a51107be81c57351ecd56c37f37cd34473224ece 100644
--- a/netwerk/base/LoadInfo.h
+++ b/netwerk/base/LoadInfo.h
-@@ -455,6 +455,8 @@ class LoadInfo final : public nsILoadInfo {
+@@ -540,6 +540,8 @@ class LoadInfo final : public nsILoadInfo {
+ dom::UserNavigationInvolvement::None;
- bool mIsNewWindowTarget = false;
bool mSkipHTTPSUpgrade = false;
+
+ uint64_t mJugglerLoadIdentifier = 0;
@@ -2435,10 +2026,10 @@ index 6547d451f3a764c8860dd0c19b5b490caecbf0af..feccce92e3769b8e9a3a4926cca9b85f
// This is exposed solely for testing purposes and should not be used outside of
// LoadInfo
diff --git a/netwerk/base/TRRLoadInfo.cpp b/netwerk/base/TRRLoadInfo.cpp
-index 551d89315243f4b515aa29d3a67eb23050ea9f0a..ac3a1ca6d846826c5d704d1b4abdaee55b834b0d 100644
+index be0f8bcb6ff861c942d8615f381b99a398ad80d1..00f07714532a12624f8f5925492da521f5e8606e 100644
--- a/netwerk/base/TRRLoadInfo.cpp
+++ b/netwerk/base/TRRLoadInfo.cpp
-@@ -1010,5 +1010,15 @@ TRRLoadInfo::GetFetchDestination(nsACString& aDestination) {
+@@ -562,5 +562,15 @@ TRRLoadInfo::GetFetchDestination(nsACString& aDestination) {
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -2455,10 +2046,10 @@ index 551d89315243f4b515aa29d3a67eb23050ea9f0a..ac3a1ca6d846826c5d704d1b4abdaee5
} // namespace net
} // namespace mozilla
diff --git a/netwerk/base/nsILoadInfo.idl b/netwerk/base/nsILoadInfo.idl
-index f1b54736d9ee006292bf4c9cd0b3490d5ec8da66..257fda17a10f702cee39fb42ad69e0cd86ca95d1 100644
+index 4f4673f41b93ffecfdefaf02011511ac0e3de685..dbc045c153c7323720c3202a30577df67b350870 100644
--- a/netwerk/base/nsILoadInfo.idl
+++ b/netwerk/base/nsILoadInfo.idl
-@@ -1686,4 +1686,6 @@ interface nsILoadInfo : nsISupports
+@@ -1714,4 +1714,6 @@ interface nsILoadInfo : nsISupports
return static_cast<mozilla::dom::UserNavigationInvolvement>(userNavigationInvolvement);
}
%}
@@ -2487,10 +2078,10 @@ index 7f91d2df6f8bb4020c75c132dc8f6bf26625fa1e..aaa5541a17039d6b13ad83ab176fdaaf
* Set the status and reason for the forthcoming synthesized response.
* Multiple calls overwrite existing values.
diff --git a/netwerk/ipc/DocumentLoadListener.cpp b/netwerk/ipc/DocumentLoadListener.cpp
-index 1471432c1f1a47be5073ed01b746f1f13d3a0b47..585f81762e2bf51681d11c06c9459063121c34e9 100644
+index a2e5c2e0397b5d56655d4d2b79e13caf2cf7ec62..38711d5cb6b7c1b409e05b2500cbd81aeea61cae 100644
--- a/netwerk/ipc/DocumentLoadListener.cpp
+++ b/netwerk/ipc/DocumentLoadListener.cpp
-@@ -185,6 +185,7 @@ static auto CreateDocumentLoadInfo(CanonicalBrowsingContext* aBrowsingContext,
+@@ -190,6 +190,7 @@ static auto CreateDocumentLoadInfo(CanonicalBrowsingContext* aBrowsingContext,
loadInfo->SetTextDirectiveUserActivation(
aLoadState->GetTextDirectiveUserActivation());
loadInfo->SetIsMetaRefresh(aLoadState->IsMetaRefresh());
@@ -2499,10 +2090,10 @@ index 1471432c1f1a47be5073ed01b746f1f13d3a0b47..585f81762e2bf51681d11c06c9459063
return loadInfo.forget();
}
diff --git a/netwerk/protocol/http/InterceptedHttpChannel.cpp b/netwerk/protocol/http/InterceptedHttpChannel.cpp
-index fbf4bdf1e24d1102df113984be6c8dc3a7d0d810..cf1978009d74221ae804b998e223904fa943a91f 100644
+index 65718b01f2ea65c6b0f326fb524ff33b0ea2c046..13733e5bd8ba864f7b499834d330f64a28383408 100644
--- a/netwerk/protocol/http/InterceptedHttpChannel.cpp
+++ b/netwerk/protocol/http/InterceptedHttpChannel.cpp
-@@ -728,10 +728,33 @@ NS_IMPL_ISUPPORTS(ResetInterceptionHeaderVisitor, nsIHttpHeaderVisitor)
+@@ -724,10 +724,33 @@ NS_IMPL_ISUPPORTS(ResetInterceptionHeaderVisitor, nsIHttpHeaderVisitor)
} // anonymous namespace
@@ -2536,7 +2127,7 @@ index fbf4bdf1e24d1102df113984be6c8dc3a7d0d810..cf1978009d74221ae804b998e223904f
if (mCanceled) {
return mStatus;
}
-@@ -1146,11 +1169,18 @@ InterceptedHttpChannel::OnStartRequest(nsIRequest* aRequest) {
+@@ -1142,11 +1165,18 @@ InterceptedHttpChannel::OnStartRequest(nsIRequest* aRequest) {
GetCallback(mProgressSink);
}
@@ -2556,7 +2147,7 @@ index fbf4bdf1e24d1102df113984be6c8dc3a7d0d810..cf1978009d74221ae804b998e223904f
if (mPump && mLoadFlags & LOAD_CALL_CONTENT_SNIFFERS) {
mPump->PeekStream(CallTypeSniffers, static_cast<nsIChannel*>(this));
diff --git a/netwerk/protocol/http/InterceptedHttpChannel.h b/netwerk/protocol/http/InterceptedHttpChannel.h
-index 704404c9f094640ad63b685d64bd5a396e733e4b..92bdc21b4d6a015cc2f2bb22781ec6750c7789ec 100644
+index 7a2a4f2910d74ded7f585c4d0a4c347bb9e03642..a416e1357aebbaab9d9a40ef6f0c2a0306913e2e 100644
--- a/netwerk/protocol/http/InterceptedHttpChannel.h
+++ b/netwerk/protocol/http/InterceptedHttpChannel.h
@@ -90,6 +90,11 @@ class InterceptedHttpChannel final
@@ -2572,10 +2163,10 @@ index 704404c9f094640ad63b685d64bd5a396e733e4b..92bdc21b4d6a015cc2f2bb22781ec675
* InterceptionTimeStamps is used to record the time stamps of the
* interception.
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
-index 1051d1e91c1ebf036f2e5db82a37636dd7cda4c3..3ef53c09442e24fb50308740950aa6d354703b7d 100644
+index eefc10ea9892f4f22f4be0e365edf0020475a7e8..db1104eba3150c43c1d5844e8d8b8f66bf3a027c 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
-@@ -685,11 +685,9 @@ nsresult nsHttpChannel::OnBeforeConnect() {
+@@ -928,11 +928,9 @@ nsresult nsHttpChannel::OnBeforeConnect() {
// SecurityInfo.sys.mjs
mLoadInfo->SetHstsStatus(isSecureURI);
@@ -2588,7 +2179,7 @@ index 1051d1e91c1ebf036f2e5db82a37636dd7cda4c3..3ef53c09442e24fb50308740950aa6d3
BYPASS_LOCAL_CACHE(mLoadFlags, LoadPreferCacheLoadOverBypass())) {
return NS_ERROR_OFFLINE;
}
-@@ -802,9 +800,7 @@ nsresult nsHttpChannel::MaybeUseHTTPSRRForUpgrade(bool aShouldUpgrade,
+@@ -1045,9 +1043,7 @@ nsresult nsHttpChannel::MaybeUseHTTPSRRForUpgrade(bool aShouldUpgrade,
return aStatus;
}
@@ -2599,7 +2190,7 @@ index 1051d1e91c1ebf036f2e5db82a37636dd7cda4c3..3ef53c09442e24fb50308740950aa6d3
if (mURI->SchemeIs("https") || aShouldUpgrade || !LoadUseHTTPSSVC() ||
forceOffline) {
-@@ -1263,15 +1259,14 @@ nsresult nsHttpChannel::ContinueConnect() {
+@@ -1524,15 +1520,14 @@ nsresult nsHttpChannel::ContinueConnect() {
"CORS preflight must have been finished by the time we "
"do the rest of ContinueConnect");
@@ -2617,7 +2208,7 @@ index 1051d1e91c1ebf036f2e5db82a37636dd7cda4c3..3ef53c09442e24fb50308740950aa6d3
BYPASS_LOCAL_CACHE(mLoadFlags, LoadPreferCacheLoadOverBypass())) {
return NS_ERROR_OFFLINE;
}
-@@ -1313,7 +1308,7 @@ nsresult nsHttpChannel::ContinueConnect() {
+@@ -1574,7 +1569,7 @@ nsresult nsHttpChannel::ContinueConnect() {
}
// We're about to hit the network. Don't if we're forced offline.
@@ -2626,7 +2217,7 @@ index 1051d1e91c1ebf036f2e5db82a37636dd7cda4c3..3ef53c09442e24fb50308740950aa6d3
return NS_ERROR_OFFLINE;
}
-@@ -1418,12 +1413,9 @@ void nsHttpChannel::SpeculativeConnect() {
+@@ -1682,12 +1677,9 @@ void nsHttpChannel::SpeculativeConnect() {
// don't speculate if we are offline, when doing http upgrade (i.e.
// websockets bootstrap), or if we can't do keep-alive (because then we
// couldn't reuse the speculative connection anyhow).
@@ -2640,7 +2231,7 @@ index 1051d1e91c1ebf036f2e5db82a37636dd7cda4c3..3ef53c09442e24fb50308740950aa6d3
return;
}
-@@ -4240,9 +4232,6 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
+@@ -4674,9 +4666,6 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
uint32_t cacheEntryOpenFlags;
bool offline = gIOService->IsOffline();
@@ -2650,7 +2241,7 @@ index 1051d1e91c1ebf036f2e5db82a37636dd7cda4c3..3ef53c09442e24fb50308740950aa6d3
bool maybeRCWN = false;
nsAutoCString cacheControlRequestHeader;
-@@ -4253,7 +4242,7 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
+@@ -4687,7 +4676,7 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
return NS_OK;
}
@@ -2659,7 +2250,7 @@ index 1051d1e91c1ebf036f2e5db82a37636dd7cda4c3..3ef53c09442e24fb50308740950aa6d3
if (offline || (mLoadFlags & INHIBIT_CACHING) || forceOffline) {
if (BYPASS_LOCAL_CACHE(mLoadFlags, LoadPreferCacheLoadOverBypass()) &&
!offline && !forceOffline) {
-@@ -7357,6 +7346,20 @@ void nsHttpChannel::MaybeStartDNSPrefetch() {
+@@ -7944,6 +7933,20 @@ void nsHttpChannel::MaybeStartDNSPrefetch() {
}
}
@@ -2681,10 +2272,10 @@ index 1051d1e91c1ebf036f2e5db82a37636dd7cda4c3..3ef53c09442e24fb50308740950aa6d3
nsHttpChannel::GetEncodedBodySize(uint64_t* aEncodedBodySize) {
if (mCacheEntry && !LoadCacheEntryIsWriteOnly()) {
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
-index 9d28bae2d270690517c11383abe4c4bcc0edda96..9087d345b1b63bdce0912abb0c880c50900a797b 100644
+index 44038353e4805831047164118ebaa55f7427d92c..0b475b28120247981a7f4ec3cc550a4825af23df 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
-@@ -305,6 +305,10 @@ class nsHttpChannel final : public HttpBaseChannel,
+@@ -311,6 +311,10 @@ class nsHttpChannel final : public HttpBaseChannel,
void MaybeResolveProxyAndBeginConnect();
void MaybeStartDNSPrefetch();
@@ -2696,10 +2287,10 @@ index 9d28bae2d270690517c11383abe4c4bcc0edda96..9087d345b1b63bdce0912abb0c880c50
// end server host name.
ProxyDNSStrategy GetProxyDNSStrategy();
diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp
-index ce2a868b9a915b98938518b6c935870f8169e0f7..e6d0a75bb3f5e8dea3f3e7f3448b553979860bd3 100644
+index 959d7078d87a4e9ab3db75400962c20e0d302470..aa258aa1804eb24f7a58fdb1df85d492c5513075 100644
--- a/parser/html/nsHtml5TreeOpExecutor.cpp
+++ b/parser/html/nsHtml5TreeOpExecutor.cpp
-@@ -1361,6 +1361,10 @@ void nsHtml5TreeOpExecutor::UpdateReferrerInfoFromMeta(
+@@ -1364,6 +1364,10 @@ void nsHtml5TreeOpExecutor::UpdateReferrerInfoFromMeta(
void nsHtml5TreeOpExecutor::AddSpeculationCSP(const nsAString& aCSP) {
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@@ -2724,7 +2315,7 @@ index 0ecf2c0df3aad52e004a69b4c7a22fea7532b4d8..f5982c2cf1d6ea0522ac7f7e1fb5b4ab
nsCOMPtr<nsIMarionette> marionette = do_GetService(NS_MARIONETTE_CONTRACTID);
if (marionette) {
diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs
-index cbdf07bcdae11de6f59e6c6c279833aca430dc70..6840c78350ccb52e99f23446b010abc2a1d92a55 100644
+index 330b49da1ebe177ae095f22c603431bb6104c54d..934fcea3c11ff1c41c92049e5041691309386cc3 100644
--- a/services/settings/Utils.sys.mjs
+++ b/services/settings/Utils.sys.mjs
@@ -97,7 +97,7 @@ const _cdnURLs = {};
@@ -2761,7 +2352,7 @@ index 75555352b8a15a50e4a21e34fc8ede4e9246c7cc..72855a404effa42b6c55cd0c2fcb8bdd
// ignored for Linux.
const unsigned long CHROME_SUPPRESS_ANIMATION = 1 << 24;
diff --git a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs
-index 3d8837cdb38fb5b25abfb9e3e369ad6fe688706e..867ce2efaa10eaea87ffeeb2669cc5a7be0045b3 100644
+index bb451a279599da49412da3c287e57d4b06a9c4dc..cf5ae514662d951102876efc00f58c3eb3387a3d 100644
--- a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs
+++ b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs
@@ -106,7 +106,9 @@ EnterprisePoliciesManager.prototype = {
@@ -2775,7 +2366,7 @@ index 3d8837cdb38fb5b25abfb9e3e369ad6fe688706e..867ce2efaa10eaea87ffeeb2669cc5a7
if (provider.failed) {
this.status = Ci.nsIEnterprisePolicies.FAILED;
-@@ -606,6 +608,19 @@ class JSONPoliciesProvider {
+@@ -619,6 +621,19 @@ class JSONPoliciesProvider {
}
}
@@ -2796,10 +2387,10 @@ index 3d8837cdb38fb5b25abfb9e3e369ad6fe688706e..867ce2efaa10eaea87ffeeb2669cc5a7
constructor() {
this._policies = null;
diff --git a/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp b/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
-index 52fa968554a88d1624bf9403b07781a8b42c93b6..2bd5162859dbc482361e2f6aaf5b7a732e9a5929 100644
+index b2934974ea0b20bbffbc0e2bfd69a35331a5fcb9..00e8765a5a0a0c8b96144d707c02e006ade8f402 100644
--- a/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
+++ b/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
-@@ -588,7 +588,7 @@ void PopulateLanguages() {
+@@ -589,7 +589,7 @@ void PopulateLanguages() {
// sufficient to only collect this information as the other properties are
// just reformats of Navigator::GetAcceptLanguages.
nsTArray<nsString> languages;
@@ -2822,7 +2413,7 @@ index d8f0c072c8a52c2837d87fe749ccac6e3e59e48a..6837927e6a49a8ff4c9f709502bf8d89
if (windowEnumerator) {
bool more;
diff --git a/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp b/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp
-index c0d60b927542653ab9beee730ec2c07f4b3d911c..85c416315f567a5edf8cfc89262dd7a48250dfd6 100644
+index 36fe2d427ee8e6c52e32930367cbddfa22e0444b..593795dfb21d215895521a1cfb998339a71c5a81 100644
--- a/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp
+++ b/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp
@@ -176,8 +176,8 @@ nsBrowserStatusFilter::OnStateChange(nsIWebProgress* aWebProgress,
@@ -2837,10 +2428,10 @@ index c0d60b927542653ab9beee730ec2c07f4b3d911c..85c416315f567a5edf8cfc89262dd7a4
int32_t aMaxSelfProgress,
int32_t aCurTotalProgress,
diff --git a/toolkit/components/windowwatcher/nsWindowWatcher.cpp b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
-index 622ff7fe214d22e1e5d5a561753cffe3e1eafe31..ac2f30e00a9a6d18c61d00b0d6d4bf41ff48af95 100644
+index 62cb9a0f2ca11d6fff70cc82e29db27dc97e6bf9..35e9c01eeab3454a23a16978d8c724aa793d938a 100644
--- a/toolkit/components/windowwatcher/nsWindowWatcher.cpp
+++ b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
-@@ -1882,7 +1882,11 @@ uint32_t nsWindowWatcher::CalculateChromeFlagsForContent(
+@@ -1881,7 +1881,11 @@ uint32_t nsWindowWatcher::CalculateChromeFlagsForContent(
// Open a minimal popup.
*aIsPopupRequested = true;
@@ -2854,10 +2445,10 @@ index 622ff7fe214d22e1e5d5a561753cffe3e1eafe31..ac2f30e00a9a6d18c61d00b0d6d4bf41
/**
diff --git a/toolkit/mozapps/update/UpdateService.sys.mjs b/toolkit/mozapps/update/UpdateService.sys.mjs
-index 5d5a3f2c46138b578b583ad4a3506e1d227607ad..6d414635b80a74edb0b5ecfc6a98dd0fee763952 100644
+index f5a9a91037cf8409c9fac77e8cbf3485b72ee366..0bffed45f195e126bf562c7b22924cf2c4105408 100644
--- a/toolkit/mozapps/update/UpdateService.sys.mjs
+++ b/toolkit/mozapps/update/UpdateService.sys.mjs
-@@ -3874,6 +3874,8 @@ export class UpdateService {
+@@ -3990,6 +3990,8 @@ export class UpdateService {
}
get disabledForTesting() {
@@ -2867,10 +2458,10 @@ index 5d5a3f2c46138b578b583ad4a3506e1d227607ad..6d414635b80a74edb0b5ecfc6a98dd0f
}
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
-index e8399d277ec0b64e5ea29aa7262b118936a02779..983ed73ad1d6d734af55a9066a8e8a6cf3ae3f45 100644
+index 0ab59fb09f92c3770cca46a8b953846cc524917a..f115a6f7bbb153bbbf16bbe39bf6878dd1a74a9a 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
-@@ -155,6 +155,7 @@ if CONFIG["ENABLE_WEBDRIVER"]:
+@@ -156,6 +156,7 @@ if CONFIG["ENABLE_WEBDRIVER"]:
"/remote",
"/testing/firefox-ui",
"/testing/marionette",
@@ -2879,7 +2470,7 @@ index e8399d277ec0b64e5ea29aa7262b118936a02779..983ed73ad1d6d734af55a9066a8e8a6c
]
diff --git a/toolkit/xre/nsWindowsWMain.cpp b/toolkit/xre/nsWindowsWMain.cpp
-index 7eb9e1104682d4eb47060654f43a1efa8b2a6bb2..a8315d6decf654b5302bea5beeea34140c300ded 100644
+index b7c376eadc1460b0f4e378ca3047eb82a079c19c..44385776349e13f7452d7c1b382cf73880e40c32 100644
--- a/toolkit/xre/nsWindowsWMain.cpp
+++ b/toolkit/xre/nsWindowsWMain.cpp
@@ -14,8 +14,10 @@
@@ -2914,12 +2505,12 @@ index 7eb9e1104682d4eb47060654f43a1efa8b2a6bb2..a8315d6decf654b5302bea5beeea3414
// Only run this code if LauncherProcessWin.h was included beforehand, thus
// signalling that the hosting process should support launcher mode.
diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp
-index 9ef5370d1524ddecb965785a73a3cfea39867324..e0245cca94e496bcffba40c9660a52b518803d44 100644
+index 95a47c3b51de1d012147042403ca9f2de4c3b247..e9693d0bbc31d8635da2be67e6cdad2a6dbead42 100644
--- a/uriloader/base/nsDocLoader.cpp
+++ b/uriloader/base/nsDocLoader.cpp
-@@ -861,6 +861,12 @@ void nsDocLoader::DocLoaderIsEmpty(bool aFlushLayout,
- ("DocLoader:%p: Firing load event for document.open\n",
- this));
+@@ -897,6 +897,12 @@ void nsDocLoader::DocLoaderIsEmpty(bool aFlushLayout,
+ mIsLoadingJavascriptURI ? "javascript URI"
+ : "document.open"));
+ nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+ if (os) {
@@ -2931,7 +2522,7 @@ index 9ef5370d1524ddecb965785a73a3cfea39867324..e0245cca94e496bcffba40c9660a52b5
// 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 5bd60b585b53cc77e75c0b68c763957f90b7e164..940b3b62b09ca70ae5e69c3e94eda11ad35b9dfe 100644
+index 53acc63fe36e30ef7f6618ceca5a1c905ae0a117..a0614d8cf1b103a270ea29295eb8ddbff266ead0 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -112,6 +112,7 @@
@@ -2942,7 +2533,7 @@ index 5bd60b585b53cc77e75c0b68c763957f90b7e164..940b3b62b09ca70ae5e69c3e94eda11a
#include "mozilla/Preferences.h"
#include "mozilla/ipc/URIUtils.h"
-@@ -865,6 +866,12 @@ NS_IMETHODIMP nsExternalHelperAppService::ApplyDecodingForExtension(
+@@ -867,6 +868,12 @@ NS_IMETHODIMP nsExternalHelperAppService::ApplyDecodingForExtension(
return NS_OK;
}
@@ -2955,7 +2546,7 @@ index 5bd60b585b53cc77e75c0b68c763957f90b7e164..940b3b62b09ca70ae5e69c3e94eda11a
nsresult nsExternalHelperAppService::GetFileTokenForPath(
const char16_t* aPlatformAppPath, nsIFile** aFile) {
nsDependentString platformAppPath(aPlatformAppPath);
-@@ -1500,7 +1507,12 @@ nsresult nsExternalAppHandler::SetUpTempFile(nsIChannel* aChannel) {
+@@ -1498,7 +1505,12 @@ nsresult nsExternalAppHandler::SetUpTempFile(nsIChannel* aChannel) {
// Strip off the ".part" from mTempLeafName
mTempLeafName.Truncate(mTempLeafName.Length() - std::size(".part") + 1);
@@ -2968,7 +2559,7 @@ index 5bd60b585b53cc77e75c0b68c763957f90b7e164..940b3b62b09ca70ae5e69c3e94eda11a
mSaver =
do_CreateInstance(NS_BACKGROUNDFILESAVERSTREAMLISTENER_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
-@@ -1684,7 +1696,36 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
+@@ -1682,7 +1694,36 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
return NS_OK;
}
@@ -3006,7 +2597,7 @@ index 5bd60b585b53cc77e75c0b68c763957f90b7e164..940b3b62b09ca70ae5e69c3e94eda11a
if (NS_FAILED(rv)) {
nsresult transferError = rv;
-@@ -1745,6 +1786,9 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
+@@ -1743,6 +1784,9 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
bool alwaysAsk = true;
mMimeInfo->GetAlwaysAskBeforeHandling(&alwaysAsk);
@@ -3016,7 +2607,7 @@ index 5bd60b585b53cc77e75c0b68c763957f90b7e164..940b3b62b09ca70ae5e69c3e94eda11a
if (alwaysAsk) {
// But we *don't* ask if this mimeInfo didn't come from
// our user configuration datastore and the user has said
-@@ -2261,6 +2305,16 @@ nsExternalAppHandler::OnSaveComplete(nsIBackgroundFileSaver* aSaver,
+@@ -2259,6 +2303,16 @@ nsExternalAppHandler::OnSaveComplete(nsIBackgroundFileSaver* aSaver,
NotifyTransfer(aStatus);
}
@@ -3033,7 +2624,7 @@ index 5bd60b585b53cc77e75c0b68c763957f90b7e164..940b3b62b09ca70ae5e69c3e94eda11a
return NS_OK;
}
-@@ -2744,6 +2798,15 @@ NS_IMETHODIMP nsExternalAppHandler::Cancel(nsresult aReason) {
+@@ -2742,6 +2796,15 @@ NS_IMETHODIMP nsExternalAppHandler::Cancel(nsresult aReason) {
}
}
@@ -3050,10 +2641,10 @@ index 5bd60b585b53cc77e75c0b68c763957f90b7e164..940b3b62b09ca70ae5e69c3e94eda11a
// OnStartRequest)
mDialog = nullptr;
diff --git a/uriloader/exthandler/nsExternalHelperAppService.h b/uriloader/exthandler/nsExternalHelperAppService.h
-index 26dfc6f04298420317c8b87b2ecc3f2f47f59598..c458ab5efb238c62499ee13452f2d750e0569e38 100644
+index 78c8199490baae8f65a24b5e0fcea3a2deb3775d..3a3183475fea6188574d88bc6313e2d779bab3f9 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.h
+++ b/uriloader/exthandler/nsExternalHelperAppService.h
-@@ -263,6 +263,8 @@ class nsExternalHelperAppService : public nsIExternalHelperAppService,
+@@ -271,6 +271,8 @@ class nsExternalHelperAppService : public nsIExternalHelperAppService,
mozilla::dom::BrowsingContext* aContentContext, bool aForceSave,
nsIInterfaceRequestor* aWindowContext,
nsIStreamListener** aStreamListener);
@@ -3062,7 +2653,7 @@ index 26dfc6f04298420317c8b87b2ecc3f2f47f59598..c458ab5efb238c62499ee13452f2d750
};
/**
-@@ -460,6 +462,9 @@ class nsExternalAppHandler final : public nsIStreamListener,
+@@ -468,6 +470,9 @@ class nsExternalAppHandler final : public nsIStreamListener,
* Upon successful return, both mTempFile and mSaver will be valid.
*/
nsresult SetUpTempFile(nsIChannel* aChannel);
@@ -3116,7 +2707,7 @@ index e6490ebb086eb4dca9db560c14e073a9e7722e29..2792373dcb30ebc787a9bdca306ac12e
/**
diff --git a/widget/InProcessCompositorWidget.cpp b/widget/InProcessCompositorWidget.cpp
-index 7098db301770ecb5b9a506d7caec89d5cf63384b..aff8d7562f8a3e595a077ce8e591008762479587 100644
+index b3e514b77ed90b039075903e3c7b378ac894f65a..9b930df5a5f4ec4b4d1fd4f6b00c402e189d4811 100644
--- a/widget/InProcessCompositorWidget.cpp
+++ b/widget/InProcessCompositorWidget.cpp
@@ -4,7 +4,10 @@
@@ -3130,7 +2721,7 @@ index 7098db301770ecb5b9a506d7caec89d5cf63384b..aff8d7562f8a3e595a077ce8e5910087
#include "nsBaseWidget.h"
namespace mozilla {
-@@ -23,6 +26,12 @@ RefPtr<CompositorWidget> CompositorWidget::CreateLocal(
+@@ -26,6 +29,12 @@ RefPtr<CompositorWidget> CompositorWidget::CreateLocal(
// do it after the static_cast.
nsBaseWidget* widget = static_cast<nsBaseWidget*>(aWidget);
MOZ_RELEASE_ASSERT(widget);
@@ -3143,28 +2734,6 @@ index 7098db301770ecb5b9a506d7caec89d5cf63384b..aff8d7562f8a3e595a077ce8e5910087
return new InProcessCompositorWidget(aOptions, widget);
}
#endif
-diff --git a/widget/MouseEvents.h b/widget/MouseEvents.h
-index 4f7ca9d0d460da3124ec8489917a9484661d5624..a04c3661b3e1e2be030ac6fe90041c81e653d26e 100644
---- a/widget/MouseEvents.h
-+++ b/widget/MouseEvents.h
-@@ -380,6 +380,9 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
- // Otherwise, this must be 0.
- uint32_t mClickCount = 0;
-
-+ // Unique event ID
-+ uint32_t mJugglerEventId = 0;
-+
- // Whether the event should ignore scroll frame bounds during dispatch.
- bool mIgnoreRootScrollFrame = false;
-
-@@ -407,6 +410,7 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
- mContextMenuTrigger = aEvent.mContextMenuTrigger;
- mExitFrom = aEvent.mExitFrom;
- mClickCount = aEvent.mClickCount;
-+ mJugglerEventId = aEvent.mJugglerEventId;
- mIgnoreRootScrollFrame = aEvent.mIgnoreRootScrollFrame;
- mIgnoreCapturingContent = aEvent.mIgnoreCapturingContent;
- mClickEventPrevented = aEvent.mClickEventPrevented;
diff --git a/widget/cocoa/NativeKeyBindings.mm b/widget/cocoa/NativeKeyBindings.mm
index 24b70173c2e8bb9be9fd6255984a70efe3b14099..75ac367a1c4bb44d4b68b5f4ecc6adf56dbd408e 100644
--- a/widget/cocoa/NativeKeyBindings.mm
@@ -3228,18 +2797,6 @@ index 24b70173c2e8bb9be9fd6255984a70efe3b14099..75ac367a1c4bb44d4b68b5f4ecc6adf5
break;
}
if (aEvent.IsMeta()) {
-diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
-index f09b0e4994304413cbd75f14e6650cf3f9df9025..41c184e74df2b9c59315a236506946bcb5d69216 100644
---- a/widget/gtk/nsFilePicker.cpp
-+++ b/widget/gtk/nsFilePicker.cpp
-@@ -21,6 +21,7 @@
- #include "mozilla/Components.h"
- #include "mozilla/Preferences.h"
- #include "mozilla/dom/Promise.h"
-+#include "gfxPlatform.h"
-
- #include "nsArrayEnumerator.h"
- #include "nsEnumeratorUtils.h"
diff --git a/widget/headless/HeadlessCompositorWidget.cpp b/widget/headless/HeadlessCompositorWidget.cpp
index bb4ee9175e66dc40de1871a7f91368fe309494a3..6814ae85038d31f1a3b1f87ba341219ffbc1e6b3 100644
--- a/widget/headless/HeadlessCompositorWidget.cpp
@@ -3428,28 +2985,8 @@ index 60598d097d9dae829ebdc15dede78bd915e3107d..3b5ac5e5590dcb36440e28569f71592d
private:
~HeadlessWidget();
bool mEnabled;
-diff --git a/widget/nsGUIEventIPC.h b/widget/nsGUIEventIPC.h
-index 2f4c33f151870bb9233899b186a5eccfaa6f5da6..6acf66e4938e3f9727916824a08d6294f8993452 100644
---- a/widget/nsGUIEventIPC.h
-+++ b/widget/nsGUIEventIPC.h
-@@ -251,6 +251,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent> {
- aParam.mExitFrom.value()));
- }
- WriteParam(aWriter, aParam.mClickCount);
-+ WriteParam(aWriter, aParam.mJugglerEventId);
- }
-
- static bool Read(MessageReader* aReader, paramType* aResult) {
-@@ -275,6 +276,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent> {
- aResult->mExitFrom = Some(static_cast<paramType::ExitFrom>(exitFrom));
- }
- rv = rv && ReadParam(aReader, &aResult->mClickCount);
-+ rv = rv && ReadParam(aReader, &aResult->mJugglerEventId);
- return rv;
- }
- };
diff --git a/xpcom/reflect/xptinfo/xptinfo.h b/xpcom/reflect/xptinfo/xptinfo.h
-index 787d30d881adedd57d2025ca57bff4bc6c57e803..ae1a0172c960ab16919133485722d2ae0cdbcbd4 100644
+index 1c0aff31b98e61fb1154e914b4af50c899b24187..bbac5fa58a7047ababf27cc9be53dcca643d98a7 100644
--- a/xpcom/reflect/xptinfo/xptinfo.h
+++ b/xpcom/reflect/xptinfo/xptinfo.h
@@ -505,7 +505,7 @@ static_assert(sizeof(nsXPTMethodInfo) == 8, "wrong size");
diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh
index fddf578548..6053d4ac74 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="486de399887bc8fa8a69e2f194ebc9476589a08a"
+BASE_REVISION="482d54b279fd6147a45aaa122242f2ac315f46df"
diff --git a/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.h b/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.h
index 4fb6229fa3..f3ebb86b81 100644
--- a/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.h
+++ b/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.h
@@ -36,6 +36,7 @@
NSMutableSet *_browserContexts;
bool _headless;
bool _noStartupWindow;
+ bool _inspectorPipe;
NSMutableSet *_dialogs;
NSString* _initialURL;
NSString* _userDataDir;
diff --git a/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m b/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m
index b89fa92d7e..c9c08a8f45 100644
--- a/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m
+++ b/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m
@@ -115,6 +115,7 @@ const NSActivityOptions ActivityOptions =
_headless = [arguments containsObject: @"--headless"];
_noStartupWindow = [arguments containsObject: @"--no-startup-window"];
+ _inspectorPipe = [arguments containsObject: @"--inspector-pipe"];
_browserContexts = [[NSMutableSet alloc] init];
if (_headless) {
@@ -126,8 +127,6 @@ const NSActivityOptions ActivityOptions =
} else {
[NSApp activateIgnoringOtherApps:YES];
}
- if ([arguments containsObject: @"--inspector-pipe"])
- [_WKBrowserInspector initializeRemoteInspectorPipe:self headless:_headless];
return self;
}
@@ -254,6 +253,9 @@ const NSActivityOptions ActivityOptions =
if (!_headless)
[self _updateNewWindowKeyEquivalents];
+ if (_inspectorPipe)
+ [_WKBrowserInspector initializeRemoteInspectorPipe:self headless:_headless];
+
if (_noStartupWindow)
return;
diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff
index 80d62c3967..ea880670ea 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 1262273a2d71853caba03827fd454f1d4fa5124e..cd5bf3b6bc2268b8d50d2a7b8c344d4bda65ad30 100644
+index 2fd2ad9c04d5b7842c0616cbb8498a5820a35de8..c4d1d4430e4dfe11549817b81dce56e6f03fa50c 100644
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
-@@ -1561,21 +1561,26 @@ set(JavaScriptCore_INSPECTOR_DOMAINS
+@@ -1573,21 +1573,26 @@ set(JavaScriptCore_INSPECTOR_DOMAINS
${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json
@@ -30,10 +30,10 @@ index 1262273a2d71853caba03827fd454f1d4fa5124e..cd5bf3b6bc2268b8d50d2a7b8c344d4b
${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 53809cbc20c8fb942304a25899a2e5ecccc79ee3..63d93e08bcf8089e4e315e48d5d2093750588cb1 100644
+index 357fead1d52023c208b292ecfd53a82fae91105c..e5a8e38e7caa98b106a8f097209f2a3bce56d36c 100644
--- a/Source/JavaScriptCore/DerivedSources-input.xcfilelist
+++ b/Source/JavaScriptCore/DerivedSources-input.xcfilelist
-@@ -100,20 +100,25 @@ $(PROJECT_DIR)/inspector/protocol/CPUProfiler.json
+@@ -104,20 +104,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
@@ -60,7 +60,7 @@ index 53809cbc20c8fb942304a25899a2e5ecccc79ee3..63d93e08bcf8089e4e315e48d5d20937
$(PROJECT_DIR)/inspector/protocol/Security.json
$(PROJECT_DIR)/inspector/protocol/ServiceWorker.json
diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make
-index f0058c1cea010b2ea0f128fb4670f0fcde93924b..717df1beaa22a0e7c8df0a50f3c0585ada0385d7 100644
+index 76576fec8122f9c4eaca4596c1155978f9dc4879..6bf8628a2a12bc6322ec00721cd499198f59ad38 100644
--- a/Source/JavaScriptCore/DerivedSources.make
+++ b/Source/JavaScriptCore/DerivedSources.make
@@ -299,21 +299,26 @@ INSPECTOR_DOMAINS := \
@@ -130,11 +130,11 @@ index b967783b83cc6da337ab0840ce0a0a8d480cbc4f..06a09811709e5e6cb1db24ad6fc48954
JS_EXPORT_PRIVATE static String requestId(unsigned long identifier);
};
diff --git a/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp b/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp
-index 8b39848154ecab9f7daa2d21c85562a319cd06d7..c8a1f44cb4516993899ffe1404b6c3865d42433a 100644
+index 3a21142b6b7151c05b0da400988b6287954ead40..85b34405cf6ad3fdeb24d6c5f5a06c9cfb96e2f8 100644
--- a/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp
+++ b/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp
@@ -85,7 +85,10 @@ static RefPtr<JSON::Value> jsToInspectorValue(JSC::JSGlobalObject* globalObject,
- JSC::PropertyNameArray propertyNames(vm, JSC::PropertyNameMode::Strings, JSC::PrivateSymbolMode::Exclude);
+ JSC::PropertyNameArrayBuilder propertyNames(vm, JSC::PropertyNameMode::Strings, JSC::PrivateSymbolMode::Exclude);
object.methodTable()->getOwnPropertyNames(&object, globalObject, propertyNames, JSC::DontEnumPropertiesMode::Exclude);
for (auto& name : propertyNames) {
- auto inspectorValue = jsToInspectorValue(globalObject, object.get(globalObject, name), maxDepth);
@@ -146,10 +146,10 @@ index 8b39848154ecab9f7daa2d21c85562a319cd06d7..c8a1f44cb4516993899ffe1404b6c386
return nullptr;
inspectorObject->setValue(name.string(), inspectorValue.releaseNonNull());
diff --git a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp
-index 6f8cae4d995d3ae020cd09aa0ba0c9ccc1e78409..fc3d0d1e0803ea38a70fee82ea94624797c6e407 100644
+index 4803de9a1a83342b61c438bddf2fcfe10d95eb84..c374187a189d73aedbe8cad73cdecb662ffbe4f1 100644
--- a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp
+++ b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp
-@@ -102,7 +102,7 @@ void BackendDispatcher::registerDispatcherForDomain(const String& domain, Supple
+@@ -103,7 +103,7 @@ void BackendDispatcher::registerDispatcherForDomain(const String& domain, Supple
m_dispatchers.set(domain, dispatcher);
}
@@ -158,7 +158,7 @@ index 6f8cae4d995d3ae020cd09aa0ba0c9ccc1e78409..fc3d0d1e0803ea38a70fee82ea946247
{
Ref<BackendDispatcher> protect(*this);
-@@ -147,6 +147,9 @@ void BackendDispatcher::dispatch(const String& message)
+@@ -148,6 +148,9 @@ void BackendDispatcher::dispatch(const String& message)
requestId = *requestIdInt;
}
@@ -169,10 +169,10 @@ index 6f8cae4d995d3ae020cd09aa0ba0c9ccc1e78409..fc3d0d1e0803ea38a70fee82ea946247
// We could be called re-entrantly from a nested run loop, so restore the previous id.
SetForScope scopedRequestId(m_currentRequestId, requestId);
diff --git a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
-index 0f7a5ff3cd0ad31ed9d816fb281a368e1c4ddcd2..8ce48015677d4fb6691a0ce0ac797f5bb370b622 100644
+index b7bb400886ba7911bcedbefefe4933d42ffc2f5b..eb628f59aed910a7cb0ec35cea5a5c1b8e89b4be 100644
--- a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
+++ b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
-@@ -95,8 +95,11 @@ public:
+@@ -97,8 +97,11 @@ public:
ServerError
};
@@ -186,10 +186,10 @@ index 0f7a5ff3cd0ad31ed9d816fb281a368e1c4ddcd2..8ce48015677d4fb6691a0ce0ac797f5b
// Note that 'unused' is a workaround so the compiler can pick the right sendResponse based on arity.
// When <http://webkit.org/b/179847> is fixed or this class is renamed for the JSON::Object case,
diff --git a/Source/JavaScriptCore/inspector/InspectorFrontendRouter.cpp b/Source/JavaScriptCore/inspector/InspectorFrontendRouter.cpp
-index d408d364f1986983161f9d44efbc8bc6f6898676..1375ce9990f0c63d7e6f33ee62930051d6cd44cb 100644
+index 13207d2da597e3b96cc9e83d0bee83fa859cdcf0..c4f9f4714578652cb71f106bb0bfdb69440ed238 100644
--- a/Source/JavaScriptCore/inspector/InspectorFrontendRouter.cpp
+++ b/Source/JavaScriptCore/inspector/InspectorFrontendRouter.cpp
-@@ -49,7 +49,7 @@ void FrontendRouter::connectFrontend(FrontendChannel& connection)
+@@ -52,7 +52,7 @@ void FrontendRouter::connectFrontend(FrontendChannel& connection)
void FrontendRouter::disconnectFrontend(FrontendChannel& connection)
{
if (!m_connections.contains(&connection)) {
@@ -268,7 +268,7 @@ index 6bbd0729a65b4a901e7da4dc50cc47c669bd9897..452b25d0e8eba3df1d5f6623dc222048
void warnUnimplemented(const String& method);
void internalAddMessage(MessageType, MessageLevel, JSC::JSGlobalObject*, Ref<ScriptArguments>&&);
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp
-index a478fa0ed95015757707de9ceb163b7e05f52656..f83b62acf22c75b65f5c12346d0756ee3bfa06a1 100644
+index ada998de5ad48030951dd17f967f852a091f1ccf..717fa83fe0e1769b91ba80725bb59ceadcce5e71 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp
+++ b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp
@@ -194,9 +194,8 @@ void InspectorRuntimeAgent::callFunctionOn(const Protocol::Runtime::RemoteObject
@@ -307,7 +307,7 @@ index 8240c23298f680abb6c379d02841c566fb287f1c..c9567e12c54c5775af6d52e59663e18b
Protocol::ErrorStringOr<Ref<Protocol::Runtime::ObjectPreview>> getPreview(const Protocol::Runtime::RemoteObjectId&) final;
Protocol::ErrorStringOr<std::tuple<Ref<JSON::ArrayOf<Protocol::Runtime::PropertyDescriptor>>, RefPtr<JSON::ArrayOf<Protocol::Runtime::InternalPropertyDescriptor>>>> getProperties(const Protocol::Runtime::RemoteObjectId&, std::optional<bool>&& ownProperties, std::optional<int>&& fetchStart, std::optional<int>&& fetchCount, std::optional<bool>&& generatePreview) final;
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.cpp b/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.cpp
-index bc315cb8bd326b10a883aaeace698f531d3d24ca..580cf5987e1652d757227b4c8c293427dc0bd9ac 100644
+index b0d937315d615fe0ea8774b057032e4096817a49..a27540d1789d74b8a0e64266f26a27c27926e6aa 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.cpp
+++ b/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.cpp
@@ -90,6 +90,34 @@ Protocol::ErrorStringOr<void> InspectorTargetAgent::sendMessageToTarget(const St
@@ -365,7 +365,7 @@ index bc315cb8bd326b10a883aaeace698f531d3d24ca..580cf5987e1652d757227b4c8c293427
void InspectorTargetAgent::didCommitProvisionalTarget(const String& oldTargetID, const String& committedTargetID)
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h
-index 6d221e260d0f3bc6ba3914b8bb14b35befd332b5..a74deeaf80ce411fe9e8600532162f74251b1e22 100644
+index 0b7d732f036fce96b01bd06f4c47f5d471a0ab38..a9efea4bec66aa68966c99d9e77f8a36f7f7205a 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h
@@ -53,8 +53,11 @@ public:
@@ -391,7 +391,7 @@ index 6d221e260d0f3bc6ba3914b8bb14b35befd332b5..a74deeaf80ce411fe9e8600532162f74
// FrontendChannel
FrontendChannel::ConnectionType connectionType() const;
diff --git a/Source/JavaScriptCore/inspector/protocol/DOM.json b/Source/JavaScriptCore/inspector/protocol/DOM.json
-index 25711ac1aa269d7e0231a6169be1bc495f2c8dc0..bcb4d83e58a51458de6e070ef7cb859ee333bdbc 100644
+index 504351538a9fca72749c7f2e424a363445197255..9786af592372140829191ea436136916edc32db6 100644
--- a/Source/JavaScriptCore/inspector/protocol/DOM.json
+++ b/Source/JavaScriptCore/inspector/protocol/DOM.json
@@ -80,6 +80,16 @@
@@ -411,7 +411,7 @@ index 25711ac1aa269d7e0231a6169be1bc495f2c8dc0..bcb4d83e58a51458de6e070ef7cb859e
{
"id": "EventListener",
"type": "object",
-@@ -745,7 +755,10 @@
+@@ -747,7 +757,10 @@
"description": "Resolves JavaScript node object for given node id.",
"targetTypes": ["page"],
"parameters": [
@@ -423,7 +423,7 @@ index 25711ac1aa269d7e0231a6169be1bc495f2c8dc0..bcb4d83e58a51458de6e070ef7cb859e
{ "name": "objectGroup", "type": "string", "optional": true, "description": "Symbolic group name that can be used to release multiple objects." }
],
"returns": [
-@@ -822,6 +835,46 @@
+@@ -824,6 +837,46 @@
"returns": [
{ "name": "mediaStats", "$ref": "MediaStats", "description": "An interleaved array of node attribute names and values." }
]
@@ -866,7 +866,7 @@ index 96af27ece2ac200e11c4311b3ca0d9d3b5a048da..3168f7806fcbdabec07acc5e304bae1e
],
"events": [
diff --git a/Source/JavaScriptCore/inspector/protocol/Page.json b/Source/JavaScriptCore/inspector/protocol/Page.json
-index a9a991e82e5354f5f98949ce6d4a61ede0aba83f..2b37089c853e4e0aa430532e6c7db237d588b29f 100644
+index 223af5102b093482e5a7b76d248ad6862b960e30..760a97841009d6f1feac0e8f2e6ae4d392180eab 100644
--- a/Source/JavaScriptCore/inspector/protocol/Page.json
+++ b/Source/JavaScriptCore/inspector/protocol/Page.json
@@ -20,7 +20,15 @@
@@ -899,46 +899,12 @@ index a9a991e82e5354f5f98949ce6d4a61ede0aba83f..2b37089c853e4e0aa430532e6c7db237
{
"id": "Frame",
"type": "object",
-@@ -126,6 +140,50 @@
+@@ -126,6 +140,16 @@
{ "name": "sameSite", "$ref": "CookieSameSitePolicy", "description": "Cookie Same-Site policy." },
{ "name": "partitionKey", "type": "string", "optional": true, "description": "Cookie partition key. If null and partitioned property is true, then key must be computed." }
]
+ },
+ {
-+ "id": "AXNode",
-+ "type": "object",
-+ "description": "Accessibility Node",
-+ "properties": [
-+ { "name": "role", "type": "string", "description": "The role."},
-+ { "name": "name", "type": "string","optional": true, "description": "A human readable name for the node."},
-+ { "name": "value", "type": "any", "optional": true, "description": "The current value of the node."},
-+ { "name": "description", "type": "string", "optional": true, "description": "An additional human readable description of the node."},
-+ { "name": "keyshortcuts", "type": "string", "optional": true, "description": "Keyboard shortcuts associated with this node."},
-+ { "name": "roledescription", "type": "string", "optional": true, "description": "A human readable alternative to the role."},
-+ { "name": "valuetext", "type": "string", "optional": true, "description": "A description of the current value."},
-+ { "name": "disabled", "type": "boolean", "optional": true, "description": "Whether the node is disabled."},
-+ { "name": "expanded", "type": "boolean", "optional": true, "description": "Whether the node is expanded or collapsed."},
-+ { "name": "focused", "type": "boolean", "optional": true, "description": "Whether the node is focused."},
-+ { "name": "modal", "type": "boolean", "optional": true, "description": "Whether the node is modal."},
-+ { "name": "multiselectable", "type": "boolean", "optional": true, "description": "Whether more than one child can be selected."},
-+ { "name": "readonly", "type": "boolean", "optional": true, "description": "Whether the node is read only."},
-+ { "name": "required", "type": "boolean", "optional": true, "description": "Whether the node is required."},
-+ { "name": "selected", "type": "boolean", "optional": true, "description": "Whether the node is selected in its parent node."},
-+ { "name": "checked", "type": "string", "optional": true, "enum": ["true", "false", "mixed"], "description": "Whether the checkbox is checked, or \"mixed\"."},
-+ { "name": "pressed", "type": "string", "optional": true, "enum": ["true", "false", "mixed"], "description": "Whether the toggle button is checked, or \"mixed\"."},
-+ { "name": "level", "type": "integer", "optional": true, "description": "The level of a heading."},
-+ { "name": "valuemin", "type": "number", "optional": true, "description": "The minimum value in a node."},
-+ { "name": "valuemax", "type": "number", "optional": true, "description": "The maximum value in a node."},
-+ { "name": "autocomplete", "type": "string", "optional": true, "description": "What kind of autocomplete is supported by a control."},
-+ { "name": "haspopup", "type": "string", "optional": true, "description": "What kind of popup is currently being shown for a node."},
-+ { "name": "invalid", "type": "string", "optional": true, "enum": ["true", "false", "grammar", "spelling"], "description": "Whether and in what way this node's value is invalid."},
-+ { "name": "orientation", "type": "string", "optional": true, "description": "Whether the node is oriented horizontally or vertically."},
-+ { "name": "focusable", "type": "boolean", "optional": true, "description": "Whether the node is focusable."},
-+ { "name": "children", "type": "array", "optional": true, "items": { "$ref": "AXNode"}, "description": "Child AXNodes of this node, if any."},
-+ { "name": "found", "type": "boolean", "optional": true, "description": "True if this AXNode corresponds with the ObjectId passed into acessibilitySnapshot."}
-+ ]
-+ },
-+ {
+ "id": "Insets",
+ "type": "object",
+ "properties": [
@@ -950,7 +916,7 @@ index a9a991e82e5354f5f98949ce6d4a61ede0aba83f..2b37089c853e4e0aa430532e6c7db237
}
],
"commands": [
-@@ -145,6 +203,14 @@
+@@ -145,6 +169,14 @@
{ "name": "revalidateAllResources", "type": "boolean", "optional": true, "description": "If true, all cached subresources will be revalidated when the main resource loads. Otherwise, only expired cached subresources will be revalidated (the default behavior for most WebKit clients)." }
]
},
@@ -963,9 +929,9 @@ index a9a991e82e5354f5f98949ce6d4a61ede0aba83f..2b37089c853e4e0aa430532e6c7db237
+ "description": "Goes forward in the history."
+ },
{
- "name": "navigate",
- "description": "Navigates current page to the given URL.",
-@@ -161,6 +227,14 @@
+ "name": "overrideUserAgent",
+ "description": "Override's the user agent of the inspected page",
+@@ -153,6 +185,14 @@
{ "name": "value", "type": "string", "optional": true, "description": "Value to override the user agent with. If this value is not provided, the override is removed. Overrides are removed when Web Inspector closes/disconnects." }
]
},
@@ -980,7 +946,7 @@ index a9a991e82e5354f5f98949ce6d4a61ede0aba83f..2b37089c853e4e0aa430532e6c7db237
{
"name": "overrideSetting",
"description": "Allows the frontend to override the inspected page's settings.",
-@@ -285,6 +359,28 @@
+@@ -277,6 +317,28 @@
{ "name": "media", "type": "string", "description": "Media type to emulate. Empty string disables the override." }
]
},
@@ -1009,7 +975,7 @@ index a9a991e82e5354f5f98949ce6d4a61ede0aba83f..2b37089c853e4e0aa430532e6c7db237
{
"name": "snapshotNode",
"description": "Capture a snapshot of the specified node that does not include unrelated layers.",
-@@ -305,7 +401,8 @@
+@@ -297,7 +359,8 @@
{ "name": "y", "type": "integer", "description": "Y coordinate" },
{ "name": "width", "type": "integer", "description": "Rectangle width" },
{ "name": "height", "type": "integer", "description": "Rectangle height" },
@@ -1019,7 +985,7 @@ index a9a991e82e5354f5f98949ce6d4a61ede0aba83f..2b37089c853e4e0aa430532e6c7db237
],
"returns": [
{ "name": "dataURL", "type": "string", "description": "Base64-encoded image data (PNG)." }
-@@ -323,12 +420,64 @@
+@@ -315,12 +378,54 @@
{
"name": "setScreenSizeOverride",
"description": "Overrides screen size exposed to DOM and used in media queries for testing with provided values.",
@@ -1038,16 +1004,6 @@ index a9a991e82e5354f5f98949ce6d4a61ede0aba83f..2b37089c853e4e0aa430532e6c7db237
+ ]
+ },
+ {
-+ "name": "accessibilitySnapshot",
-+ "description": "Serializes and returns all of the accessibility nodes of the page.",
-+ "parameters": [
-+ { "name": "objectId", "type": "string", "optional": true, "description": "Object Id of a node to find in the accessibility tree."}
-+ ],
-+ "returns": [
-+ { "name": "axNode", "$ref": "AXNode", "description": "The root AXNode."}
-+ ]
-+ },
-+ {
+ "name": "setInterceptFileChooserDialog",
+ "description": "Intercepts file chooser dialog",
+ "parameters": [
@@ -1085,7 +1041,7 @@ index a9a991e82e5354f5f98949ce6d4a61ede0aba83f..2b37089c853e4e0aa430532e6c7db237
}
],
"events": [
-@@ -336,14 +485,16 @@
+@@ -328,14 +433,16 @@
"name": "domContentEventFired",
"targetTypes": ["page"],
"parameters": [
@@ -1104,7 +1060,7 @@ index a9a991e82e5354f5f98949ce6d4a61ede0aba83f..2b37089c853e4e0aa430532e6c7db237
]
},
{
-@@ -353,6 +504,14 @@
+@@ -345,6 +452,14 @@
{ "name": "frame", "$ref": "Frame", "description": "Frame object." }
]
},
@@ -1119,7 +1075,7 @@ index a9a991e82e5354f5f98949ce6d4a61ede0aba83f..2b37089c853e4e0aa430532e6c7db237
{
"name": "frameDetached",
"description": "Fired when frame has been detached from its parent.",
-@@ -361,6 +520,22 @@
+@@ -353,6 +468,22 @@
{ "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has been detached." }
]
},
@@ -1142,7 +1098,7 @@ index a9a991e82e5354f5f98949ce6d4a61ede0aba83f..2b37089c853e4e0aa430532e6c7db237
{
"name": "defaultUserPreferencesDidChange",
"description": "Fired when the default value of a user preference changes at the system level.",
-@@ -368,6 +543,42 @@
+@@ -360,6 +491,42 @@
"parameters": [
{ "name": "preferences", "type": "array", "items": { "$ref": "UserPreference" }, "description": "List of user preferences that can be overriden and their new system (default) values." }
]
@@ -1508,7 +1464,7 @@ index 0000000000000000000000000000000000000000..8dc7f2bd04172dd6cabb1d869a295569
+ ]
+}
diff --git a/Source/JavaScriptCore/inspector/protocol/Runtime.json b/Source/JavaScriptCore/inspector/protocol/Runtime.json
-index 301b88eb1607b0975c3fa81d91045eb5403378ec..0e2ae5d96b3cdcc20ecc95ddc7b49538dcb3c302 100644
+index 3339fb0806d71bce472f34ff6454a6aa86be7de9..da7580b94519fd56eaf69d4094b4799075ea577d 100644
--- a/Source/JavaScriptCore/inspector/protocol/Runtime.json
+++ b/Source/JavaScriptCore/inspector/protocol/Runtime.json
@@ -272,6 +272,13 @@
@@ -1544,10 +1500,10 @@ index 301b88eb1607b0975c3fa81d91045eb5403378ec..0e2ae5d96b3cdcc20ecc95ddc7b49538
}
diff --git a/Source/JavaScriptCore/inspector/protocol/Screencast.json b/Source/JavaScriptCore/inspector/protocol/Screencast.json
new file mode 100644
-index 0000000000000000000000000000000000000000..73a4e53ced3acc41316bb8d4c787306d3f28a27e
+index 0000000000000000000000000000000000000000..9ce147f260f32fd5719a7c00d9018a5fec3e51fa
--- /dev/null
+++ b/Source/JavaScriptCore/inspector/protocol/Screencast.json
-@@ -0,0 +1,64 @@
+@@ -0,0 +1,65 @@
+{
+ "domain": "Screencast",
+ "availability": ["web"],
@@ -1606,6 +1562,7 @@ index 0000000000000000000000000000000000000000..73a4e53ced3acc41316bb8d4c787306d
+ "name": "screencastFrame",
+ "parameters": [
+ { "name": "data", "type": "string", "description": "Base64 data" },
++ { "name": "timestamp", "type": "number" },
+ { "name": "deviceWidth", "type": "integer" },
+ { "name": "deviceHeight", "type": "integer" }
+ ]
@@ -1658,7 +1615,7 @@ index a861a83b87e4e7752e547b7070ec1ef26e1cc3e5..16d6ec26034758e127dcb599f5cb1708
},
{
diff --git a/Source/JavaScriptCore/runtime/ConsoleClient.h b/Source/JavaScriptCore/runtime/ConsoleClient.h
-index ce394be47840853ba08066ebbd1d909fad1f602e..bfd82684410312890c1e112aced16be797437893 100644
+index ca132d74f5f4303452ed96186eea3ae860926e0a..aaccfae22ad1a8e6c11974e36dab4b867df7f693 100644
--- a/Source/JavaScriptCore/runtime/ConsoleClient.h
+++ b/Source/JavaScriptCore/runtime/ConsoleClient.h
@@ -78,6 +78,7 @@ public:
@@ -1668,13 +1625,210 @@ index ce394be47840853ba08066ebbd1d909fad1f602e..bfd82684410312890c1e112aced16be7
+ virtual void bindingCalled(JSGlobalObject*, const String& name, const String& arg) = 0;
private:
- enum ArgumentRequirement { ArgumentRequired, ArgumentNotRequired };
+ enum class ArgumentRequirement { No, Yes };
diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt
-index 5a6fca7b0bef95d05511baf41deff8841d872e04..1f59d06c9a89efe248c3b172c4324d95608e26bb 100644
+index 7fc1d9e7784759d7d12b7bce4ef1c29c66bf562e..009e93af3a7af5b90d4a66ad236999756b34ecb6 100644
--- a/Source/ThirdParty/libwebrtc/CMakeLists.txt
+++ b/Source/ThirdParty/libwebrtc/CMakeLists.txt
-@@ -1796,6 +1796,14 @@ list(APPEND webrtc_SOURCES
- Source/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/modulewrapper.cc
+@@ -195,17 +195,21 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/api/audio_options.cc
+ Source/webrtc/api/call/transport.cc
+ Source/webrtc/api/candidate.cc
++ Source/webrtc/api/create_modular_peer_connection_factory.cc
+ Source/webrtc/api/create_peerconnection_factory.cc
+ Source/webrtc/api/crypto/crypto_options.cc
+ Source/webrtc/api/data_channel_interface.cc
++ Source/webrtc/api/datagram_connection_factory.cc
+ Source/webrtc/api/dtls_transport_interface.cc
+ Source/webrtc/api/enable_media.cc
+ Source/webrtc/api/enable_media_with_defaults.cc
++ Source/webrtc/api/environment/deprecated_global_field_trials.cc
+ Source/webrtc/api/environment/environment_factory.cc
+ Source/webrtc/api/field_trials.cc
+ Source/webrtc/api/field_trials_registry.cc
+ Source/webrtc/api/frame_transformer_factory.cc
+ Source/webrtc/api/frame_transformer_interface.cc
++ Source/webrtc/api/ice_server_parsing.cc
+ Source/webrtc/api/ice_transport_factory.cc
+ Source/webrtc/api/jsep.cc
+ Source/webrtc/api/jsep_ice_candidate.cc
+@@ -232,15 +236,14 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/api/rtp_sender_interface.cc
+ Source/webrtc/api/rtp_transceiver_interface.cc
+ Source/webrtc/api/sctp_transport_interface.cc
+- # Source/webrtc/api/task_queue/default_task_queue_factory_gcd.cc
+ Source/webrtc/api/task_queue/default_task_queue_factory_stdlib.cc
+ Source/webrtc/api/task_queue/default_task_queue_factory_win.cc
+ Source/webrtc/api/task_queue/pending_task_safety_flag.cc
+ Source/webrtc/api/task_queue/task_queue_base.cc
+ Source/webrtc/api/transport/bitrate_settings.cc
+- Source/webrtc/api/transport/field_trial_based_config.cc
+ Source/webrtc/api/transport/goog_cc_factory.cc
+ Source/webrtc/api/transport/network_types.cc
++ Source/webrtc/api/transport/rtp/corruption_detection_message.cc
+ Source/webrtc/api/transport/rtp/dependency_descriptor.cc
+ Source/webrtc/api/transport/stun.cc
+ Source/webrtc/api/units/data_rate.cc
+@@ -250,6 +253,10 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/api/units/timestamp.cc
+ Source/webrtc/api/video/builtin_video_bitrate_allocator_factory.cc
+ Source/webrtc/api/video/color_space.cc
++ Source/webrtc/api/video/corruption_detection/frame_instrumentation_data.cc
++ Source/webrtc/api/video/corruption_detection/frame_instrumentation_data_reader.cc
++ Source/webrtc/api/video/corruption_detection/frame_instrumentation_evaluation.cc
++ Source/webrtc/api/video/corruption_detection/frame_instrumentation_generator.cc
+ Source/webrtc/api/video/encoded_frame.cc
+ Source/webrtc/api/video/encoded_image.cc
+ Source/webrtc/api/video/frame_buffer.cc
+@@ -276,7 +283,6 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/api/video_codecs/builtin_video_encoder_factory.cc
+ Source/webrtc/api/video_codecs/h264_profile_level_id.cc
+ Source/webrtc/api/video_codecs/h265_profile_tier_level.cc
+- # Source/webrtc/api/video_codecs/libaom_av1_encoder_factory.cc
+ 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
+@@ -293,6 +299,7 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/api/video_codecs/vp8_temporal_layers_factory.cc
+ Source/webrtc/api/video_codecs/vp9_profile.cc
+ Source/webrtc/api/voip/voip_engine_factory.cc
++ Source/webrtc/api/webrtc_sdp.cc
+ Source/webrtc/audio/audio_level.cc
+ Source/webrtc/audio/audio_receive_stream.cc
+ Source/webrtc/audio/audio_send_stream.cc
+@@ -404,7 +411,6 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/common_audio/wav_header.cc
+ Source/webrtc/common_audio/window_generator.cc
+ Source/webrtc/common_video/bitrate_adjuster.cc
+- Source/webrtc/common_video/corruption_detection_converters.cc
+ Source/webrtc/common_video/frame_rate_estimator.cc
+ Source/webrtc/common_video/framerate_controller.cc
+ Source/webrtc/common_video/generic_frame_descriptor/generic_frame_info.cc
+@@ -438,6 +444,7 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/logging/rtc_event_log/events/rtc_event_begin_log.cc
+ Source/webrtc/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.cc
+ Source/webrtc/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.cc
++ Source/webrtc/logging/rtc_event_log/events/rtc_event_bwe_update_scream.cc
+ Source/webrtc/logging/rtc_event_log/events/rtc_event_dtls_transport_state.cc
+ Source/webrtc/logging/rtc_event_log/events/rtc_event_dtls_writable_state.cc
+ Source/webrtc/logging/rtc_event_log/events/rtc_event_end_log.cc
+@@ -445,9 +452,6 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/logging/rtc_event_log/events/rtc_event_field_encoding_parser.cc
+ Source/webrtc/logging/rtc_event_log/events/rtc_event_field_extraction.cc
+ Source/webrtc/logging/rtc_event_log/events/rtc_event_frame_decoded.cc
+- Source/webrtc/logging/rtc_event_log/events/rtc_event_generic_ack_received.cc
+- Source/webrtc/logging/rtc_event_log/events/rtc_event_generic_packet_received.cc
+- Source/webrtc/logging/rtc_event_log/events/rtc_event_generic_packet_sent.cc
+ Source/webrtc/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.cc
+ Source/webrtc/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.cc
+ Source/webrtc/logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.cc
+@@ -778,6 +782,10 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/modules/congestion_controller/rtp/control_handler.cc
+ Source/webrtc/modules/congestion_controller/rtp/transport_feedback_adapter.cc
+ Source/webrtc/modules/congestion_controller/rtp/transport_feedback_demuxer.cc
++ Source/webrtc/modules/congestion_controller/scream/delay_based_congestion_control.cc
++ Source/webrtc/modules/congestion_controller/scream/scream_network_controller.cc
++ Source/webrtc/modules/congestion_controller/scream/scream_v2.cc
++ Source/webrtc/modules/congestion_controller/scream/scream_v2_parameters.cc
+ Source/webrtc/modules/pacing/bitrate_prober.cc
+ Source/webrtc/modules/pacing/interval_budget.cc
+ Source/webrtc/modules/pacing/pacing_controller.cc
+@@ -805,7 +813,6 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/modules/rtp_rtcp/source/capture_clock_offset_updater.cc
+ Source/webrtc/modules/rtp_rtcp/source/corruption_detection_extension.cc
+ Source/webrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc
+- Source/webrtc/modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.cc
+ Source/webrtc/modules/rtp_rtcp/source/dtmf_queue.cc
+ Source/webrtc/modules/rtp_rtcp/source/fec_private_tables_bursty.cc
+ Source/webrtc/modules/rtp_rtcp/source/fec_private_tables_random.cc
+@@ -876,7 +883,6 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.cc
+ Source/webrtc/modules/rtp_rtcp/source/rtp_packetizer_av1.cc
+ Source/webrtc/modules/rtp_rtcp/source/rtp_packetizer_h265.cc
+- Source/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+ Source/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
+ Source/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
+ Source/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc
+@@ -975,6 +981,7 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/modules/video_coding/utility/corruption_detection_settings_generator.cc
+ Source/webrtc/modules/video_coding/utility/decoded_frames_history.cc
+ Source/webrtc/modules/video_coding/utility/frame_dropper.cc
++ Source/webrtc/modules/video_coding/utility/frame_sampler.cc
+ Source/webrtc/modules/video_coding/utility/framerate_controller_deprecated.cc
+ Source/webrtc/modules/video_coding/utility/ivf_file_reader.cc
+ Source/webrtc/modules/video_coding/utility/ivf_file_writer.cc
+@@ -1099,6 +1106,7 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/pc/connection_context.cc
+ Source/webrtc/pc/data_channel_controller.cc
+ Source/webrtc/pc/data_channel_utils.cc
++ Source/webrtc/pc/datagram_connection_internal.cc
+ Source/webrtc/pc/dtls_srtp_transport.cc
+ Source/webrtc/pc/dtls_transport.cc
+ Source/webrtc/pc/dtmf_sender.cc
+@@ -1106,8 +1114,6 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/pc/ice_server_parsing.cc
+ Source/webrtc/pc/ice_transport.cc
+ Source/webrtc/pc/jitter_buffer_delay.cc
+- Source/webrtc/pc/jsep_ice_candidate.cc
+- Source/webrtc/pc/jsep_session_description.cc
+ Source/webrtc/pc/jsep_transport.cc
+ Source/webrtc/pc/jsep_transport_collection.cc
+ Source/webrtc/pc/jsep_transport_controller.cc
+@@ -1122,9 +1128,9 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/pc/peer_connection_factory.cc
+ Source/webrtc/pc/peer_connection_message_handler.cc
+ Source/webrtc/pc/remote_audio_source.cc
+- Source/webrtc/pc/rtcp_mux_filter.cc
+ Source/webrtc/pc/rtc_stats_collector.cc
+ Source/webrtc/pc/rtc_stats_traversal.cc
++ Source/webrtc/pc/rtcp_mux_filter.cc
+ Source/webrtc/pc/rtp_media_utils.cc
+ Source/webrtc/pc/rtp_parameters_conversion.cc
+ Source/webrtc/pc/rtp_receiver.cc
+@@ -1153,7 +1159,6 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/pc/video_track.cc
+ Source/webrtc/pc/video_track_source.cc
+ Source/webrtc/pc/video_track_source_proxy.cc
+- Source/webrtc/pc/webrtc_sdp.cc
+ Source/webrtc/pc/webrtc_session_description_factory.cc
+ Source/webrtc/rtc_base/async_dns_resolver.cc
+ Source/webrtc/rtc_base/async_packet_socket.cc
+@@ -1184,12 +1189,14 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/rtc_base/experiments/alr_experiment.cc
+ Source/webrtc/rtc_base/experiments/balanced_degradation_settings.cc
+ Source/webrtc/rtc_base/experiments/encoder_info_settings.cc
++ Source/webrtc/rtc_base/experiments/encoder_speed_experiment.cc
+ Source/webrtc/rtc_base/experiments/field_trial_list.cc
+ Source/webrtc/rtc_base/experiments/field_trial_parser.cc
+ Source/webrtc/rtc_base/experiments/field_trial_units.cc
+ Source/webrtc/rtc_base/experiments/keyframe_interval_settings.cc
+ Source/webrtc/rtc_base/experiments/min_video_bitrate_experiment.cc
+ Source/webrtc/rtc_base/experiments/normalize_simulcast_size_experiment.cc
++ Source/webrtc/rtc_base/experiments/psnr_experiment.cc
+ Source/webrtc/rtc_base/experiments/quality_scaler_settings.cc
+ Source/webrtc/rtc_base/experiments/quality_scaling_experiment.cc
+ Source/webrtc/rtc_base/experiments/rate_control_settings.cc
+@@ -1304,8 +1311,6 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/video/config/video_encoder_config.cc
+ Source/webrtc/video/corruption_detection/corruption_classifier.cc
+ Source/webrtc/video/corruption_detection/evaluation/utils.cc
+- Source/webrtc/video/corruption_detection/frame_instrumentation_evaluation.cc
+- Source/webrtc/video/corruption_detection/frame_instrumentation_generator.cc
+ Source/webrtc/video/corruption_detection/frame_pair_corruption_score.cc
+ Source/webrtc/video/corruption_detection/generic_mapping_functions.cc
+ Source/webrtc/video/corruption_detection/halton_frame_sampler.cc
+@@ -1336,6 +1341,9 @@ list(APPEND webrtc_SOURCES
+ Source/webrtc/video/stats_counter.cc
+ Source/webrtc/video/stream_synchronization.cc
+ Source/webrtc/video/task_queue_frame_decode_scheduler.cc
++ Source/webrtc/video/timing/simulator/assembler.cc
++ Source/webrtc/video/timing/simulator/decodability_tracker.cc
++ Source/webrtc/video/timing/simulator/rendering_tracker.cc
+ Source/webrtc/video/transport_adapter.cc
+ Source/webrtc/video/unique_timestamp_counter.cc
+ Source/webrtc/video/video_loopback_main.cc
+@@ -1788,6 +1796,14 @@ list(APPEND webrtc_SOURCES
+ Source/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/proto.cc
)
+# Playwright begin
@@ -1688,7 +1842,7 @@ index 5a6fca7b0bef95d05511baf41deff8841d872e04..1f59d06c9a89efe248c3b172c4324d95
if (WTF_CPU_X86_64 OR WTF_CPU_X86)
list(APPEND webrtc_SOURCES
Source/webrtc/common_audio/fir_filter_sse.cc
-@@ -2387,6 +2395,14 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE
+@@ -2356,6 +2372,14 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE
Source/webrtc/modules/video_coding/include
)
@@ -1717,13 +1871,13 @@ index 0c5c8e689bdddec766f9de5bffd4444a5e068d77..330dd1f585e530722178c65c883641a2
// FIXME: Set WEBRTC_USE_BUILTIN_ISAC_FIX and WEBRTC_USE_BUILTIN_ISAC_FLOAT for iOS and Mac
diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp
-index 001fe26ea1ce01ec7d8a605b706db20ed9bf36f6..8906ae2fa79dd94378c61cf10df4a16e9c5e8642 100644
+index 216096336500be29461eee584711a7c0aea05bf8..dab588c0f41fc6e6a31e15af0a32835a6b3e1e42 100644
--- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp
+++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp
-@@ -411,3 +411,16 @@ __ZN6webrtc11EnableMediaERNS_33PeerConnectionFactoryDependenciesE
- __ZN6webrtc18BasicPortAllocatorC1ERKNS_11EnvironmentEPNS_14NetworkManagerEPNS_19PacketSocketFactoryEPNS_14TurnCustomizerEPNS_25RelayPortFactoryInterfaceENSt3__110unique_ptrINS_44LocalNetworkAccessPermissionFactoryInterfaceENSC_14default_deleteISE_EEEE
- __ZNK6webrtc12IceCandidate8ToStringEv
- __ZN6webrtc12IceCandidate6CreateENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEEiS5_PNS_13SdpParseErrorE
+@@ -415,3 +415,16 @@ __ZN6webrtc9CandidateC1ERKS0_
+ __ZNK6webrtc27SessionDescriptionInterface8ToStringEv
+ __ZN6webrtc14SdpDeserializeENS_7SdpTypeENSt3__117basic_string_viewIcNS1_11char_traitsIcEEEEPNS_13SdpParseErrorE
+ __ZN6webrtc18callback_list_impl21CallbackListReceiversD1Ev
+__ZN8mkvmuxer11SegmentInfo4InitEv
+__ZN8mkvmuxer9MkvWriterC1EP7__sFILE
+_ARGBToI420
@@ -1738,7 +1892,7 @@ index 001fe26ea1ce01ec7d8a605b706db20ed9bf36f6..8906ae2fa79dd94378c61cf10df4a16e
+_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 94a27d3d4cebbbbc79e0b5c263ecabca8eae23de..3be6c41a824cb82aaea89bc2934c8431cc75ba94 100644
+index a4cb19044072d837dcf12894c454ee6914956880..2fcc5f14343d8502f7f2d87fcdff444538678617 100644
--- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
+++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
@@ -56,6 +56,20 @@
@@ -1762,7 +1916,7 @@ index 94a27d3d4cebbbbc79e0b5c263ecabca8eae23de..3be6c41a824cb82aaea89bc2934c8431
/* Begin PBXBuildFile section */
2938424F2E258DF1006DF6A9 /* aesni-gcm-x86_64-apple.S in Sources */ = {isa = PBXBuildFile; fileRef = 293841D82E258DF1006DF6A9 /* aesni-gcm-x86_64-apple.S */; };
293842512E258DF1006DF6A9 /* ghash-x86_64-apple.S in Sources */ = {isa = PBXBuildFile; fileRef = 293842002E258DF1006DF6A9 /* ghash-x86_64-apple.S */; };
-@@ -5692,6 +5706,13 @@
+@@ -5708,6 +5722,13 @@
remoteGlobalIDString = DDF30D0527C5C003006A526F;
remoteInfo = absl;
};
@@ -1776,7 +1930,7 @@ index 94a27d3d4cebbbbc79e0b5c263ecabca8eae23de..3be6c41a824cb82aaea89bc2934c8431
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
-@@ -24341,6 +24362,7 @@
+@@ -24389,6 +24410,7 @@
);
dependencies = (
410B3827292B73E90003E515 /* PBXTargetDependency */,
@@ -1784,7 +1938,7 @@ index 94a27d3d4cebbbbc79e0b5c263ecabca8eae23de..3be6c41a824cb82aaea89bc2934c8431
DD2E76E827C6B69A00F2A74C /* PBXTargetDependency */,
CDEBB4CC24C01AB400ADBD44 /* PBXTargetDependency */,
411ED040212E0811004320BA /* PBXTargetDependency */,
-@@ -24434,6 +24456,7 @@
+@@ -24482,6 +24504,7 @@
4460B8B92B155B6A00392062 /* vp9_qp_parser_fuzzer */,
444A6EF02AEADFC9005FE121 /* vp9_replay_fuzzer */,
44945C512B9BA1C300447FFD /* webm_fuzzer */,
@@ -1792,7 +1946,7 @@ index 94a27d3d4cebbbbc79e0b5c263ecabca8eae23de..3be6c41a824cb82aaea89bc2934c8431
);
};
/* End PBXProject section */
-@@ -24537,6 +24560,23 @@
+@@ -24585,6 +24608,23 @@
shellPath = /bin/sh;
shellScript = "[ -z \"${WK_DERIVED_SDK_HEADERS_DIR}\" -o -d \"${WK_DERIVED_SDK_HEADERS_DIR}\" ] && touch \"${SCRIPT_OUTPUT_FILE_0}\"\n";
};
@@ -1816,7 +1970,7 @@ index 94a27d3d4cebbbbc79e0b5c263ecabca8eae23de..3be6c41a824cb82aaea89bc2934c8431
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
-@@ -27611,6 +27651,11 @@
+@@ -27667,6 +27707,11 @@
target = DDF30D0527C5C003006A526F /* absl */;
targetProxy = DD2E76E727C6B69A00F2A74C /* PBXContainerItemProxy */;
};
@@ -1828,7 +1982,7 @@ index 94a27d3d4cebbbbc79e0b5c263ecabca8eae23de..3be6c41a824cb82aaea89bc2934c8431
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
-@@ -28378,6 +28423,27 @@
+@@ -28434,6 +28479,27 @@
};
name = Production;
};
@@ -1856,7 +2010,7 @@ index 94a27d3d4cebbbbc79e0b5c263ecabca8eae23de..3be6c41a824cb82aaea89bc2934c8431
FB39D0711200ED9200088E69 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */;
-@@ -28760,6 +28826,16 @@
+@@ -28816,6 +28882,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
@@ -1874,7 +2028,7 @@ index 94a27d3d4cebbbbc79e0b5c263ecabca8eae23de..3be6c41a824cb82aaea89bc2934c8431
isa = XCConfigurationList;
buildConfigurations = (
diff --git a/Source/ThirdParty/skia/CMakeLists.txt b/Source/ThirdParty/skia/CMakeLists.txt
-index 462e0e6993c543ed3c264ff12347ed703e3787cf..6422f9369f496ff9045abc7eac8f511c6c82f19b 100644
+index 3ec31514d72491bbc1c951a5fc6d1cc3305113a2..42abaab288ce69dc0a964ecb3ceb6e559ed7dc20 100644
--- a/Source/ThirdParty/skia/CMakeLists.txt
+++ b/Source/ThirdParty/skia/CMakeLists.txt
@@ -10,6 +10,8 @@ if (USE_SKIA_ENCODERS)
@@ -1886,7 +2040,7 @@ index 462e0e6993c543ed3c264ff12347ed703e3787cf..6422f9369f496ff9045abc7eac8f511c
if (ANDROID)
find_package(EXPAT REQUIRED)
endif ()
-@@ -960,6 +962,7 @@ endif ()
+@@ -964,6 +966,7 @@ endif ()
target_link_libraries(Skia PRIVATE
JPEG::JPEG
PNG::PNG
@@ -1895,10 +2049,10 @@ index 462e0e6993c543ed3c264ff12347ed703e3787cf..6422f9369f496ff9045abc7eac8f511c
WEBKIT_ADD_TARGET_CXX_FLAGS(Skia
diff --git a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
-index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca8b143e0d 100644
+index 9cd5e7f0e7bb86b48b57fcccea3d32105d6f901f..12c09e04936b64fa546f8a67eaf5d20ee6476b28 100644
--- a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
+++ b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
-@@ -540,6 +540,7 @@ ApplePayEnabled:
+@@ -567,6 +567,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.
@@ -1906,7 +2060,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
AsyncClipboardAPIEnabled:
type: bool
status: mature
-@@ -550,7 +551,7 @@ AsyncClipboardAPIEnabled:
+@@ -577,7 +578,7 @@ AsyncClipboardAPIEnabled:
default: false
WebKit:
"PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)" : true
@@ -1915,7 +2069,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
WebCore:
default: false
-@@ -811,13 +812,10 @@ BlobFileAccessEnforcementEnabled:
+@@ -849,13 +850,10 @@ BlobFileAccessEnforcementEnabled:
sharedPreferenceForWebProcess: true
defaultValue:
WebKitLegacy:
@@ -1929,7 +2083,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
default: false
BlockFontServiceInWebContentSandbox:
-@@ -2080,6 +2078,7 @@ CrossOriginEmbedderPolicyEnabled:
+@@ -2177,6 +2175,7 @@ CrossOriginEmbedderPolicyEnabled:
WebCore:
default: false
@@ -1937,7 +2091,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
CrossOriginOpenerPolicyEnabled:
type: bool
status: stable
-@@ -2153,6 +2152,7 @@ DOMAudioSessionFullEnabled:
+@@ -2250,6 +2249,7 @@ DOMAudioSessionFullEnabled:
WebCore:
default: false
@@ -1945,7 +2099,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
DOMPasteAccessRequestsEnabled:
type: bool
status: internal
-@@ -2164,7 +2164,7 @@ DOMPasteAccessRequestsEnabled:
+@@ -2261,7 +2261,7 @@ DOMPasteAccessRequestsEnabled:
default: false
WebKit:
"PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(VISION)": true
@@ -1954,7 +2108,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
WebCore:
default: false
-@@ -2230,10 +2230,10 @@ DataListElementEnabled:
+@@ -2327,10 +2327,10 @@ DataListElementEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -1967,7 +2121,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
default: false
sharedPreferenceForWebProcess: true
-@@ -2246,7 +2246,7 @@ DataTransferItemsEnabled:
+@@ -2343,7 +2343,7 @@ DataTransferItemsEnabled:
WebKitLegacy:
default: true
WebKit:
@@ -1976,7 +2130,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
default: false
WebCore:
default: false
-@@ -2489,7 +2489,7 @@ DirectoryUploadEnabled:
+@@ -2586,7 +2586,7 @@ DirectoryUploadEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -1985,7 +2139,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
default: false
WebCore:
default: false
-@@ -3057,10 +3057,10 @@ FullScreenEnabled:
+@@ -3237,10 +3237,10 @@ FullScreenEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -1998,7 +2152,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
default: false
sharedPreferenceForWebProcess: true
-@@ -3737,7 +3737,7 @@ InputTypeColorEnabled:
+@@ -3958,7 +3958,7 @@ InputTypeColorEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -2007,7 +2161,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
default: false
WebCore:
default: false
-@@ -3770,7 +3770,7 @@ InputTypeDateEnabled:
+@@ -3991,7 +3991,7 @@ InputTypeDateEnabled:
"PLATFORM(IOS_FAMILY)": true
default: false
WebKit:
@@ -2016,7 +2170,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
default: false
WebCore:
default: false
-@@ -3786,7 +3786,7 @@ InputTypeDateTimeLocalEnabled:
+@@ -4007,7 +4007,7 @@ InputTypeDateTimeLocalEnabled:
"PLATFORM(IOS_FAMILY)": true
default: false
WebKit:
@@ -2025,7 +2179,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
default: false
WebCore:
default: false
-@@ -3818,7 +3818,7 @@ InputTypeTimeEnabled:
+@@ -4039,7 +4039,7 @@ InputTypeTimeEnabled:
"PLATFORM(IOS_FAMILY)": true
default: false
WebKit:
@@ -2034,7 +2188,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
default: false
WebCore:
default: false
-@@ -3879,6 +3879,7 @@ InspectorMaximumResourcesContentSize:
+@@ -4100,6 +4100,7 @@ InspectorMaximumResourcesContentSize:
"PLATFORM(WPE)": 50
default: 200
@@ -2042,7 +2196,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
InspectorStartsAttached:
type: bool
status: embedder
-@@ -3886,7 +3887,7 @@ InspectorStartsAttached:
+@@ -4107,7 +4108,7 @@ InspectorStartsAttached:
exposed: [ WebKit ]
defaultValue:
WebKit:
@@ -2051,7 +2205,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
InspectorSupportsShowingCertificate:
type: bool
-@@ -5980,7 +5981,7 @@ PointerLockEnabled:
+@@ -6259,7 +6260,7 @@ PointerLockEnabled:
"PLATFORM(IOS_FAMILY)": false
default: true
WebCore:
@@ -2060,7 +2214,7 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
PointerLockOptionsEnabled:
type: bool
-@@ -6568,7 +6569,7 @@ ScreenOrientationAPIEnabled:
+@@ -6888,7 +6889,7 @@ ScreenOrientationAPIEnabled:
WebKitLegacy:
default: false
WebKit:
@@ -2070,10 +2224,10 @@ index 6542cff8231649d79b5eb2a1b1cf65e9640e2977..d989cb91ee9ea5323eebcb48aedd17ca
default: false
sharedPreferenceForWebProcess: true
diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h
-index 8304087cdf984c0bf5b48a638b4ae9ac85aa2f0e..96761b8bde2865a0b4a673febaf8b48b74dc421e 100644
+index 8748a245c4abddb3db269833949ef015ffe74bdf..4096072a30a7a1035a6cb644a41acb40fd32402f 100644
--- a/Source/WTF/wtf/PlatformEnable.h
+++ b/Source/WTF/wtf/PlatformEnable.h
-@@ -385,7 +385,7 @@
+@@ -453,7 +453,7 @@
// ORIENTATION_EVENTS should never get enabled on Desktop, only Mobile.
#if !defined(ENABLE_ORIENTATION_EVENTS)
@@ -2082,7 +2236,7 @@ index 8304087cdf984c0bf5b48a638b4ae9ac85aa2f0e..96761b8bde2865a0b4a673febaf8b48b
#endif
#if OS(WINDOWS)
-@@ -494,7 +494,7 @@
+@@ -566,7 +566,7 @@
#endif
#if !defined(ENABLE_TOUCH_EVENTS)
@@ -2092,10 +2246,10 @@ index 8304087cdf984c0bf5b48a638b4ae9ac85aa2f0e..96761b8bde2865a0b4a673febaf8b48b
#if !defined(ENABLE_TOUCH_ACTION_REGIONS)
diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h
-index a11439b16d2427d9a2ecbf4d2bf29f99bb1bafb0..69f1fd6c1b0f5e6b439b2313d5563af981fcfcab 100644
+index 563edfdc48bf410a6e8d2be988e51c5abd5acd24..2648127a62819a8cf00e66a401ecd925903ed64a 100644
--- a/Source/WTF/wtf/PlatformEnableCocoa.h
+++ b/Source/WTF/wtf/PlatformEnableCocoa.h
-@@ -783,7 +783,7 @@
+@@ -860,7 +860,7 @@
#endif
#if !defined(ENABLE_SEC_ITEM_SHIM)
@@ -2105,10 +2259,10 @@ index a11439b16d2427d9a2ecbf4d2bf29f99bb1bafb0..69f1fd6c1b0f5e6b439b2313d5563af9
#if !defined(ENABLE_SERVER_PRECONNECT)
diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
-index bfaf9b0b2f4a95af1cea02e180685cbbbe743f9e..a5f63c3b8f2efd4f8bb00d44523e08db9858377f 100644
+index 828987d6c829ab349c9220474e274617df4b0c4a..49d8ab0f191354ea7c74969d1455c38c0391d54e 100644
--- a/Source/WTF/wtf/PlatformHave.h
+++ b/Source/WTF/wtf/PlatformHave.h
-@@ -1069,7 +1069,8 @@
+@@ -1071,7 +1071,8 @@
#endif
#if PLATFORM(MAC)
@@ -2135,10 +2289,10 @@ index f507b6b97236e9e2e01d2b007c74b404e0ced2cb..ccd616e75835a389de17c5fc8314e2ce
namespace Unicode {
diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
-index 0f68d7a3ff54d2bb7ddb9b4e21436a323a782367..9d7134d62756baa12f1428d6b627b12d383f76b4 100644
+index 685f1b72f793cb1fd5dbca1249964362cb0915e5..5a8e94b171ed3c689fe32336795856887b7cf9dd 100644
--- a/Source/WebCore/DerivedSources.make
+++ b/Source/WebCore/DerivedSources.make
-@@ -1240,6 +1240,10 @@ JS_BINDING_IDLS := \
+@@ -1255,6 +1255,10 @@ JS_BINDING_IDLS := \
$(WebCore)/dom/SubscriberCallback.idl \
$(WebCore)/dom/SubscriptionObserver.idl \
$(WebCore)/dom/SubscriptionObserverCallback.idl \
@@ -2149,7 +2303,7 @@ index 0f68d7a3ff54d2bb7ddb9b4e21436a323a782367..9d7134d62756baa12f1428d6b627b12d
$(WebCore)/dom/Text.idl \
$(WebCore)/dom/TextDecoder.idl \
$(WebCore)/dom/TextDecoderStream.idl \
-@@ -1852,9 +1856,6 @@ JS_BINDING_IDLS := \
+@@ -1875,9 +1879,6 @@ JS_BINDING_IDLS := \
ADDITIONAL_BINDING_IDLS = \
DocumentTouch.idl \
GestureEvent.idl \
@@ -2160,10 +2314,10 @@ index 0f68d7a3ff54d2bb7ddb9b4e21436a323a782367..9d7134d62756baa12f1428d6b627b12d
vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS)
diff --git a/Source/WebCore/Modules/geolocation/Geolocation.cpp b/Source/WebCore/Modules/geolocation/Geolocation.cpp
-index 0896a8a08f0548a1758623b926bbfce683d6795c..354495b7ca6d4663d87473b34e113e193d15fffd 100644
+index 5fbf65401bd9b0de05a56a59ee16ea0c772f3bb8..60074b5aca723dc8dc6d90a48d38097e9bd3e7ba 100644
--- a/Source/WebCore/Modules/geolocation/Geolocation.cpp
+++ b/Source/WebCore/Modules/geolocation/Geolocation.cpp
-@@ -376,8 +376,9 @@ bool Geolocation::shouldBlockGeolocationRequests()
+@@ -374,8 +374,9 @@ bool Geolocation::shouldBlockGeolocationRequests()
bool isSecure = SecurityOrigin::isSecure(document->url()) || document->isSecureContext();
bool isLocalOrigin = securityOrigin()->isLocal();
@@ -2175,7 +2329,7 @@ index 0896a8a08f0548a1758623b926bbfce683d6795c..354495b7ca6d4663d87473b34e113e19
}
diff --git a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm
-index ba3ef589f1930904ffbdae7158fd59db13961cde..e227e731c8a1b6e4c2f2d5501ec1cfe0a5174710 100644
+index e4c2dc829d75e28baad6552f345982352bc50c02..a266a521960c7d920a52220e0fd9a1bdf19f4588 100644
--- a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm
+++ b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm
@@ -197,6 +197,7 @@ - (void)sendEndIfNeeded
@@ -2223,7 +2377,7 @@ index 72b2846f2c82818fc9a64fd90b7cba0c0601e15f..22277ab6c3233f040852d9daf9becf7b
elseif (USE_SKIA)
list(APPEND WebCore_SOURCES
diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
-index 40e8b4e9d5ceb5d499acf8e5804e6357cf3e15e8..a4f037ca12093f0c5b72efeb1e36fa1649649453 100644
+index c8d68f153f3dc0d8f246691a561082dcc127259a..06915064b6c3c3a9036d03b02e308b54413e6a23 100644
--- a/Source/WebCore/SourcesCocoa.txt
+++ b/Source/WebCore/SourcesCocoa.txt
@@ -734,3 +734,9 @@ testing/cocoa/WebViewVisualIdentificationOverlay.mm @nonARC
@@ -2237,13 +2391,13 @@ index 40e8b4e9d5ceb5d499acf8e5804e6357cf3e15e8..a4f037ca12093f0c5b72efeb1e36fa16
+JSTouchList.cpp
+// Playwright end
diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt
-index 55b8164ff85ba521e9e5e858109dafc1e24a6636..abb09e02ff454bee9e86667655d66ada16c5e104 100644
+index 963db9d5050b7cb86a7c21474a1820d60e464e3e..0f76f8dea0fd6f66b319fbc64a444de573aecf5c 100644
--- a/Source/WebCore/SourcesGTK.txt
+++ b/Source/WebCore/SourcesGTK.txt
-@@ -117,3 +117,10 @@ platform/unix/SharedMemoryUnix.cpp
- platform/xdg/MIMETypeRegistryXdg.cpp
+@@ -110,3 +110,10 @@ platform/unix/LoggingUnix.cpp
+ platform/unix/SharedMemoryUnix.cpp
- platform/xr/openxr/PlatformXROpenXR.cpp
+ platform/xdg/MIMETypeRegistryXdg.cpp
+
+// Playwright: begin.
+JSSpeechSynthesisErrorCode.cpp
@@ -2252,23 +2406,23 @@ index 55b8164ff85ba521e9e5e858109dafc1e24a6636..abb09e02ff454bee9e86667655d66ada
+JSSpeechSynthesisEventInit.cpp
+// Playwright: end.
diff --git a/Source/WebCore/SourcesWPE.txt b/Source/WebCore/SourcesWPE.txt
-index 2a5fdd8fd9ad31ed9145917d2335820b0b4975c1..b8085a7b2f0ad0535bfb673077e0273cee98a28b 100644
+index 4921b0ad278c9c1592a7b728946ceffa48dd8271..1c75efd3ded41e03ad0320d97f4bfc2a6fb7dccc 100644
--- a/Source/WebCore/SourcesWPE.txt
+++ b/Source/WebCore/SourcesWPE.txt
-@@ -109,3 +109,8 @@ platform/wpe/PlatformScreenWPE.cpp
- platform/xdg/MIMETypeRegistryXdg.cpp
+@@ -110,3 +110,8 @@ platform/wpe/PasteboardWPE.cpp
+ platform/wpe/PlatformScreenWPE.cpp
- platform/xr/openxr/PlatformXROpenXR.cpp
+ platform/xdg/MIMETypeRegistryXdg.cpp
+
+JSSpeechSynthesisErrorCode.cpp
+JSSpeechSynthesisErrorEvent.cpp
+JSSpeechSynthesisErrorEventInit.cpp
+JSSpeechSynthesisEventInit.cpp
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
-index be2dd5b204efd83fc08698d13c24cc8aff92ba52..9e145d385b52bb65b865712f5e49af1e9b8b821e 100644
+index 96a9f50a2c18a08010dd8204c671c2f9df102837..faddededdc12b6d35958cf4342002b41331e839a 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
-@@ -6733,6 +6733,13 @@
+@@ -6842,6 +6842,13 @@
EE62BD9D2DE12C1B006C9A05 /* ResolvedScopedName.h in Headers */ = {isa = PBXBuildFile; fileRef = EE62BD9B2DE12BD4006C9A05 /* ResolvedScopedName.h */; settings = {ATTRIBUTES = (Private, ); }; };
EEE349082DE0061C00A7D4BB /* StyleScopeIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = EEE349072DE005FC00A7D4BB /* StyleScopeIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2282,7 +2436,7 @@ index be2dd5b204efd83fc08698d13c24cc8aff92ba52..9e145d385b52bb65b865712f5e49af1e
F12171F616A8CF0B000053CA /* WebVTTElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F12171F416A8BC63000053CA /* WebVTTElement.h */; };
F30EE46B2E721BA800935B60 /* FrameInspectorController.h in Headers */ = {isa = PBXBuildFile; fileRef = F30EE46A2E721B9D00935B60 /* FrameInspectorController.h */; settings = {ATTRIBUTES = (Private, ); }; };
F32BDCD92363AACA0073B6AE /* UserGestureEmulationScope.h in Headers */ = {isa = PBXBuildFile; fileRef = F32BDCD72363AACA0073B6AE /* UserGestureEmulationScope.h */; };
-@@ -21844,6 +21851,14 @@
+@@ -22184,6 +22191,14 @@
EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasActivityRecord.h; sourceTree = "<group>"; };
F088343F2E721B29001B2348 /* AXLocalFrame.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AXLocalFrame.h; sourceTree = "<group>"; };
F08834402E721B33001B2348 /* AXLocalFrame.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AXLocalFrame.cpp; sourceTree = "<group>"; };
@@ -2297,7 +2451,7 @@ index be2dd5b204efd83fc08698d13c24cc8aff92ba52..9e145d385b52bb65b865712f5e49af1e
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>"; };
F30EE46A2E721B9D00935B60 /* FrameInspectorController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FrameInspectorController.h; sourceTree = "<group>"; };
-@@ -29744,6 +29759,11 @@
+@@ -30146,6 +30161,11 @@
BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */,
2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */,
2D4F96F21A1ECC240098BF88 /* TextIndicator.h */,
@@ -2309,7 +2463,7 @@ index be2dd5b204efd83fc08698d13c24cc8aff92ba52..9e145d385b52bb65b865712f5e49af1e
F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */,
D640B24C2E3058C800EB6C49 /* UADataValues.h */,
D640B24E2E3058C800EB6C49 /* UADataValues.idl */,
-@@ -37333,6 +37353,8 @@
+@@ -37939,6 +37959,8 @@
29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */,
1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */,
1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */,
@@ -2318,7 +2472,7 @@ index be2dd5b204efd83fc08698d13c24cc8aff92ba52..9e145d385b52bb65b865712f5e49af1e
FE3DC9932D0C063C0021B6FC /* PlatformTZoneImpls.cpp */,
0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */,
935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */,
-@@ -40227,6 +40249,7 @@
+@@ -40855,6 +40877,7 @@
AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */,
6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */,
6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */,
@@ -2326,7 +2480,7 @@ index be2dd5b204efd83fc08698d13c24cc8aff92ba52..9e145d385b52bb65b865712f5e49af1e
7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */,
7CE7FA591EF882300060C9D6 /* DocumentTouch.h */,
A8185F3209765765005826D9 /* DocumentType.cpp */,
-@@ -45281,6 +45304,8 @@
+@@ -45941,6 +45964,8 @@
F4E90A3C2B52038E002DA469 /* PlatformTextAlternatives.h in Headers */,
0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */,
074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */,
@@ -2335,7 +2489,7 @@ index be2dd5b204efd83fc08698d13c24cc8aff92ba52..9e145d385b52bb65b865712f5e49af1e
CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */,
CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */,
CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */,
-@@ -46858,6 +46883,7 @@
+@@ -47563,6 +47588,7 @@
0F54DD081881D5F5003EEDBB /* Touch.h in Headers */,
71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */,
0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */,
@@ -2343,7 +2497,7 @@ index be2dd5b204efd83fc08698d13c24cc8aff92ba52..9e145d385b52bb65b865712f5e49af1e
0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */,
070334D71459FFD5008D8D45 /* TrackBase.h in Headers */,
513C7B6E2E7C2E7A00079881 /* TrackInfo.h in Headers */,
-@@ -48087,7 +48113,9 @@
+@@ -48824,7 +48850,9 @@
2D22830323A8470700364B7E /* CursorMac.mm in Sources */,
5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */,
07E4BDBF2A3A5FAB000D5509 /* DictationCaretAnimator.cpp in Sources */,
@@ -2353,44 +2507,18 @@ index be2dd5b204efd83fc08698d13c24cc8aff92ba52..9e145d385b52bb65b865712f5e49af1e
7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */,
4667EA3E2968D9DA00BAB1E2 /* GameControllerHapticEffect.mm in Sources */,
46FE73D32968E52000B8064C /* GameControllerHapticEngines.mm in Sources */,
-@@ -48181,6 +48209,9 @@
+@@ -48920,6 +48948,9 @@
072F696F2E755BFA00281FC5 /* TextListParser.cpp in Sources */,
BE39137129B267F500FA5D4F /* TextTransformCocoa.cpp in Sources */,
51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */,
+ F050E16A23AD660C0011CE47 /* Touch.cpp in Sources */,
+ F050E17123AD669F0011CE47 /* TouchEvent.cpp in Sources */,
+ F050E16E23AD66630011CE47 /* TouchList.cpp in Sources */,
+ 0D0B4DA32EBD20E30053FB12 /* UnifiedSource1-ARC.mm in Sources */,
538EC8031F96AF81004D22A8 /* UnifiedSource1-nonARC.mm in Sources */,
538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */,
- 538EC8051F96AF81004D22A8 /* UnifiedSource2-nonARC.mm in Sources */,
-diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
-index 8e1a3e5d52305d451dff8cfee3fc9028cda42494..3a3468329217444a1d24cb1aced5e0f2a53ca3dc 100644
---- a/Source/WebCore/accessibility/AccessibilityObject.cpp
-+++ b/Source/WebCore/accessibility/AccessibilityObject.cpp
-@@ -78,6 +78,7 @@
- #include "HTMLTableSectionElement.h"
- #include "HTMLTextAreaElement.h"
- #include "HitTestResult.h"
-+#include "InspectorInstrumentation.h"
- #include "LocalFrame.h"
- #include "LocalizedStrings.h"
- #include "Logging.h"
-@@ -3897,7 +3898,12 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const
- // to search within them for revealable text matching the search query string.
- return AccessibilityObjectInclusion::IncludeObject;
- }
-- return accessibilityPlatformIncludesObject();
-+ AccessibilityObjectInclusion platformBehavior = accessibilityPlatformIncludesObject();
-+ if (platformBehavior != AccessibilityObjectInclusion::DefaultBehavior) {
-+ if (auto* page = this->page())
-+ InspectorInstrumentation::maybeOverrideDefaultObjectInclusion(*page, platformBehavior);
-+ }
-+ return platformBehavior;
- }
-
- bool AccessibilityObject::isWithinHiddenWebArea() const
diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
-index 84d30421b5b6993853f92627544d64713754821e..f9bbe4d630fe9269fb549c3b0aca5dc8afab3835 100644
+index ce08881cc4f33e96107dff5c943530db6fe2d55a..0a4c7ef9e088d313ac75b062de71f0546112e87f 100644
--- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
+++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
@@ -192,6 +192,8 @@ namespace WebCore {
@@ -2403,7 +2531,7 @@ index 84d30421b5b6993853f92627544d64713754821e..f9bbe4d630fe9269fb549c3b0aca5dc8
macro(DynamicsCompressorNode) \
macro(ElementInternals) \
diff --git a/Source/WebCore/css/query/MediaQueryFeatures.cpp b/Source/WebCore/css/query/MediaQueryFeatures.cpp
-index 5354042180f7c7cf5754142ffeeb9908166074bc..2b4d7423a3f4726c5e3ee93078184aa9b1d97649 100644
+index 903f0fa8849ed236e41adabaa896146493e3f683..fee3e38e06af18b27a43cfa82352b0a4925b9cc5 100644
--- a/Source/WebCore/css/query/MediaQueryFeatures.cpp
+++ b/Source/WebCore/css/query/MediaQueryFeatures.cpp
@@ -403,7 +403,11 @@ static const IdentifierSchema& forcedColorsFeatureSchema()
@@ -2430,10 +2558,10 @@ index 5354042180f7c7cf5754142ffeeb9908166074bc..2b4d7423a3f4726c5e3ee93078184aa9
case ForcedAccessibilityValue::On:
return true;
diff --git a/Source/WebCore/dom/DataTransfer.cpp b/Source/WebCore/dom/DataTransfer.cpp
-index c0b9d058536120b4c368ab8094c16f19a5d2acba..37e7e016f5862bab19d750d06bd72b100c775353 100644
+index c44c8b59a1d2cff661f95bbc5538d329e5ee753d..61cd721a219fda16a788bde025ec18bb2340b233 100644
--- a/Source/WebCore/dom/DataTransfer.cpp
+++ b/Source/WebCore/dom/DataTransfer.cpp
-@@ -523,6 +523,14 @@ Ref<DataTransfer> DataTransfer::createForDrag(const Document& document)
+@@ -531,6 +531,14 @@ Ref<DataTransfer> DataTransfer::createForDrag(const Document& document)
return adoptRef(*new DataTransfer(StoreMode::ReadWrite, Pasteboard::createForDragAndDrop(PagePasteboardContext::create(document.pageID())), Type::DragAndDropData));
}
@@ -2449,7 +2577,7 @@ index c0b9d058536120b4c368ab8094c16f19a5d2acba..37e7e016f5862bab19d750d06bd72b10
{
auto dataTransfer = adoptRef(*new DataTransfer(StoreMode::ReadWrite, makeUnique<StaticPasteboard>(), Type::DragAndDropData));
diff --git a/Source/WebCore/dom/DataTransfer.h b/Source/WebCore/dom/DataTransfer.h
-index b22db7093505b1bfc39b15200640db5a1363e0ef..e96117436863ace7d52c894f37027187e33c182b 100644
+index d798a1982a6e5809a5d299f78a57ca4aff411093..a0c968644264f85d57a9856e61bd7254c291d5a7 100644
--- a/Source/WebCore/dom/DataTransfer.h
+++ b/Source/WebCore/dom/DataTransfer.h
@@ -92,6 +92,9 @@ public:
@@ -2487,7 +2615,7 @@ index 9043052540b13d8120fb641de6337af46c3b36ef..a0f89e64b64640d2d4dbc14734868c4d
] interface DeviceOrientationEvent : Event {
readonly attribute unrestricted double? alpha;
diff --git a/Source/WebCore/dom/PointerEvent.cpp b/Source/WebCore/dom/PointerEvent.cpp
-index b691425261078163e043b062a0a9f1fe5215d2b5..d3a8a99b08099cf16f0b0274d680c32e9ffef54e 100644
+index b691425261078163e043b062a0a9f1fe5215d2b5..25670dbe1c99629663ba47e745f5bd46f73246ff 100644
--- a/Source/WebCore/dom/PointerEvent.cpp
+++ b/Source/WebCore/dom/PointerEvent.cpp
@@ -28,10 +28,13 @@
@@ -2508,7 +2636,7 @@ index b691425261078163e043b062a0a9f1fe5215d2b5..d3a8a99b08099cf16f0b0274d680c32e
return adjustedCoordinateForType(offsetLocation().y());
}
-+#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS_FAMILY) && !PLATFORM(WPE)
++#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS_FAMILY) && !PLATFORM(WPE) && !PLATFORM(GTK)
+
+static const AtomString& pointerEventType(PlatformTouchPoint::State state)
+{
@@ -2561,40 +2689,57 @@ index b691425261078163e043b062a0a9f1fe5215d2b5..d3a8a99b08099cf16f0b0274d680c32e
+{
+}
+
-+#endif // ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS_FAMILY)
++#endif // ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS_FAMILY) && !PLATFORM(WPE) && !PLATFORM(GTK)
+
} // namespace WebCore
diff --git a/Source/WebCore/dom/PointerEvent.h b/Source/WebCore/dom/PointerEvent.h
-index b721aea206773db628f2a7c2bbba3bec3beeb8ec..74da0c84c430f4959125b4c690d100e6289cea8b 100644
+index fda79a78b54e710d750cd2a3cf6688f71971900b..02c4b52713edb424591006a2af11fba1b9958184 100644
--- a/Source/WebCore/dom/PointerEvent.h
+++ b/Source/WebCore/dom/PointerEvent.h
-@@ -35,6 +35,8 @@
+@@ -37,8 +37,8 @@
+ #include <WebKitAdditions/PlatformTouchEventIOS.h>
+ #endif
- #if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS_FAMILY)
- #include "PlatformTouchEventIOS.h"
-+#else
-+#include "PlatformTouchEvent.h"
+-#if ENABLE(TOUCH_EVENTS) && (PLATFORM(WPE) || PLATFORM(GTK))
+-#include "PlatformTouchEvent.h"
++#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS_FAMILY)
++#include <WebCore/PlatformTouchEvent.h>
#endif
- #if ENABLE(TOUCH_EVENTS) && PLATFORM(WPE)
-@@ -95,7 +97,7 @@ public:
+ namespace WebCore {
+@@ -95,7 +95,7 @@ public:
static Ref<PointerEvent> create(const AtomString& type, MouseButton, const MouseEvent&, PointerID, const String& pointerType, CanBubble, IsCancelable);
static Ref<PointerEvent> create(const AtomString& type, PointerID, const String& pointerType, IsPrimary = IsPrimary::No);
--#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE))
+-#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE) || PLATFORM(GTK))
+#if ENABLE(TOUCH_EVENTS)
static Ref<PointerEvent> create(const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const DoublePoint& touchDelta = { });
static Ref<PointerEvent> create(const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble, IsCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const DoublePoint& touchDelta = { });
static Ref<PointerEvent> create(const AtomString& type, const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const DoublePoint& touchDelta = { });
-@@ -188,7 +190,7 @@ private:
+@@ -188,7 +188,7 @@ private:
PointerEvent();
PointerEvent(const AtomString&, Init&&, IsTrusted);
PointerEvent(const AtomString& type, PointerID, const String& pointerType, IsPrimary);
--#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE))
+-#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE) || PLATFORM(GTK))
+#if ENABLE(TOUCH_EVENTS)
PointerEvent(const AtomString& type, const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble canBubble, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const DoublePoint& touchDelta = { });
#endif
+diff --git a/Source/WebCore/dom/TouchList.h b/Source/WebCore/dom/TouchList.h
+index ec4e04a4b837664cd67303e0e041c7b58e22c5de..59d867a2671883c1e9f19d6a1fd03634267db502 100644
+--- a/Source/WebCore/dom/TouchList.h
++++ b/Source/WebCore/dom/TouchList.h
+@@ -28,8 +28,8 @@
+ #include <WebKitAdditions/TouchListIOS.h>
+ #elif ENABLE(TOUCH_EVENTS)
+
+-#include "Node.h"
+-#include "Touch.h"
++#include <WebCore/Node.h>
++#include <WebCore/Touch.h>
+ #include <wtf/FixedVector.h>
+ #include <wtf/Ref.h>
+ #include <wtf/RefCounted.h>
diff --git a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp b/Source/WebCore/editing/libwpe/EditorLibWPE.cpp
index d0a3d5c048647b07772e1581c76c4eb60ecf41b0..bec324636991079264e620c0dfdaf9842ff585cd 100644
--- a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp
@@ -2646,112 +2791,11 @@ index 51176f56b3e691937622f5b4be0ff39f5e85630b..68c84ce1199ca81180db2b087b53bee2
if (!UserGestureIndicator::processingUserGesture())
return;
-diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
-index 4f11be48fc6f3bed8d02579b166c54221f442e58..7150b1a4f16d467cc31bce52c3c5c0095cf5cf49 100644
---- a/Source/WebCore/inspector/InspectorController.cpp
-+++ b/Source/WebCore/inspector/InspectorController.cpp
-@@ -297,6 +297,8 @@ void InspectorController::disconnectFrontend(FrontendChannel& frontendChannel)
-
- // Unplug all instrumentations since they aren't needed now.
- InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
-+
-+ m_pauseOnStart = PauseCondition::DONT_PAUSE;
- }
-
- m_inspectorBackendClient->frontendCountChanged(m_frontendRouter->frontendCount());
-@@ -316,6 +318,8 @@ void InspectorController::disconnectAllFrontends()
- // The frontend should call setInspectorFrontendClient(nullptr) under closeWindow().
- ASSERT(!m_inspectorFrontendClient);
-
-+ m_pauseOnStart = PauseCondition::DONT_PAUSE;
-+
- if (!m_frontendRouter->hasFrontends())
- return;
-
-@@ -399,8 +403,8 @@ void InspectorController::inspect(Node* node)
- if (!enabled())
- return;
-
-- if (!hasRemoteFrontend())
-- show();
-+ // HACK: Always attempt to show inspector even if there is a remote connection.
-+ show();
-
- ensureDOMAgent().inspect(node);
- }
-@@ -548,4 +552,34 @@ void InspectorController::didComposite(LocalFrame& frame)
- InspectorInstrumentation::didComposite(frame);
- }
-
-+void InspectorController::pauseOnStart(PauseCondition condition)
-+{
-+ m_pauseOnStart = condition;
-+}
-+
-+void InspectorController::resumeIfPausedInNewWindow()
-+{
-+ m_pauseOnStart = PauseCondition::DONT_PAUSE;
-+}
-+
-+void InspectorController::didFinishPageCreation()
-+{
-+ if (m_pauseOnStart == PauseCondition::WHEN_CREATION_FINISHED)
-+ runLoopWhilePaused();
-+}
-+
-+void InspectorController::didShowPage()
-+{
-+ if (m_pauseOnStart == PauseCondition::WHEN_SHOWN)
-+ runLoopWhilePaused();
-+}
-+
-+void InspectorController::runLoopWhilePaused()
-+{
-+ while (m_pauseOnStart != PauseCondition::DONT_PAUSE) {
-+ if (RunLoop::cycle() == RunLoop::CycleResult::Stop)
-+ break;
-+ }
-+}
-+
- } // namespace WebCore
-diff --git a/Source/WebCore/inspector/InspectorController.h b/Source/WebCore/inspector/InspectorController.h
-index aeeca8fc1b3d6e6133ee7e85005febadd17c5c00..a0019b8cf2dc43622a34d79d687426fbb7174312 100644
---- a/Source/WebCore/inspector/InspectorController.h
-+++ b/Source/WebCore/inspector/InspectorController.h
-@@ -107,6 +107,12 @@ public:
- WEBCORE_EXPORT void willComposite(LocalFrame&);
- WEBCORE_EXPORT void didComposite(LocalFrame&);
-
-+ enum class PauseCondition { DONT_PAUSE, WHEN_SHOWN, WHEN_CREATION_FINISHED };
-+ WEBCORE_EXPORT void pauseOnStart(PauseCondition);
-+ WEBCORE_EXPORT void resumeIfPausedInNewWindow();
-+ WEBCORE_EXPORT void didShowPage();
-+ WEBCORE_EXPORT void didFinishPageCreation();
-+
- // Testing support.
- bool isUnderTest() const { return m_isUnderTest; }
- void setIsUnderTest(bool isUnderTest) { m_isUnderTest = isUnderTest; }
-@@ -137,6 +143,7 @@ private:
-
- PageAgentContext pageAgentContext();
- void createLazyAgents();
-+ void runLoopWhilePaused();
-
- WeakRef<Page> m_page;
- const Ref<InstrumentingAgents> m_instrumentingAgents;
-@@ -160,6 +167,7 @@ private:
- bool m_isAutomaticInspection { false };
- bool m_pauseAfterInitialization = { false };
- bool m_didCreateLazyAgents { false };
-+ PauseCondition m_pauseOnStart { PauseCondition::DONT_PAUSE };
- };
-
- } // namespace WebCore
diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp
-index 93f631d3897bcce961d5f8ea71cd75411d71df87..c654164fdd0f4a7ff6d5509873192fc3bce4a2f2 100644
+index 6fedd639163f3dffe60f6e05ecdaf40dd40b2af9..39e858543bc54a5c125456273a32d413a8bc6bcf 100644
--- a/Source/WebCore/inspector/InspectorInstrumentation.cpp
+++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp
-@@ -598,6 +598,12 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i
+@@ -600,6 +600,12 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i
pageAgent->applyUserAgentOverride(userAgent);
}
@@ -2764,7 +2808,7 @@ index 93f631d3897bcce961d5f8ea71cd75411d71df87..c654164fdd0f4a7ff6d5509873192fc3
void InspectorInstrumentation::applyEmulatedMediaImpl(InstrumentingAgents& instrumentingAgents, AtomString& media)
{
if (auto* pageAgent = instrumentingAgents.enabledPageAgent())
-@@ -681,6 +687,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen
+@@ -683,6 +689,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen
consoleAgent->didFailLoading(identifier, error); // This should come AFTER resource notification, front-end relies on this.
}
@@ -2777,7 +2821,7 @@ index 93f631d3897bcce961d5f8ea71cd75411d71df87..c654164fdd0f4a7ff6d5509873192fc3
void InspectorInstrumentation::willLoadXHRSynchronouslyImpl(InstrumentingAgents& instrumentingAgents)
{
if (auto* networkAgent = instrumentingAgents.enabledNetworkAgent())
-@@ -713,20 +725,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents&
+@@ -715,20 +727,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents&
void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
{
@@ -2801,7 +2845,7 @@ index 93f631d3897bcce961d5f8ea71cd75411d71df87..c654164fdd0f4a7ff6d5509873192fc3
}
void InspectorInstrumentation::frameDetachedFromParentImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
-@@ -806,12 +815,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins
+@@ -808,12 +817,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins
pageDOMDebuggerAgent->frameDocumentUpdated(frame);
}
@@ -2814,7 +2858,7 @@ index 93f631d3897bcce961d5f8ea71cd75411d71df87..c654164fdd0f4a7ff6d5509873192fc3
void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
{
if (frame.isMainFrame()) {
-@@ -842,6 +845,12 @@ void InspectorInstrumentation::accessibilitySettingsDidChangeImpl(InstrumentingA
+@@ -844,6 +847,12 @@ void InspectorInstrumentation::accessibilitySettingsDidChangeImpl(InstrumentingA
inspectorPageAgent->accessibilitySettingsDidChange();
}
@@ -2827,7 +2871,7 @@ index 93f631d3897bcce961d5f8ea71cd75411d71df87..c654164fdd0f4a7ff6d5509873192fc3
#if ENABLE(DARK_MODE_CSS)
void InspectorInstrumentation::defaultAppearanceDidChangeImpl(InstrumentingAgents& instrumentingAgents)
{
-@@ -894,6 +903,12 @@ void InspectorInstrumentation::interceptResponseImpl(InstrumentingAgents& instru
+@@ -896,6 +905,12 @@ void InspectorInstrumentation::interceptResponseImpl(InstrumentingAgents& instru
networkAgent->interceptResponse(response, identifier, WTFMove(handler));
}
@@ -2840,7 +2884,7 @@ index 93f631d3897bcce961d5f8ea71cd75411d71df87..c654164fdd0f4a7ff6d5509873192fc3
// JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes.
static bool isConsoleAssertMessage(MessageSource source, MessageType type)
{
-@@ -1012,6 +1027,12 @@ void InspectorInstrumentation::consoleStopRecordingCanvasImpl(InstrumentingAgent
+@@ -1026,6 +1041,12 @@ void InspectorInstrumentation::consoleStopRecordingCanvasImpl(InstrumentingAgent
canvasAgent->consoleStopRecordingCanvas(context);
}
@@ -2853,7 +2897,7 @@ index 93f631d3897bcce961d5f8ea71cd75411d71df87..c654164fdd0f4a7ff6d5509873192fc3
void InspectorInstrumentation::didDispatchDOMStorageEventImpl(InstrumentingAgents& instrumentingAgents, const String& key, const String& oldValue, const String& newValue, StorageType storageType, const SecurityOrigin& securityOrigin)
{
if (auto* domStorageAgent = instrumentingAgents.enabledDOMStorageAgent())
-@@ -1309,6 +1330,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins
+@@ -1323,6 +1344,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins
layerTreeAgent->renderLayerDestroyed(renderLayer);
}
@@ -2890,41 +2934,19 @@ index 93f631d3897bcce961d5f8ea71cd75411d71df87..c654164fdd0f4a7ff6d5509873192fc3
InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(WorkerOrWorkletGlobalScope& globalScope)
{
return globalScope.inspectorController().m_instrumentingAgents;
-@@ -1343,6 +1394,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page)
- return page.inspectorController().m_instrumentingAgents.get();
- }
-
-+void InspectorInstrumentation::maybeOverrideDefaultObjectInclusion(Page& page, AccessibilityObjectInclusion& inclusion) {
-+ if (InspectorPageAgent* pageAgent = instrumentingAgents(page).enabledPageAgent()) {
-+ if (pageAgent->doingAccessibilitySnapshot())
-+ inclusion = AccessibilityObjectInclusion::DefaultBehavior;
-+ }
-+}
-+
- InstrumentingAgents* InspectorInstrumentation::instrumentingAgents(ScriptExecutionContext& context)
- {
- // Using RefPtr makes us hit the m_inRemovedLastRefFunction assert.
diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h
-index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868794bf2c5 100644
+index ae252cb00b1782289440083a841d2a6cbce72f9c..9a237cab446e2a716e4f903d473fdcbbb69ba0c9 100644
--- a/Source/WebCore/inspector/InspectorInstrumentation.h
+++ b/Source/WebCore/inspector/InspectorInstrumentation.h
-@@ -31,6 +31,7 @@
-
- #pragma once
-
-+#include "AXCoreObject.h"
- #include "CSSSelector.h"
- #include "CanvasBase.h"
- #include "CanvasRenderingContext.h"
-@@ -42,6 +43,7 @@
- #include "HitTestResult.h"
- #include "InspectorInstrumentationPublic.h"
+@@ -44,6 +44,7 @@
+ #include "LocalFrame.h"
+ #include "NodeDocument.h"
#include "Page.h"
+#include "ResourceError.h"
#include "ResourceLoader.h"
#include "ResourceLoaderIdentifier.h"
#include "StorageArea.h"
-@@ -76,6 +78,7 @@ class Document;
+@@ -78,6 +79,7 @@ class Document;
class DocumentLoader;
class DocumentThreadableLoader;
class EventListener;
@@ -2932,7 +2954,7 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
class HTTPHeaderMap;
class InspectorTimelineAgent;
class InstrumentingAgents;
-@@ -199,6 +202,7 @@ public:
+@@ -202,6 +204,7 @@ public:
static void didRecalculateStyle(Document&);
static void didScheduleStyleRecalculation(Document&);
static void applyUserAgentOverride(LocalFrame&, String&);
@@ -2940,7 +2962,7 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
static void applyEmulatedMedia(LocalFrame&, AtomString&);
static void flexibleBoxRendererBeganLayout(const RenderObject&);
-@@ -211,6 +215,7 @@ public:
+@@ -214,6 +217,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&);
@@ -2948,20 +2970,20 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
static void willSendRequest(ServiceWorkerGlobalScope&, ResourceLoaderIdentifier, ResourceRequest&);
static void didReceiveResourceResponse(ServiceWorkerGlobalScope&, ResourceLoaderIdentifier, const ResourceResponse&);
-@@ -237,11 +242,11 @@ public:
+@@ -240,11 +244,11 @@ public:
static void frameDetachedFromParent(LocalFrame&);
static void didCommitLoad(LocalFrame&, DocumentLoader*);
static void frameDocumentUpdated(LocalFrame&);
- static void loaderDetachedFromFrame(LocalFrame&, DocumentLoader&);
static void frameStartedLoading(LocalFrame&);
static void frameStoppedLoading(LocalFrame&);
- static void didCompleteRenderingFrame(Frame&);
+ static void didCompleteRenderingFrame(LocalFrame&);
static void accessibilitySettingsDidChange(Page&);
+ static void didNavigateWithinPage(LocalFrame&);
#if ENABLE(DARK_MODE_CSS)
static void defaultAppearanceDidChange(Page&);
#endif
-@@ -252,6 +257,7 @@ public:
+@@ -255,6 +259,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>)>&&);
@@ -2969,7 +2991,7 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
static void addMessageToConsole(LocalFrame&, std::unique_ptr<Inspector::ConsoleMessage>);
static void addMessageToConsole(WorkerOrWorkletGlobalScope&, std::unique_ptr<Inspector::ConsoleMessage>);
-@@ -277,6 +283,7 @@ public:
+@@ -280,6 +285,7 @@ public:
static void stopProfiling(WorkerOrWorkletGlobalScope&, const String& title);
static void consoleStartRecordingCanvas(CanvasRenderingContext&, JSC::JSGlobalObject&, JSC::JSObject* options);
static void consoleStopRecordingCanvas(CanvasRenderingContext&);
@@ -2977,7 +2999,7 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
static void performanceMark(ScriptExecutionContext&, const String&, std::optional<MonotonicTime>);
-@@ -330,6 +337,12 @@ public:
+@@ -336,6 +342,12 @@ public:
static void layerTreeDidChange(Page*);
static void renderLayerDestroyed(Page*, const RenderLayer&);
@@ -2990,16 +3012,7 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
static void frontendCreated();
static void frontendDeleted();
static bool hasFrontends() { return InspectorInstrumentationPublic::hasFrontends(); }
-@@ -346,6 +359,8 @@ public:
- static void registerInstrumentingAgents(InstrumentingAgents&);
- static void unregisterInstrumentingAgents(InstrumentingAgents&);
-
-+ static void maybeOverrideDefaultObjectInclusion(Page&, AccessibilityObjectInclusion&);
-+
- private:
- static void didClearWindowObjectInWorldImpl(InstrumentingAgents&, LocalFrame&, DOMWrapperWorld&);
- static bool isDebuggerPausedImpl(InstrumentingAgents&);
-@@ -427,6 +442,7 @@ private:
+@@ -433,6 +445,7 @@ private:
static void didRecalculateStyleImpl(InstrumentingAgents&);
static void didScheduleStyleRecalculationImpl(InstrumentingAgents&, Document&);
static void applyUserAgentOverrideImpl(InstrumentingAgents&, String&);
@@ -3007,7 +3020,7 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
static void applyEmulatedMediaImpl(InstrumentingAgents&, AtomString&);
static void flexibleBoxRendererBeganLayoutImpl(InstrumentingAgents&, const RenderObject&);
-@@ -441,6 +457,7 @@ private:
+@@ -447,6 +460,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&);
@@ -3015,7 +3028,7 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
static void willLoadXHRSynchronouslyImpl(InstrumentingAgents&);
static void didLoadXHRSynchronouslyImpl(InstrumentingAgents&);
static void scriptImportedImpl(InstrumentingAgents&, ResourceLoaderIdentifier, const String& sourceString);
-@@ -451,11 +468,11 @@ private:
+@@ -457,11 +471,11 @@ private:
static void frameDetachedFromParentImpl(InstrumentingAgents&, LocalFrame&);
static void didCommitLoadImpl(InstrumentingAgents&, LocalFrame&, DocumentLoader*);
static void frameDocumentUpdatedImpl(InstrumentingAgents&, LocalFrame&);
@@ -3028,7 +3041,7 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
#if ENABLE(DARK_MODE_CSS)
static void defaultAppearanceDidChangeImpl(InstrumentingAgents&);
#endif
-@@ -466,6 +483,7 @@ private:
+@@ -472,6 +486,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>)>&&);
@@ -3036,15 +3049,15 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
static void addMessageToConsoleImpl(InstrumentingAgents&, std::unique_ptr<Inspector::ConsoleMessage>);
-@@ -480,6 +498,7 @@ private:
+@@ -486,6 +501,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>);
-
-@@ -533,6 +552,12 @@ private:
+ static void didEnqueueFirstContentfulPaintImpl(InstrumentingAgents&);
+@@ -541,6 +557,12 @@ private:
static void layerTreeDidChangeImpl(InstrumentingAgents&);
static void renderLayerDestroyedImpl(InstrumentingAgents&, const RenderLayer&);
@@ -3055,66 +3068,62 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
+ static void didCheckNavigationPolicyImpl(InstrumentingAgents&, LocalFrame&, bool cancel);
+
static InstrumentingAgents& instrumentingAgents(Page&);
- static InstrumentingAgents& instrumentingAgents(WorkerOrWorkletGlobalScope&);
- static InstrumentingAgents& instrumentingAgents(ServiceWorkerGlobalScope&);
-@@ -1093,6 +1118,13 @@ inline void InspectorInstrumentation::applyUserAgentOverride(LocalFrame& frame,
- applyUserAgentOverrideImpl(*agents, userAgent);
+ static InstrumentingAgents& instrumentingAgents(const LocalFrame&);
+ static InstrumentingAgents& instrumentingAgents(const LocalFrameView&);
+@@ -1077,6 +1099,12 @@ inline void InspectorInstrumentation::applyUserAgentOverride(LocalFrame& frame,
+ applyUserAgentOverrideImpl(instrumentingAgents(frame), userAgent);
}
+inline void InspectorInstrumentation::applyPlatformOverride(LocalFrame& frame, String& platform)
+{
+ FAST_RETURN_IF_NO_FRONTENDS(void());
-+ if (auto* agents = instrumentingAgents(frame))
-+ applyPlatformOverrideImpl(*agents, platform);
++ applyPlatformOverrideImpl(instrumentingAgents(frame), platform);
+}
+
inline void InspectorInstrumentation::applyEmulatedMedia(LocalFrame& frame, AtomString& media)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
-@@ -1195,6 +1227,13 @@ inline void InspectorInstrumentation::didFailLoading(ServiceWorkerGlobalScope& g
+@@ -1175,6 +1203,12 @@ inline void InspectorInstrumentation::didFailLoading(ServiceWorkerGlobalScope& g
didFailLoadingImpl(instrumentingAgents(globalScope), identifier, nullptr, error);
}
+inline void InspectorInstrumentation::didReceiveMainResourceError(LocalFrame& frame, const ResourceError& error)
+{
+ FAST_RETURN_IF_NO_FRONTENDS(void());
-+ if (auto* agents = instrumentingAgents(frame))
-+ didReceiveMainResourceErrorImpl(*agents, frame, error);
++ didReceiveMainResourceErrorImpl(instrumentingAgents(frame), frame, error);
+}
+
inline void InspectorInstrumentation::continueAfterXFrameOptionsDenied(LocalFrame& frame, ResourceLoaderIdentifier identifier, DocumentLoader& loader, const ResourceResponse& response)
{
// Treat the same as didReceiveResponse.
-@@ -1285,13 +1324,6 @@ inline void InspectorInstrumentation::frameDocumentUpdated(LocalFrame& frame)
- frameDocumentUpdatedImpl(*agents, frame);
+@@ -1258,12 +1292,6 @@ inline void InspectorInstrumentation::frameDocumentUpdated(LocalFrame& frame)
+ frameDocumentUpdatedImpl(instrumentingAgents(frame), frame);
}
-inline void InspectorInstrumentation::loaderDetachedFromFrame(LocalFrame& frame, DocumentLoader& loader)
-{
- FAST_RETURN_IF_NO_FRONTENDS(void());
-- if (auto* agents = instrumentingAgents(frame))
-- loaderDetachedFromFrameImpl(*agents, loader);
+- loaderDetachedFromFrameImpl(instrumentingAgents(frame), loader);
-}
-
inline void InspectorInstrumentation::frameStartedLoading(LocalFrame& frame)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
-@@ -1319,6 +1351,13 @@ inline void InspectorInstrumentation::accessibilitySettingsDidChange(Page& page)
+@@ -1288,6 +1316,12 @@ inline void InspectorInstrumentation::accessibilitySettingsDidChange(Page& page)
accessibilitySettingsDidChangeImpl(instrumentingAgents(page));
}
+inline void InspectorInstrumentation::didNavigateWithinPage(LocalFrame& frame)
+{
+ FAST_RETURN_IF_NO_FRONTENDS(void());
-+ if (auto* agents = instrumentingAgents(frame))
-+ didNavigateWithinPageImpl(*agents, frame);
++ didNavigateWithinPageImpl(instrumentingAgents(frame), frame);
+}
+
#if ENABLE(DARK_MODE_CSS)
inline void InspectorInstrumentation::defaultAppearanceDidChange(Page& page)
{
-@@ -1371,6 +1410,13 @@ inline void InspectorInstrumentation::interceptResponse(const LocalFrame& frame,
- interceptResponseImpl(*agents, response, identifier, WTFMove(handler));
+@@ -1337,6 +1371,13 @@ inline void InspectorInstrumentation::interceptResponse(const LocalFrame& frame,
+ interceptResponseImpl(instrumentingAgents(frame), response, identifier, WTFMove(handler));
}
+inline void InspectorInstrumentation::setStoppingLoadingDueToProcessSwap(Page* page, bool value)
@@ -3127,8 +3136,8 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
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());
-@@ -1710,6 +1756,11 @@ inline void InspectorInstrumentation::performanceMark(ScriptExecutionContext& co
- performanceMarkImpl(*agents, label, WTFMove(startTime));
+@@ -1680,6 +1721,11 @@ inline void InspectorInstrumentation::didEnqueueLargestContentfulPaint(ScriptExe
+ didEnqueueLargestContentfulPaintImpl(*agents, entry);
}
+inline void InspectorInstrumentation::bindingCalled(Page& page, JSC::JSGlobalObject* globalObject, const String& name, const String& arg)
@@ -3139,15 +3148,14 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
inline void InspectorInstrumentation::didRequestAnimationFrame(ScriptExecutionContext& scriptExecutionContext, int callbackId)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
-@@ -1766,6 +1817,42 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren
+@@ -1736,6 +1782,39 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren
renderLayerDestroyedImpl(*agents, renderLayer);
}
+inline void InspectorInstrumentation::runOpenPanel(LocalFrame* frame, HTMLInputElement* element, bool* intercept)
+{
+ FAST_RETURN_IF_NO_FRONTENDS(void());
-+ if (auto* agents = instrumentingAgents(*frame))
-+ runOpenPanelImpl(*agents, element, intercept);
++ runOpenPanelImpl(instrumentingAgents(*frame), element, intercept);
+}
+
+inline void InspectorInstrumentation::frameAttached(LocalFrame* frame)
@@ -3168,15 +3176,13 @@ index 274fa998f725feb20d05a66caa9e2ba18bcf26aa..e5e4e184d1528938dc2589be7dd52868
+inline void InspectorInstrumentation::willCheckNavigationPolicy(LocalFrame& frame)
+{
+ FAST_RETURN_IF_NO_FRONTENDS(void());
-+ if (auto* agents = instrumentingAgents(frame))
-+ willCheckNavigationPolicyImpl(*agents, frame);
++ willCheckNavigationPolicyImpl(instrumentingAgents(frame), frame);
+}
+
+inline void InspectorInstrumentation::didCheckNavigationPolicy(LocalFrame& frame, bool cancel)
+{
+ FAST_RETURN_IF_NO_FRONTENDS(void());
-+ if (auto* agents = instrumentingAgents(frame))
-+ didCheckNavigationPolicyImpl(*agents, frame, cancel);
++ didCheckNavigationPolicyImpl(instrumentingAgents(frame), frame, cancel);
+}
+
inline InstrumentingAgents* InspectorInstrumentation::instrumentingAgents(ScriptExecutionContext* context)
@@ -3234,8 +3240,109 @@ index b8a1585c14a753344d5b52b316511d2efb2d2bfe..910b98291328cd90109beeeb66e9ecf2
+}
+
}
+diff --git a/Source/WebCore/inspector/PageInspectorController.cpp b/Source/WebCore/inspector/PageInspectorController.cpp
+index 130ee55cbc9a9098be2eb681109ede56760593fb..1480faec6d2940b97077bf53138f076974ff3e11 100644
+--- a/Source/WebCore/inspector/PageInspectorController.cpp
++++ b/Source/WebCore/inspector/PageInspectorController.cpp
+@@ -297,6 +297,8 @@ void PageInspectorController::disconnectFrontend(FrontendChannel& frontendChanne
+
+ // Unplug all instrumentations since they aren't needed now.
+ InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
++
++ m_pauseOnStart = PauseCondition::DONT_PAUSE;
+ }
+
+ m_inspectorBackendClient->frontendCountChanged(m_frontendRouter->frontendCount());
+@@ -316,6 +318,8 @@ void PageInspectorController::disconnectAllFrontends()
+ // The frontend should call setInspectorFrontendClient(nullptr) under closeWindow().
+ ASSERT(!m_inspectorFrontendClient);
+
++ m_pauseOnStart = PauseCondition::DONT_PAUSE;
++
+ if (!m_frontendRouter->hasFrontends())
+ return;
+
+@@ -399,8 +403,8 @@ void PageInspectorController::inspect(Node* node)
+ if (!enabled())
+ return;
+
+- if (!hasRemoteFrontend())
+- show();
++ // HACK: Always attempt to show inspector even if there is a remote connection.
++ show();
+
+ ensureDOMAgent().inspect(node);
+ }
+@@ -548,4 +552,34 @@ void PageInspectorController::didComposite(LocalFrame& frame)
+ InspectorInstrumentation::didComposite(frame);
+ }
+
++void PageInspectorController::pauseOnStart(PauseCondition condition)
++{
++ m_pauseOnStart = condition;
++}
++
++void PageInspectorController::resumeIfPausedInNewWindow()
++{
++ m_pauseOnStart = PauseCondition::DONT_PAUSE;
++}
++
++void PageInspectorController::didFinishPageCreation()
++{
++ if (m_pauseOnStart == PauseCondition::WHEN_CREATION_FINISHED)
++ runLoopWhilePaused();
++}
++
++void PageInspectorController::didShowPage()
++{
++ if (m_pauseOnStart == PauseCondition::WHEN_SHOWN)
++ runLoopWhilePaused();
++}
++
++void PageInspectorController::runLoopWhilePaused()
++{
++ while (m_pauseOnStart != PauseCondition::DONT_PAUSE) {
++ if (RunLoop::cycle() == RunLoop::CycleResult::Stop)
++ break;
++ }
++}
++
+ } // namespace WebCore
+diff --git a/Source/WebCore/inspector/PageInspectorController.h b/Source/WebCore/inspector/PageInspectorController.h
+index 3051f963a2176bb113258e02d05aa77952fa6a9e..f8c3b570e7ad689dc22f5d19d15e08524e5c8747 100644
+--- a/Source/WebCore/inspector/PageInspectorController.h
++++ b/Source/WebCore/inspector/PageInspectorController.h
+@@ -116,6 +116,12 @@ public:
+ WEBCORE_EXPORT void willComposite(LocalFrame&);
+ WEBCORE_EXPORT void didComposite(LocalFrame&);
+
++ enum class PauseCondition { DONT_PAUSE, WHEN_SHOWN, WHEN_CREATION_FINISHED };
++ WEBCORE_EXPORT void pauseOnStart(PauseCondition);
++ WEBCORE_EXPORT void resumeIfPausedInNewWindow();
++ WEBCORE_EXPORT void didShowPage();
++ WEBCORE_EXPORT void didFinishPageCreation();
++
+ // Testing support.
+ bool isUnderTest() const { return m_isUnderTest; }
+ void setIsUnderTest(bool isUnderTest) { m_isUnderTest = isUnderTest; }
+@@ -149,6 +155,7 @@ private:
+
+ PageAgentContext pageAgentContext();
+ void createLazyAgents();
++ void runLoopWhilePaused();
+
+ WeakRef<Page> m_page;
+ const Ref<InstrumentingAgents> m_instrumentingAgents;
+@@ -172,6 +179,7 @@ private:
+ bool m_isAutomaticInspection { false };
+ bool m_pauseAfterInitialization = { false };
+ bool m_didCreateLazyAgents { false };
++ PauseCondition m_pauseOnStart { PauseCondition::DONT_PAUSE };
+ };
+
+ } // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
-index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b18123ce70 100644
+index 9282ad5df64f89ab129db55f8ef67a8673fed461..2bab467176d263928c5fbc27ec4683fb60e84ce4 100644
--- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
+++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
@@ -55,6 +55,7 @@
@@ -3246,14 +3353,15 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
#include "DOMEditor.h"
#include "DOMException.h"
#include "DOMPatchSupport.h"
-@@ -66,9 +67,14 @@
+@@ -67,10 +68,15 @@
#include "Event.h"
#include "EventListener.h"
#include "EventNames.h"
-+#include "File.h"
+#include <FileChooser.h>
++#include "File.h"
+#include "FileList.h"
+#include "FloatQuad.h"
+ #include "FrameInlines.h"
#include "FrameTree.h"
#include "HTMLElement.h"
#include "HTMLFrameOwnerElement.h"
@@ -3261,7 +3369,7 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
#include "HTMLScriptElement.h"
-@@ -104,12 +110,14 @@
+@@ -106,12 +112,14 @@
#include "Pasteboard.h"
#include "PseudoElement.h"
#include "RenderGrid.h"
@@ -3276,9 +3384,9 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
#include "StaticNodeList.h"
#include "StyleProperties.h"
#include "StyleResolver.h"
-@@ -151,7 +159,8 @@ using namespace HTMLNames;
+@@ -154,7 +162,8 @@ using namespace HTMLNames;
static const size_t maxTextSize = 10000;
- static const char16_t horizontalEllipsisUChar[] = { horizontalEllipsis, 0 };
+ static const char16_t horizontalEllipsisUTF16[] = { horizontalEllipsis, 0 };
-static std::optional<Color> parseColor(RefPtr<JSON::Object>&& colorObject)
+// static
@@ -3286,7 +3394,7 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
{
if (!colorObject)
return std::nullopt;
-@@ -170,7 +179,7 @@ static std::optional<Color> parseColor(RefPtr<JSON::Object>&& colorObject)
+@@ -173,7 +182,7 @@ static std::optional<Color> parseColor(RefPtr<JSON::Object>&& colorObject)
static std::optional<Color> parseRequiredConfigColor(const String& fieldName, JSON::Object& configObject)
{
@@ -3295,7 +3403,7 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
}
static Color parseOptionalConfigColor(const String& fieldName, JSON::Object& configObject)
-@@ -197,6 +206,20 @@ static bool parseQuad(Ref<JSON::Array>&& quadArray, FloatQuad* quad)
+@@ -200,6 +209,20 @@ static bool parseQuad(Ref<JSON::Array>&& quadArray, FloatQuad* quad)
return true;
}
@@ -3316,8 +3424,8 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
class RevalidateStyleAttributeTask final : public CanMakeCheckedPtr<RevalidateStyleAttributeTask> {
WTF_MAKE_TZONE_ALLOCATED(RevalidateStyleAttributeTask);
WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(RevalidateStyleAttributeTask);
-@@ -477,6 +500,20 @@ Node* InspectorDOMAgent::assertNode(Inspector::Protocol::ErrorString& errorStrin
- return node.get();
+@@ -483,6 +506,20 @@ Node* InspectorDOMAgent::assertNode(Inspector::Protocol::ErrorString& errorStrin
+ return node.unsafeGet();
}
+Node* InspectorDOMAgent::assertNode(Protocol::ErrorString& errorString, std::optional<Protocol::DOM::NodeId>&& nodeId, const String& objectId)
@@ -3337,7 +3445,7 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
Document* InspectorDOMAgent::assertDocument(Inspector::Protocol::ErrorString& errorString, Inspector::Protocol::DOM::NodeId nodeId)
{
RefPtr node = assertNode(errorString, nodeId);
-@@ -1595,16 +1632,7 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::highlightNode(std::o
+@@ -1603,16 +1640,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;
@@ -3355,7 +3463,7 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
if (!node)
return makeUnexpected(errorString);
-@@ -1859,15 +1887,159 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::setInspectedNode(Ins
+@@ -1868,15 +1896,159 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::setInspectedNode(Ins
return { };
}
@@ -3406,7 +3514,7 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
+ if (!node)
+ return makeUnexpected("Node not found"_s);
+
-+ auto* pageAgent = m_instrumentingAgents.enabledPageAgent();
++ auto* pageAgent = m_instrumentingAgents->enabledPageAgent();
+ if (!pageAgent)
+ return makeUnexpected("Page agent must be enabled"_s);
+
@@ -3497,7 +3605,7 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
Inspector::Protocol::ErrorString errorString;
+ Node* node = nullptr;
+ if (!!frameId) {
-+ auto* pageAgent = m_instrumentingAgents.enabledPageAgent();
++ auto* pageAgent = m_instrumentingAgents->enabledPageAgent();
+ if (!pageAgent)
+ return makeUnexpected("Page domain must be enabled"_s);
@@ -3518,7 +3626,7 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
if (!object)
return makeUnexpected("Missing injected script for given nodeId"_s);
-@@ -3133,7 +3305,7 @@ Inspector::Protocol::ErrorStringOr<Inspector::Protocol::DOM::NodeId> InspectorDO
+@@ -3144,7 +3316,7 @@ Inspector::Protocol::ErrorStringOr<Inspector::Protocol::DOM::NodeId> InspectorDO
return makeUnexpected("Missing node for given path"_s);
}
@@ -3527,7 +3635,7 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
{
Document* document = &node->document();
if (auto* templateHost = document->templateDocumentHost())
-@@ -3142,12 +3314,18 @@ RefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNod
+@@ -3153,12 +3325,18 @@ RefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNod
if (!frame)
return nullptr;
@@ -3549,7 +3657,7 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
}
Node* InspectorDOMAgent::scriptValueAsNode(JSC::JSValue value)
-@@ -3295,4 +3473,53 @@ Inspector::Protocol::ErrorStringOr<Ref<Inspector::Protocol::DOM::MediaStats>> In
+@@ -3310,4 +3488,53 @@ Inspector::Protocol::ErrorStringOr<Ref<Inspector::Protocol::DOM::MediaStats>> In
#endif
}
@@ -3604,10 +3712,10 @@ index e138241c41a6b0c1e238fd6f3a531b20b9c99624..b24364ad05988a8230af80b9e60874b1
+
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.h b/Source/WebCore/inspector/agents/InspectorDOMAgent.h
-index cd5edd3322a55e72643560ad852af14f7104f35b..25c3d3c73c3b9395323b4c853a70d5502c15ae52 100644
+index cef65fc132b6bd2d5e5ee3cce2b60b7adec1bb0d..fcdc21a94d99d6564079f1375b6253f1ceb83bb1 100644
--- a/Source/WebCore/inspector/agents/InspectorDOMAgent.h
+++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.h
-@@ -59,6 +59,7 @@ namespace WebCore {
+@@ -61,6 +61,7 @@ namespace WebCore {
class AXCoreObject;
class CharacterData;
@@ -3615,7 +3723,7 @@ index cd5edd3322a55e72643560ad852af14f7104f35b..25c3d3c73c3b9395323b4c853a70d550
class DOMEditor;
class Document;
class Element;
-@@ -95,6 +96,7 @@ public:
+@@ -97,6 +98,7 @@ public:
static String toErrorString(Exception&&);
static String documentURLString(Document*);
@@ -3623,7 +3731,7 @@ index cd5edd3322a55e72643560ad852af14f7104f35b..25c3d3c73c3b9395323b4c853a70d550
// We represent embedded doms as a part of the same hierarchy. Hence we treat children of frame owners differently.
// We also skip whitespace text nodes conditionally. Following methods encapsulate these specifics.
-@@ -140,7 +142,7 @@ public:
+@@ -142,7 +144,7 @@ public:
Inspector::Protocol::ErrorStringOr<std::tuple<String /* searchId */, int /* resultCount */>> performSearch(const String& query, RefPtr<JSON::Array>&& nodeIds, std::optional<bool>&& caseSensitive);
Inspector::Protocol::ErrorStringOr<Ref<JSON::ArrayOf<Inspector::Protocol::DOM::NodeId>>> getSearchResults(const String& searchId, int fromIndex, int toIndex);
Inspector::Protocol::ErrorStringOr<void> discardSearchResults(const String& searchId);
@@ -3632,7 +3740,7 @@ index cd5edd3322a55e72643560ad852af14f7104f35b..25c3d3c73c3b9395323b4c853a70d550
Inspector::Protocol::ErrorStringOr<Ref<JSON::ArrayOf<String>>> getAttributes(Inspector::Protocol::DOM::NodeId);
#if PLATFORM(IOS_FAMILY)
Inspector::Protocol::ErrorStringOr<void> setInspectModeEnabled(bool, RefPtr<JSON::Object>&& highlightConfig, RefPtr<JSON::Object>&& gridOverlayConfig, RefPtr<JSON::Object>&& flexOverlayConfig);
-@@ -177,6 +179,10 @@ public:
+@@ -179,6 +181,10 @@ public:
Inspector::Protocol::ErrorStringOr<void> setInspectedNode(Inspector::Protocol::DOM::NodeId);
Inspector::Protocol::ErrorStringOr<void> setAllowEditingUserAgentShadowTrees(bool);
Inspector::Protocol::ErrorStringOr<Ref<Inspector::Protocol::DOM::MediaStats>> getMediaStats(Inspector::Protocol::DOM::NodeId);
@@ -3643,7 +3751,7 @@ index cd5edd3322a55e72643560ad852af14f7104f35b..25c3d3c73c3b9395323b4c853a70d550
// InspectorInstrumentation
Inspector::Protocol::DOM::NodeId identifierForNode(Node&);
-@@ -218,7 +224,7 @@ public:
+@@ -220,7 +226,7 @@ public:
Node* nodeForId(Inspector::Protocol::DOM::NodeId);
Inspector::Protocol::DOM::NodeId boundNodeId(const Node*);
@@ -3652,7 +3760,7 @@ index cd5edd3322a55e72643560ad852af14f7104f35b..25c3d3c73c3b9395323b4c853a70d550
bool handleMousePress();
void mouseDidMoveOverElement(const HitTestResult&, OptionSet<PlatformEventModifier>);
void inspect(Node*);
-@@ -230,12 +236,15 @@ public:
+@@ -232,12 +238,15 @@ public:
void reset();
Node* assertNode(Inspector::Protocol::ErrorString&, Inspector::Protocol::DOM::NodeId);
@@ -3668,7 +3776,7 @@ index cd5edd3322a55e72643560ad852af14f7104f35b..25c3d3c73c3b9395323b4c853a70d550
private:
#if ENABLE(VIDEO)
void mediaMetricsTimerFired();
-@@ -265,7 +274,6 @@ private:
+@@ -267,7 +276,6 @@ private:
void processAccessibilityChildren(AXCoreObject&, JSON::ArrayOf<Inspector::Protocol::DOM::NodeId>&);
Node* nodeForPath(const String& path);
@@ -3677,10 +3785,10 @@ index cd5edd3322a55e72643560ad852af14f7104f35b..25c3d3c73c3b9395323b4c853a70d550
void discardBindings();
diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
-index ccedbcac06dec7ae5ddfec6f682092c9869c330d..e2dc52d5a6cbada4f5a44d9bb5b7612885e24b47 100644
+index 0c13bc7782d3963656647d2ad137e108c8399aae..a898dfb9504ddab5e104f7dcacb8c9fa0a4f0512 100644
--- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
+++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
-@@ -58,6 +58,7 @@
+@@ -62,6 +62,7 @@
#include "LocalFrame.h"
#include "MIMETypeRegistry.h"
#include "MemoryCache.h"
@@ -3688,7 +3796,7 @@ index ccedbcac06dec7ae5ddfec6f682092c9869c330d..e2dc52d5a6cbada4f5a44d9bb5b76128
#include "Page.h"
#include "PlatformStrategies.h"
#include "ProgressTracker.h"
-@@ -344,8 +345,8 @@ static Ref<Inspector::Protocol::Network::Request> buildObjectForResourceRequest(
+@@ -275,8 +276,8 @@ static Ref<Inspector::Protocol::Network::Request> buildObjectForResourceRequest(
.release();
if (request.httpBody() && !request.httpBody()->isEmpty()) {
@@ -3699,7 +3807,7 @@ index ccedbcac06dec7ae5ddfec6f682092c9869c330d..e2dc52d5a6cbada4f5a44d9bb5b76128
}
if (resourceLoader) {
-@@ -397,6 +398,8 @@ RefPtr<Inspector::Protocol::Network::Response> InspectorNetworkAgent::buildObjec
+@@ -328,6 +329,8 @@ RefPtr<Inspector::Protocol::Network::Response> InspectorNetworkAgent::buildObjec
.setSource(responseSource(response.source()))
.release();
@@ -3708,25 +3816,25 @@ index ccedbcac06dec7ae5ddfec6f682092c9869c330d..e2dc52d5a6cbada4f5a44d9bb5b76128
if (resourceLoader) {
auto* metrics = response.deprecatedNetworkLoadMetricsOrNull();
responseObject->setTiming(buildObjectForTiming(metrics ? *metrics : NetworkLoadMetrics::emptyMetrics(), *resourceLoader));
-@@ -683,6 +686,9 @@ void InspectorNetworkAgent::didFailLoading(ResourceLoaderIdentifier identifier,
+@@ -614,6 +617,9 @@ void InspectorNetworkAgent::didFailLoading(ResourceLoaderIdentifier identifier,
String requestId = IdentifiersFactory::requestId(identifier.toUInt64());
- if (loader && m_resourcesData->resourceType(requestId) == InspectorPageAgent::DocumentResource) {
+ if (loader && m_resourcesData->resourceType(requestId) == ResourceType::Document) {
+ if (m_stoppingLoadingDueToProcessSwap)
+ return;
+
auto* frame = loader->frame();
if (frame && frame->loader().documentLoader() && frame->document()) {
m_resourcesData->addResourceSharedBuffer(requestId,
-@@ -912,6 +918,7 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::disable()
- m_instrumentingAgents.setEnabledNetworkAgent(nullptr);
+@@ -843,6 +849,7 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::disable()
+ Ref { m_instrumentingAgents.get() }->setEnabledNetworkAgent(nullptr);
m_resourcesData->clear();
m_extraRequestHeaders.clear();
+ m_stoppingLoadingDueToProcessSwap = false;
continuePendingRequests();
continuePendingResponses();
-@@ -957,6 +964,7 @@ void InspectorNetworkAgent::continuePendingResponses()
+@@ -901,6 +908,7 @@ void InspectorNetworkAgent::continuePendingResponses()
Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::setExtraHTTPHeaders(Ref<JSON::Object>&& headers)
{
@@ -3734,7 +3842,7 @@ index ccedbcac06dec7ae5ddfec6f682092c9869c330d..e2dc52d5a6cbada4f5a44d9bb5b76128
for (auto& entry : headers.get()) {
auto stringValue = entry.value->asString();
if (!!stringValue)
-@@ -1206,6 +1214,11 @@ void InspectorNetworkAgent::interceptResponse(const ResourceResponse& response,
+@@ -1150,6 +1158,11 @@ void InspectorNetworkAgent::interceptResponse(const ResourceResponse& response,
m_frontendDispatcher->responseIntercepted(requestId, resourceResponse.releaseNonNull());
}
@@ -3746,7 +3854,7 @@ index ccedbcac06dec7ae5ddfec6f682092c9869c330d..e2dc52d5a6cbada4f5a44d9bb5b76128
Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptContinue(const Inspector::Protocol::Network::RequestId& requestId, Inspector::Protocol::Network::NetworkStage networkStage)
{
switch (networkStage) {
-@@ -1235,6 +1248,9 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptWithReq
+@@ -1179,6 +1192,9 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptWithReq
return makeUnexpected("Missing pending intercept request for given requestId"_s);
auto& loader = *pendingRequest->m_loader;
@@ -3756,7 +3864,7 @@ index ccedbcac06dec7ae5ddfec6f682092c9869c330d..e2dc52d5a6cbada4f5a44d9bb5b76128
ResourceRequest request = loader.request();
if (!!url)
request.setURL(URL({ }, url));
-@@ -1330,13 +1346,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptRequest
+@@ -1274,13 +1290,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptRequest
response.setHTTPStatusCode(status);
response.setHTTPStatusText(String { statusText });
HTTPHeaderMap explicitHeaders;
@@ -3780,7 +3888,7 @@ index ccedbcac06dec7ae5ddfec6f682092c9869c330d..e2dc52d5a6cbada4f5a44d9bb5b76128
loader->didReceiveResponse(WTFMove(response), [loader, buffer = data.releaseNonNull()]() {
if (loader->reachedTerminalState())
return;
-@@ -1400,6 +1425,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::setEmulatedCondi
+@@ -1344,6 +1369,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::setEmulatedCondi
#endif // ENABLE(INSPECTOR_NETWORK_THROTTLING)
@@ -3790,11 +3898,11 @@ index ccedbcac06dec7ae5ddfec6f682092c9869c330d..e2dc52d5a6cbada4f5a44d9bb5b76128
+ return { };
+}
+
- bool InspectorNetworkAgent::shouldTreatAsText(const String& mimeType)
+ static Ref<Inspector::Protocol::Page::SearchResult> buildObjectForSearchResult(const Inspector::Protocol::Network::RequestId& requestId, const Inspector::Protocol::Network::FrameId& frameId, const String& url, int matchesCount)
{
- return startsWithLettersIgnoringASCIICase(mimeType, "text/"_s)
+ auto searchResult = Inspector::Protocol::Page::SearchResult::create()
diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h
-index 7ae1b53be8a9b5f0d0e2787a22f5534500b7ab19..f6f33d05bcdb4084f55631fdcfd3b4d012dfc804 100644
+index edd6ca69884d8e803fb9668e73f3b49b897a60e7..a0d8045d9e0d90c3216fe7f4fb83e6a0d4a2c3b3 100644
--- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h
+++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h
@@ -35,6 +35,8 @@
@@ -3806,7 +3914,7 @@ index 7ae1b53be8a9b5f0d0e2787a22f5534500b7ab19..f6f33d05bcdb4084f55631fdcfd3b4d0
#include "WebSocket.h"
#include <JavaScriptCore/ContentSearchUtilities.h>
#include <JavaScriptCore/InspectorBackendDispatchers.h>
-@@ -104,6 +106,7 @@ public:
+@@ -103,6 +105,7 @@ public:
#if ENABLE(INSPECTOR_NETWORK_THROTTLING)
Inspector::Protocol::ErrorStringOr<void> setEmulatedConditions(std::optional<int>&& bytesPerSecondLimit) final;
#endif
@@ -3814,7 +3922,7 @@ index 7ae1b53be8a9b5f0d0e2787a22f5534500b7ab19..f6f33d05bcdb4084f55631fdcfd3b4d0
// InspectorInstrumentation
void willRecalculateStyle();
-@@ -135,6 +138,7 @@ public:
+@@ -134,6 +137,7 @@ public:
bool shouldInterceptResponse(const ResourceResponse&);
void interceptResponse(const ResourceResponse&, ResourceLoaderIdentifier, CompletionHandler<void(const ResourceResponse&, RefPtr<FragmentedSharedBuffer>)>&&);
void interceptRequest(ResourceLoader&, Function<void(const ResourceRequest&)>&&);
@@ -3822,7 +3930,7 @@ index 7ae1b53be8a9b5f0d0e2787a22f5534500b7ab19..f6f33d05bcdb4084f55631fdcfd3b4d0
void searchOtherRequests(const JSC::Yarr::RegularExpression&, Ref<JSON::ArrayOf<Inspector::Protocol::Page::SearchResult>>&);
void searchInRequest(Inspector::Protocol::ErrorString&, const Inspector::Protocol::Network::RequestId&, const String& query, bool caseSensitive, bool isRegex, RefPtr<JSON::ArrayOf<Inspector::Protocol::GenericTypes::SearchMatch>>&);
-@@ -275,6 +279,7 @@ private:
+@@ -189,6 +193,7 @@ private:
bool m_enabled { false };
bool m_loadingXHRSynchronously { false };
bool m_interceptionEnabled { false };
@@ -3831,30 +3939,28 @@ index 7ae1b53be8a9b5f0d0e2787a22f5534500b7ab19..f6f33d05bcdb4084f55631fdcfd3b4d0
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
-index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70df0d7f81 100644
+index 3f648b2a5fead536fa308257b0615a3547989467..d19e0372a8cb74baf958df6bddc19eae97bd3861 100644
--- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
+++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
-@@ -32,20 +32,29 @@
+@@ -32,21 +32,27 @@
#include "config.h"
#include "InspectorPageAgent.h"
-+#include "AccessibilityObjectInlines.h"
-+#include "AXCoreObject.h"
-+#include "AXObjectCache.h"
+#include "BackForwardController.h"
#include "CachedResource.h"
- #include "CachedResourceLoader.h"
#include "Cookie.h"
#include "CookieJar.h"
+#include "CustomHeaderFields.h"
#include "DOMWrapperWorld.h"
- #include "DocumentInlines.h"
#include "DocumentLoader.h"
+ #include "DocumentResourceLoader.h"
+ #include "DocumentView.h"
+#include "Editor.h"
#include "ElementInlines.h"
#include "EventTargetInlines.h"
+#include "FocusController.h"
#include "ForcedAccessibilityValue.h"
+ #include "FrameInlines.h"
#include "FrameLoadRequest.h"
#include "FrameLoader.h"
+#include "FrameLoaderClient.h"
@@ -3864,7 +3970,13 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
#include "HTMLNames.h"
#include "ImageBuffer.h"
#include "InspectorBackendClient.h"
-@@ -58,24 +67,38 @@
+@@ -55,29 +61,44 @@
+ #include "InspectorOverlay.h"
+ #include "InspectorResourceUtilities.h"
+ #include "InstrumentingAgents.h"
++#include "JSDOMWindowCustom.h"
+ #include "LocalFrame.h"
+ #include "LocalFrameView.h"
#include "MIMETypeRegistry.h"
#include "MemoryCache.h"
#include "Page.h"
@@ -3903,7 +4015,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
#include <wtf/text/StringBuilder.h>
#if ENABLE(APPLICATION_MANIFEST)
-@@ -97,6 +120,11 @@ using namespace Inspector;
+@@ -99,6 +120,11 @@ using namespace Inspector;
WTF_MAKE_TZONE_ALLOCATED_IMPL(InspectorPageAgent);
@@ -3912,10 +4024,10 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
+ return nameToWorld;
+}
+
- static bool decodeBuffer(std::span<const uint8_t> buffer, const String& textEncodingName, String* result)
+ Ref<InspectorOverlay> InspectorPageAgent::protectedOverlay() const
{
- if (buffer.data()) {
-@@ -350,6 +378,7 @@ InspectorPageAgent::InspectorPageAgent(PageAgentContext& context, InspectorBacke
+ return m_overlay.get();
+@@ -109,6 +135,7 @@ InspectorPageAgent::InspectorPageAgent(PageAgentContext& context, InspectorBacke
, m_frontendDispatcher(makeUniqueRef<Inspector::PageFrontendDispatcher>(context.frontendRouter))
, m_backendDispatcher(Inspector::PageBackendDispatcher::create(context.backendDispatcher, this))
, m_inspectedPage(context.inspectedPage)
@@ -3923,7 +4035,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
, m_client(client)
, m_overlay(overlay)
{
-@@ -379,12 +408,20 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::enable()
+@@ -139,12 +166,20 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::enable()
defaultUserPreferencesDidChange();
@@ -3938,13 +4050,13 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::disable()
{
- m_instrumentingAgents.setEnabledPageAgent(nullptr);
+ Ref { m_instrumentingAgents.get() }->setEnabledPageAgent(nullptr);
+ m_interceptFileChooserDialog = false;
+ m_bypassCSP = false;
setShowPaintRects(false);
#if !PLATFORM(IOS_FAMILY)
-@@ -437,6 +474,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::reload(std::optiona
+@@ -197,6 +232,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::reload(std::optiona
return { };
}
@@ -3964,10 +4076,10 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
+ return { };
+}
+
- Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::navigate(const String& url)
+ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideUserAgent(const String& value)
{
- RefPtr localMainFrame = m_inspectedPage->localMainFrame();
-@@ -463,6 +516,13 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideUserAgent(c
+ m_userAgentOverride = value;
+@@ -204,6 +255,13 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideUserAgent(c
return { };
}
@@ -3981,7 +4093,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Inspector::Protocol::Page::Setting setting, std::optional<bool>&& value)
{
auto& inspectedPageSettings = m_inspectedPage->settings();
-@@ -476,6 +536,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+@@ -217,6 +275,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
inspectedPageSettings.setAuthorAndUserStylesEnabledInspectorOverride(value);
return { };
@@ -3994,7 +4106,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
case Inspector::Protocol::Page::Setting::ICECandidateFilteringEnabled:
inspectedPageSettings.setICECandidateFilteringEnabledInspectorOverride(value);
return { };
-@@ -502,6 +568,39 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+@@ -243,6 +307,39 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
m_client->setDeveloperPreferenceOverride(InspectorBackendClient::DeveloperPreference::NeedsSiteSpecificQuirks, value);
return { };
@@ -4034,7 +4146,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
case Inspector::Protocol::Page::Setting::ScriptEnabled:
inspectedPageSettings.setScriptEnabledInspectorOverride(value);
return { };
-@@ -514,6 +613,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+@@ -255,6 +352,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
inspectedPageSettings.setShowRepaintCounterInspectorOverride(value);
return { };
@@ -4047,7 +4159,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
case Inspector::Protocol::Page::Setting::WebSecurityEnabled:
inspectedPageSettings.setWebSecurityEnabledInspectorOverride(value);
return { };
-@@ -922,15 +1027,16 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setShowPaintRects(b
+@@ -664,15 +767,16 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setShowPaintRects(b
return { };
}
@@ -4069,7 +4181,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
}
void InspectorPageAgent::frameNavigated(LocalFrame& frame)
-@@ -938,13 +1044,29 @@ void InspectorPageAgent::frameNavigated(LocalFrame& frame)
+@@ -680,13 +784,29 @@ void InspectorPageAgent::frameNavigated(LocalFrame& frame)
m_frontendDispatcher->frameNavigated(buildObjectForFrame(&frame));
}
@@ -4102,7 +4214,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
}
Frame* InspectorPageAgent::frameForId(const Inspector::Protocol::Network::FrameId& frameId)
-@@ -956,20 +1078,21 @@ String InspectorPageAgent::frameId(Frame* frame)
+@@ -698,20 +818,21 @@ String InspectorPageAgent::frameId(Frame* frame)
{
if (!frame)
return emptyString();
@@ -4132,7 +4244,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
}
LocalFrame* InspectorPageAgent::assertFrame(Inspector::Protocol::ErrorString& errorString, const Inspector::Protocol::Network::FrameId& frameId)
-@@ -1024,6 +1147,12 @@ void InspectorPageAgent::defaultUserPreferencesDidChange()
+@@ -766,6 +887,12 @@ void InspectorPageAgent::defaultUserPreferencesDidChange()
m_frontendDispatcher->defaultUserPreferencesDidChange(WTFMove(defaultUserPreferences));
}
@@ -4145,7 +4257,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
#if ENABLE(DARK_MODE_CSS)
void InspectorPageAgent::defaultAppearanceDidChange()
{
-@@ -1037,6 +1166,9 @@ void InspectorPageAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapp
+@@ -779,6 +906,9 @@ void InspectorPageAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapp
return;
if (m_bootstrapScript.isEmpty())
@@ -4155,7 +4267,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
return;
frame.script().evaluateIgnoringException(ScriptSourceCode(m_bootstrapScript, JSC::SourceTaintedOrigin::Untainted, URL { "web-inspector://bootstrap.js"_str }));
-@@ -1084,6 +1216,51 @@ void InspectorPageAgent::didRecalculateStyle()
+@@ -826,6 +956,51 @@ void InspectorPageAgent::didRecalculateStyle()
protectedOverlay()->update();
}
@@ -4207,7 +4319,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
Ref<Inspector::Protocol::Page::Frame> InspectorPageAgent::buildObjectForFrame(LocalFrame* frame)
{
ASSERT_ARG(frame, frame);
-@@ -1177,6 +1354,12 @@ void InspectorPageAgent::applyUserAgentOverride(String& userAgent)
+@@ -919,6 +1094,12 @@ void InspectorPageAgent::applyUserAgentOverride(String& userAgent)
userAgent = m_userAgentOverride;
}
@@ -4220,7 +4332,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
void InspectorPageAgent::applyEmulatedMedia(AtomString& media)
{
if (!m_emulatedMedia.isEmpty())
-@@ -1204,11 +1387,13 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotNode(Insp
+@@ -946,11 +1127,13 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotNode(Insp
return snapshot->toDataURL("image/png"_s, std::nullopt, PreserveResolution::Yes);
}
@@ -4235,7 +4347,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
IntRect rectangle(x, y, width, height);
RefPtr localMainFrame = m_inspectedPage->localMainFrame();
-@@ -1222,6 +1407,43 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int
+@@ -964,6 +1147,43 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int
return snapshot->toDataURL("image/png"_s, std::nullopt, PreserveResolution::Yes);
}
@@ -4279,7 +4391,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
#if ENABLE(WEB_ARCHIVE) && USE(CF)
Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
{
-@@ -1238,7 +1460,6 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
+@@ -980,7 +1200,6 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
}
#endif
@@ -4287,7 +4399,7 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverride(std::optional<int>&& width, std::optional<int>&& height)
{
if (width.has_value() != height.has_value())
-@@ -1256,6 +1477,500 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverri
+@@ -998,6 +1217,84 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverri
localMainFrame->setOverrideScreenSize(FloatSize(width.value_or(0), height.value_or(0)));
return { };
}
@@ -4309,422 +4421,6 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
+ return { };
+}
+
-+static String roleFromObject(RefPtr<AXCoreObject> axObject)
-+{
-+ String computedRoleString = axObject->computedRoleString();
-+ if (!computedRoleString.isEmpty())
-+ return computedRoleString;
-+ AccessibilityRole role = axObject->role();
-+ switch(role) {
-+ case AccessibilityRole::Application:
-+ return "Application"_s;
-+ case AccessibilityRole::ApplicationAlert:
-+ return "ApplicationAlert"_s;
-+ case AccessibilityRole::ApplicationAlertDialog:
-+ return "ApplicationAlertDialog"_s;
-+ case AccessibilityRole::ApplicationDialog:
-+ return "ApplicationDialog"_s;
-+ case AccessibilityRole::ApplicationLog:
-+ return "ApplicationLog"_s;
-+ case AccessibilityRole::ApplicationMarquee:
-+ return "ApplicationMarquee"_s;
-+ case AccessibilityRole::ApplicationStatus:
-+ return "ApplicationStatus"_s;
-+ case AccessibilityRole::ApplicationTimer:
-+ return "ApplicationTimer"_s;
-+ case AccessibilityRole::Audio:
-+ return "Audio"_s;
-+ case AccessibilityRole::Blockquote:
-+ return "Blockquote"_s;
-+ case AccessibilityRole::Button:
-+ return "Button"_s;
-+ case AccessibilityRole::Canvas:
-+ return "Canvas"_s;
-+ case AccessibilityRole::Caption:
-+ return "Caption"_s;
-+ case AccessibilityRole::Cell:
-+ return "Cell"_s;
-+ case AccessibilityRole::Checkbox:
-+ return "CheckBox"_s;
-+ case AccessibilityRole::Code:
-+ return "Code"_s;
-+ case AccessibilityRole::ColorWell:
-+ return "ColorWell"_s;
-+ case AccessibilityRole::Column:
-+ return "Column"_s;
-+ case AccessibilityRole::ColumnHeader:
-+ return "ColumnHeader"_s;
-+ case AccessibilityRole::ComboBox:
-+ return "ComboBox"_s;
-+ case AccessibilityRole::DateTime:
-+ return "DateTime"_s;
-+ case AccessibilityRole::Definition:
-+ return "Definition"_s;
-+ case AccessibilityRole::Deletion:
-+ return "Deletion"_s;
-+ case AccessibilityRole::DescriptionList:
-+ return "DescriptionList"_s;
-+ case AccessibilityRole::DescriptionListTerm:
-+ return "DescriptionListTerm"_s;
-+ case AccessibilityRole::DescriptionListDetail:
-+ return "DescriptionListDetail"_s;
-+ case AccessibilityRole::Details:
-+ return "Details"_s;
-+ case AccessibilityRole::Directory:
-+ return "Directory"_s;
-+ case AccessibilityRole::Document:
-+ return "Document"_s;
-+ case AccessibilityRole::DocumentArticle:
-+ return "DocumentArticle"_s;
-+ case AccessibilityRole::DocumentMath:
-+ return "DocumentMath"_s;
-+ case AccessibilityRole::DocumentNote:
-+ return "DocumentNote"_s;
-+ case AccessibilityRole::Emphasis:
-+ return "Emphasis"_s;
-+ case AccessibilityRole::Feed:
-+ return "Feed"_s;
-+ case AccessibilityRole::Figure:
-+ return "Figure"_s;
-+ case AccessibilityRole::Footnote:
-+ return "Footnote"_s;
-+ case AccessibilityRole::Form:
-+ return "Form"_s;
-+ case AccessibilityRole::FrameHost:
-+ return "FrameHost"_s;
-+ case AccessibilityRole::Generic:
-+ return "Generic"_s;
-+ case AccessibilityRole::GraphicsDocument:
-+ return "GraphicsDocument"_s;
-+ case AccessibilityRole::GraphicsObject:
-+ return "GraphicsObject"_s;
-+ case AccessibilityRole::GraphicsSymbol:
-+ return "GraphicsSymbol"_s;
-+ case AccessibilityRole::Grid:
-+ return "Grid"_s;
-+ case AccessibilityRole::GridCell:
-+ return "GridCell"_s;
-+ case AccessibilityRole::Group:
-+ return "Group"_s;
-+ case AccessibilityRole::Heading:
-+ return "Heading"_s;
-+ case AccessibilityRole::HorizontalRule:
-+ return "HorizontalRule"_s;
-+ case AccessibilityRole::Ignored:
-+ return "Ignored"_s;
-+ case AccessibilityRole::Inline:
-+ return "Inline"_s;
-+ case AccessibilityRole::Image:
-+ return "Image"_s;
-+ case AccessibilityRole::ImageMap:
-+ return "ImageMap"_s;
-+ case AccessibilityRole::Insertion:
-+ return "Insertion"_s;
-+ case AccessibilityRole::Label:
-+ return "Label"_s;
-+ case AccessibilityRole::LandmarkBanner:
-+ return "LandmarkBanner"_s;
-+ case AccessibilityRole::LandmarkComplementary:
-+ return "LandmarkComplementary"_s;
-+ case AccessibilityRole::LandmarkContentInfo:
-+ return "LandmarkContentInfo"_s;
-+ case AccessibilityRole::LandmarkDocRegion:
-+ return "LandmarkDocRegion"_s;
-+ case AccessibilityRole::LandmarkMain:
-+ return "LandmarkMain"_s;
-+ case AccessibilityRole::LandmarkNavigation:
-+ return "LandmarkNavigation"_s;
-+ case AccessibilityRole::LandmarkRegion:
-+ return "LandmarkRegion"_s;
-+ case AccessibilityRole::LandmarkSearch:
-+ return "LandmarkSearch"_s;
-+ case AccessibilityRole::Legend:
-+ return "Legend"_s;
-+ case AccessibilityRole::LineBreak:
-+ return "LineBreak"_s;
-+ case AccessibilityRole::Link:
-+ return "Link"_s;
-+ case AccessibilityRole::List:
-+ return "List"_s;
-+ case AccessibilityRole::ListBox:
-+ return "ListBox"_s;
-+ case AccessibilityRole::ListBoxOption:
-+ return "ListBoxOption"_s;
-+ case AccessibilityRole::ListItem:
-+ return "ListItem"_s;
-+ case AccessibilityRole::ListMarker:
-+ return "ListMarker"_s;
-+ case AccessibilityRole::LocalFrame:
-+ return "LocalFrame"_s;
-+ case AccessibilityRole::Mark:
-+ return "Mark"_s;
-+ case AccessibilityRole::MathElement:
-+ return "MathElement"_s;
-+ case AccessibilityRole::Menu:
-+ return "Menu"_s;
-+ case AccessibilityRole::MenuBar:
-+ return "MenuBar"_s;
-+ case AccessibilityRole::MenuItem:
-+ return "MenuItem"_s;
-+ case AccessibilityRole::MenuItemCheckbox:
-+ return "MenuItemCheckbox"_s;
-+ case AccessibilityRole::MenuItemRadio:
-+ return "MenuItemRadio"_s;
-+ case AccessibilityRole::MenuListPopup:
-+ return "MenuListPopup"_s;
-+ case AccessibilityRole::MenuListOption:
-+ return "MenuListOption"_s;
-+ case AccessibilityRole::Meter:
-+ return "Meter"_s;
-+ case AccessibilityRole::Model:
-+ return "Model"_s;
-+ case AccessibilityRole::Paragraph:
-+ return "Paragraph"_s;
-+ case AccessibilityRole::PopUpButton:
-+ return "PopUpButton"_s;
-+ case AccessibilityRole::Pre:
-+ return "Pre"_s;
-+ case AccessibilityRole::Presentational:
-+ return "Presentational"_s;
-+ case AccessibilityRole::ProgressIndicator:
-+ return "ProgressIndicator"_s;
-+ case AccessibilityRole::RadioButton:
-+ return "RadioButton"_s;
-+ case AccessibilityRole::RadioGroup:
-+ return "RadioGroup"_s;
-+ case AccessibilityRole::RemoteFrame:
-+ return "RemoteFrame"_s;
-+ case AccessibilityRole::RowHeader:
-+ return "RowHeader"_s;
-+ case AccessibilityRole::Row:
-+ return "Row"_s;
-+ case AccessibilityRole::RowGroup:
-+ return "RowGroup"_s;
-+ case AccessibilityRole::RubyInline:
-+ return "RubyInline"_s;
-+ case AccessibilityRole::RubyText:
-+ return "RubyText"_s;
-+ case AccessibilityRole::ScrollArea:
-+ return "ScrollArea"_s;
-+ case AccessibilityRole::ScrollBar:
-+ return "ScrollBar"_s;
-+ case AccessibilityRole::SearchField:
-+ return "SearchField"_s;
-+ case AccessibilityRole::SectionFooter:
-+ return "SectionFooter"_s;
-+ case AccessibilityRole::SectionHeader:
-+ return "SectionHeader"_s;
-+ case AccessibilityRole::Slider:
-+ return "Slider"_s;
-+ case AccessibilityRole::SliderThumb:
-+ return "SliderThumb"_s;
-+ case AccessibilityRole::SpinButton:
-+ return "SpinButton"_s;
-+ case AccessibilityRole::SpinButtonPart:
-+ return "SpinButtonPart"_s;
-+ case AccessibilityRole::Splitter:
-+ return "Splitter"_s;
-+ case AccessibilityRole::StaticText:
-+ return "StaticText"_s;
-+ case AccessibilityRole::Strong:
-+ return "Strong"_s;
-+ case AccessibilityRole::Subscript:
-+ return "Subscript"_s;
-+ case AccessibilityRole::Suggestion:
-+ return "Suggestion"_s;
-+ case AccessibilityRole::Summary:
-+ return "Summary"_s;
-+ case AccessibilityRole::Superscript:
-+ return "Superscript"_s;
-+ case AccessibilityRole::Switch:
-+ return "Switch"_s;
-+ case AccessibilityRole::SVGRoot:
-+ return "SVGRoot"_s;
-+ case AccessibilityRole::SVGText:
-+ return "SVGText"_s;
-+ case AccessibilityRole::SVGTSpan:
-+ return "SVGTSpan"_s;
-+ case AccessibilityRole::SVGTextPath:
-+ return "SVGTextPath"_s;
-+ case AccessibilityRole::TabGroup:
-+ return "TabGroup"_s;
-+ case AccessibilityRole::TabList:
-+ return "TabList"_s;
-+ case AccessibilityRole::TabPanel:
-+ return "TabPanel"_s;
-+ case AccessibilityRole::Tab:
-+ return "Tab"_s;
-+ case AccessibilityRole::Table:
-+ return "Table"_s;
-+ case AccessibilityRole::TableHeaderContainer:
-+ return "TableHeaderContainer"_s;
-+ case AccessibilityRole::TextArea:
-+ return "TextArea"_s;
-+ case AccessibilityRole::TextGroup:
-+ return "TextGroup"_s;
-+ case AccessibilityRole::Term:
-+ return "Term"_s;
-+ case AccessibilityRole::Time:
-+ return "Time"_s;
-+ case AccessibilityRole::Tree:
-+ return "Tree"_s;
-+ case AccessibilityRole::TreeGrid:
-+ return "TreeGrid"_s;
-+ case AccessibilityRole::TreeItem:
-+ return "TreeItem"_s;
-+ case AccessibilityRole::TextField:
-+ return "TextField"_s;
-+ case AccessibilityRole::ToggleButton:
-+ return "ToggleButton"_s;
-+ case AccessibilityRole::Toolbar:
-+ return "Toolbar"_s;
-+ case AccessibilityRole::Unknown:
-+ return "Unknown"_s;
-+ case AccessibilityRole::UserInterfaceTooltip:
-+ return "UserInterfaceTooltip"_s;
-+ case AccessibilityRole::Video:
-+ return "Video"_s;
-+ case AccessibilityRole::WebApplication:
-+ return "WebApplication"_s;
-+ case AccessibilityRole::WebArea:
-+ return "WebArea"_s;
-+ };
-+ return "Unknown"_s;
-+}
-+
-+static Ref<Inspector::Protocol::Page::AXNode> snapshotForAXObject(WTF::RefPtr<WebCore::AXCoreObject> axObject, Node* nodeToFind)
-+{
-+ auto axNode = Inspector::Protocol::Page::AXNode::create()
-+ .setRole(roleFromObject(axObject))
-+ .release();
-+ auto* liveObject = dynamicDowncast<AccessibilityObject>(axObject.get());
-+
-+ if (liveObject && !liveObject->computedLabel().isEmpty())
-+ axNode->setName(liveObject->computedLabel());
-+ if (!axObject->stringValue().isEmpty())
-+ axNode->setValue(JSON::Value::create(axObject->stringValue()));
-+ if (liveObject && !liveObject->description().isEmpty())
-+ axNode->setDescription(liveObject->description());
-+ if (!axObject->keyShortcuts().isEmpty())
-+ axNode->setKeyshortcuts(axObject->keyShortcuts());
-+ if (!axObject->valueDescription().isEmpty())
-+ axNode->setValuetext(axObject->valueDescription());
-+ if (!axObject->roleDescription().isEmpty())
-+ axNode->setRoledescription(axObject->roleDescription());
-+ if (!axObject->isEnabled())
-+ axNode->setDisabled(!axObject->isEnabled());
-+ if (axObject->supportsExpanded())
-+ axNode->setExpanded(axObject->isExpanded());
-+ if (axObject->isFocused())
-+ axNode->setFocused(axObject->isFocused());
-+ if (axObject->isModalNode())
-+ axNode->setModal(axObject->isModalNode());
-+ if (axObject->isMultiSelectable())
-+ axNode->setMultiselectable(axObject->isMultiSelectable());
-+ if (liveObject && liveObject->supportsReadOnly() && !axObject->canSetValueAttribute() && axObject->isEnabled())
-+ axNode->setReadonly(true);
-+ if (axObject->supportsRequiredAttribute())
-+ axNode->setRequired(axObject->isRequired());
-+ if (axObject->isSelected())
-+ axNode->setSelected(axObject->isSelected());
-+ if (axObject->supportsChecked()) {
-+ AccessibilityButtonState checkedState = axObject->checkboxOrRadioValue();
-+ switch (checkedState) {
-+ case AccessibilityButtonState::On:
-+ axNode->setChecked(Inspector::Protocol::Page::AXNode::Checked::True);
-+ break;
-+ case AccessibilityButtonState::Off:
-+ axNode->setChecked(Inspector::Protocol::Page::AXNode::Checked::False);
-+ break;
-+ case AccessibilityButtonState::Mixed:
-+ axNode->setChecked(Inspector::Protocol::Page::AXNode::Checked::Mixed);
-+ break;
-+ }
-+ }
-+ unsigned level = axObject->hierarchicalLevel() ? axObject->hierarchicalLevel() : axObject->headingLevel();
-+ if (level)
-+ axNode->setLevel(level);
-+ if (axObject->minValueForRange() != 0)
-+ axNode->setValuemin(axObject->minValueForRange());
-+ if (axObject->maxValueForRange() != 0)
-+ axNode->setValuemax(axObject->maxValueForRange());
-+ if (liveObject && liveObject->supportsAutoComplete())
-+ axNode->setAutocomplete(axObject->autoCompleteValue());
-+ if (axObject->hasPopup())
-+ axNode->setHaspopup(axObject->popupValue());
-+
-+ String invalidValue = axObject->invalidStatus();
-+ if (invalidValue != "false"_s) {
-+ if (invalidValue == "grammar"_s)
-+ axNode->setInvalid(Inspector::Protocol::Page::AXNode::Invalid::Grammar);
-+ else if (invalidValue == "spelling"_s)
-+ axNode->setInvalid(Inspector::Protocol::Page::AXNode::Invalid::Spelling);
-+ else // Future versions of ARIA may allow additional truthy values. Ex. format, order, or size.
-+ axNode->setInvalid(Inspector::Protocol::Page::AXNode::Invalid::True);
-+ }
-+ switch (axObject->orientation()) {
-+ case AccessibilityOrientation::Undefined:
-+ break;
-+ case AccessibilityOrientation::Vertical:
-+ axNode->setOrientation("vertical"_s);
-+ break;
-+ case AccessibilityOrientation::Horizontal:
-+ axNode->setOrientation("horizontal"_s);
-+ break;
-+ }
-+
-+ if (axObject->isKeyboardFocusable())
-+ axNode->setFocusable(axObject->isKeyboardFocusable());
-+
-+ if (nodeToFind && axObject->node() == nodeToFind)
-+ axNode->setFound(true);
-+
-+ if (!axObject->children().isEmpty()) {
-+ Ref<JSON::ArrayOf<Inspector::Protocol::Page::AXNode>> children = JSON::ArrayOf<Inspector::Protocol::Page::AXNode>::create();
-+ for (auto& childObject : axObject->children())
-+ children->addItem(snapshotForAXObject(childObject.ptr(), nodeToFind));
-+ axNode->setChildren(WTFMove(children));
-+ }
-+ return axNode;
-+}
-+
-+
-+Protocol::ErrorStringOr<Ref<Protocol::Page::AXNode>> InspectorPageAgent::accessibilitySnapshot(const String& objectId)
-+{
-+ if (!WebCore::AXObjectCache::accessibilityEnabled())
-+ WebCore::AXObjectCache::enableAccessibility();
-+
-+ auto* localMainFrame = dynamicDowncast<LocalFrame>(m_inspectedPage->mainFrame());
-+ if (!localMainFrame)
-+ return makeUnexpected("No local main frame"_s);
-+
-+ RefPtr document = localMainFrame->document();
-+ if (!document)
-+ return makeUnexpected("No document for main frame"_s);
-+
-+ AXObjectCache* axObjectCache = document->axObjectCache();
-+ if (!axObjectCache)
-+ return makeUnexpected("No AXObjectCache for main document"_s);
-+
-+ AXCoreObject* axObject = axObjectCache->rootObjectForFrame(*localMainFrame);
-+ if (!axObject)
-+ return makeUnexpected("No AXObject for main document"_s);
-+
-+ Node* node = nullptr;
-+ if (!objectId.isEmpty()) {
-+ InspectorDOMAgent* domAgent = m_instrumentingAgents.persistentDOMAgent();
-+ ASSERT(domAgent);
-+ node = domAgent->nodeForObjectId(objectId);
-+ if (!node)
-+ return makeUnexpected("No Node for objectId"_s);
-+ }
-+
-+ m_doingAccessibilitySnapshot = true;
-+ Ref<Inspector::Protocol::Page::AXNode> axNode = snapshotForAXObject(RefPtr { axObject }, node);
-+ m_doingAccessibilitySnapshot = false;
-+ return axNode;
-+}
-+
+Protocol::ErrorStringOr<void> InspectorPageAgent::setInterceptFileChooserDialog(bool enabled)
+{
+ m_interceptFileChooserDialog = enabled;
@@ -4790,19 +4486,18 @@ index 7ee1926dd2f20af854d33095dcd7431fa24c2db9..a40c4ae43f849229b4ca65f33823ff70
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.h b/Source/WebCore/inspector/agents/InspectorPageAgent.h
-index 194a97b59c553830963e72fd4a2ff4f796e0a065..256b1377b89024b5c2bcbb91615e5e62ed28a3dc 100644
+index 84cc27a3481eeb11246aee3935f46f745bdbc440..c09811571337865301d9f6d0ced770d0aa624a83 100644
--- a/Source/WebCore/inspector/agents/InspectorPageAgent.h
+++ b/Source/WebCore/inspector/agents/InspectorPageAgent.h
-@@ -44,11 +44,16 @@
- #include <wtf/WeakRef.h>
- #include <wtf/text/WTFString.h>
+@@ -46,6 +46,7 @@
-+namespace Inspector {
+ namespace Inspector {
+ enum class ResourceType;
+class InjectedScriptManager;
-+}
-+
- namespace WebCore {
+ }
+ namespace WebCore {
+@@ -53,6 +54,7 @@ namespace WebCore {
class DOMWrapperWorld;
class DocumentLoader;
class Frame;
@@ -4810,28 +4505,28 @@ index 194a97b59c553830963e72fd4a2ff4f796e0a065..256b1377b89024b5c2bcbb91615e5e62
class InspectorBackendClient;
class InspectorOverlay;
class LocalFrame;
-@@ -81,6 +86,8 @@ public:
- OtherResource,
- };
+@@ -67,6 +69,9 @@ public:
+ InspectorPageAgent(PageAgentContext&, InspectorBackendClient*, InspectorOverlay&);
+ ~InspectorPageAgent();
+ WEBCORE_EXPORT static String serializeFrameID(FrameIdentifier frameID);
+ WEBCORE_EXPORT static std::optional<FrameIdentifier> parseFrameID(String frameID);
- static bool sharedBufferContent(RefPtr<FragmentedSharedBuffer>&&, const String& textEncodingName, bool withBase64Encode, String* result);
- static Vector<CachedResource*> cachedResourcesForFrame(LocalFrame*);
- static void resourceContent(Inspector::Protocol::ErrorString&, LocalFrame*, const URL&, String* result, bool* base64Encoded);
-@@ -101,8 +108,11 @@ public:
++
+ // InspectorAgentBase
+ void didCreateFrontendAndBackend();
+ void willDestroyFrontendAndBackend(Inspector::DisconnectReason);
+@@ -75,7 +80,10 @@ public:
Inspector::Protocol::ErrorStringOr<void> enable();
Inspector::Protocol::ErrorStringOr<void> disable();
Inspector::Protocol::ErrorStringOr<void> reload(std::optional<bool>&& ignoreCache, std::optional<bool>&& revalidateAllResources);
+ Inspector::Protocol::ErrorStringOr<void> goBack();
+ Inspector::Protocol::ErrorStringOr<void> goForward();
- Inspector::Protocol::ErrorStringOr<void> navigate(const String& url);
Inspector::Protocol::ErrorStringOr<void> overrideUserAgent(const String&);
+ Inspector::Protocol::ErrorStringOr<void> overridePlatform(const String&);
Inspector::Protocol::ErrorStringOr<void> overrideSetting(Inspector::Protocol::Page::Setting, std::optional<bool>&& value);
Inspector::Protocol::ErrorStringOr<void> overrideUserPreference(Inspector::Protocol::Page::UserPreferenceName, std::optional<Inspector::Protocol::Page::UserPreferenceValue>&&);
Inspector::Protocol::ErrorStringOr<Ref<JSON::ArrayOf<Inspector::Protocol::Page::Cookie>>> getCookies();
-@@ -118,41 +128,62 @@ public:
+@@ -91,41 +99,60 @@ public:
#endif
Inspector::Protocol::ErrorStringOr<void> setShowPaintRects(bool);
Inspector::Protocol::ErrorStringOr<void> setEmulatedMedia(const String&);
@@ -4849,7 +4544,6 @@ index 194a97b59c553830963e72fd4a2ff4f796e0a065..256b1377b89024b5c2bcbb91615e5e62
-#endif
+
+ Inspector::Protocol::ErrorStringOr<void> insertText(const String& text);
-+ Inspector::Protocol::ErrorStringOr<Ref<Inspector::Protocol::Page::AXNode>> accessibilitySnapshot(const String& objectId);
+ Inspector::Protocol::ErrorStringOr<void> setInterceptFileChooserDialog(bool enabled);
+ Inspector::Protocol::ErrorStringOr<void> setDefaultBackgroundColorOverride(RefPtr<JSON::Object>&&);
+ Inspector::Protocol::ErrorStringOr<void> createUserWorld(const String&);
@@ -4884,7 +4578,6 @@ index 194a97b59c553830963e72fd4a2ff4f796e0a065..256b1377b89024b5c2bcbb91615e5e62
+ bool shouldBypassCSP();
+ void willCheckNavigationPolicy(LocalFrame&);
+ void didCheckNavigationPolicy(LocalFrame&, bool cancel);
-+ bool doingAccessibilitySnapshot() const { return m_doingAccessibilitySnapshot; };
Frame* frameForId(const Inspector::Protocol::Network::FrameId&);
WEBCORE_EXPORT String frameId(Frame*);
@@ -4899,7 +4592,7 @@ index 194a97b59c553830963e72fd4a2ff4f796e0a065..256b1377b89024b5c2bcbb91615e5e62
Ref<InspectorOverlay> protectedOverlay() const;
-@@ -170,17 +201,22 @@ private:
+@@ -140,17 +167,21 @@ private:
const Ref<Inspector::PageBackendDispatcher> m_backendDispatcher;
WeakRef<Page> m_inspectedPage;
@@ -4918,13 +4611,12 @@ index 194a97b59c553830963e72fd4a2ff4f796e0a065..256b1377b89024b5c2bcbb91615e5e62
bool m_showPaintRects { false };
+ bool m_interceptFileChooserDialog { false };
+ bool m_bypassCSP { false };
-+ bool m_doingAccessibilitySnapshot { false };
+ bool m_ignoreDidClearWindowObject { false };
};
} // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp b/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp
-index 157249fd95354782e13a63e860757383c0aaf51d..f0220b54eeb035f926013c9e6405bfe6774e10ff 100644
+index 3bbd19cfdcc1683a67bc79bbc129e3e002c20a8a..34ae027c0cd3c6b3fef88046bda08b92f16a46b3 100644
--- a/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp
+++ b/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp
@@ -35,6 +35,7 @@
@@ -4943,9 +4635,9 @@ index 157249fd95354782e13a63e860757383c0aaf51d..f0220b54eeb035f926013c9e6405bfe6
#include "SecurityOrigin.h"
#include "UserGestureEmulationScope.h"
#include <JavaScriptCore/InjectedScript.h>
-@@ -88,13 +90,74 @@ Inspector::Protocol::ErrorStringOr<void> PageRuntimeAgent::disable()
+@@ -89,13 +91,74 @@ Inspector::Protocol::ErrorStringOr<void> PageRuntimeAgent::disable()
{
- m_instrumentingAgents.setEnabledPageRuntimeAgent(nullptr);
+ Ref { m_instrumentingAgents.get() }->setEnabledPageRuntimeAgent(nullptr);
+ m_bindingNames.clear();
+
@@ -4954,7 +4646,7 @@ index 157249fd95354782e13a63e860757383c0aaf51d..f0220b54eeb035f926013c9e6405bfe6
void PageRuntimeAgent::frameNavigated(LocalFrame& frame)
{
-+ auto* pageAgent = m_instrumentingAgents.enabledPageAgent();
++ auto* pageAgent = Ref { m_instrumentingAgents.get() }->enabledPageAgent();
+ if (pageAgent)
+ pageAgent->setIgnoreDidClearWindowObject(true);
// Ensure execution context is created for the frame even if it doesn't have scripts.
@@ -5018,7 +4710,7 @@ index 157249fd95354782e13a63e860757383c0aaf51d..f0220b54eeb035f926013c9e6405bfe6
}
void PageRuntimeAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapperWorld& world)
-@@ -103,7 +166,26 @@ void PageRuntimeAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapper
+@@ -104,7 +167,26 @@ void PageRuntimeAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapper
if (!pageAgent)
return;
@@ -5045,7 +4737,7 @@ index 157249fd95354782e13a63e860757383c0aaf51d..f0220b54eeb035f926013c9e6405bfe6
}
InjectedScript PageRuntimeAgent::injectedScriptForEval(Inspector::Protocol::ErrorString& errorString, std::optional<Inspector::Protocol::Runtime::ExecutionContextId>&& executionContextId)
-@@ -142,9 +224,6 @@ void PageRuntimeAgent::reportExecutionContextCreation()
+@@ -143,9 +225,6 @@ void PageRuntimeAgent::reportExecutionContextCreation()
return;
m_inspectedPage->forEachLocalFrame([&](LocalFrame& frame) {
@@ -5056,10 +4748,10 @@ index 157249fd95354782e13a63e860757383c0aaf51d..f0220b54eeb035f926013c9e6405bfe6
// 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 6544b61b15956b218e97814b0ceb7250809f8ed3..c6657031bcd27573533a34be62e0ea0d8441a7e4 100644
+index db4e1b7cd5ba1c46f962c07fa6e23cb13092832c..f7fb1503fc42b4b5fd21f76a893c84030e8af8c2 100644
--- a/Source/WebCore/inspector/agents/page/PageRuntimeAgent.h
+++ b/Source/WebCore/inspector/agents/page/PageRuntimeAgent.h
-@@ -38,6 +38,7 @@
+@@ -39,6 +39,7 @@
namespace JSC {
class CallFrame;
@@ -5067,7 +4759,7 @@ index 6544b61b15956b218e97814b0ceb7250809f8ed3..c6657031bcd27573533a34be62e0ea0d
}
namespace WebCore {
-@@ -59,10 +60,13 @@ public:
+@@ -60,10 +61,13 @@ public:
Inspector::Protocol::ErrorStringOr<void> disable();
Inspector::Protocol::ErrorStringOr<std::tuple<Ref<Inspector::Protocol::Runtime::RemoteObject>, std::optional<bool> /* wasThrown */, std::optional<int> /* savedResultIndex */>> evaluate(const String& expression, const String& objectGroup, std::optional<bool>&& includeCommandLineAPI, std::optional<bool>&& doNotPauseOnExceptionsAndMuteConsole, std::optional<Inspector::Protocol::Runtime::ExecutionContextId>&&, std::optional<bool>&& returnByValue, std::optional<bool>&& generatePreview, std::optional<bool>&& saveResult, std::optional<bool>&& emulateUserGesture);
void callFunctionOn(const Inspector::Protocol::Runtime::RemoteObjectId&, const String& functionDeclaration, RefPtr<JSON::Array>&& arguments, std::optional<bool>&& doNotPauseOnExceptionsAndMuteConsole, std::optional<bool>&& returnByValue, std::optional<bool>&& generatePreview, std::optional<bool>&& emulateUserGesture, std::optional<bool>&& awaitPromise, Ref<CallFunctionOnCallback>&&);
@@ -5081,8 +4773,8 @@ index 6544b61b15956b218e97814b0ceb7250809f8ed3..c6657031bcd27573533a34be62e0ea0d
private:
Inspector::InjectedScript injectedScriptForEval(Inspector::Protocol::ErrorString&, std::optional<Inspector::Protocol::Runtime::ExecutionContextId>&&);
-@@ -77,6 +81,7 @@ private:
- InstrumentingAgents& m_instrumentingAgents;
+@@ -78,6 +82,7 @@ private:
+ WeakRef<InstrumentingAgents> m_instrumentingAgents;
WeakRef<Page> m_inspectedPage;
+ HashSet<String> m_bindingNames;
@@ -5112,21 +4804,21 @@ index ed8bec9c10c9d1bf659efab09f77ad7d8e439594..49bdaf8b08d157ecb7cd412ea847eb8c
protected:
static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No);
diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
-index 9d47b5803f10fb3484d9a1f82d65e728f2b26500..3aa64308c20835f4e69a80344bfe93814f1f1099 100644
+index a91656adad1a649988389fc8ab7c6bfb0b6d998d..43c549fc9f21237c6995b2006ab09ec5d836e731 100644
--- a/Source/WebCore/loader/DocumentLoader.cpp
+++ b/Source/WebCore/loader/DocumentLoader.cpp
-@@ -753,8 +753,10 @@ void DocumentLoader::willSendRequest(ResourceRequest&& newRequest, const Resourc
+@@ -769,8 +769,10 @@ void DocumentLoader::willSendRequest(ResourceRequest&& newRequest, const Resourc
if (!didReceiveRedirectResponse)
return completionHandler(WTFMove(newRequest));
+ InspectorInstrumentation::willCheckNavigationPolicy(*frame);
- auto navigationPolicyCompletionHandler = [this, protectedThis = Ref { *this }, frame, completionHandler = WTFMove(completionHandler)] (ResourceRequest&& request, WeakPtr<FormState>&&, NavigationPolicyDecision navigationPolicyDecision) mutable {
+ auto navigationPolicyCompletionHandler = [this, protectedThis = Ref { *this }, frame, completionHandler = WTFMove(completionHandler)] (ResourceRequest&& request, WeakPtr<FormSubmission>&&, NavigationPolicyDecision navigationPolicyDecision) mutable {
m_waitingForNavigationPolicy = false;
+ InspectorInstrumentation::didCheckNavigationPolicy(*frame, navigationPolicyDecision != NavigationPolicyDecision::ContinueLoad);
switch (navigationPolicyDecision) {
case NavigationPolicyDecision::IgnoreLoad:
case NavigationPolicyDecision::LoadWillContinueInAnotherProcess:
-@@ -1532,11 +1534,17 @@ void DocumentLoader::detachFromFrame(LoadWillContinueInAnotherProcess loadWillCo
+@@ -1547,11 +1549,17 @@ void DocumentLoader::detachFromFrame(LoadWillContinueInAnotherProcess loadWillCo
if (auto navigationID = std::exchange(m_navigationID, { }))
frame->loader().client().documentLoaderDetached(*navigationID, loadWillContinueInAnotherProcess);
@@ -5147,10 +4839,10 @@ index 9d47b5803f10fb3484d9a1f82d65e728f2b26500..3aa64308c20835f4e69a80344bfe9381
{
m_navigationID = navigationID;
diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h
-index f64c002d4e2fe48eb38058ae52fd8939a6bab31b..e6f6679d6a40cfa9cacc3a8e3fd629a774283551 100644
+index a02a5f78423b113d49c7ab21659dd8cc88f64b15..704d9d18f6243aaaaf8f6bc3d2815234d2e32b8a 100644
--- a/Source/WebCore/loader/DocumentLoader.h
+++ b/Source/WebCore/loader/DocumentLoader.h
-@@ -221,6 +221,8 @@ public:
+@@ -206,6 +206,8 @@ public:
WEBCORE_EXPORT virtual void detachFromFrame(LoadWillContinueInAnotherProcess);
@@ -5160,10 +4852,10 @@ index f64c002d4e2fe48eb38058ae52fd8939a6bab31b..e6f6679d6a40cfa9cacc3a8e3fd629a7
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 65040a4e2fa0def1672638668e298eab3228c3f8..65faf6687413a223828be10d55f3c8f8c1789739 100644
+index 8b36290fc4bf8eb2bd4c8080b34d1b17ad63ffd0..370d562b68535d99308072a17adf5258b159945e 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
-@@ -1335,6 +1335,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr<SerializedScriptValue> stat
+@@ -1349,6 +1349,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr<SerializedScriptValue> stat
}
m_client->dispatchDidNavigateWithinPage();
@@ -5171,7 +4863,7 @@ index 65040a4e2fa0def1672638668e298eab3228c3f8..65faf6687413a223828be10d55f3c8f8
document->statePopped(stateObject ? stateObject.releaseNonNull() : SerializedScriptValue::nullValue());
m_client->dispatchDidPopStateWithinPage();
-@@ -1879,6 +1880,7 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
+@@ -1902,6 +1903,7 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
const String& httpMethod = loader->request().httpMethod();
if (shouldPerformFragmentNavigation(isFormSubmission, httpMethod, policyChecker().loadType(), newURL)) {
@@ -5179,17 +4871,17 @@ index 65040a4e2fa0def1672638668e298eab3228c3f8..65faf6687413a223828be10d55f3c8f8
RefPtr oldDocumentLoader = m_documentLoader;
NavigationAction action { frame->protectedDocument().releaseNonNull(), loader->request(), InitiatedByMainFrame::Unknown, loader->isRequestFromClientOrUserInput(), policyChecker().loadType(), isFormSubmission };
-@@ -1917,7 +1919,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
+@@ -1940,7 +1942,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
auto policyDecisionMode = loader->triggeringAction().isFromNavigationAPI() ? PolicyDecisionMode::Synchronous : PolicyDecisionMode::Asynchronous;
RELEASE_ASSERT(!isBackForwardLoadType(policyChecker().loadType()) || history().provisionalItem());
+ InspectorInstrumentation::willCheckNavigationPolicy(m_frame);
- policyChecker().checkNavigationPolicy(ResourceRequest(loader->request()), ResourceResponse { } /* redirectResponse */, loader, WTFMove(formState), [this, protectedThis = Ref { *this }, allowNavigationToInvalidURL, completionHandler = completionHandlerCaller.release()] (const ResourceRequest& request, WeakPtr<FormState>&& weakFormState, NavigationPolicyDecision navigationPolicyDecision) mutable {
+ policyChecker().checkNavigationPolicy(ResourceRequest(loader->request()), ResourceResponse { } /* redirectResponse */, loader, WTFMove(formSubmission), [this, protectedThis = Ref { *this }, allowNavigationToInvalidURL, completionHandler = completionHandlerCaller.release()] (const ResourceRequest& request, WeakPtr<const FormSubmission>&& weakFormSubmission, NavigationPolicyDecision navigationPolicyDecision) mutable {
+ InspectorInstrumentation::didCheckNavigationPolicy(m_frame, navigationPolicyDecision != NavigationPolicyDecision::ContinueLoad);
- continueLoadAfterNavigationPolicy(request, RefPtr { weakFormState.get() }.get(), navigationPolicyDecision, allowNavigationToInvalidURL);
+ continueLoadAfterNavigationPolicy(request, RefPtr { weakFormSubmission.get() }.get(), navigationPolicyDecision, allowNavigationToInvalidURL);
completionHandler();
- }, policyDecisionMode);
-@@ -3255,10 +3259,15 @@ String FrameLoader::userAgent(const URL& url) const
+ }, policyDecisionMode, determineNavigationType(type, NavigationHistoryBehavior::Auto));
+@@ -3278,10 +3282,15 @@ String FrameLoader::userAgent(const URL& url) const
String FrameLoader::navigatorPlatform() const
{
@@ -5207,7 +4899,7 @@ index 65040a4e2fa0def1672638668e298eab3228c3f8..65faf6687413a223828be10d55f3c8f8
}
void FrameLoader::dispatchOnloadEvents()
-@@ -3719,6 +3728,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error, LoadWill
+@@ -3743,6 +3752,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error, LoadWill
checkCompleted();
if (frame->page())
checkLoadComplete(loadWillContinueInAnotherProcess);
@@ -5216,7 +4908,7 @@ index 65040a4e2fa0def1672638668e298eab3228c3f8..65faf6687413a223828be10d55f3c8f8
}
void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, const SecurityOrigin* requesterOrigin, bool shouldContinue, NavigationHistoryBehavior historyHandling)
-@@ -4668,9 +4679,6 @@ String FrameLoader::referrer() const
+@@ -4695,9 +4706,6 @@ String FrameLoader::referrer() const
void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
{
@@ -5226,7 +4918,7 @@ index 65040a4e2fa0def1672638668e298eab3228c3f8..65faf6687413a223828be10d55f3c8f8
Vector<Ref<DOMWrapperWorld>> worlds;
ScriptController::getAllWorlds(worlds);
for (auto& world : worlds)
-@@ -4680,13 +4688,12 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
+@@ -4707,13 +4715,12 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world)
{
Ref frame = m_frame.get();
@@ -5247,7 +4939,7 @@ index 65040a4e2fa0def1672638668e298eab3228c3f8..65faf6687413a223828be10d55f3c8f8
InspectorInstrumentation::didClearWindowObjectInWorld(frame, world);
}
diff --git a/Source/WebCore/loader/LoaderStrategy.h b/Source/WebCore/loader/LoaderStrategy.h
-index 2ab5e8426274fcf96f6ea97ca816a4e166876ed1..291f5a495d4f3af67a766d7f51e18e4e9c399cc5 100644
+index 6ed1b1210c605fa0670622c42f043d61d1d37e77..7622ed46da39966706d17863cbf8aa52fecd1246 100644
--- a/Source/WebCore/loader/LoaderStrategy.h
+++ b/Source/WebCore/loader/LoaderStrategy.h
@@ -89,6 +89,7 @@ public:
@@ -5281,10 +4973,10 @@ index 48105098fe5559ba6a668df6e10391b70327c9c6..b8ee8e094a9b8f383379f364e586cdaa
}
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
-index 6d78143371282d29ade0ae86f54bdec1e495cb39..a6cdf8022abd836425c1224cac5602bc92ef7235 100644
+index 5b5119235f88f5d5819d2ab4827b7bb20fccb77f..cb3f4385c645aef4659b8e1330f21c58037b2a71 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
-@@ -1121,8 +1121,11 @@ ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requ
+@@ -1134,8 +1134,11 @@ ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requ
request.updateReferrerPolicy(document ? document->referrerPolicy() : ReferrerPolicy::Default);
@@ -5298,7 +4990,7 @@ index 6d78143371282d29ade0ae86f54bdec1e495cb39..a6cdf8022abd836425c1224cac5602bc
if (RefPtr documentLoader = m_documentLoader.get()) {
bool madeHTTPS { request.resourceRequest().wasSchemeOptimisticallyUpgraded() };
-@@ -1758,8 +1761,9 @@ Vector<Ref<SVGImage>> CachedResourceLoader::allCachedSVGImages() const
+@@ -1774,8 +1777,9 @@ Vector<Ref<SVGImage>> CachedResourceLoader::allCachedSVGImages() const
ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::preload(CachedResource::Type type, CachedResourceRequest&& request)
{
@@ -5311,10 +5003,10 @@ index 6d78143371282d29ade0ae86f54bdec1e495cb39..a6cdf8022abd836425c1224cac5602bc
RefPtr document = m_document.get();
ASSERT(document);
diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h
-index 29f97b1ce6fe791d79f7e0551ff28177bb777843..4ccd94a3bc1c6f0eec47a32297d16b6eaf85173f 100644
+index 81ff4871e3b9431d3f0142578cdd44770dc0f10a..4468041518a0f1670191ebcda5c0be457c728f62 100644
--- a/Source/WebCore/page/ChromeClient.h
+++ b/Source/WebCore/page/ChromeClient.h
-@@ -366,7 +366,7 @@ public:
+@@ -401,7 +401,7 @@ public:
#endif
#if ENABLE(ORIENTATION_EVENTS)
@@ -5324,10 +5016,10 @@ index 29f97b1ce6fe791d79f7e0551ff28177bb777843..4ccd94a3bc1c6f0eec47a32297d16b6e
virtual RefPtr<ColorChooser> createColorChooser(ColorChooserClient&, const Color&) = 0;
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
-index f4b2f2a8fa6fe7928cf264c2bd75bccc3ebce4f7..1d31e44020610fc76ed0bc8d1765b6942f54458e 100644
+index 41bded29a6b376a386fab5ca93241e6fa6a8b3b2..f207476cd37e911d0c0fc0450c6f46535cf7e581 100644
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
-@@ -4721,6 +4721,12 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr
+@@ -4733,6 +4733,12 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr
if (!document)
return false;
@@ -5340,7 +5032,7 @@ index f4b2f2a8fa6fe7928cf264c2bd75bccc3ebce4f7..1d31e44020610fc76ed0bc8d1765b694
dragState().dataTransfer = DataTransfer::createForDrag(*document);
auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No;
-@@ -5325,6 +5331,7 @@ static HitTestResult hitTestResultInFrame(LocalFrame* frame, const LayoutPoint&
+@@ -5337,6 +5343,7 @@ static HitTestResult hitTestResultInFrame(LocalFrame* frame, const LayoutPoint&
return result;
}
@@ -5348,7 +5040,7 @@ index f4b2f2a8fa6fe7928cf264c2bd75bccc3ebce4f7..1d31e44020610fc76ed0bc8d1765b694
Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
{
Ref frame = m_frame.get();
-@@ -5398,7 +5405,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+@@ -5410,7 +5417,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
// Increment the platform touch id by 1 to avoid storing a key of 0 in the hashmap.
unsigned touchPointTargetKey = point.id() + 1;
@@ -5357,7 +5049,7 @@ index f4b2f2a8fa6fe7928cf264c2bd75bccc3ebce4f7..1d31e44020610fc76ed0bc8d1765b694
bool pointerCancelled = false;
#endif
RefPtr<EventTarget> touchTarget;
-@@ -5445,7 +5452,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+@@ -5457,7 +5464,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
// we also remove it from the map.
touchTarget = m_originatingTouchPointTargets.take(touchPointTargetKey);
@@ -5366,7 +5058,7 @@ index f4b2f2a8fa6fe7928cf264c2bd75bccc3ebce4f7..1d31e44020610fc76ed0bc8d1765b694
HitTestResult result = hitTestResultAtPoint(pagePoint, hitType | HitTestRequest::Type::AllowChildFrameContent);
pointerTarget = result.targetElement();
pointerCancelled = (pointerTarget != touchTarget);
-@@ -5468,7 +5475,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+@@ -5482,7 +5489,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
if (!targetFrame)
continue;
@@ -5375,7 +5067,16 @@ index f4b2f2a8fa6fe7928cf264c2bd75bccc3ebce4f7..1d31e44020610fc76ed0bc8d1765b694
// 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) {
-@@ -5555,6 +5562,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+@@ -5496,7 +5503,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+ }
+ #endif
+
+-#if PLATFORM(WPE) || PLATFORM(GTK)
++#if !ENABLE(IOS_TOUCH_EVENTS)
+ // FIXME: Pass the touch delta for pointermove events by remembering the position per pointerID similar to
+ // Apple's m_touchLastGlobalPositionAndDeltaMap
+ document->protectedPage()->pointerCaptureController().dispatchEventForTouchAtIndex(
+@@ -5571,6 +5578,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
return swallowedEvent;
}
@@ -5384,10 +5085,10 @@ index f4b2f2a8fa6fe7928cf264c2bd75bccc3ebce4f7..1d31e44020610fc76ed0bc8d1765b694
#if ENABLE(TOUCH_EVENTS)
diff --git a/Source/WebCore/page/FocusController.cpp b/Source/WebCore/page/FocusController.cpp
-index 22583fed98df02646b25410c9d6528005350f37f..7222c97da3878e77960f47aac6f747a06157f059 100644
+index e02867ec6ec9958a3e7103d16556f7df730f2440..53b9cd6603660fa5d9ce446612eaeba38b2dcef1 100644
--- a/Source/WebCore/page/FocusController.cpp
+++ b/Source/WebCore/page/FocusController.cpp
-@@ -617,13 +617,14 @@ bool FocusController::relinquishFocusToChrome(FocusDirection direction)
+@@ -630,13 +630,14 @@ bool FocusController::relinquishFocusToChrome(FocusDirection direction)
return false;
Ref page = m_page.get();
@@ -5405,11 +5106,11 @@ index 22583fed98df02646b25410c9d6528005350f37f..7222c97da3878e77960f47aac6f747a0
}
diff --git a/Source/WebCore/page/FrameConsoleClient.cpp b/Source/WebCore/page/FrameConsoleClient.cpp
-index ec1ebf9ce1d2501bc8fb39772a9cbc24d562fac5..de5d867d6cea82ebf36385da5792a46367c4b1e6 100644
+index c2650f4fe59d3ba423ad7da1a4ba58e1f8c01c72..69d0c717f73dfb65b91cd577ccf74a48dfa1e882 100644
--- a/Source/WebCore/page/FrameConsoleClient.cpp
+++ b/Source/WebCore/page/FrameConsoleClient.cpp
-@@ -476,4 +476,12 @@ void FrameConsoleClient::screenshot(JSC::JSGlobalObject* lexicalGlobalObject, Re
- addMessage(makeUnique<Inspector::ConsoleMessage>(MessageSource::ConsoleAPI, MessageType::Image, MessageLevel::Log, dataURL, WTFMove(arguments), lexicalGlobalObject, 0, timestamp));
+@@ -471,4 +471,12 @@ void FrameConsoleClient::screenshot(JSC::JSGlobalObject* lexicalGlobalObject, Re
+ addMessage(makeUnique<Inspector::ConsoleMessage>(MessageSource::ConsoleAPI, MessageType::Image, MessageLevel::Log, dataURL, ScriptArguments::create(lexicalGlobalObject, WTFMove(adjustedArguments)), lexicalGlobalObject, /* requestIdentifier */ 0, timestamp));
}
+void FrameConsoleClient::bindingCalled(JSC::JSGlobalObject* globalObject, const String& name, const String& arg)
@@ -5434,10 +5135,10 @@ index 66c57501b719d3c58ab8d6f780d9e7e7b5df3745..0e31080ca92bf2095d592cbccb1838cf
WeakRef<LocalFrame> m_frame;
};
diff --git a/Source/WebCore/page/FrameSnapshotting.cpp b/Source/WebCore/page/FrameSnapshotting.cpp
-index c0f0a17079be7a5574c40fdbbdeeedd3a45ef078..b6480851049f40e9f64926dda0407bb4d3be97e7 100644
+index 87f9c7b340f96150c1472a47bc0908042b4241bb..c48304e6c4eba0b9e246b8f07a6f873b07667af8 100644
--- a/Source/WebCore/page/FrameSnapshotting.cpp
+++ b/Source/WebCore/page/FrameSnapshotting.cpp
-@@ -120,7 +120,7 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
+@@ -119,7 +119,7 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
// Other paint behaviors are set by paintContentsForSnapshot.
frame.view()->setPaintBehavior(paintBehavior);
@@ -5446,7 +5147,7 @@ index c0f0a17079be7a5574c40fdbbdeeedd3a45ef078..b6480851049f40e9f64926dda0407bb4
if (options.flags.contains(SnapshotFlags::PaintWith3xBaseScale))
scaleFactor = 3;
-@@ -139,6 +139,8 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
+@@ -138,6 +138,8 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
return nullptr;
buffer->context().translate(-imageRect.location());
@@ -5455,7 +5156,7 @@ index c0f0a17079be7a5574c40fdbbdeeedd3a45ef078..b6480851049f40e9f64926dda0407bb4
if (!clipRects.isEmpty()) {
Path clipPath;
-@@ -147,7 +149,10 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
+@@ -146,7 +148,10 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
buffer->context().clipPath(clipPath);
}
@@ -5480,10 +5181,10 @@ index 4935bfd9a6e43d59a101c153fa89a8484fcb49e2..8384f5b5db8e405f86e1201d144d92d7
struct SnapshotOptions {
diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp
-index 221c0273606e72f0b8c36e822a0115d3cd1e0add..a674c72ea49aefae98affd84331539f8a03a0049 100644
+index 96a08d5355dc7a8ba7c7becf7d9578081534dabf..584a68a408a14c0f034f5747bacca87f29a9fbe5 100644
--- a/Source/WebCore/page/History.cpp
+++ b/Source/WebCore/page/History.cpp
-@@ -32,6 +32,7 @@
+@@ -34,6 +34,7 @@
#include "FrameLoader.h"
#include "HistoryController.h"
#include "HistoryItem.h"
@@ -5491,7 +5192,7 @@ index 221c0273606e72f0b8c36e822a0115d3cd1e0add..a674c72ea49aefae98affd84331539f8
#include "LocalFrame.h"
#include "LocalFrameLoaderClient.h"
#include "Logging.h"
-@@ -310,6 +311,8 @@ ExceptionOr<void> History::stateObjectAdded(RefPtr<SerializedScriptValue>&& data
+@@ -312,6 +313,8 @@ ExceptionOr<void> History::stateObjectAdded(RefPtr<SerializedScriptValue>&& data
}
frame->loader().updateURLAndHistory(fullURL, WTFMove(data), historyBehavior);
@@ -5501,18 +5202,18 @@ index 221c0273606e72f0b8c36e822a0115d3cd1e0add..a674c72ea49aefae98affd84331539f8
}
diff --git a/Source/WebCore/page/LocalFrame.cpp b/Source/WebCore/page/LocalFrame.cpp
-index 225fa07a08763d986141eb5cc2fb3f8dd4c5598d..c99e75c04355479d97ace4f1e2c14955f585a2d1 100644
+index 8695417fdb85d3d9fcd575579faf096f301bee8a..ce3c228d06f2bd1f2df5f5ef1591fe41c5cf2671 100644
--- a/Source/WebCore/page/LocalFrame.cpp
+++ b/Source/WebCore/page/LocalFrame.cpp
-@@ -42,6 +42,7 @@
- #include "CachedResourceLoader.h"
+@@ -41,6 +41,7 @@
+ #include "CachedCSSStyleSheet.h"
#include "Chrome.h"
#include "ChromeClient.h"
+#include "ComposedTreeIterator.h"
#include "DiagnosticLoggingClient.h"
#include "DiagnosticLoggingKeys.h"
#include "DocumentLoader.h"
-@@ -62,6 +63,7 @@
+@@ -65,6 +66,7 @@
#include "FrameSelection.h"
#include "GraphicsContext.h"
#include "GraphicsLayer.h"
@@ -5520,7 +5221,7 @@ index 225fa07a08763d986141eb5cc2fb3f8dd4c5598d..c99e75c04355479d97ace4f1e2c14955
#include "HTMLAttachmentElement.h"
#include "HTMLFormControlElement.h"
#include "HTMLFormElement.h"
-@@ -84,6 +86,7 @@
+@@ -87,6 +89,7 @@
#include "Logging.h"
#include "Navigator.h"
#include "NodeList.h"
@@ -5528,7 +5229,7 @@ index 225fa07a08763d986141eb5cc2fb3f8dd4c5598d..c99e75c04355479d97ace4f1e2c14955
#include "NodeTraversal.h"
#include "Page.h"
#include "PaymentSession.h"
-@@ -216,6 +219,7 @@ LocalFrame::LocalFrame(Page& page, ClientCreator&& clientCreator, FrameIdentifie
+@@ -220,6 +223,7 @@ LocalFrame::LocalFrame(Page& page, ClientCreator&& clientCreator, FrameIdentifie
void LocalFrame::init()
{
@@ -5536,7 +5237,7 @@ index 225fa07a08763d986141eb5cc2fb3f8dd4c5598d..c99e75c04355479d97ace4f1e2c14955
loader().init();
}
-@@ -444,7 +448,7 @@ void LocalFrame::orientationChanged()
+@@ -450,7 +454,7 @@ void LocalFrame::orientationChanged()
IntDegrees LocalFrame::orientation() const
{
if (RefPtr page = this->page())
@@ -5545,8 +5246,8 @@ index 225fa07a08763d986141eb5cc2fb3f8dd4c5598d..c99e75c04355479d97ace4f1e2c14955
return 0;
}
#endif // ENABLE(ORIENTATION_EVENTS)
-@@ -1647,6 +1651,364 @@ Ref<FrameInspectorController> LocalFrame::protectedInspectorController()
- return m_inspectorController.get();
+@@ -1699,6 +1703,364 @@ String LocalFrame::frameURLProtocol() const
+ return ""_s;
}
+#if !PLATFORM(IOS_FAMILY)
@@ -5911,7 +5612,7 @@ index 225fa07a08763d986141eb5cc2fb3f8dd4c5598d..c99e75c04355479d97ace4f1e2c14955
#undef FRAME_RELEASE_LOG_ERROR
diff --git a/Source/WebCore/page/LocalFrame.h b/Source/WebCore/page/LocalFrame.h
-index f58a04b7d8d985e05cffa434f4ed4e12f7d80698..730c98188deeabc4c2da3e06ffcff4c1ae6db95e 100644
+index 359610beb3d6cfb793449126bb4e8f27e1c7ec25..355cdbb3baa599cb4510923588d855a9631bde3a 100644
--- a/Source/WebCore/page/LocalFrame.h
+++ b/Source/WebCore/page/LocalFrame.h
@@ -29,6 +29,7 @@
@@ -5932,7 +5633,7 @@ index f58a04b7d8d985e05cffa434f4ed4e12f7d80698..730c98188deeabc4c2da3e06ffcff4c1
class LocalFrame final : public Frame {
public:
-@@ -235,10 +236,6 @@ public:
+@@ -236,10 +237,6 @@ public:
WEBCORE_EXPORT DataDetectionResultsStorage& dataDetectionResults();
#endif
@@ -5943,7 +5644,7 @@ index f58a04b7d8d985e05cffa434f4ed4e12f7d80698..730c98188deeabc4c2da3e06ffcff4c1
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);
-@@ -246,6 +243,10 @@ public:
+@@ -247,6 +244,10 @@ public:
WEBCORE_EXPORT Node* nodeRespondingToScrollWheelEvents(const FloatPoint& viewportLocation);
WEBCORE_EXPORT Node* approximateNodeAtViewportLocationLegacy(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation);
@@ -5954,7 +5655,7 @@ index f58a04b7d8d985e05cffa434f4ed4e12f7d80698..730c98188deeabc4c2da3e06ffcff4c1
WEBCORE_EXPORT NSArray *wordsInCurrentParagraph() const;
WEBCORE_EXPORT CGRect renderRectForPoint(CGPoint, bool* isReplaced, float* fontSize) const;
-@@ -313,6 +314,7 @@ public:
+@@ -314,6 +315,7 @@ public:
WEBCORE_EXPORT FloatSize screenSize() const;
void setOverrideScreenSize(FloatSize&&);
@@ -5962,7 +5663,7 @@ index f58a04b7d8d985e05cffa434f4ed4e12f7d80698..730c98188deeabc4c2da3e06ffcff4c1
void selfOnlyRef();
void selfOnlyDeref();
-@@ -393,7 +395,6 @@ private:
+@@ -397,7 +399,6 @@ private:
#if ENABLE(DATA_DETECTION)
std::unique_ptr<DataDetectionResultsStorage> m_dataDetectionResults;
#endif
@@ -5970,7 +5671,7 @@ index f58a04b7d8d985e05cffa434f4ed4e12f7d80698..730c98188deeabc4c2da3e06ffcff4c1
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);
-@@ -401,6 +402,7 @@ private:
+@@ -405,6 +406,7 @@ private:
enum class ShouldFindRootEditableElement : bool { No, Yes };
Node* qualifyingNodeAtViewportLocation(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, const NodeQualifier&, ShouldApproximate, ShouldFindRootEditableElement = ShouldFindRootEditableElement::Yes);
@@ -5978,28 +5679,11 @@ index f58a04b7d8d985e05cffa434f4ed4e12f7d80698..730c98188deeabc4c2da3e06ffcff4c1
void setTimersPausedInternal(bool);
const UniqueRef<ViewportArguments> m_viewportArguments;
-diff --git a/Source/WebCore/page/Navigation.cpp b/Source/WebCore/page/Navigation.cpp
-index bcff12eb045a53365d90988679d4c4740f3489da..3a7800b80d16a8c0479a619e61ead5ff21e17b84 100644
---- a/Source/WebCore/page/Navigation.cpp
-+++ b/Source/WebCore/page/Navigation.cpp
-@@ -161,8 +161,10 @@ void Navigation::initializeForNewWindow(std::optional<NavigationNavigationType>
-
- m_currentEntryIndex = getEntryIndexOfHistoryItem(m_entries, *currentItem);
-
-- ASSERT(navigationType);
-- m_activation = NavigationActivation::create(*navigationType, *currentEntry(), WTFMove(previousEntry));
-+ if (m_currentEntryIndex) {
-+ ASSERT(navigationType);
-+ m_activation = NavigationActivation::create(*navigationType, *currentEntry(), WTFMove(previousEntry));
-+ }
-
- return;
- }
diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
-index 6f2b8ef8748bcf5a9a3f4abd30df2a2a8703f34b..78dc7bd99ffa49b43ce0a8009011af681c9bc556 100644
+index 1f52568a3824aeddd30db2e42effd41f3a117bc5..f0dbdaa384d968c652583345bea4063fba710136 100644
--- a/Source/WebCore/page/Page.cpp
+++ b/Source/WebCore/page/Page.cpp
-@@ -676,6 +676,45 @@ void Page::setOverrideViewportArguments(const std::optional<ViewportArguments>&
+@@ -686,6 +686,45 @@ void Page::setOverrideViewportArguments(const std::optional<ViewportArguments>&
localTopDocument->updateViewportArguments();
}
@@ -6045,7 +5729,7 @@ index 6f2b8ef8748bcf5a9a3f4abd30df2a2a8703f34b..78dc7bd99ffa49b43ce0a8009011af68
ScrollingCoordinator* Page::scrollingCoordinator()
{
if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) {
-@@ -4379,6 +4418,26 @@ void Page::setUseDarkAppearanceOverride(std::optional<bool> valueOverride)
+@@ -4440,6 +4479,26 @@ void Page::setUseDarkAppearanceOverride(std::optional<bool> valueOverride)
appearanceDidChange();
}
@@ -6073,10 +5757,10 @@ index 6f2b8ef8748bcf5a9a3f4abd30df2a2a8703f34b..78dc7bd99ffa49b43ce0a8009011af68
{
if (insets == m_fullscreenInsets)
diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
-index 4d3d400560b95af2f632f36597a0628d58911445..102f5efc2e43d668d703c0941d0cb7687c3b2d44 100644
+index 18087d6b43bc6da12bf9bb87c5747d3e3533cd25..1ca5fcdb4e873b059e0fd866c4716082e0003bc3 100644
--- a/Source/WebCore/page/Page.h
+++ b/Source/WebCore/page/Page.h
-@@ -407,6 +407,9 @@ public:
+@@ -406,6 +406,9 @@ public:
const ViewportArguments* overrideViewportArguments() const { return m_overrideViewportArguments.get(); }
WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional<ViewportArguments>&);
@@ -6086,7 +5770,7 @@ index 4d3d400560b95af2f632f36597a0628d58911445..102f5efc2e43d668d703c0941d0cb768
static void refreshPlugins(bool reload);
WEBCORE_EXPORT PluginData& pluginData();
WEBCORE_EXPORT Ref<PluginData> protectedPluginData();
-@@ -506,6 +509,10 @@ public:
+@@ -504,6 +507,10 @@ public:
#if ENABLE(DRAG_SUPPORT)
DragController& dragController() { return m_dragController.get(); }
const DragController& dragController() const { return m_dragController.get(); }
@@ -6097,7 +5781,7 @@ index 4d3d400560b95af2f632f36597a0628d58911445..102f5efc2e43d668d703c0941d0cb768
#endif
FocusController& focusController() const { return m_focusController; }
#if ENABLE(CONTEXT_MENUS)
-@@ -696,6 +703,10 @@ public:
+@@ -694,6 +701,10 @@ public:
WEBCORE_EXPORT void setUseColorAppearance(bool useDarkAppearance, bool useElevatedUserInterfaceLevel);
bool defaultUseDarkAppearance() const { return m_useDarkAppearance; }
void setUseDarkAppearanceOverride(std::optional<bool>);
@@ -6108,7 +5792,7 @@ index 4d3d400560b95af2f632f36597a0628d58911445..102f5efc2e43d668d703c0941d0cb768
#if ENABLE(TEXT_AUTOSIZING)
float textAutosizingWidth() const { return m_textAutosizingWidth; }
-@@ -1168,6 +1179,11 @@ public:
+@@ -1173,6 +1184,11 @@ public:
WEBCORE_EXPORT void setInteractionRegionsEnabled(bool);
#endif
@@ -6120,7 +5804,7 @@ index 4d3d400560b95af2f632f36597a0628d58911445..102f5efc2e43d668d703c0941d0cb768
#if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY)
DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); }
#endif
-@@ -1479,6 +1495,9 @@ private:
+@@ -1496,6 +1512,9 @@ private:
#if ENABLE(DRAG_SUPPORT)
const UniqueRef<DragController> m_dragController;
@@ -6130,7 +5814,7 @@ index 4d3d400560b95af2f632f36597a0628d58911445..102f5efc2e43d668d703c0941d0cb768
#endif
const UniqueRef<FocusController> m_focusController;
#if ENABLE(CONTEXT_MENUS)
-@@ -1557,6 +1576,8 @@ private:
+@@ -1574,6 +1593,8 @@ private:
bool m_useElevatedUserInterfaceLevel { false };
bool m_useDarkAppearance { false };
std::optional<bool> m_useDarkAppearanceOverride;
@@ -6139,7 +5823,7 @@ index 4d3d400560b95af2f632f36597a0628d58911445..102f5efc2e43d668d703c0941d0cb768
#if ENABLE(TEXT_AUTOSIZING)
float m_textAutosizingWidth { 0 };
-@@ -1735,6 +1756,11 @@ private:
+@@ -1756,6 +1777,11 @@ private:
#endif
std::unique_ptr<ViewportArguments> m_overrideViewportArguments;
@@ -6152,57 +5836,57 @@ index 4d3d400560b95af2f632f36597a0628d58911445..102f5efc2e43d668d703c0941d0cb768
#if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY)
RefPtr<DeviceOrientationUpdateProvider> m_deviceOrientationUpdateProvider;
diff --git a/Source/WebCore/page/PointerCaptureController.cpp b/Source/WebCore/page/PointerCaptureController.cpp
-index a4644c7a7a7f5bd55701972c4a8e716b82bde08f..5a0b18b5c842db0cfe63fd42ec402c27782ac5a0 100644
+index 986c7877f75d5e4307a563ffb3bb1e2e1f54d063..39f2672955af66f0bed6b619527289826a19cbcc 100644
--- a/Source/WebCore/page/PointerCaptureController.cpp
+++ b/Source/WebCore/page/PointerCaptureController.cpp
-@@ -207,7 +207,7 @@ bool PointerCaptureController::preventsCompatibilityMouseEventsForIdentifier(Poi
+@@ -209,7 +209,7 @@ bool PointerCaptureController::preventsCompatibilityMouseEventsForIdentifier(Poi
return capturingData && capturingData->preventsCompatibilityMouseEvents;
}
--#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE))
+-#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE) || PLATFORM(GTK))
+#if ENABLE(TOUCH_EVENTS)
static bool hierarchyHasCapturingEventListeners(Element* target, const AtomString& eventName)
{
for (RefPtr<ContainerNode> currentNode = target; currentNode; currentNode = currentNode->parentInComposedTree()) {
-@@ -557,7 +557,7 @@ void PointerCaptureController::cancelPointer(PointerID pointerId, const IntPoint
+@@ -565,7 +565,7 @@ void PointerCaptureController::cancelPointer(PointerID pointerId, const IntPoint
capturingData->pendingTargetOverride = nullptr;
capturingData->state = CapturingData::State::Cancelled;
--#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE))
+-#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE) || PLATFORM(GTK))
+#if ENABLE(TOUCH_EVENTS)
capturingData->previousTarget = nullptr;
#endif
diff --git a/Source/WebCore/page/PointerCaptureController.h b/Source/WebCore/page/PointerCaptureController.h
-index f893be35388e1fb933e369e616ebd6f4e55900a3..937be6100c16a1625f99f02efe2d6d14df1465a0 100644
+index a018d3ec3f7d0c507758227b1e9c17515e8c7e87..b25f12a2a8e6ede500dac6a3850b23c342e15299 100644
--- a/Source/WebCore/page/PointerCaptureController.h
+++ b/Source/WebCore/page/PointerCaptureController.h
@@ -63,7 +63,7 @@ public:
RefPtr<PointerEvent> pointerEventForMouseEvent(const MouseEvent&, PointerID, const String& pointerType);
--#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE))
+-#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE) || PLATFORM(GTK))
+#if ENABLE(TOUCH_EVENTS)
void dispatchEventForTouchAtIndex(EventTarget&, const PlatformTouchEvent&, unsigned, bool isPrimary, WindowProxy&, const DoublePoint&);
#endif
-@@ -84,12 +84,12 @@ private:
+@@ -87,12 +87,12 @@ private:
WeakPtr<Document, WeakPtrImplWithEventTargetData> activeDocument;
RefPtr<Element> pendingTargetOverride;
RefPtr<Element> targetOverride;
--#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE))
+-#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE) || PLATFORM(GTK))
+#if ENABLE(TOUCH_EVENTS)
RefPtr<Element> previousTarget;
#endif
bool hasAnyElement() const {
return pendingTargetOverride || targetOverride
--#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE))
+-#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE) || PLATFORM(GTK))
+#if ENABLE(TOUCH_EVENTS)
|| previousTarget
#endif
;
diff --git a/Source/WebCore/page/Screen.cpp b/Source/WebCore/page/Screen.cpp
-index cb7069099b5983761e38f7474e0a2a9dbdd8e127..eeef89846d28005372412f46ea04c7e087d978a6 100644
+index 2702535975b19ffef91752ee06db9a30b73eb10e..36629bd6d5c47a43d864514a090e8a4aa9019a7d 100644
--- a/Source/WebCore/page/Screen.cpp
+++ b/Source/WebCore/page/Screen.cpp
@@ -125,6 +125,9 @@ int Screen::availLeft() const
@@ -6246,10 +5930,10 @@ index cb7069099b5983761e38f7474e0a2a9dbdd8e127..eeef89846d28005372412f46ea04c7e0
}
diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
-index 4def6177eda669ebf2a48537afc25ed564e19108..b2cdbe97821585bc32fa4a6238c63552628445bd 100644
+index d4811f27153cddc0eae0a0ab638d5ec765e05b19..b13a1b20017e82ec4aae09d5d606d75def6882d6 100644
--- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
+++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
-@@ -353,6 +353,8 @@ template<typename Predicate, typename... Args>
+@@ -354,6 +354,8 @@ template<typename Predicate, typename... Args>
bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, Predicate&& predicate, Args&&... args) const
requires (!std::is_convertible_v<Predicate, ContentSecurityPolicy::ViolatedDirectiveCallback>)
{
@@ -6258,7 +5942,7 @@ index 4def6177eda669ebf2a48537afc25ed564e19108..b2cdbe97821585bc32fa4a6238c63552
bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly;
for (auto& policy : m_policies) {
if (policy->isReportOnly() != isReportOnly)
-@@ -366,6 +368,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
+@@ -367,6 +369,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
template<typename Predicate, typename... Args>
bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, ViolatedDirectiveCallback&& callback, Predicate&& predicate, Args&&... args) const
{
@@ -6267,7 +5951,7 @@ index 4def6177eda669ebf2a48537afc25ed564e19108..b2cdbe97821585bc32fa4a6238c63552
bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly;
bool isAllowed = true;
for (auto& policy : m_policies) {
-@@ -382,6 +386,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
+@@ -383,6 +387,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
template<typename Predicate, typename... Args>
bool ContentSecurityPolicy::allPoliciesAllow(NOESCAPE const ViolatedDirectiveCallback& callback, Predicate&& predicate, Args&&... args) const
{
@@ -6365,7 +6049,7 @@ index 0000000000000000000000000000000000000000..7bea08826a16de4774a55c81ccba0d81
+
+}
diff --git a/Source/WebCore/platform/DragData.h b/Source/WebCore/platform/DragData.h
-index c0dcbbb5f740871254f9bb1e0b56c638f2501cb1..5db61fd8ac5b1451e2bda863464c8e8251b68f64 100644
+index 261f2d839e1c9efc0991da46d30c42ecee00463e..d170e0e17e546d1bd01e274bfd65fa8f4d5c1bf3 100644
--- a/Source/WebCore/platform/DragData.h
+++ b/Source/WebCore/platform/DragData.h
@@ -93,8 +93,8 @@ public:
@@ -6379,7 +6063,7 @@ index c0dcbbb5f740871254f9bb1e0b56c638f2501cb1..5db61fd8ac5b1451e2bda863464c8e82
void getDragFileDescriptorData(int& size, String& pathname);
void getDragFileContentData(int size, void* dataBlob);
#endif
-@@ -144,7 +144,7 @@ private:
+@@ -147,7 +147,7 @@ private:
String m_pasteboardName;
#endif
#if PLATFORM(WIN)
@@ -6388,26 +6072,11 @@ index c0dcbbb5f740871254f9bb1e0b56c638f2501cb1..5db61fd8ac5b1451e2bda863464c8e82
#endif
bool m_disallowFileAccess { false };
};
-diff --git a/Source/WebCore/platform/GStreamer.cmake b/Source/WebCore/platform/GStreamer.cmake
-index 86f926e951590926d149a75f6a5aa166ea40db19..1cee66e548af766d6ec872545ae3fa33aaf355f1 100644
---- a/Source/WebCore/platform/GStreamer.cmake
-+++ b/Source/WebCore/platform/GStreamer.cmake
-@@ -1,6 +1,10 @@
- include(CheckCXXSymbolExists)
-
- if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
-+ list(APPEND WebCore_LIBRARIES
-+ GLib::GioUnix
-+ )
-+
- list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/Modules/mediastream/gstreamer"
- "${WEBCORE_DIR}/platform/graphics/gstreamer"
diff --git a/Source/WebCore/platform/Pasteboard.h b/Source/WebCore/platform/Pasteboard.h
-index 9c281b53044eb2f37ae814a772dd7f01a2b91e9f..05efee508f3ec4e91bf66c1142672d5fc574a81b 100644
+index 11cef75ac77ed181b76fac06229ba2eadd387e02..cc77e9aa4054e848f258526b41745363c903eeca 100644
--- a/Source/WebCore/platform/Pasteboard.h
+++ b/Source/WebCore/platform/Pasteboard.h
-@@ -313,6 +313,7 @@ public:
+@@ -322,6 +322,7 @@ public:
COMPtr<IDataObject> dataObject() const { return m_dataObject; }
WEBCORE_EXPORT void setExternalDataObject(IDataObject*);
const DragDataMap& dragDataMap() const { return m_dragDataMap; }
@@ -6415,7 +6084,7 @@ index 9c281b53044eb2f37ae814a772dd7f01a2b91e9f..05efee508f3ec4e91bf66c1142672d5f
void writeURLToWritableDataObject(const URL&, const String&);
COMPtr<WCDataObject> writableDataObject() const { return m_writableDataObject; }
void writeImageToDataObject(Element&, const URL&); // FIXME: Layering violation.
-@@ -383,6 +384,7 @@ private:
+@@ -393,6 +394,7 @@ private:
COMPtr<IDataObject> m_dataObject;
COMPtr<WCDataObject> m_writableDataObject;
DragDataMap m_dragDataMap;
@@ -6424,18 +6093,10 @@ index 9c281b53044eb2f37ae814a772dd7f01a2b91e9f..05efee508f3ec4e91bf66c1142672d5f
};
diff --git a/Source/WebCore/platform/PlatformKeyboardEvent.h b/Source/WebCore/platform/PlatformKeyboardEvent.h
-index 6af0b4f643ec3edd83122637c4e2abdf002ff7ba..fe927a0d5a208ee01fb67e2df235e5b757f8b52c 100644
+index d0d2eaee99fdd9e78fd62fac26ce59b227fca0d5..99b9dd7e2841cdf2f25a81c964adccc935836a49 100644
--- a/Source/WebCore/platform/PlatformKeyboardEvent.h
+++ b/Source/WebCore/platform/PlatformKeyboardEvent.h
-@@ -139,6 +139,7 @@ namespace WebCore {
- static String keyCodeForHardwareKeyCode(unsigned);
- static String keyIdentifierForGdkKeyCode(unsigned);
- static int windowsKeyCodeForGdkKeyCode(unsigned);
-+ static unsigned gdkKeyCodeForWindowsKeyCode(int);
- static String singleCharacterString(unsigned);
- #endif
-
-@@ -147,6 +148,7 @@ namespace WebCore {
+@@ -134,6 +134,7 @@ namespace WebCore {
static String keyCodeForHardwareKeyCode(unsigned);
static String keyIdentifierForWPEKeyCode(unsigned);
static int windowsKeyCodeForWPEKeyCode(unsigned);
@@ -6494,9 +6155,20 @@ index 4566e5537a36331a9b5bd75f7235f94d0d9d60d4..195cfe90a57fafb57dc6ff0cabd1fa15
#endif
diff --git a/Source/WebCore/platform/PlatformTouchEvent.h b/Source/WebCore/platform/PlatformTouchEvent.h
-index 23f011953c66f401553bedfaef3485af215ae083..a73da2ebe47f0d8dc57f3d0159e8f299abb61c96 100644
+index 23f011953c66f401553bedfaef3485af215ae083..6e6cfe1691b9684462c78d916ef4553f801c9991 100644
--- a/Source/WebCore/platform/PlatformTouchEvent.h
+++ b/Source/WebCore/platform/PlatformTouchEvent.h
+@@ -20,8 +20,8 @@
+ #ifndef PlatformTouchEvent_h
+ #define PlatformTouchEvent_h
+
+-#include "PlatformEvent.h"
+-#include "PlatformTouchPoint.h"
++#include <WebCore/PlatformEvent.h>
++#include <WebCore/PlatformTouchPoint.h>
+ #include <wtf/Vector.h>
+
+ #if ENABLE(TOUCH_EVENTS)
@@ -42,7 +42,7 @@ public:
const Vector<PlatformTouchEvent>& predictedEvents() const { return m_predictedEvents; }
@@ -6507,9 +6179,18 @@ index 23f011953c66f401553bedfaef3485af215ae083..a73da2ebe47f0d8dc57f3d0159e8f299
// TouchCancelled touchPoints subsequently
void setTouchPoints(Vector<PlatformTouchPoint>& touchPoints) { m_touchPoints = touchPoints; }
diff --git a/Source/WebCore/platform/PlatformTouchPoint.h b/Source/WebCore/platform/PlatformTouchPoint.h
-index 1e04806dbf9cfb27dda3e5d2c3c61aa66efd8ae6..93aa8e77e9ddd315587cf2c93620874a8eaa91a8 100644
+index 1e04806dbf9cfb27dda3e5d2c3c61aa66efd8ae6..f319930cc2c6dba499e35b58c59fa5fe99199864 100644
--- a/Source/WebCore/platform/PlatformTouchPoint.h
+++ b/Source/WebCore/platform/PlatformTouchPoint.h
+@@ -20,7 +20,7 @@
+ #ifndef PlatformTouchPoint_h
+ #define PlatformTouchPoint_h
+
+-#include "DoublePoint.h"
++#include <WebCore/DoublePoint.h>
+
+ #if ENABLE(TOUCH_EVENTS)
+
@@ -47,7 +47,7 @@ public:
{
}
@@ -6532,10 +6213,10 @@ index da490f391aa2e1876e792d66c08125e86e8a4719..eb8913849dd8934e4b2d60e9c18527ff
platform/graphics/skia/SkiaHarfBuzzFontCache.h
platform/graphics/skia/SkiaPaintingEngine.h
diff --git a/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp b/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp
-index 70667bd3d6ec5ace90c169df2783f1b8741de287..f81d431335e4e80321396edc81caaf55ecad1634 100644
+index 744f448415ba85819156bd0e575333ac23199f6e..e5d3d9382e8e9b033faa8f3c7168a47838286ff3 100644
--- a/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp
+++ b/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp
-@@ -47,7 +47,7 @@
+@@ -43,7 +43,7 @@
namespace WebCore {
@@ -6544,19 +6225,6 @@ index 70667bd3d6ec5ace90c169df2783f1b8741de287..f81d431335e4e80321396edc81caaf55
static const unsigned scrollbarBorderSize = 1;
static const unsigned thumbBorderSize = 1;
static const unsigned overlayThumbSize = 3;
-diff --git a/Source/WebCore/platform/graphics/ImageAdapter.h b/Source/WebCore/platform/graphics/ImageAdapter.h
-index ffb22298e8f9b336191b3250ff438c2a8de47dc6..a76a55c7ed8a59636ab0129a7af057d4411efed2 100644
---- a/Source/WebCore/platform/graphics/ImageAdapter.h
-+++ b/Source/WebCore/platform/graphics/ImageAdapter.h
-@@ -63,6 +63,8 @@ typedef struct HBITMAP__ *HBITMAP;
- #include <wtf/RetainPtr.h>
- #endif
-
-+#include "NativeImage.h"
-+
- namespace WebCore {
-
- class Image;
diff --git a/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h b/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h
index 5b659c763b9754b025a63f89522954cc39915b9a..448b50a2b131361a75d3f816cdcbb6a102551280 100644
--- a/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h
@@ -6629,302 +6297,40 @@ index 63d2978699a1ff636465def5191395a055e06c32..4c2cf5bd8a83f4ffe23920b77008008a
for (int i = 0; i < numItems; i++) {
// Determine the string for this item.
const char16_t* str = cp.data() + items[i].iCharPos;
-diff --git a/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp b/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
-index d1027a2cd6135a95ded90440d472a66e8ab339c8..6f34476d89a531d0be8447cad1e75f23dc5c82bf 100644
---- a/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
-+++ b/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
-@@ -37,8 +37,10 @@
- #include <gdk/gdk.h>
- #include <gdk/gdkkeysyms.h>
- #include <pal/text/TextEncoding.h>
+diff --git a/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp b/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp
+index 98d93889a1b97450fde21cee53e45111b622dca7..9362518e8351eb8fe5b30a2d7875417bb3da770d 100644
+--- a/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp
++++ b/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp
+@@ -121,7 +121,7 @@ bool screenSupportsExtendedColor(Widget*)
+ }
+
+ #if ENABLE(TOUCH_EVENTS)
+-bool screenHasTouchDevice()
++bool platformScreenHasTouchDevice()
+ {
+ return getScreenProperties().screenHasTouchDevice;
+ }
+diff --git a/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp b/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
+index 3bd964f3b0fd5531bba3981ed9c730accf806424..1a6419d30d433940a9f85b8db6d1c524945f86e7 100644
+--- a/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
++++ b/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
+@@ -30,9 +30,11 @@
+
+ #include "WindowsKeyboardCodes.h"
+ #include <wpe/wpe.h>
+#include <wtf/HashMap.h>
#include <wtf/HexNumber.h>
#include <wtf/text/MakeString.h>
+ #include <wtf/text/StringBuilder.h>
+#include <mutex>
namespace WebCore {
-@@ -1302,6 +1304,246 @@ int PlatformKeyboardEvent::windowsKeyCodeForGdkKeyCode(unsigned keycode)
-
+@@ -1303,6 +1305,246 @@ int PlatformKeyboardEvent::windowsKeyCodeForWPEKeyCode(unsigned keycode)
+ return 0;
}
-+static const UncheckedKeyHashMap<int, unsigned>& gdkToWindowsKeyCodeMap()
-+{
-+ static UncheckedKeyHashMap<int, unsigned>* result;
-+ static std::once_flag once;
-+ std::call_once(
-+ once,
-+ [] {
-+ const unsigned gdkKeyCodes[] = {
-+ GDK_KEY_Cancel,
-+ // FIXME: non-keypad keys should take precedence, so we skip GDK_KEY_KP_*
-+ // GDK_KEY_KP_0,
-+ // GDK_KEY_KP_1,
-+ // GDK_KEY_KP_2,
-+ // GDK_KEY_KP_3,
-+ // GDK_KEY_KP_4,
-+ // GDK_KEY_KP_5,
-+ // GDK_KEY_KP_6,
-+ // GDK_KEY_KP_7,
-+ // GDK_KEY_KP_8,
-+ // GDK_KEY_KP_9,
-+ // GDK_KEY_KP_Multiply,
-+ // GDK_KEY_KP_Add,
-+ // GDK_KEY_KP_Subtract,
-+ // GDK_KEY_KP_Decimal,
-+ // GDK_KEY_KP_Divide,
-+ // GDK_KEY_KP_Page_Up,
-+ // GDK_KEY_KP_Page_Down,
-+ // GDK_KEY_KP_End,
-+ // GDK_KEY_KP_Home,
-+ // GDK_KEY_KP_Left,
-+ // GDK_KEY_KP_Up,
-+ // GDK_KEY_KP_Right,
-+ // GDK_KEY_KP_Down,
-+ GDK_KEY_BackSpace,
-+ // GDK_KEY_ISO_Left_Tab,
-+ // GDK_KEY_3270_BackTab,
-+ GDK_KEY_Tab,
-+ GDK_KEY_Clear,
-+ // GDK_KEY_ISO_Enter,
-+ // GDK_KEY_KP_Enter,
-+ GDK_KEY_Return,
-+ GDK_KEY_Menu,
-+ GDK_KEY_Pause,
-+ GDK_KEY_AudioPause,
-+ GDK_KEY_Caps_Lock,
-+ GDK_KEY_Kana_Lock,
-+ GDK_KEY_Kana_Shift,
-+ GDK_KEY_Hangul,
-+ GDK_KEY_Hangul_Hanja,
-+ GDK_KEY_Kanji,
-+ GDK_KEY_Escape,
-+ GDK_KEY_space,
-+ GDK_KEY_Page_Up,
-+ GDK_KEY_Page_Down,
-+ GDK_KEY_End,
-+ GDK_KEY_Home,
-+ GDK_KEY_Left,
-+ GDK_KEY_Up,
-+ GDK_KEY_Right,
-+ GDK_KEY_Down,
-+ GDK_KEY_Select,
-+ GDK_KEY_Print,
-+ GDK_KEY_Execute,
-+ GDK_KEY_Insert,
-+ GDK_KEY_KP_Insert,
-+ GDK_KEY_Delete,
-+ GDK_KEY_KP_Delete,
-+ GDK_KEY_Help,
-+ GDK_KEY_0,
-+ GDK_KEY_parenright,
-+ GDK_KEY_1,
-+ GDK_KEY_exclam,
-+ GDK_KEY_2,
-+ GDK_KEY_at,
-+ GDK_KEY_3,
-+ GDK_KEY_numbersign,
-+ GDK_KEY_4,
-+ GDK_KEY_dollar,
-+ GDK_KEY_5,
-+ GDK_KEY_percent,
-+ GDK_KEY_6,
-+ GDK_KEY_asciicircum,
-+ GDK_KEY_7,
-+ GDK_KEY_ampersand,
-+ GDK_KEY_8,
-+ GDK_KEY_asterisk,
-+ GDK_KEY_9,
-+ GDK_KEY_parenleft,
-+ GDK_KEY_a,
-+ GDK_KEY_A,
-+ GDK_KEY_b,
-+ GDK_KEY_B,
-+ GDK_KEY_c,
-+ GDK_KEY_C,
-+ GDK_KEY_d,
-+ GDK_KEY_D,
-+ GDK_KEY_e,
-+ GDK_KEY_E,
-+ GDK_KEY_f,
-+ GDK_KEY_F,
-+ GDK_KEY_g,
-+ GDK_KEY_G,
-+ GDK_KEY_h,
-+ GDK_KEY_H,
-+ GDK_KEY_i,
-+ GDK_KEY_I,
-+ GDK_KEY_j,
-+ GDK_KEY_J,
-+ GDK_KEY_k,
-+ GDK_KEY_K,
-+ GDK_KEY_l,
-+ GDK_KEY_L,
-+ GDK_KEY_m,
-+ GDK_KEY_M,
-+ GDK_KEY_n,
-+ GDK_KEY_N,
-+ GDK_KEY_o,
-+ GDK_KEY_O,
-+ GDK_KEY_p,
-+ GDK_KEY_P,
-+ GDK_KEY_q,
-+ GDK_KEY_Q,
-+ GDK_KEY_r,
-+ GDK_KEY_R,
-+ GDK_KEY_s,
-+ GDK_KEY_S,
-+ GDK_KEY_t,
-+ GDK_KEY_T,
-+ GDK_KEY_u,
-+ GDK_KEY_U,
-+ GDK_KEY_v,
-+ GDK_KEY_V,
-+ GDK_KEY_w,
-+ GDK_KEY_W,
-+ GDK_KEY_x,
-+ GDK_KEY_X,
-+ GDK_KEY_y,
-+ GDK_KEY_Y,
-+ GDK_KEY_z,
-+ GDK_KEY_Z,
-+ GDK_KEY_Meta_L,
-+ GDK_KEY_Meta_R,
-+ GDK_KEY_Sleep,
-+ GDK_KEY_Num_Lock,
-+ GDK_KEY_Scroll_Lock,
-+ GDK_KEY_Shift_L,
-+ GDK_KEY_Shift_R,
-+ GDK_KEY_Control_L,
-+ GDK_KEY_Control_R,
-+ GDK_KEY_Alt_L,
-+ GDK_KEY_Alt_R,
-+ GDK_KEY_Back,
-+ GDK_KEY_Forward,
-+ GDK_KEY_Refresh,
-+ GDK_KEY_Stop,
-+ GDK_KEY_Search,
-+ GDK_KEY_Favorites,
-+ GDK_KEY_HomePage,
-+ GDK_KEY_AudioMute,
-+ GDK_KEY_AudioLowerVolume,
-+ GDK_KEY_AudioRaiseVolume,
-+ GDK_KEY_AudioNext,
-+ GDK_KEY_AudioPrev,
-+ GDK_KEY_AudioStop,
-+ GDK_KEY_AudioMedia,
-+ GDK_KEY_semicolon,
-+ GDK_KEY_colon,
-+ GDK_KEY_plus,
-+ GDK_KEY_equal,
-+ GDK_KEY_comma,
-+ GDK_KEY_less,
-+ GDK_KEY_minus,
-+ GDK_KEY_underscore,
-+ GDK_KEY_period,
-+ GDK_KEY_greater,
-+ GDK_KEY_slash,
-+ GDK_KEY_question,
-+ GDK_KEY_asciitilde,
-+ GDK_KEY_quoteleft,
-+ GDK_KEY_bracketleft,
-+ GDK_KEY_braceleft,
-+ GDK_KEY_backslash,
-+ GDK_KEY_bar,
-+ GDK_KEY_bracketright,
-+ GDK_KEY_braceright,
-+ GDK_KEY_quoteright,
-+ GDK_KEY_quotedbl,
-+ GDK_KEY_AudioRewind,
-+ GDK_KEY_AudioForward,
-+ GDK_KEY_AudioPlay,
-+ GDK_KEY_F1,
-+ GDK_KEY_F2,
-+ GDK_KEY_F3,
-+ GDK_KEY_F4,
-+ GDK_KEY_F5,
-+ GDK_KEY_F6,
-+ GDK_KEY_F7,
-+ GDK_KEY_F8,
-+ GDK_KEY_F9,
-+ GDK_KEY_F10,
-+ GDK_KEY_F11,
-+ GDK_KEY_F12,
-+ GDK_KEY_F13,
-+ GDK_KEY_F14,
-+ GDK_KEY_F15,
-+ GDK_KEY_F16,
-+ GDK_KEY_F17,
-+ GDK_KEY_F18,
-+ GDK_KEY_F19,
-+ GDK_KEY_F20,
-+ GDK_KEY_F21,
-+ GDK_KEY_F22,
-+ GDK_KEY_F23,
-+ GDK_KEY_F24,
-+ GDK_KEY_VoidSymbol,
-+ GDK_KEY_Red,
-+ GDK_KEY_Green,
-+ GDK_KEY_Yellow,
-+ GDK_KEY_Blue,
-+ GDK_KEY_PowerOff,
-+ GDK_KEY_AudioRecord,
-+ GDK_KEY_Display,
-+ GDK_KEY_Subtitle,
-+ GDK_KEY_Video
-+ };
-+ result = new UncheckedKeyHashMap<int, unsigned>();
-+ for (unsigned gdkKeyCode : gdkKeyCodes) {
-+ int winKeyCode = PlatformKeyboardEvent::windowsKeyCodeForGdkKeyCode(gdkKeyCode);
-+ // If several gdk key codes map to the same win key code first one is used.
-+ result->add(winKeyCode, gdkKeyCode);
-+ }
-+ });
-+ return *result;
-+}
-+
-+unsigned PlatformKeyboardEvent::gdkKeyCodeForWindowsKeyCode(int keycode)
-+{
-+ return gdkToWindowsKeyCodeMap().get(keycode);
-+}
-+
- String PlatformKeyboardEvent::singleCharacterString(unsigned val)
- {
- switch (val) {
-diff --git a/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp b/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp
-index 98d93889a1b97450fde21cee53e45111b622dca7..9362518e8351eb8fe5b30a2d7875417bb3da770d 100644
---- a/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp
-+++ b/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp
-@@ -121,7 +121,7 @@ bool screenSupportsExtendedColor(Widget*)
- }
-
- #if ENABLE(TOUCH_EVENTS)
--bool screenHasTouchDevice()
-+bool platformScreenHasTouchDevice()
- {
- return getScreenProperties().screenHasTouchDevice;
- }
-diff --git a/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp b/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
-index 3bd964f3b0fd5531bba3981ed9c730accf806424..1a6419d30d433940a9f85b8db6d1c524945f86e7 100644
---- a/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
-+++ b/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
-@@ -30,9 +30,11 @@
-
- #include "WindowsKeyboardCodes.h"
- #include <wpe/wpe.h>
-+#include <wtf/HashMap.h>
- #include <wtf/HexNumber.h>
- #include <wtf/text/MakeString.h>
- #include <wtf/text/StringBuilder.h>
-+#include <mutex>
-
- namespace WebCore {
-
-@@ -1303,6 +1305,246 @@ int PlatformKeyboardEvent::windowsKeyCodeForWPEKeyCode(unsigned keycode)
- return 0;
- }
-
-+static const UncheckedKeyHashMap<int, unsigned>& WPEToWindowsKeyCodeMap()
++static const UncheckedKeyHashMap<int, unsigned>& WPEToWindowsKeyCodeMap()
+{
+ static UncheckedKeyHashMap<int, unsigned>* result;
+ static std::once_flag once;
@@ -7276,7 +6682,7 @@ index e47f5bade7c0a27e8a27f8dc95b51174f025b4a6..016efe9bc0898bb648a33973e771b49e
Vector<String> PlatformPasteboard::typesSafeForDOMToReadAndWrite(const String&) const
diff --git a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoDecoderFactory.cpp b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoDecoderFactory.cpp
-index 9dd62ba6c463d5d1e70bc8e9fe9b68bfbaa3cd96..b8a8186919b5c891289bc0b4bd839851e86809cc 100644
+index 9782359f77caad3e3ed3c75c0741fb47ae8925f9..b8a8186919b5c891289bc0b4bd839851e86809cc 100644
--- a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoDecoderFactory.cpp
+++ b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoDecoderFactory.cpp
@@ -41,6 +41,7 @@
@@ -7287,40 +6693,22 @@ index 9dd62ba6c463d5d1e70bc8e9fe9b68bfbaa3cd96..b8a8186919b5c891289bc0b4bd839851
#include <wtf/text/MakeString.h>
#include <wtf/text/WTFString.h>
-@@ -77,7 +78,7 @@ public:
- GstElement* makeElement(ASCIILiteral factoryName)
- {
- static Atomic<uint32_t> elementId;
-- auto name = makeString(Name(), "-dec-"_s, factoryName, "-"_s, elementId.exchangeAdd(1));
-+ auto name = makeString(unsafeSpan(Name()), "-dec-"_s, factoryName, "-"_s, elementId.exchangeAdd(1));
- return makeGStreamerElement(factoryName, name);
+diff --git a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoEncoderFactory.cpp b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoEncoderFactory.cpp
+index 895127ff387ac367838afa20cfeda7fadb2e660c..41a7bfe085c5540f477189d9eff9e1ba1cd066b9 100644
+--- a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoEncoderFactory.cpp
++++ b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoEncoderFactory.cpp
+@@ -60,9 +60,8 @@ public:
+ return webrtc::make_ref_counted<GStreamerEncodedImageBuffer>(data);
}
-diff --git a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoFrameLibWebRTC.cpp b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoFrameLibWebRTC.cpp
-index a629b8b54577cb26b3a89966991deef85c405163..b7b3ca8c854b516e6707c31f8f7b7d96162ba688 100644
---- a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoFrameLibWebRTC.cpp
-+++ b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoFrameLibWebRTC.cpp
-@@ -23,6 +23,8 @@
-
- #include <gst/video/video-format.h>
- #include <gst/video/video-info.h>
-+#include <wtf/glib/GUniquePtr.h>
-+#include <wtf/MediaTime.h>
- #include <thread>
- #include <wtf/MediaTime.h>
- #include <wtf/glib/GUniquePtr.h>
-diff --git a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/RealtimeOutgoingAudioSourceLibWebRTC.h b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/RealtimeOutgoingAudioSourceLibWebRTC.h
-index 95d0e3412831763a80c0c2337e84c29cdc849e71..58d5685a9ae1083b96e687a249d96c5c5be827db 100644
---- a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/RealtimeOutgoingAudioSourceLibWebRTC.h
-+++ b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/RealtimeOutgoingAudioSourceLibWebRTC.h
-@@ -27,6 +27,7 @@
- #include <gst/audio/audio.h>
- #include <wtf/CheckedRef.h>
- #include <wtf/Lock.h>
-+#include <wtf/MediaTime.h>
- #include <wtf/TZoneMalloc.h>
- #include <wtf/glib/GUniquePtr.h>
+- const uint8_t* data() const final { return m_data.data(); }
+- uint8_t* data() final { return const_cast<uint8_t*>(m_data.data()); }
+- size_t size() const final { return m_data.size_bytes(); }
++ const uint8_t* data() const override { return m_data.data(); }
++ size_t size() const override { return m_data.size_bytes(); }
+ protected:
+ GStreamerEncodedImageBuffer(std::span<const uint8_t> data)
diff --git a/Source/WebCore/platform/network/HTTPHeaderMap.cpp b/Source/WebCore/platform/network/HTTPHeaderMap.cpp
index 1178c8fb001994bc9e6166376a367d9bc148913c..fcc6534568cad6b42a819a435f84ba2b9baae6f8 100644
--- a/Source/WebCore/platform/network/HTTPHeaderMap.cpp
@@ -7339,10 +6727,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 c250e3716214d4ce040cf956672902d9a204bb36..085998000445d48a8c3dd9fbac3f1c1876f61978 100644
+index 0708ea1a644e2dea797a284a2f7d46ec47620451..ff69e387c3dd246cd93e45c49e1d461dd0f3bbdb 100644
--- a/Source/WebCore/platform/network/NetworkStorageSession.h
+++ b/Source/WebCore/platform/network/NetworkStorageSession.h
-@@ -200,6 +200,7 @@ public:
+@@ -201,6 +201,7 @@ public:
NetworkingContext* context() const;
#endif
@@ -7391,10 +6779,10 @@ index ff4b0aa51b104f1f71246e223553458012b5ab4e..fc58265466d7177ad25cfde1aa664dfe
*source,
*type,
diff --git a/Source/WebCore/platform/network/ResourceResponseBase.h b/Source/WebCore/platform/network/ResourceResponseBase.h
-index 5bbde70653944b02f8dfe6030e74696cdd53b4de..37fce47686d2956f625ff33338ef3b3b53a084d3 100644
+index 8fa7524fba38b22ac5ad8a7d8d64c54d9d792746..58c7cdd1d14f01c075ac15271ad84740b3a0e055 100644
--- a/Source/WebCore/platform/network/ResourceResponseBase.h
+++ b/Source/WebCore/platform/network/ResourceResponseBase.h
-@@ -263,6 +263,11 @@ protected:
+@@ -265,6 +265,11 @@ protected:
String m_httpStatusText;
String m_httpVersion;
HTTPHeaderMap m_httpHeaderFields;
@@ -7406,7 +6794,7 @@ index 5bbde70653944b02f8dfe6030e74696cdd53b4de..37fce47686d2956f625ff33338ef3b3b
Box<NetworkLoadMetrics> m_networkLoadMetrics;
mutable std::optional<CertificateInfo> m_certificateInfo;
-@@ -306,7 +311,7 @@ struct ResourceResponseData {
+@@ -308,7 +313,7 @@ struct ResourceResponseData {
ResourceResponseData() = default;
ResourceResponseData(ResourceResponseData&&) = default;
ResourceResponseData& operator=(ResourceResponseData&&) = default;
@@ -7415,7 +6803,7 @@ index 5bbde70653944b02f8dfe6030e74696cdd53b4de..37fce47686d2956f625ff33338ef3b3b
: url(WTFMove(url))
, mimeType(WTFMove(mimeType))
, expectedContentLength(expectedContentLength)
-@@ -315,6 +320,7 @@ struct ResourceResponseData {
+@@ -317,6 +322,7 @@ struct ResourceResponseData {
, httpStatusText(WTFMove(httpStatusText))
, httpVersion(WTFMove(httpVersion))
, httpHeaderFields(WTFMove(httpHeaderFields))
@@ -7423,7 +6811,7 @@ index 5bbde70653944b02f8dfe6030e74696cdd53b4de..37fce47686d2956f625ff33338ef3b3b
, networkLoadMetrics(WTFMove(networkLoadMetrics))
, source(source)
, type(type)
-@@ -339,6 +345,7 @@ struct ResourceResponseData {
+@@ -341,6 +347,7 @@ struct ResourceResponseData {
String httpStatusText;
String httpVersion;
HTTPHeaderMap httpHeaderFields;
@@ -7432,10 +6820,10 @@ index 5bbde70653944b02f8dfe6030e74696cdd53b4de..37fce47686d2956f625ff33338ef3b3b
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 f10d0326535f351b4a1c37d90d73e24585c86a14..6ee029953d785ee6272a8363a5c19d364384dda6 100644
+index 36b9854bdd1198290dcc133b1d97e8231b5d2be1..8389d6f2fcbd4f384ec0f5d7ef111b971d5b43de 100644
--- a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
+++ b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
-@@ -576,6 +576,28 @@ bool NetworkStorageSession::setCookieFromDOM(const URL& firstParty, const SameSi
+@@ -581,6 +581,27 @@ bool NetworkStorageSession::setCookieFromDOM(const URL& firstParty, const SameSi
return false;
}
@@ -7452,20 +6840,19 @@ index f10d0326535f351b4a1c37d90d73e24585c86a14..6ee029953d785ee6272a8363a5c19d36
+ NSArray<NSHTTPCookie*>* parsedCookies = [NSHTTPCookie cookiesWithResponseHeaderFields:headers forURL:url.createNSURL().get()];
+ [cookies addObject:parsedCookies[0]];
+ }
-+ NSURL *cookieURL = url.createNSURL().get();
+#if ENABLE(OPT_IN_PARTITIONED_COOKIES) && defined(CFN_COOKIE_ACCEPTS_POLICY_PARTITION) && CFN_COOKIE_ACCEPTS_POLICY_PARTITION
+ String partitionKey = isOptInCookiePartitioningEnabled() ? cookiePartitionIdentifier(firstParty) : String { };
+#else
+ String partitionKey;
+#endif
-+ setHTTPCookiesForURL(cookieStorage().get(), cookies, cookieURL, firstParty.createNSURL().get(), nsStringNilIfEmpty(partitionKey), sameSiteInfo, thirdPartyCookieBlockingDecision);
++ setHTTPCookiesForURL(cookieStorage().get(), cookies, url.createNSURL().get(), firstParty.createNSURL().get(), nsStringNilIfEmpty(partitionKey).get(), sameSiteInfo, thirdPartyCookieBlockingDecision);
+}
+
static NSHTTPCookieAcceptPolicy httpCookieAcceptPolicy(CFHTTPCookieStorageRef cookieStorage)
{
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
diff --git a/Source/WebCore/platform/network/curl/CookieJarDB.h b/Source/WebCore/platform/network/curl/CookieJarDB.h
-index 37e129136c69b27d509acc01f10be42a8a1fe35a..9df0babc8f82372925fddf2211a7c8c908f3bb18 100644
+index 96e0a63b347c170c963bc7e851f383b91665c5c8..2f0afc26bcc87e9440e201728778892b3fe35543 100644
--- a/Source/WebCore/platform/network/curl/CookieJarDB.h
+++ b/Source/WebCore/platform/network/curl/CookieJarDB.h
@@ -73,7 +73,7 @@ public:
@@ -7495,10 +6882,10 @@ index a765e8f33e07b492c5db681bdb8d0a1b560f3a89..aeecd7d3e5f2b22b039c377178ce93b2
{
switch (cookieDatabase().acceptPolicy()) {
diff --git a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
-index bcde277ededa3deeff602a8dede32d35c918b388..83ca088c2f7cdaed08d62f8450e63ef1d341d359 100644
+index f913d41de9dc40582c45d62145aef4f55184a9ac..59c9b7041b2e1ad36d7b92e2ccc56ab3bcc690f7 100644
--- a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
+++ b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
-@@ -553,6 +553,26 @@ void NetworkStorageSession::replaceCookies(const Vector<Cookie>& cookies)
+@@ -531,6 +531,26 @@ void NetworkStorageSession::replaceCookies(const Vector<Cookie>& cookies)
g_signal_emit(jar, signalId, 0, nullptr, nullptr);
}
@@ -7526,10 +6913,10 @@ index bcde277ededa3deeff602a8dede32d35c918b388..83ca088c2f7cdaed08d62f8450e63ef1
{
GUniquePtr<SoupCookie> targetCookie(cookie.toSoupCookie());
diff --git a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp b/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
-index d78fc19ce5b5318256e9cb15dfea650fd29a3bb6..4256c020089b5e26886b680d945b695ce3a3bfc7 100644
+index 8e6023c5f1200884723bd0871bf602ba4a37ad04..582365cfb1c9a109308d0133922ee4d2bc0ae7db 100644
--- a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
+++ b/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
-@@ -40,6 +40,7 @@
+@@ -39,6 +39,7 @@
#include <wtf/text/StringBuilder.h>
#include <wtf/text/win/WCharStringExtras.h>
#include <wtf/unicode/CharacterNames.h>
@@ -7537,7 +6924,7 @@ index d78fc19ce5b5318256e9cb15dfea650fd29a3bb6..4256c020089b5e26886b680d945b695c
namespace WebCore {
-@@ -691,7 +692,10 @@ template<typename T> void getStringData(IDataObject* data, FORMATETC* format, Ve
+@@ -690,7 +691,10 @@ template<typename T> void getStringData(IDataObject* data, FORMATETC* format, Ve
STGMEDIUM store;
if (FAILED(data->GetData(format, &store)))
return;
@@ -7590,15 +6977,15 @@ index 0379437d84807e4a8d3846afac5ec8a70e743e70..5b0461bf12535d4900ffaddc2a878262
if (!m_dragDataMap.isEmpty() || !m_platformDragData)
return m_dragDataMap;
diff --git a/Source/WebCore/platform/win/KeyEventWin.cpp b/Source/WebCore/platform/win/KeyEventWin.cpp
-index 90898196cd9077ceffa78cd00b024c917ce46e09..956d676a4bc32b682004c9662dba61b1c95fb188 100644
+index f6c0cc49e9c39686bb5a5b36c29762173f2b4d1f..f396b564ee4aa7203d1728ff8460837337e31fdd 100644
--- a/Source/WebCore/platform/win/KeyEventWin.cpp
+++ b/Source/WebCore/platform/win/KeyEventWin.cpp
-@@ -243,10 +243,16 @@ PlatformKeyboardEvent::PlatformKeyboardEvent(HWND, WPARAM code, LPARAM keyData,
- {
- }
+@@ -41,10 +41,16 @@ namespace WebCore {
+
+ static const unsigned short HIGH_BIT_MASK_SHORT = 0x8000;
-void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type, bool)
-+void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type, bool backwardsCompatibility)
++void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type, bool)
{
- // No KeyDown events on Windows to disambiguate.
- ASSERT_NOT_REACHED();
@@ -7614,7 +7001,7 @@ index 90898196cd9077ceffa78cd00b024c917ce46e09..956d676a4bc32b682004c9662dba61b1
OptionSet<PlatformEvent::Modifier> PlatformKeyboardEvent::currentStateOfModifierKeys()
diff --git a/Source/WebCore/platform/win/PasteboardWin.cpp b/Source/WebCore/platform/win/PasteboardWin.cpp
-index aac283d800d41c5185e1de655b6cbe4693c827a6..5ced4f99b3481ab88d8de7c12d44730bddf513d3 100644
+index b493793408e0c5ea091d1269ce49671d0e826dab..1b02d5ce7995a567ffadc57dc137af5221526426 100644
--- a/Source/WebCore/platform/win/PasteboardWin.cpp
+++ b/Source/WebCore/platform/win/PasteboardWin.cpp
@@ -1144,7 +1144,21 @@ void Pasteboard::writeCustomData(const Vector<PasteboardCustomData>& data)
@@ -7666,10 +7053,10 @@ index aac283d800d41c5185e1de655b6cbe4693c827a6..5ced4f99b3481ab88d8de7c12d44730b
+
} // namespace WebCore
diff --git a/Source/WebCore/rendering/RenderTextControl.cpp b/Source/WebCore/rendering/RenderTextControl.cpp
-index f9d2a09bf46ab0f9ec829aa891fa7dc7a1177842..56e84e4dc60b71b45b8e8205311703509d9697c0 100644
+index 5d22a455aa69a0b4dae059ac03d8ff2fca416695..553c943267dc0b8b41b4970195911631d63f1f5b 100644
--- a/Source/WebCore/rendering/RenderTextControl.cpp
+++ b/Source/WebCore/rendering/RenderTextControl.cpp
-@@ -256,13 +256,13 @@ void RenderTextControl::layoutExcludedChildren(RelayoutChildren relayoutChildren
+@@ -251,13 +251,13 @@ void RenderTextControl::layoutExcludedChildren(RelayoutChildren relayoutChildren
}
}
@@ -7685,7 +7072,7 @@ index f9d2a09bf46ab0f9ec829aa891fa7dc7a1177842..56e84e4dc60b71b45b8e820531170350
{
if (auto innerTextElement = this->innerTextElement(); innerTextElement && innerTextElement->renderer())
diff --git a/Source/WebCore/rendering/RenderTextControl.h b/Source/WebCore/rendering/RenderTextControl.h
-index 5eba39f814e848db970d968ab42a482a9d1f0d3e..5a8dbd07b599daf3e6b5906ec677138531f996bf 100644
+index 94c56047c1173e10738ba43d506252b7ae5fa6b2..b0a0419a558168008dce23569446bfaad11513ae 100644
--- a/Source/WebCore/rendering/RenderTextControl.h
+++ b/Source/WebCore/rendering/RenderTextControl.h
@@ -39,8 +39,8 @@ public:
@@ -7699,18 +7086,18 @@ index 5eba39f814e848db970d968ab42a482a9d1f0d3e..5a8dbd07b599daf3e6b5906ec6771385
#endif
diff --git a/Source/WebCore/workers/WorkerConsoleClient.cpp b/Source/WebCore/workers/WorkerConsoleClient.cpp
-index a9e64a0a2aabebe6c150e959034e3a5aa41cc0b0..dfc1a928eb486f9021373fc4b49e7dabe921fbae 100644
+index a26df7a696aa30e47f5f647872f35a41c096c3b4..aac61e5f901eeaf4979810e56ed03095f686f232 100644
--- a/Source/WebCore/workers/WorkerConsoleClient.cpp
+++ b/Source/WebCore/workers/WorkerConsoleClient.cpp
-@@ -124,4 +124,6 @@ void WorkerConsoleClient::recordEnd(JSC::JSGlobalObject*, Ref<ScriptArguments>&&
- // FIXME: <https://webkit.org/b/243361> Web Inspector: support console screenshots in a Worker
- void WorkerConsoleClient::screenshot(JSC::JSGlobalObject*, Ref<ScriptArguments>&&) { }
+@@ -253,4 +253,6 @@ Ref<WorkerOrWorkletGlobalScope> WorkerConsoleClient::protectedGlobalScope()
+ return m_globalScope.get();
+ }
+void WorkerConsoleClient::bindingCalled(JSC::JSGlobalObject*, const String&, const String&) { }
+
} // namespace WebCore
diff --git a/Source/WebCore/workers/WorkerConsoleClient.h b/Source/WebCore/workers/WorkerConsoleClient.h
-index 248649b615c7aed9b37cae14ab58152eb5ca34f1..85f3e2b7f5519822f53564a8c63b8bcb05de8594 100644
+index 8c872ab3be52ed96741795db7a7379851762d32f..40da72b82cf319dff7f89eb25751f9278062b827 100644
--- a/Source/WebCore/workers/WorkerConsoleClient.h
+++ b/Source/WebCore/workers/WorkerConsoleClient.h
@@ -58,6 +58,7 @@ private:
@@ -7719,10 +7106,10 @@ index 248649b615c7aed9b37cae14ab58152eb5ca34f1..85f3e2b7f5519822f53564a8c63b8bcb
void screenshot(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
+ void bindingCalled(JSC::JSGlobalObject*, const String& name, const String& arg) override;
- WeakRef<WorkerOrWorkletGlobalScope> m_globalScope;
- };
+ Ref<WorkerOrWorkletGlobalScope> protectedGlobalScope();
+
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
-index 23c28e80ad53d469daf5c91c4c8bf684b532984a..124541dcc16a7c6028363a7ed611eb5c3509d76a 100644
+index 25c84e8b2c7bacca1426fdfd5b625d47540ea07e..ad4b1846ce482d94cd2eb57c42bc28c6d9e72af0 100644
--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
@@ -98,6 +98,8 @@
@@ -7734,7 +7121,7 @@ index 23c28e80ad53d469daf5c91c4c8bf684b532984a..124541dcc16a7c6028363a7ed611eb5c
#endif
#if ENABLE(APPLE_PAY_REMOTE_UI)
-@@ -1264,6 +1266,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID)
+@@ -1287,6 +1289,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID)
storageSession->clearPageSpecificDataForResourceLoadStatistics(pageID);
}
@@ -7750,10 +7137,10 @@ index 23c28e80ad53d469daf5c91c4c8bf684b532984a..124541dcc16a7c6028363a7ed611eb5c
{
if (CheckedPtr storageSession = m_networkProcess->storageSession(m_sessionID))
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
-index 4b7fe5bf71c5e3e1f63961259b8ad9d0a0834d34..3f1656764919c53b2d80067645ef7f19dc03c388 100644
+index 25c5e65773c6819be3b68173e4f1cef8e3869deb..f67ed1c639962e22d9ed87505b75eb7b530964ba 100644
--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
-@@ -386,6 +386,8 @@ private:
+@@ -399,6 +399,8 @@ private:
void clearPageSpecificData(WebCore::PageIdentifier);
@@ -7763,7 +7150,7 @@ index 4b7fe5bf71c5e3e1f63961259b8ad9d0a0834d34..3f1656764919c53b2d80067645ef7f19
void logUserInteraction(RegistrableDomain&&);
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
-index 4bdff7c2b3a30297db5474cbff918bbb21e9bfdf..9fc3e410dc6cb49447dafa13dfd5e0207bc9959f 100644
+index 6f43a9c68ee5c247184e327bdda83ce65df444f5..b34971ca9e296106dda574f165c4f28d157ecdc6 100644
--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
@@ -83,6 +83,8 @@ messages -> NetworkConnectionToWebProcess WantsDispatchMessage {
@@ -7776,7 +7163,7 @@ index 4bdff7c2b3a30297db5474cbff918bbb21e9bfdf..9fc3e410dc6cb49447dafa13dfd5e020
LogUserInteraction(WebCore::RegistrableDomain domain)
ResourceLoadStatisticsUpdated(Vector<WebCore::ResourceLoadStatistics> statistics) -> ()
diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
-index 9b6ca02653e98895b9fcde7f9d39386b3afe01dc..b939bfbc41a0d0c06c25bf656f2c12840eb653e1 100644
+index 428292ed83ecacbab52d5b6408af5344c78acf06..7a5c0ace0a314eadf3299bdece46413549b58af8 100644
--- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
@@ -1136,6 +1136,14 @@ - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)data
@@ -7807,10 +7194,10 @@ index 6b03d650bc91f5d6f634e2d627d4745ba44e93ca..db97531e193720058d423324c09b3f22
handleCookieHeaders(request.resourceRequest(), receivedResponse);
diff --git a/Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in b/Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
-index 0f57c0d6cc2d0d494bc636625e85ba31210bef79..d8bbe4e4fc0a1faea7a9b8d47e800bf1d6637db2 100644
+index a65b25c05248a546c4e5f8cc7116e7c9f75877f0..35562a3e3560c98743fe5e7580398b628061d795 100644
--- a/Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
+++ b/Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
-@@ -452,9 +452,11 @@
+@@ -453,9 +453,11 @@
;; FIXME: This should be removed when <rdar://problem/10479685> is fixed.
;; Restrict AppSandboxed processes from creating /Library/Keychains, but allow access to the contents of /Library/Keychains:
@@ -7826,33 +7213,67 @@ index 0f57c0d6cc2d0d494bc636625e85ba31210bef79..d8bbe4e4fc0a1faea7a9b8d47e800bf1
;; 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 369be58defabbaa8e3ba2a4d2f422b99d49c07f1..9a02761ede19dc320218a10e500594443ba5e644 100644
+index e3d4922f91cd6d36a6e238b06fae4ffc89a4ba56..3d4b3f1976d049190fdf553c4463e33cb12b8be8 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)
- m_networkLoadMetrics.responseStart = MonotonicTime::now();
- #endif
+@@ -396,6 +396,8 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr<GInputStream>&& inputStream)
+ else
+ m_inputStream = WTFMove(inputStream);
+ auto& additionalMetrics = additionalNetworkLoadMetricsForWebInspector();
+ m_response.m_httpRequestHeaderFields = additionalMetrics.requestHeaders;
dispatchDidReceiveResponse();
}
+diff --git a/Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.cpp b/Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.cpp
+index 4881fbb66a9408432aa504bbc7502b0d4c74d635..16be794ecf35afefbac97cf558c8f9844a8d15a3 100644
+--- a/Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.cpp
++++ b/Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.cpp
+@@ -50,9 +50,10 @@
+ #else // PLATFORM(COCOA)
+
+ WTF_IGNORE_WARNINGS_IN_THIRD_PARTY_CODE_BEGIN
++#include <webrtc/api/environment/environment_factory.h>
+ #include <webrtc/rtc_base/async_packet_socket.h>
+ WTF_IGNORE_WARNINGS_IN_THIRD_PARTY_CODE_END
+-#endif // PLATFORM(COCOA)
++#endif // !PLATFORM(COCOA)
+
+ namespace WebKit {
+ using namespace WebCore;
+@@ -325,7 +326,7 @@ void NetworkRTCProvider::createUDPSocket(LibWebRTCSocketIdentifier identifier, c
+ {
+ assertIsRTCNetworkThread();
+
+- std::unique_ptr<webrtc::AsyncPacketSocket> socket(m_packetSocketFactory->CreateUdpSocket(address.rtcAddress(), minPort, maxPort));
++ std::unique_ptr<webrtc::AsyncPacketSocket> socket(m_packetSocketFactory->CreateUdpSocket(webrtc::CreateEnvironment(), address.rtcAddress(), minPort, maxPort));
+ createSocket(identifier, WTFMove(socket), Socket::Type::UDP, m_ipcConnection.copyRef());
+ }
+
+@@ -355,7 +356,7 @@ void NetworkRTCProvider::createClientTCPSocket(LibWebRTCSocketIdentifier identif
+
+ webrtc::PacketSocketTcpOptions tcpOptions;
+ tcpOptions.opts = options;
+- std::unique_ptr<webrtc::AsyncPacketSocket> socket(m_packetSocketFactory->CreateClientTcpSocket(localAddress, remoteAddress, tcpOptions));
++ std::unique_ptr<webrtc::AsyncPacketSocket> socket(m_packetSocketFactory->CreateClientTcpSocket(webrtc::CreateEnvironment(), localAddress, remoteAddress, tcpOptions));
+ createSocket(identifier, WTFMove(socket), Socket::Type::ClientTCP, m_ipcConnection.copyRef());
+ });
+ });
diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index 7a447e1614d0306bf648dc7d0aae254673e49ecb..b594feaa95f41889558baeadf4d464c0f33b35c8 100644
+index 6adf1ede60ded2a7e2d24b12be85b0cf1e264afa..2b6c5dd682faea86de2ea829f6779a38adf88b6b 100644
--- a/Source/WebKit/PlatformGTK.cmake
+++ b/Source/WebKit/PlatformGTK.cmake
-@@ -325,6 +325,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
+@@ -341,6 +341,9 @@ list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES
+ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
${GSTREAMER_INCLUDE_DIRS}
${GSTREAMER_PBUTILS_INCLUDE_DIRS}
- ${LIBSOUP_INCLUDE_DIRS}
+# Playwright begin
+ ${LIBVPX_INCLUDE_DIRS}
+# Playwright end
)
list(APPEND WebKit_INTERFACE_INCLUDE_DIRECTORIES
-@@ -368,6 +371,9 @@ if (USE_LIBWEBRTC)
+@@ -384,6 +387,9 @@ if (USE_LIBWEBRTC)
list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
"${THIRDPARTY_DIR}/libwebrtc/Source/"
"${THIRDPARTY_DIR}/libwebrtc/Source/webrtc"
@@ -7862,7 +7283,7 @@ index 7a447e1614d0306bf648dc7d0aae254673e49ecb..b594feaa95f41889558baeadf4d464c0
)
endif ()
-@@ -419,6 +425,12 @@ else ()
+@@ -435,6 +441,12 @@ else ()
set(WebKitGTK_ENUM_HEADER_TEMPLATE ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in)
endif ()
@@ -7876,10 +7297,10 @@ index 7a447e1614d0306bf648dc7d0aae254673e49ecb..b594feaa95f41889558baeadf4d464c0
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 e1043f03708269b7f1d5d07dbbbd3a047d1f15a6..eca0204c02c117a8c3c6831090236a5e0d9f2aad 100644
+index 1bf484dfa41f97dde28210bafa8d6808d8b8c18d..cfeab00a1f649cda9f28b77526fb427109dcdacc 100644
--- a/Source/WebKit/PlatformWPE.cmake
+++ b/Source/WebKit/PlatformWPE.cmake
-@@ -224,6 +224,7 @@ set(WPE_API_HEADER_TEMPLATES
+@@ -226,6 +226,7 @@ set(WPE_API_HEADER_TEMPLATES
${WEBKIT_DIR}/UIProcess/API/glib/WebKitWebsitePolicies.h.in
${WEBKIT_DIR}/UIProcess/API/glib/WebKitXRPermissionRequest.h.in
${WEBKIT_DIR}/UIProcess/API/glib/webkit.h.in
@@ -7887,16 +7308,15 @@ index e1043f03708269b7f1d5d07dbbbd3a047d1f15a6..eca0204c02c117a8c3c6831090236a5e
)
if (ENABLE_2022_GLIB_API)
-@@ -441,8 +442,17 @@ list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES
-
- list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
- ${LIBSOUP_INCLUDE_DIRS}
-+# Playwright begin
-+ "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/include"
-+# Playwright end
+@@ -455,6 +456,16 @@ list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES
+ "${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}/jsc"
)
+# Playwright begin
++list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
++ "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/include"
++)
++
+list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES
+ "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libwebm"
+)
@@ -7904,7 +7324,7 @@ index e1043f03708269b7f1d5d07dbbbd3a047d1f15a6..eca0204c02c117a8c3c6831090236a5e
+
list(APPEND WebKit_LIBRARIES
GLib::Module
- WPE::libwpe
+ Soup3::Soup3
diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
index 86a1febedca9fcbe7203db8cec94e8db1ef25a43..5817071222a03d57dd4d6afa550f47559a244d54 100644
--- a/Source/WebKit/PlatformWin.cmake
@@ -7985,7 +7405,7 @@ index f7e60f52af0df8081d3f223a21b10674e79c2542..e3cb79b52db7073122d78acabf03b2d1
} // namespace WebKit
diff --git a/Source/WebKit/Shared/NativeWebKeyboardEvent.h b/Source/WebKit/Shared/NativeWebKeyboardEvent.h
-index 60a6308dbbd3f9a09c82214dcd97f86dda9d2078..b33855b4c9284698155cc13ac1023bc9923d73a1 100644
+index 2b12d508987512d01c3b8dc708a4e6724814c634..461750cded70022b8f378d92c6dafeb4eb25c1ed 100644
--- a/Source/WebKit/Shared/NativeWebKeyboardEvent.h
+++ b/Source/WebKit/Shared/NativeWebKeyboardEvent.h
@@ -33,6 +33,7 @@
@@ -8037,7 +7457,7 @@ index 60a6308dbbd3f9a09c82214dcd97f86dda9d2078..b33855b4c9284698155cc13ac1023bc9
#if USE(APPKIT)
diff --git a/Source/WebKit/Shared/NativeWebMouseEvent.h b/Source/WebKit/Shared/NativeWebMouseEvent.h
-index 37f4fe60ee03fe314312417d3f550786d838f35f..d6388da22512fe1ef98fe33c79edc3ffc066b389 100644
+index 1b740b10a2db5df04771876ebb31b25d9c885c9b..54649116411c9927610d82fa21fa74601ea62b5e 100644
--- a/Source/WebKit/Shared/NativeWebMouseEvent.h
+++ b/Source/WebKit/Shared/NativeWebMouseEvent.h
@@ -87,6 +87,11 @@ public:
@@ -8053,24 +7473,26 @@ index 37f4fe60ee03fe314312417d3f550786d838f35f..d6388da22512fe1ef98fe33c79edc3ff
NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
#elif PLATFORM(GTK)
diff --git a/Source/WebKit/Shared/NativeWebWheelEvent.h b/Source/WebKit/Shared/NativeWebWheelEvent.h
-index f8e96218fd2671d1c0aca5e549efe0d8b94ef0f9..6cebd61bceb39c08e916fe991e4c3fc6f34b4704 100644
+index 29ac04187fdc501e1dfe948029fdd764d8d8442d..56c2758a60fc90b2ed90f4684477df754091b570 100644
--- a/Source/WebKit/Shared/NativeWebWheelEvent.h
+++ b/Source/WebKit/Shared/NativeWebWheelEvent.h
-@@ -74,7 +74,8 @@ public:
- #elif PLATFORM(WIN)
+@@ -76,6 +76,11 @@ public:
NativeWebWheelEvent(HWND, UINT message, WPARAM, LPARAM, float deviceScaleFactor);
#endif
--
+
++#if !USE(APPKIT)
+ NativeWebWheelEvent(const WebWheelEvent & webWheelEvent)
+ : WebWheelEvent(webWheelEvent) { }
++#endif
++
#if USE(APPKIT)
NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
#elif PLATFORM(GTK)
diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
-index 3cd24844ad5bec58aa2bdad353d861ead360170d..6678b4eb1e379ffea440a656c9b7be69e5cc4a27 100644
+index 6db8201887dcd57b0e629457e41071bc0d6af9eb..b92c4067e4b22116aa56a0bdc0bb8e5d1dc33d3c 100644
--- a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
+++ b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
-@@ -2838,6 +2838,9 @@ class WebCore::AuthenticationChallenge {
+@@ -2699,6 +2699,9 @@ class WebCore::AuthenticationChallenge {
class WebCore::DragData {
#if PLATFORM(COCOA)
String pasteboardName();
@@ -8080,7 +7502,7 @@ index 3cd24844ad5bec58aa2bdad353d861ead360170d..6678b4eb1e379ffea440a656c9b7be69
#endif
WebCore::IntPoint clientPosition();
WebCore::IntPoint globalPosition();
-@@ -3693,6 +3696,7 @@ enum class WebCore::WasPrivateRelayed : bool;
+@@ -3485,6 +3488,7 @@ enum class WebCore::WasPrivateRelayed : bool;
String httpStatusText;
String httpVersion;
WebCore::HTTPHeaderMap httpHeaderFields;
@@ -8171,7 +7593,7 @@ index 8040819bba9dcde87311aaafe7d8177d0e07281d..b20b2d56a90d1139b5e01942a3a18b20
{
}
diff --git a/Source/WebKit/Shared/WebKeyboardEvent.h b/Source/WebKit/Shared/WebKeyboardEvent.h
-index aacce0eda14902d8fe6cb2ca4bd9679737959a6f..cffe39a16c6ebbe64cad670059e4916728b134d1 100644
+index ce11155ce7a2c4e46e249cdd0e613bf2fad0e51f..6b64cd195819600dc81085d1bfdfbc6c393bd379 100644
--- a/Source/WebKit/Shared/WebKeyboardEvent.h
+++ b/Source/WebKit/Shared/WebKeyboardEvent.h
@@ -42,14 +42,18 @@ public:
@@ -8193,6 +7615,14 @@ index aacce0eda14902d8fe6cb2ca4bd9679737959a6f..cffe39a16c6ebbe64cad670059e49167
#endif
const String& text() const { return m_text; }
+@@ -93,6 +97,7 @@ public:
+ static String keyCodeStringForGdkKeycode(unsigned);
+ static String keyIdentifierForGdkKeyval(unsigned);
+ static int windowsKeyCodeForGdkKeyval(unsigned);
++ static unsigned gdkKeyCodeForWindowsKeyCode(int);
+ static String singleCharacterStringForGdkKeyval(unsigned);
+ #endif
+
diff --git a/Source/WebKit/Shared/WebMouseEvent.h b/Source/WebKit/Shared/WebMouseEvent.h
index 249ed5bf7a9ca037349cae92a063e718d015333d..6c179a0545456967f26ebf64f701e0290acaa589 100644
--- a/Source/WebKit/Shared/WebMouseEvent.h
@@ -8206,7 +7636,7 @@ index 249ed5bf7a9ca037349cae92a063e718d015333d..6c179a0545456967f26ebf64f701e029
void setPosition(const WebCore::DoublePoint& position) { m_position = position; }
const WebCore::DoublePoint& globalPosition() const { return m_globalPosition; }
diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h
-index 2561e488be3e3bb74e1d4b154c14217476712dbd..16d8c3c5ff6ad1a62943b97aba11a2e8afc625c0 100644
+index a1fc59d1789a2dc91a5ba5ce8f39c3949f621471..582735cd523cda46afb1ea20ca366a8244aa2285 100644
--- a/Source/WebKit/Shared/WebPageCreationParameters.h
+++ b/Source/WebKit/Shared/WebPageCreationParameters.h
@@ -311,6 +311,8 @@ struct WebPageCreationParameters {
@@ -8219,10 +7649,10 @@ index 2561e488be3e3bb74e1d4b154c14217476712dbd..16d8c3c5ff6ad1a62943b97aba11a2e8
#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 12ad96808abbf6cc6072f45ba6cf51bd2e6ca23f..30c52b2d07bbb7321d518d1bbc74b245c2595387 100644
+index b876f1c0f83234f8b38f78e748c55f6613609ae7..7c160dbfc3887449d77937af60494c060741a933 100644
--- a/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
+++ b/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
-@@ -229,6 +229,8 @@ enum class WebCore::UserInterfaceLayoutDirection : bool;
+@@ -228,6 +228,8 @@ enum class WebCore::UserInterfaceLayoutDirection : bool;
bool httpsUpgradeEnabled;
@@ -8254,7 +7684,7 @@ index b41816f4ba670a7058014f078ef02441c3ab0abf..983d8679574a2555b348ab0df7699253
if (execDirectory) {
String processPath = FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(execDirectory), StringView::fromLatin1(processName));
diff --git a/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp b/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp
-index 70d2b8b67d93498b94ee6ff3d711d0c13b8ec6e9..9464788f0e3837fe23b717aa8390e9e220a7a37e 100644
+index 388c57d1276b59bc889d62515efe3bd4989ace84..bf8389a08c0c726e05fb2d19eaa68e833e230819 100644
--- a/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp
+++ b/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp
@@ -51,7 +51,7 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent(const String& text, std::optional
@@ -8266,6 +7696,255 @@ index 70d2b8b67d93498b94ee6ff3d711d0c13b8ec6e9..9464788f0e3837fe23b717aa8390e9e2
{
}
+diff --git a/Source/WebKit/Shared/gtk/WebKeyboardEventGtk.cpp b/Source/WebKit/Shared/gtk/WebKeyboardEventGtk.cpp
+index 092d3c2f493aa18e09f43db2d153d5aa6822e000..65d577e344637c99885b373500d353c1abbd6aea 100644
+--- a/Source/WebKit/Shared/gtk/WebKeyboardEventGtk.cpp
++++ b/Source/WebKit/Shared/gtk/WebKeyboardEventGtk.cpp
+@@ -1328,4 +1328,244 @@ String WebKeyboardEvent::singleCharacterStringForGdkKeyval(unsigned keyval)
+ }
+ }
+
++static const UncheckedKeyHashMap<int, unsigned>& gdkToWindowsKeyCodeMap()
++{
++ static UncheckedKeyHashMap<int, unsigned>* result;
++ static std::once_flag once;
++ std::call_once(
++ once,
++ [] {
++ const unsigned gdkKeyCodes[] = {
++ GDK_KEY_Cancel,
++ // FIXME: non-keypad keys should take precedence, so we skip GDK_KEY_KP_*
++ // GDK_KEY_KP_0,
++ // GDK_KEY_KP_1,
++ // GDK_KEY_KP_2,
++ // GDK_KEY_KP_3,
++ // GDK_KEY_KP_4,
++ // GDK_KEY_KP_5,
++ // GDK_KEY_KP_6,
++ // GDK_KEY_KP_7,
++ // GDK_KEY_KP_8,
++ // GDK_KEY_KP_9,
++ // GDK_KEY_KP_Multiply,
++ // GDK_KEY_KP_Add,
++ // GDK_KEY_KP_Subtract,
++ // GDK_KEY_KP_Decimal,
++ // GDK_KEY_KP_Divide,
++ // GDK_KEY_KP_Page_Up,
++ // GDK_KEY_KP_Page_Down,
++ // GDK_KEY_KP_End,
++ // GDK_KEY_KP_Home,
++ // GDK_KEY_KP_Left,
++ // GDK_KEY_KP_Up,
++ // GDK_KEY_KP_Right,
++ // GDK_KEY_KP_Down,
++ GDK_KEY_BackSpace,
++ // GDK_KEY_ISO_Left_Tab,
++ // GDK_KEY_3270_BackTab,
++ GDK_KEY_Tab,
++ GDK_KEY_Clear,
++ // GDK_KEY_ISO_Enter,
++ // GDK_KEY_KP_Enter,
++ GDK_KEY_Return,
++ GDK_KEY_Menu,
++ GDK_KEY_Pause,
++ GDK_KEY_AudioPause,
++ GDK_KEY_Caps_Lock,
++ GDK_KEY_Kana_Lock,
++ GDK_KEY_Kana_Shift,
++ GDK_KEY_Hangul,
++ GDK_KEY_Hangul_Hanja,
++ GDK_KEY_Kanji,
++ GDK_KEY_Escape,
++ GDK_KEY_space,
++ GDK_KEY_Page_Up,
++ GDK_KEY_Page_Down,
++ GDK_KEY_End,
++ GDK_KEY_Home,
++ GDK_KEY_Left,
++ GDK_KEY_Up,
++ GDK_KEY_Right,
++ GDK_KEY_Down,
++ GDK_KEY_Select,
++ GDK_KEY_Print,
++ GDK_KEY_Execute,
++ GDK_KEY_Insert,
++ GDK_KEY_KP_Insert,
++ GDK_KEY_Delete,
++ GDK_KEY_KP_Delete,
++ GDK_KEY_Help,
++ GDK_KEY_0,
++ GDK_KEY_parenright,
++ GDK_KEY_1,
++ GDK_KEY_exclam,
++ GDK_KEY_2,
++ GDK_KEY_at,
++ GDK_KEY_3,
++ GDK_KEY_numbersign,
++ GDK_KEY_4,
++ GDK_KEY_dollar,
++ GDK_KEY_5,
++ GDK_KEY_percent,
++ GDK_KEY_6,
++ GDK_KEY_asciicircum,
++ GDK_KEY_7,
++ GDK_KEY_ampersand,
++ GDK_KEY_8,
++ GDK_KEY_asterisk,
++ GDK_KEY_9,
++ GDK_KEY_parenleft,
++ GDK_KEY_a,
++ GDK_KEY_A,
++ GDK_KEY_b,
++ GDK_KEY_B,
++ GDK_KEY_c,
++ GDK_KEY_C,
++ GDK_KEY_d,
++ GDK_KEY_D,
++ GDK_KEY_e,
++ GDK_KEY_E,
++ GDK_KEY_f,
++ GDK_KEY_F,
++ GDK_KEY_g,
++ GDK_KEY_G,
++ GDK_KEY_h,
++ GDK_KEY_H,
++ GDK_KEY_i,
++ GDK_KEY_I,
++ GDK_KEY_j,
++ GDK_KEY_J,
++ GDK_KEY_k,
++ GDK_KEY_K,
++ GDK_KEY_l,
++ GDK_KEY_L,
++ GDK_KEY_m,
++ GDK_KEY_M,
++ GDK_KEY_n,
++ GDK_KEY_N,
++ GDK_KEY_o,
++ GDK_KEY_O,
++ GDK_KEY_p,
++ GDK_KEY_P,
++ GDK_KEY_q,
++ GDK_KEY_Q,
++ GDK_KEY_r,
++ GDK_KEY_R,
++ GDK_KEY_s,
++ GDK_KEY_S,
++ GDK_KEY_t,
++ GDK_KEY_T,
++ GDK_KEY_u,
++ GDK_KEY_U,
++ GDK_KEY_v,
++ GDK_KEY_V,
++ GDK_KEY_w,
++ GDK_KEY_W,
++ GDK_KEY_x,
++ GDK_KEY_X,
++ GDK_KEY_y,
++ GDK_KEY_Y,
++ GDK_KEY_z,
++ GDK_KEY_Z,
++ GDK_KEY_Meta_L,
++ GDK_KEY_Meta_R,
++ GDK_KEY_Sleep,
++ GDK_KEY_Num_Lock,
++ GDK_KEY_Scroll_Lock,
++ GDK_KEY_Shift_L,
++ GDK_KEY_Shift_R,
++ GDK_KEY_Control_L,
++ GDK_KEY_Control_R,
++ GDK_KEY_Alt_L,
++ GDK_KEY_Alt_R,
++ GDK_KEY_Back,
++ GDK_KEY_Forward,
++ GDK_KEY_Refresh,
++ GDK_KEY_Stop,
++ GDK_KEY_Search,
++ GDK_KEY_Favorites,
++ GDK_KEY_HomePage,
++ GDK_KEY_AudioMute,
++ GDK_KEY_AudioLowerVolume,
++ GDK_KEY_AudioRaiseVolume,
++ GDK_KEY_AudioNext,
++ GDK_KEY_AudioPrev,
++ GDK_KEY_AudioStop,
++ GDK_KEY_AudioMedia,
++ GDK_KEY_semicolon,
++ GDK_KEY_colon,
++ GDK_KEY_plus,
++ GDK_KEY_equal,
++ GDK_KEY_comma,
++ GDK_KEY_less,
++ GDK_KEY_minus,
++ GDK_KEY_underscore,
++ GDK_KEY_period,
++ GDK_KEY_greater,
++ GDK_KEY_slash,
++ GDK_KEY_question,
++ GDK_KEY_asciitilde,
++ GDK_KEY_quoteleft,
++ GDK_KEY_bracketleft,
++ GDK_KEY_braceleft,
++ GDK_KEY_backslash,
++ GDK_KEY_bar,
++ GDK_KEY_bracketright,
++ GDK_KEY_braceright,
++ GDK_KEY_quoteright,
++ GDK_KEY_quotedbl,
++ GDK_KEY_AudioRewind,
++ GDK_KEY_AudioForward,
++ GDK_KEY_AudioPlay,
++ GDK_KEY_F1,
++ GDK_KEY_F2,
++ GDK_KEY_F3,
++ GDK_KEY_F4,
++ GDK_KEY_F5,
++ GDK_KEY_F6,
++ GDK_KEY_F7,
++ GDK_KEY_F8,
++ GDK_KEY_F9,
++ GDK_KEY_F10,
++ GDK_KEY_F11,
++ GDK_KEY_F12,
++ GDK_KEY_F13,
++ GDK_KEY_F14,
++ GDK_KEY_F15,
++ GDK_KEY_F16,
++ GDK_KEY_F17,
++ GDK_KEY_F18,
++ GDK_KEY_F19,
++ GDK_KEY_F20,
++ GDK_KEY_F21,
++ GDK_KEY_F22,
++ GDK_KEY_F23,
++ GDK_KEY_F24,
++ GDK_KEY_VoidSymbol,
++ GDK_KEY_Red,
++ GDK_KEY_Green,
++ GDK_KEY_Yellow,
++ GDK_KEY_Blue,
++ GDK_KEY_PowerOff,
++ GDK_KEY_AudioRecord,
++ GDK_KEY_Display,
++ GDK_KEY_Subtitle,
++ GDK_KEY_Video
++ };
++ result = new UncheckedKeyHashMap<int, unsigned>();
++ for (unsigned gdkKeyCode : gdkKeyCodes) {
++ int winKeyCode = WebKeyboardEvent::windowsKeyCodeForGdkKeyval(gdkKeyCode);
++ // If several gdk key codes map to the same win key code first one is used.
++ result->add(winKeyCode, gdkKeyCode);
++ }
++ });
++ return *result;
++}
++
++unsigned WebKeyboardEvent::gdkKeyCodeForWindowsKeyCode(int keycode)
++{
++ return gdkToWindowsKeyCodeMap().get(keycode);
++}
++
+ } // namespace WebKit
diff --git a/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp b/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp
index dc348e105065fd3c5494aa827cd69690f593dc2e..ee883b24d9c62784890b2638014c9427f6ad43ae 100644
--- a/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp
@@ -8313,10 +7992,10 @@ index 053e9336017d8818b3cbea79ce7c145fd5c46274..5632498d6ef875df80fc68ec206a9d08
JSC::Config::configureForTesting();
else if (!strcmp(argv[i], "-disable-jit"))
diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt
-index 4e786e350a6f29dad57a696df0c8a143fe552cd3..ba9cc32943c6e85fee47cfec44ff5281b9fa1ea0 100644
+index c15d1c070dc089fd20de3e4a36c5d642c5f4b725..94d7dfe878652d97a5e82eb45dc968b8f83756ff 100644
--- a/Source/WebKit/Sources.txt
+++ b/Source/WebKit/Sources.txt
-@@ -403,6 +403,7 @@ UIProcess/AboutSchemeHandler.cpp
+@@ -405,6 +405,7 @@ UIProcess/AboutSchemeHandler.cpp
UIProcess/AuxiliaryProcessProxy.cpp
UIProcess/BackgroundProcessResponsivenessTimer.cpp
UIProcess/BrowsingContextGroup.cpp
@@ -8324,7 +8003,7 @@ index 4e786e350a6f29dad57a696df0c8a143fe552cd3..ba9cc32943c6e85fee47cfec44ff5281
UIProcess/DeviceIdHashSaltStorage.cpp
UIProcess/DisplayLink.cpp
UIProcess/DisplayLinkProcessProxyClient.cpp
-@@ -412,6 +413,8 @@ UIProcess/FrameLoadState.cpp
+@@ -416,6 +417,8 @@ UIProcess/FrameLoadState.cpp
UIProcess/FrameProcess.cpp
UIProcess/GeolocationPermissionRequestManagerProxy.cpp
UIProcess/GeolocationPermissionRequestProxy.cpp
@@ -8333,7 +8012,7 @@ index 4e786e350a6f29dad57a696df0c8a143fe552cd3..ba9cc32943c6e85fee47cfec44ff5281
UIProcess/LegacyGlobalSettings.cpp
UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp
UIProcess/MediaKeySystemPermissionRequestProxy.cpp
-@@ -419,10 +422,12 @@ UIProcess/ModelElementController.cpp
+@@ -423,10 +426,12 @@ UIProcess/ModelElementController.cpp
UIProcess/OverrideLanguages.cpp
UIProcess/PageClient.cpp
UIProcess/PageLoadState.cpp
@@ -8346,7 +8025,7 @@ index 4e786e350a6f29dad57a696df0c8a143fe552cd3..ba9cc32943c6e85fee47cfec44ff5281
UIProcess/RemotePageDrawingAreaProxy.cpp
UIProcess/RemotePageFullscreenManagerProxy.cpp
UIProcess/RemotePagePlaybackSessionManagerProxy.cpp
-@@ -467,6 +472,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp
+@@ -472,6 +477,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp
UIProcess/WebPageDiagnosticLoggingClient.cpp
UIProcess/WebPageGroup.cpp
UIProcess/WebPageInjectedBundleClient.cpp
@@ -8355,7 +8034,7 @@ index 4e786e350a6f29dad57a696df0c8a143fe552cd3..ba9cc32943c6e85fee47cfec44ff5281
UIProcess/WebPageProxy.cpp
UIProcess/WebPageProxyMessageReceiverRegistration.cpp
UIProcess/WebPageProxyTesting.cpp
-@@ -631,6 +638,9 @@ UIProcess/Inspector/WebPageInspectorController.cpp
+@@ -638,6 +645,9 @@ UIProcess/Inspector/WebPageInspectorController.cpp
UIProcess/Inspector/WebPageInspectorTargetProxy.cpp
UIProcess/Inspector/Agents/InspectorBrowserAgent.cpp
@@ -8366,7 +8045,7 @@ index 4e786e350a6f29dad57a696df0c8a143fe552cd3..ba9cc32943c6e85fee47cfec44ff5281
UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp
UIProcess/Media/MediaUsageManager.cpp
diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt
-index e3e1925996d74c6837aaf09e74f1253b0e7445dd..bad2a8f00722e766c6e1562a990e845e75041f04 100644
+index f9f7c25eb148ddbc404a3aad700abe87be534cf3..cfd16f4edc556d04451e78a90b054b2cb2209411 100644
--- a/Source/WebKit/SourcesCocoa.txt
+++ b/Source/WebKit/SourcesCocoa.txt
@@ -279,6 +279,7 @@ UIProcess/API/Cocoa/_WKArchiveExclusionRule.mm @nonARC
@@ -8377,7 +8056,7 @@ index e3e1925996d74c6837aaf09e74f1253b0e7445dd..bad2a8f00722e766c6e1562a990e845e
UIProcess/API/Cocoa/_WKContentRuleListAction.mm @nonARC
UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm @nonARC
UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @nonARC @no-unify
-@@ -518,6 +519,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm @nonARC
+@@ -535,6 +536,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm @nonARC
UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm @nonARC
UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @nonARC
@@ -8386,18 +8065,10 @@ index e3e1925996d74c6837aaf09e74f1253b0e7445dd..bad2a8f00722e766c6e1562a990e845e
UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm @nonARC
UIProcess/Inspector/mac/WKInspectorViewController.mm @nonARC
diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt
-index 6d57dee8517770c8b353a092cd2b42bddd922636..212f0db2f01803823a6f52553681cc3e6f948ffd 100644
+index 138449e964461d660390ef64489f2cb5dad8439e..0b828e17561c168df7cebec87bb252794bbb1333 100644
--- a/Source/WebKit/SourcesGTK.txt
+++ b/Source/WebKit/SourcesGTK.txt
-@@ -53,6 +53,7 @@ NetworkProcess/soup/WebSocketTaskSoup.cpp
- NetworkProcess/webrtc/LibWebRTCSocketClient.cpp
- NetworkProcess/webrtc/NetworkRTCMonitor.cpp
- NetworkProcess/webrtc/NetworkRTCProvider.cpp
-+NetworkProcess/webrtc/NetworkRTCSharedMonitor.cpp
-
- Platform/IPC/glib/ConnectionGLib.cpp
-
-@@ -126,6 +127,7 @@ UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify
+@@ -133,6 +133,7 @@ UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify
UIProcess/API/glib/WebKitBackForwardList.cpp @no-unify
UIProcess/API/glib/WebKitBackForwardListItem.cpp @no-unify
UIProcess/API/glib/WebKitClipboardPermissionRequest.cpp @no-unify
@@ -8405,7 +8076,7 @@ index 6d57dee8517770c8b353a092cd2b42bddd922636..212f0db2f01803823a6f52553681cc3e
UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify
UIProcess/API/glib/WebKitCookieManager.cpp @no-unify
UIProcess/API/glib/WebKitCredential.cpp @no-unify
-@@ -259,6 +261,7 @@ UIProcess/glib/DisplayVBlankMonitorDRM.cpp
+@@ -270,6 +271,7 @@ UIProcess/glib/DisplayVBlankMonitorDRM.cpp
UIProcess/glib/DisplayVBlankMonitorThreaded.cpp
UIProcess/glib/DisplayVBlankMonitorTimer.cpp
UIProcess/glib/FenceMonitor.cpp
@@ -8413,15 +8084,15 @@ index 6d57dee8517770c8b353a092cd2b42bddd922636..212f0db2f01803823a6f52553681cc3e
UIProcess/glib/ScreenManager.cpp
UIProcess/glib/SystemSettingsManagerProxy.cpp
UIProcess/glib/WebPageProxyGLib.cpp
-@@ -274,7 +277,6 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify
- UIProcess/gtk/Display.cpp @no-unify
- UIProcess/gtk/DisplayX11.cpp @no-unify
+@@ -287,7 +289,6 @@ UIProcess/gtk/DisplayX11.cpp @no-unify
UIProcess/gtk/DisplayWayland.cpp @no-unify
+ UIProcess/gtk/GRefPtrGtk.cpp @no-unify
+ UIProcess/gtk/GtkUtilities.cpp @no-unify
-UIProcess/gtk/WebDateTimePickerGtk.cpp
UIProcess/gtk/HardwareAccelerationManager.cpp
UIProcess/gtk/KeyBindingTranslator.cpp
UIProcess/gtk/PointerLockManager.cpp @no-unify
-@@ -289,6 +291,10 @@ UIProcess/gtk/ViewGestureControllerGtk.cpp
+@@ -303,6 +304,10 @@ UIProcess/gtk/ViewGestureControllerGtk.cpp
UIProcess/gtk/WebColorPickerGtk.cpp
UIProcess/gtk/WebContextMenuProxyGtk.cpp
UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp
@@ -8433,18 +8104,10 @@ index 6d57dee8517770c8b353a092cd2b42bddd922636..212f0db2f01803823a6f52553681cc3e
UIProcess/gtk/WebPasteboardProxyGtk.cpp
UIProcess/gtk/WebPopupMenuProxyGtk.cpp
diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt
-index 3d8dc9293ce3ff609e14f6a06618dd6b8c406ee4..cd5c076432bd59610fb7174a06126d68d72b1c60 100644
+index 20043fd8e7c2b845b25a9e743f14c884bcba3535..cb247f2f5759ffb1fd8111e47bea4a75c36517e4 100644
--- a/Source/WebKit/SourcesWPE.txt
+++ b/Source/WebKit/SourcesWPE.txt
-@@ -53,6 +53,7 @@ NetworkProcess/soup/WebSocketTaskSoup.cpp
- NetworkProcess/webrtc/LibWebRTCSocketClient.cpp
- NetworkProcess/webrtc/NetworkRTCMonitor.cpp
- NetworkProcess/webrtc/NetworkRTCProvider.cpp
-+NetworkProcess/webrtc/NetworkRTCSharedMonitor.cpp
-
- Platform/IPC/android/ArgumentCodersAndroid.cpp
-
-@@ -129,6 +130,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify
+@@ -136,6 +136,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify
UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify
UIProcess/API/glib/WebKitBackForwardList.cpp @no-unify
UIProcess/API/glib/WebKitBackForwardListItem.cpp @no-unify
@@ -8452,7 +8115,7 @@ index 3d8dc9293ce3ff609e14f6a06618dd6b8c406ee4..cd5c076432bd59610fb7174a06126d68
UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify
UIProcess/API/glib/WebKitCookieManager.cpp @no-unify
UIProcess/API/glib/WebKitCredential.cpp @no-unify
-@@ -162,6 +164,7 @@ UIProcess/API/glib/WebKitOptionMenu.cpp @no-unify
+@@ -170,6 +171,7 @@ UIProcess/API/glib/WebKitOptionMenu.cpp @no-unify
UIProcess/API/glib/WebKitOptionMenuItem.cpp @no-unify
UIProcess/API/glib/WebKitPermissionRequest.cpp @no-unify
UIProcess/API/glib/WebKitPermissionStateQuery.cpp @no-unify
@@ -8460,7 +8123,7 @@ index 3d8dc9293ce3ff609e14f6a06618dd6b8c406ee4..cd5c076432bd59610fb7174a06126d68
UIProcess/API/glib/WebKitPolicyDecision.cpp @no-unify
UIProcess/API/glib/WebKitPrivate.cpp @no-unify
UIProcess/API/glib/WebKitProtocolHandler.cpp @no-unify
-@@ -232,6 +235,7 @@ UIProcess/glib/DisplayVBlankMonitorDRM.cpp
+@@ -245,6 +247,7 @@ UIProcess/glib/DisplayVBlankMonitorDRM.cpp
UIProcess/glib/DisplayVBlankMonitorThreaded.cpp
UIProcess/glib/DisplayVBlankMonitorTimer.cpp
UIProcess/glib/FenceMonitor.cpp
@@ -8468,7 +8131,7 @@ index 3d8dc9293ce3ff609e14f6a06618dd6b8c406ee4..cd5c076432bd59610fb7174a06126d68
UIProcess/glib/ScreenManager.cpp
UIProcess/glib/SystemSettingsManagerProxy.cpp
UIProcess/glib/WebPageProxyGLib.cpp
-@@ -267,6 +271,12 @@ UIProcess/wpe/DisplayVBlankMonitorWPE.cpp
+@@ -282,6 +285,12 @@ UIProcess/wpe/DisplayVBlankMonitorWPE.cpp
UIProcess/wpe/ScreenManagerWPE.cpp
UIProcess/wpe/SystemSettingsManagerProxyWPE.cpp
UIProcess/wpe/WPEUtilities.cpp
@@ -8482,7 +8145,7 @@ index 3d8dc9293ce3ff609e14f6a06618dd6b8c406ee4..cd5c076432bd59610fb7174a06126d68
UIProcess/wpe/WebPasteboardProxyWPE.cpp
UIProcess/wpe/WebPreferencesWPE.cpp
diff --git a/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp b/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
-index e67ce2103b4f2f8b53ab8413541dfe5a8055f3f0..5aca33e2247686246480b743c19016388a854129 100644
+index 9a30137e814926fc47a5de9a4b2a54efe4778b2b..903027b0babae99757936c635b72a860ded1485c 100644
--- a/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
+++ b/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
@@ -278,6 +278,11 @@ RefPtr<WebPageProxy> PageConfiguration::protectedRelatedPage() const
@@ -8498,10 +8161,10 @@ index e67ce2103b4f2f8b53ab8413541dfe5a8055f3f0..5aca33e2247686246480b743c1901638
{
return m_data.pageToCloneSessionStorageFrom.get();
diff --git a/Source/WebKit/UIProcess/API/APIPageConfiguration.h b/Source/WebKit/UIProcess/API/APIPageConfiguration.h
-index 5f5eb4cc17480ce91e74711c5248d62be2fffc1f..9993fcefd2fd4f4ac6384e82da1172f8d4dafa93 100644
+index 684800f30c8fdbc796e6e051fd606cf1fe360f44..13f88317adbaa30d408abf737171dcd7624edec6 100644
--- a/Source/WebKit/UIProcess/API/APIPageConfiguration.h
+++ b/Source/WebKit/UIProcess/API/APIPageConfiguration.h
-@@ -164,6 +164,10 @@ public:
+@@ -173,6 +173,10 @@ public:
void setRelatedPage(WeakPtr<WebKit::WebPageProxy>&& relatedPage) { m_data.relatedPage = WTFMove(relatedPage); }
RefPtr<WebKit::WebPageProxy> protectedRelatedPage() const;
@@ -8512,7 +8175,7 @@ index 5f5eb4cc17480ce91e74711c5248d62be2fffc1f..9993fcefd2fd4f4ac6384e82da1172f8
WebKit::WebPageProxy* pageToCloneSessionStorageFrom() const;
void setPageToCloneSessionStorageFrom(WeakPtr<WebKit::WebPageProxy>&&);
-@@ -528,6 +532,7 @@ private:
+@@ -534,6 +538,7 @@ private:
#endif
RefPtr<WebKit::WebPageGroup> pageGroup;
WeakPtr<WebKit::WebPageProxy> relatedPage;
@@ -8568,7 +8231,7 @@ index 24c73a26a542863f734cb698daeceadf693c70e0..871a97de130d0d15396a3716eca05533
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 30465b8aabd1981298ffc42c4cb643bc40a625fa..4c0a1887f886c735b5b715dcc6739daf3ab5e857 100644
+index 02569041290e3ea8c89a61bb82ca05b65acf0624..fb4cc85b71b966d8033767ae7a2d4ba91fbd172d 100644
--- a/Source/WebKit/UIProcess/API/APIUIClient.h
+++ b/Source/WebKit/UIProcess/API/APIUIClient.h
@@ -116,6 +116,7 @@ public:
@@ -8623,10 +8286,10 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0
}
#endif
diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp
-index 357460fbf0ab78dd06a34af9270a046d1191980b..79cce3a4dbe20915a2b02db2828bd9d16173596c 100644
+index bb4436009c3d2b62e66be0c02e651be9b494d0e2..103a397323d52801d06b3868e5cb66e720b7a29f 100644
--- a/Source/WebKit/UIProcess/API/C/WKPage.cpp
+++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp
-@@ -1911,6 +1911,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
+@@ -1912,6 +1912,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
m_client.addMessageToConsole(toAPI(&page), toAPI(message.impl()), m_client.base.clientInfo);
}
@@ -8640,7 +8303,7 @@ index 357460fbf0ab78dd06a34af9270a046d1191980b..79cce3a4dbe20915a2b02db2828bd9d1
void setStatusText(WebPageProxy* page, const String& text) final
{
if (!m_client.setStatusText)
-@@ -1948,6 +1955,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
+@@ -1949,6 +1956,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
{
if (!m_client.didNotHandleKeyEvent)
return;
@@ -8710,7 +8373,7 @@ index ae4a98c2fe5782eb2356dc8b6b486f6b44db6db3..62b2f3c351fe287af11c1ee2815f1fab
// Version 15.
WKPageDecidePolicyForSpeechRecognitionPermissionRequestCallback decidePolicyForSpeechRecognitionPermissionRequest;
diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h b/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h
-index 2ce017d213d7875eee965e554af6befb5a3c3908..79b11310d358d3edc49e30420728e1eb905309cb 100644
+index 5057b0e45a90686bfc2252b37ecb587b14db9890..dea0a533a1a13328376abb29eb19aeafde39b49b 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h
+++ b/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h
@@ -153,6 +153,12 @@ WK_SWIFT_UI_ACTOR
@@ -8740,7 +8403,7 @@ index 47b1b5ed21a65035d9bef05a991845480cfa1e93..17bd5eeafa50f94062b6f2a1b178efbf
NS_ASSUME_NONNULL_END
diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
-index 5b2e169144a7095dbb44a4d4f5d9779ab08a5c92..5793a58f259b57963463bc62450a5cb2a885da93 100644
+index 7c1368d9d5a668498069370a24abb72e90de6aa2..a2b007e414d7b271182e505e13afe958d9666b6a 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
@@ -55,6 +55,7 @@
@@ -8751,7 +8414,7 @@ index 5b2e169144a7095dbb44a4d4f5d9779ab08a5c92..5793a58f259b57963463bc62450a5cb2
#import <WebCore/Credential.h>
#import <WebCore/RegistrableDomain.h>
#import <WebCore/ResourceResponse.h>
-@@ -517,6 +518,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple
+@@ -521,6 +522,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple
});
}
@@ -8906,10 +8569,10 @@ index da15690a3d5a783a96aa5557676abeb7c349061d..cf3c06c2f1e9def8fa342019770f03d3
@property (nonatomic) BOOL processSwapsOnNavigationWithinSameNonHTTPFamilyProtocol WK_API_AVAILABLE(macos(12.0), ios(15.0));
@property (nonatomic) BOOL prewarmsProcessesAutomatically WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
-index d12e529ffef1a56c0b451b9d78c5d4bf48be20c7..b2db01631e2511794a1511a2a8eacefa60fe407e 100644
+index bb3ae06ac0364a9350befbc073c48b8f9d50e43b..2817e21943ddf5ea147beb5bd4607ca236268254 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
-@@ -243,6 +243,16 @@ - (BOOL)processSwapsOnNavigation
+@@ -250,6 +250,16 @@ - (BOOL)processSwapsOnNavigation
return _processPoolConfiguration->processSwapsOnNavigation();
}
@@ -8939,7 +8602,7 @@ index 4974e14214e2bb3e982325b885bab33e54f83998..cacdf8c71fab248d38d2faf03f7affdc
typedef NS_ENUM(NSInteger, _WKUserStyleLevel) {
_WKUserStyleUserLevel,
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushSubscriptionData.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushSubscriptionData.mm
-index d139d35f09a999e2c85f48799a399d791d421ffd..f79c073291c6071c566220a40f7dd4bbc57192a1 100644
+index 289e0dd591b20396fd3a1fd6a29fe8a7096bd703..e39ccf4f27a747e1f0ad07aad7b65e0bae98f485 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushSubscriptionData.mm
+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushSubscriptionData.mm
@@ -28,6 +28,9 @@
@@ -9106,56 +8769,279 @@ index 0000000000000000000000000000000000000000..575245fc1f279a75f7e74c26652cf772
+ return WEBKIT_BROWSER_INSPECTOR(g_once(&onceInit, createWebKitBrowserInspector, 0));
+}
+
-+/**
-+ * webkit_browser_inspector_initialize_pipe:
-+ *
-+ * Creates browser inspector and configures pipe handler to communicate with
-+ * the parent process.
-+ */
-+void webkit_browser_inspector_initialize_pipe(const char* defaultProxyURI, const char* const* ignoreHosts)
++/**
++ * webkit_browser_inspector_initialize_pipe:
++ *
++ * Creates browser inspector and configures pipe handler to communicate with
++ * the parent process.
++ */
++void webkit_browser_inspector_initialize_pipe(const char* defaultProxyURI, const char* const* ignoreHosts)
++{
++ WebKit::initializeBrowserInspectorPipe(makeUnique<WebKit::InspectorPlaywrightAgentClientGlib>(String::fromUTF8(defaultProxyURI), ignoreHosts));
++}
+diff --git a/Source/WebKit/UIProcess/API/glib/WebKitBrowserInspectorPrivate.h b/Source/WebKit/UIProcess/API/glib/WebKitBrowserInspectorPrivate.h
+new file mode 100644
+index 0000000000000000000000000000000000000000..e0b1da48465c850f541532ed961d1b778bea6028
+--- /dev/null
++++ b/Source/WebKit/UIProcess/API/glib/WebKitBrowserInspectorPrivate.h
+@@ -0,0 +1,32 @@
++/*
++ * Copyright (C) 2019 Microsoft Corporation.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#pragma once
++
++#include "WebKitBrowserInspector.h"
++#include "WebPageProxy.h"
++
++WebKit::WebPageProxy* webkitBrowserInspectorCreateNewPageInContext(WebKitWebContext*);
++void webkitBrowserInspectorQuitApplication();
+diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
+index f07bac875d627da3b53f481ee67cb23d93158416..eb59181e28c0660cb0f389d7450832056af67069 100644
+--- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
++++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
+@@ -166,51 +166,7 @@ static bool canvasAccelerationEnabled(WebKitURISchemeRequest* request)
+ }
+ #endif
+
+-static bool uiProcessContextIsEGL()
+-{
+-#if PLATFORM(GTK)
+- return Display::singleton().glDisplayIsSharedWithGtk();
+-#else
+- return true;
+-#endif
+-}
+-
+-static const char* openGLAPI()
+-{
+- if (epoxy_is_desktop_gl())
+- return "OpenGL (libepoxy)";
+- return "OpenGL ES 2 (libepoxy)";
+-}
+-
+-#if PLATFORM(GTK) || (PLATFORM(WPE) && ENABLE(WPE_PLATFORM))
+-static String dmabufRendererWithSupportedBuffers()
+-{
+- StringBuilder buffers;
+- buffers.append("DMABuf (Supported buffers: "_s);
+-
+-#if PLATFORM(GTK)
+- auto mode = AcceleratedBackingStore::rendererBufferTransportMode();
+-#else
+- OptionSet<RendererBufferTransportMode> mode;
+- if (wpe_display_get_drm_device(wpe_display_get_primary()))
+- mode.add(RendererBufferTransportMode::Hardware);
+- mode.add(RendererBufferTransportMode::SharedMemory);
+-#endif
+-
+- if (mode.contains(RendererBufferTransportMode::Hardware))
+- buffers.append("Hardware"_s);
+- if (mode.contains(RendererBufferTransportMode::SharedMemory)) {
+- if (mode.contains(RendererBufferTransportMode::Hardware))
+- buffers.append(", "_s);
+- buffers.append("Shared Memory"_s);
+- }
+-
+- buffers.append(')');
+- return buffers.toString();
+-}
+-
+ #if USE(LIBDRM)
+-
+ // Base on function 'drmGetFormatName' from 'https://gitlab.freedesktop.org/mesa/drm/-/blob/main/xf86drm.c'.
+ static String webkitDrmGetFormatName(uint32_t format)
+ {
+@@ -264,42 +220,6 @@ static String modifierListToString(const Vector<uint64_t, 1>& modifiers)
+ #endif
+ }
+
+-static String renderBufferDescription(WebKitURISchemeRequest* request)
+-{
+- StringBuilder bufferDescription;
+- auto description = webkitWebViewGetRendererBufferDescription(webkit_uri_scheme_request_get_web_view(request));
+- if (description.fourcc) {
+- auto formatName = webkitDrmGetFormatName(description.fourcc);
+- switch (description.type) {
+- case RendererBufferDescription::Type::DMABuf: {
+- auto modifierName = webkitDrmGetModifierName(description.modifier);
+- if (!modifierName.isNull())
+- bufferDescription.append("DMA-BUF: "_s, formatName, " ("_s, modifierName, ")"_s);
+- else
+- bufferDescription.append("Unknown"_s);
+- break;
+- }
+- case RendererBufferDescription::Type::SharedMemory:
+- bufferDescription.append("Shared Memory: "_s, formatName);
+- break;
+- }
+- switch (description.usage) {
+- case RendererBufferFormat::Usage::Rendering:
+- bufferDescription.append(" [Rendering]"_s);
+- break;
+- case RendererBufferFormat::Usage::Scanout:
+- bufferDescription.append(" [Scanout]"_s);
+- break;
+- case RendererBufferFormat::Usage::Mapping:
+- bufferDescription.append(" [Mapping]"_s);
+- break;
+- }
+- } else
+- bufferDescription.append("Unknown"_s);
+-
+- return bufferDescription.toString();
+-}
+-
+ #if USE(GBM)
+ static String preferredBufferFormats(WebKitURISchemeRequest* request, JSON::Array& jsonArray)
+ {
+@@ -353,6 +273,87 @@ static String preferredBufferFormats(WebKitURISchemeRequest* request, JSON::Arra
+ }
+ #endif // USE(GBM)
+ #endif // USE(LIBDRM)
++
++static bool uiProcessContextIsEGL()
++{
++#if PLATFORM(GTK)
++ return Display::singleton().glDisplayIsSharedWithGtk();
++#else
++ return true;
++#endif
++}
++
++static const char* openGLAPI()
++{
++ if (epoxy_is_desktop_gl())
++ return "OpenGL (libepoxy)";
++ return "OpenGL ES 2 (libepoxy)";
++}
++
++#if PLATFORM(GTK) || (PLATFORM(WPE) && ENABLE(WPE_PLATFORM))
++static String dmabufRendererWithSupportedBuffers()
++{
++ StringBuilder buffers;
++ buffers.append("DMABuf (Supported buffers: "_s);
++
++#if PLATFORM(GTK)
++ auto mode = AcceleratedBackingStore::rendererBufferTransportMode();
++#else
++ OptionSet<RendererBufferTransportMode> mode;
++ if (wpe_display_get_drm_device(wpe_display_get_primary()))
++ mode.add(RendererBufferTransportMode::Hardware);
++ mode.add(RendererBufferTransportMode::SharedMemory);
++#endif
++
++ if (mode.contains(RendererBufferTransportMode::Hardware))
++ buffers.append("Hardware"_s);
++ if (mode.contains(RendererBufferTransportMode::SharedMemory)) {
++ if (mode.contains(RendererBufferTransportMode::Hardware))
++ buffers.append(", "_s);
++ buffers.append("Shared Memory"_s);
++ }
++
++ buffers.append(')');
++ return buffers.toString();
++}
++
++#if USE(LIBDRM)
++static String renderBufferDescription(WebKitURISchemeRequest* request)
+{
-+ WebKit::initializeBrowserInspectorPipe(makeUnique<WebKit::InspectorPlaywrightAgentClientGlib>(String::fromUTF8(defaultProxyURI), ignoreHosts));
-+}
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitBrowserInspectorPrivate.h b/Source/WebKit/UIProcess/API/glib/WebKitBrowserInspectorPrivate.h
-new file mode 100644
-index 0000000000000000000000000000000000000000..e0b1da48465c850f541532ed961d1b778bea6028
---- /dev/null
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitBrowserInspectorPrivate.h
-@@ -0,0 +1,32 @@
-+/*
-+ * Copyright (C) 2019 Microsoft Corporation.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
++ StringBuilder bufferDescription;
++ auto description = webkitWebViewGetRendererBufferDescription(webkit_uri_scheme_request_get_web_view(request));
++ if (description.fourcc) {
++ auto formatName = webkitDrmGetFormatName(description.fourcc);
++ switch (description.type) {
++ case RendererBufferDescription::Type::DMABuf: {
++ auto modifierName = webkitDrmGetModifierName(description.modifier);
++ if (!modifierName.isNull())
++ bufferDescription.append("DMA-BUF: "_s, formatName, " ("_s, modifierName, ")"_s);
++ else
++ bufferDescription.append("Unknown"_s);
++ break;
++ }
++ case RendererBufferDescription::Type::SharedMemory:
++ bufferDescription.append("Shared Memory: "_s, formatName);
++ break;
++ }
++ switch (description.usage) {
++ case RendererBufferFormat::Usage::Rendering:
++ bufferDescription.append(" [Rendering]"_s);
++ break;
++ case RendererBufferFormat::Usage::Scanout:
++ bufferDescription.append(" [Scanout]"_s);
++ break;
++ case RendererBufferFormat::Usage::Mapping:
++ bufferDescription.append(" [Mapping]"_s);
++ break;
++ }
++ } else
++ bufferDescription.append("Unknown"_s);
+
-+#pragma once
++ return bufferDescription.toString();
++}
++#endif // USE(LIBDRM)
+ #endif // PLATFORM(GTK) || (PLATFORM(WPE) && ENABLE(WPE_PLATFORM))
+
+ static String vblankMonitorType(const DisplayVBlankMonitor& monitor)
+@@ -385,7 +386,6 @@ static String threadedRenderingInfo(const RenderProcessInfo& info)
+ static String supportedBufferFormats(const RenderProcessInfo& info, JSON::Array& jsonArray)
+ {
+ StringBuilder builder;
+-#if PLATFORM(GTK) || (PLATFORM(WPE) && ENABLE(WPE_PLATFORM))
+ for (const auto& format : info.supportedBufferFormats) {
+ StringBuilder jsonStringBuilder;
+ auto formatName = webkitDrmGetFormatName(format.fourcc);
+@@ -400,7 +400,6 @@ static String supportedBufferFormats(const RenderProcessInfo& info, JSON::Array&
+ }
+ jsonArray.pushString(jsonStringBuilder.toString());
+ }
+-#endif
+ return builder.toString();
+ }
+ #endif
+@@ -741,14 +740,18 @@ void WebKitProtocolHandler::handleGPU(WebKitURISchemeRequest* request, RenderPro
+ if (showBuffersInfo) {
+ #if PLATFORM(GTK) || (PLATFORM(WPE) && ENABLE(WPE_PLATFORM))
+ addTableRow(hardwareAccelerationObject, "Renderer"_s, dmabufRendererWithSupportedBuffers());
++#endif
+
-+#include "WebKitBrowserInspector.h"
-+#include "WebPageProxy.h"
+ #if USE(LIBDRM)
+ #if USE(GBM)
+ auto jsonFormats = JSON::Array::create();
+ auto formatsString = preferredBufferFormats(request, jsonFormats.get());
+ addTableRow(hardwareAccelerationObject, "Preferred buffer formats"_s, formatsString, WTFMove(jsonFormats));
+ #endif
+- addTableRow(hardwareAccelerationObject, "Buffer format"_s, renderBufferDescription(request));
+ #endif // USE(LIBDRM)
+
-+WebKit::WebPageProxy* webkitBrowserInspectorCreateNewPageInContext(WebKitWebContext*);
-+void webkitBrowserInspectorQuitApplication();
++#if PLATFORM(GTK) || (PLATFORM(WPE) && ENABLE(WPE_PLATFORM))
++ addTableRow(hardwareAccelerationObject, "Buffer format"_s, renderBufferDescription(request));
+ #endif // PLATFORM(GTK) || (PLATFORM(WPE) && ENABLE(WPE_PLATFORM))
+ }
+
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp
-index 7649e25c72d68860639c609d1f7cc1a8a1908167..7f57f768d7075d95db4c6a02b52442a1d081c981 100644
+index 58db8106ba2912b6dc3bc6e4669c4ca3d6dba6af..9142592ff78edad31b6fe259260cc4fb0fcc00c6 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp
@@ -102,6 +102,10 @@ private:
@@ -9170,7 +9056,7 @@ index 7649e25c72d68860639c609d1f7cc1a8a1908167..7f57f768d7075d95db4c6a02b52442a1
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 364957d88a8eac8b4ac7d851cc19e3d73eaf9d54..b21d76dda85b1bed7b937d8c7a4af34b158099a9 100644
+index b7ad2bb3f930650465ce118deebaeda0ded88814..32adb61370580ceb6f2f83e063fe792202779694 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
@@ -430,10 +430,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa
@@ -9239,7 +9125,7 @@ index c1945fbe717a42afc1f51d64a80c7de3fa9009ba..ab63fe19b00ecbd64c9421e6eecad3e2
#endif
+int webkitWebContextExistingCount();
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
-index 0342e8e8d333ebc7f8c77a0f93f409f29f3db306..200520c65f644930ae8b3edfbab2e384c1d9c517 100644
+index c9a70dd4f86cb7ee3280c702e5f1c226c65f8d23..36c77bc83962e931ffa397c5145d788a40631a06 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
@@ -40,6 +40,7 @@
@@ -9250,7 +9136,7 @@ index 0342e8e8d333ebc7f8c77a0f93f409f29f3db306..200520c65f644930ae8b3edfbab2e384
#include "WebKitAuthenticationRequestPrivate.h"
#include "WebKitBackForwardListPrivate.h"
#include "WebKitContextMenuClient.h"
-@@ -155,6 +156,7 @@ enum {
+@@ -157,6 +158,7 @@ enum {
CLOSE,
SCRIPT_DIALOG,
@@ -9258,7 +9144,7 @@ index 0342e8e8d333ebc7f8c77a0f93f409f29f3db306..200520c65f644930ae8b3edfbab2e384
DECIDE_POLICY,
PERMISSION_REQUEST,
-@@ -529,6 +531,13 @@ GRefPtr<WebKitOptionMenu> WebKitWebViewClient::showOptionMenu(WebKitPopupMenu& p
+@@ -531,6 +533,13 @@ GRefPtr<WebKitOptionMenu> WebKitWebViewClient::showOptionMenu(WebKitPopupMenu& p
void WebKitWebViewClient::frameDisplayed(WKWPE::View&)
{
@@ -9272,21 +9158,7 @@ index 0342e8e8d333ebc7f8c77a0f93f409f29f3db306..200520c65f644930ae8b3edfbab2e384
{
SetForScope inFrameDisplayedGuard(m_webView->priv->inFrameDisplayed, true);
for (const auto& callback : m_webView->priv->frameDisplayedCallbacks) {
-@@ -545,6 +554,13 @@ void WebKitWebViewClient::frameDisplayed(WKWPE::View&)
- }
- }
-
-+#if USE(SKIA)
-+sk_sp<SkImage> WebKitWebViewClient::takeViewScreenshot()
-+{
-+ return sk_sp<SkImage>(webkitWebViewBackendTakeScreenshot(m_webView->priv->backend.get()));
-+}
-+#endif
-+
- void WebKitWebViewClient::willStartLoad(WKWPE::View&)
- {
- webkitWebViewWillStartLoad(m_webView);
-@@ -636,7 +652,7 @@ static gboolean webkitWebViewDecidePolicy(WebKitWebView*, WebKitPolicyDecision*
+@@ -638,7 +647,7 @@ static gboolean webkitWebViewDecidePolicy(WebKitWebView*, WebKitPolicyDecision*
static gboolean webkitWebViewPermissionRequest(WebKitWebView*, WebKitPermissionRequest* request)
{
@@ -9295,7 +9167,7 @@ index 0342e8e8d333ebc7f8c77a0f93f409f29f3db306..200520c65f644930ae8b3edfbab2e384
if (WEBKIT_IS_POINTER_LOCK_PERMISSION_REQUEST(request)) {
webkit_permission_request_allow(request);
return TRUE;
-@@ -959,6 +975,10 @@ static void webkitWebViewConstructed(GObject* object)
+@@ -961,6 +970,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);
@@ -9306,7 +9178,7 @@ index 0342e8e8d333ebc7f8c77a0f93f409f29f3db306..200520c65f644930ae8b3edfbab2e384
webkitWebViewCreatePage(webView, WTFMove(configuration));
webkitWebContextWebViewCreated(priv->context.get(), webView);
-@@ -2044,6 +2064,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
+@@ -2046,6 +2059,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
G_TYPE_BOOLEAN, 1,
WEBKIT_TYPE_SCRIPT_DIALOG);
@@ -9322,7 +9194,7 @@ index 0342e8e8d333ebc7f8c77a0f93f409f29f3db306..200520c65f644930ae8b3edfbab2e384
/**
* WebKitWebView::decide-policy:
* @web_view: the #WebKitWebView on which the signal is emitted
-@@ -2834,6 +2863,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const
+@@ -2836,6 +2858,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const
webkit_script_dialog_unref(webView->priv->currentScriptDialog);
}
@@ -9359,7 +9231,7 @@ index 4e16a2a088f6e48f43362850cc047da7de3c88ef..5ca5ae9572d2ed962d80a5dd67f8f379
bool webkitWebViewIsScriptDialogRunning(WebKitWebView*, WebKitScriptDialog*);
String webkitWebViewGetCurrentScriptDialogMessage(WebKitWebView*);
diff --git a/Source/WebKit/UIProcess/API/glib/webkit.h.in b/Source/WebKit/UIProcess/API/glib/webkit.h.in
-index f01ddc55dd7a09d975b937aa95d0a256c13d4995..bfbd8dc089048a34a75f7fe3457b40cd8bb97f5f 100644
+index 17162406b03ac58b27d3e359407dc6b7734d8510..f820dfe84a4b0a4d775b8df6b0c44c095ed87fc4 100644
--- a/Source/WebKit/UIProcess/API/glib/webkit.h.in
+++ b/Source/WebKit/UIProcess/API/glib/webkit.h.in
@@ -45,6 +45,7 @@
@@ -9371,10 +9243,10 @@ index f01ddc55dd7a09d975b937aa95d0a256c13d4995..bfbd8dc089048a34a75f7fe3457b40cd
#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 9a36fe28ce7a5aac1b45350e3fc9e72b1a00dac1..cc661fa57e7ec1469e1ec003d783028d59836f06 100644
+index d6c64a8f5cd1f676a8dd51a051dcbd9161f07573..1c7e24caab783dc80d4633fd021c811e503d3b59 100644
--- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
+++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
-@@ -270,6 +270,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool
+@@ -255,6 +255,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool
{
if (wasEventHandled || event.type() != WebEventType::KeyDown || !event.nativeEvent())
return;
@@ -9383,7 +9255,7 @@ index 9a36fe28ce7a5aac1b45350e3fc9e72b1a00dac1..cc661fa57e7ec1469e1ec003d783028d
// Always consider arrow keys as handled, otherwise the GtkWindow key bindings will move the focus.
guint keyval;
-@@ -362,9 +364,9 @@ void PageClientImpl::selectionDidChange()
+@@ -345,9 +347,9 @@ void PageClientImpl::selectionDidChange()
webkitWebViewSelectionDidChange(WEBKIT_WEB_VIEW(m_viewWidget));
}
@@ -9509,10 +9381,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 da5d9873058905fc464c4793a352d69218f75538..20a4c43caa6571420370c1e0e1cbed45aaeb4198 100644
+index df76f897d1060dda98472453fda4cc316102124c..e38dcd8e63dcdb41cae2336594e1eb0f1eae5424 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)
+@@ -2888,6 +2888,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase)
#endif
}
@@ -9524,7 +9396,7 @@ index da5d9873058905fc464c4793a352d69218f75538..20a4c43caa6571420370c1e0e1cbed45
void webkitWebViewBaseEnterAcceleratedCompositingMode(WebKitWebViewBase* webkitWebViewBase, const LayerTreeContext& layerTreeContext)
{
ASSERT(webkitWebViewBase->priv->acceleratedBackingStore);
-@@ -2940,12 +2945,12 @@ void webkitWebViewBasePageClosed(WebKitWebViewBase* webkitWebViewBase)
+@@ -2944,12 +2949,12 @@ void webkitWebViewBasePageClosed(WebKitWebViewBase* webkitWebViewBase)
webkitWebViewBase->priv->acceleratedBackingStore->update({ });
}
@@ -9540,7 +9412,7 @@ index da5d9873058905fc464c4793a352d69218f75538..20a4c43caa6571420370c1e0e1cbed45
#if !USE(GTK4)
diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
-index 9553631aa4fc49456ae6061abae2a896da9a6988..5b4fd77cb616b5ade74889bb35ff75299272b005 100644
+index d84099f5109a4a0a8a0b51d4f46ce059460b8280..48d56239c4595053696a63fa48c69db0706ca19a 100644
--- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
+++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
@@ -27,6 +27,7 @@
@@ -9549,9 +9421,9 @@ index 9553631aa4fc49456ae6061abae2a896da9a6988..5b4fd77cb616b5ade74889bb35ff7529
+#include "AcceleratedBackingStore.h"
#include "APIPageConfiguration.h"
- #include "InputMethodState.h"
- #include "RendererBufferDescription.h"
-@@ -104,7 +105,7 @@ void webkitWebViewBaseStartDrag(WebKitWebViewBase*, WebCore::SelectionData&&, Op
+ #include "GRefPtrGtk.h"
+ #include "GUniquePtrGtk.h"
+@@ -105,7 +106,7 @@ void webkitWebViewBaseStartDrag(WebKitWebViewBase*, WebCore::SelectionData&&, Op
void webkitWebViewBaseDidPerformDragControllerAction(WebKitWebViewBase*);
#endif
@@ -9560,10 +9432,10 @@ index 9553631aa4fc49456ae6061abae2a896da9a6988..5b4fd77cb616b5ade74889bb35ff7529
void webkitWebViewBaseSetEnableBackForwardNavigationGesture(WebKitWebViewBase*, bool enabled);
WebKit::ViewGestureController* webkitWebViewBaseViewGestureController(WebKitWebViewBase*);
-@@ -145,3 +146,5 @@ void webkitWebViewBaseSetPlugID(WebKitWebViewBase*, const String&);
- #endif
+@@ -147,3 +148,5 @@ void webkitWebViewBaseSetPlugID(WebKitWebViewBase*, const String&);
WebKit::RendererBufferDescription webkitWebViewBaseGetRendererBufferDescription(WebKitWebViewBase*);
+ void webkitWebViewBaseSetCursor(WebKitWebViewBase*, const WebCore::Cursor&);
+
+WebKit::AcceleratedBackingStore* webkitWebViewBaseGetAcceleratedBackingStore(WebKitWebViewBase*);
diff --git a/Source/WebKit/UIProcess/API/wpe/APIViewClient.h b/Source/WebKit/UIProcess/API/wpe/APIViewClient.h
@@ -9593,10 +9465,10 @@ index 9091ae5198e765c2cfe0584d121afe4f88df3c0e..b0efedec419673ef2bfd0fd79406774e
virtual void didChangePageID(WKWPE::View&) { }
virtual void didReceiveUserMessage(WKWPE::View&, WebKit::UserMessage&&, CompletionHandler<void(WebKit::UserMessage&&)>&& completionHandler) { completionHandler(WebKit::UserMessage()); }
diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
-index 0cc3b527fb27dcae943b6bae522ad5fd2925843c..b2c4aea4996b73da224f9f320522b3f74567ed08 100644
+index eea16f6d30a313411de1accb074aa8dabb553b39..1bea5b67f4b3f2c980fd17132ac3de5f0132b9db 100644
--- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
+++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
-@@ -35,9 +35,12 @@
+@@ -36,9 +36,12 @@
#include "WPEWebViewLegacy.h"
#include "WPEWebViewPlatform.h"
#include "WebColorPicker.h"
@@ -9609,7 +9481,7 @@ index 0cc3b527fb27dcae943b6bae522ad5fd2925843c..b2c4aea4996b73da224f9f320522b3f7
#include "WebDateTimePicker.h"
#include "WebKitPopupMenu.h"
#include <WebCore/ActivityState.h>
-@@ -58,6 +61,12 @@
+@@ -59,6 +62,12 @@
#include <wpe/wpe-platform.h>
#endif
@@ -9622,7 +9494,7 @@ index 0cc3b527fb27dcae943b6bae522ad5fd2925843c..b2c4aea4996b73da224f9f320522b3f7
namespace WebKit {
WTF_MAKE_TZONE_ALLOCATED_IMPL(PageClientImpl);
-@@ -305,14 +314,14 @@ Ref<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& pa
+@@ -306,14 +315,14 @@ Ref<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& pa
}
#endif
@@ -9641,47 +9513,23 @@ index 0cc3b527fb27dcae943b6bae522ad5fd2925843c..b2c4aea4996b73da224f9f320522b3f7
}
RefPtr<WebDateTimePicker> PageClientImpl::createDateTimePicker(WebPageProxy& page)
-@@ -554,6 +563,37 @@ void PageClientImpl::selectionDidChange()
- m_view.selectionDidChange();
+@@ -566,11 +575,11 @@ void PageClientImpl::callAfterNextPresentationUpdate(CompletionHandler<void()>&&
}
-+#if USE(SKIA)
-+sk_sp<SkImage> PageClientImpl::takeViewSnapshot(std::optional<WebCore::IntRect>&& clipRect, bool nominalResolution)
-+{
-+ sk_sp<SkImage> fullScreenshot = m_view.client().takeViewScreenshot();
-+ float deviceScale = m_view.page().deviceScaleFactor();
-+ if (!clipRect && (!nominalResolution || deviceScale == 1))
-+ return fullScreenshot;
-+
-+ WebCore::IntSize size = clipRect ? clipRect->size() : m_view.page().viewSize();
-+ if (!nominalResolution) {
-+ size.scale(deviceScale);
-+ if (clipRect)
-+ clipRect->scale(deviceScale);
-+ }
-+
-+ SkBitmap bitmap;
-+ bitmap.allocPixels(SkImageInfo::Make(size.width(), size.height(), kN32_SkColorType, kPremul_SkAlphaType));
-+ SkCanvas canvas(bitmap);
-+ if (clipRect) {
-+ canvas.translate(-clipRect->x(), -clipRect->y());
-+ SkRect rect = SkRect::MakeXYWH(clipRect->x(), clipRect->y(), clipRect->width(), clipRect->height());
-+ canvas.clipRect(rect);
-+ }
-+ if (nominalResolution)
-+ canvas.scale(1/deviceScale, 1/deviceScale);
-+ canvas.drawImage(fullScreenshot, 0, 0);
-+ return bitmap.asImage();
-+}
-+#endif
-+
-+
- WebKitWebResourceLoadManager* PageClientImpl::webResourceLoadManager()
+ #if USE(SKIA)
+-RefPtr<ViewSnapshot> PageClientImpl::takeViewSnapshot(std::optional<WebCore::IntRect>&& clipRect)
++RefPtr<ViewSnapshot> PageClientImpl::takeViewSnapshot(std::optional<WebCore::IntRect>&& clipRect, bool nominalResolution)
{
- return m_view.webResourceLoadManager();
-@@ -564,4 +604,11 @@ void PageClientImpl::callAfterNextPresentationUpdate(CompletionHandler<void()>&&
- m_view.callAfterNextPresentationUpdate(WTFMove(callback));
+ #if ENABLE(WPE_PLATFORM)
+ if (m_view.wpeView()) {
+- auto snapshot = static_cast<WKWPE::ViewPlatform&>(m_view).takeViewSnapshot(WTFMove(clipRect));
++ auto snapshot = static_cast<WKWPE::ViewPlatform&>(m_view).takeViewSnapshot(WTFMove(clipRect), nominalResolution);
+ // FIXME Forward the Expected in https://webkit.org/b/300271
+ if (snapshot)
+ return WTFMove(snapshot.value());
+@@ -582,4 +591,11 @@ RefPtr<ViewSnapshot> PageClientImpl::takeViewSnapshot(std::optional<WebCore::Int
}
+ #endif
+#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
+RefPtr<WebDateTimePicker> PageClientImpl::createDateTimePicker(WebPageProxy& page)
@@ -9692,26 +9540,51 @@ index 0cc3b527fb27dcae943b6bae522ad5fd2925843c..b2c4aea4996b73da224f9f320522b3f7
+
} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
-index 8c257afe81fd1719434e74a3deea50991132b55b..14fd72fef0cc90464212f41770577c0c645bef9e 100644
+index ba703ee7750a35f796e8d82e1f0027fc6d75aad6..51f1a7f1728e1f6ee9eb1fdd8426534cb1453f9a 100644
--- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
+++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
-@@ -185,9 +185,15 @@ private:
- void didChangeWebPageID() const override;
-
- void selectionDidChange() override;
--
-+#if USE(SKIA)
-+ sk_sp<SkImage> takeViewSnapshot(std::optional<WebCore::IntRect>&&, bool nominalResolution) override;
-+#endif
+@@ -189,7 +189,11 @@ private:
WebKitWebResourceLoadManager* webResourceLoadManager() override;
-+#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
-+ RefPtr<WebDateTimePicker> createDateTimePicker(WebPageProxy&) override;
+ #if USE(SKIA)
+- RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&) override;
++ RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&, bool nominalResolution) override;
+#endif
+
++#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
++ RefPtr<WebDateTimePicker> createDateTimePicker(WebPageProxy&) override;
+ #endif
+
WKWPE::View& m_view;
- DefaultUndoController m_undoController;
- #if ENABLE(FULLSCREEN_API)
+diff --git a/Source/WebKit/UIProcess/API/wpe/WPEWebViewPlatform.cpp b/Source/WebKit/UIProcess/API/wpe/WPEWebViewPlatform.cpp
+index 05e5262945726478b99903ce2c1736a1e6b88382..39fa888c826d5017955eb93ee16a858cb95f0185 100644
+--- a/Source/WebKit/UIProcess/API/wpe/WPEWebViewPlatform.cpp
++++ b/Source/WebKit/UIProcess/API/wpe/WPEWebViewPlatform.cpp
+@@ -669,9 +669,9 @@ void ViewPlatform::callAfterNextPresentationUpdate(CompletionHandler<void()>&& c
+ }
+
+ #if USE(SKIA)
+-Expected<Ref<ViewSnapshot>, String> ViewPlatform::takeViewSnapshot(std::optional<WebCore::IntRect>&& clipRect)
++Expected<Ref<ViewSnapshot>, String> ViewPlatform::takeViewSnapshot(std::optional<WebCore::IntRect>&& clipRect, bool nominalResolution)
+ {
+- return m_backingStore->takeSnapshot(WTFMove(clipRect));
++ return m_backingStore->takeSnapshot(WTFMove(clipRect), nominalResolution);
+ }
+ #endif
+
+diff --git a/Source/WebKit/UIProcess/API/wpe/WPEWebViewPlatform.h b/Source/WebKit/UIProcess/API/wpe/WPEWebViewPlatform.h
+index 28473fc1ab7f3410e8655f38544b61654bf5ae1d..3ff1fa0628d378781858f0d65c9144d63ad3ffe8 100644
+--- a/Source/WebKit/UIProcess/API/wpe/WPEWebViewPlatform.h
++++ b/Source/WebKit/UIProcess/API/wpe/WPEWebViewPlatform.h
+@@ -64,7 +64,7 @@ public:
+ #endif
+
+ #if USE(SKIA)
+- Expected<Ref<WebKit::ViewSnapshot>, String> takeViewSnapshot(std::optional<WebCore::IntRect>&&);
++ Expected<Ref<WebKit::ViewSnapshot>, String> takeViewSnapshot(std::optional<WebCore::IntRect>&&, bool nominalResolution);
+ #endif
+
+ void updateAcceleratedSurface(uint64_t);
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
@@ -9870,36 +9743,20 @@ index 8987c95d8493e446e871545fc84306b279bb39b6..3e12d7f309f5bb76bde712b383d7c7c9
void webkitWebViewBackendUnref(WebKitWebViewBackend*);
+
+PlatformImage webkitWebViewBackendTakeScreenshot(WebKitWebViewBackend*);
-diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewClient.h b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewClient.h
-index 0fa1f2e970ed0c0232df9b9c7b8b4bcd0ceac655..d68c6747edc699de7d84bae2a63b927dbdd8d0fe 100644
---- a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewClient.h
-+++ b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewClient.h
-@@ -51,6 +51,11 @@ private:
- bool isGLibBasedAPI() override { return true; }
-
- void frameDisplayed(WKWPE::View&) override;
-+// Playwright begin
-+#if USE(SKIA)
-+ sk_sp<SkImage> takeViewScreenshot() override;
-+#endif
-+// Playwright end
- void willStartLoad(WKWPE::View&) override;
- 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 495d3a628ca4d4988d1f31fc67a709f2b740da32..cda238e333dd668abbc8e22ce684b6d029a81e35 100644
+index 54577cd94e2ec622433ea371e9a7cd2a504f1027..a27b80dab0cb9fb2da75245a172d3ea3d8daca6c 100644
--- a/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
+++ b/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
-@@ -297,6 +297,8 @@ public:
+@@ -309,6 +309,8 @@ public:
void didDestroyFrame(WebCore::FrameIdentifier);
+ static std::optional<String> platformGetBase64EncodedPNGData(const ViewSnapshot&);
+
RefPtr<WebPageProxy> webPageProxyForHandle(const String&);
+ String effectiveHandleForWebFrameProxy(const WebFrameProxy&);
String handleForWebFrameID(std::optional<WebCore::FrameIdentifier>);
- String handleForWebPageProxy(const WebPageProxy&);
-@@ -348,7 +350,6 @@ private:
+@@ -368,7 +370,6 @@ private:
// Get base64-encoded PNG data from a bitmap.
static std::optional<String> platformGetBase64EncodedPNGData(WebCore::ShareableBitmap::Handle&&);
@@ -9908,10 +9765,10 @@ index 495d3a628ca4d4988d1f31fc67a709f2b740da32..cda238e333dd668abbc8e22ce684b6d0
// 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 536a0b78e8b1ab110093fea33384e7bad528917b..ca4f5944f90868886bba20411e47b18598cc50a0 100644
+index cc393a86e0dce6398ad9c187506850eeaf12bd5a..ccaaed8903fc6a8401fa2cd215bee2a221a955a2 100644
--- a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
+++ b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
-@@ -173,7 +173,11 @@ void AuxiliaryProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& lau
+@@ -175,7 +175,11 @@ void AuxiliaryProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& lau
launchOptions.processCmdPrefix = String::fromUTF8(processCmdPrefix);
#endif // ENABLE(DEVELOPER_MODE) && (PLATFORM(GTK) || PLATFORM(WPE))
@@ -9924,10 +9781,10 @@ index 536a0b78e8b1ab110093fea33384e7bad528917b..ca4f5944f90868886bba20411e47b185
platformGetLaunchOptions(launchOptions);
}
diff --git a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h
-index 53b4c647c013643d45d845154dd640e8c21c3fd4..d7cc83ec06678945d6e71cdebf3227f86f7661e6 100644
+index 5f0a7f0c9e4fc94b47a32e5cb32547592749dc13..e6e75a8de771482d5e57ce60f0f7763bf053eeac 100644
--- a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h
+++ b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h
-@@ -298,13 +298,16 @@ protected:
+@@ -299,13 +299,16 @@ protected:
InitializationActivityAndGrant initializationActivityAndGrant();
@@ -10085,7 +9942,7 @@ index 89d125f7742f81ead8c50f218ecb1771b8000636..baa6cf58ad502c6c033ee6293a6cc8d4
namespace WebKit {
diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
-index e545bda40ad736cbf5bc6daf4861f9fbe6bd6100..d2ee20c86125f61d52ca08e7d16441e8cc093c97 100644
+index 25a7c6c4def4db155ef9905913ef929c7d91acfd..afb3186629d7962540ac26e0bd69b4acc3c873b1 100644
--- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
+++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
@@ -105,6 +105,7 @@ private:
@@ -10096,7 +9953,7 @@ index e545bda40ad736cbf5bc6daf4861f9fbe6bd6100..d2ee20c86125f61d52ca08e7d16441e8
void presentStorageAccessConfirmDialog(const WTF::String& requestingDomain, const WTF::String& currentDomain, CompletionHandler<void(bool)>&&);
void requestStorageAccessConfirm(WebPageProxy&, WebFrameProxy*, const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, std::optional<WebCore::OrganizationStorageAccessPromptQuirk>&&, CompletionHandler<void(bool)>&&) final;
void decidePolicyForGeolocationPermissionRequest(WebPageProxy&, WebFrameProxy&, const FrameInfoData&, Function<void(bool)>&) final;
-@@ -229,6 +230,7 @@ private:
+@@ -234,6 +235,7 @@ private:
bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1;
bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
bool webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler : 1;
@@ -10105,7 +9962,7 @@ index e545bda40ad736cbf5bc6daf4861f9fbe6bd6100..d2ee20c86125f61d52ca08e7d16441e8
bool webViewRequestStorageAccessPanelForDomainUnderCurrentDomainForQuirkDomainsCompletionHandler : 1;
bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
-index 3daa4d80bdbdd9c1e9ca74ba9f1c3217f6f4628f..9ee399d8417acca18c3e1fe55ccc88cac2a39c9b 100644
+index 0a31ce317a4ab0c83e3d735ec4108244f0418b52..b737c9fc3488373d8c65cdba103a2c2ab7d4a923 100644
--- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
+++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
@@ -136,6 +136,7 @@ void UIDelegate::setDelegate(id<WKUIDelegate> delegate)
@@ -10116,7 +9973,7 @@ index 3daa4d80bdbdd9c1e9ca74ba9f1c3217f6f4628f..9ee399d8417acca18c3e1fe55ccc88ca
m_delegateMethods.webViewRequestStorageAccessPanelUnderFirstPartyCompletionHandler = [delegate respondsToSelector:@selector(_webView:requestStorageAccessPanelForDomain:underCurrentDomain:completionHandler:)];
m_delegateMethods.webViewRequestStorageAccessPanelForDomainUnderCurrentDomainForQuirkDomainsCompletionHandler = [delegate respondsToSelector:@selector(_webView:requestStorageAccessPanelForDomain:underCurrentDomain:forQuirkDomains:completionHandler:)];
m_delegateMethods.webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(_webView:runBeforeUnloadConfirmPanelWithMessage:initiatedByFrame:completionHandler:)];
-@@ -500,6 +501,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St
+@@ -509,6 +510,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St
}).get()];
}
@@ -10133,10 +9990,10 @@ index 3daa4d80bdbdd9c1e9ca74ba9f1c3217f6f4628f..9ee399d8417acca18c3e1fe55ccc88ca
{
RefPtr uiDelegate = m_uiDelegate.get();
diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
-index 7587e1142a070da697953b79070174730d259e52..b1a440eec49540d30312b4d17da59e5159eeaa71 100644
+index d1360a8b2ae21ca5fd9088a6d5402c6e3d771cc5..b13e1c95b488c13a8097d5e0e82a63b71a9841ea 100644
--- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
+++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
-@@ -44,7 +44,9 @@
+@@ -45,7 +45,9 @@
#import "NativeWebKeyboardEvent.h"
#import "NativeWebMouseEvent.h"
#import "NavigationState.h"
@@ -10145,8 +10002,8 @@ index 7587e1142a070da697953b79070174730d259e52..b1a440eec49540d30312b4d17da59e51
+#import "PasteboardTypes.h"
#import "PlatformXRSystem.h"
#import "PlaybackSessionManagerProxy.h"
- #import "RemoteLayerTreeTransaction.h"
-@@ -356,11 +358,86 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting()
+ #import "RemoteLayerTreeCommitBundle.h"
+@@ -396,11 +398,85 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting()
void WebPageProxy::startDrag(const DragItem& dragItem, ShareableBitmap::Handle&& dragImageHandle, const std::optional<NodeIdentifier>& nodeID)
{
@@ -10164,8 +10021,7 @@ index 7587e1142a070da697953b79070174730d259e52..b1a440eec49540d30312b4d17da59e51
+ dragCancelled();
+ return;
+ }
-+ NSString *utiType = attachment->utiType().createNSString().get();
-+ if (!utiType.length) {
++ if (!attachment->utiType().createNSString().get().length) {
+ dragCancelled();
+ return;
+ }
@@ -10234,11 +10090,23 @@ index 7587e1142a070da697953b79070174730d259e52..b1a440eec49540d30312b4d17da59e51
#if ENABLE(ATTACHMENT_ELEMENT)
+diff --git a/Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
+index 21f455e9186f707167780ca297c1b667d279b980..2345886719fc849fedf763e5c839c17d095aa641 100644
+--- a/Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
++++ b/Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
+@@ -34,6 +34,7 @@
+ #import "RemotePageProxy.h"
+ #import "SandboxExtension.h"
+ #import "WebPageProxy.h"
++#import "WebPageMessages.h"
+ #import "WebPreferences.h"
+ #import "WebProcessMessages.h"
+ #import "WebProcessProxy.h"
diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
-index 7598f3e02823be871f4bf7f43171409a06aaac0e..f37ae417ee4cd8504cf7581afdcce6a5ca1fa5b9 100644
+index f94fa02ea9f0a58ce472170f4c672fb5f57c6b5b..1d6b298364ef6ad8245621103c72569e7aeeb80f 100644
--- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
+++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
-@@ -449,7 +449,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
+@@ -456,7 +456,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
auto screenProperties = WebCore::collectScreenProperties();
parameters.screenProperties = WTFMove(screenProperties);
#if PLATFORM(MAC)
@@ -10247,7 +10115,7 @@ index 7598f3e02823be871f4bf7f43171409a06aaac0e..f37ae417ee4cd8504cf7581afdcce6a5
#endif
#if PLATFORM(VISION)
-@@ -859,8 +859,8 @@ void WebProcessPool::registerNotificationObservers()
+@@ -866,8 +866,8 @@ void WebProcessPool::registerNotificationObservers()
}];
m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
@@ -10259,7 +10127,7 @@ index 7598f3e02823be871f4bf7f43171409a06aaac0e..f37ae417ee4cd8504cf7581afdcce6a5
m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSAppSingleton() queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
-index c25814a7b7c26ad90c1b51ff10d334200da9472b..d9b6654e62a6766824a6df45b73408c3141e2893 100644
+index b0e9367b33f7bc34b956e2eee96af22feee558f3..049ddd3368f2863476f42026f545ec01675ffc92 100644
--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
@@ -33,6 +33,7 @@
@@ -10483,10 +10351,10 @@ index f84e75be2ecfd15ad97a45cac3a4bca4ec41faf2..73ef164a9eb25ae22032c35154d0c57a
// 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 770377f456a8008b19acc3f11f03a6c088514b76..51b0f6c6de24d495fa8aafedfbbb059e03574ff9 100644
+index 0b5bf44fd50b6a0eaf815cb80d4f77093fadcab4..3d9841281b2541492116c813424b4ac202253b08 100644
--- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.h
+++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.h
-@@ -166,6 +166,7 @@ private:
+@@ -167,6 +167,7 @@ private:
#if HAVE(MODERN_DOWNLOADPROGRESS)
RefPtr<ProcessAssertion> m_assertion;
#endif
@@ -10495,7 +10363,7 @@ index 770377f456a8008b19acc3f11f03a6c088514b76..51b0f6c6de24d495fa8aafedfbbb059e
} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/DrawingAreaProxy.h b/Source/WebKit/UIProcess/DrawingAreaProxy.h
-index f78505520812f91ea9b96c6a6a071ec84850371d..d23fa735d38e77ff6da92a9a2bb3f972feade9be 100644
+index 5ac89b08c0233dbb611025af9f324005d0a2ba15..ac43edcde0f3d2847141fbee5250dbbee18a7b78 100644
--- a/Source/WebKit/UIProcess/DrawingAreaProxy.h
+++ b/Source/WebKit/UIProcess/DrawingAreaProxy.h
@@ -96,6 +96,7 @@ public:
@@ -10508,10 +10376,10 @@ index f78505520812f91ea9b96c6a6a071ec84850371d..d23fa735d38e77ff6da92a9a2bb3f972
virtual void sizeToContentAutoSizeMaximumSizeDidChange() { }
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..3733d0c6e8875f325bd249232b8f8205256400f8
+index 0000000000000000000000000000000000000000..4ff6583e19057909124c2b2aab3f444089b85584
--- /dev/null
+++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp
-@@ -0,0 +1,341 @@
+@@ -0,0 +1,343 @@
+/*
+ * Copyright (C) 2020 Microsoft Corporation.
+ *
@@ -10614,6 +10482,7 @@ index 0000000000000000000000000000000000000000..3733d0c6e8875f325bd249232b8f8205
+#if USE(SKIA)
+void InspectorScreencastAgent::didPaint(sk_sp<SkImage>&& surface)
+{
++ MonotonicTime timestamp = MonotonicTime::now();
+ sk_sp<SkImage> image(surface);
+#if PLATFORM(WPE) || PLATFORM(WIN)
+ // Get actual image size (in device pixels).
@@ -10676,7 +10545,7 @@ index 0000000000000000000000000000000000000000..3733d0c6e8875f325bd249232b8f8205
+ sk_sp<SkData> jpegData = stream.detachAsData();
+ String result = base64EncodeToString(std::span(reinterpret_cast<const unsigned char*>(jpegData->data()), jpegData->size()));
+ ++m_screencastFramesInFlight;
-+ m_frontendDispatcher->screencastFrame(result, displaySize.width(), displaySize.height());
++ m_frontendDispatcher->screencastFrame(result, timestamp.secondsSinceEpoch().value(), displaySize.width(), displaySize.height());
+ }
+}
+#endif
@@ -10791,6 +10660,7 @@ index 0000000000000000000000000000000000000000..3733d0c6e8875f325bd249232b8f8205
+ return;
+ RetainPtr<CGImageRef> imageRef = m_page.pageClient()->takeSnapshotForAutomation();
+ if (m_screencast && m_screencastFramesInFlight <= kMaxFramesInFlight) {
++ MonotonicTime timestamp = MonotonicTime::now();
+ CGImage* imagePtr = imageRef.get();
+ WebCore::IntSize imageSize(CGImageGetWidth(imagePtr), CGImageGetHeight(imagePtr));
+ WebCore::IntSize displaySize = imageSize;
@@ -10819,7 +10689,7 @@ index 0000000000000000000000000000000000000000..3733d0c6e8875f325bd249232b8f8205
+ if (m_lastFrameDigest != digest) {
+ String base64Data = base64EncodeToString(data);
+ ++m_screencastFramesInFlight;
-+ m_frontendDispatcher->screencastFrame(base64Data, displaySize.width(), displaySize.height());
++ m_frontendDispatcher->screencastFrame(base64Data, timestamp.secondsSinceEpoch().value(), displaySize.width(), displaySize.height());
+ m_lastFrameDigest = digest;
+ }
+ }
@@ -11590,7 +11460,7 @@ index 0000000000000000000000000000000000000000..e2ce910f3fd7f587add552275b7e7176
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
-index a0a119f4269ce96a61ce4f1c2f35745fc8291780..3684c1683d622f7e906863dcf90e307964a06e11 100644
+index ec94387154fae83a4a1f5d22e0d559c802ba365d..023b75cc64faffc0215082e10f8d070058980f85 100644
--- a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
+++ b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
@@ -26,16 +26,24 @@
@@ -11638,8 +11508,8 @@ index a0a119f4269ce96a61ce4f1c2f35745fc8291780..3684c1683d622f7e906863dcf90e3079
, m_backendDispatcher(BackendDispatcher::create(m_frontendRouter.copyRef()))
, m_inspectedPage(inspectedPage)
{
-- auto targetAgent = makeUnique<InspectorTargetAgent>(m_frontendRouter, m_backendDispatcher);
-- m_targetAgent = targetAgent.get();
+- auto targetAgent = makeUniqueRef<InspectorTargetAgent>(m_frontendRouter, m_backendDispatcher);
+- m_targetAgent = targetAgent.ptr();
- m_agents.append(WTFMove(targetAgent));
}
@@ -11654,18 +11524,18 @@ index a0a119f4269ce96a61ce4f1c2f35745fc8291780..3684c1683d622f7e906863dcf90e3079
void WebPageInspectorController::init()
+{
-+ auto targetAgent = makeUnique<InspectorTargetAgent>(m_frontendRouter.get(), m_backendDispatcher.get());
-+ m_targetAgent = targetAgent.get();
++ auto targetAgent = makeUniqueRef<InspectorTargetAgent>(m_frontendRouter.get(), m_backendDispatcher.get());
++ m_targetAgent = targetAgent.ptr();
+ m_agents.append(WTFMove(targetAgent));
-+ auto emulationAgent = makeUnique<WebPageInspectorEmulationAgent>(m_backendDispatcher.get(), m_inspectedPage);
-+ m_emulationAgent = emulationAgent.get();
++ auto emulationAgent = makeUniqueRef<WebPageInspectorEmulationAgent>(m_backendDispatcher.get(), m_inspectedPage);
++ m_emulationAgent = emulationAgent.ptr();
+ m_agents.append(WTFMove(emulationAgent));
-+ auto inputAgent = makeUnique<WebPageInspectorInputAgent>(m_backendDispatcher.get(), m_inspectedPage);
-+ m_inputAgent = inputAgent.get();
++ auto inputAgent = makeUniqueRef<WebPageInspectorInputAgent>(m_backendDispatcher.get(), m_inspectedPage);
++ m_inputAgent = inputAgent.ptr();
+ m_agents.append(WTFMove(inputAgent));
-+ m_agents.append(makeUnique<InspectorDialogAgent>(m_backendDispatcher.get(), m_frontendRouter.get(), m_inspectedPage));
-+ auto screencastAgent = makeUnique<InspectorScreencastAgent>(m_backendDispatcher.get(), m_frontendRouter.get(), m_inspectedPage);
-+ m_screecastAgent = screencastAgent.get();
++ m_agents.append(makeUniqueRef<InspectorDialogAgent>(m_backendDispatcher.get(), m_frontendRouter.get(), m_inspectedPage));
++ auto screencastAgent = makeUniqueRef<InspectorScreencastAgent>(m_backendDispatcher.get(), m_frontendRouter.get(), m_inspectedPage);
++ m_screecastAgent = screencastAgent.ptr();
+ m_agents.append(WTFMove(screencastAgent));
+ if (s_observer)
+ s_observer->didCreateInspectorController(m_inspectedPage);
@@ -12051,7 +11921,7 @@ index 43345234f9bbcdfac9c532e6b7e972002ef59eff..2a6418236f1ab9848c6e2828937bd4e1
} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.cpp b/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.cpp
-index 1c393ce01ed94f96908c674f969c383d4ddc50d7..404e46f4786f54b946f254efa6f6b06cad765bf3 100644
+index 947a4447a396e492a41579fbfdc208e323aa3669..134d267b970d730d30b9b6c7838e9c4b1d715de7 100644
--- a/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.cpp
+++ b/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.cpp
@@ -59,6 +59,11 @@ std::unique_ptr<WebPageInspectorTargetProxy> WebPageInspectorTargetProxy::create
@@ -12099,7 +11969,7 @@ index 1c393ce01ed94f96908c674f969c383d4ddc50d7..404e46f4786f54b946f254efa6f6b06c
{
return !!m_provisionalPage;
diff --git a/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.h b/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.h
-index 32e18c59ffdeae8564664dbc851ad1f26aebdfc4..ecc55f78d2deed7d7342ecbc90c2766adfb1799d 100644
+index 6d9cb376ca283266fbd206ef1c69168d83c7a864..b1a4f8a09be5f3b1dfd88ab2653e3cd104e970af 100644
--- a/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.h
+++ b/Source/WebKit/UIProcess/Inspector/WebPageInspectorTargetProxy.h
@@ -43,6 +43,7 @@ class WebPageInspectorTargetProxy final : public InspectorTargetProxy {
@@ -12108,9 +11978,9 @@ index 32e18c59ffdeae8564664dbc851ad1f26aebdfc4..ecc55f78d2deed7d7342ecbc90c2766a
static std::unique_ptr<WebPageInspectorTargetProxy> create(ProvisionalPageProxy&, const String& targetId, Inspector::InspectorTargetType);
+ static std::unique_ptr<WebPageInspectorTargetProxy> create(ProvisionalPageProxy&, const String& targetId);
WebPageInspectorTargetProxy(WebPageProxy&, const String& targetId, Inspector::InspectorTargetType);
- ~WebPageInspectorTargetProxy() = default;
-@@ -52,8 +53,13 @@ public:
+ void didCommitProvisionalTarget() override;
+@@ -51,8 +52,13 @@ public:
void connect(Inspector::FrontendChannel::ConnectionType) override;
void disconnect() override;
void sendMessageToTargetBackend(const String&) override;
@@ -13684,11 +13554,23 @@ index 6723ee0d9943be07bc8ad09d2b678838aca968df..0d7fb3c7b1a4c877a2ff2f2189d12c7d
PROCESS_INFORMATION processInformation { };
BOOL result = ::CreateProcess(0, commandLine.mutableSpan().data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation);
+diff --git a/Source/WebKit/UIProcess/Media/RemoteMediaSessionManagerProxy.cpp b/Source/WebKit/UIProcess/Media/RemoteMediaSessionManagerProxy.cpp
+index c82d6a51075936f8c5256b34931386e9f4d7ed9f..43d78e1d5e9aa84c59ebe1c3f6cfca8df46e552e 100644
+--- a/Source/WebKit/UIProcess/Media/RemoteMediaSessionManagerProxy.cpp
++++ b/Source/WebKit/UIProcess/Media/RemoteMediaSessionManagerProxy.cpp
+@@ -30,6 +30,7 @@
+
+ #include "RemoteMediaSessionClientProxy.h"
+ #include "RemoteMediaSessionManagerMessages.h"
++#include "RemoteMediaSessionManager.h"
+ #include "RemoteMediaSessionManagerProxyMessages.h"
+ #include "RemoteMediaSessionProxy.h"
+ #include "RemoteMediaSessionState.h"
diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h
-index 5eb9a2c8ffee283bd4cf23b32a3319d21c675299..d0d864d4b1e098b7b909afb0055a4c88b354ae59 100644
+index de05b5599f14d5ffc3f0dda05c4bb3a6cc7748aa..43b365085d657edf55d98eba0aabcc1e05bb7714 100644
--- a/Source/WebKit/UIProcess/PageClient.h
+++ b/Source/WebKit/UIProcess/PageClient.h
-@@ -74,6 +74,11 @@
+@@ -77,6 +77,11 @@
#include <WebCore/PlatformTextAlternatives.h>
#endif
@@ -13700,17 +13582,15 @@ index 5eb9a2c8ffee283bd4cf23b32a3319d21c675299..d0d864d4b1e098b7b909afb0055a4c88
OBJC_CLASS AVPlayerViewController;
OBJC_CLASS CALayer;
OBJC_CLASS NSFileWrapper;
-@@ -387,7 +392,16 @@ public:
+@@ -395,7 +400,14 @@ public:
virtual void selectionDidChange() = 0;
#endif
--#if PLATFORM(COCOA) || PLATFORM(GTK)
+-#if PLATFORM(COCOA) || PLATFORM(GTK) || (PLATFORM(WPE) && USE(SKIA))
+// Paywright begin
+#if PLATFORM(COCOA)
+ virtual RetainPtr<CGImageRef> takeSnapshotForAutomation() = 0;
-+#elif PLATFORM(WPE)
-+ virtual sk_sp<SkImage> takeViewSnapshot(std::optional<WebCore::IntRect>&&, bool nominalResolution = false) = 0;
-+#elif PLATFORM(GTK)
++#elif PLATFORM(GTK) || (PLATFORM(WPE) && USE(SKIA))
+ virtual RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&, bool nominalResolution = false) = 0;
+#endif
+// Paywright end
@@ -13863,7 +13743,7 @@ index 39a815b0819e99e9575d8f3deec07affd2e9c404..5c9196627dd1bcdbf80fb41c09d77fb2
#include "FrameProcess.h"
#include "ProvisionalFrameCreationParameters.h"
diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.h b/Source/WebKit/UIProcess/ProvisionalPageProxy.h
-index eb26056800aaec0f2919438d97ffceb72e70fc31..4e53ec412c541efbf9a5cdb0311adf56cceaca1e 100644
+index 17fbb07fee4057b5066e051723ec3249af7ba23b..ab5ed59333ed74d2ef48bfe06e02804b81759239 100644
--- a/Source/WebKit/UIProcess/ProvisionalPageProxy.h
+++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.h
@@ -34,6 +34,7 @@
@@ -14188,8 +14068,20 @@ index 0000000000000000000000000000000000000000..23626aa70d5a14e6484c81e05b146b37
+} // namespace WebKit
+
+#endif // ENABLE(REMOTE_INSPECTOR)
+diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteAnimationTimeline.cpp b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteAnimationTimeline.cpp
+index 7ef986965d3fda34b4f09279c62bdad40712ab12..5e0bc508f72bbbd0bcb4bb1254782028961867a9 100644
+--- a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteAnimationTimeline.cpp
++++ b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteAnimationTimeline.cpp
+@@ -30,6 +30,7 @@
+
+ #import "RemoteAnimationUtilities.h"
+ #import <wtf/TZoneMallocInlines.h>
++#import <wtf/MonotonicTime.h>
+
+ namespace WebKit {
+
diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteScrollingTreeMac.mm b/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteScrollingTreeMac.mm
-index b3557b3f7ff2283113191f61b5a5ea1fce8065e2..1ded8a28fcd870b0bae4965d60a56c1d582077b9 100644
+index 50879098a2b8679c2a79c2ca5486d118e0f084fc..3a48021b401bf11f1af32e0b818c361092729da1 100644
--- a/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteScrollingTreeMac.mm
+++ b/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteScrollingTreeMac.mm
@@ -46,6 +46,7 @@
@@ -14218,7 +14110,7 @@ index 3f6cd845733e2e8f5e25c318e7ab54f77032d4cf..e4399bfd734a28ef5df5ec855b7c78b4
class RemotePagePlaybackSessionManagerProxy : public IPC::MessageReceiver, public RefCounted<RemotePagePlaybackSessionManagerProxy> {
diff --git a/Source/WebKit/UIProcess/RemotePageProxy.cpp b/Source/WebKit/UIProcess/RemotePageProxy.cpp
-index 75cbe6ba806eb865a83119b2a15a6a86dd632c59..a21c6d7f4dab3ab2456ffc3c7b558464268295a6 100644
+index f59a65a43000a670649dc24c4bb5c0964b841601..57a006bb3c4325420f8e595b6a4f43ac371d1dfa 100644
--- a/Source/WebKit/UIProcess/RemotePageProxy.cpp
+++ b/Source/WebKit/UIProcess/RemotePageProxy.cpp
@@ -37,6 +37,7 @@
@@ -14226,10 +14118,10 @@ index 75cbe6ba806eb865a83119b2a15a6a86dd632c59..a21c6d7f4dab3ab2456ffc3c7b558464
#include "RemotePageDrawingAreaProxy.h"
#include "RemotePageFullscreenManagerProxy.h"
+#include "RemotePagePlaybackSessionManagerProxy.h"
+ #include "RemotePageScreenOrientationManagerProxy.h"
#include "RemotePageVisitedLinkStoreRegistration.h"
#include "UserMediaProcessManager.h"
- #include "WebFrameProxy.h"
-@@ -51,12 +52,14 @@
+@@ -55,12 +56,14 @@
#include <WebCore/RemoteUserInputEventData.h>
#include <wtf/TZoneMallocInlines.h>
@@ -14243,7 +14135,7 @@ index 75cbe6ba806eb865a83119b2a15a6a86dd632c59..a21c6d7f4dab3ab2456ffc3c7b558464
+#include "VideoPresentationManagerProxy.h"
#endif
- namespace WebKit {
+ #if PLATFORM(IOS_FAMILY) && ENABLE(DEVICE_ORIENTATION)
diff --git a/Source/WebKit/UIProcess/WebContextMenuProxy.h b/Source/WebKit/UIProcess/WebContextMenuProxy.h
index 697a350812e1bf73dd44cc3d723a6a291f9d59d1..a8e1edd710d88f48632d51fd05aa964732d727d3 100644
--- a/Source/WebKit/UIProcess/WebContextMenuProxy.h
@@ -14256,20 +14148,6 @@ index 697a350812e1bf73dd44cc3d723a6a291f9d59d1..a8e1edd710d88f48632d51fd05aa9647
WebPageProxy* page() const { return m_page.get(); }
RefPtr<WebPageProxy> protectedPage() const;
-diff --git a/Source/WebKit/UIProcess/WebFrameProxy.cpp b/Source/WebKit/UIProcess/WebFrameProxy.cpp
-index 5fdb94c7c596bf6fc32c1dc29544a7b662bed349..dcb9a97492039ea8bc5006635c07f509eb93ca3a 100644
---- a/Source/WebKit/UIProcess/WebFrameProxy.cpp
-+++ b/Source/WebKit/UIProcess/WebFrameProxy.cpp
-@@ -183,6 +183,9 @@ void WebFrameProxy::webProcessWillShutDown()
- for (auto& childFrame : std::exchange(m_childFrames, { }))
- childFrame->webProcessWillShutDown();
-
-+ if (RefPtr page = m_page.get())
-+ page->inspectorController().destroyInspectorTarget(WebFrameInspectorTarget::toTargetID(frameID()));
-+
- m_page = nullptr;
-
- if (RefPtr activeListener = m_activeListener) {
diff --git a/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.cpp b/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..058b9a31fc23cc36a228ef63cc89a80ccf3fa62e
@@ -14519,7 +14397,7 @@ index 0000000000000000000000000000000000000000..14db923537ba3cad1961a748ae5e1d66
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..6552cca25752823321adf0aea2b46a2df90a3ec1
+index 0000000000000000000000000000000000000000..68aa4d902c1d12e0f7c6d932a3115532f8dc270f
--- /dev/null
+++ b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp
@@ -0,0 +1,394 @@
@@ -14911,7 +14789,7 @@ index 0000000000000000000000000000000000000000..6552cca25752823321adf0aea2b46a2d
+ WebCore::FloatSize delta = {-eventDeltaX, -eventDeltaY};
+ WebCore::FloatSize wheelTicks = delta;
+ wheelTicks.scale(1.0f / WebCore::Scrollbar::pixelsPerLineStep());
-+ WebWheelEvent webEvent({WebEventType::Wheel, eventModifiers, timestamp}, {x, y}, {x, y}, delta, wheelTicks, WebWheelEvent::ScrollByPixelWheelEvent);
++ WebWheelEvent webEvent({WebEventType::Wheel, eventModifiers, timestamp}, {x, y}, {x, y}, delta, wheelTicks, WebWheelEvent::Granularity::ScrollByPixelWheelEvent);
+ NativeWebWheelEvent event(webEvent);
+ m_page.handleNativeWheelEvent(event);
+}
@@ -15011,10 +14889,10 @@ index 0000000000000000000000000000000000000000..1430b24f8d4b992ccd637ef6ff6a27e9
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
-index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc115017379a 100644
+index d0b4b0e0264fb5b5e795ad17754d6f667452cb9d..2d01d2e9d787112a4b399653b0e178cf411590ca 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
-@@ -210,6 +210,7 @@
+@@ -214,6 +214,7 @@
#include <WebCore/CaptureDeviceManager.h>
#include <WebCore/CaptureDeviceWithCapabilities.h>
#include <WebCore/ChromeClient.h>
@@ -15022,7 +14900,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
#include <WebCore/CompositionHighlight.h>
#include <WebCore/CrossSiteNavigationDataTransfer.h>
#include <WebCore/CryptoKey.h>
-@@ -222,6 +223,7 @@
+@@ -226,6 +227,7 @@
#include <WebCore/DigitalCredentialsProtocols.h>
#include <WebCore/DigitalCredentialsRequestData.h>
#include <WebCore/DigitalCredentialsResponseData.h>
@@ -15030,7 +14908,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
#include <WebCore/DragController.h>
#include <WebCore/DragData.h>
#include <WebCore/ElementContext.h>
-@@ -245,6 +247,7 @@
+@@ -250,6 +252,7 @@
#include <WebCore/ModalContainerTypes.h>
#include <WebCore/NotImplemented.h>
#include <WebCore/OrganizationStorageAccessPromptQuirk.h>
@@ -15038,7 +14916,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
#include <WebCore/PerformanceLoggingClient.h>
#include <WebCore/PermissionDescriptor.h>
#include <WebCore/PermissionState.h>
-@@ -254,10 +257,13 @@
+@@ -259,10 +262,12 @@
#include <WebCore/Quirks.h>
#include <WebCore/RealtimeMediaSourceCenter.h>
#include <WebCore/ReferrerPolicy.h>
@@ -15048,11 +14926,10 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
#include <WebCore/ResourceLoadStatistics.h>
#include <WebCore/RunJavaScriptParameters.h>
+#include <WebCore/ScreenOrientationType.h>
-+#include <WebCore/SecurityOriginData.h>
+ #include <WebCore/SecurityOrigin.h>
#include <WebCore/SerializedCryptoKeyWrap.h>
#include <WebCore/SerializedScriptValue.h>
- #include <WebCore/ShareData.h>
-@@ -345,7 +351,7 @@
+@@ -351,7 +356,7 @@
#include "ViewSnapshotStore.h"
#endif
@@ -15061,7 +14938,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
#include <WebCore/SelectionData.h>
#endif
-@@ -1016,6 +1022,10 @@ WebPageProxy::~WebPageProxy()
+@@ -1054,6 +1059,10 @@ WebPageProxy::~WebPageProxy()
ASSERT(webPageProxyMap().get(m_identifier) == this);
webPageProxyMap().remove(m_identifier);
@@ -15072,7 +14949,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
}
Ref<WebPageProxy> WebPageProxy::Internals::protectedPage() const
-@@ -1593,7 +1603,7 @@ void WebPageProxy::didAttachToRunningProcess()
+@@ -1635,7 +1644,7 @@ void WebPageProxy::didAttachToRunningProcess()
#if ENABLE(FULLSCREEN_API)
ASSERT(!m_fullScreenManager);
@@ -15081,7 +14958,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
#endif
#if ENABLE(VIDEO_PRESENTATION_MODE)
ASSERT(!m_playbackSessionManager);
-@@ -1757,6 +1767,7 @@ void WebPageProxy::initializeWebPage(const Site& site, WebCore::SandboxFlags eff
+@@ -1799,6 +1808,7 @@ void WebPageProxy::initializeWebPage(const Site& site, WebCore::SandboxFlags eff
if (preferences->siteIsolationEnabled())
browsingContextGroup->addPage(*this);
process->send(Messages::WebProcess::CreateWebPage(m_webPageID, creationParameters(process, *protectedDrawingArea(), m_mainFrame->frameID(), std::nullopt)), 0);
@@ -15089,7 +14966,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
#if ENABLE(WINDOW_PROXY_PROPERTY_ACCESS_NOTIFICATION)
internals().frameLoadStateObserver = WebPageProxyFrameLoadStateObserver::create();
-@@ -2071,6 +2082,21 @@ Ref<WebProcessProxy> WebPageProxy::ensureProtectedRunningProcess()
+@@ -2121,6 +2131,21 @@ Ref<WebProcessProxy> WebPageProxy::ensureProtectedRunningProcess()
return ensureRunningProcess();
}
@@ -15111,7 +14988,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
RefPtr<API::Navigation> WebPageProxy::loadRequest(WebCore::ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, IsPerformingHTTPFallback isPerformingHTTPFallback, std::unique_ptr<NavigationActionData>&& lastNavigationAction, API::Object* userData, bool isRequestFromClientOrUserInput)
{
if (m_isClosed)
-@@ -2190,11 +2216,29 @@ void WebPageProxy::loadRequestWithNavigationShared(Ref<WebProcessProxy>&& proces
+@@ -2242,11 +2267,29 @@ void WebPageProxy::loadRequestWithNavigationShared(Ref<WebProcessProxy>&& proces
navigation->setIsLoadedWithNavigationShared(true);
protectedProcess->markProcessAsRecentlyUsed();
@@ -15145,7 +15022,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
});
}
-@@ -2757,6 +2801,63 @@ RefPtr<WebAutomationSession> WebPageProxy::activeAutomationSession() const
+@@ -2809,6 +2852,63 @@ RefPtr<WebAutomationSession> WebPageProxy::activeAutomationSession() const
return m_configuration->processPool().automationSession();
}
@@ -15209,7 +15086,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
void WebPageProxy::createInspectorTarget(IPC::Connection& connection, const String& targetId, Inspector::InspectorTargetType type)
{
MESSAGE_CHECK_BASE(!targetId.isEmpty(), connection);
-@@ -3044,6 +3145,24 @@ void WebPageProxy::updateActivityState(OptionSet<ActivityState> flagsToUpdate)
+@@ -3098,6 +3198,24 @@ void WebPageProxy::updateActivityState(OptionSet<ActivityState> flagsToUpdate)
bool wasVisible = isViewVisible();
RefPtr pageClient = this->pageClient();
internals().activityState.remove(flagsToUpdate);
@@ -15234,7 +15111,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
if (flagsToUpdate & ActivityState::IsFocused && pageClient->isViewFocused())
internals().activityState.add(ActivityState::IsFocused);
if (flagsToUpdate & ActivityState::WindowIsActive && pageClient->isViewWindowActive())
-@@ -3809,7 +3928,7 @@ void WebPageProxy::performDragOperation(DragData& dragData, const String& dragSt
+@@ -3867,7 +3985,7 @@ void WebPageProxy::performDragOperation(DragData& dragData, const String& dragSt
if (!hasRunningProcess())
return;
@@ -15243,7 +15120,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
URL url { dragData.asURL() };
if (url.protocolIsFile())
protectedLegacyMainFrameProcess()->assumeReadAccessToBaseURL(*this, url.string(), [] { });
-@@ -3837,6 +3956,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
+@@ -3895,6 +4013,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
if (!hasRunningProcess())
return;
@@ -15252,8 +15129,8 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
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;
-@@ -3848,7 +3969,7 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
- dragData.setClientPosition(remoteUserInputEventData->transformedPoint);
+@@ -3906,7 +4026,7 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
+ dragData.setClientPosition(roundedIntPoint(remoteUserInputEventData->transformedPoint));
performDragControllerAction(action, dragData, remoteUserInputEventData->targetFrameID);
};
-#if PLATFORM(GTK)
@@ -15261,7 +15138,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
ASSERT(dragData.platformData());
sendWithAsyncReplyToProcessContainingFrame(frameID, Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags()), WTFMove(completionHandler));
#else
-@@ -3883,17 +4004,36 @@ void WebPageProxy::didPerformDragControllerAction(std::optional<WebCore::DragOpe
+@@ -3941,17 +4061,36 @@ void WebPageProxy::didPerformDragControllerAction(std::optional<WebCore::DragOpe
setDragCaretRect(insertionRect);
if (RefPtr pageClient = this->pageClient())
pageClient->didPerformDragControllerAction();
@@ -15301,7 +15178,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
didStartDrag();
}
#endif
-@@ -3914,6 +4054,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo
+@@ -3972,6 +4111,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo
setDragCaretRect({ });
}
@@ -15326,7 +15203,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
void WebPageProxy::didStartDrag()
{
if (!hasRunningProcess())
-@@ -3921,6 +4079,26 @@ void WebPageProxy::didStartDrag()
+@@ -3979,6 +4136,26 @@ void WebPageProxy::didStartDrag()
discardQueuedMouseEvents();
send(Messages::WebPage::DidStartDrag());
@@ -15353,9 +15230,9 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
}
void WebPageProxy::dragCancelled()
-@@ -4092,26 +4270,47 @@ void WebPageProxy::processNextQueuedMouseEvent()
- process->startResponsivenessTimer();
- }
+@@ -4159,26 +4336,47 @@ void WebPageProxy::processNextQueuedMouseEvent()
+ auto eventType = event->type();
+ startResponsivenessTimerForMouseEvent(*targetFrame, eventType);
- std::optional<Vector<SandboxExtension::Handle>> sandboxExtensions;
+ m_lastMousePositionForDrag = roundedIntPoint(event->position());
@@ -15386,7 +15263,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
- LOG_WITH_STREAM(MouseHandling, stream << "UIProcess: sent mouse event " << eventType << " (queue size " << internals().mouseEventQueue.size() << ", coalesced events size " << internals().coalescedMouseEvents.size() << ")");
+ LOG_WITH_STREAM(MouseHandling, stream << "UIProcess: sent mouse event " << eventType << " (queue size " << internals().mouseEventQueue.size() << ", coalesced events size " << internals().coalescedMouseEvents.size() << ")");
-- sendMouseEvent(m_mainFrame->frameID(), eventWithCoalescedEvents, WTFMove(sandboxExtensions));
+- sendMouseEvent(targetFrame->frameID(), eventWithCoalescedEvents, WTFMove(sandboxExtensions));
+ sendMouseEvent(m_mainFrame->frameID(), eventWithCoalescedEvents, WTFMove(sandboxExtensions));
- internals().coalescedMouseEvents.clear();
@@ -15412,8 +15289,8 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
+ }
}
- void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function<void ()>&& action)
-@@ -4309,6 +4508,8 @@ void WebPageProxy::wheelEventHandlingCompleted(bool wasHandled)
+ #if ENABLE(MAC_GESTURE_EVENTS)
+@@ -4402,6 +4600,8 @@ void WebPageProxy::wheelEventHandlingCompleted(bool wasHandled)
if (RefPtr automationSession = m_configuration->processPool().automationSession())
automationSession->wheelEventsFlushedForPage(*this);
@@ -15422,16 +15299,16 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
}
void WebPageProxy::cacheWheelEventScrollingAccelerationCurve(const NativeWebWheelEvent& nativeWheelEvent)
-@@ -4444,7 +4645,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b)
+@@ -4545,7 +4745,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b)
void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent)
{
--#if ENABLE(ASYNC_SCROLLING) && PLATFORM(COCOA)
-+#if ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS_FAMILY)
+-#if PLATFORM(COCOA)
++#if PLATFORM(IOS_FAMILY)
for (auto& touchPoint : touchStartEvent.touchPoints()) {
auto location = touchPoint.locationInRootView();
auto update = [this, location](TrackingType& trackingType, EventTrackingRegions::EventType eventType) {
-@@ -5163,6 +5364,7 @@ Ref<WebPageProxy> WebPageProxy::navigationOriginatingPage(const FrameInfoData& f
+@@ -5338,6 +5538,7 @@ Ref<WebPageProxy> WebPageProxy::navigationOriginatingPage(const FrameInfoData& f
void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, std::optional<std::pair<Ref<API::WebsitePolicies>, Ref<WebProcessProxy>>>&& websitePoliciesAndProcess, Ref<API::NavigationAction>&& navigationAction, WillContinueLoadInNewProcess willContinueLoadInNewProcess, std::optional<SandboxExtension::Handle> sandboxExtensionHandle, std::optional<PolicyDecisionConsoleMessage>&& consoleMessage, CompletionHandler<void(PolicyDecision&&)>&& completionHandler)
{
@@ -15439,7 +15316,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
if (!hasRunningProcess())
return completionHandler(PolicyDecision { });
-@@ -6174,6 +6376,7 @@ void WebPageProxy::viewScaleFactorDidChange(IPC::Connection& connection, double
+@@ -6357,6 +6558,7 @@ void WebPageProxy::viewScaleFactorDidChange(IPC::Connection& connection, double
MESSAGE_CHECK_BASE(scaleFactorIsValid(scaleFactor), connection);
if (!legacyMainFrameProcess().hasConnection(connection))
return;
@@ -15447,7 +15324,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
forEachWebContentProcess([&] (auto& process, auto pageID) {
if (&process == &legacyMainFrameProcess())
-@@ -6836,6 +7039,7 @@ void WebPageProxy::didDestroyNavigationShared(Ref<WebProcessProxy>&& process, We
+@@ -7141,6 +7343,7 @@ void WebPageProxy::didDestroyNavigationShared(Ref<WebProcessProxy>&& process, We
RefPtr protectedPageClient { pageClient() };
m_navigationState->didDestroyNavigation(process->coreProcessIdentifier(), navigationID);
@@ -15455,7 +15332,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
}
void WebPageProxy::didStartProvisionalLoadForFrame(IPC::Connection& connection, FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, std::optional<WebCore::NavigationIdentifier> navigationID, URL&& url, URL&& unreachableURL, const UserData& userData, WallTime timestamp)
-@@ -7202,6 +7406,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref<WebProcessProxy>&& p
+@@ -7509,6 +7712,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref<WebProcessProxy>&& p
m_failingProvisionalLoadURL = { };
@@ -15464,7 +15341,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
// If the provisional page's load fails then we destroy the provisional page.
if (m_provisionalPage && m_provisionalPage->mainFrame() == &frame && (willContinueLoading == WillContinueLoading::No || protectedPreferences()->siteIsolationEnabled()))
m_provisionalPage = nullptr;
-@@ -8779,6 +8985,8 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
+@@ -9142,6 +9347,8 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
if (RefPtr page = originatingFrameInfo->page())
openerAppInitiatedState = page->lastNavigationWasAppInitiated();
@@ -15473,15 +15350,15 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
auto completionHandler = [
this,
protectedThis = Ref { *this },
-@@ -8865,6 +9073,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
+@@ -9229,6 +9436,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
+ configuration->setInitialReferrerPolicy(effectiveReferrerPolicy);
+ configuration->setWindowFeatures(WTFMove(windowFeatures));
configuration->setOpenedMainFrameName(openedMainFrameName);
- if (!protectedPreferences()->siteIsolationEnabled())
- configuration->setRelatedPage(*this);
+ configuration->setOpenerPageForInspector(*this);
if (RefPtr openerFrame = WebFrameProxy::webFrame(originatingFrameInfoData.frameID); navigationActionData.hasOpener && openerFrame) {
- configuration->setOpenerInfo({ {
-@@ -8894,6 +9103,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
+ configuration->setRelatedPage(*this);
+@@ -9261,6 +9469,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
void WebPageProxy::showPage()
{
m_uiClient->showPage(this);
@@ -15489,7 +15366,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
}
bool WebPageProxy::hasOpenedPage() const
-@@ -9032,6 +9242,10 @@ void WebPageProxy::closePage()
+@@ -9414,6 +9623,10 @@ void WebPageProxy::closePage()
if (isClosed())
return;
@@ -15500,7 +15377,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:");
if (RefPtr pageClient = this->pageClient())
pageClient->clearAllEditCommands();
-@@ -9070,6 +9284,8 @@ void WebPageProxy::runJavaScriptAlert(IPC::Connection& connection, FrameIdentifi
+@@ -9452,6 +9665,8 @@ void WebPageProxy::runJavaScriptAlert(IPC::Connection& connection, FrameIdentifi
}
runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), WTFMove(message), [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, String&& message, CompletionHandler<void()>&& completion) mutable {
@@ -15509,7 +15386,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
page.m_uiClient->runJavaScriptAlert(page, WTFMove(message), frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable {
reply();
completion();
-@@ -9092,6 +9308,8 @@ void WebPageProxy::runJavaScriptConfirm(IPC::Connection& connection, FrameIdenti
+@@ -9474,6 +9689,8 @@ void WebPageProxy::runJavaScriptConfirm(IPC::Connection& connection, FrameIdenti
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->willShowJavaScriptDialog(*this, message, std::nullopt);
}
@@ -15518,7 +15395,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), WTFMove(message), [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, String&& message, CompletionHandler<void()>&& completion) mutable {
page.m_uiClient->runJavaScriptConfirm(page, WTFMove(message), frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](bool result) mutable {
-@@ -9116,6 +9334,8 @@ void WebPageProxy::runJavaScriptPrompt(IPC::Connection& connection, FrameIdentif
+@@ -9498,6 +9715,8 @@ void WebPageProxy::runJavaScriptPrompt(IPC::Connection& connection, FrameIdentif
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->willShowJavaScriptDialog(*this, message, defaultValue);
}
@@ -15527,7 +15404,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), WTFMove(message), [reply = WTFMove(reply), defaultValue= WTFMove(defaultValue)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, String&& message, CompletionHandler<void()>&& completion) mutable {
page.m_uiClient->runJavaScriptPrompt(page, WTFMove(message), WTFMove(defaultValue), frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](auto& result) mutable {
-@@ -9252,6 +9472,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(IPC::Connection& connection, Fram
+@@ -9634,6 +9853,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(IPC::Connection& connection, Fram
return;
}
}
@@ -15536,7 +15413,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
// Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer.
webProcess->stopResponsivenessTimer();
-@@ -9897,6 +10119,11 @@ void WebPageProxy::resourceLoadDidCompleteWithError(ResourceLoadInfo&& loadInfo,
+@@ -10292,6 +10513,11 @@ void WebPageProxy::resourceLoadDidCompleteWithError(ResourceLoadInfo&& loadInfo,
}
#if ENABLE(FULLSCREEN_API)
@@ -15548,7 +15425,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
WebFullScreenManagerProxy* WebPageProxy::fullScreenManager()
{
return m_fullScreenManager.get();
-@@ -10029,6 +10256,17 @@ void WebPageProxy::requestDOMPasteAccess(IPC::Connection& connection, DOMPasteAc
+@@ -10436,6 +10662,17 @@ void WebPageProxy::requestDOMPasteAccess(IPC::Connection& connection, DOMPasteAc
}
}
@@ -15566,7 +15443,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
protectedPageClient()->requestDOMPasteAccess(pasteAccessCategory, requiresInteraction, elementRect, originIdentifier, WTFMove(completionHandler));
}
-@@ -11064,6 +11302,8 @@ void WebPageProxy::mouseEventHandlingCompleted(std::optional<WebEventType> event
+@@ -11365,6 +11602,8 @@ void WebPageProxy::mouseEventHandlingCompleted(std::optional<WebEventType> event
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->mouseEventsFlushedForPage(*this);
didFinishProcessingAllPendingMouseEvents();
@@ -15575,7 +15452,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
}
}
-@@ -11099,6 +11339,7 @@ void WebPageProxy::keyEventHandlingCompleted(std::optional<WebEventType> eventTy
+@@ -11422,6 +11661,7 @@ void WebPageProxy::keyEventHandlingCompleted(std::optional<WebEventType> eventTy
if (!canProcessMoreKeyEvents) {
if (RefPtr automationSession = configuration().processPool().automationSession())
automationSession->keyboardEventsFlushedForPage(*this);
@@ -15583,9 +15460,9 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
}
}
-@@ -11533,7 +11774,10 @@ void WebPageProxy::dispatchProcessDidTerminate(WebProcessProxy& process, Process
- if (protectedPreferences()->siteIsolationEnabled())
+@@ -11866,7 +12106,10 @@ void WebPageProxy::dispatchProcessDidTerminate(WebProcessProxy& process, Process
protectedBrowsingContextGroup()->processDidTerminate(*this, process);
+ }
- bool handledByClient = false;
+ bool handledByClient = m_inspectorController->pageCrashed(reason);
@@ -15595,7 +15472,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
if (m_loaderClient)
handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this);
else
-@@ -12195,6 +12439,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
+@@ -12532,6 +12775,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
parameters.httpsUpgradeEnabled = preferences->upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false;
parameters.allowPostingLegacySynchronousMessages = m_configuration->allowPostingLegacySynchronousMessages();
@@ -15604,7 +15481,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
#if ENABLE(APP_HIGHLIGHTS)
parameters.appHighlightsVisible = appHighlightsVisibility() ? HighlightVisibility::Visible : HighlightVisibility::Hidden;
#endif
-@@ -12368,8 +12614,47 @@ void WebPageProxy::allowGamepadAccess()
+@@ -12707,8 +12952,47 @@ void WebPageProxy::allowGamepadAccess()
#endif // ENABLE(GAMEPAD)
@@ -15652,7 +15529,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) {
m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) {
if (shouldAllowLegacyTLS)
-@@ -12465,6 +12750,12 @@ void WebPageProxy::requestGeolocationPermissionForFrame(IPC::Connection& connect
+@@ -12804,6 +13088,12 @@ void WebPageProxy::requestGeolocationPermissionForFrame(IPC::Connection& connect
request->deny();
};
@@ -15665,7 +15542,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
// 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
-@@ -12531,6 +12822,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
+@@ -12870,6 +13160,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
shouldChangeDeniedToPrompt = false;
if (sessionID().isEphemeral()) {
@@ -15678,7 +15555,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
completionHandler(shouldChangeDeniedToPrompt ? PermissionState::Prompt : PermissionState::Denied);
return;
}
-@@ -12545,6 +12842,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
+@@ -12884,6 +13180,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
return;
}
@@ -15692,7 +15569,7 @@ index 5d0aee4580888ea1714d2c7aa0f7cd77f6a7c3bf..3e3a8a01d25af9ae0c88e941c094dc11
completionHandler(shouldChangeDeniedToPrompt ? PermissionState::Prompt : PermissionState::Denied);
return;
diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
-index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191030c1b39 100644
+index 9cb985c53f034ad4d70ca524d81fd00101b5e0a1..313378d78a0f329308097c203cf1973964b75f92 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.h
+++ b/Source/WebKit/UIProcess/WebPageProxy.h
@@ -28,6 +28,7 @@
@@ -15701,9 +15578,9 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
#include "APIObject.h"
+#include "APIWebsitePolicies.h"
#include "MessageReceiver.h"
+ #include <WebCore/LayerHostingContextIdentifier.h>
#include <wtf/ApproximateTime.h>
- #include <wtf/CheckedRef.h>
-@@ -38,6 +39,20 @@
+@@ -40,6 +41,20 @@
#include <wtf/RunLoop.h>
#include <wtf/UniqueRef.h>
#include <wtf/WeakHashSet.h>
@@ -15724,7 +15601,7 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
namespace API {
class Attachment;
-@@ -115,6 +130,7 @@ class DragData;
+@@ -117,6 +132,7 @@ class DragData;
class Exception;
class FloatPoint;
class FloatQuad;
@@ -15732,7 +15609,7 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
class FloatRect;
class FloatSize;
class FontAttributeChanges;
-@@ -773,6 +789,8 @@ public:
+@@ -788,6 +804,8 @@ public:
RefPtr<WebAutomationSession> activeAutomationSession() const;
WebPageInspectorController& inspectorController() { return m_inspectorController.get(); }
@@ -15741,7 +15618,7 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
#if PLATFORM(IOS_FAMILY)
void showInspectorIndication();
-@@ -806,6 +824,7 @@ public:
+@@ -822,6 +840,7 @@ public:
bool hasSleepDisabler() const;
#if ENABLE(FULLSCREEN_API)
@@ -15749,7 +15626,7 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
WebFullScreenManagerProxy* fullScreenManager();
RefPtr<WebFullScreenManagerProxy> protectedFullScreenManager();
void setFullScreenClientForTesting(std::unique_ptr<WebKit::WebFullScreenManagerProxyClient>&&);
-@@ -898,6 +917,12 @@ public:
+@@ -921,6 +940,12 @@ public:
void setPageLoadStateObserver(RefPtr<PageLoadStateObserverBase>&&);
@@ -15762,7 +15639,7 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
void initializeWebPage(const WebCore::Site&, WebCore::SandboxFlags, WebCore::ReferrerPolicy);
void setDrawingArea(RefPtr<DrawingAreaProxy>&&);
-@@ -929,6 +954,8 @@ public:
+@@ -952,6 +977,8 @@ public:
RefPtr<API::Navigation> loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy, WebCore::IsPerformingHTTPFallback);
RefPtr<API::Navigation> loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy, WebCore::IsPerformingHTTPFallback, std::unique_ptr<NavigationActionData>&&, API::Object* userData = nullptr, bool isRequestFromClientOrUserInput = true);
@@ -15771,7 +15648,7 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
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);
-@@ -1021,6 +1048,7 @@ public:
+@@ -1045,6 +1072,7 @@ public:
PageClient* pageClient() const;
RefPtr<PageClient> protectedPageClient() const;
@@ -15779,7 +15656,7 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
void setViewNeedsDisplay(const WebCore::Region&);
void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, WebCore::ScrollIsAnimated);
-@@ -1674,10 +1702,13 @@ public:
+@@ -1712,10 +1740,13 @@ public:
void didStartDrag();
void dragCancelled();
void setDragCaretRect(const WebCore::IntRect&);
@@ -15793,7 +15670,7 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
#endif
#if PLATFORM(GTK) || PLATFORM(WPE)
void startDrag(WebCore::SelectionData&&, OptionSet<WebCore::DragOperation>, std::optional<WebCore::ShareableBitmapHandle>&& dragImage, WebCore::IntPoint&& dragImageHotspot);
-@@ -1685,6 +1716,9 @@ public:
+@@ -1723,6 +1754,9 @@ public:
#if ENABLE(MODEL_PROCESS)
void modelDragEnded(const WebCore::NodeIdentifier);
#endif
@@ -15802,8 +15679,8 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
+#endif
#endif
- void processDidBecomeUnresponsive();
-@@ -1930,6 +1964,7 @@ public:
+ void processDidBecomeUnresponsive(WebProcessProxy&);
+@@ -1968,6 +2002,7 @@ public:
void setViewportSizeForCSSViewportUnits(const WebCore::FloatSize&);
WebCore::FloatSize viewportSizeForCSSViewportUnits() const;
@@ -15811,8 +15688,8 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
void didReceiveAuthenticationChallengeProxy(Ref<AuthenticationChallengeProxy>&&, NegotiatedLegacyTLS);
void negotiatedLegacyTLS();
void didNegotiateModernTLS(const URL&);
-@@ -1962,6 +1997,8 @@ public:
- #if PLATFORM(COCOA) || PLATFORM(GTK)
+@@ -2001,6 +2036,8 @@ public:
+ // TODO Replace RefPtr with Expected for error reporting https://webkit.org/b/300271
RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&);
RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&, ForceSoftwareCapturingViewportSnapshot);
+#elif PLATFORM(WPE)
@@ -15820,7 +15697,7 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
#endif
void serializeAndWrapCryptoKey(IPC::Connection&, WebCore::CryptoKeyData&&, CompletionHandler<void(std::optional<Vector<uint8_t>>&&)>&&);
-@@ -3012,6 +3049,7 @@ private:
+@@ -3100,6 +3137,7 @@ private:
RefPtr<API::Navigation> launchProcessForReload();
void requestNotificationPermission(const String& originString, CompletionHandler<void(bool allowed)>&&);
@@ -15828,7 +15705,7 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
void didChangeContentSize(const WebCore::IntSize&);
void didChangeIntrinsicContentSize(const WebCore::IntSize&);
-@@ -3541,8 +3579,10 @@ private:
+@@ -3623,8 +3661,10 @@ private:
String m_openedMainFrameName;
RefPtr<WebInspectorUIProxy> m_inspector;
@@ -15839,7 +15716,7 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
RefPtr<WebFullScreenManagerProxy> m_fullScreenManager;
std::unique_ptr<API::FullscreenClient> m_fullscreenClient;
#endif
-@@ -3743,6 +3783,22 @@ private:
+@@ -3826,6 +3866,22 @@ private:
std::optional<WebCore::DragOperation> m_currentDragOperation;
bool m_currentDragIsOverFileInput { false };
unsigned m_currentDragNumberOfFilesToBeAccepted { 0 };
@@ -15862,7 +15739,7 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
#endif
bool m_mainFrameHasHorizontalScrollbar { false };
-@@ -3913,6 +3969,10 @@ private:
+@@ -3996,6 +4052,10 @@ private:
RefPtr<API::Object> messageBody;
};
Vector<InjectedBundleMessage> m_pendingInjectedBundleMessages;
@@ -15874,7 +15751,7 @@ index d52e894d265b737d653497c418369a8b79c58c26..35404a588d4b5c45848f6921ea2c3191
#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 0e03626bb05e7d28b053bca6524c51c962d05050..fb5e6ff170dd0f163b0803183a49bff9239480eb 100644
+index 899d02516e622698c1d9398cbc3a79ad047baa8c..62e5fa6143c099dabcd7532db76f52d65a749101 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.messages.in
+++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in
@@ -35,6 +35,7 @@ messages -> WebPageProxy {
@@ -15883,9 +15760,9 @@ index 0e03626bb05e7d28b053bca6524c51c962d05050..fb5e6ff170dd0f163b0803183a49bff9
MouseDidMoveOverElement(struct WebKit::WebHitTestResultData hitTestResultData, OptionSet<WebKit::WebEventModifier> modifiers)
+ LogToStderr(String text)
- DidReceiveEventIPC(enum:uint8_t WebKit::WebEventType eventType, bool handled, struct std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData)
+ DidReceiveEventIPC(enum:uint32_t WebKit::WebEventType eventType, bool handled, struct std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData)
SetCursor(WebCore::Cursor cursor)
-@@ -332,6 +333,10 @@ messages -> WebPageProxy {
+@@ -336,6 +337,10 @@ messages -> WebPageProxy {
StartDrag(WebCore::SelectionData selectionData, OptionSet<WebCore::DragOperation> dragOperationMask, std::optional<WebCore::ShareableBitmapHandle> dragImage, WebCore::IntPoint dragImageHotspot)
#endif
@@ -15897,10 +15774,10 @@ index 0e03626bb05e7d28b053bca6524c51c962d05050..fb5e6ff170dd0f163b0803183a49bff9
WillReceiveEditDragSnapshot()
DidReceiveEditDragSnapshot(RefPtr<WebCore::TextIndicator> textIndicator)
diff --git a/Source/WebKit/UIProcess/WebProcessCache.cpp b/Source/WebKit/UIProcess/WebProcessCache.cpp
-index 2f731b7a81c5aef52bc3542fad9a958ae1629298..56d3681fbefe55417e388f27b4b7a5a28cfc4f9d 100644
+index 3b1429adbb2443b5341ccf3b694d817a3242bade..703a9d5543f1d0c84b38e73edd2c393be3016415 100644
--- a/Source/WebKit/UIProcess/WebProcessCache.cpp
+++ b/Source/WebKit/UIProcess/WebProcessCache.cpp
-@@ -111,6 +111,10 @@ bool WebProcessCache::canCacheProcess(WebProcessProxy& process) const
+@@ -120,6 +120,10 @@ bool WebProcessCache::canCacheProcess(WebProcessProxy& process) const
return false;
}
@@ -15912,10 +15789,10 @@ index 2f731b7a81c5aef52bc3542fad9a958ae1629298..56d3681fbefe55417e388f27b4b7a5a2
}
diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
-index 22c373f5888aabdaa20aadbcba1aefdbc783dc25..0ce3b02ceca179b47fe91c4dba5225d52e3f2c7b 100644
+index e2900f2e299cba3e390ed5a6eb72b4064ef54d40..217a64185a7e9d7bdf397ea86b6dbb771e9557cd 100644
--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
-@@ -429,10 +429,10 @@ void WebProcessPool::setAutomationClient(std::unique_ptr<API::AutomationClient>&
+@@ -431,10 +431,10 @@ void WebProcessPool::setAutomationClient(std::unique_ptr<API::AutomationClient>&
void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
{
@@ -15928,7 +15805,7 @@ index 22c373f5888aabdaa20aadbcba1aefdbc783dc25..0ce3b02ceca179b47fe91c4dba5225d5
#if ENABLE(GPU_PROCESS)
if (RefPtr gpuProcess = GPUProcessProxy::singletonIfCreated())
-@@ -440,9 +440,10 @@ void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
+@@ -442,9 +442,10 @@ void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
#endif
#if USE(SOUP)
for (Ref networkProcess : NetworkProcessProxy::allNetworkProcesses())
@@ -15940,7 +15817,7 @@ index 22c373f5888aabdaa20aadbcba1aefdbc783dc25..0ce3b02ceca179b47fe91c4dba5225d5
void WebProcessPool::fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)
{
-@@ -1002,7 +1003,7 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
+@@ -1004,7 +1005,7 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
#endif
parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
@@ -15950,10 +15827,10 @@ index 22c373f5888aabdaa20aadbcba1aefdbc783dc25..0ce3b02ceca179b47fe91c4dba5225d5
parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure());
diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp
-index 749651e725c4485514ab2b17f78bb2e03d865e10..e50620b733cea8055e02aca6196287efeba56d96 100644
+index bf0f768de3854bbeee47c8667d2130741cc03289..070d4318a76dccd7a005a36e770709b07c4f96bf 100644
--- a/Source/WebKit/UIProcess/WebProcessProxy.cpp
+++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp
-@@ -209,6 +209,11 @@ Vector<Ref<WebProcessProxy>> WebProcessProxy::allProcesses()
+@@ -215,6 +215,11 @@ Vector<Ref<WebProcessProxy>> WebProcessProxy::allProcesses()
});
}
@@ -15965,7 +15842,7 @@ index 749651e725c4485514ab2b17f78bb2e03d865e10..e50620b733cea8055e02aca6196287ef
RefPtr<WebProcessProxy> WebProcessProxy::processForIdentifier(ProcessIdentifier identifier)
{
return allProcessMap().get(identifier);
-@@ -534,6 +539,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt
+@@ -561,6 +566,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt
if (WebKit::isInspectorProcessPool(protectedProcessPool()))
launchOptions.extraInitializationData.add<HashTranslatorASCIILiteral>("inspector-process"_s, "1"_s);
@@ -15993,10 +15870,10 @@ index 749651e725c4485514ab2b17f78bb2e03d865e10..e50620b733cea8055e02aca6196287ef
if (isPrewarmed())
diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h
-index 35bfcf566f59ebd82525b5dc75e6782a624e485c..7f761e12fe836ad9dd54a77343f223bbdec92a44 100644
+index 62f97606fe069680a2ea36d0c746b02515f662c5..38414fff9749671ac1a4d88328707822d4a09df4 100644
--- a/Source/WebKit/UIProcess/WebProcessProxy.h
+++ b/Source/WebKit/UIProcess/WebProcessProxy.h
-@@ -193,6 +193,7 @@ public:
+@@ -198,6 +198,7 @@ public:
static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, NOESCAPE const Function<void(WebPageProxy&)>&);
static Vector<std::pair<WebCore::ProcessIdentifier, WebCore::RegistrableDomain>> allowedFirstPartiesForCookies();
@@ -16004,11 +15881,23 @@ index 35bfcf566f59ebd82525b5dc75e6782a624e485c..7f761e12fe836ad9dd54a77343f223bb
void initializeWebProcess(WebProcessCreationParameters&&);
+diff --git a/Source/WebKit/UIProcess/WebURLSchemeTask.cpp b/Source/WebKit/UIProcess/WebURLSchemeTask.cpp
+index 44c8399606f4bbf6cf7f84763b3d9b9c07f8dff7..a53f6a8d84eb45288a0cedc75f34646e486c84df 100644
+--- a/Source/WebKit/UIProcess/WebURLSchemeTask.cpp
++++ b/Source/WebKit/UIProcess/WebURLSchemeTask.cpp
+@@ -33,6 +33,7 @@
+ #include "WebErrors.h"
+ #include "WebPageMessages.h"
+ #include "WebPageProxy.h"
++#include "WebProcessProxy.h"
+ #include "WebURLSchemeHandler.h"
+ #include "WebURLSchemeHandlerIdentifier.h"
+ #include <WebCore/ResourceLoaderIdentifier.h>
diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
-index 9c3fc4c42aa0369937dc6ba34bdbb2ee4db6dcfb..8d36b66176c4c94af03611a599ae111430852d96 100644
+index fdc795d4b32f5a8f901700d797d73e3a1b170e3b..bf14d3c543549ae12861604b87ae14dc4d00166c 100644
--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
-@@ -320,15 +320,10 @@ SOAuthorizationCoordinator& WebsiteDataStore::soAuthorizationCoordinator(const W
+@@ -323,15 +323,10 @@ SOAuthorizationCoordinator& WebsiteDataStore::soAuthorizationCoordinator(const W
static Ref<NetworkProcessProxy> networkProcessForSession(PAL::SessionID sessionID)
{
@@ -16027,7 +15916,7 @@ index 9c3fc4c42aa0369937dc6ba34bdbb2ee4db6dcfb..8d36b66176c4c94af03611a599ae1114
#else
UNUSED_PARAM(sessionID);
return NetworkProcessProxy::ensureDefaultNetworkProcess();
-@@ -2085,6 +2080,15 @@ void WebsiteDataStore::setCacheModelSynchronouslyForTesting(CacheModel cacheMode
+@@ -2124,6 +2119,15 @@ void WebsiteDataStore::setCacheModelSynchronouslyForTesting(CacheModel cacheMode
processPool->setCacheModelSynchronouslyForTesting(cacheModel);
}
@@ -16043,7 +15932,7 @@ index 9c3fc4c42aa0369937dc6ba34bdbb2ee4db6dcfb..8d36b66176c4c94af03611a599ae1114
Vector<WebsiteDataStoreParameters> WebsiteDataStore::parametersFromEachWebsiteDataStore()
{
return WTF::map(allDataStores(), [](auto& entry) {
-@@ -2519,6 +2523,12 @@ void WebsiteDataStore::originDirectoryForTesting(WebCore::ClientOrigin&& origin,
+@@ -2558,6 +2562,12 @@ void WebsiteDataStore::originDirectoryForTesting(WebCore::ClientOrigin&& origin,
protectedNetworkProcess()->websiteDataOriginDirectoryForTesting(m_sessionID, WTFMove(origin), type, WTFMove(completionHandler));
}
@@ -16057,10 +15946,10 @@ index 9c3fc4c42aa0369937dc6ba34bdbb2ee4db6dcfb..8d36b66176c4c94af03611a599ae1114
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 428e7bf7c1804e635312c6ee3fda1c29c1a61a5e..b497045e01412826d3a4116577472e4f8b9b6f95 100644
+index e0afaafced524352fc1b9cea74a2b8f04a314889..532ace70a24215725c75c4b45b1608ab57327249 100644
--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
-@@ -98,6 +98,7 @@ class DeviceIdHashSaltStorage;
+@@ -102,6 +102,7 @@ class DeviceIdHashSaltStorage;
class DownloadProxy;
class NetworkProcessProxy;
class SOAuthorizationCoordinator;
@@ -16068,7 +15957,7 @@ index 428e7bf7c1804e635312c6ee3fda1c29c1a61a5e..b497045e01412826d3a4116577472e4f
class VirtualAuthenticatorManager;
class WebPageProxy;
class WebProcessPool;
-@@ -113,6 +114,7 @@ enum class UnifiedOriginStorageLevel : uint8_t;
+@@ -117,6 +118,7 @@ enum class UnifiedOriginStorageLevel : uint8_t;
enum class WebsiteDataFetchOption : uint8_t;
enum class WebsiteDataType : uint32_t;
@@ -16076,7 +15965,7 @@ index 428e7bf7c1804e635312c6ee3fda1c29c1a61a5e..b497045e01412826d3a4116577472e4f
struct ITPThirdPartyData;
struct NetworkProcessConnectionInfo;
struct WebPushMessage;
-@@ -122,6 +124,14 @@ struct WebsiteDataStoreParameters;
+@@ -126,6 +128,14 @@ struct WebsiteDataStoreParameters;
enum RemoveDataTaskCounterType { };
using RemoveDataTaskCounter = RefCounter<RemoveDataTaskCounterType>;
@@ -16090,8 +15979,8 @@ index 428e7bf7c1804e635312c6ee3fda1c29c1a61a5e..b497045e01412826d3a4116577472e4f
+
class WebsiteDataStore : public API::ObjectImpl<API::Object::Type::WebsiteDataStore>, public CanMakeWeakPtr<WebsiteDataStore> {
public:
- static Ref<WebsiteDataStore> defaultDataStore();
-@@ -324,8 +334,10 @@ public:
+ static WebsiteDataStore& defaultDataStore();
+@@ -331,8 +341,10 @@ public:
#if USE(SOUP)
void setPersistentCredentialStorageEnabled(bool);
bool persistentCredentialStorageEnabled() const { return m_persistentCredentialStorageEnabled && isPersistent(); }
@@ -16102,7 +15991,7 @@ index 428e7bf7c1804e635312c6ee3fda1c29c1a61a5e..b497045e01412826d3a4116577472e4f
void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&);
const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; }
void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType);
-@@ -421,6 +433,12 @@ public:
+@@ -429,6 +441,12 @@ public:
static const String& defaultBaseDataDirectory();
#endif
@@ -16115,7 +16004,7 @@ index 428e7bf7c1804e635312c6ee3fda1c29c1a61a5e..b497045e01412826d3a4116577472e4f
void resetQuota(CompletionHandler<void()>&&);
void resetStoragePersistedState(CompletionHandler<void()>&&);
#if PLATFORM(IOS_FAMILY)
-@@ -623,7 +641,9 @@ private:
+@@ -645,7 +663,9 @@ private:
#if USE(SOUP)
bool m_persistentCredentialStorageEnabled { true };
@@ -16126,7 +16015,7 @@ index 428e7bf7c1804e635312c6ee3fda1c29c1a61a5e..b497045e01412826d3a4116577472e4f
WebCore::SoupNetworkProxySettings m_networkProxySettings;
String m_cookiePersistentStoragePath;
SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite };
-@@ -650,6 +670,10 @@ private:
+@@ -672,6 +692,10 @@ private:
const RefPtr<API::HTTPCookieStore> m_cookieStore;
RefPtr<NetworkProcessProxy> m_networkProcess;
@@ -16181,10 +16070,10 @@ index 96bf77411e2e1f4c835f56b409dc179977d197ee..512af5ffce511711b502248e34e49e45
RunLoop::Timer m_destroyLaterTimer;
diff --git a/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp b/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..dfa06245b5411f2bc6ca7cebdb7c6d5fb46cd800
+index 0000000000000000000000000000000000000000..dfda89e6c74393d552d81bbb6d3c1ef877a32b31
--- /dev/null
+++ b/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp
-@@ -0,0 +1,192 @@
+@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2019 Microsoft Corporation.
+ *
@@ -16304,30 +16193,15 @@ index 0000000000000000000000000000000000000000..dfa06245b5411f2bc6ca7cebdb7c6d5f
+
+std::unique_ptr<BrowserContext> InspectorPlaywrightAgentClientGlib::createBrowserContext(WTF::String& error, const WTF::String& proxyServer, const WTF::String& proxyBypassList)
+{
-+#if !ENABLE(2022_GLIB_API)
-+ GRefPtr<WebKitWebsiteDataManager> data_manager = adoptGRef(webkit_website_data_manager_new_ephemeral());
-+#endif
-+ GRefPtr<WebKitWebContext> context = adoptGRef(WEBKIT_WEB_CONTEXT(g_object_new(WEBKIT_TYPE_WEB_CONTEXT,
-+#if !ENABLE(2022_GLIB_API)
-+ "website-data-manager", data_manager.get(),
-+#endif
-+ // WPE has PSON enabled by default and doesn't have such parameter.
-+#if PLATFORM(GTK)
-+#if !ENABLE(2022_GLIB_API)
-+ "process-swap-on-cross-site-navigation-enabled", true,
-+#endif
-+#endif
-+ nullptr)));
++ GRefPtr<WebKitWebContext> context = adoptGRef(WEBKIT_WEB_CONTEXT(g_object_new(WEBKIT_TYPE_WEB_CONTEXT, nullptr)));
+ if (!context) {
+ error = "Failed to create GLib ephemeral context"_s;
+ return nullptr;
+ }
+
-+#if ENABLE(2022_GLIB_API)
+ GRefPtr<WebKitNetworkSession> networkSession = adoptGRef(webkit_network_session_new_ephemeral());
+ webkit_web_context_set_network_session_for_automation(context.get(), networkSession.get());
+ GRefPtr<WebKitWebsiteDataManager> data_manager = webkit_network_session_get_website_data_manager(networkSession.get());
-+#endif
+
+ auto browserContext = std::make_unique<BrowserContext>();
+ browserContext->processPool = &webkitWebContextGetProcessPool(context.get());
@@ -16352,7 +16226,7 @@ index 0000000000000000000000000000000000000000..dfa06245b5411f2bc6ca7cebdb7c6d5f
+void InspectorPlaywrightAgentClientGlib::takePageScreenshot(WebPageProxy& page, WebCore::IntRect&& clip, bool nominalResolution, CompletionHandler<void(const String&, const String&)>&& completionHandler)
+{
+ page.callAfterNextPresentationUpdate([protectedPage = Ref{ page }, clip = WTFMove(clip), nominalResolution, completionHandler = WTFMove(completionHandler)]() mutable {
-+#if PLATFORM(GTK)
++#if PLATFORM(GTK) || (PLATFORM(WPE) && USE(SKIA))
+ RefPtr<ViewSnapshot> viewSnapshot = protectedPage->pageClient()->takeViewSnapshot(WTFMove(clip), nominalResolution);
+ if (viewSnapshot) {
+ std::optional<String> data = WebAutomationSession::platformGetBase64EncodedPNGData(*viewSnapshot);
@@ -16361,14 +16235,6 @@ index 0000000000000000000000000000000000000000..dfa06245b5411f2bc6ca7cebdb7c6d5f
+ return;
+ }
+ }
-+#elif PLATFORM(WPE)
-+ sk_sp<SkImage> protectPtr = protectedPage->pageClient()->takeViewSnapshot(WTFMove(clip), nominalResolution);
-+ SkImage* surface = protectPtr.get();
-+ if (surface) {
-+ Vector<uint8_t> encodeData = WebCore::encodeData(surface, "image/png"_s, std::nullopt);
-+ completionHandler(emptyString(), makeString("data:image/png;base64,"_s, base64Encoded(encodeData)));
-+ return;
-+ }
+#endif
+ completionHandler("Failed to take screenshot"_s, emptyString());
+ });
@@ -16493,7 +16359,7 @@ index 7a8478ed880bdb584b54c250b250f2805000f4aa..5d7b63ba6fbb5426f5746b36ef6ccfa4
+
} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h
-index d305b6bf990f6befccb3f3e7c22a9949c4be41d3..22b0558d5729cf52fadc64b9e191b8a1f7330608 100644
+index e325f39cd985793451911f3623d712da5ef5d6ae..c1f8ffa0930d492e383c3c8f2be43a5d98d8f8ea 100644
--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h
+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h
@@ -41,6 +41,7 @@
@@ -16512,7 +16378,7 @@ index d305b6bf990f6befccb3f3e7c22a9949c4be41d3..22b0558d5729cf52fadc64b9e191b8a1
private:
explicit AcceleratedBackingStore(WebPageProxy&);
-@@ -251,6 +253,10 @@ private:
+@@ -249,6 +251,10 @@ private:
RefPtr<Buffer> m_committedBuffer;
Rects m_pendingDamageRects;
HashMap<uint64_t, RefPtr<Buffer>> m_buffers;
@@ -16525,10 +16391,10 @@ index d305b6bf990f6befccb3f3e7c22a9949c4be41d3..22b0558d5729cf52fadc64b9e191b8a1
} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/gtk/InspectorTargetProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/InspectorTargetProxyGtk.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..bf78de1915940c2d3292514cf0fe4e682b636f70
+index 0000000000000000000000000000000000000000..8f661f8c62dc091670f9474db037e7eee0ec37ce
--- /dev/null
+++ b/Source/WebKit/UIProcess/gtk/InspectorTargetProxyGtk.cpp
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2019 Microsoft Corporation.
+ *
@@ -16558,18 +16424,14 @@ index 0000000000000000000000000000000000000000..bf78de1915940c2d3292514cf0fe4e68
+#include "InspectorTargetProxy.h"
+
+#include "WebPageProxy.h"
-+#include <WebCore/GtkUtilities.h>
++#include "GtkUtilities.h"
+#include <gtk/gtk.h>
+
+namespace WebKit {
+
+void InspectorTargetProxy::platformActivate(String& error) const
+{
-+#if USE(GTK4)
+ GtkWidget* parent = GTK_WIDGET(gtk_widget_get_root(m_page->viewWidget()));
-+#else
-+ GtkWidget* parent = gtk_widget_get_toplevel(m_page->viewWidget());
-+#endif
+ if (WebCore::widgetIsOnscreenToplevelWindow(parent))
+ gtk_window_present(GTK_WINDOW(parent));
+ else
@@ -16578,10 +16440,10 @@ index 0000000000000000000000000000000000000000..bf78de1915940c2d3292514cf0fe4e68
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/gtk/SystemSettingsManagerProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/SystemSettingsManagerProxyGtk.cpp
-index 349cd3d9efd7a921560fa2f1a9e1a2238e415938..9df937535595281039660b060c7fba221d110691 100644
+index 31ebf8480d842db47e17bdb4639a3cd5e934ea49..bdffaeb1b97fe54f58086a62e7b641ebc6bc0196 100644
--- a/Source/WebKit/UIProcess/gtk/SystemSettingsManagerProxyGtk.cpp
+++ b/Source/WebKit/UIProcess/gtk/SystemSettingsManagerProxyGtk.cpp
-@@ -126,6 +126,8 @@ int SystemSettingsManagerProxy::xftDPI() const
+@@ -128,6 +128,8 @@ int SystemSettingsManagerProxy::xftDPI() const
bool SystemSettingsManagerProxy::followFontSystemSettings() const
{
@@ -16592,10 +16454,10 @@ index 349cd3d9efd7a921560fa2f1a9e1a2238e415938..9df937535595281039660b060c7fba22
GtkFontRendering fontRendering;
diff --git a/Source/WebKit/UIProcess/gtk/WebPageInspectorEmulationAgentGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPageInspectorEmulationAgentGtk.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..61d5b3f7f453fc67e6440da545fb5b4ae63ff64d
+index 0000000000000000000000000000000000000000..735f6e2175b6da2d1802b6154af027e907153545
--- /dev/null
+++ b/Source/WebKit/UIProcess/gtk/WebPageInspectorEmulationAgentGtk.cpp
-@@ -0,0 +1,121 @@
+@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2019 Microsoft Corporation.
+ *
@@ -16625,15 +16487,14 @@ index 0000000000000000000000000000000000000000..61d5b3f7f453fc67e6440da545fb5b4a
+#include "DrawingAreaProxyCoordinatedGraphics.h"
+#include "WebPageInspectorEmulationAgent.h"
+#include "WebPageProxy.h"
-+#include <WebCore/GtkUtilities.h>
-+#include <WebCore/GtkVersioning.h>
++#include "GtkUtilities.h"
++#include "GtkVersioning.h"
+#include <WebCore/IntSize.h>
+#include <gtk/gtk.h>
+
+namespace WebKit {
+
-+#if USE(GTK4)
-+bool windowHasManyTabs(GtkWidget* widget) {
++static bool windowHasManyTabs(GtkWidget* widget) {
+ for (GtkWidget* parent = gtk_widget_get_parent(widget); parent; parent = gtk_widget_get_parent(parent)) {
+ if (GTK_IS_NOTEBOOK(parent)) {
+ int pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(parent));
@@ -16642,7 +16503,6 @@ index 0000000000000000000000000000000000000000..61d5b3f7f453fc67e6440da545fb5b4a
+ }
+ return false;
+}
-+#endif
+
+void WebPageInspectorEmulationAgent::platformSetSize(int width, int height, Function<void (const String& error)>&& callback)
+{
@@ -16659,14 +16519,14 @@ index 0000000000000000000000000000000000000000..61d5b3f7f453fc67e6440da545fb5b4a
+ }
+ GtkAllocation viewAllocation;
+ gtk_widget_get_allocation(viewWidget, &viewAllocation);
-+#if USE(GTK4)
++
+ // In GTK4 newly added tabs will have allocation size of 0x0, before the tab is shown.
-+ // This is a Ctrl+click scenario. We invoke callback righ await to not stall.
++ // This is a Ctrl+click scenario. We invoke callback right away to not stall.
+ if (!viewAllocation.width && !viewAllocation.height && windowHasManyTabs(viewWidget)) {
+ callback(String());
+ return;
+ }
-+#endif
++
+ if (viewAllocation.width == width && viewAllocation.height == height) {
+ callback(String());
+ return;
@@ -16684,7 +16544,6 @@ index 0000000000000000000000000000000000000000..61d5b3f7f453fc67e6440da545fb5b4a
+ (windowAllocation.width == 1024 && windowAllocation.height == 768);
+ // The callback can only be called if the page is still alive, so we can safely capture `this`.
+ drawingArea->waitForSizeUpdate([this, callback = WTFMove(callback), didNotHaveInitialAllocation, viewSize](const DrawingAreaProxyCoordinatedGraphics& drawingArea) mutable {
-+#if USE(GTK4)
+ if (viewSize == drawingArea.size()) {
+ callback(String());
+ return;
@@ -16696,30 +16555,20 @@ index 0000000000000000000000000000000000000000..61d5b3f7f453fc67e6440da545fb5b4a
+ return;
+ }
+ callback("Failed to resize window"_s);
-+#else
-+ UNUSED_PARAM(this);
-+ UNUSED_PARAM(didNotHaveInitialAllocation);
-+ UNUSED_PARAM(drawingArea);
-+ callback(String());
-+#endif
+ });
+ } else {
+ callback("No backing store for window"_s);
+ }
-+#if USE(GTK4)
+ // Depending on whether default size has been applied or not, we need to
+ // do one of the calls, so we just do both.
+ gtk_window_set_default_size(GTK_WINDOW(window), width, height);
+ gtk_widget_set_size_request(window, width, height);
-+#else
-+ gtk_window_resize(GTK_WINDOW(window), width, height);
-+#endif
+}
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/gtk/WebPageInspectorInputAgentGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPageInspectorInputAgentGtk.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..1cfdb88580573649d816a875b51ebe650c091170
+index 0000000000000000000000000000000000000000..bf7d792f5fd7a96b090970cb4177c113e3265870
--- /dev/null
+++ b/Source/WebKit/UIProcess/gtk/WebPageInspectorInputAgentGtk.cpp
@@ -0,0 +1,76 @@
@@ -16775,7 +16624,7 @@ index 0000000000000000000000000000000000000000..1cfdb88580573649d816a875b51ebe65
+void WebPageInspectorInputAgent::platformDispatchKeyEvent(WebEventType type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<WebEventModifier> modifiers, Vector<String>& macCommands, MonotonicTime timestamp)
+{
+ Vector<String> commands;
-+ const guint keyVal = WebCore::PlatformKeyboardEvent::gdkKeyCodeForWindowsKeyCode(windowsVirtualKeyCode);
++ const guint keyVal = WebKeyboardEvent::gdkKeyCodeForWindowsKeyCode(windowsVirtualKeyCode);
+ if (keyVal) {
+ unsigned state = modifiersToEventState(modifiers);
+ commands = KeyBindingTranslator().commandsForKeyval(keyVal, state);
@@ -16801,10 +16650,10 @@ index 0000000000000000000000000000000000000000..1cfdb88580573649d816a875b51ebe65
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/gtk/WebPageInspectorTargetProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPageInspectorTargetProxyGtk.cpp
new file mode 100644
-index 0000000000000000000000000000000000000000..1230758b42b5affc40b85ca98ed4af7547342588
+index 0000000000000000000000000000000000000000..4c30302b5bd7d7f989da63375f1b4eb9c0b15b50
--- /dev/null
+++ b/Source/WebKit/UIProcess/gtk/WebPageInspectorTargetProxyGtk.cpp
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2019 Microsoft Corporation.
+ *
@@ -16834,19 +16683,15 @@ index 0000000000000000000000000000000000000000..1230758b42b5affc40b85ca98ed4af75
+#include "WebPageInspectorTargetProxy.h"
+
+#include "WebPageProxy.h"
-+#include <WebCore/GtkUtilities.h>
++#include "GtkUtilities.h"
+#include <gtk/gtk.h>
+
+namespace WebKit {
+
+void WebPageInspectorTargetProxy::platformActivate(String& error) const
+{
-+#if USE(GTK4)
+ GtkWidget* parent = GTK_WIDGET(gtk_widget_get_root(m_page->viewWidget()));
-+#else
-+ GtkWidget* parent = gtk_widget_get_toplevel(m_page->viewWidget());
-+#endif
-+ if (WebCore::widgetIsOnscreenToplevelWindow(parent))
++ if (widgetIsOnscreenToplevelWindow(parent))
+ gtk_window_present(GTK_WINDOW(parent));
+ else
+ error = "The view is not on screen"_s;
@@ -16854,7 +16699,7 @@ index 0000000000000000000000000000000000000000..1230758b42b5affc40b85ca98ed4af75
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp
-index e4f31f89b42bc7884da760a18150bd1274d0383d..b2390de63e48a8a48a798199aa99203ef9390451 100644
+index 4ea79c717a8ad579d92942cd7ffdcaebcbb981cd..b1e7fd66413b5dae487f7db52f6ad31aa5afe7f2 100644
--- a/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp
+++ b/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp
@@ -85,8 +85,10 @@ void WebPasteboardProxy::setPrimarySelectionOwner(WebFrameProxy* frame)
@@ -17097,7 +16942,7 @@ index 0000000000000000000000000000000000000000..8adbd51bfecad2a273117588bf50f8f7
+
+#endif
diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h
-index 06d85d02ad62fdfaf211deb534126b0a5e966493..ab16123d697e7dab5907e4e5d4386cb84f03756e 100644
+index 3dc019bb84020d4ea0ce5d50294fa5f13a400ebc..e7c4d9d1d637b73c11785d627414bc0232a5a9ca 100644
--- a/Source/WebKit/UIProcess/mac/PageClientImplMac.h
+++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.h
@@ -31,9 +31,11 @@
@@ -17143,7 +16988,7 @@ index 06d85d02ad62fdfaf211deb534126b0a5e966493..ab16123d697e7dab5907e4e5d4386cb8
void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&) override;
void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override;
diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
-index 8b6e600a9b85e37c19bdddde5b32666a2179e14b..56c2b8949b2fb027ec40374d8eb2c2577da0c302 100644
+index 6e190b00ba5d7f222ed7d9310f9a40ce6a031e30..eca0abc5dbd6ba7fbe1a200e3bc3b9ae66193c38 100644
--- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
+++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
@@ -108,6 +108,13 @@ namespace WebKit {
@@ -17160,7 +17005,7 @@ index 8b6e600a9b85e37c19bdddde5b32666a2179e14b..56c2b8949b2fb027ec40374d8eb2c257
PageClientImpl::PageClientImpl(NSView *view, WKWebView *webView)
: PageClientImplCocoa(webView)
, m_view(view)
-@@ -163,6 +170,9 @@ NSWindow *PageClientImpl::activeWindow() const
+@@ -167,6 +174,9 @@ NSWindow *PageClientImpl::activeWindow() const
bool PageClientImpl::isViewWindowActive()
{
@@ -17170,7 +17015,7 @@ index 8b6e600a9b85e37c19bdddde5b32666a2179e14b..56c2b8949b2fb027ec40374d8eb2c257
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer));
RetainPtr activeViewWindow = activeWindow();
return activeViewWindow.get().isKeyWindow || (activeViewWindow && [NSApp keyWindow] == activeViewWindow.get());
-@@ -170,6 +180,9 @@ bool PageClientImpl::isViewWindowActive()
+@@ -174,6 +184,9 @@ bool PageClientImpl::isViewWindowActive()
bool PageClientImpl::isViewFocused()
{
@@ -17180,7 +17025,7 @@ index 8b6e600a9b85e37c19bdddde5b32666a2179e14b..56c2b8949b2fb027ec40374d8eb2c257
// FIXME: This is called from the WebPageProxy constructor before we have a WebViewImpl.
// Once WebViewImpl and PageClient merge, this won't be a problem.
if (CheckedPtr impl = m_impl.get())
-@@ -193,6 +206,9 @@ void PageClientImpl::makeFirstResponder()
+@@ -197,6 +210,9 @@ void PageClientImpl::makeFirstResponder()
bool PageClientImpl::isViewVisible(NSView *view, NSWindow *viewWindow)
{
@@ -17190,7 +17035,7 @@ index 8b6e600a9b85e37c19bdddde5b32666a2179e14b..56c2b8949b2fb027ec40374d8eb2c257
auto windowIsOccluded = [&]()->bool {
return m_impl && m_impl->windowOcclusionDetectionEnabled() && (viewWindow.occlusionState & NSWindowOcclusionStateVisible) != NSWindowOcclusionStateVisible;
};
-@@ -280,7 +296,8 @@ void PageClientImpl::didRelaunchProcess()
+@@ -288,7 +304,8 @@ void PageClientImpl::didRelaunchProcess()
void PageClientImpl::preferencesDidChange()
{
@@ -17200,16 +17045,16 @@ index 8b6e600a9b85e37c19bdddde5b32666a2179e14b..56c2b8949b2fb027ec40374d8eb2c257
}
void PageClientImpl::toolTipChanged(const String& oldToolTip, const String& newToolTip)
-@@ -494,6 +511,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
+@@ -507,6 +524,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled)
{
+ if (!event.nativeEvent())
+ return;
- checkedImpl()->doneWithKeyEvent(event.nativeEvent(), eventWasHandled);
+ checkedImpl()->doneWithKeyEvent(RetainPtr { event.nativeEvent() }.get(), eventWasHandled);
}
-@@ -513,6 +532,8 @@ void PageClientImpl::computeHasVisualSearchResults(const URL& imageURL, Shareabl
+@@ -526,6 +545,8 @@ void PageClientImpl::computeHasVisualSearchResults(const URL& imageURL, Shareabl
RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy& page)
{
@@ -17218,7 +17063,7 @@ index 8b6e600a9b85e37c19bdddde5b32666a2179e14b..56c2b8949b2fb027ec40374d8eb2c257
return WebPopupMenuProxyMac::create(m_view.get().get(), page.checkedPopupMenuClient().get());
}
-@@ -638,6 +659,12 @@ CALayer *PageClientImpl::footerBannerLayer() const
+@@ -651,6 +672,12 @@ CALayer *PageClientImpl::footerBannerLayer() const
return m_impl->footerBannerLayer();
}
@@ -17231,7 +17076,7 @@ index 8b6e600a9b85e37c19bdddde5b32666a2179e14b..56c2b8949b2fb027ec40374d8eb2c257
RefPtr<ViewSnapshot> PageClientImpl::takeViewSnapshot(std::optional<WebCore::IntRect>&&)
{
return checkedImpl()->takeViewSnapshot();
-@@ -849,6 +876,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR
+@@ -865,6 +892,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR
#endif // ENABLE(FULLSCREEN_API)
@@ -17245,14 +17090,14 @@ index 8b6e600a9b85e37c19bdddde5b32666a2179e14b..56c2b8949b2fb027ec40374d8eb2c257
void PageClientImpl::navigationGestureDidBegin()
{
checkedImpl()->dismissContentRelativeChildWindowsWithAnimation(true);
-@@ -1029,6 +1063,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c
+@@ -1045,6 +1079,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c
bool PageClientImpl::windowIsFrontWindowUnderMouse(const NativeWebMouseEvent& event)
{
+ // Simulated event.
+ if (!event.nativeEvent())
+ return false;
- return checkedImpl()->windowIsFrontWindowUnderMouse(event.nativeEvent());
+ return checkedImpl()->windowIsFrontWindowUnderMouse(RetainPtr { event.nativeEvent() }.get());
}
diff --git a/Source/WebKit/UIProcess/mac/SecItemShimProxy.messages.in b/Source/WebKit/UIProcess/mac/SecItemShimProxy.messages.in
@@ -17279,7 +17124,7 @@ index f46895285dbc84c624537a194814c18f771a0c08..29ef9e5afa13b8d2b47b7f2dd4ce3784
}
+#endif
diff --git a/Source/WebKit/UIProcess/mac/WKTextAnimationManagerMac.mm b/Source/WebKit/UIProcess/mac/WKTextAnimationManagerMac.mm
-index 1e32d91466e9785f20fd1d63b8fa93ee192d5f55..e355cb75d3c25f63f51d030190fb49f20831fda8 100644
+index ff8d60fe011fe881ea552a1e66cbc9a6fa2bbb19..23a98f7dfd2be5317e22a9d97f5290fddcaf9d72 100644
--- a/Source/WebKit/UIProcess/mac/WKTextAnimationManagerMac.mm
+++ b/Source/WebKit/UIProcess/mac/WKTextAnimationManagerMac.mm
@@ -35,6 +35,7 @@
@@ -17291,10 +17136,10 @@ index 1e32d91466e9785f20fd1d63b8fa93ee192d5f55..e355cb75d3c25f63f51d030190fb49f2
@interface WKTextAnimationTypeEffectData : NSObject
diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h
-index a3c53c0bf913385d4d2d92900360d5f7d75927f8..e5570ef599ff1b59224648c353f8ab16f8fe7f88 100644
+index 22ec84f21f3b2d18740356cfb72ebad813ffd17b..880e1dbde6430b93a701e5d7977eb8e8854b964f 100644
--- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h
+++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h
-@@ -81,6 +81,7 @@ private:
+@@ -87,6 +87,7 @@ private:
void show() override;
void showContextMenuWithItems(Vector<Ref<WebContextMenuItem>>&&) override;
void useContextMenuItems(Vector<Ref<WebContextMenuItem>>&&) override;
@@ -17303,10 +17148,10 @@ index a3c53c0bf913385d4d2d92900360d5f7d75927f8..e5570ef599ff1b59224648c353f8ab16
bool showAfterPostProcessingContextData();
diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
-index 14ced1d7fee6409e39301c9bf6d589a733b16afe..4bd68c01564c3d3828e45bce68529c5ea284a1a9 100644
+index 95986aa1bfcfd2e1ce0a9de1ff6a3a2dd78a2ba1..7cfad9352724976f4fb58e66ecb3195b11b16a5a 100644
--- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
+++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
-@@ -521,6 +521,12 @@ RetainPtr<NSMenuItem> WebContextMenuProxyMac::createShareMenuItem(ShareMenuItemT
+@@ -535,6 +535,12 @@ RetainPtr<NSMenuItem> WebContextMenuProxyMac::createShareMenuItem(ShareMenuItemT
}
#endif
@@ -17559,7 +17404,7 @@ index 0000000000000000000000000000000000000000..c58e17e9095c73eb9670ca55e5465b0d
+
+#endif
diff --git a/Source/WebKit/UIProcess/mac/WebViewImpl.h b/Source/WebKit/UIProcess/mac/WebViewImpl.h
-index 62b5fc6f5e08c4192774f659f2589085e7f8b5ed..58576d276501e29afc0e77ff5b32b645ec433108 100644
+index 0a479b522e0c9ab77e02fb1b82dc6d56bbdfac8b..b73180a12d982df3d513de29182919d242b039af 100644
--- a/Source/WebKit/UIProcess/mac/WebViewImpl.h
+++ b/Source/WebKit/UIProcess/mac/WebViewImpl.h
@@ -34,6 +34,7 @@
@@ -17568,9 +17413,9 @@ index 62b5fc6f5e08c4192774f659f2589085e7f8b5ed..58576d276501e29afc0e77ff5b32b645
#include <WebCore/DOMPasteAccess.h>
+#include <WebCore/FrameIdentifier.h>
#include <WebCore/FocusDirection.h>
+ #include <WebCore/HTMLMediaElementIdentifier.h>
#include <WebCore/KeypressCommand.h>
- #include <WebCore/PlatformPlaybackSessionInterface.h>
-@@ -579,6 +580,9 @@ public:
+@@ -591,6 +592,9 @@ public:
void provideDataForPasteboard(NSPasteboard *, NSString *type);
NSArray *namesOfPromisedFilesDroppedAtDestination(NSURL *dropDestination);
@@ -17581,10 +17426,10 @@ index 62b5fc6f5e08c4192774f659f2589085e7f8b5ed..58576d276501e29afc0e77ff5b32b645
RefPtr<ViewSnapshot> takeViewSnapshot(ForceSoftwareCapturingViewportSnapshot);
void saveBackForwardSnapshotForCurrentItem();
diff --git a/Source/WebKit/UIProcess/mac/WebViewImpl.mm b/Source/WebKit/UIProcess/mac/WebViewImpl.mm
-index 65e89d47c58ba4449b72db525153313ab41bcc85..df70a7c2beda025db41651d558c1978d65632710 100644
+index a2cb92081fd69ea05e18a304d1cb7b02fd35a36d..71375fa5de95775ea7c20ec745ce3d634b15ead0 100644
--- a/Source/WebKit/UIProcess/mac/WebViewImpl.mm
+++ b/Source/WebKit/UIProcess/mac/WebViewImpl.mm
-@@ -2497,6 +2497,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace()
+@@ -2519,6 +2519,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace()
if (!m_colorSpace)
m_colorSpace = [NSColorSpace sRGBColorSpace];
}
@@ -17596,7 +17441,7 @@ index 65e89d47c58ba4449b72db525153313ab41bcc85..df70a7c2beda025db41651d558c1978d
ASSERT(m_colorSpace);
return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] };
-@@ -4777,6 +4782,17 @@ static RetainPtr<CGImageRef> takeWindowSnapshot(CGSWindowID windowID, bool captu
+@@ -4831,6 +4836,17 @@ static RetainPtr<CGImageRef> takeWindowSnapshot(CGSWindowID windowID, bool captu
return WebCore::cgWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions);
}
@@ -17615,7 +17460,7 @@ index 65e89d47c58ba4449b72db525153313ab41bcc85..df70a7c2beda025db41651d558c1978d
{
return takeViewSnapshot(ForceSoftwareCapturingViewportSnapshot::No);
diff --git a/Source/WebKit/UIProcess/wc/DrawingAreaProxyWC.cpp b/Source/WebKit/UIProcess/wc/DrawingAreaProxyWC.cpp
-index 3f4c7f86c46a39036d6c52f8b77e50d915b740da..a9990ef434d86b432e6e77911145c96b15dff06c 100644
+index 37876a0c8c31193d1312ada7d34852e256df18a9..9c891ef5f00c03f3ae6786260a840d4e3a502e6c 100644
--- a/Source/WebKit/UIProcess/wc/DrawingAreaProxyWC.cpp
+++ b/Source/WebKit/UIProcess/wc/DrawingAreaProxyWC.cpp
@@ -35,6 +35,7 @@
@@ -18070,6 +17915,90 @@ index 22124ffc5c0daf37be6ac7d115d587925613b4cd..83fbf4182132b87c0b90416e5cd83372
if (m_page && m_page->drawingArea()) {
// FIXME specify correctly layerPosition.
+diff --git a/Source/WebKit/UIProcess/wpe/AcceleratedBackingStore.cpp b/Source/WebKit/UIProcess/wpe/AcceleratedBackingStore.cpp
+index af0d7afa0f864569115e07aa8064f8dc8cd1e575..fd2dcb14baf9abbae650b068694341c65aa54667 100644
+--- a/Source/WebKit/UIProcess/wpe/AcceleratedBackingStore.cpp
++++ b/Source/WebKit/UIProcess/wpe/AcceleratedBackingStore.cpp
+@@ -190,7 +190,7 @@ static Expected<SkImageInfo, String> getImageInfoFromBuffer(const GRefPtr<WPEBu
+ return makeUnexpected("Failed to extract snapshot pixel information"_s);
+ }
+
+-static Expected<Ref<ViewSnapshot>, String> saveBufferSnapshot(const GRefPtr<WPEBuffer>& buffer, std::optional<WebCore::IntRect>&& clipRect)
++static Expected<Ref<ViewSnapshot>, String> saveBufferSnapshot(const GRefPtr<WPEBuffer>& buffer, std::optional<WebCore::IntRect>&& clipRect, bool nominalResolution)
+ {
+ GUniqueOutPtr<GError> error;
+ GBytes* pixels = wpe_buffer_import_to_pixels(buffer.get(), &error.outPtr());
+@@ -208,33 +208,39 @@ static Expected<Ref<ViewSnapshot>, String> saveBufferSnapshot(const GRefPtr<WPEB
+ if (!info)
+ return makeUnexpected(info.error());
+
+- SkPixmap pixmap(info.value(), g_bytes_get_data(bytes.get(), nullptr), info->minRowBytes());
++ sk_sp<SkImage> fullScreenshot = SkImage::MakeRasterDirect(info, pixelsData, info->minRowBytes());
+
+- if (clipRect) {
+- SkIRect clippedRect = SkIRect::MakeXYWH(clipRect->x(), clipRect->y(), clipRect->width(), clipRect->height());
+- SkImageInfo clippedInfo = info->makeWH(clipRect->width(), clipRect->height());
+- SkPixmap clippedPixmap(info.value(), nullptr, clippedInfo.minRowBytes());
+- if (!pixmap.extractSubset(&clippedPixmap, clippedRect))
+- return makeUnexpected("Failed to extract clipped snapshot"_s);
+- pixmap = clippedPixmap;
+- }
+-
+- auto image = SkImages::RasterFromPixmap(pixmap, [](const void*, void* context) {
+- g_bytes_unref(static_cast<GBytes*>(context));
+- }, bytes.leakRef());
++ float deviceScale = m_view.page().deviceScaleFactor();
++ if (!clipRect && (!nominalResolution || deviceScale == 1))
++ return { ViewSnapshot::create(WTFMove(fullScreenshot)) };
+
+- if (!image)
+- return makeUnexpected("Failed to create snapshot image"_s);
++ WebCore::IntSize size = clipRect ? clipRect->size() : m_view.page().viewSize();
++ if (!nominalResolution) {
++ size.scale(deviceScale);
++ if (clipRect)
++ clipRect->scale(deviceScale);
++ }
+
+- return { ViewSnapshot::create(WTFMove(image)) };
++ SkBitmap bitmap;
++ bitmap.allocPixels(SkImageInfo::Make(size.width(), size.height(), kN32_SkColorType, kPremul_SkAlphaType));
++ SkCanvas canvas(bitmap);
++ if (clipRect) {
++ canvas.translate(-clipRect->x(), -clipRect->y());
++ SkRect rect = SkRect::MakeXYWH(clipRect->x(), clipRect->y(), clipRect->width(), clipRect->height());
++ canvas.clipRect(rect);
++ }
++ if (nominalResolution)
++ canvas.scale(1/deviceScale, 1/deviceScale);
++ canvas.drawImage(fullScreenshot, 0, 0);
++ return { ViewSnapshot::create(WTFMove(bitmap.asImage())) };
+ }
+
+-Expected<Ref<ViewSnapshot>, String> AcceleratedBackingStore::takeSnapshot(std::optional<WebCore::IntRect>&& clipRect)
++Expected<Ref<ViewSnapshot>, String> AcceleratedBackingStore::takeSnapshot(std::optional<WebCore::IntRect>&& clipRect, bool nominalResolution)
+ {
+ if (!m_committedBuffer && !m_pendingBuffer) [[unlikely]]
+ return makeUnexpected("No buffer to create snapshot from"_s);
+
+- return saveBufferSnapshot(m_committedBuffer ? m_committedBuffer : m_pendingBuffer, WTFMove(clipRect));
++ return saveBufferSnapshot(m_committedBuffer ? m_committedBuffer : m_pendingBuffer, WTFMove(clipRect), nominalResolution);
+ }
+
+ #endif
+diff --git a/Source/WebKit/UIProcess/wpe/AcceleratedBackingStore.h b/Source/WebKit/UIProcess/wpe/AcceleratedBackingStore.h
+index ebbc2be4d45a4f3eb507eec2d3f5aa0aa360352a..f856be5e83d61b2883453f9f6fef66aba015b968 100644
+--- a/Source/WebKit/UIProcess/wpe/AcceleratedBackingStore.h
++++ b/Source/WebKit/UIProcess/wpe/AcceleratedBackingStore.h
+@@ -69,7 +69,7 @@ public:
+ void updateSurfaceID(uint64_t);
+
+ #if USE(SKIA)
+- Expected<Ref<ViewSnapshot>, String> takeSnapshot(std::optional<WebCore::IntRect>&&);
++ Expected<Ref<ViewSnapshot>, String> takeSnapshot(std::optional<WebCore::IntRect>&&, bool nominalResolution);
+ #endif
+
+ RendererBufferDescription bufferDescription() const;
diff --git a/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.cpp b/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7df77e30c2e7303dc6aaad560434e5b8e35f4f3c
@@ -18611,10 +18540,10 @@ index 9b688ad328317fea4fd96ce66e9714bad8f0f937..402a36a9c565e13ec298aa7f014f0d92
} // namespace WebKit
diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
-index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2ff404e2b8 100644
+index 9f68d20085a8e97b7fb8e189435eab5c67e72024..a5a5567f9bcd4d5ef2038450e24ff31b70f5225c 100644
--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
-@@ -1499,6 +1499,7 @@
+@@ -1515,6 +1515,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 */; };
@@ -18622,7 +18551,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
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 */; };
-@@ -2281,6 +2282,18 @@
+@@ -2308,6 +2309,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 */; };
@@ -18641,7 +18570,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
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, ); }; };
-@@ -2381,6 +2394,8 @@
+@@ -2412,6 +2425,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 */; };
@@ -18650,7 +18579,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
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 */; };
-@@ -2424,6 +2439,9 @@
+@@ -2457,6 +2472,9 @@
F3EEEE592DB318270038CC1D /* BidiBrowserAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3EEEE572DB318270038CC1D /* BidiBrowserAgent.h */; };
F3EEEE5A2DB318270038CC1D /* BidiBrowserAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3EEEE582DB318270038CC1D /* BidiBrowserAgent.cpp */; };
F404455C2D5CFB56000E587E /* AppKitSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = F404455A2D5CFB56000E587E /* AppKitSoftLink.h */; };
@@ -18660,7 +18589,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
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, ); }; };
-@@ -6446,6 +6464,7 @@
+@@ -6570,6 +6588,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>"; };
@@ -18668,7 +18597,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
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>"; };
-@@ -8213,6 +8232,19 @@
+@@ -8367,6 +8386,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>"; };
@@ -18688,7 +18617,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
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>"; };
-@@ -8393,6 +8425,8 @@
+@@ -8552,6 +8584,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>"; };
@@ -18697,7 +18626,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
E5DEFA6726F8F42600AB68DB /* PhotosUISPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PhotosUISPI.h; sourceTree = "<group>"; };
E838FCAF2DE90BF800703353 /* ISO18013MobileDocumentRequest+Extras.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ISO18013MobileDocumentRequest+Extras.swift"; sourceTree = "<group>"; };
E88885662DC914C400C572B8 /* WKISO18013Request.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKISO18013Request.h; sourceTree = "<group>"; };
-@@ -8454,6 +8488,14 @@
+@@ -8615,6 +8649,14 @@
F404455A2D5CFB56000E587E /* AppKitSoftLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppKitSoftLink.h; sourceTree = "<group>"; };
F404455B2D5CFB56000E587E /* AppKitSoftLink.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AppKitSoftLink.mm; sourceTree = "<group>"; };
F4063DDE2D71481E00F3FE6E /* LLVMProfiling.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LLVMProfiling.h; sourceTree = "<group>"; };
@@ -18710,9 +18639,9 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
+ F3867F0424607D2B008F0F31 /* InspectorScreencastAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorScreencastAgent.h; sourceTree = "<group>"; };
+ F3970344249BD4CE003E1A22 /* ScreencastEncoderMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScreencastEncoderMac.mm; sourceTree = "<group>"; };
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>"; };
-@@ -8928,6 +8970,7 @@
+ F40C3B6F2AB40167007A3567 /* WKDatePickerPopoverController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKDatePickerPopoverController.h; sourceTree = "<group>"; };
+ F40C3B702AB40167007A3567 /* WKDatePickerPopoverController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKDatePickerPopoverController.mm; sourceTree = "<group>"; };
+@@ -9131,6 +9173,7 @@
3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */,
3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */,
7B9FC5BB28A5233B007570E7 /* libWebKitPlatform.a in Frameworks */,
@@ -18720,7 +18649,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */,
37694525184FC6B600CDE21F /* Security.framework in Frameworks */,
37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */,
-@@ -12215,6 +12258,7 @@
+@@ -12480,6 +12523,7 @@
99788ACA1F421DCA00C08000 /* _WKAutomationSessionConfiguration.mm */,
990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */,
990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */,
@@ -18728,7 +18657,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
5C4609E222430E4C009943C2 /* _WKContentRuleListAction.h */,
5C4609E322430E4D009943C2 /* _WKContentRuleListAction.mm */,
5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */,
-@@ -13636,6 +13680,7 @@
+@@ -13921,6 +13965,7 @@
E34B110C27C46BC6006D2F2E /* libWebCoreTestShim.dylib */,
E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */,
DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */,
@@ -18736,7 +18665,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
57A9FF15252C6AEF006A2040 /* libWTF.a */,
5750F32A2032D4E500389347 /* LocalAuthentication.framework */,
570DAAB0230273D200E8FC04 /* NearField.framework */,
-@@ -14232,6 +14277,12 @@
+@@ -14521,6 +14566,12 @@
children = (
9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */,
9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */,
@@ -18749,7 +18678,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
);
path = Agents;
sourceTree = "<group>";
-@@ -14240,6 +14291,7 @@
+@@ -14529,6 +14580,7 @@
isa = PBXGroup;
children = (
A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */,
@@ -18757,7 +18686,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */,
99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */,
99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */,
-@@ -15007,6 +15059,7 @@
+@@ -15300,6 +15352,7 @@
E1513C65166EABB200149FCB /* AuxiliaryProcessProxy.h */,
46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */,
46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */,
@@ -18765,7 +18694,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
5C6D69352AC3935D0099BDAF /* BrowsingContextGroup.cpp */,
5C6D69362AC3935D0099BDAF /* BrowsingContextGroup.h */,
5CA98549210BEB5A0057EB6B /* BrowsingWarning.h */,
-@@ -15031,6 +15084,8 @@
+@@ -15330,6 +15383,8 @@
BC06F43912DBCCFB002D78DE /* GeolocationPermissionRequestProxy.cpp */,
BC06F43812DBCCFB002D78DE /* GeolocationPermissionRequestProxy.h */,
2DD5A72A1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h */,
@@ -18774,7 +18703,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */,
5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */,
31607F3819627002009B87DA /* LegacySessionStateCoding.h */,
-@@ -15061,6 +15116,7 @@
+@@ -15360,6 +15415,7 @@
4683569B21E81CC7006E27A3 /* ProvisionalPageProxy.cpp */,
4683569A21E81CC7006E27A3 /* ProvisionalPageProxy.h */,
411B89CB27B2B89600F9EBD3 /* QueryPermissionResultCallback.h */,
@@ -18782,7 +18711,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
5CCB54DC2A4FEA6A0005FAA8 /* RemotePageDrawingAreaProxy.cpp */,
5CCB54DB2A4FEA6A0005FAA8 /* RemotePageDrawingAreaProxy.h */,
FABBBC802D35AC6800820017 /* RemotePageFullscreenManagerProxy.cpp */,
-@@ -15170,6 +15226,8 @@
+@@ -15471,6 +15527,8 @@
BC7B6204129A0A6700D174A4 /* WebPageGroup.h */,
2D9EA3101A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp */,
2D9EA30E1A96CBFF002D2807 /* WebPageInjectedBundleClient.h */,
@@ -18791,7 +18720,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
9B7F8A502C785725000057F3 /* WebPageLoadTiming.h */,
BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */,
BC032DCB10F4389F0058C15A /* WebPageProxy.h */,
-@@ -15354,6 +15412,7 @@
+@@ -15660,6 +15718,7 @@
BC646C1911DD399F006455B0 /* WKBackForwardListItemRef.h */,
BC646C1611DD399F006455B0 /* WKBackForwardListRef.cpp */,
BC646C1711DD399F006455B0 /* WKBackForwardListRef.h */,
@@ -18799,34 +18728,34 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
BCB9E24A1120E15C00A137E0 /* WKContext.cpp */,
BCB9E2491120E15C00A137E0 /* WKContext.h */,
1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */,
-@@ -15935,6 +15994,9 @@
+@@ -16247,6 +16306,8 @@
07EF07592745A8160066EA04 /* DisplayCaptureSessionManager.h */,
07EF07582745A8160066EA04 /* DisplayCaptureSessionManager.mm */,
7AFA6F682A9F57C50055322A /* DisplayLinkMac.cpp */,
+ D71A94302370E025002C4D9E /* InspectorPlaywrightAgentClientMac.h */,
+ D7EB04E62372A73B00F744CE /* InspectorPlaywrightAgentClientMac.mm */,
-+ D79902AF236E9404005D6F7E /* WebPageInspectorTargetProxyMac.mm */,
1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */,
0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */,
0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */,
-@@ -15958,6 +16020,8 @@
+@@ -16270,6 +16331,9 @@
E568B92120A3AC6A00E3C856 /* WebDataListSuggestionsDropdownMac.mm */,
E55CD20124D09F1F0042DB9C /* WebDateTimePickerMac.h */,
E55CD20224D09F1F0042DB9C /* WebDateTimePickerMac.mm */,
+ D79902AE236E9404005D6F7E /* WebPageInspectorEmulationAgentMac.mm */,
+ D79902B0236E9404005D6F7E /* WebPageInspectorInputAgentMac.mm */,
++ D79902AF236E9404005D6F7E /* WebPageInspectorTargetProxyMac.mm */,
BC857E8512B71EBB00EDEB2E /* WebPageProxyMac.mm */,
BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */,
BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */,
-@@ -17065,6 +17129,7 @@
+@@ -17388,6 +17452,7 @@
99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */,
990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */,
990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */,
+ D71A944A2372290B002C4D9E /* _WKBrowserInspector.h in Headers */,
+ CD89ACBD2EA696A300C76423 /* _WKCaptionStyleMenuController.h in Headers */,
+ 97C476282ECD33A6004D1492 /* _WKCaptionStyleMenuControllerInternal.h in Headers */,
5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */,
- 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */,
- 9B4CE9512CD99B7C00351173 /* _WKContentWorldConfiguration.h in Headers */,
-@@ -17386,6 +17451,7 @@
+@@ -17706,6 +17771,7 @@
E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */,
4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */,
1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */,
@@ -18834,7 +18763,7 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
5CA9854A210BEB640057EB6B /* BrowsingWarning.h in Headers */,
A7E69BCC2B2117A100D43D3F /* BufferAndBackendInfo.h in Headers */,
BC3065FA1259344E00E71278 /* CacheModel.h in Headers */,
-@@ -17569,7 +17635,11 @@
+@@ -17899,7 +17965,11 @@
BC14DF77120B5B7900826C0C /* InjectedBundleScriptWorld.h in Headers */,
CE550E152283752200D28791 /* InsertTextOptions.h in Headers */,
9197940523DBC4BB00257892 /* InspectorBrowserAgent.h in Headers */,
@@ -18846,15 +18775,15 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */,
C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */,
2D4D2C811DF60BF3002EB10C /* InteractionInformationRequest.h in Headers */,
-@@ -17833,6 +17903,7 @@
+@@ -18170,6 +18240,7 @@
+ CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */,
0F6E7C532C4C386800F1DB85 /* RemoteGraphicsContextMessages.h in Headers */,
F451C0FE2703B263002BA03B /* RemoteGraphicsContextProxy.h in Headers */,
- A78A5FE42B0EB39E005036D3 /* RemoteImageBufferSetIdentifier.h in Headers */,
+ D71A943A2370F061002C4D9E /* RemoteInspectorPipe.h in Headers */,
2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */,
2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */,
- 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */,
-@@ -17889,6 +17960,7 @@
+ 5F4D67D682584880B7E5A569 /* RemoteLayerTreeCommitBundle.h in Headers */,
+@@ -18233,6 +18304,7 @@
E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */,
E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */,
7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */,
@@ -18862,73 +18791,38 @@ index 081685223da21e0053b76380ebdb2cf878a7ab23..22c488e25c2b20c9a0f8fe57e5630d2f
6D4DF20C2D824242001F964C /* ScreenTimeWebsiteDataSupport.h in Headers */,
463BB93A2B9D08D80098C5C3 /* ScriptMessageHandlerIdentifier.h in Headers */,
F4E28A362C923814008120DD /* ScriptTrackingPrivacyFilter.h in Headers */,
-@@ -18260,6 +18332,8 @@
+@@ -18610,6 +18682,8 @@
939EF87029D112EE00F23AEE /* WebPageInlines.h in Headers */,
9197940823DBC4CB00257892 /* WebPageInspectorAgentBase.h in Headers */,
A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */,
+ D71A94422371F67E002C4D9E /* WebPageInspectorEmulationAgent.h in Headers */,
+ D71A94432371F67E002C4D9E /* WebPageInspectorInputAgent.h in Headers */,
A543E30C215C8A8D00279CD9 /* WebPageInspectorTarget.h in Headers */,
- A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */,
A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */,
-@@ -20917,7 +20991,43 @@
+ F30EE4712E72226700935B60 /* WebPageInspectorTargetProxy.h in Headers */,
+@@ -21451,6 +21525,7 @@
522F792928D50EBB0069B45B /* HidService.mm in Sources */,
2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */,
2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */,
+ D7EB04E72372A73B00F744CE /* InspectorPlaywrightAgentClientMac.mm in Sources */,
-+ D79902B2236E9404005D6F7E /* WebPageInspectorTargetProxyMac.mm in Sources */,
-+ 1CC94E532AC92F190045F269 /* JSWebExtensionAPIAction.mm in Sources */,
-+ 1C2B4D4B2A819D0D00C528A1 /* JSWebExtensionAPIAlarms.mm in Sources */,
-+ 1C8ECFEA2AFC7DCB007BAA62 /* JSWebExtensionAPICommands.mm in Sources */,
-+ 1C40052C2B2B953D00F2D9EE /* JSWebExtensionAPICookies.mm in Sources */,
-+ 331102402B17B99800B21C8C /* JSWebExtensionAPIDeclarativeNetRequest.mm in Sources */,
-+ 1C517F452B74393C00C46EDC /* JSWebExtensionAPIDevTools.mm in Sources */,
-+ 1C517F432B74393C00C46EDC /* JSWebExtensionAPIDevToolsExtensionPanel.mm in Sources */,
-+ 1C517F472B74393C00C46EDC /* JSWebExtensionAPIDevToolsInspectedWindow.mm in Sources */,
-+ 1C517F462B74393C00C46EDC /* JSWebExtensionAPIDevToolsNetwork.mm in Sources */,
-+ 1C517F412B74393C00C46EDC /* JSWebExtensionAPIDevToolsPanels.mm in Sources */,
-+ B6114A7F29394A1600380B1B /* JSWebExtensionAPIEvent.mm in Sources */,
-+ 1C5DC471290B33A20061EC62 /* JSWebExtensionAPIExtension.mm in Sources */,
-+ B6CCAAB929A445E90092E846 /* JSWebExtensionAPILocalization.mm in Sources */,
-+ 1CCEE4532B0989FC0034E059 /* JSWebExtensionAPIMenus.mm in Sources */,
-+ 1C5DC4552908AC900061EC62 /* JSWebExtensionAPINamespace.mm in Sources */,
-+ 1C386F362AF409F9004108F0 /* JSWebExtensionAPINotifications.mm in Sources */,
-+ B61AFA4929510D0F008220B1 /* JSWebExtensionAPIPermissions.mm in Sources */,
-+ 1C9A15CF2ABDF1E2002CC12A /* JSWebExtensionAPIPort.mm in Sources */,
-+ 1C5DC472290B33A60061EC62 /* JSWebExtensionAPIRuntime.mm in Sources */,
-+ B63E9A6F2AAF2B2D005F4561 /* JSWebExtensionAPIScripting.mm in Sources */,
-+ 029D6BB22C407AA30068CF99 /* JSWebExtensionAPISidebarAction.mm in Sources */,
-+ 029D6BB12C407AA30068CF99 /* JSWebExtensionAPISidePanel.mm in Sources */,
-+ B63C10342B51C0B6004A69B8 /* JSWebExtensionAPIStorage.mm in Sources */,
-+ B63C10372B51C102004A69B8 /* JSWebExtensionAPIStorageArea.mm in Sources */,
-+ 1C5ACFAB2A96F8D500C041C0 /* JSWebExtensionAPITabs.mm in Sources */,
-+ 1C15497F2926C073001B9E5B /* JSWebExtensionAPITest.mm in Sources */,
+ 5CF250AF2EE06491006A7172 /* IPCTesterReceiverSwift.swift in Sources */,
+ 5C448C662EE06E11008931C7 /* IPCTesterReceiverSwiftMessageReceiver.swift in Sources */,
1C0F05BE2CFA5D2E007D1F62 /* JSWebExtensionAPIUnified.mm in Sources */,
-+ 3375A3772942A19D0028536D /* JSWebExtensionAPIWebNavigation.mm in Sources */,
-+ 33F68338293FF6F5005C63C0 /* JSWebExtensionAPIWebNavigationEvent.mm in Sources */,
-+ B63A99772B7EA002004611FD /* JSWebExtensionAPIWebPageNamespace.mm in Sources */,
-+ B63A99782B7EA002004611FD /* JSWebExtensionAPIWebPageRuntime.mm in Sources */,
-+ 3399E1532B59EFD7008BFB60 /* JSWebExtensionAPIWebRequest.mm in Sources */,
-+ 337042022B58A0B70077FF78 /* JSWebExtensionAPIWebRequestEvent.mm in Sources */,
-+ 1C5ACFA62A96F8C400C041C0 /* JSWebExtensionAPIWindows.mm in Sources */,
-+ 1C5ACFA72A96F8C400C041C0 /* JSWebExtensionAPIWindowsEvent.mm in Sources */,
- C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */,
- C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */,
- 41A0EB142641714900794471 /* LibWebRTCCodecsProxy.mm in Sources */,
-@@ -21258,6 +21368,8 @@
+@@ -21802,6 +21877,9 @@
078B04A02CF18EAB00B453A6 /* WebPage+NavigationPreferences.swift in Sources */,
071467782DFE84E500F77867 /* WebPage+Transferable.swift in Sources */,
07CB79962CE9435700199C49 /* WebPage.swift in Sources */,
+ D79902B1236E9404005D6F7E /* WebPageInspectorEmulationAgentMac.mm in Sources */,
+ D79902B3236E9404005D6F7E /* WebPageInspectorInputAgentMac.mm in Sources */,
++ D79902B2236E9404005D6F7E /* WebPageInspectorTargetProxyMac.mm in Sources */,
7CE9CE101FA0767A000177DE /* WebPageUpdatePreferences.cpp in Sources */,
079A4DA12D72CC0D00CA387F /* WebPageWebView.swift in Sources */,
7CEB00DD1FA69ABE0065473B /* WebPreferencesFeatures.cpp in Sources */,
diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
-index 717468dc02f8f50567a8e421eb5a2b5a28d63411..6c6a06b93f6ef26e7b5acd73f89f9d515a99c5af 100644
+index eab2e2b933f812643aa2577c06370969dc2e90cf..33350236fc188d4d8553cce43dfae47029293ca5 100644
--- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
+++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
-@@ -272,6 +272,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
+@@ -273,6 +273,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
}
#endif
@@ -18940,7 +18834,7 @@ index 717468dc02f8f50567a8e421eb5a2b5a28d63411..6c6a06b93f6ef26e7b5acd73f89f9d51
#if ENABLE(PDFJS)
if (tryLoadingUsingPDFJSHandler(resourceLoader, trackingParameters))
return;
-@@ -293,12 +298,16 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
+@@ -294,12 +299,16 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
}
if (InspectorInstrumentationWebKit::shouldInterceptRequest(resourceLoader)) {
@@ -18963,7 +18857,7 @@ index 717468dc02f8f50567a8e421eb5a2b5a28d63411..6c6a06b93f6ef26e7b5acd73f89f9d51
}
WEBLOADERSTRATEGY_RELEASE_LOG_FORWARDABLE(WEBLOADERSTRATEGY_SCHEDULELOAD);
-@@ -425,7 +434,7 @@ static void addParametersShared(const LocalFrame* frame, NetworkResourceLoadPara
+@@ -429,7 +438,7 @@ static void addParametersShared(const LocalFrame* frame, NetworkResourceLoadPara
parameters.linkPreconnectEarlyHintsEnabled = mainFrame->settings().linkPreconnectEarlyHintsEnabled();
}
@@ -18972,7 +18866,7 @@ index 717468dc02f8f50567a8e421eb5a2b5a28d63411..6c6a06b93f6ef26e7b5acd73f89f9d51
{
auto identifier = *resourceLoader.identifier();
-@@ -437,10 +446,10 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -441,10 +450,10 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
&& resourceLoader.frameLoader()->notifier().isInitialRequestIdentifier(identifier)
? MainFrameMainResource::Yes : MainFrameMainResource::No;
if (!page->allowsLoadFromURL(request.url(), mainFrameMainResource)) {
@@ -18985,7 +18879,7 @@ index 717468dc02f8f50567a8e421eb5a2b5a28d63411..6c6a06b93f6ef26e7b5acd73f89f9d51
}
}
-@@ -450,14 +459,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -454,14 +463,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);
@@ -19000,7 +18894,7 @@ index 717468dc02f8f50567a8e421eb5a2b5a28d63411..6c6a06b93f6ef26e7b5acd73f89f9d51
loadParameters.identifier = identifier;
loadParameters.parentPID = legacyPresentingApplicationPID();
loadParameters.contentSniffingPolicy = contentSniffingPolicy;
-@@ -541,14 +542,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -545,14 +546,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
if (loadParameters.options.mode != FetchOptions::Mode::Navigate) {
ASSERT(loadParameters.sourceOrigin);
@@ -19018,7 +18912,7 @@ index 717468dc02f8f50567a8e421eb5a2b5a28d63411..6c6a06b93f6ef26e7b5acd73f89f9d51
loadParameters.isMainFrameNavigation = isMainFrameNavigation;
if (loadParameters.isMainFrameNavigation && document)
-@@ -602,6 +600,25 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -606,6 +604,25 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
if (CachedResourceHandle handle = resourceLoader.cachedResource())
loadParameters.isInitiatorPrefetch = handle->type() == CachedResource::Type::LinkPrefetch;
@@ -19044,7 +18938,7 @@ index 717468dc02f8f50567a8e421eb5a2b5a28d63411..6c6a06b93f6ef26e7b5acd73f89f9d51
std::optional<NetworkResourceLoadIdentifier> existingNetworkResourceLoadIdentifierToResume;
if (loadParameters.isMainFrameNavigation)
existingNetworkResourceLoadIdentifierToResume = std::exchange(m_existingNetworkResourceLoadIdentifierToResume, std::nullopt);
-@@ -617,7 +634,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -621,7 +638,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
}
auto loader = WebResourceLoader::create(resourceLoader, trackingParameters);
@@ -19053,7 +18947,7 @@ index 717468dc02f8f50567a8e421eb5a2b5a28d63411..6c6a06b93f6ef26e7b5acd73f89f9d51
}
void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader)
-@@ -1035,7 +1052,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier
+@@ -1039,7 +1056,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier
bool WebLoaderStrategy::isOnLine() const
{
@@ -19062,7 +18956,7 @@ index 717468dc02f8f50567a8e421eb5a2b5a28d63411..6c6a06b93f6ef26e7b5acd73f89f9d51
}
void WebLoaderStrategy::addOnlineStateChangeListener(Function<void(bool)>&& listener)
-@@ -1061,6 +1078,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet
+@@ -1065,6 +1082,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet
void WebLoaderStrategy::setOnLineState(bool isOnLine)
{
@@ -19074,7 +18968,7 @@ index 717468dc02f8f50567a8e421eb5a2b5a28d63411..6c6a06b93f6ef26e7b5acd73f89f9d51
if (m_isOnLine == isOnLine)
return;
-@@ -1069,6 +1091,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine)
+@@ -1073,6 +1095,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine)
listener(isOnLine);
}
@@ -19088,7 +18982,7 @@ index 717468dc02f8f50567a8e421eb5a2b5a28d63411..6c6a06b93f6ef26e7b5acd73f89f9d51
{
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 2c63aa572dda8af5d9b33b9636c33f04172563ae..1b30460e13a334b43be2b6b0f58a88b2f307cd30 100644
+index 7cdc69f27b25457f07b3f7cbba75290f995538bb..e4b1ab52e259f24a2cf5403c4dd9e694b2b086e7 100644
--- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h
+++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h
@@ -26,6 +26,7 @@
@@ -19099,7 +18993,7 @@ index 2c63aa572dda8af5d9b33b9636c33f04172563ae..1b30460e13a334b43be2b6b0f58a88b2
#include "WebResourceLoader.h"
#include <WebCore/LoaderStrategy.h>
#include <WebCore/ResourceError.h>
-@@ -97,6 +98,9 @@ public:
+@@ -98,6 +99,9 @@ public:
bool isOnLine() const final;
void addOnlineStateChangeListener(Function<void(bool)>&&) final;
void setOnLineState(bool);
@@ -19109,7 +19003,7 @@ index 2c63aa572dda8af5d9b33b9636c33f04172563ae..1b30460e13a334b43be2b6b0f58a88b2
void setExistingNetworkResourceLoadIdentifierToResume(std::optional<NetworkResourceLoadIdentifier> existingNetworkResourceLoadIdentifierToResume) { m_existingNetworkResourceLoadIdentifierToResume = existingNetworkResourceLoadIdentifierToResume; }
-@@ -165,6 +169,7 @@ private:
+@@ -166,6 +170,7 @@ private:
Vector<Function<void(bool)>> m_onlineStateChangeListeners;
std::optional<NetworkResourceLoadIdentifier> m_existingNetworkResourceLoadIdentifierToResume;
bool m_isOnLine { true };
@@ -19118,10 +19012,10 @@ index 2c63aa572dda8af5d9b33b9636c33f04172563ae..1b30460e13a334b43be2b6b0f58a88b2
} // namespace WebKit
diff --git a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
-index 46c2cccc74f7d650a2c2624aa5bb72a93206b9bc..74c1bc4de3d3ab304c7faebebe1ada62a81ff660 100644
+index 01cc8797d5091e4c912a3261ce95b9b87aad9939..fa83d1c0bfcb1d75d469d48c740978db05267aae 100644
--- a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
+++ b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
-@@ -204,9 +204,6 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
+@@ -203,9 +203,6 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
coreLoader->didReceiveResponse(ResourceResponse { inspectorResponse }, [this, protectedThis = Ref { *this }, interceptedRequestIdentifier, policyDecisionCompletionHandler = WTFMove(policyDecisionCompletionHandler), overrideData = WTFMove(overrideData)]() mutable {
RefPtr coreLoader = m_coreLoader;
@@ -19131,7 +19025,7 @@ index 46c2cccc74f7d650a2c2624aa5bb72a93206b9bc..74c1bc4de3d3ab304c7faebebe1ada62
if (!m_coreLoader || !coreLoader->identifier()) {
m_interceptController.continueResponse(interceptedRequestIdentifier);
return;
-@@ -223,6 +220,8 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
+@@ -222,6 +219,8 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
}
});
});
@@ -19141,10 +19035,10 @@ index 46c2cccc74f7d650a2c2624aa5bb72a93206b9bc..74c1bc4de3d3ab304c7faebebe1ada62
}
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
-index 69ad1034b9f01a8582c84841f0e44fadc12a6367..af0f824672baec478b17b8c8f53dd2df56bd731a 100644
+index 9d4ff34fe5befc7a5326164eb281cd630b79ed02..a8b84973f73d4b68029b3d4e940f91d666456b02 100644
--- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
-@@ -494,6 +494,9 @@ void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel lev
+@@ -508,6 +508,9 @@ void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel lev
if (!page)
return;
@@ -19180,10 +19074,10 @@ index f0e2863e578c60cfc0ddc98a50b45061fad1fc0b..81e59abd8c5201d0550bff3ad8ecf284
#include <WebCore/UserMediaRequest.h>
#include <wtf/TZoneMallocInlines.h>
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm b/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
-index 5819df852bf76f0ed4ce50105b93c0fd697123d6..2fc578b7ff70877738278fe7006f14262e82e7a2 100644
+index 49f5744bedb68860258cf8afeafcbac752837ced..d5292168d55655ffe0e1c11f7907fb2f51fc8f0c 100644
--- a/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
+++ b/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
-@@ -128,7 +128,8 @@ static WebCore::CachedImage* cachedImage(Element& element)
+@@ -130,7 +130,8 @@ static WebCore::CachedImage* cachedImage(Element& element)
void WebDragClient::declareAndWriteDragImage(const String& pasteboardName, Element& element, const URL& url, const String& label, LocalFrame*)
{
@@ -19257,30 +19151,6 @@ index 0000000000000000000000000000000000000000..741ef5b11fe8718529105339cda0fab5
+}; // namespace WebKit.
+
+#endif // ENABLE(DRAG_SUPPORT)
-diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
-index 4c4daaa62270c3236ee0f3352076c740968dcd89..780ddeb80f18eb8e314867a6c49a19fd0e9354a9 100644
---- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
-+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
-@@ -39,6 +39,7 @@
- #include "WebPreferencesKeys.h"
- #include "WebProcess.h"
- #include <WebCore/GraphicsContext.h>
-+#include <WebCore/InspectorController.h>
- #include <WebCore/LocalFrameInlines.h>
- #include <WebCore/LocalFrameView.h>
- #include <WebCore/Page.h>
-diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-index 4ffe3d98d023cd6f415782d59e40d52bb15ab1be..d8d38f57fc57ab51585aaeea8c9c1e92bef5ce2d 100644
---- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-@@ -140,6 +140,7 @@ public:
- #if PLATFORM(WPE) && USE(GBM) && ENABLE(WPE_PLATFORM)
- void preferredBufferFormatsDidChange();
- #endif
-+
- private:
- void updateRootLayer();
- WebCore::FloatRect visibleContentsRect() const;
diff --git a/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp b/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp
index 04f3e2cebec36db9487ee5b5d4f33eb2ca8db3b8..4677b87d3cdfdc98e4b10747bf483df3ec1feec0 100644
--- a/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp
@@ -19294,18 +19164,18 @@ index 04f3e2cebec36db9487ee5b5d4f33eb2ca8db3b8..4677b87d3cdfdc98e4b10747bf483df3
#include "WebPage.h"
#include "WebPageCreationParameters.h"
diff --git a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp
-index 7ff2b1ad2dd19a2b25c5f5c3afbe7f580dd02c4e..eceb689621ed65f4e19461489e43e9f1690f0ea1 100644
+index 868a836e964d3a24a74e5e6b853c537dfed7c08a..079590ce32193a80be7ca467397c2e79ac0079b7 100644
--- a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp
+++ b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp
-@@ -44,6 +44,7 @@
+@@ -43,6 +43,7 @@
+ #include <WebCore/FrameLoader.h>
#include <WebCore/LocalFrame.h>
#include <WebCore/LocalFrameLoaderClient.h>
- #include <WebCore/Page.h>
+#include <WebCore/ResourceLoader.h>
#include <WebCore/ScriptTrackingPrivacyCategory.h>
#include <WebCore/Settings.h>
#include <WebCore/StorageSessionProvider.h>
-@@ -447,6 +448,12 @@ void WebCookieJar::setOptInCookiePartitioningEnabled(bool enabled)
+@@ -446,6 +447,12 @@ void WebCookieJar::setOptInCookiePartitioningEnabled(bool enabled)
}
#endif
@@ -19332,18 +19202,18 @@ index a7ad18fc1201e5de2cc1528539a765599ecfc41e..ebea233bc54ab6e56fb7093ff63e2368
WebCookieJar();
diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
-index dfeb32a72c1954e4ae456ed89c4fe7b44c533875..3278fd1b672ea8b406e415cce31995fefefaac83 100644
+index 740461ddc23b7a7083b051270d8f21b7e276c206..691e00eed87e680e3799675a1721b412daa3b023 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
-@@ -249,6 +249,7 @@
+@@ -256,6 +256,7 @@
+ #include <WebCore/HitTestResult.h>
#include <WebCore/ImageAnalysisQueue.h>
#include <WebCore/ImageOverlay.h>
- #include <WebCore/InspectorController.h>
+#include <WebCore/InspectorInstrumentationWebKit.h>
#include <WebCore/JSDOMExceptionHandling.h>
#include <WebCore/JSNode.h>
#include <WebCore/KeyboardEvent.h>
-@@ -1185,6 +1186,12 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
+@@ -1205,6 +1206,12 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
setLinkDecorationFilteringData(WTFMove(parameters.linkDecorationFilteringData));
setAllowedQueryParametersForAdvancedPrivacyProtections(WTFMove(parameters.allowedQueryParametersForAdvancedPrivacyProtections));
#endif
@@ -19352,11 +19222,11 @@ index dfeb32a72c1954e4ae456ed89c4fe7b44c533875..3278fd1b672ea8b406e415cce31995fe
+ // dispatch nested message loop and receive IPC messages. To mitigate that, the actual
+ // pause is postponed until the page is added to the map.
+ if (parameters.shouldPauseInInspectorWhenShown)
-+ m_page->inspectorController().pauseOnStart(parameters.windowFeatures ? InspectorController::PauseCondition::WHEN_CREATION_FINISHED : InspectorController::PauseCondition::WHEN_SHOWN);
++ m_page->inspectorController().pauseOnStart(parameters.windowFeatures ? PageInspectorController::PauseCondition::WHEN_CREATION_FINISHED : PageInspectorController::PauseCondition::WHEN_SHOWN);
if (parameters.windowFeatures) {
page->applyWindowFeatures(*parameters.windowFeatures);
page->chrome().show();
-@@ -2115,6 +2122,22 @@ void WebPage::loadDidCommitInAnotherProcess(WebCore::FrameIdentifier frameID, st
+@@ -2150,6 +2157,22 @@ void WebPage::loadDidCommitInAnotherProcess(WebCore::FrameIdentifier frameID, st
frame->loadDidCommitInAnotherProcess(layerHostingContextIdentifier);
}
@@ -19379,7 +19249,7 @@ index dfeb32a72c1954e4ae456ed89c4fe7b44c533875..3278fd1b672ea8b406e415cce31995fe
void WebPage::loadRequest(LoadParameters&& loadParameters)
{
WEBPAGE_RELEASE_LOG_FORWARDABLE(Loading, WEBPAGE_LOADREQUEST, loadParameters.navigationID ? loadParameters.navigationID->toUInt64() : 0, static_cast<unsigned>(loadParameters.shouldTreatAsContinuingLoad), loadParameters.request.isAppInitiated(), loadParameters.existingNetworkResourceLoadIdentifierToResume ? loadParameters.existingNetworkResourceLoadIdentifierToResume->toUInt64() : 0);
-@@ -2315,7 +2338,9 @@ void WebPage::stopLoading()
+@@ -2350,7 +2373,9 @@ void WebPage::stopLoading()
void WebPage::stopLoadingDueToProcessSwap()
{
SetForScope isStoppingLoadingDueToProcessSwap(m_isStoppingLoadingDueToProcessSwap, true);
@@ -19389,7 +19259,7 @@ index dfeb32a72c1954e4ae456ed89c4fe7b44c533875..3278fd1b672ea8b406e415cce31995fe
}
bool WebPage::defersLoading() const
-@@ -2891,7 +2916,7 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum
+@@ -2926,7 +2951,7 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum
#if PLATFORM(IOS_FAMILY)
if (m_viewportConfiguration.setViewportArguments(viewportArguments))
viewportConfigurationChanged();
@@ -19398,8 +19268,8 @@ index dfeb32a72c1954e4ae456ed89c4fe7b44c533875..3278fd1b672ea8b406e415cce31995fe
// Adjust view dimensions when using fixed layout.
RefPtr localMainFrame = this->localMainFrame();
RefPtr view = localMainFrame ? localMainFrame->view() : nullptr;
-@@ -3689,6 +3714,13 @@ void WebPage::flushDeferredScrollEvents()
- protectedCorePage()->flushDeferredScrollEvents();
+@@ -3734,6 +3759,13 @@ void WebPage::flushDeferredIntersectionObservations()
+ protectedCorePage()->flushDeferredIntersectionObservations();
}
+#if ENABLE(ORIENTATION_EVENTS)
@@ -19412,7 +19282,7 @@ index dfeb32a72c1954e4ae456ed89c4fe7b44c533875..3278fd1b672ea8b406e415cce31995fe
void WebPage::flushDeferredDidReceiveMouseEvent()
{
if (auto info = std::exchange(m_deferredDidReceiveMouseEvent, std::nullopt))
-@@ -3959,6 +3991,97 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent, CompletionHandler<void
+@@ -4004,6 +4036,97 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent, CompletionHandler<void
completionHandler(touchEvent.type(), handled);
}
@@ -19510,8 +19380,8 @@ index dfeb32a72c1954e4ae456ed89c4fe7b44c533875..3278fd1b672ea8b406e415cce31995fe
#endif
void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint)
-@@ -4047,6 +4170,16 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m
- m_inspectorTargetController->sendMessageToTargetBackend(targetId, message);
+@@ -4099,6 +4222,16 @@ void WebPage::sendMessageToTargetBackend(const String& message)
+ ensureInspectorTarget().sendMessageToTargetBackend(message);
}
+void WebPage::resumeInspectorIfPausedInNewWindow()
@@ -19527,7 +19397,7 @@ index dfeb32a72c1954e4ae456ed89c4fe7b44c533875..3278fd1b672ea8b406e415cce31995fe
void WebPage::insertNewlineInQuotedContent()
{
RefPtr frame = corePage()->focusController().focusedOrMainFrame();
-@@ -4290,6 +4423,7 @@ void WebPage::setMainFrameDocumentVisualUpdatesAllowed(bool allowed)
+@@ -4334,6 +4467,7 @@ void WebPage::setMainFrameDocumentVisualUpdatesAllowed(bool allowed)
void WebPage::show()
{
send(Messages::WebPageProxy::ShowPage());
@@ -19535,7 +19405,7 @@ index dfeb32a72c1954e4ae456ed89c4fe7b44c533875..3278fd1b672ea8b406e415cce31995fe
}
void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension)
-@@ -5489,7 +5623,7 @@ RefPtr<NotificationPermissionRequestManager> WebPage::protectedNotificationPermi
+@@ -5419,7 +5553,7 @@ RefPtr<NotificationPermissionRequestManager> WebPage::protectedNotificationPermi
#if ENABLE(DRAG_SUPPORT)
@@ -19544,7 +19414,7 @@ index dfeb32a72c1954e4ae456ed89c4fe7b44c533875..3278fd1b672ea8b406e415cce31995fe
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)
-@@ -8217,6 +8351,10 @@ void WebPage::didCommitLoad(WebFrame* frame)
+@@ -7703,6 +7837,10 @@ void WebPage::didCommitLoad(WebFrame* frame)
if (frame && frame->isMainFrame())
m_networkResourceRequestIdentifiersForPageLoadTiming.clear();
@@ -19555,7 +19425,7 @@ index dfeb32a72c1954e4ae456ed89c4fe7b44c533875..3278fd1b672ea8b406e415cce31995fe
}
void WebPage::didFinishDocumentLoad(WebFrame& frame)
-@@ -8526,6 +8664,9 @@ Ref<DocumentLoader> WebPage::createDocumentLoader(LocalFrame& frame, ResourceReq
+@@ -8017,6 +8155,9 @@ Ref<DocumentLoader> WebPage::createDocumentLoader(LocalFrame& frame, ResourceReq
m_allowsContentJavaScriptFromMostRecentNavigation = m_internals->pendingWebsitePolicies->allowsContentJavaScript;
WebsitePoliciesData::applyToDocumentLoader(*std::exchange(m_internals->pendingWebsitePolicies, std::nullopt), documentLoader);
}
@@ -19566,7 +19436,7 @@ index dfeb32a72c1954e4ae456ed89c4fe7b44c533875..3278fd1b672ea8b406e415cce31995fe
return documentLoader;
diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
-index 0577245e9f59eb2cb5875be0edcfa28c464d16aa..e24ca4acfde65e2da499e834212290ba2253123c 100644
+index 3a54cff7826fc9d9a8055fd67909a9c8ac75d5ea..d8f4f83c19c5954a9fe2428574234e28f8ab0c0f 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
@@ -47,6 +47,7 @@
@@ -19577,7 +19447,7 @@ index 0577245e9f59eb2cb5875be0edcfa28c464d16aa..e24ca4acfde65e2da499e834212290ba
#include <WebCore/PageIdentifier.h>
#include <WebCore/PageOverlay.h>
#include <WebCore/PlatformLayerIdentifier.h>
-@@ -1321,11 +1322,11 @@ public:
+@@ -1344,11 +1345,11 @@ public:
void clearSelection();
void restoreSelectionInFocusedEditableElement();
@@ -19591,7 +19461,7 @@ index 0577245e9f59eb2cb5875be0edcfa28c464d16aa..e24ca4acfde65e2da499e834212290ba
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
-@@ -1343,6 +1344,9 @@ public:
+@@ -1366,6 +1367,9 @@ public:
#if ENABLE(MODEL_PROCESS)
void modelDragEnded(WebCore::NodeIdentifier);
#endif
@@ -19601,7 +19471,7 @@ index 0577245e9f59eb2cb5875be0edcfa28c464d16aa..e24ca4acfde65e2da499e834212290ba
#endif
#if ENABLE(MODEL_PROCESS)
-@@ -1444,8 +1448,11 @@ public:
+@@ -1467,8 +1471,11 @@ public:
void gestureEvent(WebCore::FrameIdentifier, const WebGestureEvent&, CompletionHandler<void(std::optional<WebEventType>, bool, std::optional<WebCore::RemoteUserInputEventData>)>&&);
#endif
@@ -19614,16 +19484,16 @@ index 0577245e9f59eb2cb5875be0edcfa28c464d16aa..e24ca4acfde65e2da499e834212290ba
void dynamicViewportSizeUpdate(const DynamicViewportSizeUpdate&);
bool scaleWasSetByUIProcess() const { return m_scaleWasSetByUIProcess; }
void willStartUserTriggeredZooming();
-@@ -1607,6 +1614,8 @@ public:
- void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType);
- void disconnectInspector(const String& targetId);
- void sendMessageToTargetBackend(const String& targetId, const String& message);
+@@ -1629,6 +1636,8 @@ public:
+ void connectInspector(Inspector::FrontendChannel::ConnectionType);
+ void disconnectInspector();
+ void sendMessageToTargetBackend(const String& message);
+ void resumeInspectorIfPausedInNewWindow();
+ void didAddWebPageToWebProcess();
void insertNewlineInQuotedContent();
-@@ -2031,6 +2040,7 @@ public:
+@@ -2066,6 +2075,7 @@ public:
void showContextMenuFromFrame(const FrameInfoData&, const ContextMenuContextData&, const UserData&);
#endif
void loadRequest(LoadParameters&&);
@@ -19631,7 +19501,7 @@ index 0577245e9f59eb2cb5875be0edcfa28c464d16aa..e24ca4acfde65e2da499e834212290ba
void setObscuredContentInsets(const WebCore::FloatBoxExtent&);
-@@ -2255,6 +2265,7 @@ private:
+@@ -2292,6 +2302,7 @@ private:
void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled);
#elif ENABLE(TOUCH_EVENTS)
void touchEvent(const WebTouchEvent&, CompletionHandler<void(std::optional<WebEventType>, bool)>&&);
@@ -19639,7 +19509,7 @@ index 0577245e9f59eb2cb5875be0edcfa28c464d16aa..e24ca4acfde65e2da499e834212290ba
#endif
void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&);
-@@ -3035,6 +3046,7 @@ private:
+@@ -3079,6 +3090,7 @@ private:
bool m_isAppNapEnabled { true };
Markable<WebCore::NavigationIdentifier> m_pendingNavigationID;
@@ -19648,7 +19518,7 @@ index 0577245e9f59eb2cb5875be0edcfa28c464d16aa..e24ca4acfde65e2da499e834212290ba
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 961e4cde3b7f7dcfeed3826cbece0700c63e6fc5..97ba51f4608de657d9f7475d2d5b26a08c553426 100644
+index 57b4b5e79115300c5896664c45f137c395e566df..837f5df525f6ee9d26fb1adb2824d0b62a6ec0fb 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
@@ -61,10 +61,13 @@ messages -> WebPage WantsAsyncDispatchMessage {
@@ -19667,9 +19537,9 @@ index 961e4cde3b7f7dcfeed3826cbece0700c63e6fc5..97ba51f4608de657d9f7475d2d5b26a0
DynamicViewportSizeUpdate(struct WebKit::DynamicViewportSizeUpdate target)
@@ -159,6 +162,7 @@ messages -> WebPage WantsAsyncDispatchMessage {
- ConnectInspector(String targetId, Inspector::FrontendChannel::ConnectionType connectionType)
- DisconnectInspector(String targetId)
- SendMessageToTargetBackend(String targetId, String message)
+ ConnectInspector(Inspector::FrontendChannel::ConnectionType connectionType)
+ DisconnectInspector()
+ SendMessageToTargetBackend(String message)
+ ResumeInspectorIfPausedInNewWindow();
#if ENABLE(REMOTE_INSPECTOR)
@@ -19677,7 +19547,7 @@ index 961e4cde3b7f7dcfeed3826cbece0700c63e6fc5..97ba51f4608de657d9f7475d2d5b26a0
@@ -169,6 +173,7 @@ messages -> WebPage WantsAsyncDispatchMessage {
#endif
#if !ENABLE(IOS_TOUCH_EVENTS) && ENABLE(TOUCH_EVENTS)
- TouchEvent(WebKit::WebTouchEvent event) -> (enum:uint8_t std::optional<WebKit::WebEventType> eventType, bool handled)
+ TouchEvent(WebKit::WebTouchEvent event) -> (enum:uint32_t std::optional<WebKit::WebEventType> eventType, bool handled)
+ FakeTouchTap(WebCore::IntPoint position, uint8_t modifiers) -> () Async
#endif
@@ -19690,7 +19560,7 @@ index 961e4cde3b7f7dcfeed3826cbece0700c63e6fc5..97ba51f4608de657d9f7475d2d5b26a0
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)
-@@ -358,10 +364,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
+@@ -357,10 +363,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
RemoveLayerForFindOverlay() -> ()
# Drag and drop.
@@ -19703,7 +19573,7 @@ index 961e4cde3b7f7dcfeed3826cbece0700c63e6fc5..97ba51f4608de657d9f7475d2d5b26a0
PerformDragControllerAction(std::optional<WebCore::FrameIdentifier> frameID, enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData) -> (enum:uint8_t std::optional<WebCore::DragOperation> dragOperation, enum:uint8_t WebCore::DragHandlingMethod dragHandlingMethod, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, WebCore::IntRect insertionRect, WebCore::IntRect editableElementRect, struct std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData)
PerformDragOperation(WebCore::DragData dragData, WebKit::SandboxExtensionHandle sandboxExtensionHandle, Vector<WebKit::SandboxExtensionHandle> sandboxExtensionsForUpload) -> (bool handled)
#endif
-@@ -381,6 +387,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
+@@ -380,6 +386,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
ModelDragEnded(WebCore::NodeIdentifier nodeID)
#endif
@@ -19715,10 +19585,10 @@ index 961e4cde3b7f7dcfeed3826cbece0700c63e6fc5..97ba51f4608de657d9f7475d2d5b26a0
RequestDragStart(std::optional<WebCore::FrameIdentifier> remoteFrameID, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet<WebCore::DragSourceAction> allowedActionsMask) -> (struct WebKit::DragInitiationResult result)
RequestAdditionalItemsForDragSession(std::optional<WebCore::FrameIdentifier> rootFrameID, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet<WebCore::DragSourceAction> allowedActionsMask) -> (struct WebKit::DragInitiationResult result)
diff --git a/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp b/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp
-index 907f750f7e6c9c3d2b15a7eafd5480a6582b3a69..0163098c7ea168b985ee92f9dbf0b31c502bf6b8 100644
+index 009d2e5e07544e5d8e39802a388559f1a98d6d52..1ae313228a3b3b61c67b796934fa89702bd13f89 100644
--- a/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp
+++ b/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp
-@@ -211,16 +211,23 @@ String WebPage::platformUserAgent(const URL& url) const
+@@ -222,16 +222,23 @@ String WebPage::platformUserAgent(const URL& url) const
bool WebPage::hoverSupportedByPrimaryPointingDevice() const
{
@@ -19742,7 +19612,7 @@ index 907f750f7e6c9c3d2b15a7eafd5480a6582b3a69..0163098c7ea168b985ee92f9dbf0b31c
const auto& primaryPointingDevice = WebProcess::singleton().primaryPointingDevice();
if (primaryPointingDevice == AvailableInputDevices::Mouse)
return PointerCharacteristics::Fine;
-@@ -231,6 +238,9 @@ std::optional<PointerCharacteristics> WebPage::pointerCharacteristicsOfPrimaryPo
+@@ -242,6 +249,9 @@ std::optional<PointerCharacteristics> WebPage::pointerCharacteristicsOfPrimaryPo
OptionSet<PointerCharacteristics> WebPage::pointerCharacteristicsOfAllAvailablePointingDevices() const
{
@@ -19753,10 +19623,10 @@ index 907f750f7e6c9c3d2b15a7eafd5480a6582b3a69..0163098c7ea168b985ee92f9dbf0b31c
const auto& availableInputs = WebProcess::singleton().availableInputDevices();
if (availableInputs.contains(AvailableInputDevices::Mouse))
diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
-index 12c8c15f4e02fe442110815bfb37a3433e2f7e78..21504a7d64e4313cfe86c85e60a0ec2879d36087 100644
+index ae77b6bd5630584813a80333224c606625d6b28a..377871a91d4dd4e588858135a522c52a0a7515c4 100644
--- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
+++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
-@@ -703,21 +703,37 @@ String WebPage::platformUserAgent(const URL&) const
+@@ -705,21 +705,37 @@ String WebPage::platformUserAgent(const URL&) const
bool WebPage::hoverSupportedByPrimaryPointingDevice() const
{
@@ -19795,7 +19665,7 @@ index 12c8c15f4e02fe442110815bfb37a3433e2f7e78..21504a7d64e4313cfe86c85e60a0ec28
}
diff --git a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp
-index ea3a03b5ee6d4ecadd771314c6059268db917087..91be6f4c687157afcfdaa431d7a1a6ff712b551c 100644
+index d32f7d2dd108647aeba05007a371b8c7381232a7..00da787b3ac4d312006a92475701c13366a1d740 100644
--- a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp
+++ b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp
@@ -45,6 +45,7 @@
@@ -19845,10 +19715,10 @@ index ea3a03b5ee6d4ecadd771314c6059268db917087..91be6f4c687157afcfdaa431d7a1a6ff
}
diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp
-index f0544767cec6c08f3a8ff7da1c7df40ad10488e7..2345e5dc795240cd963e1c56f7da2a1c38503425 100644
+index b851f0f615e2c13a004abd15d576f969812e7b5e..6d87836a917ff55977c84386e7ceaa7999934368 100644
--- a/Source/WebKit/WebProcess/WebProcess.cpp
+++ b/Source/WebKit/WebProcess/WebProcess.cpp
-@@ -94,6 +94,7 @@
+@@ -96,6 +96,7 @@
#include "WebsiteData.h"
#include "WebsiteDataStoreParameters.h"
#include "WebsiteDataType.h"
@@ -19856,7 +19726,7 @@ index f0544767cec6c08f3a8ff7da1c7df40ad10488e7..2345e5dc795240cd963e1c56f7da2a1c
#include <JavaScriptCore/JSLock.h>
#include <JavaScriptCore/MemoryStatistics.h>
#include <JavaScriptCore/WasmFaultSignalHandler.h>
-@@ -391,6 +392,14 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
+@@ -413,6 +414,14 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
{
JSC::Options::AllowUnfinalizedAccessScope scope;
JSC::Options::allowNonSPTagging() = false;
@@ -19871,7 +19741,7 @@ index f0544767cec6c08f3a8ff7da1c7df40ad10488e7..2345e5dc795240cd963e1c56f7da2a1c
JSC::Options::notifyOptionsChanged();
}
-@@ -398,6 +407,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
+@@ -420,6 +429,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
platformInitializeProcess(parameters);
updateCPULimit();
@@ -19880,20 +19750,19 @@ index f0544767cec6c08f3a8ff7da1c7df40ad10488e7..2345e5dc795240cd963e1c56f7da2a1c
}
void WebProcess::initializeConnection(IPC::Connection* connection)
-@@ -1002,6 +1013,8 @@ void WebProcess::createWebPage(PageIdentifier pageID, WebPageCreationParameters&
+@@ -1056,6 +1067,7 @@ void WebProcess::createWebPage(PageIdentifier pageID, WebPageCreationParameters&
+ m_hasPendingAccessibilityUnsuspension = false;
accessibilityRelayProcessSuspended(false);
}
- ASSERT(result.iterator->value);
-+
-+ result.iterator->value->didAddWebPageToWebProcess();
++ page->didAddWebPageToWebProcess();
}
- void WebProcess::removeWebPage(PageIdentifier pageID)
+ Awaitable<unsigned> WebProcess::countWebPagesForTesting()
diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
-index 50897a0f972d994224ceada9dfeb5c95c12cfd69..fde414357c688fe3b26eba1f2157bd8e295e2589 100644
+index 9889f7db1fa35661da131a5fec15c6a549e0489f..256e46b2a7cd5be1c1939f8e9c331ca4f2e68f2a 100644
--- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
-@@ -4210,7 +4210,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
+@@ -4222,7 +4222,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
_private->handlingMouseDownEvent = NO;
}
@@ -19903,10 +19772,10 @@ index 50897a0f972d994224ceada9dfeb5c95c12cfd69..fde414357c688fe3b26eba1f2157bd8e
- (void)touch:(WebEvent *)event
{
diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
-index db58f96c27158f1234477f90d47a98911af98d95..c2091651640b081c266486fd8a50a414ff246f4b 100644
+index d94313e75baa25f656fe991d07d0005501ac4de2..715ab4cfd21c38a00f3187c7b8a50af24857a901 100644
--- a/Source/WebKitLegacy/mac/WebView/WebView.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
-@@ -3929,7 +3929,7 @@ + (void)_doNotStartObservingNetworkReachability
+@@ -3931,7 +3931,7 @@ + (void)_doNotStartObservingNetworkReachability
}
#endif // PLATFORM(IOS_FAMILY)
@@ -19915,7 +19784,7 @@ index db58f96c27158f1234477f90d47a98911af98d95..c2091651640b081c266486fd8a50a414
- (NSArray *)_touchEventRegions
{
-@@ -3971,7 +3971,7 @@ - (NSArray *)_touchEventRegions
+@@ -3973,7 +3973,7 @@ - (NSArray *)_touchEventRegions
}).autorelease();
}
@@ -19958,7 +19827,7 @@ index 0000000000000000000000000000000000000000..a9db9ec38d05e36517414248237e885b
+ LIBVPX_LIBRARIES
+)
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index a47bbb70db0ef0688d63ada76eddc2cf382685cf..a19dfc1206a89e940105c3a77b4479f45a28c139 100644
+index 1d12a308ae6ea762a8ec9903475db63dd4041cc3..d3398fc4b3c83f48c5b14dbce74dc61d5e5db444 100644
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -9,6 +9,10 @@ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
@@ -19971,8 +19840,8 @@ index a47bbb70db0ef0688d63ada76eddc2cf382685cf..a19dfc1206a89e940105c3a77b4479f4
+
find_package(Cairo 1.16.0 REQUIRED)
find_package(LibGcrypt 1.7.0 REQUIRED)
- find_package(Libtasn1 REQUIRED)
-@@ -24,6 +28,10 @@ find_package(ZLIB REQUIRED)
+ find_package(Soup3 3.0.0 REQUIRED)
+@@ -25,6 +29,10 @@ find_package(ZLIB REQUIRED)
find_package(WebP REQUIRED COMPONENTS demux)
find_package(ATSPI 2.5.3)
@@ -19983,7 +19852,7 @@ index a47bbb70db0ef0688d63ada76eddc2cf382685cf..a19dfc1206a89e940105c3a77b4479f4
include(GStreamerDefinitions)
include(FindGLibCompileResources)
-@@ -71,6 +79,10 @@ WEBKIT_OPTION_DEFINE(USE_SYSTEM_UNIFDEF "Whether to use a system-provided unifde
+@@ -69,6 +77,10 @@ WEBKIT_OPTION_DEFINE(USE_SYSTEM_UNIFDEF "Whether to use a system-provided unifde
WEBKIT_OPTION_DEPEND(USE_SYSTEM_SYSPROF_CAPTURE USE_SYSPROF_CAPTURE)
@@ -19994,7 +19863,7 @@ index a47bbb70db0ef0688d63ada76eddc2cf382685cf..a19dfc1206a89e940105c3a77b4479f4
SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
if (DEVELOPER_MODE)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
-@@ -148,6 +160,21 @@ endif ()
+@@ -150,6 +162,21 @@ endif ()
WEBKIT_OPTION_DEPEND(ENABLE_GPU_PROCESS USE_GBM)
@@ -20017,10 +19886,10 @@ index a47bbb70db0ef0688d63ada76eddc2cf382685cf..a19dfc1206a89e940105c3a77b4479f4
WEBKIT_OPTION_DEPEND(ENABLE_WEBXR ENABLE_GAMEPAD)
diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
-index 9303f05609cef53f6fccb0b3d8d42213efabec79..aced5eff5e07ba8de1ca7835f1decb4a0690cf10 100644
+index 27d81cbe5d5726b95c5d1e62cbd2dafdd0fc74da..a2dc7bef80b1e4144e6ee12d427c54a73d89459a 100644
--- a/Source/cmake/OptionsWPE.cmake
+++ b/Source/cmake/OptionsWPE.cmake
-@@ -33,6 +33,9 @@ else ()
+@@ -34,6 +34,9 @@ else ()
set(ENABLE_MEDIA_SESSION_DEFAULT ON)
endif ()
@@ -20030,7 +19899,7 @@ index 9303f05609cef53f6fccb0b3d8d42213efabec79..aced5eff5e07ba8de1ca7835f1decb4a
WEBKIT_OPTION_BEGIN()
SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
-@@ -92,6 +95,22 @@ else ()
+@@ -96,6 +99,22 @@ else ()
WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SKIA PRIVATE OFF)
endif ()
@@ -20053,7 +19922,7 @@ index 9303f05609cef53f6fccb0b3d8d42213efabec79..aced5eff5e07ba8de1ca7835f1decb4a
# 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.
-@@ -127,6 +146,11 @@ WEBKIT_OPTION_DEPEND(USE_QT6 ENABLE_WPE_PLATFORM)
+@@ -131,6 +150,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)
@@ -20096,7 +19965,7 @@ index 38684436bf8272f2e6d05681e7b1cb257479e877..20007a8425728241a8b039570c61dd2b
set(USE_ANGLE_EGL ON)
diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
-index 692287a5dc9380b9f09fcf4638c4b73bc6003f4c..5cddb30b6c2df2d56a80a459776206e8d688f5c6 100644
+index 2cb9e7da0c16dfc28c3ed9ea237b223750a08146..be9ddc750abb770840862b07f728f82d80bc9772 100644
--- a/Source/cmake/WebKitCompilerFlags.cmake
+++ b/Source/cmake/WebKitCompilerFlags.cmake
@@ -122,7 +122,7 @@ macro(WEBKIT_ADD_TARGET_CXX_FLAGS _target)
@@ -20109,11 +19978,11 @@ index 692287a5dc9380b9f09fcf4638c4b73bc6003f4c..5cddb30b6c2df2d56a80a459776206e8
if (DEVELOPER_MODE AND DEVELOPER_MODE_FATAL_WARNINGS)
if (MSVC)
diff --git a/Tools/DumpRenderTree/DerivedSources.make b/Tools/DumpRenderTree/DerivedSources.make
-index 576835410df6deac60f0158f1d2d1ef1e5f4c78d..9b492cfe5fef8de340a80f2af70a7d68672ef2e4 100644
+index e5859ed734046a3dc37a5c184e8a43fc9f858004..1235b8315d2ce5d6990474e525857770a7660e61 100644
--- a/Tools/DumpRenderTree/DerivedSources.make
+++ b/Tools/DumpRenderTree/DerivedSources.make
@@ -73,8 +73,8 @@ $(IDL_FILE_NAMES_LIST) : $(UICONTEXT_INTERFACES:%=%.idl)
- JS%.h JS%.cpp : %.idl $(SCRIPTS) $(IDL_ATTRIBUTES_FILE) $(IDL_FILE_NAMES_LIST) $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
+ JS%.h JS%.cpp : %.idl $(SCRIPTS) $(IDL_ATTRIBUTES_FILE) $(IDL_FILE_NAMES_LIST) $(FEATURE_AND_PLATFORM_FLAGS_RESPONSE_FILE)
@echo Generating bindings for $*...
$(PERL) -I $(WebCoreScripts) -I $(UISCRIPTCONTEXT_DIR) -I $(DumpRenderTree)/Bindings $(WebCoreScripts)/generate-bindings.pl --defines "$(FEATURE_AND_PLATFORM_DEFINES)" --idlFileNamesList $(IDL_FILE_NAMES_LIST) --outputDir . --generator DumpRenderTree --idlAttributesFile $(IDL_ATTRIBUTES_FILE) $<
-#
@@ -20123,7 +19992,7 @@ index 576835410df6deac60f0158f1d2d1ef1e5f4c78d..9b492cfe5fef8de340a80f2af70a7d68
WEB_PREFERENCES_GENERATED_FILES = \
TestOptionsGeneratedWebKitLegacyKeyMapping.cpp \
diff --git a/Tools/MiniBrowser/gtk/BrowserTab.c b/Tools/MiniBrowser/gtk/BrowserTab.c
-index a7d4d6ce8ee32140eb188610fbd0996921dc7168..9ecb09431c5d427e6a878f1da7f010ea9faeb8be 100644
+index 0e7f9c7bb7ccb52ccb579ff464a5904aaab2baed..65999b8d7c2dfd1aecc58fe93504aa9cb6965dd8 100644
--- a/Tools/MiniBrowser/gtk/BrowserTab.c
+++ b/Tools/MiniBrowser/gtk/BrowserTab.c
@@ -118,19 +118,38 @@ static void isLoadingChanged(WebKitWebView *webView, GParamSpec *paramSpec, Brow
@@ -20181,7 +20050,7 @@ index a7d4d6ce8ee32140eb188610fbd0996921dc7168..9ecb09431c5d427e6a878f1da7f010ea
static GtkWidget *createInfoBarQuestionMessage(const char *title, const char *text)
{
GtkWidget *dialog = gtk_info_bar_new_with_buttons("No", GTK_RESPONSE_NO, "Yes", GTK_RESPONSE_YES, NULL);
-@@ -805,6 +829,7 @@ static void browserTabConstructed(GObject *gObject)
+@@ -806,6 +830,7 @@ static void browserTabConstructed(GObject *gObject)
g_signal_connect(tab->webView, "notify::is-loading", G_CALLBACK(isLoadingChanged), tab);
g_signal_connect(tab->webView, "decide-policy", G_CALLBACK(decidePolicy), tab);
g_signal_connect(tab->webView, "load-changed", G_CALLBACK(loadChanged), tab);
@@ -20189,7 +20058,7 @@ index a7d4d6ce8ee32140eb188610fbd0996921dc7168..9ecb09431c5d427e6a878f1da7f010ea
g_signal_connect(tab->webView, "load-failed-with-tls-errors", G_CALLBACK(loadFailedWithTLSerrors), tab);
g_signal_connect(tab->webView, "permission-request", G_CALLBACK(decidePermissionRequest), tab);
g_signal_connect(tab->webView, "run-color-chooser", G_CALLBACK(runColorChooserCallback), tab);
-@@ -860,6 +885,9 @@ static char *getInternalURI(const char *uri)
+@@ -861,6 +886,9 @@ static char *getInternalURI(const char *uri)
if (g_str_has_prefix(uri, "about:") && !g_str_equal(uri, "about:blank"))
return g_strconcat(BROWSER_ABOUT_SCHEME, uri + strlen ("about"), NULL);
@@ -20200,7 +20069,7 @@ index a7d4d6ce8ee32140eb188610fbd0996921dc7168..9ecb09431c5d427e6a878f1da7f010ea
}
diff --git a/Tools/MiniBrowser/gtk/BrowserWindow.c b/Tools/MiniBrowser/gtk/BrowserWindow.c
-index d39b809a879babcdbbf4b5f7687204df5ccc43f3..2862876cb515da09db653e71659d64215a636758 100644
+index d39b809a879babcdbbf4b5f7687204df5ccc43f3..a784ea4e693332aee731c4b8949ddb33af7dff9f 100644
--- a/Tools/MiniBrowser/gtk/BrowserWindow.c
+++ b/Tools/MiniBrowser/gtk/BrowserWindow.c
@@ -73,7 +73,7 @@ struct _BrowserWindowClass {
@@ -20248,11 +20117,10 @@ index d39b809a879babcdbbf4b5f7687204df5ccc43f3..2862876cb515da09db653e71659d6421
return FALSE;
/* Multiple tabs are not allowed in editor mode. */
-@@ -1502,6 +1500,28 @@ static gboolean browserWindowDeleteEvent(GtkWidget *widget, GdkEventAny* event)
+@@ -1502,6 +1500,20 @@ static gboolean browserWindowDeleteEvent(GtkWidget *widget, GdkEventAny* event)
}
#endif
-+#if GTK_CHECK_VERSION(3, 98, 0)
+static void zero_widget_measure (GtkWidget *widget,
+ GtkOrientation orientation,
+ int for_size,
@@ -20266,18 +20134,11 @@ index d39b809a879babcdbbf4b5f7687204df5ccc43f3..2862876cb515da09db653e71659d6421
+ // *minimum_baseline = 10;
+ // *natural_baseline = 10;
+}
-+#else
-+static void zeroPreferredSize(GtkWidget* widget, gint* minimumSize, gint* naturalSize)
-+{
-+ *minimumSize = 10;
-+ *naturalSize = 10;
-+}
-+#endif
+
static void browser_window_class_init(BrowserWindowClass *klass)
{
GObjectClass *gobjectClass = G_OBJECT_CLASS(klass);
-@@ -1515,6 +1535,19 @@ static void browser_window_class_init(BrowserWindowClass *klass)
+@@ -1515,6 +1527,13 @@ static void browser_window_class_init(BrowserWindowClass *klass)
GtkWidgetClass *widgetClass = GTK_WIDGET_CLASS(klass);
widgetClass->delete_event = browserWindowDeleteEvent;
#endif
@@ -20285,14 +20146,8 @@ index d39b809a879babcdbbf4b5f7687204df5ccc43f3..2862876cb515da09db653e71659d6421
+// Playwrigth begin
+// Override preferred (which is minimum :-) size to 0 so that we can
+// emulate arbitrary resolution.
-+#if GTK_CHECK_VERSION(3, 98, 0)
+ GtkWidgetClass* browserWidgetClass = GTK_WIDGET_CLASS(klass);
+ browserWidgetClass->measure = zero_widget_measure;
-+#else
-+ GtkWidgetClass* browserWidgetClass = GTK_WIDGET_CLASS(klass);
-+ browserWidgetClass->get_preferred_width = zeroPreferredSize;
-+ browserWidgetClass->get_preferred_height = zeroPreferredSize;
-+#endif
+// Playwrigth end
}
@@ -20311,7 +20166,7 @@ index 1fd07efb828b85b6d8def6c6cd92a0c11debfe1b..da9fac7975d477857ead2adb1d67108d
typedef struct _BrowserWindow BrowserWindow;
diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c
-index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec99b097c30 100644
+index d3fbb968ee463f86c64fecb855b46c8634b4b72d..d4c449878e9d35dc3767ef72fac60293e1668db7 100644
--- a/Tools/MiniBrowser/gtk/main.c
+++ b/Tools/MiniBrowser/gtk/main.c
@@ -65,9 +65,14 @@ static char* timeZone;
@@ -20340,20 +20195,14 @@ index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec9
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, 0, "[URL…]" },
{ 0, 0, 0, 0, 0, 0, 0 }
};
-@@ -729,6 +738,70 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul
+@@ -729,6 +738,56 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul
g_main_loop_quit(data->mainLoop);
}
+static WebKitSettings* createPlaywrightSettings() {
+ WebKitSettings* webkitSettings = webkit_settings_new();
-+#if GTK_CHECK_VERSION(3, 98, 0)
+ // FIXME(Playwright): in GTK4, WEBKIT_HARDWARE_ACCELERATION_POLICY_ALWAYS is the default, but the page content is just black in that case.
+ webkit_settings_set_hardware_acceleration_policy(webkitSettings, WEBKIT_HARDWARE_ACCELERATION_POLICY_NEVER);
-+#else
-+ // Playwright: revert to the default state before https://github.com/WebKit/WebKit/commit/a73a25b9ea9229987c8fa7b2e092e6324cb17913
-+ webkit_settings_set_hardware_acceleration_policy(webkitSettings, WEBKIT_HARDWARE_ACCELERATION_POLICY_NEVER);
-+ webkit_settings_set_hardware_acceleration_policy(webkitSettings, WEBKIT_HARDWARE_ACCELERATION_POLICY_ON_DEMAND);
-+#endif
+ return webkitSettings;
+}
+
@@ -20367,18 +20216,10 @@ index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec9
+ WebKitWebView *newWebView = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW,
+ "web-context", context,
+ "settings", createPlaywrightSettings(),
-+#if GTK_CHECK_VERSION(3, 98, 0)
+ "network-session", webkit_web_context_get_network_session_for_automation(context),
-+#else
-+ "is-ephemeral", webkit_web_context_is_ephemeral(context),
-+#endif
+ "is-controlled-by-automation", TRUE,
+ NULL));
-+#if GTK_CHECK_VERSION(3, 98, 0)
+ GtkWidget *newWindow = browser_window_new(NULL, context, webkit_web_context_get_network_session_for_automation(context));
-+#else
-+ GtkWidget *newWindow = browser_window_new(NULL, context);
-+#endif
+ gtk_window_set_application(GTK_WINDOW(newWindow), browserApplication);
+ browser_window_append_view(BROWSER_WINDOW(newWindow), newWebView);
+ gtk_widget_grab_focus(GTK_WIDGET(newWebView));
@@ -20411,7 +20252,7 @@ index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec9
static void startup(GApplication *application)
{
const char *actionAccels[] = {
-@@ -787,17 +860,30 @@ static void setupDarkMode(GtkSettings *settings)
+@@ -787,17 +846,30 @@ static void setupDarkMode(GtkSettings *settings)
static void activate(GApplication *application, WebKitSettings *webkitSettings)
{
@@ -20446,7 +20287,7 @@ index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec9
char *dataDirectory = g_build_filename(g_get_user_data_dir(), "webkitgtk-" WEBKITGTK_API_VERSION, "MiniBrowser", NULL);
char *cacheDirectory = g_build_filename(g_get_user_cache_dir(), "webkitgtk-" WEBKITGTK_API_VERSION, "MiniBrowser", NULL);
networkSession = webkit_network_session_new(dataDirectory, cacheDirectory);
-@@ -805,6 +891,8 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
+@@ -805,6 +877,8 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
g_free(cacheDirectory);
}
@@ -20455,7 +20296,7 @@ index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec9
webkit_network_session_set_itp_enabled(networkSession, enableITP);
if (!automationMode) {
-@@ -839,9 +927,12 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
+@@ -839,9 +913,12 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
}
#else
WebKitWebsiteDataManager *manager;
@@ -20470,7 +20311,7 @@ index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec9
char *dataDirectory = g_build_filename(g_get_user_data_dir(), "webkitgtk-" WEBKITGTK_API_VERSION, "MiniBrowser", NULL);
char *cacheDirectory = g_build_filename(g_get_user_cache_dir(), "webkitgtk-" WEBKITGTK_API_VERSION, "MiniBrowser", NULL);
manager = webkit_website_data_manager_new("base-data-directory", dataDirectory, "base-cache-directory", cacheDirectory, NULL);
-@@ -891,6 +982,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
+@@ -891,6 +968,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
// Enable the favicon database.
webkit_web_context_set_favicon_database_directory(webContext, NULL);
#endif
@@ -20478,7 +20319,7 @@ index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec9
webkit_web_context_register_uri_scheme(webContext, BROWSER_ABOUT_SCHEME, (WebKitURISchemeRequestCallback)aboutURISchemeRequestCallback, NULL, NULL);
-@@ -955,9 +1047,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
+@@ -955,9 +1033,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
if (exitAfterLoad)
exitAfterWebViewLoadFinishes(webView, application);
}
@@ -20489,7 +20330,7 @@ index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec9
}
} else {
WebKitWebView *webView = createBrowserTab(mainWindow, webkitSettings, userContentManager, defaultWebsitePolicies);
-@@ -1007,7 +1097,7 @@ int main(int argc, char *argv[])
+@@ -1007,7 +1083,7 @@ int main(int argc, char *argv[])
g_option_context_add_group(context, gst_init_get_option_group());
#endif
@@ -20498,7 +20339,7 @@ index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec9
webkit_settings_set_enable_developer_extras(webkitSettings, TRUE);
webkit_settings_set_enable_webgl(webkitSettings, TRUE);
webkit_settings_set_enable_media_stream(webkitSettings, TRUE);
-@@ -1059,9 +1149,11 @@ int main(int argc, char *argv[])
+@@ -1059,9 +1135,11 @@ int main(int argc, char *argv[])
}
GtkApplication *application = gtk_application_new("org.webkitgtk.MiniBrowser", G_APPLICATION_NON_UNIQUE);
@@ -20511,7 +20352,7 @@ index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec9
g_clear_object(&interfaceSettings);
diff --git a/Tools/MiniBrowser/wpe/main.cpp b/Tools/MiniBrowser/wpe/main.cpp
-index 3f0a7b883e30c982c68d53ab09ae36c54ea40030..0fc2fa2b8c9c3b0af7de861f681734f87e16dcc6 100644
+index 4a459bca1786c10cfc1796f6ca39d0a84ecc2322..112645111701019e415c82840e2a18c99420cabf 100644
--- a/Tools/MiniBrowser/wpe/main.cpp
+++ b/Tools/MiniBrowser/wpe/main.cpp
@@ -52,6 +52,9 @@ static gboolean headlessMode;
@@ -20534,7 +20375,7 @@ index 3f0a7b883e30c982c68d53ab09ae36c54ea40030..0fc2fa2b8c9c3b0af7de861f681734f8
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, nullptr, "[URL]" },
{ nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
};
-@@ -302,15 +308,38 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul
+@@ -316,15 +322,38 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul
g_main_loop_quit(data->mainLoop);
}
@@ -20575,7 +20416,7 @@ index 3f0a7b883e30c982c68d53ab09ae36c54ea40030..0fc2fa2b8c9c3b0af7de861f681734f8
{
auto backend = createViewBackend(defaultWindowWidthLegacyAPI, defaultWindowHeightLegacyAPI);
WebKitWebViewBackend* viewBackend = nullptr;
-@@ -325,12 +354,27 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
+@@ -339,12 +368,27 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
}, backend.release());
}
@@ -20609,7 +20450,7 @@ index 3f0a7b883e30c982c68d53ab09ae36c54ea40030..0fc2fa2b8c9c3b0af7de861f681734f8
#if ENABLE_WPE_PLATFORM
if (auto* wpeView = webkit_web_view_get_wpe_view(newWebView)) {
-@@ -342,9 +386,13 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
+@@ -356,9 +400,13 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
g_signal_connect(newWebView, "create", G_CALLBACK(createWebView), user_data);
g_signal_connect(newWebView, "close", G_CALLBACK(webViewClose), user_data);
@@ -20625,7 +20466,7 @@ index 3f0a7b883e30c982c68d53ab09ae36c54ea40030..0fc2fa2b8c9c3b0af7de861f681734f8
return newWebView;
}
-@@ -432,13 +480,105 @@ void loadConfigFile(WPESettings* settings)
+@@ -446,13 +494,105 @@ void loadConfigFile(WPESettings* settings)
}
#endif
@@ -20732,7 +20573,7 @@ index 3f0a7b883e30c982c68d53ab09ae36c54ea40030..0fc2fa2b8c9c3b0af7de861f681734f8
webkit_network_session_set_itp_enabled(networkSession, enableITP);
if (proxy) {
-@@ -465,10 +605,18 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -479,10 +619,18 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
webkit_cookie_manager_set_persistent_storage(cookieManager, cookiesFile, storageType);
}
}
@@ -20753,7 +20594,7 @@ index 3f0a7b883e30c982c68d53ab09ae36c54ea40030..0fc2fa2b8c9c3b0af7de861f681734f8
webkit_website_data_manager_set_itp_enabled(manager, enableITP);
if (proxy) {
-@@ -499,6 +647,7 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -513,6 +661,7 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
}
#endif
@@ -20761,7 +20602,7 @@ index 3f0a7b883e30c982c68d53ab09ae36c54ea40030..0fc2fa2b8c9c3b0af7de861f681734f8
WebKitUserContentManager* userContentManager = nullptr;
if (contentFilter) {
GFile* contentFilterFile = g_file_new_for_commandline_arg(contentFilter);
-@@ -577,6 +726,15 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -591,6 +740,15 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
"autoplay", WEBKIT_AUTOPLAY_ALLOW,
nullptr);
@@ -20777,7 +20618,7 @@ index 3f0a7b883e30c982c68d53ab09ae36c54ea40030..0fc2fa2b8c9c3b0af7de861f681734f8
auto* webView = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW,
"backend", viewBackend,
"web-context", webContext,
-@@ -623,12 +781,16 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -642,12 +800,16 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
}
#endif
@@ -20796,7 +20637,7 @@ index 3f0a7b883e30c982c68d53ab09ae36c54ea40030..0fc2fa2b8c9c3b0af7de861f681734f8
g_hash_table_add(openViews, webView);
WebKitColor color;
-@@ -636,16 +798,11 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -655,16 +817,11 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
webkit_web_view_set_background_color(webView, &color);
if (uriArguments) {
@@ -20818,7 +20659,7 @@ index 3f0a7b883e30c982c68d53ab09ae36c54ea40030..0fc2fa2b8c9c3b0af7de861f681734f8
webkit_web_view_load_uri(webView, "https://wpewebkit.org");
g_object_unref(webContext);
-@@ -742,8 +899,14 @@ int main(int argc, char *argv[])
+@@ -755,8 +912,14 @@ int main(int argc, char *argv[])
}
}
@@ -20861,10 +20702,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 763464258cd174b858fe04e00c21a87d5a644c8d..cbe6d4dde62803d491bb8f1818d54d7b40ecb718 100644
+index c81c7460c35a74b24138f7a4a69c9eb2abb35d9f..7c5b13da913ac75b4ef82db86064f6516e9e868a 100644
--- a/Tools/WebKitTestRunner/TestController.cpp
+++ b/Tools/WebKitTestRunner/TestController.cpp
-@@ -763,6 +763,7 @@ PlatformWebView* TestController::createOtherPlatformWebView(PlatformWebView* par
+@@ -771,6 +771,7 @@ PlatformWebView* TestController::createOtherPlatformWebView(PlatformWebView* par
nullptr, // requestStorageAccessConfirm
nullptr, // shouldAllowDeviceOrientationAndMotionAccess
nullptr, // runWebAuthenticationPanel
@@ -20872,7 +20713,7 @@ index 763464258cd174b858fe04e00c21a87d5a644c8d..cbe6d4dde62803d491bb8f1818d54d7b
nullptr, // decidePolicyForSpeechRecognitionPermissionRequest
nullptr, // decidePolicyForMediaKeySystemPermissionRequest
nullptr, // queryPermission
-@@ -1241,6 +1242,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)
+@@ -1251,6 +1252,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)
nullptr, // requestStorageAccessConfirm
shouldAllowDeviceOrientationAndMotionAccess,
runWebAuthenticationPanel,
@@ -20881,10 +20722,10 @@ index 763464258cd174b858fe04e00c21a87d5a644c8d..cbe6d4dde62803d491bb8f1818d54d7b
decidePolicyForMediaKeySystemPermissionRequest,
queryPermission,
diff --git a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
-index b5e56675d2005f78dfd7def861601c63398c069d..038e763aa8dead3e570f9dd0bdcc5a7aa7734436 100644
+index e95cdaf07836f70d18a0a96ca89c8b490d2ddddc..0d72b7b16a5519c049dbd383f8acbb8daab2e5a6 100644
--- a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
+++ b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
-@@ -967,4 +967,51 @@ void EventSenderProxy::waitForPendingMouseEvents()
+@@ -963,4 +963,51 @@ void EventSenderProxy::waitForPendingMouseEvents()
}
}
@@ -20937,7 +20778,7 @@ index b5e56675d2005f78dfd7def861601c63398c069d..038e763aa8dead3e570f9dd0bdcc5a7a
+
} // namespace WTR
diff --git a/Tools/jhbuild/jhbuild-minimal.modules b/Tools/jhbuild/jhbuild-minimal.modules
-index 5af40246b94fb365453f94f8b1b2ba29f3a84b20..91e6e4600557e8dcd4cd886fa1316f63a4c81138 100644
+index 8df87f54f63ebf9f7adbff626a12ef7079fff3d3..30ab6e8a0ca264cdebe673b806f125bb7cda0769 100644
--- a/Tools/jhbuild/jhbuild-minimal.modules
+++ b/Tools/jhbuild/jhbuild-minimal.modules
@@ -67,8 +67,8 @@
@@ -21083,7 +20924,7 @@ index 68732987fc02d863415360d066bc2a45d16ec39a..f4f924cb859034306361e9e55cdf31c6
buildForTesting = "YES"
buildForRunning = "YES"
diff --git a/vcpkg.json b/vcpkg.json
-index 9ffb2efbf87058a7d314a9ea4dc25f33c6acea16..a5491c8967934b85d9e866da9b0677cfac3f266f 100644
+index 259c46a415a84439b622d34f9ee3431e351401ba..e5ef6f3e0bc7ec64e2b714de783a2181c409fdad 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,7 +1,8 @@
@@ -21096,18 +20937,14 @@ index 9ffb2efbf87058a7d314a9ea4dc25f33c6acea16..a5491c8967934b85d9e866da9b0677cf
],
"features": {
"avif": {
-@@ -96,5 +97,11 @@
- "woff2"
- ]
- }
-- }
--}
-+ },
-+ "overrides": [
+@@ -101,6 +102,10 @@
+ {
+ "name": "ngtcp2",
+ "version": "1.12.0"
++ },
+ {
+ "name": "libvpx",
+ "version": "1.13.1#3"
-+ }
-+ ]
-+}
-\ No newline at end of file
+ }
+ ]
+ }