From 8012bf37885f5b015426213737df2873fed889e5 Mon Sep 17 00:00:00 2001
From: Ben Turner <bent.mozilla@gmail.com>
Date: Tue, 30 Jun 2015 19:45:58 -0700
Subject: [PATCH] Backout 316c0601d7db (bug 1167431) for static analysis
 bustage on CLOSED TREE

---
 ipc/glue/BackgroundImpl.cpp | 100 ++++++++----------------------------
 1 file changed, 21 insertions(+), 79 deletions(-)

diff --git a/ipc/glue/BackgroundImpl.cpp b/ipc/glue/BackgroundImpl.cpp
index 7c96f485438..10db4325826 100644
--- a/ipc/glue/BackgroundImpl.cpp
+++ b/ipc/glue/BackgroundImpl.cpp
@@ -292,13 +292,7 @@ private:
     mLiveActorArray->AppendElement(this);
   }
 
-  already_AddRefed<ContentParent>
-  GetContentParent() const;
-
   // These methods are only called by IPDL.
-  virtual void
-  ProcessingError(Result aCode, const char* aReason) override;
-
   virtual IToplevelProtocol*
   CloneToplevel(const InfallibleTArray<ProtocolFdMapping>& aFds,
                 ProcessHandle aPeerProcess,
@@ -1020,7 +1014,27 @@ ParentImpl::GetContentParent(PBackgroundParent* aBackgroundActor)
   AssertIsOnBackgroundThread();
   MOZ_ASSERT(aBackgroundActor);
 
-  return static_cast<ParentImpl*>(aBackgroundActor)->GetContentParent();
+  auto actor = static_cast<ParentImpl*>(aBackgroundActor);
+  if (actor->mActorDestroyed) {
+    MOZ_ASSERT(false, "GetContentParent called after ActorDestroy was called!");
+    return nullptr;
+  }
+
+  if (actor->mContent) {
+    // We need to hand out a reference to our ContentParent but we also need to
+    // keep the one we have. We can't call AddRef here because ContentParent is
+    // not threadsafe so instead we dispatch a runnable to the main thread to do
+    // it for us. This is safe since we are guaranteed that our AddRef runnable
+    // will run before the reference we hand out can be released, and the
+    // ContentParent can't die as long as the existing reference is maintained.
+    nsCOMPtr<nsIRunnable> runnable =
+      NS_NewNonOwningRunnableMethod(actor->mContent, &ContentParent::AddRef);
+    MOZ_ASSERT(runnable);
+
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(runnable)));
+  }
+
+  return already_AddRefed<ContentParent>(actor->mContent.get());
 }
 
 // static
@@ -1314,78 +1328,6 @@ ParentImpl::MainThreadActorDestroy()
   Release();
 }
 
-already_AddRefed<ContentParent>
-ParentImpl::GetContentParent() const
-{
-  if (mActorDestroyed) {
-    MOZ_ASSERT(false, "GetContentParent called after ActorDestroy was called!");
-    return nullptr;
-  }
-
-  if (mContent) {
-    // We need to hand out a reference to our ContentParent but we also need to
-    // keep the one we have. We can't call AddRef here because ContentParent is
-    // not threadsafe so instead we dispatch a runnable to the main thread to do
-    // it for us. This is safe since we are guaranteed that our AddRef runnable
-    // will run before the reference we hand out can be released, and the
-    // ContentParent can't die as long as the existing reference is maintained.
-    nsCOMPtr<nsIRunnable> runnable =
-      NS_NewNonOwningRunnableMethod(mContent, &ContentParent::AddRef);
-    MOZ_ASSERT(runnable);
-
-    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(runnable)));
-  }
-
-  return already_AddRefed<ContentParent>(mContent.get());
-}
-
-void
-ParentImpl::ProcessingError(Result aCode, const char* aReason)
-{
-  AssertIsInMainProcess();
-  AssertIsOnBackgroundThread();
-  MOZ_ASSERT(!mActorDestroyed);
-
-  BackgroundParentImpl::ProcessingError(aCode, aReason);
-
-  if (!mIsOtherProcessActor) {
-    // Warning is about all we can really do here, short of intentionally
-    // crashing the parent process.
-    return;
-  }
-
-  if (aCode == MsgDropped) {
-    // Ignore this; it just means that the child process can't receive any
-    // more messages.
-    return;
-  }
-
-  nsRefPtr<ContentParent> content = GetContentParent();
-  if (NS_WARN_IF(!content)) {
-    return;
-  }
-
-  // Transfer ownership to the lambda.
-  ContentParent* owningContent = content.forget().take();
-  nsCString owningReason(aReason);
-
-  nsCOMPtr<nsIRunnable> runnable = NS_NewRunnableFunction(
-    [owningContent, owningReason]()
-    {
-      MOZ_ASSERT(NS_IsMainThread());
-
-      // Transfer ownership back to the stack.
-      nsRefPtr<ContentParent> content = dont_AddRef(owningContent);
-      MOZ_ASSERT(content);
-
-      content->KillHard(owningReason.get());
-    }
-  );
-  MOZ_ASSERT(runnable);
-
-  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(runnable)));
-}
-
 IToplevelProtocol*
 ParentImpl::CloneToplevel(const InfallibleTArray<ProtocolFdMapping>& aFds,
                           ProcessHandle aPeerProcess,