Upgrade WebGLImageConversion to support WebGL 2 formats and types.

Source/platform/graphics/gpu/WebGLImageConversion.h

 // Copyright 2014 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.
 
 #ifndef WebGLImageConversion_h
 #define WebGLImageConversion_h
 
 #include "platform/PlatformExport.h"
 #include "platform/graphics/Image.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
+#include "third_party/khronos/GLES3/gl3.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 class Image;
 class IntSize;
 
 // Helper functions for texture uploading and pixel readback.
 class PLATFORM_EXPORT WebGLImageConversion {
 public:
     // Attempt to enumerate all possible native image formats to
     // reduce the amount of temporary allocations during texture
     // uploading. This enum must be public because it is accessed
     // by non-member functions.
+    // "_S" postfix indicates signed type.
     enum DataFormat {
         DataFormatRGBA8 = 0,
+        DataFormatRGBA8_S,
+        DataFormatRGBA16,
+        DataFormatRGBA16_S,
+        DataFormatRGBA32,
+        DataFormatRGBA32_S,
         DataFormatRGBA16F,
         DataFormatRGBA32F,
+        DataFormatRGBA2_10_10_10,
         DataFormatRGB8,
+        DataFormatRGB8_S,
+        DataFormatRGB16,
+        DataFormatRGB16_S,
+        DataFormatRGB32,
+        DataFormatRGB32_S,
         DataFormatRGB16F,
         DataFormatRGB32F,
         DataFormatBGR8,
         DataFormatBGRA8,
         DataFormatARGB8,
         DataFormatABGR8,
         DataFormatRGBA5551,
         DataFormatRGBA4444,
         DataFormatRGB565,
+        DataFormatRGB10F11F11F,
+        DataFormatRG8,
+        DataFormatRG8_S,
+        DataFormatRG16,
+        DataFormatRG16_S,
+        DataFormatRG32,
+        DataFormatRG32_S,
+        DataFormatRG16F,
+        DataFormatRG32F,
         DataFormatR8,
+        DataFormatR8_S,
+        DataFormatR16,
+        DataFormatR16_S,
+        DataFormatR32,
+        DataFormatR32_S,
         DataFormatR16F,
         DataFormatR32F,
         DataFormatRA8,
         DataFormatRA16F,
         DataFormatRA32F,
         DataFormatAR8,
         DataFormatA8,
         DataFormatA16F,
         DataFormatA32F,
+        DataFormatD16,
+        DataFormatD32,
+        DataFormatD32F,
+        DataFormatDS24_8,
         DataFormatNumFormats
     };
 
     enum ChannelBits {
         ChannelRed = 1,
         ChannelGreen = 2,
         ChannelBlue = 4,
         ChannelAlpha = 8,
         ChannelDepth = 16,
         ChannelStencil = 32,
+        ChannelRG = ChannelRed | ChannelGreen,
         ChannelRGB = ChannelRed | ChannelGreen | ChannelBlue,
         ChannelRGBA = ChannelRGB | ChannelAlpha,
+        ChannelDepthStencil = ChannelDepth | ChannelStencil,
     };
 
     // Possible alpha operations that may need to occur during
     // pixel packing. FIXME: kAlphaDoUnmultiply is lossy and must
     // be removed.
     enum AlphaOp {
         AlphaDoNothing = 0,
         AlphaDoPremultiply = 1,
         AlphaDoUnmultiply = 2
     };
@@ skipping 50 matching lines @@
     static GLenum computeImageSizeInBytes(GLenum format, GLenum type, GLsizei width, GLsizei height, GLint alignment, unsigned* imageSizeInBytes, unsigned* paddingInBytes);
 
     // Check if the format is one of the formats from the ImageData or DOM elements.
     // The formats from ImageData is always RGBA8.
     // The formats from DOM elements vary with Graphics ports. It can only be RGBA8 or BGRA8.
     static ALWAYS_INLINE bool srcFormatComeFromDOMElementOrImageData(DataFormat SrcFormat)
     {
         return SrcFormat == DataFormatBGRA8 || SrcFormat == DataFormatRGBA8;
     }
 
-    static unsigned getClearBitsByFormat(GLenum);
+    // The input can be either format or internalformat.
     static unsigned getChannelBitsByFormat(GLenum);
 
     // The Following functions are implemented in GraphicsContext3DImagePacking.cpp
 
     // Packs the contents of the given Image which is passed in |pixels| into the passed Vector
     // according to the given format and type, and obeying the flipY and AlphaOp flags.
     // Returns true upon success.
     static bool packImageData(Image*, const void* pixels, GLenum format, GLenum type, bool flipY, AlphaOp, DataFormat sourceFormat, unsigned width, unsigned height, unsigned sourceUnpackAlignment, Vector<uint8_t>& data);
 
     // Extracts the contents of the given ImageData into the passed Vector,
@@ skipping 17 matching lines @@
     // A sourceUnpackAlignment of zero indicates that the source
     // data is tightly packed. Non-zero values may take a slow path.
     // Destination data will have no gaps between rows.
     // Implemented in GraphicsContext3DImagePacking.cpp
     static bool packPixels(const uint8_t* sourceData, DataFormat sourceDataFormat, unsigned width, unsigned height, unsigned sourceUnpackAlignment, unsigned destinationFormat, unsigned destinationType, AlphaOp, void* destinationData, bool flipY);
 };
 
 } // namespace blink
 
 #endif // WebGLImageConversion_h