From 42f095d4fa333b61892dbfa84f887a0414ab4a25 Mon Sep 17 00:00:00 2001 From: Benjamin Smedberg Date: Wed, 25 Nov 2009 15:34:49 -0500 Subject: [PATCH] XXX removal: don't destroy the stream on failure (a future ActorDestroy callback will take care of that), and other shutdown- and crash-related XXX removal which are handled by bug 529005 --- dom/plugins/BrowserStreamParent.cpp | 6 ++---- dom/plugins/PPluginModule.ipdl | 2 -- dom/plugins/PluginProcessParent.cpp | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dom/plugins/BrowserStreamParent.cpp b/dom/plugins/BrowserStreamParent.cpp index 1fba25eda72..2fecc660e17 100644 --- a/dom/plugins/BrowserStreamParent.cpp +++ b/dom/plugins/BrowserStreamParent.cpp @@ -50,11 +50,9 @@ BrowserStreamParent::WriteReady() _MOZ_LOG(__FUNCTION__); int32_t result; - if (!CallNPP_WriteReady(mStream->end, &result)) { - mNPP->mNPNIface->destroystream(mNPP->mNPP, mStream, NPRES_NETWORK_ERR); - // XXX is this right? + if (!CallNPP_WriteReady(mStream->end, &result)) return -1; - } + return result; } diff --git a/dom/plugins/PPluginModule.ipdl b/dom/plugins/PPluginModule.ipdl index e627b748ea5..4ba8ec86a2a 100644 --- a/dom/plugins/PPluginModule.ipdl +++ b/dom/plugins/PPluginModule.ipdl @@ -69,8 +69,6 @@ child: returns (NPError rv); parent: - // XXX does NPN_UserAgent need to be RPC? certainly hope not, but to - // XXX be safe ... rpc NPN_UserAgent() returns (nsCString userAgent); diff --git a/dom/plugins/PluginProcessParent.cpp b/dom/plugins/PluginProcessParent.cpp index a0e8ab8ec2e..2bf07db8026 100644 --- a/dom/plugins/PluginProcessParent.cpp +++ b/dom/plugins/PluginProcessParent.cpp @@ -57,7 +57,6 @@ PluginProcessParent::PluginProcessParent(const std::string& aPluginFilePath) : GeckoChildProcessHost(GeckoProcessType_Plugin), mPluginFilePath(aPluginFilePath) { - // XXXbent Need to catch crashing plugins by watching the process event! } PluginProcessParent::~PluginProcessParent()