Android WebView Merged-Thread Hardware Draw

android_webview/browser/in_process_renderer/in_process_renderer_client.cc

Index: android_webview/browser/in_process_renderer/in_process_renderer_client.cc
diff --git a/android_webview/browser/in_process_renderer/in_process_renderer_client.cc b/android_webview/browser/in_process_renderer/in_process_renderer_client.cc
index 5f16ae2e8818a32b7b600339864db20d224c7096..54425ab699bf01f6814ceac84917a768185f2bbe 100644
--- a/android_webview/browser/in_process_renderer/in_process_renderer_client.cc
+++ b/android_webview/browser/in_process_renderer/in_process_renderer_client.cc
@@ -4,7 +4,8 @@
 
 #include "android_webview/browser/in_process_renderer/in_process_renderer_client.h"
 
-#include "android_webview/browser/browser_view_renderer_impl.h"
+#include "android_webview/browser/in_process_renderer/in_process_view_renderer.h"
+#include "android_webview/renderer/aw_render_view_ext.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 
@@ -29,6 +30,11 @@ int GetInProcessRendererId() {
 
 }
 
+void InProcessRendererClient::RenderViewCreated(
+    content::RenderView* render_view) {
+  AwRenderViewExt::RenderViewCreated(render_view);

[joth, 2013/05/09 10:48:52]

I think this will be much easier to clean up if we don't override here, but
instead make ViewRenderHost::RenderViewCreated() a no-op unless the no-merge
flag is set. That way when the flag is deleted it'll be far more obvious that
whole class can be deleted.

+}
+
 MessageLoop* InProcessRendererClient::OverrideCompositorMessageLoop() const {
  MessageLoop* rv = content::BrowserThread::UnsafeGetMessageLoopForThread(
       content::BrowserThread::UI);
@@ -39,8 +45,8 @@ MessageLoop* InProcessRendererClient::OverrideCompositorMessageLoop() const {
 void InProcessRendererClient::DidCreateSynchronousCompositor(
     int render_view_id,
     content::SynchronousCompositor* compositor) {
-  BrowserViewRendererImpl* view_renderer =
-      BrowserViewRendererImpl::FromId(GetInProcessRendererId(), render_view_id);
+  InProcessViewRenderer* view_renderer =
+      InProcessViewRenderer::FromId(GetInProcessRendererId(), render_view_id);
   if (view_renderer)
     view_renderer->BindSynchronousCompositor(compositor);
 }