Move geometric types to a separate, more lightweight target.

ui/gfx/vector2d.h

Index: ui/gfx/vector2d.h
diff --git a/ui/gfx/vector2d.h b/ui/gfx/vector2d.h
index 8dd76324d1a90a3c1d6673f41edf9dcd9b255db6..c0eefd2394338d5a427951857f3152563e2c36f8 100644
--- a/ui/gfx/vector2d.h
+++ b/ui/gfx/vector2d.h
@@ -1,91 +1,7 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Defines a simple integer vector class.  This class is used to indicate a
-// distance in two dimensions between two points. Subtracting two points should
-// produce a vector, and adding a vector to a point produces the point at the
-// vector's distance from the original point.
+// TODO(beng): remove once callsites are patched.
+#include "ui/gfx/geometry/vector2d.h"
 
-#ifndef UI_GFX_VECTOR2D_H_
-#define UI_GFX_VECTOR2D_H_
-
-#include <string>
-
-#include "base/basictypes.h"
-#include "ui/gfx/gfx_export.h"
-#include "ui/gfx/vector2d_f.h"
-
-namespace gfx {
-
-class GFX_EXPORT Vector2d {
- public:
-  Vector2d() : x_(0), y_(0) {}
-  Vector2d(int x, int y) : x_(x), y_(y) {}
-
-  int x() const { return x_; }
-  void set_x(int x) { x_ = x; }
-
-  int y() const { return y_; }
-  void set_y(int y) { y_ = y; }
-
-  // True if both components of the vector are 0.
-  bool IsZero() const;
-
-  // Add the components of the |other| vector to the current vector.
-  void Add(const Vector2d& other);
-  // Subtract the components of the |other| vector from the current vector.
-  void Subtract(const Vector2d& other);
-
-  void operator+=(const Vector2d& other) { Add(other); }
-  void operator-=(const Vector2d& other) { Subtract(other); }
-
-  void SetToMin(const Vector2d& other) {
-    x_ = x_ <= other.x_ ? x_ : other.x_;
-    y_ = y_ <= other.y_ ? y_ : other.y_;
-  }
-
-  void SetToMax(const Vector2d& other) {
-    x_ = x_ >= other.x_ ? x_ : other.x_;
-    y_ = y_ >= other.y_ ? y_ : other.y_;
-  }
-
-  // Gives the square of the diagonal length of the vector. Since this is
-  // cheaper to compute than Length(), it is useful when you want to compare
-  // relative lengths of different vectors without needing the actual lengths.
-  int64 LengthSquared() const;
-  // Gives the diagonal length of the vector.
-  float Length() const;
-
-  std::string ToString() const;
-
-  operator Vector2dF() const { return Vector2dF(x_, y_); }
-
- private:
-  int x_;
-  int y_;
-};
-
-inline bool operator==(const Vector2d& lhs, const Vector2d& rhs) {
-  return lhs.x() == rhs.x() && lhs.y() == rhs.y();
-}
-
-inline Vector2d operator-(const Vector2d& v) {
-  return Vector2d(-v.x(), -v.y());
-}
-
-inline Vector2d operator+(const Vector2d& lhs, const Vector2d& rhs) {
-  Vector2d result = lhs;
-  result.Add(rhs);
-  return result;
-}
-
-inline Vector2d operator-(const Vector2d& lhs, const Vector2d& rhs) {
-  Vector2d result = lhs;
-  result.Add(-rhs);
-  return result;
-}
-
-}  // namespace gfx
-
-#endif // UI_GFX_VECTOR2D_H_