Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ui / gl / gl_implementation_android.cc

diff --git a/src/ui/gl/gl_implementation_android.cc b/src/ui/gl/gl_implementation_android.cc
index 31fec9a..22d5ec6 100644 (file)
--- a/src/ui/gl/gl_implementation_android.cc
+++ b/src/ui/gl/gl_implementation_android.cc
@@ -52,16 +52,18 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {
   // Prevent reinitialization with a different implementation. Once the gpu
   // unit tests have initialized with kGLImplementationMock, we don't want to
   // later switch to another GL implementation.
-  if (GetGLImplementation() != kGLImplementationNone)
-    return true;
+  DCHECK_EQ(kGLImplementationNone, GetGLImplementation());
 
   switch (implementation) {
     case kGLImplementationEGLGLES2: {
       base::NativeLibrary gles_library = LoadLibrary("libGLESv2.so");
-      if (!gles_library)
+      if (!gles_library) {
+        LOG(ERROR) << "Failed to load libGLESv2.so.";
         return false;
+      }
       base::NativeLibrary egl_library = LoadLibrary("libEGL.so");
       if (!egl_library) {
+        LOG(ERROR) << "Failed to load libEGL.so.";
         base::UnloadNativeLibrary(gles_library);
         return false;
       }
@@ -121,6 +123,7 @@ bool InitializeDynamicGLBindings(GLImplementation implementation,
         InitializeDynamicGLBindingsGL(context);
       break;
     default:
+      NOTREACHED() << "InitializeDynamicGLBindings on Android";
       return false;
   }