| Index: Source/platform/fonts/SimpleFontData.cpp
|
| diff --git a/Source/platform/fonts/SimpleFontData.cpp b/Source/platform/fonts/SimpleFontData.cpp
|
| index 1b957da27c724884661798f12030d76c72bbaa2d..e66f21508dea45a7079777535f045babe6a3894b 100644
|
| --- a/Source/platform/fonts/SimpleFontData.cpp
|
| +++ b/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()
|
|
|