Revert 98504 - Manually merging trunk revs 95836 and 96904 to 835 branch (second attempt)

gpu/command_buffer/common/id_allocator.h

 // Copyright (c) 2011 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.
 
 // This file contains the definition of the IdAllocator class.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_ID_ALLOCATOR_H_
 #define GPU_COMMAND_BUFFER_CLIENT_ID_ALLOCATOR_H_
 
 #include <set>
 #include <utility>
 #include "../common/types.h"
 
+// TODO(apatrick): Having regular GL flush semantics on the client side, it
+// probably isn't necessary to round trip to the service to allocate IDs.
+// Retire this code.
+
 namespace gpu {
 
 // A resource ID, key to the resource maps.
 typedef uint32 ResourceId;
 // Invalid resource ID.
 static const ResourceId kInvalidResource = 0u;
 
 class IdAllocatorInterface {
  public:
   virtual ~IdAllocatorInterface();
@@ skipping 62 matching lines @@
 
  private:
   ResourceId last_id_;
 
   DISALLOW_COPY_AND_ASSIGN(NonReusedIdAllocator);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_ID_ALLOCATOR_H_