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

Unified Diff: Source/modules/webgl/WebGLContextObject.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/WebGLContextGroup.h ('k') | Source/modules/webgl/WebGLDebugRendererInfo.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webgl/WebGLContextObject.cpp
diff --git a/Source/modules/webgl/WebGLContextObject.cpp b/Source/modules/webgl/WebGLContextObject.cpp
index 4278843a94a0f412d5edbc8de1483e29b1662bf7..e1359f0c1220bbfb37173d2e8137b9f63319e520 100644
--- a/Source/modules/webgl/WebGLContextObject.cpp
+++ b/Source/modules/webgl/WebGLContextObject.cpp
@@ -39,6 +39,10 @@
WebGLContextObject::~WebGLContextObject()
{
+#if !ENABLE(OILPAN)
+ if (m_context)
+ m_context->removeContextObject(this);
+#endif
}
void WebGLContextObject::detachContext()
@@ -53,7 +57,7 @@
WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() const
{
- return m_context ? m_context->webContext() : nullptr;
+ return m_context ? m_context->webContext() : 0;
}
DEFINE_TRACE(WebGLContextObject)
« no previous file with comments | « Source/modules/webgl/WebGLContextGroup.h ('k') | Source/modules/webgl/WebGLDebugRendererInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698