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 795221 part 3. Implement cycle collection for GroupRule objects. r=smaug,dbaron

Browse Source 
--HG--
rename : content/html/content/crashtests/795221-1.html => content/html/content/crashtests/795221-2.html
This commit is contained in:
Boris Zbarsky 2012-10-07 22:39:09 -04:00
parent 50dcf71b9b
commit 0120d2ee48
10 changed files with 75 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
content/html/content/crashtests/795221-2.html Normal file
View File

@ -0,0 +1,9 @@
<!DOCTYPE html>
<style>
@media all {
div { }
}
</style>
<script>
document.styleSheets[0].cssRules[0].cssRules[0].style.foo = document;
</script>

1
content/html/content/crashtests/crashtests.list
View File

@ -37,3 +37,4 @@ load 673853.html
load 738744.xhtml load 738744.xhtml
load 741250.xhtml load 741250.xhtml
load 795221-1.html load 795221-1.html
load 795221-2.html

4
layout/style/GroupRule.h
View File

@ -14,6 +14,7 @@
#include "mozilla/css/Rule.h" #include "mozilla/css/Rule.h"
#include "nsCOMArray.h" #include "nsCOMArray.h"
#include "nsAutoPtr.h" #include "nsAutoPtr.h"
#include "nsCycleCollectionParticipant.h"
class nsPresContext; class nsPresContext;
class nsMediaQueryResultCacheKey; class nsMediaQueryResultCacheKey;
@ -33,6 +34,9 @@ protected:
virtual ~GroupRule(); virtual ~GroupRule();
public: public:
NS_DECL_CYCLE_COLLECTION_CLASS(GroupRule)
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
// implement part of nsIStyleRule and Rule // implement part of nsIStyleRule and Rule
DECL_STYLE_RULE_INHERIT_NO_DOMRULE DECL_STYLE_RULE_INHERIT_NO_DOMRULE
virtual void SetStyleSheet(nsCSSStyleSheet* aSheet); virtual void SetStyleSheet(nsCSSStyleSheet* aSheet);

2
layout/style/ImportRule.h
View File

@ -30,7 +30,7 @@ private:
ImportRule(const ImportRule& aCopy); ImportRule(const ImportRule& aCopy);
~ImportRule(); ~ImportRule();
public: public:
NS_DECL_ISUPPORTS_INHERITED NS_DECL_ISUPPORTS
DECL_STYLE_RULE_INHERIT DECL_STYLE_RULE_INHERIT

2
layout/style/NameSpaceRule.h
View File

@ -35,7 +35,7 @@ private:
public: public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_CSS_NAMESPACE_RULE_IMPL_CID) NS_DECLARE_STATIC_IID_ACCESSOR(NS_CSS_NAMESPACE_RULE_IMPL_CID)
NS_DECL_ISUPPORTS_INHERITED NS_DECL_ISUPPORTS
DECL_STYLE_RULE_INHERIT DECL_STYLE_RULE_INHERIT

7
layout/style/Rule.h
View File

@ -46,13 +46,6 @@ protected:
virtual ~Rule() {} virtual ~Rule() {}
public:
// for implementing nsISupports
NS_IMETHOD_(nsrefcnt) AddRef();
NS_IMETHOD_(nsrefcnt) Release();
protected:
nsAutoRefCnt mRefCnt;
NS_DECL_OWNINGTHREAD
public: public:
// The constants in this list must maintain the following invariants: // The constants in this list must maintain the following invariants:

4
layout/style/StyleRule.cpp
View File

@ -1361,8 +1361,8 @@ NS_INTERFACE_MAP_BEGIN(StyleRule)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
NS_INTERFACE_MAP_END NS_INTERFACE_MAP_END
NS_IMPL_ADDREF_INHERITED(StyleRule, Rule) NS_IMPL_ADDREF(StyleRule)
NS_IMPL_RELEASE_INHERITED(StyleRule, Rule) NS_IMPL_RELEASE(StyleRule)
void void
StyleRule::RuleMatched() StyleRule::RuleMatched()

2
layout/style/StyleRule.h
View File

@ -307,7 +307,7 @@ private:
public: public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_CSS_STYLE_RULE_IMPL_CID) NS_DECLARE_STATIC_IID_ACCESSOR(NS_CSS_STYLE_RULE_IMPL_CID)
NS_DECL_ISUPPORTS_INHERITED NS_DECL_ISUPPORTS
// null for style attribute // null for style attribute
nsCSSSelectorList* Selector() { return mSelector; } nsCSSSelectorList* Selector() { return mSelector; }

