| Index: third_party/WebKit/Source/core/html/ImageDocument.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/ImageDocument.cpp b/third_party/WebKit/Source/core/html/ImageDocument.cpp
|
| index 419c255a5add9a2060005316ace129e7627759c2..1744b0f15100a28ee7ed3f094c4e649ef41e4ddd 100644
|
| --- a/third_party/WebKit/Source/core/html/ImageDocument.cpp
|
| +++ b/third_party/WebKit/Source/core/html/ImageDocument.cpp
|
| @@ -53,8 +53,6 @@
|
| #include "platform/HostWindow.h"
|
| #include "wtf/text/StringBuilder.h"
|
|
|
| -using namespace std;
|
| -
|
| namespace {
|
|
|
| // The base square size is set to 10 because it rounds nicely for both the
|
| @@ -317,7 +315,7 @@ float ImageDocument::scale() const {
|
| float heightScale =
|
| view->height() * manualZoom / imageSize.height().toFloat();
|
|
|
| - return min(widthScale, heightScale);
|
| + return std::min(widthScale, heightScale);
|
| }
|
|
|
| void ImageDocument::resizeImageToFit() {
|
|
|