diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 18:16:19 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 18:16:19 +0000 |
| commit | 0152773a7e8c07b7c8bc3b536a1fbaf444402445 (patch) | |
| tree | 30a30afea17612699281006296db9050b8e653bd /cc/layer_impl.cc | |
| parent | 68464aacf997a60d7abe1b2d1c4873349827757a (diff) | |
| download | chromium_src-0152773a7e8c07b7c8bc3b536a1fbaf444402445.zip chromium_src-0152773a7e8c07b7c8bc3b536a1fbaf444402445.tar.gz chromium_src-0152773a7e8c07b7c8bc3b536a1fbaf444402445.tar.bz2 | |
cc: Rename viewportPoint to screenSpacePoint to be more precise in the hit-testing code.
The point given to these functions is meant to be applied to the inverse
screenSpaceTransform. That point must be in the device-viewport, ie.
screen space.
The current name makes it sound like the point is in logical pixels rather than
device pixels, which is incorrect.
Just renaming variables, no new tests.
R=enne
Review URL: https://codereview.chromium.org/11191076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_impl.cc')
| -rw-r--r-- | cc/layer_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc index 3ee5405..f71cbca 100644 --- a/cc/layer_impl.cc +++ b/cc/layer_impl.cc @@ -191,7 +191,7 @@ FloatSize CCLayerImpl::scrollBy(const FloatSize& scroll) return unscrolled; } -CCInputHandlerClient::ScrollStatus CCLayerImpl::tryScroll(const IntPoint& viewportPoint, CCInputHandlerClient::ScrollInputType type) const +CCInputHandlerClient::ScrollStatus CCLayerImpl::tryScroll(const IntPoint& screenSpacePoint, CCInputHandlerClient::ScrollInputType type) const { if (shouldScrollOnMainThread()) { TRACE_EVENT0("cc", "CCLayerImpl::tryScroll: Failed shouldScrollOnMainThread"); @@ -205,7 +205,7 @@ CCInputHandlerClient::ScrollStatus CCLayerImpl::tryScroll(const IntPoint& viewpo if (!nonFastScrollableRegion().isEmpty()) { bool clipped = false; - FloatPoint hitTestPointInLocalSpace = CCMathUtil::projectPoint(screenSpaceTransform().inverse(), FloatPoint(viewportPoint), clipped); + FloatPoint hitTestPointInLocalSpace = CCMathUtil::projectPoint(screenSpaceTransform().inverse(), FloatPoint(screenSpacePoint), clipped); if (!clipped && nonFastScrollableRegion().contains(flooredIntPoint(hitTestPointInLocalSpace))) { TRACE_EVENT0("cc", "CCLayerImpl::tryScroll: Failed nonFastScrollableRegion"); return CCInputHandlerClient::ScrollOnMainThread; |