| Index: cc/page_scale_animation.cc
|
| diff --git a/cc/page_scale_animation.cc b/cc/page_scale_animation.cc
|
| index e1d5f45436eeae4a27b6e37378c776e2d5ff654e..b773d9ea8e799e2bac07197c624cfcbcfac5cfcd 100644
|
| --- a/cc/page_scale_animation.cc
|
| +++ b/cc/page_scale_animation.cc
|
| @@ -5,7 +5,6 @@
|
| #include "cc/page_scale_animation.h"
|
|
|
| #include "base/logging.h"
|
| -#include "cc/geometry.h"
|
| #include "ui/gfx/point_f.h"
|
| #include "ui/gfx/rect_f.h"
|
| #include "ui/gfx/vector2d_conversions.h"
|
| @@ -117,7 +116,7 @@ void PageScaleAnimation::inferTargetAnchorFromScrollOffsets()
|
|
|
| void PageScaleAnimation::clampTargetScrollOffset()
|
| {
|
| - gfx::Vector2dF maxScrollOffset = BottomRight(gfx::RectF(m_rootLayerSize)) - BottomRight(gfx::RectF(targetViewportSize()));
|
| + gfx::Vector2dF maxScrollOffset = gfx::RectF(m_rootLayerSize).BottomRight() - gfx::RectF(targetViewportSize()).BottomRight();
|
| m_targetScrollOffset.ClampToMin(gfx::Vector2dF());
|
| m_targetScrollOffset.ClampToMax(maxScrollOffset);
|
| }
|
|
|