[NOT FOR COMMIT] Hacks to merge render compositor thread with UI thread

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 99 matching lines @@
 #endif
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #endif
 
 #if defined(ENABLE_WEBRTC)
 #include "third_party/webrtc/system_wrappers/interface/event_tracer.h"
 #endif
 
+#include "content/public/browser/browser_thread.h"
+#include "chrome/browser/metrics/thread_watcher.h"
+
+
+
 using WebKit::WebDocument;
 using WebKit::WebFrame;
 using WebKit::WebNetworkStateNotifier;
 using WebKit::WebRuntimeFeatures;
 using WebKit::WebScriptController;
 using WebKit::WebSecurityPolicy;
 using WebKit::WebString;
 using WebKit::WebView;
 
 namespace content {
@@ skipping 467 matching lines @@
       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));
+    compositor_thread_.reset(new CompositorThread(this, BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::UI)));
     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();
@@ skipping 258 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(
+    BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::UI)->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 302 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