Make it possible to use OSMesa on Android

ui/gl/gl_implementation_android.cc

Index: ui/gl/gl_implementation_android.cc
diff --git a/ui/gl/gl_implementation_android.cc b/ui/gl/gl_implementation_android.cc
index 22d5ec63a120d1158e2624604b50ae4f2d747ec6..65f90ee5094239ee9db0f8d52914ed0f7654e67d 100644
--- a/ui/gl/gl_implementation_android.cc
+++ b/ui/gl/gl_implementation_android.cc
@@ -13,6 +13,7 @@
 #include "ui/gl/gl_egl_api_implementation.h"
 #include "ui/gl/gl_gl_api_implementation.h"
 #include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_implementation_osmesa.h"
 #include "ui/gl/gl_osmesa_api_implementation.h"
 
 namespace gfx {
@@ -28,24 +29,11 @@ void GL_BINDING_CALL MarshalDepthRangeToDepthRangef(GLclampd z_near,
   glDepthRangef(static_cast<GLclampf>(z_near), static_cast<GLclampf>(z_far));
 }
 
-base::NativeLibrary LoadLibrary(const base::FilePath& filename) {
-  std::string error;
-  base::NativeLibrary library = base::LoadNativeLibrary(filename, &error);
-  if (!library) {
-    DVLOG(1) << "Failed to load " << filename.MaybeAsASCII() << ": " << error;
-    return NULL;
-  }
-  return library;
-}
-
-base::NativeLibrary LoadLibrary(const char* filename) {
-  return LoadLibrary(base::FilePath(filename));
-}
-
 }  // namespace
 
 void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) {
   impls->push_back(kGLImplementationEGLGLES2);
+  impls->push_back(kGLImplementationOSMesaGL);
 }
 
 bool InitializeStaticGLBindings(GLImplementation implementation) {
@@ -93,6 +81,8 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {
       ::gfx::g_driver_gl.fn.glDepthRangeFn = MarshalDepthRangeToDepthRangef;
       break;
     }
+    case kGLImplementationOSMesaGL:
+      return InitializeStaticGLBindingsOSMesaGL();

[Sami, 2014/02/19 18:42:43]

nit: To make this a tiny bit more consistent, instead of returning here just
fall through to the "return true" at the bottom of this function.

     case kGLImplementationMockGL: {
       SetGLImplementation(kGLImplementationMockGL);
       InitializeStaticGLBindingsGL();
@@ -113,6 +103,10 @@ bool InitializeDynamicGLBindings(GLImplementation implementation,
       InitializeDynamicGLBindingsGL(context);
       InitializeDynamicGLBindingsEGL(context);
       break;
+    case kGLImplementationOSMesaGL:
+      InitializeDynamicGLBindingsGL(context);
+      InitializeDynamicGLBindingsOSMESA(context);
+      break;
     case kGLImplementationMockGL:
       if (!context) {
         scoped_refptr<GLContextStubWithExtensions> mock_context(
@@ -133,11 +127,13 @@ bool InitializeDynamicGLBindings(GLImplementation implementation,
 void InitializeDebugGLBindings() {
   InitializeDebugGLBindingsEGL();
   InitializeDebugGLBindingsGL();
+  InitializeDebugGLBindingsOSMESA();
 }
 
 void ClearGLBindings() {
   ClearGLBindingsEGL();
   ClearGLBindingsGL();
+  ClearGLBindingsOSMESA();
   SetGLImplementation(kGLImplementationNone);
 
   UnloadGLNativeLibraries();