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

Unified Diff: ui/gl/gl_context_android.cc

Issue 14241033: Android GLNonOwnedContext support GLVirtualContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_context_android.cc
diff --git a/ui/gl/gl_context_android.cc b/ui/gl/gl_context_android.cc
index 846433c3f1439f37bec3c272641bc1a9675919a4..ea3460e376de65b35432098747256f5283731a3c 100644
--- a/ui/gl/gl_context_android.cc
+++ b/ui/gl/gl_context_android.cc
@@ -21,7 +21,7 @@ namespace {
// that we do not have ownership of (draw callback).
class GLNonOwnedContext : public GLContext {
public:
- GLNonOwnedContext();
+ GLNonOwnedContext(GLShareGroup* share_group);
// Implement GLContext.
virtual bool Initialize(GLSurface* compatible_surface,
@@ -43,7 +43,8 @@ class GLNonOwnedContext : public GLContext {
DISALLOW_COPY_AND_ASSIGN(GLNonOwnedContext);
};
-GLNonOwnedContext::GLNonOwnedContext() : GLContext(NULL) {}
+GLNonOwnedContext::GLNonOwnedContext(GLShareGroup* share_group)
+ : GLContext(share_group) {}
bool GLNonOwnedContext::MakeCurrent(GLSurface* surface) {
SetCurrent(this, surface);
@@ -69,7 +70,7 @@ scoped_refptr<GLContext> GLContext::CreateGLContext(
if (compatible_surface->GetHandle())
context = new GLContextEGL(share_group);
else
- context = new GLNonOwnedContext();
+ context = new GLNonOwnedContext(share_group);
if (!context->Initialize(compatible_surface, gpu_preference))
return NULL;
return context;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698