| Index: third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.h
|
| diff --git a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.h b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.h
|
| index 2edd92b345a29b1939e2bf36504a722d90a527ff..6cce892b555974420fe36be79ff19c62da5c2a5f 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.h
|
| +++ b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.h
|
| @@ -219,17 +219,21 @@ class PLATFORM_EXPORT WebGLImageConversion final {
|
| unsigned sourceImageWidth,
|
| unsigned sourceImageHeight,
|
| const IntRect& sourceImageSubRectangle,
|
| + int depth,
|
| unsigned sourceUnpackAlignment,
|
| + int unpackImageHeight,
|
| Vector<uint8_t>& data);
|
|
|
| // Extracts the contents of the given ImageData into the passed Vector,
|
| // packing the pixel data according to the given format and type,
|
| // and obeying the flipY and premultiplyAlpha flags. Returns true
|
| // upon success.
|
| - static bool extractImageData(const uint8_t*,
|
| + static bool extractImageData(const uint8_t* imageData,
|
| DataFormat sourceDataFormat,
|
| - const IntSize&,
|
| - const IntRect&,
|
| + const IntSize& imageDataSize,
|
| + const IntRect& sourceImageSubRectangle,
|
| + int depth,
|
| + int unpackImageHeight,
|
| GLenum format,
|
| GLenum type,
|
| bool flipY,
|
| @@ -266,7 +270,9 @@ class PLATFORM_EXPORT WebGLImageConversion final {
|
| unsigned sourceDataWidth,
|
| unsigned sourceDataHeight,
|
| const IntRect& sourceDataSubRectangle,
|
| + int depth,
|
| unsigned sourceUnpackAlignment,
|
| + int unpackImageHeight,
|
| unsigned destinationFormat,
|
| unsigned destinationType,
|
| AlphaOp,
|
|
|