diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /dom/ipc/BrowserParent.h | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/ipc/BrowserParent.h')
-rw-r--r-- | dom/ipc/BrowserParent.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/dom/ipc/BrowserParent.h b/dom/ipc/BrowserParent.h index 63a52c6ac4..c7fc196c25 100644 --- a/dom/ipc/BrowserParent.h +++ b/dom/ipc/BrowserParent.h @@ -131,7 +131,7 @@ class BrowserParent final : public PBrowserParent, const TabId GetTabId() const { return mTabId; } - ContentParent* Manager() const { return mManager; } + ContentParent* Manager() const; CanonicalBrowsingContext* GetBrowsingContext() { return mBrowsingContext; } @@ -383,12 +383,9 @@ class BrowserParent final : public PBrowserParent, nsTArray<nsCString>&& aDisabledCommands); mozilla::ipc::IPCResult RecvSetCursor( - const nsCursor& aValue, const bool& aHasCustomCursor, - Maybe<BigBuffer>&& aCursorData, const uint32_t& aWidth, - const uint32_t& aHeight, const float& aResolutionX, - const float& aResolutionY, const uint32_t& aStride, - const gfx::SurfaceFormat& aFormat, const uint32_t& aHotspotX, - const uint32_t& aHotspotY, const bool& aForce); + const nsCursor& aValue, Maybe<IPCImage>&& aCustomCursor, + const float& aResolutionX, const float& aResolutionY, + const uint32_t& aHotspotX, const uint32_t& aHotspotY, const bool& aForce); mozilla::ipc::IPCResult RecvSetLinkStatus(const nsString& aStatus); @@ -423,9 +420,9 @@ class BrowserParent final : public PBrowserParent, const nsString& aTitle, const nsString& aInitialColor, const nsTArray<nsString>& aDefaultColors); - PVsyncParent* AllocPVsyncParent(); + already_AddRefed<PVsyncParent> AllocPVsyncParent(); - bool DeallocPVsyncParent(PVsyncParent* aActor); + mozilla::ipc::IPCResult RecvPVsyncConstructor(PVsyncParent* aActor) override; #ifdef ACCESSIBILITY PDocAccessibleParent* AllocPDocAccessibleParent( @@ -855,10 +852,8 @@ class BrowserParent final : public PBrowserParent, private: TabId mTabId; - RefPtr<ContentParent> mManager; // The root browsing context loaded in this BrowserParent. RefPtr<CanonicalBrowsingContext> mBrowsingContext; - nsCOMPtr<nsILoadContext> mLoadContext; RefPtr<Element> mFrameElement; nsCOMPtr<nsIBrowserDOMWindow> mBrowserDOMWindow; // We keep a strong reference to the frameloader after we've sent the @@ -942,8 +937,6 @@ class BrowserParent final : public PBrowserParent, nsTArray<nsString> mVerifyDropLinks; - RefPtr<VsyncParent> mVsyncParent; - #ifdef DEBUG int32_t mActiveSupressDisplayportCount = 0; #endif |