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

content/renderer/gpu/compositor_thread.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/gpu/compositor_thread.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
+#include "base/message_loop.h"
 #include "content/renderer/gpu/input_event_filter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebActiveWheelFlingParameters.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositorInputHandlerClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositorInputHandler.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
 #if defined(OS_ANDROID)
 // TODO(epenner): Move thread priorities to base. (crbug.com/170549)
 #include <sys/resource.h>
 #endif
@@ skipping 72 matching lines @@
 #if defined(OS_ANDROID)
 // TODO(epenner): Move thread priorities to base. (crbug.com/170549)
 namespace {
 void SetHighThreadPriority() {
   int nice_value = -6; // High priority.
   setpriority(PRIO_PROCESS, base::PlatformThread::CurrentId(), nice_value);
 }
 }
 #endif
 
-CompositorThread::CompositorThread(IPC::Listener* main_listener)
-    : thread_("Compositor") {
+CompositorThread::CompositorThread(IPC::Listener* main_listener, MessageLoop* message_loop)
+    : message_loop_(message_loop),
+      thread_(message_loop->message_loop_proxy()) {
   filter_ =
       new InputEventFilter(main_listener,
-                           thread_.message_loop()->message_loop_proxy(),
+                           message_loop->message_loop_proxy(),
                            base::Bind(&CompositorThread::HandleInputEvent,
                                       base::Unretained(this)));
 #if defined(OS_ANDROID)
 // TODO(epenner): Move thread priorities to base. (crbug.com/170549)
-  thread_.message_loop()->PostTask(FROM_HERE,
-                                   base::Bind(&SetHighThreadPriority));
+  message_loop->PostTask(FROM_HERE, base::Bind(&SetHighThreadPriority));
 #endif
 }
 
 CompositorThread::~CompositorThread() {
 }
 
 IPC::ChannelProxy::MessageFilter* CompositorThread::GetMessageFilter() const {
   return filter_;
 }
 
 void CompositorThread::AddInputHandler(
     int routing_id, int input_handler_id,
     const base::WeakPtr<RenderViewImpl>& render_view_impl) {
-  DCHECK_NE(thread_.message_loop(), MessageLoop::current());
+  DCHECK_NE(message_loop_, MessageLoop::current());
 
-  thread_.message_loop()->PostTask(
+  message_loop_->PostTask(
       FROM_HERE,
       base::Bind(&CompositorThread::AddInputHandlerOnCompositorThread,
                  base::Unretained(this),
                  routing_id,
                  input_handler_id,
                  base::MessageLoopProxy::current(),
                  render_view_impl));
 }
 
 void CompositorThread::AddInputHandlerOnCompositorThread(
     int routing_id, int input_handler_id,
     scoped_refptr<base::MessageLoopProxy> main_loop,
     const base::WeakPtr<RenderViewImpl>& render_view_impl) {
 
-  DCHECK_EQ(thread_.message_loop(), MessageLoop::current());
+  DCHECK_EQ(message_loop_, MessageLoop::current());
 
   WebCompositorInputHandler* input_handler =
       WebCompositorInputHandler::fromIdentifier(input_handler_id);
   if (!input_handler)
     return;
 
   if (input_handlers_.count(routing_id) != 0) {
     // It's valid to call AddInputHandler() for the same routing id with the
     // same input_handler many times, but it's not valid to change the
     // input_handler for a route.
     DCHECK_EQ(input_handlers_[routing_id]->input_handler(), input_handler);
     return;
   }
 
   TRACE_EVENT0("CompositorThread::AddInputHandler", "AddingRoute");
   filter_->AddRoute(routing_id);
   input_handlers_[routing_id] =
       make_scoped_refptr(new InputHandlerWrapper(this,
           routing_id, input_handler, main_loop, render_view_impl));
 }
 
 void CompositorThread::RemoveInputHandler(int routing_id) {
-  DCHECK_EQ(MessageLoop::current(), thread_.message_loop());
+  DCHECK_EQ(MessageLoop::current(), message_loop_);
 
   TRACE_EVENT0("CompositorThread::RemoveInputHandler", "RemovingRoute");
 
   filter_->RemoveRoute(routing_id);
   input_handlers_.erase(routing_id);
 }
 
 void CompositorThread::HandleInputEvent(
     int routing_id,
     const WebInputEvent* input_event) {
-  DCHECK_EQ(MessageLoop::current(), thread_.message_loop());
+  DCHECK_EQ(MessageLoop::current(), message_loop_);
 
   InputHandlerMap::iterator it = input_handlers_.find(routing_id);
   if (it == input_handlers_.end()) {
     TRACE_EVENT0("CompositorThread::HandleInputEvent", "NoInputHandlerFound");
     // Oops, we no longer have an interested input handler..
     filter_->DidNotHandleInputEvent(true);
     return;
   }
 
   it->second->input_handler()->handleInputEvent(*input_event);
 }
 
 }  // namespace content