71
layout/style/nsCSSRules.cpp
View File

@ -57,9 +57,6 @@ IMPL_STYLE_RULE_INHERIT_MAP_RULE_INFO_INTO(class_, super_)
namespace mozilla { namespace mozilla {
namespace css { namespace css {
NS_IMPL_ADDREF(Rule)
NS_IMPL_RELEASE(Rule)
nsCSSStyleSheet* nsCSSStyleSheet*
Rule::GetStyleSheet() const Rule::GetStyleSheet() const
{ {
@ -243,8 +240,8 @@ CharsetRule::CharsetRule(const CharsetRule& aCopy)
{ {
} }
NS_IMPL_ADDREF_INHERITED(CharsetRule, Rule) NS_IMPL_ADDREF(CharsetRule)
NS_IMPL_RELEASE_INHERITED(CharsetRule, Rule) NS_IMPL_RELEASE(CharsetRule)
// QueryInterface implementation for CharsetRule // QueryInterface implementation for CharsetRule
NS_INTERFACE_MAP_BEGIN(CharsetRule) NS_INTERFACE_MAP_BEGIN(CharsetRule)
@ -377,8 +374,8 @@ ImportRule::~ImportRule()
} }
} }
NS_IMPL_ADDREF_INHERITED(ImportRule, Rule) NS_IMPL_ADDREF(ImportRule)
NS_IMPL_RELEASE_INHERITED(ImportRule, Rule) NS_IMPL_RELEASE(ImportRule)
// QueryInterface implementation for ImportRule // QueryInterface implementation for ImportRule
NS_INTERFACE_MAP_BEGIN(ImportRule) NS_INTERFACE_MAP_BEGIN(ImportRule)
@ -567,6 +564,13 @@ GroupRule::~GroupRule()
} }
} }
NS_IMPL_CYCLE_COLLECTION_CLASS(GroupRule)
NS_IMPL_CYCLE_COLLECTING_ADDREF(GroupRule)
NS_IMPL_CYCLE_COLLECTING_RELEASE(GroupRule)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(GroupRule)
NS_INTERFACE_MAP_END
IMPL_STYLE_RULE_INHERIT_MAP_RULE_INFO_INTO(GroupRule, Rule) IMPL_STYLE_RULE_INHERIT_MAP_RULE_INFO_INTO(GroupRule, Rule)
static bool static bool
@ -577,11 +581,44 @@ SetStyleSheetReference(Rule* aRule, void* aSheet)
return true; return true;
} }
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(GroupRule)
tmp->mRules.EnumerateForwards(SetParentRuleReference, nullptr);
// If tmp does not have a stylesheet, neither do its descendants. In that
// case, don't try to null out their stylesheet, to avoid O(N^2) behavior in
// depth of group rule nesting. But if tmp _does_ have a stylesheet (which
// can happen if it gets unlinked earlier than its owning stylesheet), then we
// need to null out the stylesheet pointer on descendants now, before we clear
// tmp->mRules.
if (tmp->GetStyleSheet()) {
tmp->mRules.EnumerateForwards(SetStyleSheetReference, nullptr);
}
tmp->mRules.Clear();
if (tmp->mRuleCollection) {
tmp->mRuleCollection->DropReference();
tmp->mRuleCollection = nullptr;
}
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(GroupRule)
const nsCOMArray<Rule>& rules = tmp->mRules;
for (int32_t i = 0, count = rules.Count(); i < count; ++i) {
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mRules[i]");
cb.NoteXPCOMChild(rules[i]->GetExistingDOMRule());
}
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mRuleCollection)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
/* virtual */ void /* virtual */ void
GroupRule::SetStyleSheet(nsCSSStyleSheet* aSheet) GroupRule::SetStyleSheet(nsCSSStyleSheet* aSheet)
{ {
mRules.EnumerateForwards(SetStyleSheetReference, aSheet); // Don't set the sheet on the kids if it's already the same as the sheet we
Rule::SetStyleSheet(aSheet); // already have. This is needed to avoid O(N^2) behavior in group nesting
// depth when seting the sheet to null during unlink, if we happen to unlin in
// order from most nested rule up to least nested rule.
if (aSheet != GetStyleSheet()) {
mRules.EnumerateForwards(SetStyleSheetReference, aSheet);
Rule::SetStyleSheet(aSheet);
}
} }
#ifdef DEBUG #ifdef DEBUG
@ -779,7 +816,7 @@ NS_INTERFACE_MAP_BEGIN(MediaRule)
NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMediaRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMediaRule)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSMediaRule) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSMediaRule)
NS_INTERFACE_MAP_END NS_INTERFACE_MAP_END_INHERITING(GroupRule)
/* virtual */ void /* virtual */ void
MediaRule::SetStyleSheet(nsCSSStyleSheet* aSheet) MediaRule::SetStyleSheet(nsCSSStyleSheet* aSheet)
@ -959,7 +996,7 @@ NS_INTERFACE_MAP_BEGIN(DocumentRule)
NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMozDocumentRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMozDocumentRule)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSMozDocumentRule) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSMozDocumentRule)
NS_INTERFACE_MAP_END NS_INTERFACE_MAP_END_INHERITING(GroupRule)
#ifdef DEBUG #ifdef DEBUG
/* virtual */ void /* virtual */ void
@ -1179,8 +1216,8 @@ NameSpaceRule::~NameSpaceRule()
{ {
} }
NS_IMPL_ADDREF_INHERITED(NameSpaceRule, Rule) NS_IMPL_ADDREF(NameSpaceRule)
NS_IMPL_RELEASE_INHERITED(NameSpaceRule, Rule) NS_IMPL_RELEASE(NameSpaceRule)
// QueryInterface implementation for NameSpaceRule // QueryInterface implementation for NameSpaceRule
NS_INTERFACE_MAP_BEGIN(NameSpaceRule) NS_INTERFACE_MAP_BEGIN(NameSpaceRule)
@ -1922,8 +1959,8 @@ nsCSSKeyframeRule::Clone() const
return clone.forget(); return clone.forget();
} }
NS_IMPL_ADDREF_INHERITED(nsCSSKeyframeRule, Rule) NS_IMPL_ADDREF(nsCSSKeyframeRule)
NS_IMPL_RELEASE_INHERITED(nsCSSKeyframeRule, Rule) NS_IMPL_RELEASE(nsCSSKeyframeRule)
DOMCI_DATA(MozCSSKeyframeRule, nsCSSKeyframeRule) DOMCI_DATA(MozCSSKeyframeRule, nsCSSKeyframeRule)
@ -2117,7 +2154,7 @@ NS_INTERFACE_MAP_BEGIN(nsCSSKeyframesRule)
NS_INTERFACE_MAP_ENTRY(nsIDOMMozCSSKeyframesRule) NS_INTERFACE_MAP_ENTRY(nsIDOMMozCSSKeyframesRule)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozCSSKeyframesRule) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozCSSKeyframesRule)
NS_INTERFACE_MAP_END NS_INTERFACE_MAP_END_INHERITING(GroupRule)
#ifdef DEBUG #ifdef DEBUG
void void
@ -2355,7 +2392,7 @@ NS_INTERFACE_MAP_BEGIN(CSSSupportsRule)
NS_INTERFACE_MAP_ENTRY(nsIDOMCSSSupportsRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSSupportsRule)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSSupportsRule) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSSupportsRule)
NS_INTERFACE_MAP_END NS_INTERFACE_MAP_END_INHERITING(GroupRule)
// nsIDOMCSSRule methods // nsIDOMCSSRule methods
NS_IMETHODIMP NS_IMETHODIMP

4
layout/style/nsCSSRules.h
View File

@ -279,7 +279,7 @@ private:
~CharsetRule() {} ~CharsetRule() {}
public: public:
NS_DECL_ISUPPORTS_INHERITED NS_DECL_ISUPPORTS
DECL_STYLE_RULE_INHERIT DECL_STYLE_RULE_INHERIT
@ -350,7 +350,7 @@ private:
nsCSSKeyframeRule(const nsCSSKeyframeRule& aCopy); nsCSSKeyframeRule(const nsCSSKeyframeRule& aCopy);
~nsCSSKeyframeRule(); ~nsCSSKeyframeRule();
public: public:
NS_DECL_ISUPPORTS_INHERITED NS_DECL_ISUPPORTS
// nsIStyleRule methods // nsIStyleRule methods
#ifdef DEBUG #ifdef DEBUG