Android WebView Merged-Thread Hardware Draw

android_webview/browser/browser_view_renderer_impl.cc

 // Copyright (c) 2013 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/browser_view_renderer_impl.h"
 
 #include <android/bitmap.h>
 
 #include "android_webview/browser/in_process_renderer/in_process_view_renderer.h"
 #include "android_webview/common/aw_switches.h"
@@ skipping 100 matching lines @@
     UserData* data = reinterpret_cast<UserData*>(
         contents->GetUserData(kUserDataKey));
     return data ? data->instance_ : NULL;
   }
 
  private:
   BrowserViewRendererImpl* instance_;
 };
 
 // static
-BrowserViewRendererImpl* BrowserViewRendererImpl::Create(
+BrowserViewRenderer* BrowserViewRendererImpl::Create(
     BrowserViewRenderer::Client* client,
     JavaHelper* java_helper) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kNoMergeUIAndRendererCompositorThreads)) {
     return new BrowserViewRendererImpl(client, java_helper);
   }
 
   return new InProcessViewRenderer(client, java_helper);
 }
 
 // static
 BrowserViewRendererImpl* BrowserViewRendererImpl::FromWebContents(
     content::WebContents* contents) {
   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)
     : client_(client),
       java_helper_(java_helper),
       view_renderer_host_(new ViewRendererHost(NULL, this)),
       compositor_(Compositor::Create(this)),
       view_clip_layer_(cc::Layer::Create()),
       transform_layer_(cc::Layer::Create()),
       scissor_clip_layer_(cc::Layer::Create()),
@@ skipping 18 matching lines @@
   scissor_clip_layer_->AddChild(transform_layer_);
   compositor_->SetRootLayer(scissor_clip_layer_);
 
   RendererPictureMap::CreateInstance();
 }
 
 BrowserViewRendererImpl::~BrowserViewRendererImpl() {
   SetContents(NULL);
 }
 
-void BrowserViewRendererImpl::BindSynchronousCompositor(
-    content::SynchronousCompositor* compositor) {
-  NOTREACHED();  // Must be handled by the InProcessViewRenderer
-}
-
 // static
 void BrowserViewRendererImpl::SetAwDrawSWFunctionTable(
     AwDrawSWFunctionTable* table) {
   g_sw_draw_functions = table;
   g_is_skia_version_compatible =
       g_sw_draw_functions->is_skia_version_compatible(&SkGraphics::GetVersion);
   LOG_IF(WARNING, !g_is_skia_version_compatible)
       << "Skia versions are not compatible, rendering performance will suffer.";
 }
 
@@ skipping 286 matching lines @@
 }
 
 void BrowserViewRendererImpl::OnPictureUpdated(int process_id,
                                                int render_view_id) {
   client_->OnNewPicture();
 
   // TODO(mkosiba): Remove when invalidation path is re-implemented.
   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;
     compositor_->SetVisible(compositor_visible_);
   }
 }
 
 void BrowserViewRendererImpl::ResetCompositor() {
   compositor_.reset(content::Compositor::Create(this));
   compositor_->SetRootLayer(scissor_clip_layer_);
@@ skipping 33 matching lines @@
 
 void BrowserViewRendererImpl::OnFrameInfoUpdated(
     const gfx::SizeF& content_size,
     const gfx::Vector2dF& scroll_offset,
     float page_scale_factor) {
   page_scale_ = page_scale_factor;
   content_size_css_ = content_size;
 }
 
 }  // namespace android_webview