Remove CompositorThread dependency on WebThread

content/renderer/render_thread_impl.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_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 306 matching lines @@
 
   // In single process the single process is all there is.
   suspend_webkit_shared_timer_ = true;
   notify_webkit_of_modal_loop_ = true;
   widget_count_ = 0;
   hidden_widget_count_ = 0;
   idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs;
   idle_notifications_to_skip_ = 0;
   should_send_focus_ipcs_ = true;
   short_circuit_size_updates_ = false;
-  compositor_initialized_ = false;
 
   appcache_dispatcher_.reset(new AppCacheDispatcher(Get()));
   dom_storage_dispatcher_.reset(new DomStorageDispatcher());
   main_thread_indexed_db_dispatcher_.reset(new IndexedDBDispatcher());
 
   media_stream_center_ = NULL;
 
   db_message_filter_ = new DBMessageFilter();
   AddFilter(db_message_filter_.get());
 
@@ skipping 66 matching lines @@
 
   // Shutdown the file thread if it's running.
   if (file_thread_.get())
     file_thread_->Stop();
 
   if (compositor_output_surface_filter_.get()) {
     RemoveFilter(compositor_output_surface_filter_.get());
     compositor_output_surface_filter_ = NULL;
   }
 
-  if (compositor_initialized_) {
-    WebKit::Platform::current()->compositorSupport()->shutdown();
-    compositor_initialized_ = false;
-  }
   if (compositor_thread_.get()) {
     RemoveFilter(compositor_thread_->GetMessageFilter());
     compositor_thread_.reset();
   }
 
   if (webkit_platform_support_.get())
     WebKit::shutdown();
 
   lazy_tls.Pointer()->Set(NULL);
 
@@ skipping 166 matching lines @@
   if (webkit_platform_support_.get())
     return;
 
   webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl);
   WebKit::initialize(webkit_platform_support_.get());
   WebKit::setSharedWorkerRepository(
       webkit_platform_support_.get()->sharedWorkerRepository());
   WebKit::setIDBFactory(
       webkit_platform_support_.get()->idbFactory());
 
-  WebKit::WebCompositorSupport* compositor_support =
-      WebKit::Platform::current()->compositorSupport();
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   bool enable = command_line.HasSwitch(switches::kEnableThreadedCompositing);
   if (enable) {
     compositor_thread_.reset(new CompositorThread(this));
     AddFilter(compositor_thread_->GetMessageFilter());
-    compositor_support->initialize(compositor_thread_->GetWebThread());
-  } else {
-    compositor_support->initialize(NULL);
   }
-  compositor_initialized_ = true;
 
-  MessageLoop* output_surface_loop = enable ?
-      compositor_thread_->message_loop() :
-      MessageLoop::current();
+  base::MessageLoopProxy* output_surface_loop;
+  if (enable)
+    output_surface_loop = compositor_thread_->message_loop_proxy();
+  else
+    output_surface_loop = base::MessageLoopProxy::current();
 
-  compositor_output_surface_filter_ = CompositorOutputSurface::CreateFilter(
-      output_surface_loop->message_loop_proxy());
+  compositor_output_surface_filter_ =
+      CompositorOutputSurface::CreateFilter(output_surface_loop);
   AddFilter(compositor_output_surface_filter_.get());
 
   WebScriptController::enableV8SingleThreadMode();
 
   RenderThreadImpl::RegisterSchemes();
 
   webkit_glue::EnableWebCoreLogChannels(
       command_line.GetSwitchValueASCII(switches::kWebCoreLogChannels));
 
   web_database_observer_impl_.reset(
@@ skipping 246 matching lines @@
   idle_notifications_to_skip_ = 2;
 }
 
 /* static */
 void RenderThreadImpl::OnGpuVDAContextLoss() {
   RenderThreadImpl* self = RenderThreadImpl::current();
   DCHECK(self);
   if (!self->gpu_vda_context3d_.get())
     return;
   if (self->compositor_thread()) {
-    self->compositor_thread()->GetWebThread()->message_loop()->DeleteSoon(
+    self->compositor_thread()->message_loop_proxy()->DeleteSoon(
         FROM_HERE, self->gpu_vda_context3d_.release());
   } else {
     self->gpu_vda_context3d_.reset();
   }
 }
 
 WebGraphicsContext3DCommandBufferImpl*
 RenderThreadImpl::GetGpuVDAContext3D() {
   if (!gpu_vda_context3d_.get()) {
     gpu_vda_context3d_.reset(
@@ skipping 349 matching lines @@
 
 void RenderThreadImpl::SetFlingCurveParameters(
     const std::vector<float>& new_touchpad,
     const std::vector<float>& new_touchscreen) {
   webkit_platform_support_->SetFlingCurveParameters(new_touchpad,
                                                     new_touchscreen);
 
 }
 
 }  // namespace content