| Index: ui/gl/gl_context.cc
|
| diff --git a/ui/gl/gl_context.cc b/ui/gl/gl_context.cc
|
| index 3e54ebb0b660a110a2ba2809b014f4a8bbe167da..6d41cd0a571530ecf4ed2b3c903cb6ec457ec332 100644
|
| --- a/ui/gl/gl_context.cc
|
| +++ b/ui/gl/gl_context.cc
|
| @@ -42,17 +42,11 @@ void GLContext::ScopedReleaseCurrent::Cancel() {
|
| canceled_ = true;
|
| }
|
|
|
| -GLContext::GLContext(GLShareGroup* share_group) :
|
| - share_group_(share_group),
|
| - state_dirtied_externally_(false),
|
| - swap_interval_(1),
|
| - force_swap_interval_zero_(false),
|
| - state_dirtied_callback_(
|
| - base::Bind(&GLContext::SetStateWasDirtiedExternally,
|
| - // Note that if this is not unretained, it will create a cycle (and
|
| - // will never be freed.
|
| - base::Unretained(this),
|
| - true)) {
|
| +GLContext::GLContext(GLShareGroup* share_group)
|
| + : share_group_(share_group),
|
| + state_dirtied_externally_(false),
|
| + swap_interval_(1),
|
| + force_swap_interval_zero_(false) {
|
| if (!share_group_.get())
|
| share_group_ = new GLShareGroup;
|
|
|
| @@ -96,24 +90,6 @@ std::string GLContext::GetGLRenderer() {
|
| return std::string(renderer ? renderer : "");
|
| }
|
|
|
| -base::Closure GLContext::GetStateWasDirtiedExternallyCallback() {
|
| - return state_dirtied_callback_.callback();
|
| -}
|
| -
|
| -void GLContext::RestoreStateIfDirtiedExternally() {
|
| - NOTREACHED();
|
| -}
|
| -
|
| -bool GLContext::GetStateWasDirtiedExternally() const {
|
| - DCHECK(virtual_gl_api_);
|
| - return state_dirtied_externally_;
|
| -}
|
| -
|
| -void GLContext::SetStateWasDirtiedExternally(bool dirtied_externally) {
|
| - DCHECK(virtual_gl_api_);
|
| - state_dirtied_externally_ = dirtied_externally;
|
| -}
|
| -
|
| bool GLContext::HasExtension(const char* name) {
|
| std::string extensions = GetExtensions();
|
| extensions += " ";
|
|
|