diff options
| author | wjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-10 18:20:02 +0000 |
|---|---|---|
| committer | wjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-10 18:20:02 +0000 |
| commit | 2cd4d08aeaaf0c68779a4da403606e10302d4cae (patch) | |
| tree | 0640be7a2ebab49be5c80c9be24b2be738eab072 /ui/gfx/compositor | |
| parent | c7f428df423d18c6425eb40b2ed38191f1003f43 (diff) | |
| download | chromium_src-2cd4d08aeaaf0c68779a4da403606e10302d4cae.zip chromium_src-2cd4d08aeaaf0c68779a4da403606e10302d4cae.tar.gz chromium_src-2cd4d08aeaaf0c68779a4da403606e10302d4cae.tar.bz2 | |
Re-enable thread IO restriction override.
The Linux Views browser ui tests are failing. The test dies on an thread io restriction violation. I'm guessing (with Backer's help) that this may be due to the bot not having GL enabled, and continuing attempts to init the bindings fail (normally it would never get to us, hence why we thought the IO restriction was gone).
BUG=linux views fails on compositor startup due to thread io restriction
TEST=browser ui tests
Review URL: http://codereview.chromium.org/7104115
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/compositor')
| -rw-r--r-- | ui/gfx/compositor/compositor_gl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/gfx/compositor/compositor_gl.cc b/ui/gfx/compositor/compositor_gl.cc index 5c68add..e1a25e7 100644 --- a/ui/gfx/compositor/compositor_gl.cc +++ b/ui/gfx/compositor/compositor_gl.cc @@ -10,6 +10,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/threading/thread_restrictions.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkMatrix.h" #include "third_party/skia/include/core/SkScalar.h" @@ -356,6 +357,10 @@ bool CompositorGL::InitShaders() { // static Compositor* Compositor::Create(gfx::AcceleratedWidget widget) { + // The following line of code exists soley to disable IO restrictions + // on this thread long enough to perform the GL bindings. + // TODO(wjmaclean) Remove this when GL initialisation cleaned up. + base::ThreadRestrictions::ScopedAllowIO allow_io; gfx::GLSurface::InitializeOneOff(); if (gfx::GetGLImplementation() != gfx::kGLImplementationNone) return new glHidden::CompositorGL(widget); |