Revert of [Oilpan] Migrate classes under module/webgl onto oilpan heap

Source/modules/webgl/WebGLVertexArrayObjectBase.h

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