| Index: third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
|
| index 99ca5209e4bbbe0a7d81c64943e4479e2843133b..d68ec91c01d5e5517cf7d1cd84ebaa37d33dc597 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
|
| @@ -200,16 +200,13 @@ WebLayer* ImageBuffer::platformLayer() const {
|
|
|
| bool ImageBuffer::copyToPlatformTexture(SnapshotReason reason,
|
| gpu::gles2::GLES2Interface* gl,
|
| + GLenum target,
|
| GLuint texture,
|
| - GLenum internalFormat,
|
| - GLenum destType,
|
| - GLint level,
|
| bool premultiplyAlpha,
|
| bool flipY,
|
| const IntPoint& destPoint,
|
| const IntRect& sourceSubRectangle) {
|
| - if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(
|
| - GL_TEXTURE_2D, internalFormat, destType, level))
|
| + if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(target))
|
| return false;
|
|
|
| if (!isSurfaceValid())
|
| @@ -260,7 +257,7 @@ bool ImageBuffer::copyToPlatformTexture(SnapshotReason reason,
|
| // It is expected that callers of this method have already allocated
|
| // the platform texture with the appropriate size.
|
| gl->CopySubTextureCHROMIUM(
|
| - sourceTexture, 0, GL_TEXTURE_2D, texture, 0, destPoint.x(), destPoint.y(),
|
| + sourceTexture, 0, target, texture, 0, destPoint.x(), destPoint.y(),
|
| sourceSubRectangle.x(), sourceSubRectangle.y(),
|
| sourceSubRectangle.width(), sourceSubRectangle.height(),
|
| flipY ? GL_FALSE : GL_TRUE, GL_FALSE,
|
| @@ -304,7 +301,7 @@ bool ImageBuffer::copyRenderingResultsFromDrawingBuffer(
|
| gl->Flush();
|
|
|
| return drawingBuffer->copyToPlatformTexture(
|
| - gl, textureId, GL_RGBA, GL_UNSIGNED_BYTE, 0, true, false, IntPoint(0, 0),
|
| + gl, GL_TEXTURE_2D, textureId, true, false, IntPoint(0, 0),
|
| IntRect(IntPoint(0, 0), drawingBuffer->size()), sourceBuffer);
|
| }
|
|
|
|
|