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

Source/modules/webgl/WebGLProgram.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 14 matching lines @@
 
 #include "config.h"
 
 #include "modules/webgl/WebGLProgram.h"
 
 #include "modules/webgl/WebGLContextGroup.h"
 #include "modules/webgl/WebGLRenderingContextBase.h"
 
 namespace blink {
 
-WebGLProgram* WebGLProgram::create(WebGLRenderingContextBase* ctx)
+PassRefPtrWillBeRawPtr<WebGLProgram> WebGLProgram::create(WebGLRenderingContextBase* ctx)
 {
-    return new WebGLProgram(ctx);
+    return adoptRefWillBeNoop(new WebGLProgram(ctx));
 }
 
 WebGLProgram::WebGLProgram(WebGLRenderingContextBase* ctx)
     : WebGLSharedPlatform3DObject(ctx)
     , m_linkStatus(false)
     , m_linkCount(0)
     , m_infoValid(true)
 {
     setObject(ctx->webContext()->createProgram());
 }
 
 WebGLProgram::~WebGLProgram()
 {
+#if ENABLE(OILPAN)
     // These heap objects handle detachment on their own. Clear out
     // the references to prevent deleteObjectImpl() from trying to do
     // same, as we cannot safely access other heap objects from this
     // destructor.
     m_vertexShader = nullptr;
     m_fragmentShader = nullptr;
-
-    // See the comment in WebGLObject::detachAndDeleteObject().
+#endif
+    // Always call detach here to ensure that platform object deletion
+    // happens with Oilpan enabled. It keeps the code regular to do it
+    // with or without Oilpan enabled.
+    //
+    // See comment in WebGLBuffer's destructor for additional
+    // information on why this is done for WebGLSharedObject-derived
+    // objects.
     detachAndDeleteObject();
 }
 
 void WebGLProgram::deleteObjectImpl(WebGraphicsContext3D* context3d)
 {
     context3d->deleteProgram(m_object);
     m_object = 0;
     if (m_vertexShader) {
         m_vertexShader->onDetached(context3d);
         m_vertexShader = nullptr;
@@ skipping 37 matching lines @@
 void WebGLProgram::increaseLinkCount()
 {
     ++m_linkCount;
     m_infoValid = false;
 }
 
 WebGLShader* WebGLProgram::getAttachedShader(GLenum type)
 {
     switch (type) {
     case GL_VERTEX_SHADER:
-        return m_vertexShader;
+        return m_vertexShader.get();
     case GL_FRAGMENT_SHADER:
-        return m_fragmentShader;
+        return m_fragmentShader.get();
     default:
         return 0;
     }
 }
 
 bool WebGLProgram::attachShader(WebGLShader* shader)
 {
     if (!shader || !shader->object())
         return false;
     switch (shader->type()) {
@@ skipping 68 matching lines @@
 }
 
 DEFINE_TRACE(WebGLProgram)
 {
     visitor->trace(m_vertexShader);
     visitor->trace(m_fragmentShader);
     WebGLSharedPlatform3DObject::trace(visitor);
 }
 
 } // namespace blink