commit 87e8b25ea3c95be5921a79c65fbf4060de2e2e84
author Chet Haase <chet@google.com> Fri Jul 13 07:39:41 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 13 07:39:41 2012 -0700
tree 408c4fa1aecca98109f90b4566596d489972d3dc
parent 401b1f85746ab7005907747a59534def967d825b
parent 526057bc77150e608666bbc80a0c9626254650a0

Merge "Remove redundant computeScroll() call for hw-accelerated views"

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 6819f8b..3f017b4 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -12922,11 +12922,6 @@
             mPrivateFlags &= ~INVALIDATED;
         }
 
-        computeScroll();
-
-        final int sx = mScrollX;
-        final int sy = mScrollY;
-
         DisplayList displayList = null;
         Bitmap cache = null;
         boolean hasDisplayList = false;
@@ -12973,6 +12968,14 @@
             }
         }
 
+        int sx = 0;
+        int sy = 0;
+        if (!hasDisplayList) {
+            computeScroll();
+            sx = mScrollX;
+            sy = mScrollY;
+        }
+
         final boolean hasNoCache = cache == null || hasDisplayList;
         final boolean offsetForScroll = cache == null && !hasDisplayList &&
                 layerType != LAYER_TYPE_HARDWARE;