Backing out bug 550026 due to orange

dom/plugins/PluginModuleParent.cpp

@@ -67,6 +67,24 @@ struct RunnableMethodTraits<mozilla::plugins::PluginModuleParent>
     static void ReleaseCallee(Class* obj) { }
 };
 
+class PluginCrashed : public nsRunnable
+{
+public:
+    PluginCrashed(nsNPAPIPlugin* plugin,
+                  const nsString& dumpID)
+        : mDumpID(dumpID),
+          mPlugin(plugin) { }
+
+    NS_IMETHOD Run() {
+        mPlugin->PluginCrashed(mDumpID);
+        return NS_OK;
+    }
+
+private:
+    nsNPAPIPlugin* mPlugin;
+    nsString mDumpID;
+};
+
 // static
 PluginLibrary*
 PluginModuleParent::LoadModule(const char* aFilePath)
@@ -91,7 +109,6 @@ PluginModuleParent::PluginModuleParent(const char* aFilePath)
     , mNPNIface(NULL)
     , mPlugin(NULL)
     , mProcessStartTime(time(NULL))
-    , mPluginCrashedTask(NULL)
 {
     NS_ASSERTION(mSubprocess, "Out of memory!");
 
@@ -104,13 +121,6 @@ PluginModuleParent::PluginModuleParent(const char* aFilePath)
 
 PluginModuleParent::~PluginModuleParent()
 {
-    NS_ASSERTION(OkToCleanup(), "unsafe destruction");
-
-    if (mPluginCrashedTask) {
-        mPluginCrashedTask->Cancel();
-        mPluginCrashedTask = 0;
-    }
-
     if (!mShutdown) {
         NS_WARNING("Plugin host deleted the module without shutting down.");
         NPError err;
@@ -256,11 +266,12 @@ PluginModuleParent::ActorDestroy(ActorDestroyReason why)
     switch (why) {
     case AbnormalShutdown: {
         nsCOMPtr<nsIFile> dump;
+        nsAutoString dumpID;
         if (GetMinidump(getter_AddRefs(dump))) {
             WriteExtraDataForMinidump(dump);
-            if (NS_SUCCEEDED(dump->GetLeafName(mDumpID))) {
-                mDumpID.Replace(mDumpID.Length() - 4, 4,
-                                NS_LITERAL_STRING(""));
+            if (NS_SUCCEEDED(dump->GetLeafName(dumpID))) {
+                dumpID.Replace(dumpID.Length() - 4, 4,
+                               NS_LITERAL_STRING(""));
             }
         }
         else {
@@ -271,9 +282,9 @@ PluginModuleParent::ActorDestroy(ActorDestroyReason why)
         // Defer the PluginCrashed method so that we don't re-enter
         // and potentially modify the actor child list while enumerating it.
         if (mPlugin) {
-            mPluginCrashedTask = NewRunnableMethod(
-                this, &PluginModuleParent::NotifyPluginCrashed);
-            MessageLoop::current()->PostTask(FROM_HERE, mPluginCrashedTask);
+            nsCOMPtr<nsIRunnable> r =
+                new PluginCrashed(mPlugin, dumpID);
+            NS_DispatchToMainThread(r);
         }
         break;
     }
@@ -286,24 +297,6 @@ PluginModuleParent::ActorDestroy(ActorDestroyReason why)
     }
 }
 
-void
-PluginModuleParent::NotifyPluginCrashed()
-{
-    // MessageLoop owns this
-    mPluginCrashedTask = NULL;
-
-    if (!OkToCleanup()) {
-        // there's still plugin code on the C++ stack.  try again
-        mPluginCrashedTask = NewRunnableMethod(
-            this, &PluginModuleParent::NotifyPluginCrashed);
-        MessageLoop::current()->PostTask(FROM_HERE, mPluginCrashedTask);
-        return;
-    }
-
-    if (mPlugin)
-        mPlugin->PluginCrashed(mDumpID);
-}
-
 PPluginInstanceParent*
 PluginModuleParent::AllocPPluginInstance(const nsCString& aMimeType,
                                          const uint16_t& aMode,

dom/plugins/PluginModuleParent.h

@@ -120,10 +120,6 @@ public:
 
     bool EnsureValidNPIdentifier(NPIdentifier aIdentifier);
 
-    bool OkToCleanup() const {
-        return !IsOnCxxStack();
-    }
-
 protected:
     NS_OVERRIDE
     virtual bool ShouldContinueFromReplyTimeout();
@@ -232,7 +228,6 @@ private:
                              const char* value);
     void CleanupFromTimeout();
     static int TimeoutChanged(const char* aPref, void* aModule);
-    void NotifyPluginCrashed();
 
     nsCString mCrashNotes;
     PluginProcessParent* mSubprocess;
@@ -241,8 +236,6 @@ private:
     nsTHashtable<nsVoidPtrHashKey> mValidIdentifiers;
     nsNPAPIPlugin* mPlugin;
     time_t mProcessStartTime;
-    CancelableTask* mPluginCrashedTask;
-    nsString mDumpID;
 };
 
 } // namespace plugins

ipc/glue/RPCChannel.cpp

@@ -183,16 +183,6 @@ RPCChannel::Call(Message* msg, Message* reply)
         NewRunnableMethod(this, &RPCChannel::OnSend, msg));
 
     while (1) {
-        // if a handler invoked by *Dispatch*() spun a nested event
-        // loop, and the connection was broken during that loop, we
-        // might have already processed the OnError event. if so,
-        // trying another loop iteration will be futile because
-        // channel state will have been cleared
-        if (!Connected()) {
-            ReportConnectionError("RPCChannel");
-            return false;
-        }
-
         // now might be the time to process a message deferred because
         // of race resolution
         MaybeProcessDeferredIncall();

ipc/glue/RPCChannel.h

@@ -128,11 +128,6 @@ public:
     // Return true iff successful.
     bool UnblockChild();
 
-    // Return true iff this has code on the C++ stack.
-    bool IsOnCxxStack() const {
-        return 0 < mCxxStackFrames;
-    }
-
     NS_OVERRIDE
     virtual bool OnSpecialMessage(uint16 id, const Message& msg);
 

ipc/ipdl/ipdl/lower.py

@@ -1356,10 +1356,6 @@ class Protocol(ipdl.ast.Protocol):
         assert self.decl.type.isToplevel()
         return ExprVar('ExitedCxxStack')
 
-    def onCxxStackVar(self):
-        assert self.decl.type.isToplevel()
-        return ExprVar('IsOnCxxStack')
-
     def nextActorIdExpr(self, side):
         assert self.decl.type.isToplevel()
         if side is 'parent':   op = '++'
@@ -2880,23 +2876,15 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
 
             self.cls.addstmts([ ontimeout, Whitespace.NL ])
 
-        # C++-stack-related methods
+        # On[Entered/Exited]CxxStack()
         if ptype.isToplevel() and toplevel.talksRpc():
-            # OnEnteredCxxStack()
             onentered = MethodDefn(MethodDecl('OnEnteredCxxStack'))
             onentered.addstmt(StmtReturn(ExprCall(p.enteredCxxStackVar())))
 
-            # OnExitedCxxStack()
             onexited = MethodDefn(MethodDecl('OnExitedCxxStack'))
             onexited.addstmt(StmtReturn(ExprCall(p.exitedCxxStackVar())))
 
-            # bool IsOnCxxStack()
-            onstack = MethodDefn(
-                MethodDecl(p.onCxxStackVar().name, ret=Type.BOOL, const=1))
-            onstack.addstmt(StmtReturn(ExprCall(
-                ExprSelect(p.channelVar(), '.', p.onCxxStackVar().name))))
-
-            self.cls.addstmts([ onentered, onexited, onstack, Whitespace.NL ])
+            self.cls.addstmts([ onentered, onexited, Whitespace.NL ])
 
         # OnChannelClose()
         onclose = MethodDefn(MethodDecl('OnChannelClose'))