зеркало из https://github.com/mozilla/gecko-dev.git
Bug 107485 nsPluginHostImpl's shutdown listener should be a weak reference
patch by adu@sparc.spb.su r=dougt sr=darin
This commit is contained in:
Родитель
4e76f802b3
Коммит
5c8c9dac42
|
@ -1681,7 +1681,7 @@ nsPluginCacheListener::~nsPluginCacheListener()
|
|||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
NS_IMPL_ISUPPORTS1(nsPluginCacheListener, nsIStreamListener)
|
||||
NS_IMPL_ISUPPORTS2(nsPluginCacheListener, nsIStreamListener, nsISupportsWeakReference)
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
NS_IMETHODIMP
|
||||
nsPluginCacheListener::OnStartRequest(nsIRequest *request, nsISupports* ctxt)
|
||||
|
@ -2604,8 +2604,8 @@ nsPluginHostImpl::nsPluginHostImpl()
|
|||
nsCOMPtr<nsIObserverService> obsService = do_GetService("@mozilla.org/observer-service;1");
|
||||
if (obsService)
|
||||
{
|
||||
obsService->AddObserver(this, "quit-application", PR_FALSE);
|
||||
obsService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE);
|
||||
obsService->AddObserver(this, "quit-application", PR_TRUE);
|
||||
obsService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
|
||||
}
|
||||
|
||||
#ifdef PLUGIN_LOGGING
|
||||
|
|
|
@ -51,6 +51,7 @@
|
|||
#include "nsPluginsDir.h"
|
||||
#include "nsVoidArray.h" // array for holding "active" streams
|
||||
#include "nsIDirectoryService.h"
|
||||
#include "nsWeakReference.h"
|
||||
#include "nsWeakPtr.h"
|
||||
|
||||
class ns4xPlugin;
|
||||
|
@ -177,7 +178,8 @@ class nsPluginHostImpl : public nsIPluginManager2,
|
|||
public nsIFileUtilities,
|
||||
public nsICookieStorage,
|
||||
public nsIObserver,
|
||||
public nsPIPluginHost
|
||||
public nsPIPluginHost,
|
||||
public nsSupportsWeakReference
|
||||
{
|
||||
public:
|
||||
nsPluginHostImpl();
|
||||
|
|
Загрузка…
Ссылка в новой задаче