| 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;
|
|
|