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

Source/modules/webgl/WebGLFramebuffer.h

 /*
  * Copyright (C) 2009 Apple 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 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebGLFramebuffer_h
 #define WebGLFramebuffer_h
 
 #include "modules/webgl/WebGLContextObject.h"
 #include "modules/webgl/WebGLSharedObject.h"
 #include "wtf/PassRefPtr.h"

[sof, 2015/08/01 18:49:14]

The wtf/ includes can now be retired.

[peria, 2015/08/03 09:00:36]

Done.

 #include "wtf/RefCounted.h"
 
 namespace blink {
 
 class WebGLRenderbuffer;
 class WebGLTexture;
 
 class WebGLFramebuffer final : public WebGLContextObject {
     DEFINE_WRAPPERTYPEINFO();
 public:
-    class WebGLAttachment : public RefCountedWillBeGarbageCollectedFinalized<WebGLAttachment> {
+    class WebGLAttachment : public GarbageCollectedFinalized<WebGLAttachment> {
     public:
         virtual ~WebGLAttachment();
 
         virtual GLsizei width() const = 0;
         virtual GLsizei height() const = 0;
         virtual GLenum format() const = 0;
         // For texture attachment, type() returns the type of the attached texture.
         // For renderbuffer attachment, the type of the renderbuffer may vary with GL implementation.
         // To avoid confusion, it would be better to not implement type() for renderbuffer attachment and
         // we should always use the internalformat of the renderbuffer and avoid using type() API.
         virtual GLenum type() const = 0;
         virtual WebGLSharedObject* object() const = 0;
         virtual bool isSharedObject(WebGLSharedObject*) const = 0;
         virtual bool valid() const = 0;
         virtual void onDetached(WebGraphicsContext3D*) = 0;
         virtual void attach(WebGraphicsContext3D*, GLenum target, GLenum attachment) = 0;
         virtual void unattach(WebGraphicsContext3D*, GLenum target, GLenum attachment) = 0;
 
         DEFINE_INLINE_VIRTUAL_TRACE() { }
 
     protected:
         WebGLAttachment();
     };
 
     ~WebGLFramebuffer() override;
 
-    static PassRefPtrWillBeRawPtr<WebGLFramebuffer> create(WebGLRenderingContextBase*);
+    static WebGLFramebuffer* create(WebGLRenderingContextBase*);
 
     Platform3DObject object() const { return m_object; }
 
     void setAttachmentForBoundFramebuffer(GLenum target, GLenum attachment, GLenum texTarget, WebGLTexture*, GLint level);
     void setAttachmentForBoundFramebuffer(GLenum target, GLenum attachment, WebGLRenderbuffer*);
     // If an object is attached to the currently bound framebuffer, remove it.
     void removeAttachmentFromBoundFramebuffer(GLenum target, WebGLSharedObject*);
     // If a given attachment point for the currently bound framebuffer is not null, remove the attached object.
     void removeAttachmentFromBoundFramebuffer(GLenum target, GLenum attachment);
     WebGLSharedObject* getAttachmentObject(GLenum) const;
@@ skipping 47 matching lines @@
     bool isBound(GLenum target) const;
 
     // attach 'attachment' at 'attachmentPoint'.
     void attach(GLenum target, GLenum attachment, GLenum attachmentPoint);
 
     // Check if a new drawBuffers call should be issued. This is called when we add or remove an attachment.
     void drawBuffersIfNecessary(bool force);
 
     Platform3DObject m_object;
 
-    typedef WillBeHeapHashMap<GLenum, RefPtrWillBeMember<WebGLAttachment>> AttachmentMap;
+    typedef HeapHashMap<GLenum, Member<WebGLAttachment>> AttachmentMap;
 
     AttachmentMap m_attachments;
 
     bool m_hasEverBeenBound;
 
     Vector<GLenum> m_drawBuffers;
     Vector<GLenum> m_filteredDrawBuffers;
 
     GLenum m_readBuffer;
 };
 
 } // namespace blink
 
 #endif // WebGLFramebuffer_h