зеркало из https://github.com/mozilla/gecko-dev.git
Bug 851892 part 2. Remove the now-unused GetExistingDOMRule method. r=heycam
This commit is contained in:
Родитель
b428dc3b24
Коммит
ff9df2fc65
|
@ -27,8 +27,7 @@ class GroupRule;
|
||||||
|
|
||||||
#define DECL_STYLE_RULE_INHERIT \
|
#define DECL_STYLE_RULE_INHERIT \
|
||||||
DECL_STYLE_RULE_INHERIT_NO_DOMRULE \
|
DECL_STYLE_RULE_INHERIT_NO_DOMRULE \
|
||||||
virtual nsIDOMCSSRule* GetDOMRule() override; \
|
virtual nsIDOMCSSRule* GetDOMRule() override;
|
||||||
virtual nsIDOMCSSRule* GetExistingDOMRule() override;
|
|
||||||
|
|
||||||
class Rule : public nsISupports {
|
class Rule : public nsISupports {
|
||||||
protected:
|
protected:
|
||||||
|
@ -113,9 +112,6 @@ public:
|
||||||
// supposed to have a DOM rule representation (and our code wouldn't work).
|
// supposed to have a DOM rule representation (and our code wouldn't work).
|
||||||
virtual nsIDOMCSSRule* GetDOMRule() = 0;
|
virtual nsIDOMCSSRule* GetDOMRule() = 0;
|
||||||
|
|
||||||
// Like GetDOMRule(), but won't create one if we don't have one yet
|
|
||||||
virtual nsIDOMCSSRule* GetExistingDOMRule() = 0;
|
|
||||||
|
|
||||||
// to implement methods on nsIDOMCSSRule
|
// to implement methods on nsIDOMCSSRule
|
||||||
nsresult GetParentRule(nsIDOMCSSRule** aParentRule);
|
nsresult GetParentRule(nsIDOMCSSRule** aParentRule);
|
||||||
nsresult GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet);
|
nsresult GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet);
|
||||||
|
|
|
@ -65,7 +65,6 @@ public:
|
||||||
int32_t GetType() const final { return css::Rule::STYLE_RULE; }
|
int32_t GetType() const final { return css::Rule::STYLE_RULE; }
|
||||||
already_AddRefed<Rule> Clone() const final;
|
already_AddRefed<Rule> Clone() const final;
|
||||||
nsIDOMCSSRule* GetDOMRule() final { return this; }
|
nsIDOMCSSRule* GetDOMRule() final { return this; }
|
||||||
nsIDOMCSSRule* GetExistingDOMRule() final { return this; }
|
|
||||||
size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const final;
|
size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const final;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
void List(FILE* out = stdout, int32_t aIndent = 0) const final;
|
void List(FILE* out = stdout, int32_t aIndent = 0) const final;
|
||||||
|
|
|
@ -1464,12 +1464,6 @@ StyleRule::GetDOMRule()
|
||||||
return mDOMRule;
|
return mDOMRule;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* virtual */ nsIDOMCSSRule*
|
|
||||||
StyleRule::GetExistingDOMRule()
|
|
||||||
{
|
|
||||||
return mDOMRule;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
StyleRule::SetDeclaration(Declaration* aDecl)
|
StyleRule::SetDeclaration(Declaration* aDecl)
|
||||||
{
|
{
|
||||||
|
|
|
@ -348,8 +348,6 @@ public:
|
||||||
|
|
||||||
virtual nsIDOMCSSRule* GetDOMRule() override;
|
virtual nsIDOMCSSRule* GetDOMRule() override;
|
||||||
|
|
||||||
virtual nsIDOMCSSRule* GetExistingDOMRule() override;
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const override;
|
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const override;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -43,8 +43,6 @@ using namespace mozilla::dom;
|
||||||
|
|
||||||
#define IMPL_STYLE_RULE_INHERIT_GET_DOM_RULE_WEAK(class_, super_) \
|
#define IMPL_STYLE_RULE_INHERIT_GET_DOM_RULE_WEAK(class_, super_) \
|
||||||
/* virtual */ nsIDOMCSSRule* class_::GetDOMRule() \
|
/* virtual */ nsIDOMCSSRule* class_::GetDOMRule() \
|
||||||
{ return this; } \
|
|
||||||
/* virtual */ nsIDOMCSSRule* class_::GetExistingDOMRule() \
|
|
||||||
{ return this; }
|
{ return this; }
|
||||||
|
|
||||||
#define IMPL_STYLE_RULE_INHERIT(class_, super_) \
|
#define IMPL_STYLE_RULE_INHERIT(class_, super_) \
|
||||||
|
@ -839,7 +837,6 @@ NS_INTERFACE_MAP_BEGIN(DocumentRule)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMCSSGroupingRule)
|
NS_INTERFACE_MAP_ENTRY(nsIDOMCSSGroupingRule)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMCSSConditionRule)
|
NS_INTERFACE_MAP_ENTRY(nsIDOMCSSConditionRule)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMozDocumentRule)
|
NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMozDocumentRule)
|
||||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, mozilla::css::Rule)
|
|
||||||
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSMozDocumentRule)
|
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSMozDocumentRule)
|
||||||
NS_INTERFACE_MAP_END_INHERITING(GroupRule)
|
NS_INTERFACE_MAP_END_INHERITING(GroupRule)
|
||||||
|
|
||||||
|
|
|
@ -72,10 +72,6 @@ public:
|
||||||
{
|
{
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
virtual nsIDOMCSSRule* GetExistingDOMRule() override
|
|
||||||
{
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
// nsIDOMCSSRule interface
|
// nsIDOMCSSRule interface
|
||||||
NS_DECL_NSIDOMCSSRULE
|
NS_DECL_NSIDOMCSSRULE
|
||||||
|
@ -127,10 +123,6 @@ public:
|
||||||
{
|
{
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
virtual nsIDOMCSSRule* GetExistingDOMRule() override
|
|
||||||
{
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
// nsIDOMCSSRule interface
|
// nsIDOMCSSRule interface
|
||||||
NS_DECL_NSIDOMCSSRULE
|
NS_DECL_NSIDOMCSSRULE
|
||||||
|
@ -457,10 +449,6 @@ public:
|
||||||
{
|
{
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
virtual nsIDOMCSSRule* GetExistingDOMRule() override
|
|
||||||
{
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
// nsIDOMCSSRule interface
|
// nsIDOMCSSRule interface
|
||||||
NS_DECL_NSIDOMCSSRULE
|
NS_DECL_NSIDOMCSSRULE
|
||||||
|
@ -575,10 +563,6 @@ public:
|
||||||
{
|
{
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
virtual nsIDOMCSSRule* GetExistingDOMRule() override
|
|
||||||
{
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_DECL_ISUPPORTS_INHERITED
|
NS_DECL_ISUPPORTS_INHERITED
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче