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

Side by Side Diff: Source/core/css/CSSFontSelector.h

Issue 129063002: Update CSS classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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 unified diff | Download patch
« no previous file with comments | « Source/core/css/CSSFontFaceSource.h ('k') | Source/core/css/CSSImportRule.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 void clearResourceFetcher(); 55 void clearResourceFetcher();
56 56
57 private: 57 private:
58 void beginLoadTimerFired(Timer<FontLoader>*); 58 void beginLoadTimerFired(Timer<FontLoader>*);
59 59
60 Timer<FontLoader> m_beginLoadingTimer; 60 Timer<FontLoader> m_beginLoadingTimer;
61 Vector<ResourcePtr<FontResource> > m_fontsToBeginLoading; 61 Vector<ResourcePtr<FontResource> > m_fontsToBeginLoading;
62 ResourceFetcher* m_resourceFetcher; 62 ResourceFetcher* m_resourceFetcher;
63 }; 63 };
64 64
65 class CSSFontSelector : public FontSelector { 65 class CSSFontSelector FINAL : public FontSelector {
66 public: 66 public:
67 static PassRefPtr<CSSFontSelector> create(Document* document) 67 static PassRefPtr<CSSFontSelector> create(Document* document)
68 { 68 {
69 return adoptRef(new CSSFontSelector(document)); 69 return adoptRef(new CSSFontSelector(document));
70 } 70 }
71 virtual ~CSSFontSelector(); 71 virtual ~CSSFontSelector();
72 72
73 virtual unsigned version() const OVERRIDE { return m_cssSegmentedFontFaceCac he.version(); } 73 virtual unsigned version() const OVERRIDE { return m_cssSegmentedFontFaceCac he.version(); }
74 74
75 virtual PassRefPtr<FontData> getFontData(const FontDescription&, const Atomi cString&); 75 virtual PassRefPtr<FontData> getFontData(const FontDescription&, const Atomi cString&) OVERRIDE;
76 CSSSegmentedFontFace* getFontFace(const FontDescription&, const AtomicString & family); 76 CSSSegmentedFontFace* getFontFace(const FontDescription&, const AtomicString & family);
77 virtual void willUseFontData(const FontDescription&, const AtomicString& fam ily) OVERRIDE; 77 virtual void willUseFontData(const FontDescription&, const AtomicString& fam ily) OVERRIDE;
78 78
79 void clearDocument(); 79 void clearDocument();
80 80
81 void addFontFaceRule(const StyleRuleFontFace*, PassRefPtr<CSSFontFace>); 81 void addFontFaceRule(const StyleRuleFontFace*, PassRefPtr<CSSFontFace>);
82 void removeFontFaceRule(const StyleRuleFontFace*); 82 void removeFontFaceRule(const StyleRuleFontFace*);
83 83
84 void fontLoaded(); 84 void fontLoaded();
85 virtual void fontCacheInvalidated(); 85 virtual void fontCacheInvalidated() OVERRIDE;
86 86
87 virtual void registerForInvalidationCallbacks(FontSelectorClient*); 87 virtual void registerForInvalidationCallbacks(FontSelectorClient*) OVERRIDE;
88 virtual void unregisterForInvalidationCallbacks(FontSelectorClient*); 88 virtual void unregisterForInvalidationCallbacks(FontSelectorClient*) OVERRID E;
89 89
90 Document* document() const { return m_document; } 90 Document* document() const { return m_document; }
91 91
92 const GenericFontFamilySettings& genericFontFamilySettings() const { return m_genericFontFamilySettings; } 92 const GenericFontFamilySettings& genericFontFamilySettings() const { return m_genericFontFamilySettings; }
93 93
94 void beginLoadingFontSoon(FontResource*); 94 void beginLoadingFontSoon(FontResource*);
95 void loadPendingFonts(); 95 void loadPendingFonts();
96 96
97 private: 97 private:
98 explicit CSSFontSelector(Document*); 98 explicit CSSFontSelector(Document*);
99 99
100 void dispatchInvalidationCallbacks(); 100 void dispatchInvalidationCallbacks();
101 101
102 Document* m_document; 102 Document* m_document;
103 // FIXME: Move to Document or StyleEngine. 103 // FIXME: Move to Document or StyleEngine.
104 CSSSegmentedFontFaceCache m_cssSegmentedFontFaceCache; 104 CSSSegmentedFontFaceCache m_cssSegmentedFontFaceCache;
105 HashSet<FontSelectorClient*> m_clients; 105 HashSet<FontSelectorClient*> m_clients;
106 106
107 FontLoader m_fontLoader; 107 FontLoader m_fontLoader;
108 GenericFontFamilySettings m_genericFontFamilySettings; 108 GenericFontFamilySettings m_genericFontFamilySettings;
109 }; 109 };
110 110
111 } // namespace WebCore 111 } // namespace WebCore
112 112
113 #endif // CSSFontSelector_h 113 #endif // CSSFontSelector_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSFontFaceSource.h ('k') | Source/core/css/CSSImportRule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698