ui: Add methods to clamp Sizes, Points, and Vectors from above or below.

ui: Add methods to clamp Sizes, Points, and Vectors from above or below.

Tests:
PointTest.Clamp
PointTest.ClampF
SizeTest.Clamp
SizeTest.ClampF
Vector2dTest.Clamp
Vector2dTest.ClampF
Vector3dTest.ClampF

R=sky,enne
BUG=147395
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=167014

[danakj, 2012-11-09 16:44:19]

sky please review ui/gfx
enne please review cc

[sky, 2012-11-09 18:23:11]

https://codereview.chromium.org/11361186/diff/4001/ui/gfx/point_base.h
File ui/gfx/point_base.h (right):

https://codereview.chromium.org/11361186/diff/4001/ui/gfx/point_base.h#newcode44
ui/gfx/point_base.h:44: void ClampFromAbove(const Class& other) {
Is there some other name we could use for these that doesn't imply the
coordinates in a particular direction?

https://codereview.chromium.org/11361186/diff/4001/ui/gfx/size_base.h
File ui/gfx/size_base.h (right):

https://codereview.chromium.org/11361186/diff/4001/ui/gfx/size_base.h#newcode38
ui/gfx/size_base.h:38: void ClampFromAbove(const Class& other) {
The name here is even more confusing. Sizes generally don't have an implied
direction. Is there a better name you could use?

[danakj, 2012-11-09 18:24:25]

https://codereview.chromium.org/11361186/diff/4001/ui/gfx/size_base.h
File ui/gfx/size_base.h (right):

https://codereview.chromium.org/11361186/diff/4001/ui/gfx/size_base.h#newcode38
ui/gfx/size_base.h:38: void ClampFromAbove(const Class& other) {
On 2012/11/09 18:23:12, sky wrote:
> The name here is even more confusing. Sizes generally don't have an implied
> direction. Is there a better name you could use?

Oh, hm. I hadn't thought of it in terms of direction. I was thinking above like,
on the number line. I'll think of something.

[danakj, 2012-11-09 18:54:55]

PTAL ClampToMax() ClampToMin()

[danakj, 2012-11-09 18:59:13]

Also considered:
ClampIfLargerThan() clamps <= something
ClampIfSmallerThan() clamps >= something

Please place your votes here.

[slavi, 2012-11-09 19:15:18]

On 2012/11/09 18:59:13, danakj wrote:
> Also considered:
> ClampIfLargerThan() clamps <= something
> ClampIfSmallerThan() clamps >= something
> 
> Please place your votes here.

Clamp(Vector min, Vector max) is generally useful. 

I'm not sure if I've ever used something like ClampIfLargerThan.

[slavi, 2012-11-09 19:15:26]

https://codereview.chromium.org/11361186/diff/16/ui/gfx/vector3d_f.h
File ui/gfx/vector3d_f.h (right):

https://codereview.chromium.org/11361186/diff/16/ui/gfx/vector3d_f.h#newcode48
ui/gfx/vector3d_f.h:48: x_ = x_ <= max.x_ ? x_ : max.x_;
Why not just
x_ = x_ < max.x_ ? x_ : max.x_;

I get goose bumps every time I see == or <= used with floats.

[danakj, 2012-11-09 19:54:57]

https://codereview.chromium.org/11361186/diff/16/ui/gfx/vector3d_f.h
File ui/gfx/vector3d_f.h (right):

https://codereview.chromium.org/11361186/diff/16/ui/gfx/vector3d_f.h#newcode48
ui/gfx/vector3d_f.h:48: x_ = x_ <= max.x_ ? x_ : max.x_;
On 2012/11/09 19:15:26, slavi wrote:
> Why not just
> x_ = x_ < max.x_ ? x_ : max.x_;
> 
> I get goose bumps every time I see == or <= used with floats.

Yeh, it seemed equally good here though, and more cases where the code doesn't
say to change the current value?

[danakj, 2012-11-09 19:56:26]

On Fri, Nov 9, 2012 at 2:15 PM,  <skaslev@chromium.org> wrote:
> On 2012/11/09 18:59:13, danakj wrote:
>>
>> Also considered:
>> ClampIfLargerThan() clamps <= something
>> ClampIfSmallerThan() clamps >= something
>
>
>> Please place your votes here.
>
>
> Clamp(Vector min, Vector max) is generally useful.
>
> I'm not sure if I've ever used something like ClampIfLargerThan.

We do this operation in tiled_layer.cc to keep things below a max size.

[sky, 2012-11-09 21:41:04]

LGTM New names are much better!

[commit-bot: I haz the power, 2012-11-09 21:42:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/11361186/16

[commit-bot: I haz the power, 2012-11-09 21:42:18]

Failed to apply patch for ui/gfx/point_base.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/gfx/point_base.h
  Hunk #1 FAILED at 41.
  1 out of 1 hunk FAILED -- saving rejects to file ui/gfx/point_base.h.rej

Patch:       ui/gfx/point_base.h
Index: ui/gfx/point_base.h
diff --git a/ui/gfx/point_base.h b/ui/gfx/point_base.h
index
2eed6142d6c3b1a3999d88bf6b7e720118624966..870b2644e4f986bc1d99fbad30e80bbc094eae80
100644
--- a/ui/gfx/point_base.h
+++ b/ui/gfx/point_base.h
@@ -41,6 +41,16 @@ class UI_EXPORT PointBase {
     Offset(-vector.x(), -vector.y());
   }
 
+  void ClampToMax(const Class& max) {
+    x_ = x_ <= max.x_ ? x_ : max.x_;
+    y_ = y_ <= max.y_ ? y_ : max.y_;
+  }
+
+  void ClampToMin(const Class& min) {
+    x_ = x_ >= min.x_ ? x_ : min.x_;
+    y_ = y_ >= min.y_ ? y_ : min.y_;
+  }
+
   Class Middle(const Class& other) const WARN_UNUSED_RESULT {
     return Class((x_ + other.x_) / 2, (y_ + other.y_) / 2);
   }

[commit-bot: I haz the power, 2012-11-09 21:47:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/11361186/15002