Index: third_party/WebKit/Source/core/css/CSSFontFace.h |
diff --git a/third_party/WebKit/Source/core/css/CSSFontFace.h b/third_party/WebKit/Source/core/css/CSSFontFace.h |
index 8d217faa73d6c46b1b4d6412aaa6cb7890038af5..676f3f4920155aa161620b2f46473a5a1bc7a300 100644 |
--- a/third_party/WebKit/Source/core/css/CSSFontFace.h |
+++ b/third_party/WebKit/Source/core/css/CSSFontFace.h |
@@ -51,7 +51,8 @@ class CORE_EXPORT CSSFontFace final |
CSSFontFace(FontFace* fontFace, Vector<UnicodeRange>& ranges) |
: m_ranges(adoptRef(new UnicodeRangeSet(ranges))), |
m_segmentedFontFace(nullptr), |
- m_fontFace(fontFace) { |
+ m_fontFace(fontFace), |
+ m_loadStatus(FontFace::Unloaded) { |
ASSERT(m_fontFace); |
} |
@@ -73,25 +74,25 @@ class CORE_EXPORT CSSFontFace final |
PassRefPtr<SimpleFontData> getFontData(const FontDescription&); |
- FontFace::LoadStatusType loadStatus() const { |
- return m_fontFace->loadStatus(); |
- } |
+ FontFace::LoadStatusType loadStatus() const { return m_loadStatus; } |
bool maybeLoadFont(const FontDescription&, const String&); |
bool maybeLoadFont(const FontDescription&, const FontDataForRangeSet&); |
void load(); |
void load(const FontDescription&); |
+ void setLoadStatus(FontFace::LoadStatusType); |
bool hadBlankText() { return isValid() && m_sources.first()->hadBlankText(); } |
DECLARE_TRACE(); |
private: |
- void setLoadStatus(FontFace::LoadStatusType); |
+ void setLoadStatusHelper(FontFace::LoadStatusType); |
RefPtr<UnicodeRangeSet> m_ranges; |
Member<CSSSegmentedFontFace> m_segmentedFontFace; |
HeapDeque<Member<CSSFontFaceSource>> m_sources; |
Member<FontFace> m_fontFace; |
+ FontFace::LoadStatusType m_loadStatus; |
}; |
} // namespace blink |