Make StrictIdHandler mark IDs as used

gpu/command_buffer/client/share_group.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 "../client/atomicops.h"
 #include "../client/share_group.h"
 #include "../client/gles2_implementation.h"
 #include "../client/program_info_manager.h"
 #include "../common/id_allocator.h"
 #include "../common/logging.h"
@@ skipping 41 matching lines @@
     // We need to ensure that the delete call is evaluated on the service side
     // before any other contexts issue commands using these client ids.
     gl_impl->helper()->CommandBufferHelper::Flush();
     return true;
   }
 
   // Overridden from IdHandlerInterface.
   virtual bool MarkAsUsedForBind(GLuint id) {
     return id == 0 ? true : id_allocator_.MarkAsUsed(id);
   }
- private:
+ protected:
   IdAllocator id_allocator_;
 };
 
 // An id handler that require Gen before Bind.
-class StrictIdHandler : public IdHandlerInterface {
+class StrictIdHandler : public IdHandler {
  public:
   StrictIdHandler() { }
   virtual ~StrictIdHandler() { }
 
-  // Overridden from IdHandlerInterface.
-  virtual void Destroy(GLES2Implementation* /* gl_impl */) {
-  }
-
-  // Overridden from IdHandlerInterface.
-  virtual void MakeIds(
-      GLES2Implementation* /* gl_impl */,
-      GLuint id_offset, GLsizei n, GLuint* ids) {
-    if (id_offset == 0) {
-      for (GLsizei ii = 0; ii < n; ++ii) {
-        ids[ii] = id_allocator_.AllocateID();
-      }
-    } else {
-      for (GLsizei ii = 0; ii < n; ++ii) {
-        ids[ii] = id_allocator_.AllocateIDAtOrAbove(id_offset);
-        id_offset = ids[ii] + 1;
-      }
-    }
-  }
-
-  // Overridden from IdHandlerInterface.
-  virtual bool FreeIds(
-      GLES2Implementation* gl_impl,
-      GLsizei n, const GLuint* ids, DeleteFn delete_fn) {
-    for (GLsizei ii = 0; ii < n; ++ii) {
-      id_allocator_.FreeID(ids[ii]);
-    }
-    (gl_impl->*delete_fn)(n, ids);
-    // We need to ensure that the delete call is evaluated on the service side
-    // before any other contexts issue commands using these client ids.
-    gl_impl->helper()->CommandBufferHelper::Flush();
-    return true;
-  }
-
-  // Overridden from IdHandlerInterface.
+  // Overridden from IdHandler.
   virtual bool MarkAsUsedForBind(GLuint id) {
     GPU_DCHECK(id == 0 || id_allocator_.InUse(id));
-    return true;
+    return IdHandler::MarkAsUsedForBind(id);
   }
- private:
-  IdAllocator id_allocator_;
 };
 
 // An id handler for ids that are never reused.
 class NonReusedIdHandler : public IdHandlerInterface {
  public:
   NonReusedIdHandler() : last_id_(0) { }
   virtual ~NonReusedIdHandler() { }
 
   // Overridden from IdHandlerInterface.
   virtual void Destroy(GLES2Implementation* /* gl_impl */) {
@@ skipping 144 matching lines @@
 }
 
 void ShareGroup::SetGLES2ImplementationForDestruction(
     GLES2Implementation* gl_impl) {
   gles2_ = gl_impl;
 }
 
 
 }  // namespace gles2
 }  // namespace gpu
-