[Android WebView] Migrate the rendering code to a separate set of classes.

android_webview/renderer/aw_render_view_ext.cc

Index: android_webview/renderer/aw_render_view_ext.cc
diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc
index 4a86bc1979ae144f0954a0a708f43d84b38e6fdd..f080505bcc846d7808d170d6a34b652a5f291792 100644
--- a/android_webview/renderer/aw_render_view_ext.cc
+++ b/android_webview/renderer/aw_render_view_ext.cc
@@ -48,19 +48,9 @@ bool RemovePrefixAndAssignIfMatches(const base::StringPiece& prefix,
 AwRenderViewExt::AwRenderViewExt(content::RenderView* render_view)
     : content::RenderViewObserver(render_view) {
   render_view->GetWebView()->setPermissionClient(this);
-  // TODO(leandrogracia): enable once the feature is available in RenderView.
-  // TODO(leandrogracia): remove when SW rendering uses Ubercompositor.
-  // Until then we need the callback enabled for SW mode invalidation.
-  // http://crbug.com/170086.
-  //render_view->SetCapturePictureCallback(
-  //    base::Bind(&AwRenderViewExt::OnPictureUpdate, AsWeakPtr()));
 }
 
 AwRenderViewExt::~AwRenderViewExt() {
-  // TODO(leandrogracia): enable once the feature is available in RenderView.
-  //render_view()->SetCapturePictureCallback(
-  //    content::RenderView::CapturePictureCallback());
-  RendererPictureMap::GetInstance()->ClearRendererPicture(routing_id());
 }
 
 // static
@@ -73,10 +63,6 @@ bool AwRenderViewExt::OnMessageReceived(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(AwRenderViewExt, message)
     IPC_MESSAGE_HANDLER(AwViewMsg_DocumentHasImages, OnDocumentHasImagesRequest)
     IPC_MESSAGE_HANDLER(AwViewMsg_DoHitTest, OnDoHitTest)
-    IPC_MESSAGE_HANDLER(AwViewMsg_EnableCapturePictureCallback,
-                        OnEnableCapturePictureCallback)
-    IPC_MESSAGE_HANDLER(AwViewMsg_CapturePictureSync,
-                        OnCapturePictureSync)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -198,22 +184,4 @@ void AwRenderViewExt::OnDoHitTest(int view_x, int view_y) {
   Send(new AwViewHostMsg_UpdateHitTestData(routing_id(), data));
 }
 
-void AwRenderViewExt::OnEnableCapturePictureCallback(bool enable) {
-  // TODO(leandrogracia): enable once the feature is available in RenderView.
-  //render_view()->SetCapturePictureCallback(enable ?
-  //    base::Bind(&AwRenderViewExt::OnPictureUpdate, AsWeakPtr()) :
-  //    content::RenderView::CapturePictureCallback());
-}
-
-void AwRenderViewExt::OnPictureUpdate(skia::RefPtr<SkPicture> picture) {
-  RendererPictureMap::GetInstance()->SetRendererPicture(routing_id(), picture);
-  Send(new AwViewHostMsg_PictureUpdated(routing_id()));
-}
-
-void AwRenderViewExt::OnCapturePictureSync() {
-  // TODO(leandrogracia): enable once the feature is available in RenderView.
-  //RendererPictureMap::GetInstance()->SetRendererPicture(
-  //    routing_id(), render_view()->CapturePicture());
-}
-
 }  // namespace android_webview