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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/FontFallbackList.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) 2006, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 private: 61 private:
62 FontFallbackList& m_fallbackList; 62 FontFallbackList& m_fallbackList;
63 GlyphPages& m_pages; 63 GlyphPages& m_pages;
64 GlyphPageTreeNodeBase* m_pageZero; 64 GlyphPageTreeNodeBase* m_pageZero;
65 }; 65 };
66 66
67 static PassRefPtr<FontFallbackList> create() { return adoptRef(new FontFallb ackList()); } 67 static PassRefPtr<FontFallbackList> create() { return adoptRef(new FontFallb ackList()); }
68 68
69 ~FontFallbackList() { releaseFontData(); } 69 ~FontFallbackList() { releaseFontData(); }
70 bool isValid() const; 70 bool isValid() const;
71 void invalidate(PassRefPtrWillBeRawPtr<FontSelector>); 71 void invalidate(RawPtr<FontSelector>);
72 72
73 bool loadingCustomFonts() const; 73 bool loadingCustomFonts() const;
74 bool shouldSkipDrawing() const; 74 bool shouldSkipDrawing() const;
75 75
76 FontSelector* getFontSelector() const { return m_fontSelector.get(); } 76 FontSelector* getFontSelector() const { return m_fontSelector.get(); }
77 // FIXME: It should be possible to combine fontSelectorVersion and generatio n. 77 // FIXME: It should be possible to combine fontSelectorVersion and generatio n.
78 unsigned fontSelectorVersion() const { return m_fontSelectorVersion; } 78 unsigned fontSelectorVersion() const { return m_fontSelectorVersion; }
79 unsigned generation() const { return m_generation; } 79 unsigned generation() const { return m_generation; }
80 80
81 ShapeCache* shapeCache(const FontDescription& fontDescription) const 81 ShapeCache* shapeCache(const FontDescription& fontDescription) const
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 PassRefPtr<FontData> getFontData(const FontDescription&, int& familyIndex) c onst; 122 PassRefPtr<FontData> getFontData(const FontDescription&, int& familyIndex) c onst;
123 123
124 const SimpleFontData* determinePrimarySimpleFontData(const FontDescription&) const; 124 const SimpleFontData* determinePrimarySimpleFontData(const FontDescription&) const;
125 125
126 void releaseFontData(); 126 void releaseFontData();
127 127
128 mutable Vector<RefPtr<FontData>, 1> m_fontList; 128 mutable Vector<RefPtr<FontData>, 1> m_fontList;
129 GlyphPages m_pages; 129 GlyphPages m_pages;
130 GlyphPageTreeNodeBase* m_pageZero; 130 GlyphPageTreeNodeBase* m_pageZero;
131 mutable const SimpleFontData* m_cachedPrimarySimpleFontData; 131 mutable const SimpleFontData* m_cachedPrimarySimpleFontData;
132 RefPtrWillBePersistent<FontSelector> m_fontSelector; 132 Persistent<FontSelector> m_fontSelector;
133 unsigned m_fontSelectorVersion; 133 unsigned m_fontSelectorVersion;
134 mutable int m_familyIndex; 134 mutable int m_familyIndex;
135 unsigned short m_generation; 135 unsigned short m_generation;
136 mutable bool m_hasLoadingFallback : 1; 136 mutable bool m_hasLoadingFallback : 1;
137 mutable WeakPtr<ShapeCache> m_shapeCache; 137 mutable WeakPtr<ShapeCache> m_shapeCache;
138 }; 138 };
139 139
140 } // namespace blink 140 } // namespace blink
141 141
142 #endif 142 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698