wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 539699-ITypeInfo nsAccessible member conversion to static r=tbsaunde

Browse Source
This commit is contained in:
Andrew Quartey 2012-01-05 22:45:27 -05:00
parent aec89d9220
commit 2a9e9bcedd
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
accessible/src/msaa/nsAccessibleWrap.cpp
View File

@ -91,12 +91,14 @@ static const PRInt32 kIEnumVariantDisconnected = -1;
// nsAccessibleWrap
////////////////////////////////////////////////////////////////////////////////
ITypeInfo* nsAccessibleWrap::gTypeInfo = NULL;
//-----------------------------------------------------
// construction
//-----------------------------------------------------
nsAccessibleWrap::
nsAccessibleWrap(nsIContent *aContent, nsIWeakReference *aShell) :
nsAccessible(aContent, aShell), mEnumVARIANTPosition(0), mTypeInfo(NULL)
nsAccessible(aContent, aShell), mEnumVARIANTPosition(0)
{
}
@ -105,8 +107,6 @@ nsAccessibleWrap::
//-----------------------------------------------------
nsAccessibleWrap::~nsAccessibleWrap()
{
if (mTypeInfo)
mTypeInfo->Release();
}
NS_IMPL_ISUPPORTS_INHERITED0(nsAccessibleWrap, nsAccessible);
@ -1835,19 +1835,19 @@ void nsAccessibleWrap::UpdateSystemCaret()
ITypeInfo*
nsAccessibleWrap::GetTI(LCID lcid)
{
if (mTypeInfo)
return mTypeInfo;
if (gTypeInfo)
return gTypeInfo;
ITypeLib *typeLib = NULL;
HRESULT hr = LoadRegTypeLib(LIBID_Accessibility, 1, 0, lcid, &typeLib);
if (FAILED(hr))
return NULL;
hr = typeLib->GetTypeInfoOfGuid(IID_IAccessible, &mTypeInfo);
hr = typeLib->GetTypeInfoOfGuid(IID_IAccessible, &gTypeInfo);
typeLib->Release();
if (FAILED(hr))
return NULL;
return mTypeInfo;
return gTypeInfo;
}

4
accessible/src/msaa/nsAccessibleWrap.h
View File

@ -356,9 +356,9 @@ protected:
/**
* Creates ITypeInfo for LIBID_Accessibility if it's needed and returns it.
*/
ITypeInfo *GetTI(LCID lcid);
static ITypeInfo* GetTI(LCID lcid);
ITypeInfo *mTypeInfo;
static ITypeInfo* gTypeInfo;
enum navRelations {