Upgrade blink side ReadPixels size validation to consider ES3 pack parameters.

third_party/WebKit/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 "platform/graphics/skia/ImagePixelLocker.h"
@@ skipping 97 matching lines @@
         AlphaDoUnmultiply = 2
     };
 
     enum ImageHtmlDomSource {
         HtmlDomImage = 0,
         HtmlDomCanvas = 1,
         HtmlDomVideo = 2,
         HtmlDomNone = 3
     };
 
+    struct PLATFORM_EXPORT PixelStoreParams final {
+        PixelStoreParams();
+
+        GLint alignment;
+        GLint rowLength;
+        GLint imageHeight;
+        GLint skipPixels;
+        GLint skipRows;
+        GLint skipImages;
+    };
+
     class PLATFORM_EXPORT ImageExtractor final {
         STACK_ALLOCATED();
     public:
         ImageExtractor(Image*, ImageHtmlDomSource, bool premultiplyAlpha, bool ignoreGammaAndColorProfile);
 
         const void* imagePixelData() { return m_imagePixelLocker ? m_imagePixelLocker->pixels() : nullptr; }
         unsigned imageWidth() { return m_imageWidth; }
         unsigned imageHeight() { return m_imageHeight; }
         DataFormat imageSourceFormat() { return m_imageSourceFormat; }
         AlphaOp imageAlphaOp() { return m_alphaOp; }
@@ skipping 17 matching lines @@
     // Computes the components per pixel and bytes per component
     // for the given format and type combination. Returns false if
     // either was an invalid enum.
     static bool computeFormatAndTypeParameters(GLenum format, GLenum type, unsigned* componentsPerPixel, unsigned* bytesPerComponent);
 
     // Computes the image size in bytes. If paddingInBytes is not null, padding
     // is also calculated in return. Returns NO_ERROR if succeed, otherwise
     // return the suggested GL error indicating the cause of the failure:
     //   INVALID_VALUE if width/height/depth is negative or overflow happens.
     //   INVALID_ENUM if format/type is illegal.
-    static GLenum computeImageSizeInBytes(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth, GLint alignment, unsigned* imageSizeInBytes, unsigned* paddingInBytes);
+    // Note that imageSizeBytes does not include skipSizeInBytes, but it is
+    // guaranteed if NO_ERROR is returned, adding the two sizes won't cause
+    // overflow.
+    // |paddingInBytes| and |skipSizeInBytes| are optional and can be null, but
+    // the overflow validation is still performed.
+    static GLenum computeImageSizeInBytes(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth, const PixelStoreParams&, unsigned* imageSizeInBytes, unsigned* paddingInBytes, unsigned* skipSizeInBytes);
 
     // 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;
     }
 
     // The input can be either format or internalformat.
@@ skipping 27 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