Remove WebGLObject maps from WebGLRenderingContextBase and WebGLContextGroup.

third_party/WebKit/Source/modules/webgl/WebGLTimerQueryEXT.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/WebGLTimerQueryEXT.h"
 
 #include "core/dom/TaskRunnerHelper.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "modules/webgl/WebGLRenderingContextBase.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 WebGLTimerQueryEXT* WebGLTimerQueryEXT::create(WebGLRenderingContextBase* ctx) {
   return new WebGLTimerQueryEXT(ctx);
 }
 
-WebGLTimerQueryEXT::~WebGLTimerQueryEXT() {
-  // See the comment in WebGLObject::detachAndDeleteObject().
-  detachAndDeleteObject();
-}
-
 WebGLTimerQueryEXT::WebGLTimerQueryEXT(WebGLRenderingContextBase* ctx)
     : WebGLContextObject(ctx),
       m_target(0),
       m_queryId(0),
       m_canUpdateAvailability(false),
       m_queryResultAvailable(false),
       m_queryResult(0),
       m_taskRunner(TaskRunnerHelper::get(TaskType::Unthrottled,
                                          &ctx->canvas()->document())
                        ->clone()) {
   context()->contextGL()->GenQueriesEXT(1, &m_queryId);
 }
 
+WebGLTimerQueryEXT::~WebGLTimerQueryEXT() {
+  runDestructor();
+}
+
 void WebGLTimerQueryEXT::resetCachedResult() {
   m_canUpdateAvailability = false;
   m_queryResultAvailable = false;
   m_queryResult = 0;
   // When this is called, the implication is that we should start
   // keeping track of whether we can update the cached availability
   // and result.
   scheduleAllowAvailabilityUpdate();
 }
 
@@ skipping 50 matching lines @@
   m_taskHandle = m_taskRunner->postCancellableTask(
       BLINK_FROM_HERE, WTF::bind(&WebGLTimerQueryEXT::allowAvailabilityUpdate,
                                  wrapWeakPersistent(this)));
 }
 
 void WebGLTimerQueryEXT::allowAvailabilityUpdate() {
   m_canUpdateAvailability = true;
 }
 
 }  // namespace blink