Merge "scroll relative to visibleRect in spawnContentScrollTo()"

Victoria Lease · Android (Google) Code Review · commit 9776ed7b944a · 2012-03-09T09:23:40.000-08:00
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
@@ -4176,9 +4176,9 @@ private void spawnContentScrollTo(int cx, int cy) {
             // is used in the view system.
             return;
         }
-        int vx = contentToViewX(cx);
-        int vy = contentToViewY(cy);
-        pinScrollTo(vx, vy, true, 0);
+        int vx = contentToViewDimension(cx - mScrollOffset.x);
+        int vy = contentToViewDimension(cy - mScrollOffset.y);
+        pinScrollBy(vx, vy, true, 0);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -4176,9 +4176,9 @@ private void spawnContentScrollTo(int cx, int cy) {`
`4176`	`4176`	`// is used in the view system.`
`4177`	`4177`	`return;`
`4178`	`4178`	`}`
`4179`		`- int vx = contentToViewX(cx);`
`4180`		`- int vy = contentToViewY(cy);`
`4181`		`- pinScrollTo(vx, vy, true, 0);`
	`4179`	`+ int vx = contentToViewDimension(cx - mScrollOffset.x);`
	`4180`	`+ int vy = contentToViewDimension(cy - mScrollOffset.y);`
	`4181`	`+ pinScrollBy(vx, vy, true, 0);`
`4182`	`4182`	`}`
`4183`	`4183`
`4184`	`4184`	`/**`