| Index: ui/gfx/box_f.cc
|
| diff --git a/ui/gfx/box_f.cc b/ui/gfx/box_f.cc
|
| index b4191f36bb32b71b806fe1043f13bba2fef13d22..62e755bdc3e2d061a6eab6cdac6a2f0b01777c70 100644
|
| --- a/ui/gfx/box_f.cc
|
| +++ b/ui/gfx/box_f.cc
|
| @@ -50,14 +50,17 @@ void BoxF::Union(const BoxF& box) {
|
| }
|
| if (box.IsEmpty())
|
| return;
|
| -
|
| - ExpandTo(box.origin(), gfx::Point3F(box.right(), box.bottom(), box.front()));
|
| + ExpandTo(box);
|
| }
|
|
|
| void BoxF::ExpandTo(const Point3F& point) {
|
| ExpandTo(point, point);
|
| }
|
|
|
| +void BoxF::ExpandTo(const BoxF& box) {
|
| + ExpandTo(box.origin(), gfx::Point3F(box.right(), box.bottom(), box.front()));
|
| +}
|
| +
|
| BoxF UnionBoxes(const BoxF& a, const BoxF& b) {
|
| BoxF result = a;
|
| result.Union(b);
|
|
|