Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/renderbuffer_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/renderbuffer_manager.h"
 #include "base/logging.h"
 #include "base/debug/trace_event.h"
 #include "base/stringprintf.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
@@ skipping 12 matching lines @@
       max_renderbuffer_size_(max_renderbuffer_size),
       max_samples_(max_samples),
       num_uncleared_renderbuffers_(0),
       renderbuffer_info_count_(0),
       have_context_(true) {
 }
 
 RenderbufferManager::~RenderbufferManager() {
   DCHECK(renderbuffer_infos_.empty());
   // If this triggers, that means something is keeping a reference to
-  // a RenderbufferInfo belonging to this.
+  // a Renderbuffer belonging to this.
   CHECK_EQ(renderbuffer_info_count_, 0u);
 
   DCHECK_EQ(0, num_uncleared_renderbuffers_);
 }
 
-size_t RenderbufferManager::RenderbufferInfo::EstimatedSize() {
+size_t Renderbuffer::EstimatedSize() {
   uint32 size = 0;
   RenderbufferManager::ComputeEstimatedRenderbufferSize(
       width_, height_, samples_, internal_format_, &size);
   return size;
 }
 
-void RenderbufferManager::RenderbufferInfo::AddToSignature(
+void Renderbuffer::AddToSignature(
     std::string* signature) const {
   DCHECK(signature);
   *signature += base::StringPrintf(
       "|Renderbuffer|internal_format=%04x|samples=%d|width=%d|height=%d",
       internal_format_, samples_, width_, height_);
 }
 
-RenderbufferManager::RenderbufferInfo::~RenderbufferInfo() {
+Renderbuffer::Renderbuffer(RenderbufferManager* manager, GLuint service_id)
+    : manager_(manager),
+      deleted_(false),
+      service_id_(service_id),
+      cleared_(true),
+      has_been_bound_(false),
+      samples_(0),
+      internal_format_(GL_RGBA4),
+      width_(0),
+      height_(0) {
+  manager_->StartTracking(this);
+}
+
+Renderbuffer::~Renderbuffer() {
   if (manager_) {
     if (manager_->have_context_) {
       GLuint id = service_id();
       glDeleteRenderbuffersEXT(1, &id);
     }
     manager_->StopTracking(this);
     manager_ = NULL;
   }
 }
 
 void RenderbufferManager::Destroy(bool have_context) {
   have_context_ = have_context;
   renderbuffer_infos_.clear();
   DCHECK_EQ(0u, memory_tracker_->GetMemRepresented());
 }
 
-void RenderbufferManager::StartTracking(RenderbufferInfo* /* renderbuffer */) {
+void RenderbufferManager::StartTracking(Renderbuffer* /* renderbuffer */) {
   ++renderbuffer_info_count_;
 }
 
-void RenderbufferManager::StopTracking(RenderbufferInfo* renderbuffer) {
+void RenderbufferManager::StopTracking(Renderbuffer* renderbuffer) {
   --renderbuffer_info_count_;
   if (!renderbuffer->cleared()) {
     --num_uncleared_renderbuffers_;
   }
   memory_tracker_->TrackMemFree(renderbuffer->EstimatedSize());
 }
 
 void RenderbufferManager::SetInfo(
-    RenderbufferInfo* renderbuffer,
+    Renderbuffer* renderbuffer,
     GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height) {
   DCHECK(renderbuffer);
   if (!renderbuffer->cleared()) {
     --num_uncleared_renderbuffers_;
   }
   memory_tracker_->TrackMemFree(renderbuffer->EstimatedSize());
   renderbuffer->SetInfo(samples, internalformat, width, height);
   memory_tracker_->TrackMemAlloc(renderbuffer->EstimatedSize());
   if (!renderbuffer->cleared()) {
     ++num_uncleared_renderbuffers_;
   }
 }
 
-void RenderbufferManager::SetCleared(RenderbufferInfo* renderbuffer,
+void RenderbufferManager::SetCleared(Renderbuffer* renderbuffer,
                                      bool cleared) {
   DCHECK(renderbuffer);
   if (!renderbuffer->cleared()) {
     --num_uncleared_renderbuffers_;
   }
   renderbuffer->set_cleared(cleared);
   if (!renderbuffer->cleared()) {
     ++num_uncleared_renderbuffers_;
   }
 }
 
-void RenderbufferManager::CreateRenderbufferInfo(
+void RenderbufferManager::CreateRenderbuffer(
     GLuint client_id, GLuint service_id) {
-  RenderbufferInfo::Ref info(new RenderbufferInfo(this, service_id));
+  scoped_refptr<Renderbuffer> info(new Renderbuffer(this, service_id));
   std::pair<RenderbufferInfoMap::iterator, bool> result =
       renderbuffer_infos_.insert(std::make_pair(client_id, info));
   DCHECK(result.second);
   if (!info->cleared()) {
     ++num_uncleared_renderbuffers_;
   }
 }
 
-RenderbufferManager::RenderbufferInfo* RenderbufferManager::GetRenderbufferInfo(
+Renderbuffer* RenderbufferManager::GetRenderbuffer(
     GLuint client_id) {
   RenderbufferInfoMap::iterator it = renderbuffer_infos_.find(client_id);
   return it != renderbuffer_infos_.end() ? it->second : NULL;
 }
 
-void RenderbufferManager::RemoveRenderbufferInfo(GLuint client_id) {
+void RenderbufferManager::RemoveRenderbuffer(GLuint client_id) {
   RenderbufferInfoMap::iterator it = renderbuffer_infos_.find(client_id);
   if (it != renderbuffer_infos_.end()) {
-    RenderbufferInfo* info = it->second;
+    Renderbuffer* info = it->second;
     info->MarkAsDeleted();
     renderbuffer_infos_.erase(it);
   }
 }
 
 bool RenderbufferManager::GetClientId(
     GLuint service_id, GLuint* client_id) const {
   // This doesn't need to be fast. It's only used during slow queries.
   for (RenderbufferInfoMap::const_iterator it = renderbuffer_infos_.begin();
        it != renderbuffer_infos_.end(); ++it) {
@@ skipping 38 matching lines @@
         return GL_RGB;
     }
   }
   return impl_format;
 }
 
 }  // namespace gles2
 }  // namespace gpu