Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(664)

Unified Diff: Source/core/dom/TreeScopeStyleSheetCollection.h

Issue 180003002: Consistently use on-heap collections for StyleRuleBase descendants. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/dom/TreeScopeStyleSheetCollection.h
diff --git a/Source/core/dom/TreeScopeStyleSheetCollection.h b/Source/core/dom/TreeScopeStyleSheetCollection.h
index 6d24219c119b43ee0323e5406bd641f172dd51b8..8f9b7894c7beceb680821d090747e7106661c509 100644
--- a/Source/core/dom/TreeScopeStyleSheetCollection.h
+++ b/Source/core/dom/TreeScopeStyleSheetCollection.h
@@ -79,11 +79,14 @@ protected:
struct StyleSheetChange {
StyleResolverUpdateType styleResolverUpdateType;
bool requiresFullStyleRecalc;
- Vector<const StyleRuleFontFace*> fontFaceRulesToRemove;
+ WillBeHeapVector<RawPtrWillBeMember<const StyleRuleFontFace> > fontFaceRulesToRemove;
StyleSheetChange()
: styleResolverUpdateType(Reconstruct)
, requiresFullStyleRecalc(true) { }
+ private:
+ // FIXME: oilpan: This should be STACK_ALLOCATED.
+ DISALLOW_ALLOCATION();
haraken 2014/02/26 02:20:13 Let's put this at the head of the struct. Probabl
Erik Corry 2014/02/26 13:01:28 Classes normally start off private, so it would be
Vyacheslav Egorov (Chromium) 2014/02/26 13:12:24 Done.
};
void analyzeStyleSheetChange(StyleResolverUpdateMode, const StyleSheetCollection&, StyleSheetChange&);
@@ -91,7 +94,7 @@ protected:
void updateUsesRemUnits();
private:
- static StyleResolverUpdateType compareStyleSheets(const Vector<RefPtr<CSSStyleSheet> >& oldStyleSheets, const Vector<RefPtr<CSSStyleSheet> >& newStylesheets, Vector<StyleSheetContents*>& addedSheets);
+ static StyleResolverUpdateType compareStyleSheets(const Vector<RefPtr<CSSStyleSheet> >& oldStyleSheets, const Vector<RefPtr<CSSStyleSheet> >& newStylesheets, WillBeHeapVector<RawPtrWillBeMember<StyleSheetContents> >& addedSheets);
bool activeLoadingStyleSheetLoaded(const Vector<RefPtr<CSSStyleSheet> >& newStyleSheets);
protected:

Powered by Google App Engine
This is Rietveld 408576698