Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refcounted case conversion service properly

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@49094 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
warren%netscape.com
1999-09-26 10:05:51 +00:00
parent e057760aeb
commit 6fbf464bce
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/layout/generic/nsTextTransformer.cpp
View File

@@ -32,6 +32,7 @@
static NS_DEFINE_IID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID);
static nsICaseConversion* gCaseConv = nsnull;
static nsrefcnt gCaseConvRefCnt = 0;
//#define DEBUG_GETPREVWORD
// XXX I'm sure there are other special characters
@@ -47,6 +48,13 @@ nsTextTransformer::nsTextTransformer(nsILineBreaker* aLineBreaker,
mLineBreaker(aLineBreaker),
mWordBreaker(aWordBreaker)
{
if (gCaseConvRefCnt++ == 0) {
nsresult res;
res = nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID,
(nsISupports**)&gCaseConv);
NS_ASSERTION( NS_SUCCEEDED(res), "cannot get UnicharUtil");
NS_ASSERTION( gCaseConv != NULL, "cannot get UnicharUtil");
}
}
nsTextTransformer::~nsTextTransformer()
@@ -54,6 +62,10 @@ nsTextTransformer::~nsTextTransformer()
if (mBuffer != mAutoWordBuffer) {
delete [] mBuffer;
}
if (--gCaseConvRefCnt == 0) {
nsServiceManager::ReleaseService(kUnicharUtilCID, gCaseConv);
gCaseConv = nsnull;
}
}
nsresult
@@ -104,17 +116,6 @@ nsTextTransformer::Init(nsIFrame* aFrame,
mPreformatted = (NS_STYLE_WHITESPACE_PRE == styleText->mWhiteSpace) ||
(NS_STYLE_WHITESPACE_MOZ_PRE_WRAP == styleText->mWhiteSpace);
mTextTransform = styleText->mTextTransform;
if(NS_STYLE_TEXT_TRANSFORM_NONE != mTextTransform)
{
if(nsnull == gCaseConv) {
nsresult res;
res = nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID,
(nsISupports**)&gCaseConv);
NS_ASSERTION( NS_SUCCEEDED(res), "cannot get UnicharUtil");
NS_ASSERTION( gCaseConv != NULL, "cannot get UnicharUtil");
}
}
return NS_OK;
}

23
mozilla/layout/html/base/src/nsTextTransformer.cpp
View File

@@ -32,6 +32,7 @@
static NS_DEFINE_IID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID);
static nsICaseConversion* gCaseConv = nsnull;
static nsrefcnt gCaseConvRefCnt = 0;
//#define DEBUG_GETPREVWORD
// XXX I'm sure there are other special characters
@@ -47,6 +48,13 @@ nsTextTransformer::nsTextTransformer(nsILineBreaker* aLineBreaker,
mLineBreaker(aLineBreaker),
mWordBreaker(aWordBreaker)
{
if (gCaseConvRefCnt++ == 0) {
nsresult res;
res = nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID,
(nsISupports**)&gCaseConv);
NS_ASSERTION( NS_SUCCEEDED(res), "cannot get UnicharUtil");
NS_ASSERTION( gCaseConv != NULL, "cannot get UnicharUtil");
}
}
nsTextTransformer::~nsTextTransformer()
@@ -54,6 +62,10 @@ nsTextTransformer::~nsTextTransformer()
if (mBuffer != mAutoWordBuffer) {
delete [] mBuffer;
}
if (--gCaseConvRefCnt == 0) {
nsServiceManager::ReleaseService(kUnicharUtilCID, gCaseConv);
gCaseConv = nsnull;
}
}
nsresult
@@ -104,17 +116,6 @@ nsTextTransformer::Init(nsIFrame* aFrame,
mPreformatted = (NS_STYLE_WHITESPACE_PRE == styleText->mWhiteSpace) ||
(NS_STYLE_WHITESPACE_MOZ_PRE_WRAP == styleText->mWhiteSpace);
mTextTransform = styleText->mTextTransform;
if(NS_STYLE_TEXT_TRANSFORM_NONE != mTextTransform)
{
if(nsnull == gCaseConv) {
nsresult res;
res = nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID,
(nsISupports**)&gCaseConv);
NS_ASSERTION( NS_SUCCEEDED(res), "cannot get UnicharUtil");
NS_ASSERTION( gCaseConv != NULL, "cannot get UnicharUtil");
}
}
return NS_OK;
}