| Index: Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| diff --git a/Source/core/html/canvas/CanvasRenderingContext2D.cpp b/Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| index 6ef99dcde6499c40016a7a2c4a16d89482985f55..a6421e52dd6f7f5fe439d03de073fabe6df5e7c6 100644
|
| --- a/Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| +++ b/Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| @@ -69,8 +69,6 @@
|
| #include "wtf/Uint8ClampedArray.h"
|
| #include "wtf/text/StringBuilder.h"
|
|
|
| -using namespace std;
|
| -
|
| namespace WebCore {
|
|
|
| static const int defaultFontSize = 10;
|
| @@ -1415,10 +1413,10 @@ bool CanvasRenderingContext2D::shouldDrawShadows() const
|
|
|
| static inline FloatRect normalizeRect(const FloatRect& rect)
|
| {
|
| - return FloatRect(min(rect.x(), rect.maxX()),
|
| - min(rect.y(), rect.maxY()),
|
| - max(rect.width(), -rect.width()),
|
| - max(rect.height(), -rect.height()));
|
| + return FloatRect(std::min(rect.x(), rect.maxX()),
|
| + std::min(rect.y(), rect.maxY()),
|
| + std::max(rect.width(), -rect.width()),
|
| + std::max(rect.height(), -rect.height()));
|
| }
|
|
|
| static inline void clipRectsToImageRect(const FloatRect& imageRect, FloatRect* srcRect, FloatRect* dstRect)
|
|
|