| 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 fb2455a468cefcd196f7531c345a51ffd8fbf2af..0756c6125e83fbb89e2f06e730a120038467e0f8 100644
|
| --- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
|
| +++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
|
| @@ -1101,16 +1101,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& sourceSubRectangle);
|
| - virtual bool canUseTexImageByGPU(TexImageFunctionID,
|
| - GLint internalformat,
|
| - GLenum type);
|
| + virtual bool canUseTexImageByGPU(GLenum type);
|
|
|
| virtual WebGLImageConversion::PixelStoreParams getPackPixelStoreParams();
|
| virtual WebGLImageConversion::PixelStoreParams getUnpackPixelStoreParams(
|
| @@ -1645,14 +1641,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& sourceSubRectangle);
|
| - void texImageBitmapByGPU(ImageBitmap*, GLuint, GLenum, GLenum, GLint, bool);
|
| + const IntRect&);
|
|
|
| sk_sp<SkImage> makeImageSnapshot(SkImageInfo&);
|
| const unsigned m_version;
|
|
|