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 576831 part 3. Rename CSSImportantRule to mozilla::css::ImportantRule. r=bzbarsky

Browse Source
This commit is contained in:
Craig Topper 2011-03-10 21:48:26 -05:00
parent 2465d73b63
commit 5331afcc56
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
layout/style/nsCSSStyleRule.cpp
View File

@ -894,17 +894,16 @@ nsCSSSelectorList::Clone(PRBool aDeep) const
return result;
}
// -- CSSImportantRule -------------------------------
// -- ImportantRule ----------------------------------
namespace mozilla {
namespace css {
class StyleRule;
}
}
class CSSImportantRule : public nsIStyleRule {
class StyleRule;
class ImportantRule : public nsIStyleRule {
public:
CSSImportantRule(css::Declaration *aDeclaration);
ImportantRule(Declaration *aDeclaration);
NS_DECL_ISUPPORTS
@ -915,36 +914,36 @@ public:
#endif
protected:
virtual ~CSSImportantRule(void);
virtual ~ImportantRule();
// Not an owning reference; the StyleRule that owns this
// CSSImportantRule also owns the mDeclaration, and any rule node
// ImportantRule also owns the mDeclaration, and any rule node
// pointing to this rule keeps that StyleRule alive as well.
css::Declaration* mDeclaration;
Declaration* mDeclaration;
friend class css::StyleRule;
};
CSSImportantRule::CSSImportantRule(css::Declaration* aDeclaration)
ImportantRule::ImportantRule(Declaration* aDeclaration)
: mDeclaration(aDeclaration)
{
}
CSSImportantRule::~CSSImportantRule(void)
ImportantRule::~ImportantRule()
{
}
NS_IMPL_ISUPPORTS1(CSSImportantRule, nsIStyleRule)
NS_IMPL_ISUPPORTS1(ImportantRule, nsIStyleRule)
/* virtual */ void
CSSImportantRule::MapRuleInfoInto(nsRuleData* aRuleData)
ImportantRule::MapRuleInfoInto(nsRuleData* aRuleData)
{
mDeclaration->MapImportantRuleInfoInto(aRuleData);
}
#ifdef DEBUG
/* virtual */ void
CSSImportantRule::List(FILE* out, PRInt32 aIndent) const
ImportantRule::List(FILE* out, PRInt32 aIndent) const
{
// Indent
for (PRInt32 index = aIndent; --index >= 0; ) fputs(" ", out);
@ -954,6 +953,9 @@ CSSImportantRule::List(FILE* out, PRInt32 aIndent) const
}
#endif
} // namespace css
} // namespace mozilla
// --------------------------------------------------------
namespace mozilla {
@ -1357,7 +1359,7 @@ private:
protected:
nsCSSSelectorList* mSelector; // null for style attribute
Declaration* mDeclaration;
CSSImportantRule* mImportantRule; // initialized by RuleMatched
ImportantRule* mImportantRule; // initialized by RuleMatched
DOMCSSStyleRule* mDOMRule;
// Keep the same type so that MSVC packs them.
PRUint32 mLineNumber : 31;
@ -1473,7 +1475,7 @@ StyleRule::RuleMatched()
mWasMatched = PR_TRUE;
mDeclaration->SetImmutable();
if (mDeclaration->HasImportantData()) {
NS_ADDREF(mImportantRule = new CSSImportantRule(mDeclaration));
NS_ADDREF(mImportantRule = new ImportantRule(mDeclaration));
}
}
}