diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/third_party/WebKit/Source/core/css/CSSCustomFontData.h | |
parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/css/CSSCustomFontData.h')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/css/CSSCustomFontData.h | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/chromium/third_party/WebKit/Source/core/css/CSSCustomFontData.h b/chromium/third_party/WebKit/Source/core/css/CSSCustomFontData.h index 9436927cabb..ec2bb6dc885 100644 --- a/chromium/third_party/WebKit/Source/core/css/CSSCustomFontData.h +++ b/chromium/third_party/WebKit/Source/core/css/CSSCustomFontData.h @@ -28,32 +28,45 @@ namespace WebCore { class CSSCustomFontData FINAL : public CustomFontData { public: - static PassRefPtr<CSSCustomFontData> create(bool isLoadingFallback = false) + enum FallbackVisibility { InvisibleFallback, VisibleFallback }; + + static PassRefPtr<CSSCustomFontData> create(RemoteFontFaceSource* source, FallbackVisibility visibility) { - return adoptRef(new CSSCustomFontData(isLoadingFallback)); + return adoptRef(new CSSCustomFontData(source, visibility)); } virtual ~CSSCustomFontData() { } + virtual bool shouldSkipDrawing() const OVERRIDE + { + if (m_fontFaceSource) + m_fontFaceSource->paintRequested(); + return m_fallbackVisibility == InvisibleFallback && m_isUsed; + } + virtual void beginLoadIfNeeded() const OVERRIDE { - if (!m_isUsed && m_isLoadingFallback && m_fontFaceSource) { + if (!m_isUsed && m_fontFaceSource) { m_isUsed = true; m_fontFaceSource->beginLoadIfNeeded(); } } - virtual void setCSSFontFaceSource(CSSFontFaceSource* source) OVERRIDE { m_fontFaceSource = source; } - virtual void clearCSSFontFaceSource() OVERRIDE { m_fontFaceSource = 0; } + virtual bool isLoading() const OVERRIDE { return m_isUsed; } + virtual bool isLoadingFallback() const OVERRIDE { return true; } + virtual void clearFontFaceSource() OVERRIDE { m_fontFaceSource = 0; } private: - CSSCustomFontData(bool isLoadingFallback) - : CustomFontData(isLoadingFallback) - , m_fontFaceSource(0) + CSSCustomFontData(RemoteFontFaceSource* source, FallbackVisibility visibility) + : m_fontFaceSource(source) + , m_fallbackVisibility(visibility) + , m_isUsed(false) { } - CSSFontFaceSource* m_fontFaceSource; + RemoteFontFaceSource* m_fontFaceSource; + FallbackVisibility m_fallbackVisibility; + mutable bool m_isUsed; }; } |