Android Webview IPC-based sync compositing

content/browser/android/in_process/synchronous_compositor_impl.cc

 // Copyright 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 "content/browser/android/in_process/synchronous_compositor_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "content/browser/android/in_process/synchronous_compositor_factory_impl.h"
 #include "content/browser/android/in_process/synchronous_compositor_registry_in_proc.h"
 #include "content/browser/android/in_process/synchronous_input_event_filter.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
-#include "content/browser/web_contents/web_contents_android.h"
-#include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/input/did_overscroll_params.h"
 #include "content/common/input_messages.h"
 #include "content/public/browser/android/synchronous_compositor_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/common/child_process_host.h"
 #include "ui/gfx/geometry/scroll_offset.h"
 #include "ui/gl/gl_surface.h"
 
 namespace content {
 
 namespace {
 
 int g_process_id = ChildProcessHost::kInvalidUniqueID;
 
 base::LazyInstance<SynchronousCompositorFactoryImpl>::Leaky g_factory =
     LAZY_INSTANCE_INITIALIZER;
 
-base::Thread* CreateInProcessGpuThreadForSynchronousCompositor(
-    const InProcessChildThreadParams& params) {
-  return g_factory.Get().CreateInProcessGpuThread(params);
-}
-
 }  // namespace
 
 SynchronousCompositorImpl* SynchronousCompositorImpl::FromRoutingID(
     int routing_id) {
   if (g_factory == nullptr)
     return nullptr;
   if (g_process_id == ChildProcessHost::kInvalidUniqueID)
     return nullptr;
   RenderViewHost* rvh = RenderViewHost::FromID(g_process_id, routing_id);
   if (!rvh)
     return nullptr;
   RenderWidgetHostViewAndroid* rwhva =
       static_cast<RenderWidgetHostViewAndroid*>(rvh->GetWidget()->GetView());
   if (!rwhva)
     return nullptr;
-  return rwhva->GetSynchronousCompositorImpl();
-}
-
-// static
-scoped_ptr<SynchronousCompositorImpl> SynchronousCompositorImpl::Create(
-    RenderWidgetHostViewAndroid* rwhva,
-    WebContents* web_contents) {
-  DCHECK(web_contents);
-  WebContentsAndroid* web_contents_android =
-      static_cast<WebContentsImpl*>(web_contents)->GetWebContentsAndroid();
-  if (!web_contents_android->synchronous_compositor_client())
-    return nullptr;  // Not using sync compositing.
-
-  return make_scoped_ptr(new SynchronousCompositorImpl(
-      rwhva, web_contents_android->synchronous_compositor_client()));
+  return static_cast<SynchronousCompositorImpl*>(
+      rwhva->GetSynchronousCompositor());
 }
 
 SynchronousCompositorImpl::SynchronousCompositorImpl(
     RenderWidgetHostViewAndroid* rwhva,
     SynchronousCompositorClient* client)
     : rwhva_(rwhva),
       routing_id_(rwhva_->GetRenderWidgetHost()->GetRoutingID()),
       compositor_client_(client),
       output_surface_(nullptr),
       begin_frame_source_(nullptr),
       synchronous_input_handler_proxy_(nullptr),
       registered_with_client_(false),
       is_active_(true),
       renderer_needs_begin_frames_(false),
       need_animate_input_(false),
       weak_ptr_factory_(this) {
   DCHECK_NE(routing_id_, MSG_ROUTING_NONE);
+  g_factory.Get();  // Ensure it's initialized.
 
   int process_id = rwhva_->GetRenderWidgetHost()->GetProcess()->GetID();
   if (g_process_id == ChildProcessHost::kInvalidUniqueID) {
     g_process_id = process_id;
   } else {
     DCHECK_EQ(g_process_id, process_id);  // Not multiprocess compatible.
   }
 
   SynchronousCompositorRegistryInProc::GetInstance()->RegisterCompositor(
       routing_id_, this);
@@ skipping 18 matching lines @@
                weak_ptr_factory_.GetWeakPtr()));
 
   // This disables the input system from animating inputs autonomously, instead
   // routing all input animations through the SynchronousInputHandler, which is
   // |this| class. Calling this causes an UpdateRootLayerState() immediately so,
   // do it after setting the client.
   synchronous_input_handler_proxy_->SetOnlySynchronouslyAnimateRootFlings(this);
 }
 
 // static
-void SynchronousCompositor::SetGpuService(
+void SynchronousCompositorImpl::SetGpuServiceInProc(
     scoped_refptr<gpu::InProcessCommandBuffer::Service> service) {
   g_factory.Get().SetDeferredGpuService(service);
-  GpuProcessHost::RegisterGpuMainThreadFactory(
-      CreateInProcessGpuThreadForSynchronousCompositor);
 }
 
 void SynchronousCompositorImpl::DidInitializeRendererObjects(
     SynchronousCompositorOutputSurface* output_surface,
     SynchronousCompositorExternalBeginFrameSource* begin_frame_source,
     SynchronousInputHandlerProxy* synchronous_input_handler_proxy) {
   DCHECK(!output_surface_);
   DCHECK(!begin_frame_source_);
   DCHECK(output_surface);
   DCHECK(begin_frame_source);
@@ skipping 163 matching lines @@
       InputHostMsg_DidStopFlinging(routing_id_));
 }
 
 InputEventAckState SynchronousCompositorImpl::HandleInputEvent(
     const blink::WebInputEvent& input_event) {
   DCHECK(CalledOnValidThread());
   return g_factory.Get().synchronous_input_event_filter()->HandleInputEvent(
       routing_id_, input_event);
 }
 
+bool SynchronousCompositorImpl::OnMessageReceived(const IPC::Message& message) {
+  return false;

[no sievers, 2015/10/29 01:37:00]

ideally NOTREACHED(), or some comment '// not handling any messages' or so would
be nice

[boliu, 2015/10/29 04:24:43]

NOTREACHED is good.

+}
+
 void SynchronousCompositorImpl::DeliverMessages() {
   ScopedVector<IPC::Message> messages;
   output_surface_->GetMessagesToDeliver(&messages);
   RenderProcessHost* rph = rwhva_->GetRenderWidgetHost()->GetProcess();
   for (ScopedVector<IPC::Message>::const_iterator i = messages.begin();
        i != messages.end();
        ++i) {
     rph->OnMessageReceived(**i);
   }
 }
@@ skipping 32 matching lines @@
         max_page_scale_factor);
   }
 }
 
 // Not using base::NonThreadSafe as we want to enforce a more exacting threading
 // requirement: SynchronousCompositorImpl() must only be used on the UI thread.
 bool SynchronousCompositorImpl::CalledOnValidThread() const {
   return BrowserThread::CurrentlyOn(BrowserThread::UI);
 }
 
-// static
-void SynchronousCompositor::SetClientForWebContents(
-    WebContents* contents,
-    SynchronousCompositorClient* client) {
-  DCHECK(contents);
-  DCHECK(client);
-  g_factory.Get();  // Ensure it's initialized.
-  WebContentsAndroid* web_contents_android =
-      static_cast<WebContentsImpl*>(contents)->GetWebContentsAndroid();
-  DCHECK(!web_contents_android->synchronous_compositor_client());
-  web_contents_android->set_synchronous_compositor_client(client);
-}
-
 }  // namespace content