| Index: Source/core/dom/StyleEngine.h
|
| diff --git a/Source/core/dom/StyleEngine.h b/Source/core/dom/StyleEngine.h
|
| index 18eb3744e0f42249ecd4b9c3ffbf021ec6d1cc92..252bc6f78d7c53c3135a24d63866c588d8424949 100644
|
| --- a/Source/core/dom/StyleEngine.h
|
| +++ b/Source/core/dom/StyleEngine.h
|
| @@ -74,13 +74,13 @@ public:
|
| void detachFromDocument();
|
| #endif
|
|
|
| - const WillBeHeapVector<RefPtrWillBeMember<StyleSheet> >& styleSheetsForStyleSheetList(TreeScope&);
|
| - const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& activeAuthorStyleSheets() const;
|
| + const WillBeHeapVector<RefPtrWillBeMember<StyleSheet>>& styleSheetsForStyleSheetList(TreeScope&);
|
| + const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& activeAuthorStyleSheets() const;
|
|
|
| - const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& documentAuthorStyleSheets() const { return m_authorStyleSheets; }
|
| - const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& injectedAuthorStyleSheets() const;
|
| + const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& documentAuthorStyleSheets() const { return m_authorStyleSheets; }
|
| + const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& injectedAuthorStyleSheets() const;
|
|
|
| - const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> > activeStyleSheetsForInspector() const;
|
| + const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>> activeStyleSheetsForInspector() const;
|
|
|
| void modifiedStyleSheet(StyleSheet*);
|
| void addStyleSheetCandidateNode(Node*, bool createdByParser);
|
| @@ -157,7 +157,7 @@ public:
|
| CSSFontSelector* fontSelector() { return m_fontSelector.get(); }
|
| void setFontSelector(PassRefPtrWillBeRawPtr<CSSFontSelector>);
|
|
|
| - void removeFontFaceRules(const WillBeHeapVector<RawPtrWillBeMember<const StyleRuleFontFace> >&);
|
| + void removeFontFaceRules(const WillBeHeapVector<RawPtrWillBeMember<const StyleRuleFontFace>>&);
|
| void clearFontCache();
|
| // updateGenericFontFamilySettings is used from WebSettingsImpl.
|
| void updateGenericFontFamilySettings();
|
| @@ -267,14 +267,14 @@ private:
|
| // elements and when it is safe to execute scripts.
|
| int m_pendingStylesheets;
|
|
|
| - mutable WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> > m_injectedAuthorStyleSheets;
|
| + mutable WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>> m_injectedAuthorStyleSheets;
|
| mutable bool m_injectedStyleSheetCacheValid;
|
|
|
| - WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> > m_authorStyleSheets;
|
| + WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>> m_authorStyleSheets;
|
|
|
| OwnPtrWillBeMember<DocumentStyleSheetCollection> m_documentStyleSheetCollection;
|
|
|
| - typedef WillBeHeapHashMap<RawPtrWillBeWeakMember<TreeScope>, OwnPtrWillBeMember<ShadowTreeStyleSheetCollection> > StyleSheetCollectionMap;
|
| + typedef WillBeHeapHashMap<RawPtrWillBeWeakMember<TreeScope>, OwnPtrWillBeMember<ShadowTreeStyleSheetCollection>> StyleSheetCollectionMap;
|
| StyleSheetCollectionMap m_styleSheetCollectionMap;
|
|
|
| bool m_documentScopeDirty;
|
| @@ -297,7 +297,7 @@ private:
|
|
|
| RefPtrWillBeMember<CSSFontSelector> m_fontSelector;
|
|
|
| - WillBeHeapHashMap<AtomicString, RawPtrWillBeMember<StyleSheetContents> > m_textToSheetCache;
|
| + WillBeHeapHashMap<AtomicString, RawPtrWillBeMember<StyleSheetContents>> m_textToSheetCache;
|
| WillBeHeapHashMap<RawPtrWillBeMember<StyleSheetContents>, AtomicString> m_sheetToTextCache;
|
| };
|
|
|
|
|