Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(865)

Unified Diff: Source/core/rendering/FastTextAutosizer.cpp

Issue 339333002: Removing using declarations that import names in the C++ Standard library. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixing mac error Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/AutoTableLayout.cpp ('k') | Source/core/rendering/FixedTableLayout.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « Source/core/rendering/AutoTableLayout.cpp ('k') | Source/core/rendering/FixedTableLayout.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698