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

Unified Diff: Source/platform/fonts/mac/FontComplexTextMac.cpp

Issue 516953003: Removing "using" declarations that import names in the C++ Standard library.(Source/platform/[fonts… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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
Index: Source/platform/fonts/mac/FontComplexTextMac.cpp
diff --git a/Source/platform/fonts/mac/FontComplexTextMac.cpp b/Source/platform/fonts/mac/FontComplexTextMac.cpp
index c9ba466ab88c4d9ccce0d2ee4c4fe5fe22a21f2f..02b2900d733d31662da2514aef392230ed1bd527 100644
--- a/Source/platform/fonts/mac/FontComplexTextMac.cpp
+++ b/Source/platform/fonts/mac/FontComplexTextMac.cpp
@@ -36,8 +36,6 @@
#include "platform/text/TextRun.h"
#include "wtf/MathExtras.h"
-using namespace std;
-
namespace blink {
static bool preferHarfBuzz(const Font* font)
@@ -138,8 +136,8 @@ float Font::floatWidthForComplexText(const TextRun& run, HashSet<const SimpleFon
ComplexTextController controller(this, run, true, fallbackFonts);
glyphBounds->setTop(floorf(-controller.minGlyphBoundingBoxY()));
glyphBounds->setBottom(ceilf(controller.maxGlyphBoundingBoxY()));
- glyphBounds->setLeft(max<int>(0, floorf(-controller.minGlyphBoundingBoxX())));
- glyphBounds->setRight(max<int>(0, ceilf(controller.maxGlyphBoundingBoxX() - controller.totalWidth())));
+ glyphBounds->setLeft(std::max<int>(0, floorf(-controller.minGlyphBoundingBoxX())));
+ glyphBounds->setRight(std::max<int>(0, ceilf(controller.maxGlyphBoundingBoxX() - controller.totalWidth())));
return controller.totalWidth();
}

Powered by Google App Engine
This is Rietveld 408576698