third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp - Issue 1800383002: Disable timestamps in WebGL.

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 1800383002: Disable timestamps in WebGL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Mark the test as no longer flaky 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

« third_party/WebKit/Source/modules/webgl/EXTDisjointTimerQuery.cpp ('K') | « third_party/WebKit/Source/modules/webgl/EXTDisjointTimerQuery.cpp ('k') | third_party/WebKit/Source/modules/webgl/WebGLTimerQueryEXT.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 1fa00a882fa35a7e4d9f714a938e1ece4ca5c37e..ec4312f1f520eb49ec92d03ebe79aeede5f772ce 100644

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

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

@@ -2767,7 +2767,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* scriptState, GL

return ScriptValue::createNull(scriptState);

case GL_TIMESTAMP_EXT:

if (extensionEnabled(EXTDisjointTimerQueryName))

- return getInt64Parameter(scriptState, GL_TIMESTAMP_EXT);

+ return WebGLAny(scriptState, 0);

synthesizeGLError(GL_INVALID_ENUM, "getParameter", "invalid parameter name, EXT_disjoint_timer_query not enabled");

return ScriptValue::createNull(scriptState);

case GL_GPU_DISJOINT_EXT: