diff options
Diffstat (limited to '')
| -rw-r--r-- | dom/ipc/ContentParent.h | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h index 31cfa6de88..8040f4a07b 100644 --- a/dom/ipc/ContentParent.h +++ b/dom/ipc/ContentParent.h @@ -410,7 +410,7 @@ class ContentParent final : public PContentParent, * WARNING: aReason appears in telemetry, so any new value passed in requires * data review. */ - void KillHard(const char* aWhy); + void KillHard(const char* aReason); ContentParentId ChildID() const { return mChildID; } @@ -422,8 +422,6 @@ class ContentParent final : public PContentParent, */ void FriendlyName(nsAString& aName, bool aAnonymize = false); - virtual void OnChannelError() override; - mozilla::ipc::IPCResult RecvInitCrashReporter( const NativeThreadId& aThreadId); @@ -473,12 +471,11 @@ class ContentParent final : public PContentParent, void ForkNewProcess(bool aBlocking); mozilla::ipc::IPCResult RecvCreateWindow( - PBrowserParent* aThisBrowserParent, - const MaybeDiscarded<BrowsingContext>& aParent, PBrowserParent* aNewTab, - const uint32_t& aChromeFlags, const bool& aCalledFromJS, - const bool& aForPrinting, const bool& aForWindowDotPrint, - nsIURI* aURIToLoad, const nsACString& aFeatures, - const UserActivation::Modifiers& aModifiers, + PBrowserParent* aThisTab, const MaybeDiscarded<BrowsingContext>& aParent, + PBrowserParent* aNewTab, const uint32_t& aChromeFlags, + const bool& aCalledFromJS, const bool& aForPrinting, + const bool& aForWindowDotPrint, nsIURI* aURIToLoad, + const nsACString& aFeatures, const UserActivation::Modifiers& aModifiers, nsIPrincipal* aTriggeringPrincipal, nsIContentSecurityPolicy* aCsp, nsIReferrerInfo* aReferrerInfo, const OriginAttributes& aOriginAttributes, CreateWindowResolver&& aResolve); @@ -879,7 +876,7 @@ class ContentParent final : public PContentParent, const MaybeDiscarded<BrowsingContext>& aTarget, PrintData&& aPrintData); mozilla::ipc::IPCResult RecvConstructPopupBrowser( - ManagedEndpoint<PBrowserParent>&& actor, + ManagedEndpoint<PBrowserParent>&& aBrowserEp, ManagedEndpoint<PWindowGlobalParent>&& windowEp, const TabId& tabId, const IPCTabContext& context, const WindowGlobalInit& initialWindowInit, const uint32_t& chromeFlags); @@ -949,13 +946,14 @@ class ContentParent final : public PContentParent, PBrowserParent* aBrowser, const MaybeDiscarded<BrowsingContext>& aContext); - mozilla::ipc::IPCResult RecvSetClipboard(const IPCTransferable& aTransferable, - const int32_t& aWhichClipboard); + mozilla::ipc::IPCResult RecvSetClipboard( + const IPCTransferable& aTransferable, const int32_t& aWhichClipboard, + const MaybeDiscarded<WindowContext>& aRequestingWindowContext); mozilla::ipc::IPCResult RecvGetClipboard( nsTArray<nsCString>&& aTypes, const int32_t& aWhichClipboard, const MaybeDiscarded<WindowContext>& aRequestingWindowContext, - IPCTransferableData* aTransferableData); + IPCTransferableDataOrError* aTransferableDataOrError); mozilla::ipc::IPCResult RecvEmptyClipboard(const int32_t& aWhichClipboard); @@ -975,7 +973,9 @@ class ContentParent final : public PContentParent, ClipboardReadRequestOrError* aRequestOrError); already_AddRefed<PClipboardWriteRequestParent> - AllocPClipboardWriteRequestParent(const int32_t& aClipboardType); + AllocPClipboardWriteRequestParent( + const int32_t& aClipboardType, + const MaybeDiscarded<WindowContext>& aSettingWindowContext); mozilla::ipc::IPCResult RecvGetIconForExtension(const nsACString& aFileExt, const uint32_t& aIconSize, @@ -1085,10 +1085,10 @@ class ContentParent final : public PContentParent, mozilla::ipc::IPCResult RecvEndDriverCrashGuard(const uint32_t& aGuardType); - mozilla::ipc::IPCResult RecvAddIdleObserver(const uint64_t& observerId, + mozilla::ipc::IPCResult RecvAddIdleObserver(const uint64_t& aObserverId, const uint32_t& aIdleTimeInS); - mozilla::ipc::IPCResult RecvRemoveIdleObserver(const uint64_t& observerId, + mozilla::ipc::IPCResult RecvRemoveIdleObserver(const uint64_t& aObserverId, const uint32_t& aIdleTimeInS); mozilla::ipc::IPCResult RecvBackUpXResources( @@ -1184,7 +1184,7 @@ class ContentParent final : public PContentParent, mozilla::ipc::IPCResult RecvRecordDiscardedData( const DiscardedData& aDiscardedData); mozilla::ipc::IPCResult RecvRecordPageLoadEvent( - const mozilla::glean::perf::PageLoadExtra& aPageLoadEventExtra); + mozilla::glean::perf::PageLoadExtra&& aPageLoadEventExtra); mozilla::ipc::IPCResult RecvRecordOrigin(const uint32_t& aMetricId, const nsACString& aOrigin); mozilla::ipc::IPCResult RecvReportContentBlockingLog( @@ -1272,6 +1272,10 @@ class ContentParent final : public PContentParent, const MaybeDiscarded<BrowsingContext>& aContext, const Maybe<PositionState>& aState); + mozilla::ipc::IPCResult RecvNotifyGuessedPositionStateChanged( + const MaybeDiscarded<BrowsingContext>& aContext, const nsID& aMediaId, + const Maybe<PositionState>& aState); + mozilla::ipc::IPCResult RecvAddOrRemovePageAwakeRequest( const MaybeDiscarded<BrowsingContext>& aContext, const bool& aShouldAddCount); @@ -1660,8 +1664,7 @@ class ThreadsafeContentParentHandle final { }; // This is the C++ version of remoteTypePrefix in E10SUtils.sys.mjs. -const nsDependentCSubstring RemoteTypePrefix( - const nsACString& aContentProcessType); +nsDependentCSubstring RemoteTypePrefix(const nsACString& aContentProcessType); // This is based on isWebRemoteType in E10SUtils.sys.mjs. bool IsWebRemoteType(const nsACString& aContentProcessType); |