Oilpan: move 2D Canvas and WebGL objects to the heap.

Source/core/html/canvas/WebGLVertexArrayObjectOES.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 13 matching lines @@
  */
 
 #include "config.h"
 
 #include "core/html/canvas/WebGLVertexArrayObjectOES.h"
 
 #include "core/html/canvas/WebGLRenderingContextBase.h"
 
 namespace blink {
 
-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)
     : WebGLContextObject(ctx)
     , m_type(type)
     , m_hasEverBeenBound(false)
     , m_boundElementArrayBuffer(nullptr)
 {
     ScriptWrappable::init(this);
     m_vertexAttribState.resize(ctx->maxVertexAttribs());
 
     switch (m_type) {
     case VaoTypeDefault:
         break;
     default:
         setObject(context()->webContext()->createVertexArrayOES());
         break;
     }
 }
 
 WebGLVertexArrayObjectOES::~WebGLVertexArrayObjectOES()
 {
-    deleteObject(0);
+#if ENABLE(OILPAN)
+    // These heap objects must not be accessed by deleteObjectImpl(),
+    // clear them out before a call to it is triggered below. The
+    // finalizers of these two (and their elements) will themselves
+    // handle detachment.
+    m_boundElementArrayBuffer.clear();
+    m_vertexAttribState.clear();
+#endif
+    // Delete the platform framebuffer resource. Explicit detachment
+    // is for the benefit of Oilpan, where this vertex array object
+    // isn't detached when it and the WebGLRenderingContextBase object
+    // it is registered with are both finalized. Without Oilpan, the
+    // object will have been detached.
+    //
+    // To keep the code regular, the trivial detach()ment is always
+    // performed.
+    detachAndDeleteObject();
 }
 
 void WebGLVertexArrayObjectOES::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Platform3DObject object)
 {
     switch (m_type) {
     case VaoTypeDefault:
         break;
     default:
-        context()->webContext()->deleteVertexArrayOES(object);
+        context3d->deleteVertexArrayOES(object);
         break;
     }
 
     if (m_boundElementArrayBuffer)
         m_boundElementArrayBuffer->onDetached(context3d);
 
     for (size_t i = 0; i < m_vertexAttribState.size(); ++i) {
         VertexAttribState& state = m_vertexAttribState[i];
         if (state.bufferBinding)
             state.bufferBinding->onDetached(context3d);
     }
 }
 
-void WebGLVertexArrayObjectOES::setElementArrayBuffer(PassRefPtr<WebGLBuffer> buffer)
+void WebGLVertexArrayObjectOES::setElementArrayBuffer(PassRefPtrWillBeRawPtr<WebGLBuffer> buffer)
 {
     if (buffer)
         buffer->onAttached();
     if (m_boundElementArrayBuffer)
         m_boundElementArrayBuffer->onDetached(context()->webContext());
     m_boundElementArrayBuffer = buffer;
-
 }
 
 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;
 
     VertexAttribState& state = m_vertexAttribState[index];
 
     if (buffer)
         buffer->onAttached();
     if (state.bufferBinding)
         state.bufferBinding->onDetached(context()->webContext());
 
     state.bufferBinding = buffer;
     state.bytesPerElement = bytesPerElement;
     state.size = size;
     state.type = type;
     state.normalized = normalized;
     state.stride = validatedStride;
     state.originalStride = stride;
     state.offset = offset;
 }
 
-void WebGLVertexArrayObjectOES::unbindBuffer(PassRefPtr<WebGLBuffer> buffer)
+void WebGLVertexArrayObjectOES::unbindBuffer(PassRefPtrWillBeRawPtr<WebGLBuffer> buffer)
 {
     if (m_boundElementArrayBuffer == buffer) {
         m_boundElementArrayBuffer->onDetached(context()->webContext());
         m_boundElementArrayBuffer = nullptr;
     }
 
     for (size_t i = 0; i < m_vertexAttribState.size(); ++i) {
         VertexAttribState& state = m_vertexAttribState[i];
         if (state.bufferBinding == buffer) {
             buffer->onDetached(context()->webContext());
             state.bufferBinding = nullptr;
         }
     }
 }
 
 void WebGLVertexArrayObjectOES::setVertexAttribDivisor(GLuint index, GLuint divisor)
 {
     VertexAttribState& state = m_vertexAttribState[index];
     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);
+}
+
+}