Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / geometry / RoundedRect.cpp

diff --git a/src/third_party/WebKit/Source/platform/geometry/RoundedRect.cpp b/src/third_party/WebKit/Source/platform/geometry/RoundedRect.cpp
index 24257dd..f7d3043 100644 (file)
--- a/src/third_party/WebKit/Source/platform/geometry/RoundedRect.cpp
+++ b/src/third_party/WebKit/Source/platform/geometry/RoundedRect.cpp
@@ -31,8 +31,6 @@
 #include "wtf/Assertions.h"
 #include <algorithm>
 
-using namespace std;
-
 namespace blink {
 
 bool RoundedRect::Radii::isZero() const
@@ -64,20 +62,20 @@ void RoundedRect::Radii::scale(float factor)
 void RoundedRect::Radii::expand(int topWidth, int bottomWidth, int leftWidth, int rightWidth)
 {
     if (m_topLeft.width() > 0 && m_topLeft.height() > 0) {
-        m_topLeft.setWidth(max<int>(0, m_topLeft.width() + leftWidth));
-        m_topLeft.setHeight(max<int>(0, m_topLeft.height() + topWidth));
+        m_topLeft.setWidth(std::max<int>(0, m_topLeft.width() + leftWidth));
+        m_topLeft.setHeight(std::max<int>(0, m_topLeft.height() + topWidth));
     }
     if (m_topRight.width() > 0 && m_topRight.height() > 0) {
-        m_topRight.setWidth(max<int>(0, m_topRight.width() + rightWidth));
-        m_topRight.setHeight(max<int>(0, m_topRight.height() + topWidth));
+        m_topRight.setWidth(std::max<int>(0, m_topRight.width() + rightWidth));
+        m_topRight.setHeight(std::max<int>(0, m_topRight.height() + topWidth));
     }
     if (m_bottomLeft.width() > 0 && m_bottomLeft.height() > 0) {
-        m_bottomLeft.setWidth(max<int>(0, m_bottomLeft.width() + leftWidth));
-        m_bottomLeft.setHeight(max<int>(0, m_bottomLeft.height() + bottomWidth));
+        m_bottomLeft.setWidth(std::max<int>(0, m_bottomLeft.width() + leftWidth));
+        m_bottomLeft.setHeight(std::max<int>(0, m_bottomLeft.height() + bottomWidth));
     }
     if (m_bottomRight.width() > 0 && m_bottomRight.height() > 0) {
-        m_bottomRight.setWidth(max<int>(0, m_bottomRight.width() + rightWidth));
-        m_bottomRight.setHeight(max<int>(0, m_bottomRight.height() + bottomWidth));
+        m_bottomRight.setWidth(std::max<int>(0, m_bottomRight.width() + rightWidth));
+        m_bottomRight.setHeight(std::max<int>(0, m_bottomRight.height() + bottomWidth));
     }
 }
 
@@ -154,10 +152,10 @@ RoundedRect::RoundedRect(const IntRect& rect, const IntSize& topLeft, const IntS
 IntRect RoundedRect::radiusCenterRect() const
 {
     ASSERT(isRenderable());
-    int minX = m_rect.x() + max(m_radii.topLeft().width(), m_radii.bottomLeft().width());
-    int minY = m_rect.y() + max(m_radii.topLeft().height(), m_radii.topRight().height());
-    int maxX = m_rect.maxX() - max(m_radii.topRight().width(), m_radii.bottomRight().width());
-    int maxY = m_rect.maxY() - max(m_radii.bottomLeft().height(), m_radii.bottomRight().height());
+    int minX = m_rect.x() + std::max(m_radii.topLeft().width(), m_radii.bottomLeft().width());
+    int minY = m_rect.y() + std::max(m_radii.topLeft().height(), m_radii.topRight().height());
+    int maxX = m_rect.maxX() - std::max(m_radii.topRight().width(), m_radii.bottomRight().width());
+    int maxY = m_rect.maxY() - std::max(m_radii.bottomLeft().height(), m_radii.bottomRight().height());
     return IntRect(minX, minY, maxX - minX, maxY - minY);
 }