Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: ui/gfx/point_f.h

Issue 109433013: Move geometric types to a separate, more lightweight target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/gfx/point_f.h
diff --git a/ui/gfx/point_f.h b/ui/gfx/point_f.h
index 664c18d8aa0bbbc67130909f55f662e2fcf25b6f..f4be8ff05780bdbacfcc3d1d555d9a23572467b4 100644
--- a/ui/gfx/point_f.h
+++ b/ui/gfx/point_f.h
@@ -1,75 +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.
-#ifndef UI_GFX_POINT_F_H_
-#define UI_GFX_POINT_F_H_
+// TODO(beng): remove once callsites are patched.
+#include "ui/gfx/geometry/point_f.h"
-#include <string>
-
-#include "ui/gfx/gfx_export.h"
-#include "ui/gfx/point_base.h"
-#include "ui/gfx/vector2d_f.h"
-
-namespace gfx {
-
-// A floating version of gfx::Point.
-class GFX_EXPORT PointF : public PointBase<PointF, float, Vector2dF> {
- public:
- PointF() : PointBase<PointF, float, Vector2dF>(0, 0) {}
- PointF(float x, float y) : PointBase<PointF, float, Vector2dF>(x, y) {}
- ~PointF() {}
-
- void Scale(float scale) {
- Scale(scale, scale);
- }
-
- void Scale(float x_scale, float y_scale) {
- SetPoint(x() * x_scale, y() * y_scale);
- }
-
- // Returns a string representation of point.
- std::string ToString() const;
-};
-
-inline bool operator==(const PointF& lhs, const PointF& rhs) {
- return lhs.x() == rhs.x() && lhs.y() == rhs.y();
-}
-
-inline bool operator!=(const PointF& lhs, const PointF& rhs) {
- return !(lhs == rhs);
-}
-
-inline PointF operator+(const PointF& lhs, const Vector2dF& rhs) {
- PointF result(lhs);
- result += rhs;
- return result;
-}
-
-inline PointF operator-(const PointF& lhs, const Vector2dF& rhs) {
- PointF result(lhs);
- result -= rhs;
- return result;
-}
-
-inline Vector2dF operator-(const PointF& lhs, const PointF& rhs) {
- return Vector2dF(lhs.x() - rhs.x(), lhs.y() - rhs.y());
-}
-
-inline PointF PointAtOffsetFromOrigin(const Vector2dF& offset_from_origin) {
- return PointF(offset_from_origin.x(), offset_from_origin.y());
-}
-
-GFX_EXPORT PointF ScalePoint(const PointF& p, float x_scale, float y_scale);
-
-inline PointF ScalePoint(const PointF& p, float scale) {
- return ScalePoint(p, scale, scale);
-}
-
-#if !defined(COMPILER_MSVC)
-extern template class PointBase<PointF, float, Vector2dF>;
-#endif
-
-} // namespace gfx
-
-#endif // UI_GFX_POINT_F_H_
« ui/aura/aura.gyp ('K') | « ui/gfx/point_conversions.cc ('k') | ui/gfx/point_f.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698