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

android_webview/common/renderer_picture_map.cc

Index: android_webview/common/renderer_picture_map.cc
diff --git a/android_webview/common/renderer_picture_map.cc b/android_webview/common/renderer_picture_map.cc
index f5e9e036fbd831ce165cf3614bccd6838522df6a..c27cc5665644b92a78b55c1123ced6ed4349b188 100644
--- a/android_webview/common/renderer_picture_map.cc
+++ b/android_webview/common/renderer_picture_map.cc
@@ -4,6 +4,8 @@
 
 #include "android_webview/common/renderer_picture_map.h"
 
+#include "base/logging.h"
+
 using base::AutoLock;
 
 namespace android_webview {
@@ -28,14 +30,13 @@ RendererPictureMap::RendererPictureMap() {
 RendererPictureMap::~RendererPictureMap() {
 }
 
-scoped_refptr<cc::PicturePileImpl> RendererPictureMap::GetRendererPicture(
-    int id) {
+skia::RefPtr<SkPicture> RendererPictureMap::GetRendererPicture(int id) {
   AutoLock lock(lock_);
   return picture_map_[id];
 }
 
 void RendererPictureMap::SetRendererPicture(int id,
-    scoped_refptr<cc::PicturePileImpl> picture) {
+    skia::RefPtr<SkPicture> picture) {
   AutoLock lock(lock_);
   picture_map_[id] = picture;
 }