Bug 1334328 - Remove unused fields ContentBridge{Parent,Child}::mTransport. r=kanru
MozReview-Commit-ID: 39cytTfmGFk
--- a/dom/ipc/ContentBridgeChild.cpp
+++ b/dom/ipc/ContentBridgeChild.cpp
@@ -17,35 +17,33 @@ using namespace mozilla::ipc;
using namespace mozilla::jsipc;
namespace mozilla {
namespace dom {
NS_IMPL_ISUPPORTS(ContentBridgeChild,
nsIContentChild)
-ContentBridgeChild::ContentBridgeChild(Transport* aTransport)
- : mTransport(aTransport)
+ContentBridgeChild::ContentBridgeChild()
{}
ContentBridgeChild::~ContentBridgeChild()
{
}
void
ContentBridgeChild::ActorDestroy(ActorDestroyReason aWhy)
{
MessageLoop::current()->PostTask(NewRunnableMethod(this, &ContentBridgeChild::DeferredDestroy));
}
/*static*/ ContentBridgeChild*
ContentBridgeChild::Create(Transport* aTransport, ProcessId aOtherPid)
{
- RefPtr<ContentBridgeChild> bridge =
- new ContentBridgeChild(aTransport);
+ RefPtr<ContentBridgeChild> bridge = new ContentBridgeChild();
bridge->mSelfRef = bridge;
DebugOnly<bool> ok = bridge->Open(aTransport, aOtherPid, XRE_GetIOMessageLoop());
MOZ_ASSERT(ok);
return bridge;
}
--- a/dom/ipc/ContentBridgeChild.h
+++ b/dom/ipc/ContentBridgeChild.h
@@ -12,17 +12,17 @@
namespace mozilla {
namespace dom {
class ContentBridgeChild final : public PContentBridgeChild
, public nsIContentChild
{
public:
- explicit ContentBridgeChild(Transport* aTransport);
+ explicit ContentBridgeChild();
NS_DECL_ISUPPORTS
static ContentBridgeChild*
Create(Transport* aTransport, ProcessId aOtherProcess);
virtual void ActorDestroy(ActorDestroyReason aWhy) override;
void DeferredDestroy();
@@ -85,15 +85,14 @@ protected:
virtual bool
DeallocPFileDescriptorSetChild(mozilla::ipc::PFileDescriptorSetChild* aActor) override;
DISALLOW_EVIL_CONSTRUCTORS(ContentBridgeChild);
protected: // members
RefPtr<ContentBridgeChild> mSelfRef;
- Transport* mTransport; // owned
};
} // namespace dom
} // namespace mozilla
#endif // mozilla_dom_ContentBridgeChild_h
--- a/dom/ipc/ContentBridgeParent.cpp
+++ b/dom/ipc/ContentBridgeParent.cpp
@@ -16,18 +16,17 @@ using namespace mozilla::jsipc;
namespace mozilla {
namespace dom {
NS_IMPL_ISUPPORTS(ContentBridgeParent,
nsIContentParent,
nsIObserver)
-ContentBridgeParent::ContentBridgeParent(Transport* aTransport)
- : mTransport(aTransport)
+ContentBridgeParent::ContentBridgeParent()
{}
ContentBridgeParent::~ContentBridgeParent()
{
}
void
ContentBridgeParent::ActorDestroy(ActorDestroyReason aWhy)
@@ -37,18 +36,17 @@ ContentBridgeParent::ActorDestroy(ActorD
os->RemoveObserver(this, "content-child-shutdown");
}
MessageLoop::current()->PostTask(NewRunnableMethod(this, &ContentBridgeParent::DeferredDestroy));
}
/*static*/ ContentBridgeParent*
ContentBridgeParent::Create(Transport* aTransport, ProcessId aOtherPid)
{
- RefPtr<ContentBridgeParent> bridge =
- new ContentBridgeParent(aTransport);
+ RefPtr<ContentBridgeParent> bridge = new ContentBridgeParent();
bridge->mSelfRef = bridge;
DebugOnly<bool> ok = bridge->Open(aTransport, aOtherPid,
XRE_GetIOMessageLoop());
MOZ_ASSERT(ok);
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
if (os) {
--- a/dom/ipc/ContentBridgeParent.h
+++ b/dom/ipc/ContentBridgeParent.h
@@ -15,17 +15,17 @@
namespace mozilla {
namespace dom {
class ContentBridgeParent : public PContentBridgeParent
, public nsIContentParent
, public nsIObserver
{
public:
- explicit ContentBridgeParent(Transport* aTransport);
+ explicit ContentBridgeParent();
NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER
virtual void ActorDestroy(ActorDestroyReason aWhy) override;
void DeferredDestroy();
virtual bool IsContentBridgeParent() const override { return true; }
void NotifyTabDestroyed();
@@ -123,17 +123,16 @@ protected:
virtual bool
DeallocPFileDescriptorSetParent(PFileDescriptorSetParent*) override;
DISALLOW_EVIL_CONSTRUCTORS(ContentBridgeParent);
protected: // members
RefPtr<ContentBridgeParent> mSelfRef;
- Transport* mTransport; // owned
ContentParentId mChildID;
bool mIsForBrowser;
private:
friend class ContentParent;
};
} // namespace dom