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 577974 - Part 4: DeCOM and de-virtualize methods in GroupRule, r=bzbarsky

Browse Source
This commit is contained in:
Craig Topper 2010-08-07 22:29:28 -07:00
parent e742b48926
commit 4f5347e078
4 changed files with 44 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
layout/style/GroupRule.h
View File

@ -83,37 +83,36 @@ public:
#endif
public:
NS_IMETHOD AppendStyleRule(nsICSSRule* aRule);
void AppendStyleRule(nsICSSRule* aRule);
NS_IMETHOD StyleRuleCount(PRInt32& aCount) const;
NS_IMETHOD GetStyleRuleAt(PRInt32 aIndex, nsICSSRule*& aRule) const;
PRInt32 StyleRuleCount() const { return mRules.Count(); }
nsICSSRule* GetStyleRuleAt(PRInt32 aIndex) const;
typedef nsCOMArray<nsICSSRule>::nsCOMArrayEnumFunc RuleEnumFunc;
NS_IMETHOD_(PRBool) EnumerateRulesForwards(RuleEnumFunc aFunc, void * aData) const;
PRBool EnumerateRulesForwards(RuleEnumFunc aFunc, void * aData) const;
/*
* The next three methods should never be called unless you have first
* called WillDirty() on the parent stylesheet. After they are
* called, DidDirty() needs to be called on the sheet.
*/
NS_IMETHOD DeleteStyleRuleAt(PRUint32 aIndex);
NS_IMETHOD InsertStyleRulesAt(PRUint32 aIndex,
nsCOMArray<nsICSSRule>& aRules);
NS_IMETHOD ReplaceStyleRule(nsICSSRule *aOld, nsICSSRule *aNew);
nsresult DeleteStyleRuleAt(PRUint32 aIndex);
nsresult InsertStyleRulesAt(PRUint32 aIndex,
nsCOMArray<nsICSSRule>& aRules);
nsresult ReplaceStyleRule(nsICSSRule *aOld, nsICSSRule *aNew);
NS_IMETHOD_(PRBool) UseForPresentation(nsPresContext* aPresContext,
nsMediaQueryResultCacheKey& aKey) = 0;
virtual PRBool UseForPresentation(nsPresContext* aPresContext,
nsMediaQueryResultCacheKey& aKey) = 0;
protected:
// to help implement nsIDOMCSSRule
nsresult AppendRulesToCssText(nsAString& aCssText);
// to implement methods on nsIDOMCSSRule
nsresult GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet);
nsresult GetParentRule(nsIDOMCSSRule** aParentRule);
// to implement common methods on nsIDOMCSSMediaRule and
// nsIDOMCSSMozDocumentRule
nsresult GetCssRules(nsIDOMCSSRuleList* *aRuleList);
nsIDOMCSSRuleList* GetCssRules();
nsresult InsertRule(const nsAString & aRule, PRUint32 aIndex,
PRUint32* _retval);
nsresult DeleteRule(PRUint32 aIndex);

75
layout/style/nsCSSRules.cpp
View File

