third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp - Issue 1817323003: Revert of Remove create/delete methods from WebGraphicsContext3D.

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/Canvas2DLayerBridge.cpp

Issue 1817323003: Revert of Remove create/delete methods from WebGraphicsContext3D. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@complex-casts

Patch Set: Created 4 years, 9 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/modules/webgl/WebGLVertexArrayObjectBase.cpp ('k') | third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp

index 31c459fa95afe7fd0a177137d92dbf0fbfc5de2a..23fa6e996adcd8e231e18308710bb7b2787ceec0 100644

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

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

@@ -258,8 +258,12 @@

if (!imageId)

return Canvas2DLayerBridge::ImageInfo();

- GLuint textureId;

- gl->GenTextures(1, &textureId);

+ GLuint textureId= webContext->createTexture();

+ if (!textureId) {

+ gl->DestroyImageCHROMIUM(imageId);

+ return Canvas2DLayerBridge::ImageInfo();

+ }

GLenum target = GC3D_TEXTURE_RECTANGLE_ARB;

gl->BindTexture(target, textureId);

gl->TexParameteri(target, GL_TEXTURE_MAG_FILTER, getGLFilter());

@@ -282,7 +286,7 @@

gl->BindTexture(target, info.m_textureId);

gl->ReleaseTexImage2DCHROMIUM(target, info.m_imageId);

gl->DestroyImageCHROMIUM(info.m_imageId);

- gl->DeleteTextures(1, &info.m_textureId);

+ webContext->deleteTexture(info.m_textureId);

gl->BindTexture(target, 0);

resetSkiaTextureBinding();