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

Unified Diff: Source/modules/webgl/WebGLBuffer.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/WebGLBuffer.h ('k') | Source/modules/webgl/WebGLBuffer.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webgl/WebGLBuffer.cpp
diff --git a/Source/modules/webgl/WebGLBuffer.cpp b/Source/modules/webgl/WebGLBuffer.cpp
index 0969b7b8983abc6cf31e5d5cec766228e1b141b4..4744cd162f998f72a157dd00be8a6df6b074cbf1 100644
--- a/Source/modules/webgl/WebGLBuffer.cpp
+++ b/Source/modules/webgl/WebGLBuffer.cpp
@@ -31,9 +31,9 @@
namespace blink {
-WebGLBuffer* WebGLBuffer::create(WebGLRenderingContextBase* ctx)
+PassRefPtrWillBeRawPtr<WebGLBuffer> WebGLBuffer::create(WebGLRenderingContextBase* ctx)
{
- return new WebGLBuffer(ctx);
+ return adoptRefWillBeNoop(new WebGLBuffer(ctx));
}
WebGLBuffer::WebGLBuffer(WebGLRenderingContextBase* ctx)
@@ -45,7 +45,15 @@
WebGLBuffer::~WebGLBuffer()
{
- // See the comment in WebGLObject::detachAndDeleteObject().
+ // Delete the buffer's platform object. This object will have been
+ // detached from the WebGLContextGroup if the group object was
+ // finalized first. With Oilpan not enabled, it always will be,
+ // but with Oilpan enabled, the WebGLBuffer might end up being
+ // finalized first. In which case detachment is needed to ensure
+ // that the platform object is indeed deleted.
+ //
+ // To keep the code regular, the trivial detach()ment is always
+ // performed.
detachAndDeleteObject();
}
« no previous file with comments | « Source/modules/webgl/WebGLBuffer.h ('k') | Source/modules/webgl/WebGLBuffer.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698