Index: Source/core/rendering/FastTextAutosizer.cpp |
diff --git a/Source/core/rendering/FastTextAutosizer.cpp b/Source/core/rendering/FastTextAutosizer.cpp |
index 43ec0362bf6e1ffaef460b61e4ca14a5b1d08fea..ad04628bc4b68a8d0a6dafa33670768799285820 100644 |
--- a/Source/core/rendering/FastTextAutosizer.cpp |
+++ b/Source/core/rendering/FastTextAutosizer.cpp |
@@ -48,8 +48,6 @@ |
#include "core/dom/ExecutionContextTask.h" |
#endif |
-using namespace std; |
- |
namespace WebCore { |
#ifdef AUTOSIZING_DOM_DEBUG_INFO |
@@ -862,9 +860,9 @@ float FastTextAutosizer::multiplierFromBlock(const RenderBlock* block) |
// Block width, in CSS pixels. |
float blockWidth = widthFromBlock(block); |
- float multiplier = m_pageInfo.m_frameWidth ? min(blockWidth, static_cast<float>(m_pageInfo.m_layoutWidth)) / m_pageInfo.m_frameWidth : 1.0f; |
+ float multiplier = m_pageInfo.m_frameWidth ? std::min(blockWidth, static_cast<float>(m_pageInfo.m_layoutWidth)) / m_pageInfo.m_frameWidth : 1.0f; |
- return max(m_pageInfo.m_baseMultiplier * multiplier, 1.0f); |
+ return std::max(m_pageInfo.m_baseMultiplier * multiplier, 1.0f); |
} |
const RenderBlock* FastTextAutosizer::deepestBlockContainingAllText(Cluster* cluster) |