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

android_webview/renderer/aw_render_view_ext.cc

 // 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.
 
 #include "android_webview/renderer/aw_render_view_ext.h"
 
 #include <string>
 
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/common/render_view_messages.h"
@@ skipping 30 matching lines @@
     return true;
   }
   return false;
 }
 
 }
 
 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
 void AwRenderViewExt::RenderViewCreated(content::RenderView* render_view) {
   new AwRenderViewExt(render_view);  // |render_view| takes ownership.
 }
 
 bool AwRenderViewExt::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   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;
 }
 
 void AwRenderViewExt::OnDocumentHasImagesRequest(int id) {
   bool hasImages = false;
   if (render_view()) {
     WebKit::WebView* webview = render_view()->GetWebView();
     if (webview) {
@@ skipping 101 matching lines @@
     data.type = AwHitTestData::IMAGE_TYPE;
     data.extra_data_for_type = data.img_src.spec();
   } else if (result.isContentEditable()) {
     data.type = AwHitTestData::EDIT_TEXT_TYPE;
     DCHECK(data.extra_data_for_type.length() == 0);
   }
 
   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