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

Unified Diff: ui/gfx/vector3d_f.h

Issue 14367021: Rename ClampToMin and ClampToMax (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 7 months 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
« no previous file with comments | « ui/gfx/vector2d_unittest.cc ('k') | ui/gfx/vector3d_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/vector3d_f.h
diff --git a/ui/gfx/vector3d_f.h b/ui/gfx/vector3d_f.h
index bb93abdeaffb8d1e325123e65df121c27b1ea31f..17ad332f3aab68a66b887f4e093c0c3f25547e7f 100644
--- a/ui/gfx/vector3d_f.h
+++ b/ui/gfx/vector3d_f.h
@@ -44,16 +44,16 @@ class UI_EXPORT Vector3dF {
void operator+=(const Vector3dF& other) { Add(other); }
void operator-=(const Vector3dF& other) { Subtract(other); }
- void ClampToMax(const Vector3dF& max) {
- x_ = x_ <= max.x_ ? x_ : max.x_;
- y_ = y_ <= max.y_ ? y_ : max.y_;
- z_ = z_ <= max.z_ ? z_ : max.z_;
+ void SetToMin(const Vector3dF& other) {
+ x_ = x_ <= other.x_ ? x_ : other.x_;
+ y_ = y_ <= other.y_ ? y_ : other.y_;
+ z_ = z_ <= other.z_ ? z_ : other.z_;
}
- void ClampToMin(const Vector3dF& min) {
- x_ = x_ >= min.x_ ? x_ : min.x_;
- y_ = y_ >= min.y_ ? y_ : min.y_;
- z_ = z_ >= min.z_ ? z_ : min.z_;
+ void SetToMax(const Vector3dF& other) {
+ x_ = x_ >= other.x_ ? x_ : other.x_;
+ y_ = y_ >= other.y_ ? y_ : other.y_;
+ z_ = z_ >= other.z_ ? z_ : other.z_;
}
// Gives the square of the diagonal length of the vector.
« no previous file with comments | « ui/gfx/vector2d_unittest.cc ('k') | ui/gfx/vector3d_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698