Oilpan: Remove most WillBe types from the code base

third_party/WebKit/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"
 
 namespace blink {
 
 class WebGLTexture;
 
 class WebGLActiveInfo;
 class WebGLBuffer;
 class WebGLProgram;
 class WebGLQuery;
 class WebGLSampler;
 class WebGLSync;
 class WebGLTransformFeedback;
 class WebGLUniformLocation;
 class WebGLVertexArrayObject;
 
 class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WebGL2RenderingContextBase);
+    USING_GARBAGE_COLLECTED_MIXIN(WebGL2RenderingContextBase);
 public:
     ~WebGL2RenderingContextBase() override;
 
     /* Buffer objects */
     void copyBufferSubData(GLenum, GLenum, long long, long long, long long);
     void getBufferSubData(GLenum target, long long offset, DOMArrayBuffer* returnedData);
 
     /* Framebuffer objects */
     bool validateTexFuncLayer(const char*, GLenum texTarget, GLint layer);
     void blitFramebuffer(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
@@ skipping 16 matching lines @@
         GLenum format, GLenum type, DOMArrayBufferView*);
     void texImage2D(GLenum target, GLint level, GLint internalformat,
         GLenum format, GLenum type, ImageData*);
     void texImage2D(GLenum target, GLint level, GLint internalformat,
         GLenum format, GLenum type, HTMLImageElement*, ExceptionState&);
     void texImage2D(GLenum target, GLint level, GLint internalformat,
         GLenum format, GLenum type, HTMLCanvasElement*, ExceptionState&);
     void texImage2D(GLenum target, GLint level, GLint internalformat,
         GLenum format, GLenum type, HTMLVideoElement*, ExceptionState&);
     void texImage2D(GLenum target, GLint level, GLint internalformat,
-        GLenum format, GLenum type, PassRefPtrWillBeRawPtr<ImageBitmap>, ExceptionState&);
+        GLenum format, GLenum type, RawPtr<ImageBitmap>, ExceptionState&);
     void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
         GLsizei width, GLsizei height,
         GLenum format, GLenum type, DOMArrayBufferView*);
     void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
         GLenum format, GLenum type, ImageData*);
     void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
         GLenum format, GLenum type, HTMLImageElement*, ExceptionState&);
     void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
         GLenum format, GLenum type, HTMLCanvasElement*, ExceptionState&);
     void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
         GLenum format, GLenum type, HTMLVideoElement*, ExceptionState&);
     void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
-        GLenum format, GLenum type, PassRefPtrWillBeRawPtr<ImageBitmap>, ExceptionState&);
+        GLenum format, GLenum type, RawPtr<ImageBitmap>, ExceptionState&);
 
     void texStorage2D(GLenum, GLsizei, GLenum, GLsizei, GLsizei);
     void texStorage3D(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei);
     void texImage3D(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, DOMArrayBufferView*);
     void texImage3D(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, GLintptr);
     void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, DOMArrayBufferView*);
     void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, GLintptr);
     void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, ImageData*);
     void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, HTMLImageElement*, ExceptionState&);
     void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, HTMLCanvasElement*, ExceptionState&);
     void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, HTMLVideoElement*, ExceptionState&);
-    void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, PassRefPtrWillBeRawPtr<ImageBitmap>, ExceptionState&);
+    void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, RawPtr<ImageBitmap>, ExceptionState&);
     void copyTexSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
     void compressedTexImage3D(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, DOMArrayBufferView*);
     void compressedTexSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, DOMArrayBufferView*);
 
     /* Programs and shaders */
     GLint getFragDataLocation(WebGLProgram*, const String&);
 
     /* Uniforms and attributes */
     void uniform1ui(const WebGLUniformLocation*, GLuint);
     void uniform2ui(const WebGLUniformLocation*, GLuint, GLuint);
@@ skipping 176 matching lines @@
     void removeBoundBuffer(WebGLBuffer*) override;
 
     void resetUnpackParameters() override;
     void restoreUnpackParameters() override;
 
     bool transformFeedbackActive() const override;
     bool transformFeedbackPaused() const override;
     void setTransformFeedbackActive(bool);
     void setTransformFeedbackPaused(bool);
 
-    PersistentWillBeMember<WebGLFramebuffer> m_readFramebufferBinding;
-    PersistentWillBeMember<WebGLTransformFeedback> m_transformFeedbackBinding;
+    Member<WebGLFramebuffer> m_readFramebufferBinding;
+    Member<WebGLTransformFeedback> m_transformFeedbackBinding;
 
     std::set<GLenum> m_supportedInternalFormatsStorage;
     std::set<GLenum> m_compressedTextureFormatsETC2EAC;
 
-    PersistentWillBeMember<WebGLBuffer> m_boundCopyReadBuffer;
-    PersistentWillBeMember<WebGLBuffer> m_boundCopyWriteBuffer;
-    PersistentWillBeMember<WebGLBuffer> m_boundPixelPackBuffer;
-    PersistentWillBeMember<WebGLBuffer> m_boundPixelUnpackBuffer;
-    PersistentWillBeMember<WebGLBuffer> m_boundTransformFeedbackBuffer;
-    PersistentWillBeMember<WebGLBuffer> m_boundUniformBuffer;
+    Member<WebGLBuffer> m_boundCopyReadBuffer;
+    Member<WebGLBuffer> m_boundCopyWriteBuffer;
+    Member<WebGLBuffer> m_boundPixelPackBuffer;
+    Member<WebGLBuffer> m_boundPixelUnpackBuffer;
+    Member<WebGLBuffer> m_boundTransformFeedbackBuffer;
+    Member<WebGLBuffer> m_boundUniformBuffer;
 
-    PersistentHeapVectorWillBeHeapVector<Member<WebGLBuffer>> m_boundIndexedTransformFeedbackBuffers;
-    PersistentHeapVectorWillBeHeapVector<Member<WebGLBuffer>> m_boundIndexedUniformBuffers;
+    HeapVector<Member<WebGLBuffer>> m_boundIndexedTransformFeedbackBuffers;
+    HeapVector<Member<WebGLBuffer>> m_boundIndexedUniformBuffers;
     GLint m_maxTransformFeedbackSeparateAttribs;
     size_t m_maxBoundUniformBufferIndex;
 
-    PersistentWillBeMember<WebGLQuery> m_currentBooleanOcclusionQuery;
-    PersistentWillBeMember<WebGLQuery> m_currentTransformFeedbackPrimitivesWrittenQuery;
-    PersistentHeapVectorWillBeHeapVector<Member<WebGLSampler>> m_samplerUnits;
+    Member<WebGLQuery> m_currentBooleanOcclusionQuery;
+    Member<WebGLQuery> m_currentTransformFeedbackPrimitivesWrittenQuery;
+    HeapVector<Member<WebGLSampler>> m_samplerUnits;
 
     GLint m_packRowLength;
     GLint m_packSkipPixels;
     GLint m_packSkipRows;
     GLint m_unpackRowLength;
     GLint m_unpackImageHeight;
     GLint m_unpackSkipPixels;
     GLint m_unpackSkipRows;
     GLint m_unpackSkipImages;
 };
 
 DEFINE_TYPE_CASTS(WebGL2RenderingContextBase, CanvasRenderingContext, context,
     context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) >= 2,
     context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) >= 2);
 
 } // namespace blink
 
 #endif