Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / graphics / gpu / WebGLImageConversion.cpp

diff --git a/src/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp b/src/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp
index 06bb98f..f03cdcc 100644 (file)
--- a/src/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp
+++ b/src/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp
@@ -1453,10 +1453,12 @@ bool WebGLImageConversion::computeFormatAndTypeParameters(GLenum format, GLenum
         *componentsPerPixel = 2;
         break;
     case GL_RGB:
+    case GL_SRGB_EXT: // GL_EXT_sRGB
         *componentsPerPixel = 3;
         break;
     case GL_RGBA:
     case GL_BGRA_EXT: // GL_EXT_texture_format_BGRA8888
+    case GL_SRGB_ALPHA_EXT: // GL_EXT_sRGB
         *componentsPerPixel = 4;
         break;
     default:
@@ -1610,6 +1612,8 @@ unsigned WebGLImageConversion::getClearBitsByFormat(GLenum format)
     case GL_RGBA:
     case GL_RGBA4:
     case GL_RGB5_A1:
+    case GL_SRGB_EXT:
+    case GL_SRGB_ALPHA_EXT:
         return GL_COLOR_BUFFER_BIT;
     case GL_DEPTH_COMPONENT16:
     case GL_DEPTH_COMPONENT:
@@ -1634,10 +1638,12 @@ unsigned WebGLImageConversion::getChannelBitsByFormat(GLenum format)
         return ChannelRGBA;
     case GL_RGB:
     case GL_RGB565:
+    case GL_SRGB_EXT:
         return ChannelRGB;
     case GL_RGBA:
     case GL_RGBA4:
     case GL_RGB5_A1:
+    case GL_SRGB_ALPHA_EXT:
         return ChannelRGBA;
     case GL_DEPTH_COMPONENT16:
     case GL_DEPTH_COMPONENT: