From a307a97864647f6373c599f917e762a5fee3a197 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Fri, 9 Sep 2011 15:05:06 +0100
Subject: Simplify logic in ScrollableLayerAndroid::scrollTo()

No functional change

Bug: 5262656
Change-Id: Ifb6cc64e7578625acc1d5e91b8296b9e4cf1d449
---
 Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'Source/WebCore')

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;
 }
 
-- 
cgit v1.1