Add BoxF::ExpandTo

ui/gfx/box_f.cc

 // 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.
 
 #include "ui/gfx/box_f.h"
 
 #include <algorithm>
 
 #include "base/strings/stringprintf.h"
 
 namespace gfx {
 
 std::string BoxF::ToString() const {
   return base::StringPrintf("%s %fx%fx%f",
                             origin().ToString().c_str(),
                             width_,
                             height_,
                             depth_);
 }
 
 bool BoxF::IsEmpty() const {
   return (width_ == 0 && height_ == 0) ||
          (width_ == 0 && depth_ == 0) ||
          (height_ == 0 && depth_ == 0);
 }
 
+void BoxF::ExpandTo(const Point3F& min, const Point3F& max) {
+  float min_x = std::min(x(), min.x());

[danakj, 2013/10/01 14:23:44]

DCHECK() that min <= max please.

+  float min_y = std::min(y(), min.y());
+  float min_z = std::min(z(), min.z());
+  float max_x = std::max(right(), max.x());
+  float max_y = std::max(bottom(), max.y());
+  float max_z = std::max(front(), max.z());
+
+  origin_.SetPoint(min_x, min_y, min_z);
+  width_ = max_x - min_x;
+  height_ = max_y - min_y;
+  depth_ = max_z - min_z;
+}
+
 void BoxF::Union(const BoxF& box) {
   if (IsEmpty()) {
     *this = box;
     return;
   }
   if (box.IsEmpty())
     return;
 
-  float min_x = std::min(x(), box.x());
-  float min_y = std::min(y(), box.y());
-  float min_z = std::min(z(), box.z());
-  float max_x = std::max(right(), box.right());
-  float max_y = std::max(bottom(), box.bottom());
-  float max_z = std::max(front(), box.front());
+  ExpandTo(box.origin(), gfx::Point3F(box.right(), box.bottom(), box.front()));

[danakj, 2013/10/01 14:23:44]

What happens if |box| is entirely left/above |this|? That violates the
requirement for |min| and |max| on ExpandTo(min,max) doesn't it?

For instances, box = 0,0,0x5x5x5 and this = 20,20,20x5x5x5. You'll do
ExpandTo([20,20,20], [5,5,5])?

This case should be covered by the Union unit test, does it pass somehow?

+}
 
-  origin_.SetPoint(min_x, min_y, min_z);
-  width_ = max_x - min_x;
-  height_ = max_y - min_y;
-  depth_ = max_z - min_z;
+void BoxF::ExpandTo(const Point3F& point) {
+  ExpandTo(point, point);
 }
 
 BoxF UnionBoxes(const BoxF& a, const BoxF& b) {
   BoxF result = a;
   result.Union(b);
   return result;
 }
 
 }  // namespace gfx