diff options
| author | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 02:24:11 +0000 |
|---|---|---|
| committer | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 02:24:11 +0000 |
| commit | 94d86c6293f72e74b00e7cae5cd339f9ff441114 (patch) | |
| tree | d6d90a358a760f90e1a275b95f1334c820ab0987 /cc/layer_impl.cc | |
| parent | 02e071cf35c16c1c402a960d3cb1dda31e14b0c7 (diff) | |
| download | chromium_src-94d86c6293f72e74b00e7cae5cd339f9ff441114.zip chromium_src-94d86c6293f72e74b00e7cae5cd339f9ff441114.tar.gz chromium_src-94d86c6293f72e74b00e7cae5cd339f9ff441114.tar.bz2 | |
LayerImpl::tryScroll should return false when max scroll offset is zero.
If the max scroll offset is zero in both dimensions, we can't scroll, so despite
the fact that we may be technically scrollable (i.e., LayerImpl::scrollable()
returns true), we aren't effectively scrollable and should return ScrollIgnored.
BUG=170953
Review URL: https://chromiumcodereview.appspot.com/12224013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_impl.cc')
| -rw-r--r-- | cc/layer_impl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc index dcf531f..8545e42 100644 --- a/cc/layer_impl.cc +++ b/cc/layer_impl.cc @@ -279,6 +279,11 @@ InputHandlerClient::ScrollStatus LayerImpl::tryScroll(const gfx::PointF& screenS return InputHandlerClient::ScrollIgnored; } + if (m_maxScrollOffset.x() <= 0 && m_maxScrollOffset.y() <= 0) { + TRACE_EVENT0("cc", "LayerImpl::tryScroll: Ignored. Technically scrollable, but has no affordance in either direction."); + return InputHandlerClient::ScrollIgnored; + } + return InputHandlerClient::ScrollStarted; } |