| Index: ui/gfx/compositor/compositor_gl.cc
|
| diff --git a/ui/gfx/compositor/compositor_gl.cc b/ui/gfx/compositor/compositor_gl.cc
|
| index 078556bd5126ce03016f3a4df0d15d69d753803c..fbf513badb2a39f586e4928552e61b6dd48aa2c7 100644
|
| --- a/ui/gfx/compositor/compositor_gl.cc
|
| +++ b/ui/gfx/compositor/compositor_gl.cc
|
| @@ -342,15 +342,11 @@ void SharedResourcesGL::Destroy() {
|
| initialized_ = false;
|
| }
|
|
|
| -bool SharedResourcesGL::MakeSharedContextCurrent() {
|
| - if (!initialized_)
|
| - return false;
|
| - else
|
| - return context_->MakeCurrent(surface_.get());
|
| -}
|
| -
|
| gfx::ScopedMakeCurrent* SharedResourcesGL::GetScopedMakeCurrent() {
|
| - return new gfx::ScopedMakeCurrent(context_.get(), surface_.get());
|
| + if (initialized_)
|
| + return new gfx::ScopedMakeCurrent(context_.get(), surface_.get());
|
| + else
|
| + return NULL;
|
| }
|
|
|
| scoped_refptr<gfx::GLContext> SharedResourcesGL::CreateContext(
|
|
|