зеркало из https://github.com/mozilla/gecko-dev.git
removed scriptable region hackery, switched to NS_IMPLE_ISUPPORTS1. r=pavlov
This commit is contained in:
Родитель
b1eae55163
Коммит
98f50c9632
|
@ -17,7 +17,6 @@
|
|||
*/
|
||||
|
||||
#include "nsRegionMac.h"
|
||||
#include "nsScriptableRegion.h"
|
||||
#include "prmem.h"
|
||||
|
||||
NS_EXPORT nsNativeRegionPool sNativeRegionPool;
|
||||
|
@ -125,34 +124,7 @@ nsRegionMac::~nsRegionMac()
|
|||
}
|
||||
}
|
||||
|
||||
NS_IMPL_ADDREF(nsRegionMac);
|
||||
NS_IMPL_RELEASE(nsRegionMac);
|
||||
|
||||
NS_IMETHODIMP nsRegionMac::QueryInterface(REFNSIID aIID, void** aInstancePtr)
|
||||
{
|
||||
if (NULL == aInstancePtr) {
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
}
|
||||
|
||||
*aInstancePtr = NULL;
|
||||
|
||||
if (aIID.Equals(NS_GET_IID(nsIRegion)) || aIID.Equals(NS_GET_IID(nsISupports))) {
|
||||
*aInstancePtr = (void*) this;
|
||||
NS_ADDREF_THIS();
|
||||
return NS_OK;
|
||||
}
|
||||
if (aIID.Equals(NS_GET_IID(nsIScriptableRegion))) {
|
||||
nsScriptableRegion* scriptableRegion = new nsScriptableRegion(this);
|
||||
if (scriptableRegion != nsnull) {
|
||||
*aInstancePtr = (void*) scriptableRegion;
|
||||
NS_ADDREF(scriptableRegion);
|
||||
return NS_OK;
|
||||
}
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
return NS_NOINTERFACE;
|
||||
}
|
||||
NS_IMPL_ISUPPORTS1(nsRegionMac, nsIRegion)
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче