Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / fonts / SimpleFontData.cpp

diff --git a/src/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp b/src/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp
index 1b957da..83c4cc5 100644 (file)
--- a/src/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp
+++ b/src/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp
@@ -32,8 +32,6 @@
 
 #include "wtf/MathExtras.h"
 
-using namespace std;
-
 namespace blink {
 
 const float smallCapsFontSizeMultiplier = 0.7f;
@@ -96,7 +94,7 @@ void SimpleFontData::initCharWidths()
         m_avgCharWidth = m_fontMetrics.xHeight();
 
     if (m_maxCharWidth <= 0.f)
-        m_maxCharWidth = max(m_avgCharWidth, m_fontMetrics.floatAscent());
+        m_maxCharWidth = std::max(m_avgCharWidth, m_fontMetrics.floatAscent());
 }
 
 void SimpleFontData::platformGlyphInit()
@@ -220,18 +218,6 @@ PassRefPtr<SimpleFontData> SimpleFontData::brokenIdeographFontData() const
     return m_derivedFontData->brokenIdeograph;
 }
 
-#ifndef NDEBUG
-String SimpleFontData::description() const
-{
-    if (isSVGFont())
-        return "[SVG font]";
-    if (isCustomFont())
-        return "[custom font]";
-
-    return platformData().description();
-}
-#endif
-
 PassOwnPtr<SimpleFontData::DerivedFontData> SimpleFontData::DerivedFontData::create(bool forCustomFont)
 {
     return adoptPtr(new DerivedFontData(forCustomFont));