Android WebView Merged-Thread Hardware Draw

android_webview/browser/browser_view_renderer_impl.cc

Index: android_webview/browser/browser_view_renderer_impl.cc
diff --git a/android_webview/browser/browser_view_renderer_impl.cc b/android_webview/browser/browser_view_renderer_impl.cc
index cc3f5c58196259fe493ba4d1d2d86c9d2e7021d9..ddeb8ccd444efed4300b6090424d9cb83fd55e6f 100644
--- a/android_webview/browser/browser_view_renderer_impl.cc
+++ b/android_webview/browser/browser_view_renderer_impl.cc
@@ -118,7 +118,7 @@ class BrowserViewRendererImpl::UserData : public content::WebContents::Data {
 };
 
 // static
-BrowserViewRendererImpl* BrowserViewRendererImpl::Create(
+BrowserViewRenderer* BrowserViewRendererImpl::Create(
     BrowserViewRenderer::Client* client,
     JavaHelper* java_helper) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
@@ -135,15 +135,6 @@ BrowserViewRendererImpl* BrowserViewRendererImpl::FromWebContents(
   return UserData::GetInstance(contents);
 }
 
-// static
-BrowserViewRendererImpl* BrowserViewRendererImpl::FromId(int render_process_id,
-                                                         int render_view_id) {
-  const content::RenderViewHost* rvh =
-      content::RenderViewHost::FromID(render_process_id, render_view_id);
-  if (!rvh) return NULL;
-  return FromWebContents(content::WebContents::FromRenderViewHost(rvh));
-}
-
 BrowserViewRendererImpl::BrowserViewRendererImpl(
     BrowserViewRenderer::Client* client,
     JavaHelper* java_helper)
@@ -182,11 +173,6 @@ BrowserViewRendererImpl::~BrowserViewRendererImpl() {
   SetContents(NULL);
 }
 
-void BrowserViewRendererImpl::BindSynchronousCompositor(
-    content::SynchronousCompositor* compositor) {
-  NOTREACHED();  // Must be handled by the InProcessViewRenderer
-}
-
 // static
 void BrowserViewRendererImpl::SetAwDrawSWFunctionTable(
     AwDrawSWFunctionTable* table) {
@@ -493,17 +479,6 @@ void BrowserViewRendererImpl::OnPictureUpdated(int process_id,
   Invalidate();
 }
 
-void BrowserViewRendererImpl::OnPageScaleFactorChanged(
-    int process_id,
-    int render_view_id,
-    float page_scale_factor) {
-  CHECK_EQ(web_contents_->GetRenderProcessHost()->GetID(), process_id);
-  if (render_view_id != web_contents_->GetRoutingID())
-    return;
-
-  client_->OnPageScaleFactorChanged(page_scale_factor);
-}
-
 void BrowserViewRendererImpl::SetCompositorVisibility(bool visible) {
   if (compositor_visible_ != visible) {
     compositor_visible_ = visible;