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

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

Issue 719833002: Clean up virtual functions in css/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove some changes Created 6 years, 1 month 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 void unregisterForInvalidationCallbacks(CSSFontSelectorClient*); 69 void unregisterForInvalidationCallbacks(CSSFontSelectorClient*);
70 #endif 70 #endif
71 71
72 Document* document() const { return m_document; } 72 Document* document() const { return m_document; }
73 FontFaceCache* fontFaceCache() { return &m_fontFaceCache; } 73 FontFaceCache* fontFaceCache() { return &m_fontFaceCache; }
74 FontLoader* fontLoader() { return m_fontLoader.get(); } 74 FontLoader* fontLoader() { return m_fontLoader.get(); }
75 75
76 const GenericFontFamilySettings& genericFontFamilySettings() const { return m_genericFontFamilySettings; } 76 const GenericFontFamilySettings& genericFontFamilySettings() const { return m_genericFontFamilySettings; }
77 void updateGenericFontFamilySettings(Document&); 77 void updateGenericFontFamilySettings(Document&);
78 78
79 virtual void trace(Visitor*); 79 virtual void trace(Visitor*) override;
80 80
81 private: 81 private:
82 explicit CSSFontSelector(Document*); 82 explicit CSSFontSelector(Document*);
83 83
84 void dispatchInvalidationCallbacks(); 84 void dispatchInvalidationCallbacks();
85 85
86 // FIXME: Oilpan: Ideally this should just be a traced Member but that will 86 // FIXME: Oilpan: Ideally this should just be a traced Member but that will
87 // currently leak because RenderStyle and its data are not on the heap. 87 // currently leak because RenderStyle and its data are not on the heap.
88 // See crbug.com/383860 for details. 88 // See crbug.com/383860 for details.
89 RawPtrWillBeWeakMember<Document> m_document; 89 RawPtrWillBeWeakMember<Document> m_document;
90 // FIXME: Move to Document or StyleEngine. 90 // FIXME: Move to Document or StyleEngine.
91 FontFaceCache m_fontFaceCache; 91 FontFaceCache m_fontFaceCache;
92 WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient> > m_clients; 92 WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient> > m_clients;
93 93
94 RefPtrWillBeMember<FontLoader> m_fontLoader; 94 RefPtrWillBeMember<FontLoader> m_fontLoader;
95 GenericFontFamilySettings m_genericFontFamilySettings; 95 GenericFontFamilySettings m_genericFontFamilySettings;
96 }; 96 };
97 97
98 } // namespace blink 98 } // namespace blink
99 99
100 #endif // CSSFontSelector_h 100 #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