diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-20 17:27:57 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-20 17:27:57 +0000 |
| commit | b93ca987e90cfc80be99311f5a410fba885076a8 (patch) | |
| tree | 291edf1f07f0a703334a13397c0f7058d7a1a89d /ui/gfx/compositor | |
| parent | 695d7a7ee8f810f79376cfefdbf69bbde11f2894 (diff) | |
| download | chromium_src-b93ca987e90cfc80be99311f5a410fba885076a8.zip chromium_src-b93ca987e90cfc80be99311f5a410fba885076a8.tar.gz chromium_src-b93ca987e90cfc80be99311f5a410fba885076a8.tar.bz2 | |
Disable compositor if GL is failed to initialize.
BUG=86600
TEST=see bug description for repro step
Review URL: http://codereview.chromium.org/7201017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89678 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/compositor')
| -rw-r--r-- | ui/gfx/compositor/compositor_gl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gfx/compositor/compositor_gl.cc b/ui/gfx/compositor/compositor_gl.cc index cd2c482..167bc5e 100644 --- a/ui/gfx/compositor/compositor_gl.cc +++ b/ui/gfx/compositor/compositor_gl.cc @@ -366,8 +366,8 @@ Compositor* Compositor::Create(gfx::AcceleratedWidget widget) { // 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) + if (gfx::GLSurface::InitializeOneOff() && + gfx::GetGLImplementation() != gfx::kGLImplementationNone) return new glHidden::CompositorGL(widget); return NULL; } |