summaryrefslogtreecommitdiffstats
path: root/ui/gfx/surface
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-27 20:51:33 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-27 20:51:33 +0000
commitd4ad7a2c139986ed2224a9b943f23f46680108ec (patch)
treefe3df2538d268b47fde0726b031fa0650993f497 /ui/gfx/surface
parent906d9a61025ec7bcf2d888292594cb9861fb8687 (diff)
downloadchromium_src-d4ad7a2c139986ed2224a9b943f23f46680108ec.zip
chromium_src-d4ad7a2c139986ed2224a9b943f23f46680108ec.tar.gz
chromium_src-d4ad7a2c139986ed2224a9b943f23f46680108ec.tar.bz2
Add a suppression for the accelerated surface code blocking the UI thread.
BUG=125391 TBR=jbauman Review URL: https://chromiumcodereview.appspot.com/10137008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/surface')
-rw-r--r--ui/gfx/surface/accelerated_surface_win.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/gfx/surface/accelerated_surface_win.cc b/ui/gfx/surface/accelerated_surface_win.cc
index d5c7ddc..ced9f01 100644
--- a/ui/gfx/surface/accelerated_surface_win.cc
+++ b/ui/gfx/surface/accelerated_surface_win.cc
@@ -21,6 +21,7 @@
#include "base/stringprintf.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
+#include "base/threading/thread_restrictions.h"
#include "base/tracked_objects.h"
#include "base/win/wrapped_window_proc.h"
#include "ui/base/win/hwnd_util.h"
@@ -320,6 +321,8 @@ bool AcceleratedPresenter::Present() {
base::Bind(&AcceleratedPresenter::DoPresent,
this,
&result));
+ // http://crbug.com/125391
+ base::ThreadRestrictions::ScopedAllowWait allow_wait;
event_.Wait();
return result;
}