Remove WebGLObject maps from WebGLRenderingContextBase and WebGLContextGroup.

third_party/WebKit/Source/modules/webgl/WebGLObject.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 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/webgl/WebGLObject.h"
 
 #include "modules/webgl/WebGLRenderingContextBase.h"
 
 namespace blink {
 
-WebGLObject::WebGLObject(WebGLRenderingContextBase*)
-    : m_attachmentCount(0), m_deleted(false) {}
+WebGLObject::WebGLObject(WebGLRenderingContextBase* context)
+    : m_cachedNumberOfContextLosses(context->numberOfContextLosses()),
+      m_attachmentCount(0),
+      m_deleted(false),
+      m_destructionInProgress(false) {}
 
-WebGLObject::~WebGLObject() {
-  // Verify that platform objects have been explicitly deleted.
-  ASSERT(m_deleted);
+WebGLObject::~WebGLObject() {}
+
+uint32_t WebGLObject::cachedNumberOfContextLosses() const {
+  return m_cachedNumberOfContextLosses;
 }
 
 void WebGLObject::deleteObject(gpu::gles2::GLES2Interface* gl) {
   m_deleted = true;
   if (!hasObject())
     return;
 
   if (!hasGroupOrContext())
     return;
 
+  if (currentNumberOfContextLosses() != m_cachedNumberOfContextLosses) {
+    // This object has been invalidated.
+    return;
+  }
+
   if (!m_attachmentCount) {
     if (!gl)
       gl = getAGLInterface();
     if (gl) {
       deleteObjectImpl(gl);
       // Ensure the inherited class no longer claims to have a valid object
       ASSERT(!hasObject());
     }
   }
 }
 
 void WebGLObject::detach() {
   m_attachmentCount = 0;  // Make sure OpenGL resource is deleted.
 }
 
 void WebGLObject::detachAndDeleteObject() {
   // To ensure that all platform objects are deleted after being detached,
   // this method does them together.
-  //
-  // The individual WebGL destructors need to call detachAndDeleteObject()
-  // rather than do it based on Oilpan GC.
   detach();
   deleteObject(nullptr);
 }
 
+void WebGLObject::runDestructor() {
+  DCHECK(!m_destructionInProgress);
+  // This boilerplate destructor is sufficient for all subclasses, as long
+  // as they implement deleteObjectImpl properly, and don't try to touch
+  // other objects on the Oilpan heap if the destructor's been entered.
+  m_destructionInProgress = true;
+  detachAndDeleteObject();
+}
+
+bool WebGLObject::destructionInProgress() const {
+  return m_destructionInProgress;
+}
+
 void WebGLObject::onDetached(gpu::gles2::GLES2Interface* gl) {
   if (m_attachmentCount)
     --m_attachmentCount;
   if (m_deleted)
     deleteObject(gl);
 }
 
+DEFINE_TRACE_WRAPPERS(WebGLObject) {}
+
 }  // namespace blink