corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove static nsCOMPtr from nsTextControlFrame. b=179228 r=jkeiser sr=bzbarsky

Browse Source
This commit is contained in:
dbaron@fas.harvard.edu
2002-11-19 15:21:57 +00:00
parent 1bb47979a0
commit 4799790fd9
5 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
layout/forms/nsTextControlFrame.cpp
View File

@@ -139,22 +139,20 @@ static const PRInt32 DEFAULT_COLS = 20;
static const PRInt32 DEFAULT_ROWS = 1;
static const PRInt32 DEFAULT_ROWS_TEXTAREA = 2;
static nsIWeakReference *sElementFactory = nsnull;
static nsresult GetElementFactoryService(nsIElementFactory **aFactory)
{
nsresult rv(NS_OK);
static nsWeakPtr sElementFactory = getter_AddRefs( NS_GetWeakReference(nsCOMPtr<nsIElementFactory>(do_GetService(
NS_ELEMENT_FACTORY_CONTRACTID_PREFIX"http://www.w3.org/1999/xhtml", &rv) )));
if (sElementFactory)
{
nsCOMPtr<nsIElementFactory> fac(do_QueryReferent(sElementFactory));
*aFactory = fac.get();
if (!*aFactory)
rv = NS_ERROR_FAILURE;
NS_IF_ADDREF(*aFactory);
if (!sElementFactory) {
sElementFactory = NS_GetWeakReference(
nsCOMPtr<nsIElementFactory>(
do_GetService(
NS_ELEMENT_FACTORY_CONTRACTID_PREFIX
"http://www.w3.org/1999/xhtml")));
if (!sElementFactory)
return NS_ERROR_FAILURE;
}
else
return NS_ERROR_FAILURE;
return rv;
return CallQueryReferent(sElementFactory, aFactory);
}
@@ -1323,6 +1321,12 @@ nsTextControlFrame::~nsTextControlFrame()
//delete mTextSelImpl; dont delete this since mSelCon will release it.
}
/* static */ void
nsTextControlFrame::ReleaseGlobals()
{
NS_IF_RELEASE(sElementFactory);
}
static PRBool
SuppressEventHandlers(nsIPresContext* aPresContext)
{