| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/geometry/cubic_bezier.h" | 5 #include "ui/gfx/animation/cubic_bezier.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 | 11 |
| 12 namespace gfx { | 12 namespace gfx { |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 sol_1 = eval_bezier(y1_, y2_, t_1); | 130 sol_1 = eval_bezier(y1_, y2_, t_1); |
| 131 | 131 |
| 132 if (0 < t_2 && t_2 < 1) | 132 if (0 < t_2 && t_2 < 1) |
| 133 sol_2 = eval_bezier(y1_, y2_, t_2); | 133 sol_2 = eval_bezier(y1_, y2_, t_2); |
| 134 | 134 |
| 135 *min = std::min(std::min(*min, sol_1), sol_2); | 135 *min = std::min(std::min(*min, sol_1), sol_2); |
| 136 *max = std::max(std::max(*max, sol_1), sol_2); | 136 *max = std::max(std::max(*max, sol_1), sol_2); |
| 137 } | 137 } |
| 138 | 138 |
| 139 } // namespace gfx | 139 } // namespace gfx |
| OLD | NEW |