summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-09-09 15:05:06 +0100
committerSteve Block <steveblock@google.com>2011-09-19 19:03:57 +0100
commita307a97864647f6373c599f917e762a5fee3a197 (patch)
treef6b4bd3dfc66fbd1f51410c5f1cf2e3e1895832a
parentf92d7cf56380e421b81212d32a557bda707a9555 (diff)
downloadexternal_webkit-a307a97864647f6373c599f917e762a5fee3a197.zip
external_webkit-a307a97864647f6373c599f917e762a5fee3a197.tar.gz
external_webkit-a307a97864647f6373c599f917e762a5fee3a197.tar.bz2
Simplify logic in ScrollableLayerAndroid::scrollTo()
No functional change Bug: 5262656 Change-Id: Ifb6cc64e7578625acc1d5e91b8296b9e4cf1d449
-rw-r--r--Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.cpp
index ca8f03c..2bb8b5c 100644
--- a/Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.cpp
@@ -18,10 +18,7 @@ bool ScrollableLayerAndroid::scrollTo(int x, int y)
if (newX == scrollBounds.fLeft && newY == scrollBounds.fTop)
return false;
- SkScalar diffX = newX - scrollBounds.fLeft;
- SkScalar diffY = newY - scrollBounds.fTop;
- const SkPoint& pos = getPosition();
- setPosition(pos.fX - diffX, pos.fY - diffY);
+ setPosition(m_scrollLimits.fLeft - newX, m_scrollLimits.fTop - newY);
return true;
}