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

Source/modules/webgl/WebGL2RenderingContextBase.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WebGL2RenderingContextBase_h
 #define WebGL2RenderingContextBase_h
 
 #include "modules/webgl/WebGLExtension.h"
 #include "modules/webgl/WebGLRenderingContextBase.h"
+#include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 class WebGLTexture;
 
 class WebGLActiveInfo;
 class WebGLBuffer;
 class WebGLProgram;
 class WebGLQuery;
 class WebGLSampler;
@@ skipping 76 matching lines @@
     void drawBuffers(const Vector<GLenum>&);
     void clearBufferiv(GLenum, GLint, DOMInt32Array*);
     void clearBufferiv(GLenum, GLint, const Vector<GLint>&);
     void clearBufferuiv(GLenum, GLint, DOMUint32Array*);
     void clearBufferuiv(GLenum, GLint, const Vector<GLuint>&);
     void clearBufferfv(GLenum, GLint, DOMFloat32Array*);
     void clearBufferfv(GLenum, GLint, const Vector<GLfloat>&);
     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*);
     void samplerParameteri(WebGLSampler*, GLenum, GLint);
     void samplerParameterf(WebGLSampler*, GLenum, GLfloat);
     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);
     void waitSync(WebGLSync*, GLbitfield, GLint64);
 
     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();
 
     /* Uniform Buffer Objects and Transform Feedback Buffers */
     void bindBufferBase(GLenum, GLuint, WebGLBuffer*);
     void bindBufferRange(GLenum, GLuint, WebGLBuffer*, long long, long long);
     ScriptValue getIndexedParameter(ScriptState*, GLenum, GLuint);
     Vector<GLuint> getUniformIndices(WebGLProgram*, const Vector<String>&);
     Vector<GLint> getActiveUniforms(WebGLProgram*, const Vector<GLuint>&, GLenum);
     GLuint getUniformBlockIndex(WebGLProgram*, const String&);
     ScriptValue getActiveUniformBlockParameter(ScriptState*, WebGLProgram*, GLuint, GLenum);
     String getActiveUniformBlockName(WebGLProgram*, GLuint);
     void uniformBlockBinding(WebGLProgram*, GLuint, GLuint);
 
     /* Vertex Array Objects */
-    WebGLVertexArrayObject* createVertexArray();
+    PassRefPtrWillBeRawPtr<WebGLVertexArrayObject> createVertexArray();
     void deleteVertexArray(WebGLVertexArrayObject*);
     GLboolean isVertexArray(WebGLVertexArrayObject*);
     void bindVertexArray(WebGLVertexArrayObject*);
 
     /* WebGLRenderingContextBase overrides */
     void initializeNewContext() override;
     void bindFramebuffer(GLenum target, WebGLFramebuffer*) override;
     void deleteFramebuffer(WebGLFramebuffer*) override;
     ScriptValue getParameter(ScriptState*, GLenum pname) override;
     ScriptValue getTexParameter(ScriptState*, GLenum target, GLenum pname) override;
@@ skipping 33 matching lines @@
     bool validateReadPixelsFormatAndType(GLenum format, GLenum type) override;
     WebGLFramebuffer* getFramebufferBinding(GLenum target) override;
     GLint getMaxTextureLevelForTarget(GLenum target) override;
     void renderbufferStorageImpl(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, const char* functionName) override;
     GLenum boundFramebufferColorFormat() override;
 
     WebGLBuffer* validateBufferDataTarget(const char* functionName, GLenum target) override;
 
     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;
+    RefPtrWillBeMember<WebGLBuffer> m_boundCopyReadBuffer;
+    RefPtrWillBeMember<WebGLBuffer> m_boundCopyWriteBuffer;
+    RefPtrWillBeMember<WebGLBuffer> m_boundPixelPackBuffer;
+    RefPtrWillBeMember<WebGLBuffer> m_boundPixelUnpackBuffer;
+    RefPtrWillBeMember<WebGLBuffer> m_boundTransformFeedbackBuffer;
+    RefPtrWillBeMember<WebGLBuffer> m_boundUniformBuffer;
 
-    PersistentWillBeMember<WebGLQuery> m_currentBooleanOcclusionQuery;
-    PersistentWillBeMember<WebGLQuery> m_currentTransformFeedbackPrimitivesWrittenQuery;
-    PersistentHeapVectorWillBeHeapVector<Member<WebGLSampler>> m_samplerUnits;
+    RefPtrWillBeMember<WebGLQuery> m_currentBooleanOcclusionQuery;
+    RefPtrWillBeMember<WebGLQuery> m_currentTransformFeedbackPrimitivesWrittenQuery;
+    WillBeHeapVector<RefPtrWillBeMember<WebGLSampler>> m_samplerUnits;
 };
 
 DEFINE_TYPE_CASTS(WebGL2RenderingContextBase, CanvasRenderingContext, context,
     context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) >= 2,
     context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) >= 2);
 
 } // namespace blink
 
 #endif