cc: Remove redundant BufferIdAllocator

cc/resources/resource_provider.cc

 // Copyright 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 "cc/resources/resource_provider.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 30 matching lines @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/gpu_memory_buffer_tracing.h"
 #include "ui/gfx/icc_profile.h"
 #include "ui/gl/trace_util.h"
 
 using gpu::gles2::GLES2Interface;
 
 namespace cc {
 
-class IdAllocator {
+class TextureIdAllocator {
  public:
-  virtual ~IdAllocator() {}
-
-  virtual GLuint NextId() = 0;
-
- protected:
-  IdAllocator(GLES2Interface* gl, size_t id_allocation_chunk_size)
+  TextureIdAllocator(GLES2Interface* gl,
+                     size_t texture_id_allocation_chunk_size)
       : gl_(gl),
-        id_allocation_chunk_size_(id_allocation_chunk_size),
-        ids_(new GLuint[id_allocation_chunk_size]),
-        next_id_index_(id_allocation_chunk_size) {
+        id_allocation_chunk_size_(texture_id_allocation_chunk_size),
+        ids_(new GLuint[texture_id_allocation_chunk_size]),
+        next_id_index_(texture_id_allocation_chunk_size) {
     DCHECK(id_allocation_chunk_size_);
     DCHECK_LE(id_allocation_chunk_size_,
               static_cast<size_t>(std::numeric_limits<int>::max()));
   }
 
+  ~TextureIdAllocator() {
+    gl_->DeleteTextures(
+        static_cast<int>(id_allocation_chunk_size_ - next_id_index_),
+        ids_.get() + next_id_index_);
+  }
+
+  GLuint NextId() {
+    if (next_id_index_ == id_allocation_chunk_size_) {
+      gl_->GenTextures(static_cast<int>(id_allocation_chunk_size_), ids_.get());
+      next_id_index_ = 0;
+    }
+
+    return ids_[next_id_index_++];
+  }
+
+ private:
   GLES2Interface* gl_;
   const size_t id_allocation_chunk_size_;
   std::unique_ptr<GLuint[]> ids_;
   size_t next_id_index_;
+
+  DISALLOW_COPY_AND_ASSIGN(TextureIdAllocator);
 };
 
 namespace {
 
 bool IsGpuResourceType(ResourceProvider::ResourceType type) {
   return type != ResourceProvider::RESOURCE_TYPE_BITMAP;
 }
 
 GLenum TextureToStorageFormat(ResourceFormat format) {
   GLenum storage_format = GL_RGBA8_OES;
@@ skipping 70 matching lines @@
     // Active unit being GL_TEXTURE0 is effectively the ground state.
     if (unit_ != GL_TEXTURE0)
       gl_->ActiveTexture(GL_TEXTURE0);
   }
 
  private:
   GLES2Interface* gl_;
   GLenum unit_;
 };
 
-class TextureIdAllocator : public IdAllocator {
- public:
-  TextureIdAllocator(GLES2Interface* gl,
-                     size_t texture_id_allocation_chunk_size)
-      : IdAllocator(gl, texture_id_allocation_chunk_size) {}
-  ~TextureIdAllocator() override {
-    gl_->DeleteTextures(
-        static_cast<int>(id_allocation_chunk_size_ - next_id_index_),
-        ids_.get() + next_id_index_);
-  }
-
-  // Overridden from IdAllocator:
-  GLuint NextId() override {
-    if (next_id_index_ == id_allocation_chunk_size_) {
-      gl_->GenTextures(static_cast<int>(id_allocation_chunk_size_), ids_.get());
-      next_id_index_ = 0;
-    }
-
-    return ids_[next_id_index_++];
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TextureIdAllocator);
-};
-
-class BufferIdAllocator : public IdAllocator {
- public:
-  BufferIdAllocator(GLES2Interface* gl, size_t buffer_id_allocation_chunk_size)
-      : IdAllocator(gl, buffer_id_allocation_chunk_size) {}
-  ~BufferIdAllocator() override {
-    gl_->DeleteBuffers(
-        static_cast<int>(id_allocation_chunk_size_ - next_id_index_),
-        ids_.get() + next_id_index_);
-  }
-
-  // Overridden from IdAllocator:
-  GLuint NextId() override {
-    if (next_id_index_ == id_allocation_chunk_size_) {
-      gl_->GenBuffers(static_cast<int>(id_allocation_chunk_size_), ids_.get());
-      next_id_index_ = 0;
-    }
-
-    return ids_[next_id_index_++];
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(BufferIdAllocator);
-};
-
 // Generates process-unique IDs to use for tracing a ResourceProvider's
 // resources.
 base::StaticAtomicSequenceNumber g_next_resource_provider_tracing_id;
 
 }  // namespace
 
 ResourceProvider::Resource::~Resource() {}
 
 ResourceProvider::Resource::Resource(GLuint texture_id,
                                      const gfx::Size& size,
@@ skipping 259 matching lines @@
   // TODO(ericrk): Get this working in Android Webview. crbug.com/517156
   if (base::ThreadTaskRunnerHandle::IsSet()) {
     base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
         this, "cc::ResourceProvider", base::ThreadTaskRunnerHandle::Get());
   }
 
   if (!compositor_context_provider)
     return;
 
   DCHECK(!texture_id_allocator_);
-  DCHECK(!buffer_id_allocator_);
   GLES2Interface* gl = ContextGL();
   texture_id_allocator_.reset(
       new TextureIdAllocator(gl, id_allocation_chunk_size));
-  buffer_id_allocator_.reset(
-      new BufferIdAllocator(gl, id_allocation_chunk_size));
 }
 
 ResourceProvider::~ResourceProvider() {
   base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
       this);
 
   while (!children_.empty())
     DestroyChildInternal(children_.begin(), FOR_SHUTDOWN);
   while (!resources_.empty())
     DeleteResourceInternal(resources_.begin(), FOR_SHUTDOWN);
 
   GLES2Interface* gl = ContextGL();
   if (!IsGpuResourceType(settings_.default_resource_type)) {
     // We are not in GL mode, but double check before returning.
     DCHECK(!gl);
     return;
   }
 
   DCHECK(gl);
 #if DCHECK_IS_ON()
   // Check that all GL resources has been deleted.
   for (ResourceMap::const_iterator itr = resources_.begin();
        itr != resources_.end(); ++itr) {
     DCHECK(!IsGpuResourceType(itr->second.type));
   }
 #endif  // DCHECK_IS_ON()
 
   texture_id_allocator_ = nullptr;
-  buffer_id_allocator_ = nullptr;
   gl->Finish();
 }
 
 bool ResourceProvider::IsResourceFormatSupported(ResourceFormat format) const {
   gpu::Capabilities caps;
   if (compositor_context_provider_)
     caps = compositor_context_provider_->ContextCapabilities();
 
   switch (format) {
     case ALPHA_8:
@@ skipping 1652 matching lines @@
 
     const int kImportance = 2;
     pmd->CreateSharedGlobalAllocatorDump(guid);
     pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
   }
 
   return true;
 }
 
 }  // namespace cc