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: |