Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

back out this morning's mess, it caused crashes at startup on unix (not mac or win .. oddly enough)

Browse Source 
#0  0x4197db8e in nsPluginHostImpl::~nsPluginHostImpl (this=0x81beca0, __in_chrg=3)
    at mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp:2630
#1  0x4197dd61 in nsPluginHostImpl::Release (this=0x81beca0)
    at mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp:2639
#2  0x4015a878 in nsObserverList::AddObserver (this=0x81bed08, anObserver=0x81becb0, ownsWeak=1)
    at ../../dist/include/xpcom/nsCOMPtr.h:490
#3  0x4015b7da in nsObserverService::AddObserver (this=0x80f1678,
    anObserver=0x81becb0, aTopic=0x419a2b73 "quit-application", ownsWeak=1)
    at mozilla/xpcom/ds/nsObserverService.cpp:163


git-svn-id: svn://10.0.0.236/trunk@122411 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mac.com
2002-05-31 08:05:14 +00:00
parent 3eb9c1c912
commit 22bfbf8d90
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -2604,8 +2604,8 @@ nsPluginHostImpl::nsPluginHostImpl()
nsCOMPtr<nsIObserverService> obsService = do_GetService("@mozilla.org/observer-service;1");
if (obsService)
{
obsService->AddObserver(this, "quit-application", PR_TRUE);
obsService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
obsService->AddObserver(this, "quit-application", PR_FALSE);
obsService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE);
}
#ifdef PLUGIN_LOGGING
@@ -2636,15 +2636,14 @@ nsPluginHostImpl::~nsPluginHostImpl()
}
////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS8(nsPluginHostImpl,
NS_IMPL_ISUPPORTS7(nsPluginHostImpl,
nsIPluginManager,
nsIPluginManager2,
nsIPluginHost,
nsIFileUtilities,
nsICookieStorage,
nsIObserver,
nsPIPluginHost,
nsISupportsWeakReference);
nsPIPluginHost);
////////////////////////////////////////////////////////////////////////
NS_METHOD
nsPluginHostImpl::Create(nsISupports* aOuter, REFNSIID aIID, void** aResult)

4
mozilla/modules/plugin/base/src/nsPluginHostImpl.h
View File

@@ -51,7 +51,6 @@
#include "nsPluginsDir.h"
#include "nsVoidArray.h" // array for holding "active" streams
#include "nsIDirectoryService.h"
#include "nsWeakReference.h"
#include "nsWeakPtr.h"
class ns4xPlugin;
@@ -178,8 +177,7 @@ class nsPluginHostImpl : public nsIPluginManager2,
public nsIFileUtilities,
public nsICookieStorage,
public nsIObserver,
public nsPIPluginHost,
public nsSupportsWeakReference
public nsPIPluginHost
{
public:
nsPluginHostImpl();