third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp - Issue 1824433002: Remove getError() and synthesizeGLError() 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/WebGL2RenderingContextBase.cpp

Issue 1824433002: Remove getError() and synthesizeGLError() from WebGraphicsContext3D. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simples-tplus

Patch Set: errors: rebase 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/OESVertexArrayObject.cpp ('k') | third_party/WebKit/Source/modules/webgl/WebGLObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 543953aa053b03b8e643531067b10e77faf489f3..2919fe525e3c0a0835c9fd8a038b1433563a667e 100644

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

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

@@ -2289,7 +2289,7 @@ WebGLActiveInfo* WebGL2RenderingContextBase::getTransformFeedbackVarying(WebGLPr

if (isContextLost() || !validateWebGLObject("getTransformFeedbackVarying", program))

return nullptr;

- if (!program->linkStatus()) {

+ if (!program->linkStatus(this)) {

synthesizeGLError(GL_INVALID_OPERATION, "getTransformFeedbackVarying", "program not linked");

return nullptr;

}

@@ -2583,7 +2583,7 @@ GLuint WebGL2RenderingContextBase::getUniformBlockIndex(WebGLProgram* program, c

bool WebGL2RenderingContextBase::validateUniformBlockIndex(const char* functionName, WebGLProgram* program, GLuint blockIndex)

{

ASSERT(program);

- if (!program->linkStatus()) {

+ if (!program->linkStatus(this)) {

synthesizeGLError(GL_INVALID_OPERATION, functionName, "program not linked");

return false;

}

@@ -2707,7 +2707,7 @@ void WebGL2RenderingContextBase::bindVertexArray(ScriptState* scriptState, WebGL

return;

if (vertexArray && (vertexArray->isDeleted() || !vertexArray->validate(0, this))) {

- webContext()->synthesizeGLError(GL_INVALID_OPERATION);

+ synthesizeGLError(GL_INVALID_OPERATION, "bindVertexArray", "invalid vertexArray");

return;

}