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

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGLSampler.cpp

Issue 2547813002: Remove WebGLObject maps from WebGLRenderingContextBase and WebGLContextGroup. (Closed)
Patch Set: Fixed WebGLContextObject::validate. Made WebGLExtension non-finalized. Created 4 years 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
Index: third_party/WebKit/Source/modules/webgl/WebGLSampler.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLSampler.cpp b/third_party/WebKit/Source/modules/webgl/WebGLSampler.cpp
index 6fb811a72c528275dfcc53034d3f92d1420bb3d0..0198383092d13c83aacab72b854aaff80e80006a 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGLSampler.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGLSampler.cpp
@@ -13,11 +13,6 @@ WebGLSampler* WebGLSampler::create(WebGL2RenderingContextBase* ctx) {
return new WebGLSampler(ctx);
}
-WebGLSampler::~WebGLSampler() {
- // See the comment in WebGLObject::detachAndDeleteObject().
- detachAndDeleteObject();
-}
-
WebGLSampler::WebGLSampler(WebGL2RenderingContextBase* ctx)
: WebGLSharedPlatform3DObject(ctx) {
GLuint sampler;
@@ -25,6 +20,10 @@ WebGLSampler::WebGLSampler(WebGL2RenderingContextBase* ctx)
setObject(sampler);
}
+WebGLSampler::~WebGLSampler() {
+ runDestructor();
+}
+
void WebGLSampler::deleteObjectImpl(gpu::gles2::GLES2Interface* gl) {
gl->DeleteSamplers(1, &m_object);
m_object = 0;

Powered by Google App Engine
This is Rietveld 408576698