| Index: Source/core/html/canvas/WebGLVertexArrayObjectOES.cpp
|
| diff --git a/Source/core/html/canvas/WebGLVertexArrayObjectOES.cpp b/Source/core/html/canvas/WebGLVertexArrayObjectOES.cpp
|
| index 6c12bccb7048db6bf46c1ecee414aec519394be5..366ba7b84b4ce137e06a5492402f3e4862dae63d 100644
|
| --- a/Source/core/html/canvas/WebGLVertexArrayObjectOES.cpp
|
| +++ b/Source/core/html/canvas/WebGLVertexArrayObjectOES.cpp
|
| @@ -31,9 +31,9 @@
|
|
|
| namespace WebCore {
|
|
|
| -PassRefPtr<WebGLVertexArrayObjectOES> WebGLVertexArrayObjectOES::create(WebGLRenderingContextBase* ctx, VaoType type)
|
| +PassRefPtrWillBeRawPtr<WebGLVertexArrayObjectOES> WebGLVertexArrayObjectOES::create(WebGLRenderingContextBase* ctx, VaoType type)
|
| {
|
| - return adoptRef(new WebGLVertexArrayObjectOES(ctx, type));
|
| + return adoptRefWillBeNoop(new WebGLVertexArrayObjectOES(ctx, type));
|
| }
|
|
|
| WebGLVertexArrayObjectOES::WebGLVertexArrayObjectOES(WebGLRenderingContextBase* ctx, VaoType type)
|
| @@ -79,7 +79,7 @@ void WebGLVertexArrayObjectOES::deleteObjectImpl(blink::WebGraphicsContext3D* co
|
| }
|
| }
|
|
|
| -void WebGLVertexArrayObjectOES::setElementArrayBuffer(PassRefPtr<WebGLBuffer> buffer)
|
| +void WebGLVertexArrayObjectOES::setElementArrayBuffer(PassRefPtrWillBeRawPtr<WebGLBuffer> buffer)
|
| {
|
| if (buffer)
|
| buffer->onAttached();
|
| @@ -90,7 +90,7 @@ void WebGLVertexArrayObjectOES::setElementArrayBuffer(PassRefPtr<WebGLBuffer> bu
|
| }
|
|
|
| void WebGLVertexArrayObjectOES::setVertexAttribState(
|
| - GLuint index, GLsizei bytesPerElement, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset, PassRefPtr<WebGLBuffer> buffer)
|
| + GLuint index, GLsizei bytesPerElement, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset, PassRefPtrWillBeRawPtr<WebGLBuffer> buffer)
|
| {
|
| GLsizei validatedStride = stride ? stride : bytesPerElement;
|
|
|
| @@ -111,7 +111,7 @@ void WebGLVertexArrayObjectOES::setVertexAttribState(
|
| state.offset = offset;
|
| }
|
|
|
| -void WebGLVertexArrayObjectOES::unbindBuffer(PassRefPtr<WebGLBuffer> buffer)
|
| +void WebGLVertexArrayObjectOES::unbindBuffer(PassRefPtrWillBeRawPtr<WebGLBuffer> buffer)
|
| {
|
| if (m_boundElementArrayBuffer == buffer) {
|
| m_boundElementArrayBuffer->onDetached(context()->webContext());
|
| @@ -133,4 +133,16 @@ void WebGLVertexArrayObjectOES::setVertexAttribDivisor(GLuint index, GLuint divi
|
| state.divisor = divisor;
|
| }
|
|
|
| +void WebGLVertexArrayObjectOES::VertexAttribState::trace(Visitor* visitor)
|
| +{
|
| + visitor->trace(bufferBinding);
|
| +}
|
| +
|
| +void WebGLVertexArrayObjectOES::trace(Visitor* visitor)
|
| +{
|
| + visitor->trace(m_boundElementArrayBuffer);
|
| + visitor->trace(m_vertexAttribState);
|
| + WebGLContextObject::trace(visitor);
|
| +}
|
| +
|
| }
|
|
|