Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Unified Diff: Source/modules/webgl/WebGLTexture.cpp

Issue 1281953003: Revert of [Oilpan] Migrate classes under module/webgl onto oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/webgl/WebGLTexture.h ('k') | Source/modules/webgl/WebGLTexture.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webgl/WebGLTexture.cpp
diff --git a/Source/modules/webgl/WebGLTexture.cpp b/Source/modules/webgl/WebGLTexture.cpp
index 16b651875b1ab555d8a3a9da1afc1fecb2a02618..345e62345754cc58f916581a8f756e7b98ab0f21 100644
--- a/Source/modules/webgl/WebGLTexture.cpp
+++ b/Source/modules/webgl/WebGLTexture.cpp
@@ -31,9 +31,9 @@
namespace blink {
-WebGLTexture* WebGLTexture::create(WebGLRenderingContextBase* ctx)
-{
- return new WebGLTexture(ctx);
+PassRefPtrWillBeRawPtr<WebGLTexture> WebGLTexture::create(WebGLRenderingContextBase* ctx)
+{
+ return adoptRefWillBeNoop(new WebGLTexture(ctx));
}
WebGLTexture::WebGLTexture(WebGLRenderingContextBase* ctx)
@@ -60,7 +60,13 @@
WebGLTexture::~WebGLTexture()
{
- // See the comment in WebGLObject::detachAndDeleteObject().
+ // Always perform 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();
}
« no previous file with comments | « Source/modules/webgl/WebGLTexture.h ('k') | Source/modules/webgl/WebGLTexture.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698