diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /dom/ipc/ContentParent.h | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/ipc/ContentParent.h')
| -rw-r--r-- | dom/ipc/ContentParent.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h index 53994e45e7..15139a93f1 100644 --- a/dom/ipc/ContentParent.h +++ b/dom/ipc/ContentParent.h @@ -964,16 +964,17 @@ class ContentParent final : public PContentParent, const int32_t& aWhichClipboard, bool* aHasType); - mozilla::ipc::IPCResult RecvGetExternalClipboardFormats( - const int32_t& aWhichClipboard, const bool& aPlainTextOnly, - nsTArray<nsCString>* aTypes); - mozilla::ipc::IPCResult RecvGetClipboardAsync( nsTArray<nsCString>&& aTypes, const int32_t& aWhichClipboard, const MaybeDiscarded<WindowContext>& aRequestingWindowContext, mozilla::NotNull<nsIPrincipal*> aRequestingPrincipal, GetClipboardAsyncResolver&& aResolver); + mozilla::ipc::IPCResult RecvGetClipboardDataSnapshotSync( + nsTArray<nsCString>&& aTypes, const int32_t& aWhichClipboard, + const MaybeDiscarded<WindowContext>& aRequestingWindowContext, + ClipboardReadRequestOrError* aRequestOrError); + already_AddRefed<PClipboardWriteRequestParent> AllocPClipboardWriteRequestParent(const int32_t& aClipboardType); @@ -1270,7 +1271,7 @@ class ContentParent final : public PContentParent, mozilla::ipc::IPCResult RecvNotifyPositionStateChanged( const MaybeDiscarded<BrowsingContext>& aContext, - const PositionState& aState); + const Maybe<PositionState>& aState); mozilla::ipc::IPCResult RecvAddOrRemovePageAwakeRequest( const MaybeDiscarded<BrowsingContext>& aContext, |