Fix semantics of uploading HTML sources to 3D textures.

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 201 matching lines @@
   static bool packImageData(Image*,
                             const void* pixels,
                             GLenum format,
                             GLenum type,
                             bool flipY,
                             AlphaOp,
                             DataFormat sourceFormat,
                             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,
                                bool premultiplyAlpha,
                                Vector<uint8_t>& data);
 
   // Helper function which extracts the user-supplied texture
   // data, applying the flipY and premultiplyAlpha parameters.
   // If the data is not tightly packed according to the passed
   // unpackAlignment, the output data will be tightly packed.
@@ skipping 16 matching lines @@
   // implement packing of pixel data into the specified OpenGL destination
   // format and type. 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 sourceDataWidth,
                          unsigned sourceDataHeight,
                          const IntRect& sourceDataSubRectangle,
+                         int depth,
                          unsigned sourceUnpackAlignment,
+                         int unpackImageHeight,
                          unsigned destinationFormat,
                          unsigned destinationType,
                          AlphaOp,
                          void* destinationData,
                          bool flipY);
   static void unpackPixels(const uint16_t* sourceData,
                            DataFormat sourceDataFormat,
                            unsigned pixelsPerRow,
                            uint8_t* destinationData);
   static void packPixels(const uint8_t* sourceData,
                          DataFormat sourceDataFormat,
                          unsigned pixelsPerRow,
                          uint8_t* destinationData);
 };
 
 }  // namespace blink
 
 #endif  // WebGLImageConversion_h