Merge "Fix typo preventing layers from scrolling to top"

jreck · Android (Google) Code Review · commit 4da5c4ac6f32 · 2012-03-30T09:20:14.000-07:00
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
@@ -3877,7 +3877,7 @@ public void computeScroll() {
     private void scrollLayerTo(int x, int y) {
         int dx = mScrollingLayerRect.left - x;
         int dy = mScrollingLayerRect.top - y;
-        if (dx == 0 && y == 0) {
+        if (dx == 0 && dy == 0) {
             return;
         }
         if (mSelectingText) {

Original file line number	Diff line number	Diff line change
`@@ -3877,7 +3877,7 @@ public void computeScroll() {`
`3877`	`3877`	`private void scrollLayerTo(int x, int y) {`
`3878`	`3878`	`int dx = mScrollingLayerRect.left - x;`
`3879`	`3879`	`int dy = mScrollingLayerRect.top - y;`
`3880`		`- if (dx == 0 && y == 0) {`
	`3880`	`+ if (dx == 0 && dy == 0) {`
`3881`	`3881`	`return;`
`3882`	`3882`	`}`
`3883`	`3883`	`if (mSelectingText) {`