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

android_webview/native/aw_contents.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
 
 #include <jni.h>
 #include <string>
 
@@ skipping 34 matching lines @@
   // Returns the AwContents instance associated with |web_contents|, or NULL.
   static AwContents* FromWebContents(content::WebContents* web_contents);
 
   AwContents(JNIEnv* env,
              jobject obj,
              jobject web_contents_delegate,
              bool private_browsing);
   virtual ~AwContents();
 
   void DrawGL(AwDrawGLInfo* draw_info);
-  bool DrawSW(JNIEnv* env, jobject obj, jobject canvas);
+  bool DrawSW(JNIEnv* env, jobject obj, jobject canvas, jint scroll_x,
+              jint scroll_y);
 
   void RunJavaScriptDialog(
       content::JavaScriptMessageType message_type,
       const GURL& origin_url,
       const string16& message_text,
       const string16& default_prompt_text,
       const base::android::ScopedJavaLocalRef<jobject>& js_result);
 
   void RunBeforeUnloadDialog(
       const GURL& origin_url,
@@ skipping 73 matching lines @@
   scoped_ptr<AwWebContentsDelegate> web_contents_delegate_;
   scoped_ptr<AwRenderViewHostExt> render_view_host_ext_;
   scoped_ptr<FindHelper> find_helper_;
   scoped_ptr<content::WebContents> pending_contents_;
 
   // Compositor-specific state.
   scoped_ptr<content::Compositor> compositor_;
   scoped_refptr<cc::Layer> scissor_clip_layer_;
   scoped_refptr<cc::Layer> transform_layer_;
   scoped_refptr<cc::Layer> view_clip_layer_;
+  gfx::Point hw_rendering_scroll_;
   gfx::Size view_size_;
   bool view_visible_;
   bool compositor_visible_;
   bool is_composite_pending_;
-  int last_scroll_x_, last_scroll_y_;
 
   // Used only for detecting Android View System context changes.
   // Not to be used between draw calls.
   EGLContext last_frame_context_;
 
   DISALLOW_COPY_AND_ASSIGN(AwContents);
 };
 
 bool RegisterAwContents(JNIEnv* env);
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_