More work in Command Buffers...

core/cross/command_buffer/render_surface_cb.h

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 72 matching lines @@
     DCHECK(false);
     return Bitmap::Ref();
   }
 
   // Destroys any data structures associated with the render surface and
   // resets any allocated IDs. This function should never be called during
   // rendering.
   virtual void Destroy();
 
   // Returns the render surface resource ID.
-  command_buffer::ResourceID resource_id() const { return resource_id_; }
+  command_buffer::ResourceId resource_id() const { return resource_id_; }
 
  private:
-  command_buffer::ResourceID resource_id_;
+  command_buffer::ResourceId resource_id_;
   RendererCB *renderer_;
   DISALLOW_COPY_AND_ASSIGN(RenderSurfaceCB);
 };
 
 // The RenderDepthStencilSurfaceCB class represents a depth stencil surface in
 // the core library of the client for command buffers. This class is
 // responsible for sending calls across the command buffer to create an actual
 // depth stencil surface resource on the server.
 class RenderDepthStencilSurfaceCB : public RenderDepthStencilSurface {
  public:
@@ skipping 13 matching lines @@
                               int height,
                               RendererCB *renderer);
   virtual ~RenderDepthStencilSurfaceCB() {}
 
   // Destroys any data structures associated with the render surface and
   // resets any allocated IDs. This function should never be called during
   // rendering.
   virtual void Destroy();
 
   // Returns the render depth stencil surface resource ID.
-  command_buffer::ResourceID resource_id() const { return resource_id_; }
+  command_buffer::ResourceId resource_id() const { return resource_id_; }
 
  private:
-  command_buffer::ResourceID resource_id_;
+  command_buffer::ResourceId resource_id_;
   RendererCB *renderer_;
   DISALLOW_COPY_AND_ASSIGN(RenderDepthStencilSurfaceCB);
 };
 
 }  // namespace o3d
 
 #endif  // O3D_CORE_CROSS_COMMAND_BUFFER_RENDER_SURFACE_CB_H_