Remove WebGLObject maps from WebGLRenderingContextBase and WebGLContextGroup.

third_party/WebKit/Source/modules/webgl/WebGLQuery.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/webgl/WebGLQuery.h"
 
 #include "core/dom/TaskRunnerHelper.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "modules/webgl/WebGL2RenderingContextBase.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 WebGLQuery* WebGLQuery::create(WebGL2RenderingContextBase* ctx) {
   return new WebGLQuery(ctx);
 }
 
-WebGLQuery::~WebGLQuery() {
-  // See the comment in WebGLObject::detachAndDeleteObject().
-  detachAndDeleteObject();
-}
-
 WebGLQuery::WebGLQuery(WebGL2RenderingContextBase* ctx)
     : WebGLSharedPlatform3DObject(ctx),
       m_target(0),
       m_canUpdateAvailability(false),
       m_queryResultAvailable(false),
       m_queryResult(0),
       m_taskRunner(TaskRunnerHelper::get(TaskType::Unthrottled,
                                          &ctx->canvas()->document())
                        ->clone()) {
   GLuint query;
   ctx->contextGL()->GenQueriesEXT(1, &query);
   setObject(query);
 }
 
+WebGLQuery::~WebGLQuery() {
+  runDestructor();
+}
+
 void WebGLQuery::setTarget(GLenum target) {
   ASSERT(object());
   ASSERT(!m_target);
   m_target = target;
 }
 
 void WebGLQuery::deleteObjectImpl(gpu::gles2::GLES2Interface* gl) {
   gl->DeleteQueriesEXT(1, &m_object);
   m_object = 0;
 }
@@ skipping 47 matching lines @@
   m_taskHandle = m_taskRunner->postCancellableTask(
       BLINK_FROM_HERE, WTF::bind(&WebGLQuery::allowAvailabilityUpdate,
                                  wrapWeakPersistent(this)));
 }
 
 void WebGLQuery::allowAvailabilityUpdate() {
   m_canUpdateAvailability = true;
 }
 
 }  // namespace blink