Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / fonts / SegmentedFontData.h

diff --git a/src/third_party/WebKit/Source/platform/fonts/SegmentedFontData.h b/src/third_party/WebKit/Source/platform/fonts/SegmentedFontData.h
index 73f3645..a48ec67 100644 (file)
--- a/src/third_party/WebKit/Source/platform/fonts/SegmentedFontData.h
+++ b/src/third_party/WebKit/Source/platform/fonts/SegmentedFontData.h
@@ -30,7 +30,7 @@
 #include "platform/fonts/FontData.h"
 #include "wtf/Vector.h"
 
-namespace WebCore {
+namespace blink {
 
 class SimpleFontData;
 
@@ -64,10 +64,6 @@ public:
     const FontDataRange& rangeAt(unsigned i) const { return m_ranges[i]; }
     bool containsCharacter(UChar32) const;
 
-#ifndef NDEBUG
-    virtual String description() const OVERRIDE;
-#endif
-
 private:
     SegmentedFontData() { }
 
@@ -77,12 +73,13 @@ private:
     virtual bool isLoading() const OVERRIDE;
     virtual bool isLoadingFallback() const OVERRIDE;
     virtual bool isSegmented() const OVERRIDE;
+    virtual bool shouldSkipDrawing() const OVERRIDE;
 
     Vector<FontDataRange, 1> m_ranges;
 };
 
-DEFINE_TYPE_CASTS(SegmentedFontData, FontData, fontData, fontData->isSegmented(), fontData.isSegmented());
+DEFINE_FONT_DATA_TYPE_CASTS(SegmentedFontData, true);
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // SegmentedFontData_h