Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / CSSCustomFontData.h

diff --git a/src/third_party/WebKit/Source/core/css/CSSCustomFontData.h b/src/third_party/WebKit/Source/core/css/CSSCustomFontData.h
index ec2bb6d..d674c07 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/CSSCustomFontData.h
+++ b/src/third_party/WebKit/Source/core/css/CSSCustomFontData.h
@@ -24,7 +24,7 @@
 #include "core/css/CSSFontFaceSource.h"
 #include "platform/fonts/CustomFontData.h"
 
-namespace WebCore {
+namespace blink {
 
 class CSSCustomFontData FINAL : public CustomFontData {
 public:
@@ -41,18 +41,18 @@ public:
     {
         if (m_fontFaceSource)
             m_fontFaceSource->paintRequested();
-        return m_fallbackVisibility == InvisibleFallback && m_isUsed;
+        return m_fallbackVisibility == InvisibleFallback && m_isLoading;
     }
 
     virtual void beginLoadIfNeeded() const OVERRIDE
     {
-        if (!m_isUsed && m_fontFaceSource) {
-            m_isUsed = true;
+        if (!m_isLoading && m_fontFaceSource) {
+            m_isLoading = true;
             m_fontFaceSource->beginLoadIfNeeded();
         }
     }
 
-    virtual bool isLoading() const OVERRIDE { return m_isUsed; }
+    virtual bool isLoading() const OVERRIDE { return m_isLoading; }
     virtual bool isLoadingFallback() const OVERRIDE { return true; }
     virtual void clearFontFaceSource() OVERRIDE { m_fontFaceSource = 0; }
 
@@ -60,13 +60,15 @@ private:
     CSSCustomFontData(RemoteFontFaceSource* source, FallbackVisibility visibility)
         : m_fontFaceSource(source)
         , m_fallbackVisibility(visibility)
-        , m_isUsed(false)
+        , m_isLoading(false)
     {
+        if (source)
+            m_isLoading = source->isLoading();
     }
 
     RemoteFontFaceSource* m_fontFaceSource;
     FallbackVisibility m_fallbackVisibility;
-    mutable bool m_isUsed;
+    mutable bool m_isLoading;
 };
 
 }