Revert of [wrapper-tracing] Fix WebGL extension and attachment handling

third_party/WebKit/Source/modules/webgl/WebGLFramebuffer.cpp

Index: third_party/WebKit/Source/modules/webgl/WebGLFramebuffer.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLFramebuffer.cpp b/third_party/WebKit/Source/modules/webgl/WebGLFramebuffer.cpp
index 305b366fbb608056afd07107627131731cfa6de4..9a4b8221b9a2d54dadf53312df978e56eb32787d 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGLFramebuffer.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGLFramebuffer.cpp
@@ -40,13 +40,10 @@
   static WebGLFramebuffer::WebGLAttachment* create(WebGLRenderbuffer*);
 
   DECLARE_VIRTUAL_TRACE();
-  DEFINE_INLINE_VIRTUAL_TRACE_WRAPPERS() {
-    visitor->traceWrappers(m_renderbuffer);
-  }
 
  private:
   explicit WebGLRenderbufferAttachment(WebGLRenderbuffer*);
-  WebGLRenderbufferAttachment() : m_renderbuffer(this, nullptr) {}
+  WebGLRenderbufferAttachment() {}
 
   WebGLSharedObject* object() const override;
   bool isSharedObject(WebGLSharedObject*) const override;
@@ -59,7 +56,7 @@
                 GLenum target,
                 GLenum attachment) override;
 
-  TraceWrapperMember<WebGLRenderbuffer> m_renderbuffer;
+  Member<WebGLRenderbuffer> m_renderbuffer;
 };
 
 WebGLFramebuffer::WebGLAttachment* WebGLRenderbufferAttachment::create(
@@ -74,7 +71,7 @@
 
 WebGLRenderbufferAttachment::WebGLRenderbufferAttachment(
     WebGLRenderbuffer* renderbuffer)
-    : m_renderbuffer(this, renderbuffer) {}
+    : m_renderbuffer(renderbuffer) {}
 
 WebGLSharedObject* WebGLRenderbufferAttachment::object() const {
   return m_renderbuffer->object() ? m_renderbuffer.get() : 0;
@@ -114,14 +111,13 @@
                                                    GLint layer);
 
   DECLARE_VIRTUAL_TRACE();
-  DEFINE_INLINE_VIRTUAL_TRACE_WRAPPERS() { visitor->traceWrappers(m_texture); }
 
  private:
   WebGLTextureAttachment(WebGLTexture*,
                          GLenum target,
                          GLint level,
                          GLint layer);
-  WebGLTextureAttachment() : m_texture(this, nullptr) {}
+  WebGLTextureAttachment() {}
 
   WebGLSharedObject* object() const override;
   bool isSharedObject(WebGLSharedObject*) const override;
@@ -134,7 +130,7 @@
                 GLenum target,
                 GLenum attachment) override;
 
-  TraceWrapperMember<WebGLTexture> m_texture;
+  Member<WebGLTexture> m_texture;
   GLenum m_target;
   GLint m_level;
   GLint m_layer;
@@ -157,10 +153,7 @@
                                                GLenum target,
                                                GLint level,
                                                GLint layer)
-    : m_texture(this, texture),
-      m_target(target),
-      m_level(level),
-      m_layer(layer) {}
+    : m_texture(texture), m_target(target), m_level(level), m_layer(layer) {}
 
 WebGLSharedObject* WebGLTextureAttachment::object() const {
   return m_texture->object() ? m_texture.get() : 0;