Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(374)

Side by Side Diff: ui/gl/gl_context.cc

Issue 12038095: Android webview fix gpu crashes after destroy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/threading/thread_local.h" 10 #include "base/threading/thread_local.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 } 114 }
115 } 115 }
116 116
117 bool GLContext::MakeVirtuallyCurrent( 117 bool GLContext::MakeVirtuallyCurrent(
118 GLContext* virtual_context, GLSurface* surface) { 118 GLContext* virtual_context, GLSurface* surface) {
119 DCHECK(virtual_gl_api_); 119 DCHECK(virtual_gl_api_);
120 return virtual_gl_api_->MakeCurrent(virtual_context, surface); 120 return virtual_gl_api_->MakeCurrent(virtual_context, surface);
121 } 121 }
122 122
123 void GLContext::OnDestroyVirtualContext(GLContext* virtual_context) { 123 void GLContext::OnDestroyVirtualContext(GLContext* virtual_context) {
124 DCHECK(virtual_gl_api_); 124 if (virtual_gl_api_)
125 virtual_gl_api_->OnDestroyVirtualContext(virtual_context); 125 virtual_gl_api_->OnDestroyVirtualContext(virtual_context);
no sievers 2013/01/25 20:24:41 This change looks correct for where GLContextVirtu
boliu 2013/01/25 21:27:02 Crash stack for this is in the bug.
126 } 126 }
127 127
128 void GLContext::SetRealGLApi() { 128 void GLContext::SetRealGLApi() {
129 SetGLToRealGLApi(); 129 SetGLToRealGLApi();
130 } 130 }
131 131
132 } // namespace gfx 132 } // namespace gfx
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698