Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h |
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h |
index eafa0a35926d30b963f00e397dfa5ea3c320833a..45a8a20a36bce701e1a0db1a4ff7b1dca3225600 100644 |
--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h |
+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h |
@@ -1103,16 +1103,12 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, |
WebGLTexture*, |
GLenum target, |
GLint level, |
- GLint internalformat, |
- GLenum type, |
GLint xoffset, |
GLint yoffset, |
GLint zoffset, |
CanvasImageSource*, |
const IntRect& source_sub_rectangle); |
- virtual bool CanUseTexImageByGPU(TexImageFunctionID, |
- GLint internalformat, |
- GLenum type); |
+ virtual bool CanUseTexImageByGPU(GLenum type); |
virtual WebGLImageConversion::PixelStoreParams GetPackPixelStoreParams(); |
virtual WebGLImageConversion::PixelStoreParams GetUnpackPixelStoreParams( |
@@ -1650,14 +1646,18 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, |
unsigned); |
void TexImageCanvasByGPU(TexImageFunctionID, |
HTMLCanvasElement*, |
- GLuint, |
- GLenum, |
GLenum, |
+ GLuint, |
GLint, |
GLint, |
+ const IntRect&); |
+ void TexImageBitmapByGPU(ImageBitmap*, |
+ GLenum, |
+ GLuint, |
+ bool, |
+ GLint, |
GLint, |
- const IntRect& source_sub_rectangle); |
- void TexImageBitmapByGPU(ImageBitmap*, GLuint, GLenum, GLenum, GLint, bool); |
+ const IntRect&); |
sk_sp<SkImage> MakeImageSnapshot(SkImageInfo&); |
const unsigned version_; |