Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(583)

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h

Issue 2437233002: Implement EXT_disjoint_timer_query_webgl2 (Closed)
Patch Set: fix logic again Created 4 years, 2 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
Index: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
diff --git a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
index 5749eb9c1b70a3d70e1dd81ae73a932c6d8baa02..c513908139264a8867774dc8f43fadd0c5050faa 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
+++ b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
@@ -642,7 +642,7 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
GLboolean isQuery(WebGLQuery*);
void beginQuery(GLenum, WebGLQuery*);
void endQuery(GLenum);
- WebGLQuery* getQuery(GLenum, GLenum);
+ ScriptValue getQuery(ScriptState*, GLenum, GLenum);
ScriptValue getQueryParameter(ScriptState*, WebGLQuery*, GLenum);
/* Sampler Objects */
@@ -881,7 +881,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
TraceWrapperMember<WebGLQuery> m_currentBooleanOcclusionQuery;
TraceWrapperMember<WebGLQuery>
m_currentTransformFeedbackPrimitivesWrittenQuery;
- HeapVector<TraceWrapperMember<WebGLSampler>> m_samplerUnits;
+ TraceWrapperMember<WebGLQuery> m_currentElapsedQuery;
+ HeapVector<Member<WebGLSampler>> m_samplerUnits;
GLint m_packRowLength;
GLint m_packSkipPixels;

Powered by Google App Engine
This is Rietveld 408576698