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

android_webview/browser/renderer_host/aw_render_view_host_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/browser/renderer_host/aw_render_view_host_ext.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "android_webview/common/render_view_messages.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 
 namespace android_webview {
 
-AwRenderViewHostExt::AwRenderViewHostExt(content::WebContents* contents,
-                                         Client* client)
+AwRenderViewHostExt::AwRenderViewHostExt(content::WebContents* contents)
     : content::WebContentsObserver(contents),
-      has_new_hit_test_data_(false),
-      client_(client) {
+      has_new_hit_test_data_(false) {
 }
 
 AwRenderViewHostExt::~AwRenderViewHostExt() {}
 
 void AwRenderViewHostExt::DocumentHasImages(DocumentHasImagesResult result) {
   DCHECK(CalledOnValidThread());
   if (!web_contents()->GetRenderViewHost()) {
     result.Run(false);
     return;
   }
@@ skipping 22 matching lines @@
   Send(new AwViewMsg_DoHitTest(web_contents()->GetRoutingID(),
                                view_x,
                                view_y));
 }
 
 const AwHitTestData& AwRenderViewHostExt::GetLastHitTestData() const {
   DCHECK(CalledOnValidThread());
   return last_hit_test_data_;
 }
 
-void AwRenderViewHostExt::EnableCapturePictureCallback(bool enabled) {
-  Send(new AwViewMsg_EnableCapturePictureCallback(
-      web_contents()->GetRoutingID(), enabled));
-}
-
 void AwRenderViewHostExt::RenderViewGone(base::TerminationStatus status) {
   DCHECK(CalledOnValidThread());
   for (std::map<int, DocumentHasImagesResult>::iterator pending_req =
            pending_document_has_images_requests_.begin();
        pending_req != pending_document_has_images_requests_.end();
       ++pending_req) {
     pending_req->second.Run(false);
   }
 }
 
 void AwRenderViewHostExt::DidNavigateAnyFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   DCHECK(CalledOnValidThread());
 
   AwBrowserContext::FromWebContents(web_contents())
       ->AddVisitedURLs(params.redirects);
 }
 
 bool AwRenderViewHostExt::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(AwRenderViewHostExt, message)
     IPC_MESSAGE_HANDLER(AwViewHostMsg_DocumentHasImagesResponse,
                         OnDocumentHasImagesResponse)
     IPC_MESSAGE_HANDLER(AwViewHostMsg_UpdateHitTestData,
                         OnUpdateHitTestData)
-    IPC_MESSAGE_HANDLER(AwViewHostMsg_PictureUpdated,
-                        OnPictureUpdated)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled ? true : WebContentsObserver::OnMessageReceived(message);
 }
 
 void AwRenderViewHostExt::OnDocumentHasImagesResponse(int msg_id,
                                                       bool has_images) {
   DCHECK(CalledOnValidThread());
   std::map<int, DocumentHasImagesResult>::iterator pending_req =
       pending_document_has_images_requests_.find(msg_id);
   if (pending_req == pending_document_has_images_requests_.end()) {
     DLOG(WARNING) << "unexpected DocumentHasImages Response: " << msg_id;
   } else {
     pending_req->second.Run(has_images);
     pending_document_has_images_requests_.erase(pending_req);
   }
 }
 
 void AwRenderViewHostExt::OnUpdateHitTestData(
     const AwHitTestData& hit_test_data) {
   DCHECK(CalledOnValidThread());
   last_hit_test_data_ = hit_test_data;
   has_new_hit_test_data_ = true;
 }
 
-void AwRenderViewHostExt::OnPictureUpdated() {
-  if (client_)
-    client_->OnPictureUpdated(web_contents()->GetRenderProcessHost()->GetID(),
-                              routing_id());
-}
-
-bool AwRenderViewHostExt::IsRenderViewReady() const {
-  return web_contents()->GetRenderProcessHost()->HasConnection() &&
-      web_contents()->GetRenderViewHost() &&
-      web_contents()->GetRenderViewHost()->IsRenderViewLive();
-}
-
-void AwRenderViewHostExt::CapturePictureSync() {
-  if (!IsRenderViewReady())
-    return;
-
-  ScopedAllowWaitForLegacyWebViewApi wait;
-  Send(new AwViewMsg_CapturePictureSync(web_contents()->GetRoutingID()));
-}
-
 }  // namespace android_webview