RefCounted types should not have public destructors, media/ and gpu/ edition

gpu/command_buffer/service/query_manager.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/query_manager.h"
 #include "base/atomicops.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/service/common_decoder.h"
 #include "gpu/command_buffer/service/feature_info.h"
 
 namespace gpu {
 namespace gles2 {
 
 class AllSamplesPassedQuery : public QueryManager::Query {
  public:
   AllSamplesPassedQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset,
       GLuint service_id);
-  virtual ~AllSamplesPassedQuery();
   virtual bool Begin() OVERRIDE;
   virtual bool End(uint32 submit_count) OVERRIDE;
   virtual bool Process() OVERRIDE;
   virtual void Destroy(bool have_context) OVERRIDE;
 
+ protected:
+  virtual ~AllSamplesPassedQuery();
+
  private:
   // Service side query id.
   GLuint service_id_;
 };
 
 AllSamplesPassedQuery::AllSamplesPassedQuery(
     QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset,
     GLuint service_id)
     : Query(manager, target, shm_id, shm_offset),
       service_id_(service_id) {
 }
 
-AllSamplesPassedQuery::~AllSamplesPassedQuery() {
-}
-
-void AllSamplesPassedQuery::Destroy(bool have_context) {
-  if (have_context && !IsDeleted()) {
-    glDeleteQueriesARB(1, &service_id_);
-    MarkAsDeleted();
-  }
-}
-
 bool AllSamplesPassedQuery::Begin() {
   BeginQueryHelper(target(), service_id_);
   return true;
 }
 
 bool AllSamplesPassedQuery::End(uint32 submit_count) {
   EndQueryHelper(target());
   return AddToPendingQueue(submit_count);
 }
 
 bool AllSamplesPassedQuery::Process() {
   GLuint available = 0;
   glGetQueryObjectuivARB(
       service_id_, GL_QUERY_RESULT_AVAILABLE_EXT, &available);
   if (!available) {
     return true;
   }
   GLuint result = 0;
   glGetQueryObjectuivARB(
       service_id_, GL_QUERY_RESULT_EXT, &result);
 
   return MarkAsCompleted(result != 0);
 }
 
+void AllSamplesPassedQuery::Destroy(bool have_context) {
+  if (have_context && !IsDeleted()) {
+    glDeleteQueriesARB(1, &service_id_);
+    MarkAsDeleted();
+  }
+}
+
+AllSamplesPassedQuery::~AllSamplesPassedQuery() {
+}
+
 class CommandsIssuedQuery : public QueryManager::Query {
  public:
   CommandsIssuedQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
-  virtual ~CommandsIssuedQuery();
 
   virtual bool Begin() OVERRIDE;
   virtual bool End(uint32 submit_count) OVERRIDE;
   virtual bool Process() OVERRIDE;
   virtual void Destroy(bool have_context) OVERRIDE;
 
+ protected:
+  virtual ~CommandsIssuedQuery();
+
  private:
   base::TimeTicks begin_time_;
 };
 
 CommandsIssuedQuery::CommandsIssuedQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset)
     : Query(manager, target, shm_id, shm_offset) {
 }
 
-CommandsIssuedQuery::~CommandsIssuedQuery() {
-}
-
-bool CommandsIssuedQuery::Process() {
-  NOTREACHED();
-  return true;
-}
-
 bool CommandsIssuedQuery::Begin() {
   begin_time_ = base::TimeTicks::HighResNow();
   return true;
 }
 
 bool CommandsIssuedQuery::End(uint32 submit_count) {
   base::TimeDelta elapsed = base::TimeTicks::HighResNow() - begin_time_;
   MarkAsPending(submit_count);
   return MarkAsCompleted(
       std::min(elapsed.InMicroseconds(), static_cast<int64>(0xFFFFFFFFL)));
 }
 
+bool CommandsIssuedQuery::Process() {
+  NOTREACHED();
+  return true;
+}
+
 void CommandsIssuedQuery::Destroy(bool /* have_context */) {
   if (!IsDeleted()) {
     MarkAsDeleted();
   }
 }
 
+CommandsIssuedQuery::~CommandsIssuedQuery() {
+}
+
 QueryManager::QueryManager(
     CommonDecoder* decoder,
     FeatureInfo* feature_info)
     : decoder_(decoder),
       use_arb_occlusion_query2_for_occlusion_query_boolean_(
           feature_info->feature_flags(
             ).use_arb_occlusion_query2_for_occlusion_query_boolean),
       use_arb_occlusion_query_for_occlusion_query_boolean_(
           feature_info->feature_flags(
             ).use_arb_occlusion_query_for_occlusion_query_boolean),
@@ skipping 198 matching lines @@
   if (!RemovePendingQuery(query)) {
     return false;
   }
   return query->End(submit_count);
 }
 
 }  // namespace gles2
 }  // namespace gpu