third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.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/modules/webgl/WebGLRenderingContextBase.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/WebGLRenderbuffer.cpp ('k') | third_party/WebKit/Source/modules/webgl/WebGLSampler.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

index 5c2ebccd2f425e81aa294eb639d8df4803148e66..2c9df0272ad48a056587f67a85815c9ebeac7dc2 100644

--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

@@ -4096,7 +4096,7 @@

targetLevel = 0;

targetInternalformat = GL_RGBA;

targetType = GL_UNSIGNED_BYTE;

- contextGL()->GenTextures(1, &targetTexture);

+ targetTexture = webContext()->createTexture();

contextGL()->BindTexture(GL_TEXTURE_2D, targetTexture);

contextGL()->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

contextGL()->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

@@ -4122,8 +4122,7 @@

}

if (!possibleDirectCopy) {

- GLuint tmpFBO;

- contextGL()->GenFramebuffers(1, &tmpFBO);

+ WebGLId tmpFBO = webContext()->createFramebuffer();

contextGL()->BindFramebuffer(GL_FRAMEBUFFER, tmpFBO);

contextGL()->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, targetTexture, 0);

contextGL()->BindTexture(texture->getTarget(), texture->object());

@@ -4136,8 +4135,8 @@

}

contextGL()->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0);

restoreCurrentFramebuffer();

- contextGL()->DeleteFramebuffers(1, &tmpFBO);

- contextGL()->DeleteTextures(1, &targetTexture);

+ webContext()->deleteFramebuffer(tmpFBO);

+ webContext()->deleteTexture(targetTexture);

}