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

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
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 26 matching lines...) Expand all
37 #include "wtf/HashSet.h" 37 #include "wtf/HashSet.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 class CSSFontSelectorClient; 41 class CSSFontSelectorClient;
42 class Document; 42 class Document;
43 class FontDescription; 43 class FontDescription;
44 44
45 class CORE_EXPORT CSSFontSelector : public FontSelector { 45 class CORE_EXPORT CSSFontSelector : public FontSelector {
46 public: 46 public:
47 static PassRefPtrWillBeRawPtr<CSSFontSelector> create(Document* document) 47 static RawPtr<CSSFontSelector> create(Document* document)
48 { 48 {
49 return adoptRefWillBeNoop(new CSSFontSelector(document)); 49 return new CSSFontSelector(document);
50 } 50 }
51 ~CSSFontSelector() override; 51 ~CSSFontSelector() override;
52 52
53 unsigned version() const override { return m_fontFaceCache.version(); } 53 unsigned version() const override { return m_fontFaceCache.version(); }
54 54
55 PassRefPtr<FontData> getFontData(const FontDescription&, const AtomicString& ) override; 55 PassRefPtr<FontData> getFontData(const FontDescription&, const AtomicString& ) override;
56 void willUseFontData(const FontDescription&, const AtomicString& family, UCh ar32) override; 56 void willUseFontData(const FontDescription&, const AtomicString& family, UCh ar32) override;
57 void willUseRange(const FontDescription&, const AtomicString& familyName, co nst FontDataForRangeSet&) override; 57 void willUseRange(const FontDescription&, const AtomicString& familyName, co nst FontDataForRangeSet&) override;
58 bool isPlatformFontAvailable(const FontDescription&, const AtomicString& fam ily); 58 bool isPlatformFontAvailable(const FontDescription&, const AtomicString& fam ily);
59 59
(...skipping 22 matching lines...) Expand all
82 82
83 protected: 83 protected:
84 explicit CSSFontSelector(Document*); 84 explicit CSSFontSelector(Document*);
85 85
86 void dispatchInvalidationCallbacks(); 86 void dispatchInvalidationCallbacks();
87 87
88 private: 88 private:
89 // FIXME: Oilpan: Ideally this should just be a traced Member but that will 89 // FIXME: Oilpan: Ideally this should just be a traced Member but that will
90 // currently leak because ComputedStyle and its data are not on the heap. 90 // currently leak because ComputedStyle and its data are not on the heap.
91 // See crbug.com/383860 for details. 91 // See crbug.com/383860 for details.
92 RawPtrWillBeWeakMember<Document> m_document; 92 WeakMember<Document> m_document;
93 // FIXME: Move to Document or StyleEngine. 93 // FIXME: Move to Document or StyleEngine.
94 FontFaceCache m_fontFaceCache; 94 FontFaceCache m_fontFaceCache;
95 WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient>> m_clients; 95 HeapHashSet<WeakMember<CSSFontSelectorClient>> m_clients;
96 96
97 RefPtrWillBeMember<FontLoader> m_fontLoader; 97 Member<FontLoader> m_fontLoader;
98 GenericFontFamilySettings m_genericFontFamilySettings; 98 GenericFontFamilySettings m_genericFontFamilySettings;
99 }; 99 };
100 100
101 } // namespace blink 101 } // namespace blink
102 102
103 #endif // CSSFontSelector_h 103 #endif // CSSFontSelector_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSFontFeatureValue.h ('k') | third_party/WebKit/Source/core/css/CSSFontSelector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698