From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:27 +0200 Subject: Adding upstream version 125.0.1. Signed-off-by: Daniel Baumann --- dom/ipc/PContent.ipdl | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'dom/ipc/PContent.ipdl') diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl index b8155fd375..3789c046c8 100644 --- a/dom/ipc/PContent.ipdl +++ b/dom/ipc/PContent.ipdl @@ -188,7 +188,7 @@ struct SystemFontListEntry { uint8_t index; FontVisibility visibility; }; -#elif defined(XP_MACOSX) +#elif defined(XP_MACOSX) || defined(XP_IOS) // Used on Mac OS X to pass the list of font families (not faces) // from chrome to content processes. // The entryType field distinguishes several types of font family @@ -470,8 +470,13 @@ struct IPCImage { ImageIntSize size; }; -union PClipboardReadRequestOrError { - PClipboardReadRequest; +struct ClipboardReadRequest { + ManagedEndpoint childEndpoint; + nsCString[] availableTypes; +}; + +union ClipboardReadRequestOrError { + ClipboardReadRequest; nsresult; }; @@ -1057,8 +1062,6 @@ child: async PRemotePrintJob(); - async PClipboardReadRequest(nsCString[] aTypes); - parent: async SynchronizeLayoutHistoryState(MaybeDiscardedBrowsingContext aContext, nullable nsILayoutHistoryState aState); @@ -1226,14 +1229,16 @@ parent: MaybeDiscardedWindowContext aRequestingWindowContext) returns (IPCTransferableData transferableData); - // Returns a list of formats supported by the clipboard - sync GetExternalClipboardFormats(int32_t aWhichClipboard, bool aPlainTextOnly) returns (nsCString[] aTypes); - // Requests getting data from clipboard. async GetClipboardAsync(nsCString[] aTypes, int32_t aWhichClipboard, MaybeDiscardedWindowContext aRequestingWindowContext, nsIPrincipal aRequestingPrincipal) - returns (PClipboardReadRequestOrError aClipboardReadRequest); + returns (ClipboardReadRequestOrError aClipboardReadRequestOrError); + + // Requests getting data from clipboard. + sync GetClipboardDataSnapshotSync(nsCString[] aTypes, int32_t aWhichClipboard, + MaybeDiscardedWindowContext aRequestingWindowContext) + returns (ClipboardReadRequestOrError aClipboardReadRequestOrError); // Clears the clipboard. async EmptyClipboard(int32_t aWhichClipboard); @@ -1733,7 +1738,7 @@ parent: */ async NotifyPositionStateChanged( MaybeDiscardedBrowsingContext aContext, - PositionState aState); + PositionState? aState); /** * This method will make canonical browsing context to update the count of -- cgit v1.2.3