| Index: cc/layer_impl.cc
|
| diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
|
| index f1555c1b49e1db07f73999743d1bc8afb087026c..4d4dcc007479f85adbbc39cd7a0abf4123cf585a 100644
|
| --- a/cc/layer_impl.cc
|
| +++ b/cc/layer_impl.cc
|
| @@ -196,7 +196,7 @@ FloatSize LayerImpl::scrollBy(const FloatSize& scroll)
|
| return unscrolled;
|
| }
|
|
|
| -InputHandlerClient::ScrollStatus LayerImpl::tryScroll(const IntPoint& screenSpacePoint, InputHandlerClient::ScrollInputType type) const
|
| +InputHandlerClient::ScrollStatus LayerImpl::tryScroll(const gfx::Point& screenSpacePoint, InputHandlerClient::ScrollInputType type) const
|
| {
|
| if (shouldScrollOnMainThread()) {
|
| TRACE_EVENT0("cc", "LayerImpl::tryScroll: Failed shouldScrollOnMainThread");
|
| @@ -208,10 +208,10 @@ InputHandlerClient::ScrollStatus LayerImpl::tryScroll(const IntPoint& screenSpac
|
| return InputHandlerClient::ScrollIgnored;
|
| }
|
|
|
| - if (!nonFastScrollableRegion().isEmpty()) {
|
| + if (!nonFastScrollableRegion().IsEmpty()) {
|
| bool clipped = false;
|
| - gfx::PointF hitTestPointInLocalSpace = MathUtil::projectPoint(screenSpaceTransform().inverse(), FloatPoint(screenSpacePoint), clipped);
|
| - if (!clipped && nonFastScrollableRegion().contains(cc::IntPoint(gfx::ToFlooredPoint(hitTestPointInLocalSpace)))) {
|
| + gfx::PointF hitTestPointInLocalSpace = MathUtil::projectPoint(screenSpaceTransform().inverse(), gfx::PointF(screenSpacePoint), clipped);
|
| + if (!clipped && nonFastScrollableRegion().Contains(gfx::ToFlooredPoint(hitTestPointInLocalSpace))) {
|
| TRACE_EVENT0("cc", "LayerImpl::tryScroll: Failed nonFastScrollableRegion");
|
| return InputHandlerClient::ScrollOnMainThread;
|
| }
|
| @@ -660,7 +660,7 @@ void LayerImpl::setDoubleSided(bool doubleSided)
|
| Region LayerImpl::visibleContentOpaqueRegion() const
|
| {
|
| if (contentsOpaque())
|
| - return cc::IntRect(visibleContentRect());
|
| + return visibleContentRect();
|
| return Region();
|
| }
|
|
|
|
|