[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 81 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerRepository.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/layout.h"
 #include "ui/base/ui_base_switches.h"
 #include "v8/include/v8.h"
 #include "webkit/glue/webkit_glue.h"
 
+#include "base/threading/thread_restrictions.h"
+
 #if defined(OS_WIN)
 #include <windows.h>
 #include <objbase.h>
 #include "base/win/scoped_com_initializer.h"
 #else
 // TODO(port)
 #include "base/memory/scoped_handle.h"
 #include "content/common/np_channel_base.h"
 #endif
 
@@ skipping 646 matching lines @@
     RenderThreadImpl::HostAllocateSharedMemoryBuffer(size_t size) {
   if (size > static_cast<size_t>(std::numeric_limits<int>::max()))
     return scoped_ptr<base::SharedMemory>();
 
   base::SharedMemoryHandle handle;
   bool success;
   IPC::Message* message =
       new ChildProcessHostMsg_SyncAllocateSharedMemory(size, &handle);
 
   // Allow calling this from the compositor thread.
-  if (MessageLoop::current() == message_loop())
+  if (MessageLoop::current() == message_loop()) {
     success = ChildThread::Send(message);
-  else
+  } else {
+    // This one should be ok...
+    base::ThreadRestrictions::ScopedAllowWait allow_wait;

[boliu, 2013/03/01 00:19:12]

This one just allocates shared mem and does not use DELAYED_RESPONSE, should be
ok.

     success = sync_message_filter()->Send(message);
+  }
 
   if (!success)
     return scoped_ptr<base::SharedMemory>();
 
   if (!base::SharedMemory::IsHandleValid(handle))
     return scoped_ptr<base::SharedMemory>();
 
   return scoped_ptr<base::SharedMemory>(new base::SharedMemory(handle, false));
 }
 
@@ skipping 216 matching lines @@
                "surface_id",
                surface_id);
 
   int32 route_id = MSG_ROUTING_NONE;
   IPC::Message* message = new GpuHostMsg_CreateViewCommandBuffer(
       surface_id,
       init_params,
       &route_id);
 
   // Allow calling this from the compositor thread.
-  if (MessageLoop::current() == message_loop())
+  if (MessageLoop::current() == message_loop()) {
     ChildThread::Send(message);
-  else
+  } else {
+    base::ThreadRestrictions::ScopedAllowWait allow_wait;

[boliu, 2013/03/01 00:19:12]

potential deadlock? See comment in gpu_message_filter.cc

     sync_message_filter()->Send(message);
+  }
 
   return route_id;
 }
 
 void RenderThreadImpl::CreateImage(
     gfx::PluginWindowHandle window,
     int32 image_id,
     const CreateImageCallback& callback) {
   NOTREACHED();
 }
@@ skipping 183 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