third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp - Issue 1950763002: Remove abstractions around GLuint and GL constants.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

Issue 1950763002: Remove abstractions around GLuint and GL constants. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 months 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

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/ImageBuffer.h ('k') | third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 79220c7a716d8cec8df778f76f63d0fb51490132..f402c1a008725de648915e91666c2422f596d84c 100644

--- a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

+++ b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

@@ -36,7 +36,6 @@

#include "platform/MIMETypeRegistry.h"

#include "platform/geometry/IntRect.h"

#include "platform/graphics/GraphicsContext.h"

-#include "platform/graphics/GraphicsTypes3D.h"

#include "platform/graphics/ImageBufferClient.h"

#include "platform/graphics/StaticBitmapImage.h"

#include "platform/graphics/UnacceleratedImageBufferSurface.h"

@@ -178,7 +177,7 @@ WebLayer* ImageBuffer::platformLayer() const

return m_surface->layer();

}

-bool ImageBuffer::copyToPlatformTexture(gpu::gles2::GLES2Interface* gl, Platform3DObject texture, GLenum internalFormat, GLenum destType, GLint level, bool premultiplyAlpha, bool flipY)

+bool ImageBuffer::copyToPlatformTexture(gpu::gles2::GLES2Interface* gl, GLuint texture, GLenum internalFormat, GLenum destType, GLint level, bool premultiplyAlpha, bool flipY)

{

if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(GL_TEXTURE_2D, internalFormat, destType, level))

return false;

@@ -218,7 +217,7 @@ bool ImageBuffer::copyToPlatformTexture(gpu::gles2::GLES2Interface* gl, Platform

mailbox->validSyncToken = true;

gl->WaitSyncTokenCHROMIUM(mailbox->syncToken);

- Platform3DObject sourceTexture = gl->CreateAndConsumeTextureCHROMIUM(textureInfo->fTarget, mailbox->name);

+ GLuint sourceTexture = gl->CreateAndConsumeTextureCHROMIUM(textureInfo->fTarget, mailbox->name);

// The canvas is stored in a premultiplied format, so unpremultiply if necessary.

// The canvas is stored in an inverted position, so the flip semantics are reversed.

@@ -248,7 +247,7 @@ bool ImageBuffer::copyRenderingResultsFromDrawingBuffer(DrawingBuffer* drawingBu

if (!provider)

return false;

gpu::gles2::GLES2Interface* gl = provider->contextGL();

- Platform3DObject textureId = m_surface->getBackingTextureHandleForOverwrite();

+ GLuint textureId = m_surface->getBackingTextureHandleForOverwrite();

if (!textureId)

return false;