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"
 
@@ skipping 27 matching lines @@
   float max_x = std::max(right(), box.right());
   float max_y = std::max(bottom(), box.bottom());
   float max_z = std::max(front(), box.front());
 
   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) {
+  Point3F max(
+      origin_.x() + width_, origin_.y() + height_, origin_.z() + depth_);
+
+  if (point.x() < origin_.x())
+    origin_.set_x(point.x());
+  if (point.y() < origin_.y())
+    origin_.set_y(point.y());
+  if (point.z() < origin_.z())
+    origin_.set_z(point.z());
+
+  if (point.x() > max.x())
+    max.set_x(point.x());
+  if (point.y() > max.y())
+    max.set_y(point.y());
+  if (point.z() > max.z())
+    max.set_z(point.z());
+
+  width_ = max.x() - origin_.x();
+  height_ = max.y() - origin_.y();
+  depth_ = max.z() - origin_.z();

[ajuma, 2013/10/01 13:21:02]

How about putting the logic that ExpandTo and Union have in common into a
separate helper function? I think we could share everything from Union except
the emptiness check.

+}
+
 BoxF UnionBoxes(const BoxF& a, const BoxF& b) {
   BoxF result = a;
   result.Union(b);
   return result;
 }
 
 }  // namespace gfx