| Index: Source/modules/webgl/WebGLVertexArrayObjectBase.h
|
| diff --git a/Source/modules/webgl/WebGLVertexArrayObjectBase.h b/Source/modules/webgl/WebGLVertexArrayObjectBase.h
|
| index 0e01f43508ab54c5a8dc6cac48654158bf9d427f..8253bb8fc47aef3b9b7814030247aebee963f0f1 100644
|
| --- a/Source/modules/webgl/WebGLVertexArrayObjectBase.h
|
| +++ b/Source/modules/webgl/WebGLVertexArrayObjectBase.h
|
| @@ -24,7 +24,7 @@ public:
|
| Platform3DObject object() const { return m_object; }
|
|
|
| // Cached values for vertex attrib range checks
|
| - class VertexAttribState final : public NoBaseWillBeGarbageCollected<VertexAttribState> {
|
| + class VertexAttribState final : public GarbageCollected<VertexAttribState> {
|
| public:
|
| VertexAttribState()
|
| : enabled(false)
|
| @@ -42,7 +42,7 @@ public:
|
| DECLARE_TRACE();
|
|
|
| bool enabled;
|
| - RefPtrWillBeMember<WebGLBuffer> bufferBinding;
|
| + Member<WebGLBuffer> bufferBinding;
|
| GLsizei bytesPerElement;
|
| GLint size;
|
| GLenum type;
|
| @@ -58,12 +58,12 @@ public:
|
| bool hasEverBeenBound() const { return object() && m_hasEverBeenBound; }
|
| void setHasEverBeenBound() { m_hasEverBeenBound = true; }
|
|
|
| - PassRefPtrWillBeRawPtr<WebGLBuffer> boundElementArrayBuffer() const { return m_boundElementArrayBuffer; }
|
| - void setElementArrayBuffer(PassRefPtrWillBeRawPtr<WebGLBuffer>);
|
| + WebGLBuffer* boundElementArrayBuffer() const { return m_boundElementArrayBuffer; }
|
| + void setElementArrayBuffer(WebGLBuffer*);
|
|
|
| VertexAttribState* getVertexAttribState(size_t);
|
| - void setVertexAttribState(GLuint, GLsizei, GLint, GLenum, GLboolean, GLsizei, GLintptr, PassRefPtrWillBeRawPtr<WebGLBuffer>);
|
| - void unbindBuffer(PassRefPtrWillBeRawPtr<WebGLBuffer>);
|
| + void setVertexAttribState(GLuint, GLsizei, GLint, GLenum, GLboolean, GLsizei, GLintptr, WebGLBuffer*);
|
| + void unbindBuffer(WebGLBuffer*);
|
| void setVertexAttribDivisor(GLuint index, GLuint divisor);
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
| @@ -80,11 +80,9 @@ private:
|
|
|
| VaoType m_type;
|
| bool m_hasEverBeenBound;
|
| -#if ENABLE(OILPAN)
|
| bool m_destructionInProgress;
|
| -#endif
|
| - RefPtrWillBeMember<WebGLBuffer> m_boundElementArrayBuffer;
|
| - WillBeHeapVector<OwnPtrWillBeMember<VertexAttribState>> m_vertexAttribState;
|
| + Member<WebGLBuffer> m_boundElementArrayBuffer;
|
| + HeapVector<Member<VertexAttribState>> m_vertexAttribState;
|
| };
|
|
|
| } // namespace blink
|
|
|