Move synchronous compositor into content/browser

content/renderer/render_widget.cc

 // Copyright (c) 2012 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/renderer/render_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 44 matching lines @@
 #include "ui/gfx/skia_util.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/surface/transport_dib.h"
 #include "webkit/glue/cursor_utils.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/renderer/compositor_bindings/web_rendering_stats_impl.h"
 
 #if defined(OS_ANDROID)
-#include "content/renderer/android/synchronous_compositor_impl.h"
-#include "content/renderer/android/synchronous_compositor_output_surface.h"
+#include "content/renderer/android/synchronous_compositor_factory.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #include "third_party/skia/include/core/SkMallocPixelRef.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #endif  // defined(OS_POSIX)
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h"
 
@@ skipping 222 matching lines @@
   if (!is_swapped_out)
     RenderProcess::current()->AddRefProcess();
 }
 
 bool RenderWidget::AllowPartialSwap() const {
   return true;
 }
 
 bool RenderWidget::UsingSynchronousRendererCompositor() const {
 #if defined(OS_ANDROID)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableSynchronousRendererCompositor)) {
-    return true;
-  }
+  return SynchronousCompositorFactory::GetInstance() != NULL;
+#else
+  return false;
 #endif
-  return false;
 }
 
 bool RenderWidget::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RenderWidget, message)
     IPC_MESSAGE_HANDLER(InputMsg_HandleInputEvent, OnHandleInputEvent)
     IPC_MESSAGE_HANDLER(InputMsg_CursorVisibilityChange,
                         OnCursorVisibilityChange)
     IPC_MESSAGE_HANDLER(InputMsg_MouseCaptureLost, OnMouseCaptureLost)
     IPC_MESSAGE_HANDLER(InputMsg_SetFocus, OnSetFocus)
@@ skipping 254 matching lines @@
 }
 
 bool RenderWidget::ForceCompositingModeEnabled() {
   return false;
 }
 
 scoped_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
 #if defined(OS_ANDROID)
-  if (GetSynchronousCompositor()) {
-    return GetSynchronousCompositor()->CreateOutputSurface();
+   if (SynchronousCompositorFactory* factory =
+       SynchronousCompositorFactory::GetInstance()) {
+    return factory->CreateOutputSurface(routing_id());
   }
 #endif
 
   if (command_line.HasSwitch(switches::kEnableSoftwareCompositingGLAdapter)) {
       return scoped_ptr<cc::OutputSurface>(
           new CompositorOutputSurface(routing_id(), NULL,
               new CompositorSoftwareOutputDevice()));
   }
 
   // Explicitly disable antialiasing for the compositor. As of the time of
@@ skipping 22 matching lines @@
   bool composite_to_mailbox =
       command_line.HasSwitch(cc::switches::kCompositeToMailbox) &&
       !command_line.HasSwitch(switches::kEnableDelegatedRenderer);
   // No swap throttling yet when compositing on the main thread.
   DCHECK(!composite_to_mailbox || is_threaded_compositing_enabled_);
   return scoped_ptr<cc::OutputSurface>(composite_to_mailbox ?
       new MailboxOutputSurface(routing_id(), context, NULL) :
           new CompositorOutputSurface(routing_id(), context, NULL));
 }
 
-#if defined(OS_ANDROID)
-SynchronousCompositorImpl* RenderWidget::GetSynchronousCompositor() {
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (!synchronous_compositor_ &&
-      command_line.HasSwitch(switches::kEnableSynchronousRendererCompositor)) {
-    synchronous_compositor_.reset(new SynchronousCompositorImpl(routing_id()));
-  }
-  return synchronous_compositor_.get();
-}
-#endif
-
 void RenderWidget::OnViewContextSwapBuffersAborted() {
   TRACE_EVENT0("renderer", "RenderWidget::OnSwapBuffersAborted");
   while (!updates_pending_swap_.empty()) {
     ViewHostMsg_UpdateRect* msg = updates_pending_swap_.front();
     updates_pending_swap_.pop_front();
     // msg can be NULL if the swap doesn't correspond to an DoDeferredUpdate
     // compositing pass, hence doesn't require an UpdateRect message.
     if (msg)
       Send(msg);
   }
@@ skipping 1738 matching lines @@
 
   if (!context->Initialize(
           attributes,
           false /* bind generates resources */,
           CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE))
     return NULL;
   return context.release();
 }
 
 }  // namespace content