Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / gl / GrGLUtil.cpp

diff --git a/src/third_party/skia/src/gpu/gl/GrGLUtil.cpp b/src/third_party/skia/src/gpu/gl/GrGLUtil.cpp
index a479523..0fa2d2c 100644 (file)
--- a/src/third_party/skia/src/gpu/gl/GrGLUtil.cpp
+++ b/src/third_party/skia/src/gpu/gl/GrGLUtil.cpp
@@ -99,7 +99,7 @@ bool get_gl_version_for_mesa(int mesaMajorVersion, int* major, int* minor) {
 
 GrGLStandard GrGLGetStandardInUseFromString(const char* versionString) {
     if (NULL == versionString) {
-        SkDEBUGFAIL("NULL GL version string.");
+        SkDebugf("NULL GL version string.");
         return kNone_GrGLStandard;
     }
 
@@ -139,8 +139,8 @@ bool GrGLIsChromiumFromRendererString(const char* rendererString) {
 
 GrGLVersion GrGLGetVersionFromString(const char* versionString) {
     if (NULL == versionString) {
-        SkDEBUGFAIL("NULL GL version string.");
-        return 0;
+        SkDebugf("NULL GL version string.");
+        return GR_GL_INVALID_VER;
     }
 
     int major, minor;
@@ -152,7 +152,7 @@ GrGLVersion GrGLGetVersionFromString(const char* versionString) {
         if (get_gl_version_for_mesa(mesaMajor, &major, &minor)) {
             return GR_GL_VER(major, minor);
         } else {
-            return 0;
+            return GR_GL_INVALID_VER;
         }
     }
 
@@ -173,13 +173,13 @@ GrGLVersion GrGLGetVersionFromString(const char* versionString) {
         return GR_GL_VER(major, minor);
     }
 
-    return 0;
+    return GR_GL_INVALID_VER;
 }
 
 GrGLSLVersion GrGLGetGLSLVersionFromString(const char* versionString) {
     if (NULL == versionString) {
-        SkDEBUGFAIL("NULL GLSL version string.");
-        return 0;
+        SkDebugf("NULL GLSL version string.");
+        return GR_GLSL_INVALID_VER;
     }
 
     int major, minor;
@@ -202,7 +202,7 @@ GrGLSLVersion GrGLGetGLSLVersionFromString(const char* versionString) {
     }
 #endif
 
-    return 0;
+    return GR_GLSL_INVALID_VER;
 }
 
 GrGLVendor GrGLGetVendorFromString(const char* vendorString) {