| Index: Source/modules/webgl/WebGL2RenderingContextBase.h
|
| diff --git a/Source/modules/webgl/WebGL2RenderingContextBase.h b/Source/modules/webgl/WebGL2RenderingContextBase.h
|
| index 3d6d15ce4800e4a511b2afc6f72462ac8e569e6d..834b344cf848d63bdfcee7b7b7f313b0481b6670 100644
|
| --- a/Source/modules/webgl/WebGL2RenderingContextBase.h
|
| +++ b/Source/modules/webgl/WebGL2RenderingContextBase.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "modules/webgl/WebGLExtension.h"
|
| #include "modules/webgl/WebGLRenderingContextBase.h"
|
| +#include "wtf/PassRefPtr.h"
|
|
|
| namespace blink {
|
|
|
| @@ -103,16 +104,16 @@
|
| void clearBufferfi(GLenum, GLint, GLfloat, GLint);
|
|
|
| /* Query Objects */
|
| - WebGLQuery* createQuery();
|
| + PassRefPtrWillBeRawPtr<WebGLQuery> createQuery();
|
| void deleteQuery(WebGLQuery*);
|
| GLboolean isQuery(WebGLQuery*);
|
| void beginQuery(GLenum, WebGLQuery*);
|
| void endQuery(GLenum);
|
| - WebGLQuery* getQuery(GLenum, GLenum);
|
| + PassRefPtrWillBeRawPtr<WebGLQuery> getQuery(GLenum, GLenum);
|
| ScriptValue getQueryParameter(ScriptState*, WebGLQuery*, GLenum);
|
|
|
| /* Sampler Objects */
|
| - WebGLSampler* createSampler();
|
| + PassRefPtrWillBeRawPtr<WebGLSampler> createSampler();
|
| void deleteSampler(WebGLSampler*);
|
| GLboolean isSampler(WebGLSampler*);
|
| void bindSampler(GLuint, WebGLSampler*);
|
| @@ -121,7 +122,7 @@
|
| ScriptValue getSamplerParameter(ScriptState*, WebGLSampler*, GLenum);
|
|
|
| /* Sync objects */
|
| - WebGLSync* fenceSync(GLenum, GLbitfield);
|
| + PassRefPtrWillBeRawPtr<WebGLSync> fenceSync(GLenum, GLbitfield);
|
| GLboolean isSync(WebGLSync*);
|
| void deleteSync(WebGLSync*);
|
| GLenum clientWaitSync(WebGLSync*, GLbitfield, GLint64);
|
| @@ -130,14 +131,14 @@
|
| ScriptValue getSyncParameter(ScriptState*, WebGLSync*, GLenum);
|
|
|
| /* Transform Feedback */
|
| - WebGLTransformFeedback* createTransformFeedback();
|
| + PassRefPtrWillBeRawPtr<WebGLTransformFeedback> createTransformFeedback();
|
| void deleteTransformFeedback(WebGLTransformFeedback*);
|
| GLboolean isTransformFeedback(WebGLTransformFeedback*);
|
| void bindTransformFeedback(GLenum, WebGLTransformFeedback*);
|
| void beginTransformFeedback(GLenum);
|
| void endTransformFeedback();
|
| void transformFeedbackVaryings(WebGLProgram*, const Vector<String>&, GLenum);
|
| - WebGLActiveInfo* getTransformFeedbackVarying(WebGLProgram*, GLuint);
|
| + PassRefPtrWillBeRawPtr<WebGLActiveInfo> getTransformFeedbackVarying(WebGLProgram*, GLuint);
|
| void pauseTransformFeedback();
|
| void resumeTransformFeedback();
|
|
|
| @@ -153,7 +154,7 @@
|
| void uniformBlockBinding(WebGLProgram*, GLuint, GLuint);
|
|
|
| /* Vertex Array Objects */
|
| - WebGLVertexArrayObject* createVertexArray();
|
| + PassRefPtrWillBeRawPtr<WebGLVertexArrayObject> createVertexArray();
|
| void deleteVertexArray(WebGLVertexArrayObject*);
|
| GLboolean isVertexArray(WebGLVertexArrayObject*);
|
| void bindVertexArray(WebGLVertexArrayObject*);
|
| @@ -207,21 +208,21 @@
|
|
|
| void removeBoundBuffer(WebGLBuffer*) override;
|
|
|
| - PersistentWillBeMember<WebGLFramebuffer> m_readFramebufferBinding;
|
| - PersistentWillBeMember<WebGLTransformFeedback> m_transformFeedbackBinding;
|
| + RefPtrWillBeMember<WebGLFramebuffer> m_readFramebufferBinding;
|
| + RefPtrWillBeMember<WebGLTransformFeedback> m_transformFeedbackBinding;
|
| GLint m_max3DTextureSize;
|
| GLint m_max3DTextureLevel;
|
|
|
| - PersistentWillBeMember<WebGLBuffer> m_boundCopyReadBuffer;
|
| - PersistentWillBeMember<WebGLBuffer> m_boundCopyWriteBuffer;
|
| - PersistentWillBeMember<WebGLBuffer> m_boundPixelPackBuffer;
|
| - PersistentWillBeMember<WebGLBuffer> m_boundPixelUnpackBuffer;
|
| - PersistentWillBeMember<WebGLBuffer> m_boundTransformFeedbackBuffer;
|
| - PersistentWillBeMember<WebGLBuffer> m_boundUniformBuffer;
|
| -
|
| - PersistentWillBeMember<WebGLQuery> m_currentBooleanOcclusionQuery;
|
| - PersistentWillBeMember<WebGLQuery> m_currentTransformFeedbackPrimitivesWrittenQuery;
|
| - PersistentHeapVectorWillBeHeapVector<Member<WebGLSampler>> m_samplerUnits;
|
| + RefPtrWillBeMember<WebGLBuffer> m_boundCopyReadBuffer;
|
| + RefPtrWillBeMember<WebGLBuffer> m_boundCopyWriteBuffer;
|
| + RefPtrWillBeMember<WebGLBuffer> m_boundPixelPackBuffer;
|
| + RefPtrWillBeMember<WebGLBuffer> m_boundPixelUnpackBuffer;
|
| + RefPtrWillBeMember<WebGLBuffer> m_boundTransformFeedbackBuffer;
|
| + RefPtrWillBeMember<WebGLBuffer> m_boundUniformBuffer;
|
| +
|
| + RefPtrWillBeMember<WebGLQuery> m_currentBooleanOcclusionQuery;
|
| + RefPtrWillBeMember<WebGLQuery> m_currentTransformFeedbackPrimitivesWrittenQuery;
|
| + WillBeHeapVector<RefPtrWillBeMember<WebGLSampler>> m_samplerUnits;
|
| };
|
|
|
| DEFINE_TYPE_CASTS(WebGL2RenderingContextBase, CanvasRenderingContext, context,
|
|
|