Oilpan: move 2D Canvas and WebGL objects to the heap.

Source/core/html/canvas/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 "config.h"
 
 #include "core/html/canvas/WebGLObject.h"
 
 namespace blink {
 
-WebGLObject::WebGLObject(WebGLRenderingContextBase*)
+WebGLObject::WebGLObject(WebGLRenderingContextBase* base)

[haraken, 2014/07/22 03:46:10]

|base| is not needed.

[sof, 2014/07/22 06:15:21]

Removed.

     : m_object(0)
     , m_attachmentCount(0)
     , m_deleted(false)
 {
 }
 
 WebGLObject::~WebGLObject()
 {
+#if ENABLE(OILPAN)

[haraken, 2014/07/22 03:46:10]

Do we need #if ENABLE(OILPAN)? I guess ASSERT(m_deleted) should hold in
non-oilpan builds as well.

[sof, 2014/07/22 06:15:21]

I made it condition to avoid needlessly upsetting non-Oilpan. I can remove.

+    // Verify that platform objects have been explicitly deleted.
+    ASSERT(m_deleted);
+#endif
 }
 
 void WebGLObject::setObject(Platform3DObject object)
 {
     // object==0 && m_deleted==false indicating an uninitialized state;
     ASSERT(!m_object && !m_deleted);
     m_object = object;
 }
 
 void WebGLObject::deleteObject(blink::WebGraphicsContext3D* context3d)
@@ skipping 12 matching lines @@
         if (context3d)
             deleteObjectImpl(context3d, m_object);
 
         m_object = 0;
     }
 }
 
 void WebGLObject::detach()
 {
     m_attachmentCount = 0; // Make sure OpenGL resource is deleted.
-    }
+}
 
+void WebGLObject::detachAndDeleteObject()
+{
+    // Helper method that pairs detachment with platform object
+    // deletion.
+    //
+    // With Oilpan enabled, objects may end up being finalized without
+    // having been detached first. Consequently, the objects force
+    // detachment first before deleting the platform object. Without
+    // Oilpan, the objects will have been detached from the 'parent'
+    // objects first and do not separately require it when finalizing.
+    //
+    // However, as detach() is trivial, the individual WebGL
+    // destructors will always call detachAndDeleteObject() rather
+    // than do it based on Oilpan being enabled.
+    detach();
+    deleteObject(0);
+}
 
 void WebGLObject::onDetached(blink::WebGraphicsContext3D* context3d)
 {
     if (m_attachmentCount)
         --m_attachmentCount;
     if (m_deleted)

[haraken, 2014/07/22 03:46:10]

Probably not related to this CL, but why isn't this 'if(!m_deleted)' ?

         deleteObject(context3d);
 }
 
 }