[Android WebView] Update SW rendering to use SkPicture and fix scrolling cases.

android_webview/java/src/org/chromium/android_webview/AwContents.java

Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 27038d6798e536d1ea791b897a76ef8b924ee27e..0442aa4b0d7ced39369eefb9faf1820f4a29cb40 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -354,7 +354,8 @@ public class AwContents {
     }
 
     public void onDraw(Canvas canvas) {
-        if (!nativeDrawSW(mNativeAwContents, canvas)) {
+        if (!nativeDrawSW(mNativeAwContents, canvas, mContainerView.getScrollX(),
+                mContainerView.getScrollY())) {
             Log.w(TAG, "Native DrawSW failed; clearing to background color.");
             int c = mContentViewCore.getBackgroundColor();
             canvas.drawRGB(Color.red(c), Color.green(c), Color.blue(c));
@@ -953,7 +954,8 @@ public class AwContents {
     private native void nativeSetInterceptNavigationDelegate(int nativeAwContents,
             InterceptNavigationDelegate navigationInterceptionDelegate);
 
-    private native boolean nativeDrawSW(int nativeAwContents, Canvas canvas);
+    private native boolean nativeDrawSW(int nativeAwContents, Canvas canvas, int scrollX,
+            int scrollY);
     private native void nativeSetScrollForHWFrame(int nativeAwContents, int scrollX, int scrollY);
     private native int nativeFindAllSync(int nativeAwContents, String searchString);
     private native void nativeFindAllAsync(int nativeAwContents, String searchString);