Android WebView Merged-Thread Hardware Draw

android_webview/browser/renderer_host/view_renderer_host.cc

Index: android_webview/browser/renderer_host/view_renderer_host.cc
diff --git a/android_webview/browser/renderer_host/view_renderer_host.cc b/android_webview/browser/renderer_host/view_renderer_host.cc
index 49227ecd64031586019a8f83fa303705f2106db6..8dd9314fae79a94602e6483854da55e518475f3e 100644
--- a/android_webview/browser/renderer_host/view_renderer_host.cc
+++ b/android_webview/browser/renderer_host/view_renderer_host.cc
@@ -8,12 +8,9 @@
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/common/render_view_messages.h"
 #include "android_webview/common/renderer_picture_map.h"
-#include "base/command_line.h"
-#include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositorInputHandler.h"
 
 namespace android_webview {
 
@@ -45,35 +42,6 @@ void ViewRendererHost::OnPictureUpdated() {
                             routing_id());
 }
 
-void ViewRendererHost::OnDidActivateAcceleratedCompositing(
-    int input_handler_id) {
-
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kNoMergeUIAndRendererCompositorThreads)) {
-    return;
-  }
-
-  // This call is only meaningful and thread-safe when the UI and renderer
-  // compositor share the same thread.  Any other case will likely yield
-  // terrible, terrible damage.
-  WebKit::WebCompositorInputHandler* input_handler =
-      WebKit::WebCompositorInputHandler::fromIdentifier(input_handler_id);
-  if (!input_handler)
-    return;
-
-  content::ContentViewCore* content_view_core
-      = content::ContentViewCore::FromWebContents(web_contents());
-  if (content_view_core)
-    content_view_core->SetInputHandler(input_handler);
-}
-
-void ViewRendererHost::OnPageScaleFactorChanged(float page_scale_factor) {
-  client_->OnPageScaleFactorChanged(
-      web_contents()->GetRenderProcessHost()->GetID(),
-      routing_id(),
-      page_scale_factor);
-}
-
 void ViewRendererHost::RenderViewGone(base::TerminationStatus status) {
   DCHECK(CalledOnValidThread());
   RendererPictureMap::GetInstance()->ClearRendererPicture(
@@ -85,10 +53,6 @@ bool ViewRendererHost::OnMessageReceived(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(ViewRendererHost, message)
     IPC_MESSAGE_HANDLER(AwViewHostMsg_PictureUpdated,
                         OnPictureUpdated)
-    IPC_MESSAGE_HANDLER(AwViewHostMsg_DidActivateAcceleratedCompositing,
-                        OnDidActivateAcceleratedCompositing)
-    IPC_MESSAGE_HANDLER(AwViewHostMsg_PageScaleFactorChanged,
-                        OnPageScaleFactorChanged)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()