Make it possible to use OSMesa on Android

ui/gl/gl_context_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gl/gl_context.h"
 
 #include "base/android/sys_utils.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/sys_info.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context_egl.h"
+#include "ui/gl/gl_context_osmesa.h"
 #include "ui/gl/gl_context_stub.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
 namespace {
 
 // Used to render into an already current context+surface,
 // that we do not have ownership of (draw callback).
@@ skipping 45 matching lines @@
   return GLContext::GetExtensions() + " " + extensions;
 }
 
 }  // anonymous namespace
 
 // static
 scoped_refptr<GLContext> GLContext::CreateGLContext(
     GLShareGroup* share_group,
     GLSurface* compatible_surface,
     GpuPreference gpu_preference) {
-  if (GetGLImplementation() == kGLImplementationMockGL)
-    return scoped_refptr<GLContext>(new GLContextStub());
+  scoped_refptr<GLContext> context;
+  switch(GetGLImplementation()) {

[Sami, 2013/09/19 16:37:46]

Since you're here :) Could you change this to be a little more explicit about
what we support:

    switch(GetGLImplementation()) {
      case kGLImplementationMockGL:
        return scoped_refptr<GLContext>(new GLContextStub());
      case kGLImplementationOSMesaGL:
        context = new GLContextOSMesa(share_group);
        break;
      case kGLImplementationEGLGLES2:
        if (compatible_surface->GetHandle())
          context = new GLContextEGL(share_group);
        else
          context = new GLNonOwnedContext(share_group);
        break;
      default:
        NOTREACHED();
        return NULL;
    }

[Peter Beverloo, 2013/09/19 16:48:44]

Done.

+    case kGLImplementationMockGL:
+      return scoped_refptr<GLContext>(new GLContextStub());
+    case kGLImplementationOSMesaGL:
+      context = new GLContextOSMesa(share_group);
+      break;
+    default:
+      if (compatible_surface->GetHandle())
+        context = new GLContextEGL(share_group);
+      else
+        context = new GLNonOwnedContext(share_group);
+      break;
+  }
 
-  scoped_refptr<GLContext> context;
-  if (compatible_surface->GetHandle())
-    context = new GLContextEGL(share_group);
-  else
-    context = new GLNonOwnedContext(share_group);
   if (!context->Initialize(compatible_surface, gpu_preference))
     return NULL;
+
   return context;
 }
 
 bool GLContextEGL::GetTotalGpuMemory(size_t* bytes) {
   DCHECK(bytes);
   *bytes = 0;
 
   // We can't query available GPU memory from the system on Android.
   // Physical memory is also mis-reported sometimes (eg. Nexus 10 reports
   // 1262MB when it actually has 2GB, while Razr M has 1GB but only reports
@@ skipping 29 matching lines @@
     } else {
       limit_bytes = physical_memory_mb / 64;
     }
     limit_bytes = limit_bytes * 1024 * 1024;
   }
   *bytes = limit_bytes;
   return true;
 }
 
 }