corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 923251 - Part c: Make nsCSSStyleSheet::AppendAllChildSheets return void; r=heycam

Browse Source
This commit is contained in:
Ms2ger
2013-11-11 08:59:58 +01:00
parent f434b7976a
commit 970dcfe12f
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
layout/style/nsCSSStyleSheet.cpp
View File

@@ -1528,17 +1528,14 @@ nsCSSStyleSheet::EnsureUniqueInner()
return eUniqueInner_ClonedInner; return eUniqueInner_ClonedInner;
} }
bool void
nsCSSStyleSheet::AppendAllChildSheets(nsTArray<nsCSSStyleSheet*>& aArray) nsCSSStyleSheet::AppendAllChildSheets(nsTArray<nsCSSStyleSheet*>& aArray)
{ {
for (nsCSSStyleSheet* child = mInner->mFirstChild; child; for (nsCSSStyleSheet* child = mInner->mFirstChild; child;
child = child->mNext) { child = child->mNext) {
if (!aArray.AppendElement(child)) { aArray.AppendElement(child);
return false;
} }
} }
return true;
}
already_AddRefed<nsCSSStyleSheet> already_AddRefed<nsCSSStyleSheet>
nsCSSStyleSheet::Clone(nsCSSStyleSheet* aCloneParent, nsCSSStyleSheet::Clone(nsCSSStyleSheet* aCloneParent,

5
layout/style/nsCSSStyleSheet.h
View File

@@ -225,9 +225,8 @@ public:
}; };
EnsureUniqueInnerResult EnsureUniqueInner(); EnsureUniqueInnerResult EnsureUniqueInner();
// Append all of this sheet's child sheets to aArray. Return true // Append all of this sheet's child sheets to aArray.
// on success and false on allocation failure. void AppendAllChildSheets(nsTArray<nsCSSStyleSheet*>& aArray);
bool AppendAllChildSheets(nsTArray<nsCSSStyleSheet*>& aArray);
bool UseForPresentation(nsPresContext* aPresContext, bool UseForPresentation(nsPresContext* aPresContext,
nsMediaQueryResultCacheKey& aKey) const; nsMediaQueryResultCacheKey& aKey) const;

4
layout/style/nsStyleSet.cpp
View File

@@ -2026,9 +2026,7 @@ nsStyleSet::EnsureUniqueInnerOnCSSSheets()
} }
// Enqueue all the sheet's children. // Enqueue all the sheet's children.
if (!sheet->AppendAllChildSheets(queue)) { sheet->AppendAllChildSheets(queue);
return nsCSSStyleSheet::eUniqueInner_CloneFailed;
}
} }
return res; return res;
} }