| Index: third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.h
|
| diff --git a/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.h b/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.h
|
| index c651de87525e0a277efb22486c1acbba93798f76..fa954d358a727c25d034bbc0a0f4be7676dcd711 100644
|
| --- a/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.h
|
| +++ b/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.h
|
| @@ -72,7 +72,7 @@ protected:
|
| public:
|
| StyleResolverUpdateType styleResolverUpdateType;
|
| bool requiresFullStyleRecalc;
|
| - WillBeHeapVector<RawPtrWillBeMember<const StyleRuleFontFace>> fontFaceRulesToRemove;
|
| + HeapVector<Member<const StyleRuleFontFace>> fontFaceRulesToRemove;
|
|
|
| StyleSheetChange()
|
| : styleResolverUpdateType(Reconstruct)
|
| @@ -82,13 +82,13 @@ protected:
|
| void analyzeStyleSheetChange(StyleResolverUpdateMode, const StyleSheetCollection&, StyleSheetChange&);
|
|
|
| private:
|
| - static StyleResolverUpdateType compareStyleSheets(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& oldStyleSheets, const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& newStylesheets, WillBeHeapVector<RawPtrWillBeMember<StyleSheetContents>>& addedSheets);
|
| - bool activeLoadingStyleSheetLoaded(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& newStyleSheets);
|
| + static StyleResolverUpdateType compareStyleSheets(const HeapVector<Member<CSSStyleSheet>>& oldStyleSheets, const HeapVector<Member<CSSStyleSheet>>& newStylesheets, HeapVector<Member<StyleSheetContents>>& addedSheets);
|
| + bool activeLoadingStyleSheetLoaded(const HeapVector<Member<CSSStyleSheet>>& newStyleSheets);
|
|
|
| friend class TreeScopeStyleSheetCollectionTest;
|
|
|
| protected:
|
| - RawPtrWillBeMember<TreeScope> m_treeScope;
|
| + Member<TreeScope> m_treeScope;
|
| bool m_hadActiveLoadingStylesheet;
|
|
|
| DocumentOrderedList m_styleSheetCandidateNodes;
|
|
|