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

Attempt to fix page load regression. b=35768

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@127261 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%fas.harvard.edu 2002-08-14 14:01:39 +00:00
parent 28c5771cf0
commit 43e046d34d
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/content/base/public/nsIStyleRuleProcessor.h
View File

@ -103,8 +103,7 @@ struct RuleProcessorData {
RuleProcessorData* mParentData;
protected:
nsAutoString mLanguage;
PRBool mIsLanguageValid;
nsAutoString *mLanguage; // NULL means we haven't found out the language yet
};
struct ElementRuleProcessorData : public RuleProcessorData {

16
mozilla/content/html/style/src/nsCSSStyleSheet.cpp
View File

@ -3383,7 +3383,7 @@ RuleProcessorData::RuleProcessorData(nsIPresContext* aPresContext,
mNameSpaceID = kNameSpaceID_Unknown;
mPreviousSiblingData = nsnull;
mParentData = nsnull;
mIsLanguageValid = PR_FALSE;
mLanguage = nsnull;
// get the compat. mode (unless it is provided)
if(!aCompat) {
@ -3476,9 +3476,11 @@ RuleProcessorData::~RuleProcessorData()
const nsString* RuleProcessorData::GetLang(void)
{
if (!mIsLanguageValid) {
mIsLanguageValid = PR_TRUE;
mLanguage.SetLength(0);
if (!mLanguage) {
mLanguage = new nsAutoString();
if (!mLanguage)
return nsnull;
mLanguage->SetLength(0);
nsCOMPtr<nsIContent> content = mContent;
while (content) {
PRInt32 attrCount = 0;
@ -3495,7 +3497,7 @@ const nsString* RuleProcessorData::GetLang(void)
nsHTMLAtoms::lang, value);
}
if (attrState == NS_CONTENT_ATTR_HAS_VALUE) {
mLanguage = value;
*mLanguage = value;
break;
}
}
@ -3504,7 +3506,7 @@ const nsString* RuleProcessorData::GetLang(void)
content = dont_AddRef(parent);
}
}
return &mLanguage;
return mLanguage;
}
static const PRUnichar kNullCh = PRUnichar('\0');
@ -3771,7 +3773,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
// from the parent we have to be prepared to look at all parent
// nodes. The language itself is encoded in the LANG attribute.
const nsString* lang = data.GetLang();
if (!lang->IsEmpty()) {
if (lang && !lang->IsEmpty()) { // null check for out-of-memory
result = localTrue == DashMatchCompare(*lang,
nsDependentString(pseudoClass->mString), PR_FALSE);
}

16
mozilla/layout/style/nsCSSStyleSheet.cpp
View File

@ -3383,7 +3383,7 @@ RuleProcessorData::RuleProcessorData(nsIPresContext* aPresContext,
mNameSpaceID = kNameSpaceID_Unknown;
mPreviousSiblingData = nsnull;
mParentData = nsnull;
mIsLanguageValid = PR_FALSE;
mLanguage = nsnull;
// get the compat. mode (unless it is provided)
if(!aCompat) {
@ -3476,9 +3476,11 @@ RuleProcessorData::~RuleProcessorData()
const nsString* RuleProcessorData::GetLang(void)
{
if (!mIsLanguageValid) {
mIsLanguageValid = PR_TRUE;
mLanguage.SetLength(0);
if (!mLanguage) {
mLanguage = new nsAutoString();
if (!mLanguage)
return nsnull;
mLanguage->SetLength(0);
nsCOMPtr<nsIContent> content = mContent;
while (content) {
PRInt32 attrCount = 0;
@ -3495,7 +3497,7 @@ const nsString* RuleProcessorData::GetLang(void)
nsHTMLAtoms::lang, value);
}
if (attrState == NS_CONTENT_ATTR_HAS_VALUE) {
mLanguage = value;
*mLanguage = value;
break;
}
}
@ -3504,7 +3506,7 @@ const nsString* RuleProcessorData::GetLang(void)
content = dont_AddRef(parent);
}
}
return &mLanguage;
return mLanguage;
}
static const PRUnichar kNullCh = PRUnichar('\0');
@ -3771,7 +3773,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
// from the parent we have to be prepared to look at all parent
// nodes. The language itself is encoded in the LANG attribute.
const nsString* lang = data.GetLang();
if (!lang->IsEmpty()) {
if (lang && !lang->IsEmpty()) { // null check for out-of-memory
result = localTrue == DashMatchCompare(*lang,
nsDependentString(pseudoClass->mString), PR_FALSE);
}

3
mozilla/layout/style/nsIStyleRuleProcessor.h
View File

@ -103,8 +103,7 @@ struct RuleProcessorData {
RuleProcessorData* mParentData;
protected:
nsAutoString mLanguage;
PRBool mIsLanguageValid;
nsAutoString *mLanguage; // NULL means we haven't found out the language yet
};
struct ElementRuleProcessorData : public RuleProcessorData {