Remove WebGLObject maps from WebGLRenderingContextBase and WebGLContextGroup.

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

 /*
  * 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 25 matching lines @@
 
 class WebGLRenderbufferAttachment final
     : public WebGLFramebuffer::WebGLAttachment {
  public:
   static WebGLFramebuffer::WebGLAttachment* create(WebGLRenderbuffer*);
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   explicit WebGLRenderbufferAttachment(WebGLRenderbuffer*);
-  WebGLRenderbufferAttachment() {}
 
   WebGLSharedObject* object() const override;
   bool isSharedObject(WebGLSharedObject*) const override;
   bool valid() const override;
   void onDetached(gpu::gles2::GLES2Interface*) override;
   void attach(gpu::gles2::GLES2Interface*,
               GLenum target,
               GLenum attachment) override;
   void unattach(gpu::gles2::GLES2Interface*,
                 GLenum target,
@@ skipping 53 matching lines @@
                                                    GLint level,
                                                    GLint layer);
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   WebGLTextureAttachment(WebGLTexture*,
                          GLenum target,
                          GLint level,
                          GLint layer);
-  WebGLTextureAttachment() {}
 
   WebGLSharedObject* object() const override;
   bool isSharedObject(WebGLSharedObject*) const override;
   bool valid() const override;
   void onDetached(gpu::gles2::GLES2Interface*) override;
   void attach(gpu::gles2::GLES2Interface*,
               GLenum target,
               GLenum attachment) override;
   void unattach(gpu::gles2::GLES2Interface*,
                 GLenum target,
@@ skipping 59 matching lines @@
     gl->FramebufferTextureLayer(target, attachment, 0, m_level, m_layer);
   } else {
     gl->FramebufferTexture2D(target, attachment, m_target, 0, m_level);
   }
 }
 
 }  // anonymous namespace
 
 WebGLFramebuffer::WebGLAttachment::WebGLAttachment() {}
 
-WebGLFramebuffer::WebGLAttachment::~WebGLAttachment() {}
-
 WebGLFramebuffer* WebGLFramebuffer::create(WebGLRenderingContextBase* ctx) {
   return new WebGLFramebuffer(ctx);
 }
 
 WebGLFramebuffer::WebGLFramebuffer(WebGLRenderingContextBase* ctx)
     : WebGLContextObject(ctx),
       m_object(0),
-      m_destructionInProgress(false),
       m_hasEverBeenBound(false),
       m_webGL1DepthStencilConsistent(true),
       m_readBuffer(GL_COLOR_ATTACHMENT0) {
   ctx->contextGL()->GenFramebuffers(1, &m_object);
 }
 
 WebGLFramebuffer::~WebGLFramebuffer() {
-  // Attachments in |m_attachments| will be deleted from other
-  // places, and we must not touch that map in deleteObjectImpl once
-  // the destructor has been entered.
-  m_destructionInProgress = true;
-
-  // See the comment in WebGLObject::detachAndDeleteObject().
-  detachAndDeleteObject();
+  runDestructor();
 }
 
 void WebGLFramebuffer::setAttachmentForBoundFramebuffer(GLenum target,
                                                         GLenum attachment,
                                                         GLenum texTarget,
                                                         WebGLTexture* texture,
                                                         GLint level,
                                                         GLint layer) {
   DCHECK(m_object);
   DCHECK(isBound(target));
@@ skipping 142 matching lines @@
     attachment = getAttachment(GL_DEPTH_STENCIL_ATTACHMENT);
   return attachment && attachment->valid();
 }
 
 void WebGLFramebuffer::deleteObjectImpl(gpu::gles2::GLES2Interface* gl) {
   // Both the AttachmentMap and its WebGLAttachment objects are GCed
   // objects and cannot be accessed after the destructor has been
   // entered, as they may have been finalized already during the
   // same GC sweep. These attachments' OpenGL objects will be fully
   // destroyed once their JavaScript wrappers are collected.
-  if (!m_destructionInProgress) {
+  if (!destructionInProgress()) {
     for (const auto& attachment : m_attachments)
       attachment.value->onDetached(gl);
   }
 
   gl->DeleteFramebuffers(1, &m_object);
   m_object = 0;
 }
 
 bool WebGLFramebuffer::isBound(GLenum target) const {
   return (context()->getFramebufferBinding(target) == this);
@@ skipping 153 matching lines @@
 }
 
 DEFINE_TRACE_WRAPPERS(WebGLFramebuffer) {
   for (const auto& attachment : m_attachments) {
     visitor->traceWrappers(attachment.value->object());
   }
   WebGLContextObject::traceWrappers(visitor);
 }
 
 }  // namespace blink