зеркало из https://github.com/mozilla/gecko-dev.git
Fixing nsIAllocator for mac.
This commit is contained in:
Родитель
7156ac3145
Коммит
46e86d5eac
|
@ -33,7 +33,7 @@
|
|||
#include "npapi.h"
|
||||
#include "nsIPluginManager2.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIMemory.h"
|
||||
#include "nsMemory.h"
|
||||
#include "nsLiveConnect.h"
|
||||
#include "nsIEventHandler.h"
|
||||
#include "nsplugin.h"
|
||||
|
@ -925,7 +925,7 @@ nsIPlugin* thePlugin = NULL;
|
|||
|
||||
static NS_DEFINE_IID(kPluginCID, NS_PLUGIN_CID);
|
||||
static NS_DEFINE_IID(kPluginManagerCID, NS_PLUGINMANAGER_CID);
|
||||
static NS_DEFINE_IID(kAllocatorCID, NS_ALLOCATOR_CID);
|
||||
static NS_DEFINE_IID(kMemoryCID, NS_MEMORY_CID);
|
||||
|
||||
static NS_DEFINE_IID(kIPluginStreamInfoIID, NS_IPLUGINSTREAMINFO_IID);
|
||||
static NS_DEFINE_IID(kIPluginInputStreamIID, NS_IPLUGININPUTSTREAM_IID);
|
||||
|
@ -1886,7 +1886,7 @@ CPluginManager::GetService(const nsCID& aClass, const nsIID& aIID,
|
|||
nsIShutdownListener* shutdownListener)
|
||||
{
|
||||
// the only service we support currently is nsIMemory.
|
||||
if (aClass.Equals(kPluginManagerCID) || aClass.Equals(kAllocatorCID)) {
|
||||
if (aClass.Equals(kPluginManagerCID) || aClass.Equals(kMemoryCID)) {
|
||||
return QueryInterface(aIID, (void**) result);
|
||||
}
|
||||
if (aClass.Equals(nsILiveconnect::GetCID())) {
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include "EmbeddedFramePluginInstance.h"
|
||||
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIMemory.h"
|
||||
#include "nsMemory.h"
|
||||
#include "nsRepository.h"
|
||||
#include "nsIJVMManager.h"
|
||||
#include "nsIJVMPluginTagInfo.h"
|
||||
|
@ -64,7 +64,7 @@ short thePluginRefnum = -1;
|
|||
|
||||
static NS_DEFINE_IID(kPluginCID, NS_PLUGIN_CID);
|
||||
static NS_DEFINE_IID(kPluginManagerCID, NS_PLUGINMANAGER_CID);
|
||||
static NS_DEFINE_IID(kAllocatorCID, NS_ALLOCATOR_CID);
|
||||
static NS_DEFINE_IID(kMemoryCID, NS_MEMORY_CID);
|
||||
static NS_DEFINE_IID(kJVMManagerCID, NS_JVMMANAGER_CID);
|
||||
|
||||
static NS_DEFINE_IID(kIWindowlessPluginInstancePeerIID, NS_IWINDOWLESSPLUGININSTANCEPEER_IID);
|
||||
|
@ -84,7 +84,7 @@ nsresult NSGetFactory(nsISupports* serviceManager, const nsCID &aClass, const ch
|
|||
|
||||
// Our global operator new wants to use nsIMalloc to do all of its allocation.
|
||||
// This should be available from the Service Manager.
|
||||
if (theServiceManager->GetService(kAllocatorCID, NS_GET_IID(nsIMemory), (nsISupports**)&theMemoryAllocator) != NS_OK)
|
||||
if (theServiceManager->GetService(kMemoryCID, NS_GET_IID(nsIMemory), (nsISupports**)&theMemoryAllocator) != NS_OK)
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче