Move geometry classes from core/platform/graphics to platform/geometry

Source/platform/geometry/LayoutRect.cpp

 /*
  * Copyright (c) 2012, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
-#include "core/platform/graphics/LayoutRect.h"
+#include "platform/geometry/LayoutRect.h"
 
+#include "platform/LayoutUnit.h"
+#include "platform/geometry/FloatRect.h"
 #include <algorithm>
-#include "core/platform/graphics/FloatRect.h"
-#include "platform/LayoutUnit.h"
-
-using std::max;
-using std::min;
 
 namespace WebCore {
 
 LayoutRect::LayoutRect(const FloatRect& r)
     : m_location(LayoutPoint(r.location()))
     , m_size(LayoutSize(r.size()))
 {
 }
 
 bool LayoutRect::intersects(const LayoutRect& other) const
 {
     // Checking emptiness handles negative widths as well as zero.
     return !isEmpty() && !other.isEmpty()
         && x() < other.maxX() && other.x() < maxX()
         && y() < other.maxY() && other.y() < maxY();
 }
 
 bool LayoutRect::contains(const LayoutRect& other) const
 {
     return x() <= other.x() && maxX() >= other.maxX()
         && y() <= other.y() && maxY() >= other.maxY();
 }
 
 void LayoutRect::intersect(const LayoutRect& other)
 {
-    LayoutPoint newLocation(max(x(), other.x()), max(y(), other.y()));
-    LayoutPoint newMaxPoint(min(maxX(), other.maxX()), min(maxY(), other.maxY()));
+    LayoutPoint newLocation(std::max(x(), other.x()), std::max(y(), other.y()));
+    LayoutPoint newMaxPoint(std::min(maxX(), other.maxX()), std::min(maxY(), other.maxY()));
 
     // Return a clean empty rectangle for non-intersecting cases.
     if (newLocation.x() >= newMaxPoint.x() || newLocation.y() >= newMaxPoint.y()) {
         newLocation = LayoutPoint(0, 0);
         newMaxPoint = LayoutPoint(0, 0);
     }
 
     m_location = newLocation;
     m_size = newMaxPoint - newLocation;
 }
 
 void LayoutRect::unite(const LayoutRect& other)
 {
     // Handle empty special cases first.
     if (other.isEmpty())
         return;
     if (isEmpty()) {
         *this = other;
         return;
     }
 
-    LayoutPoint newLocation(min(x(), other.x()), min(y(), other.y()));
-    LayoutPoint newMaxPoint(max(maxX(), other.maxX()), max(maxY(), other.maxY()));
+    LayoutPoint newLocation(std::min(x(), other.x()), std::min(y(), other.y()));
+    LayoutPoint newMaxPoint(std::max(maxX(), other.maxX()), std::max(maxY(), other.maxY()));
 
     m_location = newLocation;
     m_size = newMaxPoint - newLocation;
 }
 
 void LayoutRect::uniteIfNonZero(const LayoutRect& other)
 {
     // Handle empty special cases first.
     if (!other.width() && !other.height())
         return;
     if (!width() && !height()) {
         *this = other;
         return;
     }
 
-    LayoutPoint newLocation(min(x(), other.x()), min(y(), other.y()));
-    LayoutPoint newMaxPoint(max(maxX(), other.maxX()), max(maxY(), other.maxY()));
+    LayoutPoint newLocation(std::min(x(), other.x()), std::min(y(), other.y()));
+    LayoutPoint newMaxPoint(std::max(maxX(), other.maxX()), std::max(maxY(), other.maxY()));
 
     m_location = newLocation;
     m_size = newMaxPoint - newLocation;
 }
 
 void LayoutRect::scale(float s)
 {
     m_location.scale(s, s);
     m_size.scale(s);
 }
@@ skipping 24 matching lines @@
 }
 
 LayoutRect enclosingLayoutRect(const FloatRect& rect)
 {
     LayoutPoint location = flooredLayoutPoint(rect.minXMinYCorner());
     LayoutPoint maxPoint = ceiledLayoutPoint(rect.maxXMaxYCorner());
     return LayoutRect(location, maxPoint - location);
 }
 
 } // namespace WebCore