| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/gfx/box_f.h" | 5 #include "ui/gfx/geometry/box_f.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| 11 | 11 |
| 12 namespace gfx { | 12 namespace gfx { |
| 13 | 13 |
| 14 std::string BoxF::ToString() const { | 14 std::string BoxF::ToString() const { |
| 15 return base::StringPrintf("%s %fx%fx%f", | 15 return base::StringPrintf("%s %fx%fx%f", |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 ExpandTo(box.origin(), gfx::Point3F(box.right(), box.bottom(), box.front())); | 61 ExpandTo(box.origin(), gfx::Point3F(box.right(), box.bottom(), box.front())); |
| 62 } | 62 } |
| 63 | 63 |
| 64 BoxF UnionBoxes(const BoxF& a, const BoxF& b) { | 64 BoxF UnionBoxes(const BoxF& a, const BoxF& b) { |
| 65 BoxF result = a; | 65 BoxF result = a; |
| 66 result.Union(b); | 66 result.Union(b); |
| 67 return result; | 67 return result; |
| 68 } | 68 } |
| 69 | 69 |
| 70 } // namespace gfx | 70 } // namespace gfx |
| OLD | NEW |