diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 20:46:47 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 20:46:47 +0000 |
| commit | 906d9a61025ec7bcf2d888292594cb9861fb8687 (patch) | |
| tree | 6bea1eb39423ab18cd96c00fb5ac5072335ccabb /content/common | |
| parent | 73c7f71918be108fc4ef289a075bea783f12f173 (diff) | |
| download | chromium_src-906d9a61025ec7bcf2d888292594cb9861fb8687.zip chromium_src-906d9a61025ec7bcf2d888292594cb9861fb8687.tar.gz chromium_src-906d9a61025ec7bcf2d888292594cb9861fb8687.tar.bz2 | |
Fix debug asserts when --ui-use-gpu-process is specified.
BUG=125248,125264
TEST=Chrome debug build starts successfully with --ui-use-gpu-process
Review URL: https://chromiumcodereview.appspot.com/10209017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
| -rw-r--r-- | content/common/gpu/client/gpu_channel_host.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/content/common/gpu/client/gpu_channel_host.cc b/content/common/gpu/client/gpu_channel_host.cc index cda0468..2446101 100644 --- a/content/common/gpu/client/gpu_channel_host.cc +++ b/content/common/gpu/client/gpu_channel_host.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" +#include "base/threading/thread_restrictions.h" #include "content/common/gpu/client/command_buffer_proxy_impl.h" #include "content/common/gpu/gpu_messages.h" #include "googleurl/src/gurl.h" @@ -165,8 +166,11 @@ bool GpuChannelHost::Send(IPC::Message* message) { // TODO: Can we just always use sync_filter_ since we setup the channel // without a main listener? if (factory_->IsMainThread()) { - if (channel_.get()) + if (channel_.get()) { + // http://crbug.com/125264 + base::ThreadRestrictions::ScopedAllowWait allow_wait; return channel_->Send(message); + } } else if (MessageLoop::current()) { return sync_filter_->Send(message); } |