Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1358)

Unified Diff: third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.h

Issue 2520043004: Fix semantics of uploading HTML sources to 3D textures. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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,

Powered by Google App Engine
This is Rietveld 408576698