@ -136,9 +136,7 @@ NS_IMETHODIMP
GroupRuleRuleList::GetLength(PRUint32* aLength)
{
if (mGroupRule) {
PRInt32 count;
mGroupRule->StyleRuleCount(count);
*aLength = (PRUint32)count;
*aLength = (PRUint32)mGroupRule->StyleRuleCount();
} else {
*aLength = 0;
}
@ -149,22 +147,15 @@ GroupRuleRuleList::GetLength(PRUint32* aLength)
nsIDOMCSSRule*
GroupRuleRuleList::GetItemAt(PRUint32 aIndex, nsresult* aResult)
{
nsresult result = NS_OK;
*aResult = NS_OK;
if (mGroupRule) {
nsCOMPtr<nsICSSRule> rule;
result = mGroupRule->GetStyleRuleAt(aIndex, *getter_AddRefs(rule));
nsCOMPtr<nsICSSRule> rule = mGroupRule->GetStyleRuleAt(aIndex);
if (rule) {
return rule->GetDOMRuleWeak(aResult);
}
if (result == NS_ERROR_ILLEGAL_VALUE) {
result = NS_OK; // per spec: "Return Value ... null if ... not a valid index."
}
}
*aResult = result;
return nsnull;
}
@ -648,7 +639,7 @@ GroupRule::List(FILE* out, PRInt32 aIndent) const
}
#endif
NS_IMETHODIMP
void
GroupRule::AppendStyleRule(nsICSSRule* aRule)
{
mRules.AppendObject(aRule);
@ -659,29 +650,15 @@ GroupRule::AppendStyleRule(nsICSSRule* aRule)
// shouldn't |SetModified| be removed?
mSheet->SetModified(PR_TRUE);
}
return NS_OK;
}
NS_IMETHODIMP
GroupRule::StyleRuleCount(PRInt32& aCount) const
nsICSSRule*
GroupRule::GetStyleRuleAt(PRInt32 aIndex) const
{
aCount = mRules.Count();
return NS_OK;
return mRules.SafeObjectAt(aIndex);
}
NS_IMETHODIMP
GroupRule::GetStyleRuleAt(PRInt32 aIndex, nsICSSRule*& aRule) const
{
if (aIndex < 0 || aIndex >= mRules.Count()) {
aRule = nsnull;
return NS_ERROR_ILLEGAL_VALUE;
}
NS_ADDREF(aRule = mRules.ObjectAt(aIndex));
return NS_OK;
}
NS_IMETHODIMP_(PRBool)
PRBool
GroupRule::EnumerateRulesForwards(RuleEnumFunc aFunc, void * aData) const
{
return
@ -694,7 +671,7 @@ GroupRule::EnumerateRulesForwards(RuleEnumFunc aFunc, void * aData) const
* the parents tylesheet. After they are called, DidDirty() needs to
* be called on the sheet
*/
NS_IMETHODIMP
nsresult
GroupRule::DeleteStyleRuleAt(PRUint32 aIndex)
{
nsICSSRule* rule = mRules.SafeObjectAt(aIndex);
@ -705,7 +682,7 @@ GroupRule::DeleteStyleRuleAt(PRUint32 aIndex)
return mRules.RemoveObjectAt(aIndex) ? NS_OK : NS_ERROR_ILLEGAL_VALUE;
}
NS_IMETHODIMP
nsresult
GroupRule::InsertStyleRulesAt(PRUint32 aIndex,
nsCOMArray<nsICSSRule>& aRules)
{
@ -717,7 +694,7 @@ GroupRule::InsertStyleRulesAt(PRUint32 aIndex,
return NS_OK;
}
NS_IMETHODIMP
nsresult
GroupRule::ReplaceStyleRule(nsICSSRule* aOld, nsICSSRule* aNew)
{
PRInt32 index = mRules.IndexOf(aOld);
@ -754,13 +731,6 @@ GroupRule::AppendRulesToCssText(nsAString& aCssText)
return NS_OK;
}
nsresult
GroupRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
{
NS_IF_ADDREF(*aSheet = mSheet);
return NS_OK;
}
nsresult
GroupRule::GetParentRule(nsIDOMCSSRule** aParentRule)
{
@ -772,15 +742,14 @@ GroupRule::GetParentRule(nsIDOMCSSRule** aParentRule)
}
// nsIDOMCSSMediaRule or nsIDOMCSSMozDocumentRule methods
nsresult
GroupRule::GetCssRules(nsIDOMCSSRuleList* *aRuleList)
nsIDOMCSSRuleList*
GroupRule::GetCssRules()
{
if (!mRuleCollection) {
mRuleCollection = new css::GroupRuleRuleList(this);
}
NS_ADDREF(*aRuleList = mRuleCollection);
return NS_OK;
return mRuleCollection;
}
nsresult
@ -936,7 +905,8 @@ MediaRule::SetCssText(const nsAString& aCssText)
NS_IMETHODIMP
MediaRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
{
return GroupRule::GetParentStyleSheet(aSheet);
NS_IF_ADDREF(*aSheet = mSheet);
return NS_OK;
}
NS_IMETHODIMP
@ -957,7 +927,8 @@ MediaRule::GetMedia(nsIDOMMediaList* *aMedia)
NS_IMETHODIMP
MediaRule::GetCssRules(nsIDOMCSSRuleList* *aRuleList)
{
return GroupRule::GetCssRules(aRuleList);
NS_ADDREF(*aRuleList = GroupRule::GetCssRules());
return NS_OK;
}
NS_IMETHODIMP
@ -973,7 +944,7 @@ MediaRule::DeleteRule(PRUint32 aIndex)
}
// GroupRule interface
NS_IMETHODIMP_(PRBool)
/* virtual */ PRBool
MediaRule::UseForPresentation(nsPresContext* aPresContext,
nsMediaQueryResultCacheKey& aKey)
{
@ -1107,7 +1078,8 @@ DocumentRule::SetCssText(const nsAString& aCssText)
NS_IMETHODIMP
DocumentRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
{
return GroupRule::GetParentStyleSheet(aSheet);
NS_IF_ADDREF(*aSheet = mSheet);
return NS_OK;
}
NS_IMETHODIMP
@ -1119,7 +1091,8 @@ DocumentRule::GetParentRule(nsIDOMCSSRule** aParentRule)
NS_IMETHODIMP
DocumentRule::GetCssRules(nsIDOMCSSRuleList* *aRuleList)
{
return GroupRule::GetCssRules(aRuleList);
NS_ADDREF(*aRuleList = GroupRule::GetCssRules());
return NS_OK;
}
NS_IMETHODIMP
@ -1135,7 +1108,7 @@ DocumentRule::DeleteRule(PRUint32 aIndex)
}
// GroupRule interface
NS_IMETHODIMP_(PRBool)
/* virtual */ PRBool
DocumentRule::UseForPresentation(nsPresContext* aPresContext,
nsMediaQueryResultCacheKey& aKey)
{

12
layout/style/nsCSSRules.h
View File

@ -79,7 +79,7 @@ public:
virtual void SetStyleSheet(nsCSSStyleSheet* aSheet); //override GroupRule
virtual PRInt32 GetType() const;
virtual already_AddRefed<nsICSSRule> Clone() const;
nsIDOMCSSRule* GetDOMRuleWeak(nsresult *aResult)
virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult *aResult)
{
*aResult = NS_OK;
return this;
@ -92,8 +92,8 @@ public:
NS_DECL_NSIDOMCSSMEDIARULE
// rest of GroupRule
NS_IMETHOD_(PRBool) UseForPresentation(nsPresContext* aPresContext,
nsMediaQueryResultCacheKey& aKey);
virtual PRBool UseForPresentation(nsPresContext* aPresContext,
nsMediaQueryResultCacheKey& aKey);
// @media rule methods
nsresult SetMedia(nsMediaList* aMedia);
@ -122,7 +122,7 @@ public:
// nsICSSRule methods
virtual PRInt32 GetType() const;
virtual already_AddRefed<nsICSSRule> Clone() const;
nsIDOMCSSRule* GetDOMRuleWeak(nsresult *aResult)
virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult *aResult)
{
*aResult = NS_OK;
return this;
@ -135,8 +135,8 @@ public:
NS_DECL_NSIDOMCSSMOZDOCUMENTRULE
// rest of GroupRule
NS_IMETHOD_(PRBool) UseForPresentation(nsPresContext* aPresContext,
nsMediaQueryResultCacheKey& aKey);
virtual PRBool UseForPresentation(nsPresContext* aPresContext,
nsMediaQueryResultCacheKey& aKey);
enum Function {
eURL,

7
layout/style/nsCSSStyleSheet.cpp
View File

@ -1939,10 +1939,9 @@ nsCSSStyleSheet::DeleteRuleFromGroup(css::GroupRule* aGroup, PRUint32 aIndex)
NS_ENSURE_ARG_POINTER(aGroup);
NS_ASSERTION(mInner->mComplete, "No deleting from an incomplete sheet!");
nsresult result;
nsCOMPtr<nsICSSRule> rule;
result = aGroup->GetStyleRuleAt(aIndex, *getter_AddRefs(rule));
NS_ENSURE_SUCCESS(result, result);
nsCOMPtr<nsICSSRule> rule = aGroup->GetStyleRuleAt(aIndex);
NS_ENSURE_TRUE(rule, NS_ERROR_ILLEGAL_VALUE);
// check that the rule actually belongs to this sheet!
nsCOMPtr<nsIStyleSheet> ruleSheet = rule->GetStyleSheet();
if (this != ruleSheet) {