Rename SurfaceState to MemoryManagerState

content/common/gpu/gpu_command_buffer_stub.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 30 matching lines @@
 namespace gpu {
 namespace gles2 {
 class MailboxManager;
 }
 }
 
 // This Base class is used to expose methods of GpuCommandBufferStub used for
 // testability.
 class CONTENT_EXPORT GpuCommandBufferStubBase {
  public:
-  struct CONTENT_EXPORT SurfaceState {
-    int32 surface_id;
+  struct CONTENT_EXPORT MemoryManagerState {
+    // Offscreen commandbuffers will not have a surface.
+    bool has_surface;
     bool visible;
+    bool client_has_memory_allocation_changed_callback;
+    // Use time is determined by the last time that visibility was changed

[Ken Russell (switch to Gerrit), 2012/10/16 22:06:01]

Nit: prefer complete sentences in comments.
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Punctu...

[ccameron, 2012/10/16 22:29:32]

Done.

     base::TimeTicks last_used_time;
 
-    SurfaceState(int32 surface_id,
-                 bool visible,
-                 base::TimeTicks last_used_time);
+    MemoryManagerState(
+       bool has_surface,
+       bool visible,
+       base::TimeTicks last_used_time);
   };
 
  public:
   virtual ~GpuCommandBufferStubBase() {}
 
-  // Will not have surface state if this is an offscreen commandbuffer.
-  virtual bool client_has_memory_allocation_changed_callback() const = 0;
-  virtual bool has_surface_state() const = 0;
-  virtual const SurfaceState& surface_state() const = 0;
+  virtual const MemoryManagerState& memory_manager_state() const = 0;
 
   virtual gfx::Size GetSurfaceSize() const = 0;
 
   virtual bool IsInSameContextShareGroup(
       const GpuCommandBufferStubBase& other) const = 0;
 
   virtual void SetMemoryAllocation(
       const GpuMemoryAllocation& allocation) = 0;
 
   virtual bool GetTotalGpuMemory(size_t* bytes) = 0;
@@ skipping 32 matching lines @@
 
   virtual ~GpuCommandBufferStub();
 
   // IPC::Listener implementation:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // IPC::Sender implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // GpuCommandBufferStubBase implementation:
-  virtual bool client_has_memory_allocation_changed_callback() const OVERRIDE;
-  virtual bool has_surface_state() const OVERRIDE;
-  virtual const GpuCommandBufferStubBase::SurfaceState& surface_state() const
-      OVERRIDE;
+  virtual const GpuCommandBufferStubBase::MemoryManagerState&
+      memory_manager_state() const OVERRIDE {
+    return *memory_manager_state_.get();
+  }
 
   // Returns surface size.
   virtual gfx::Size GetSurfaceSize() const OVERRIDE;
 
   // Returns true iff |other| is in the same context share group as this stub.
   virtual bool IsInSameContextShareGroup(
       const GpuCommandBufferStubBase& other) const OVERRIDE;
 
   // Sets buffer usage depending on Memory Allocation
   virtual void SetMemoryAllocation(
@@ skipping 12 matching lines @@
 
   // Delay an echo message until the command buffer has been rescheduled.
   void DelayEcho(IPC::Message*);
 
   gpu::gles2::GLES2Decoder* decoder() const { return decoder_.get(); }
   gpu::GpuScheduler* scheduler() const { return scheduler_.get(); }
   GpuChannel* channel() const { return channel_; }
 
   // Identifies the target surface.
   int32 surface_id() const {
-    return (surface_state_.get()) ? surface_state_->surface_id : 0;
+    return surface_id_;
   }
 
   // Identifies the various GpuCommandBufferStubs in the GPU process belonging
   // to the same renderer process.
   int32 route_id() const { return route_id_; }
 
   gfx::GpuPreference gpu_preference() { return gpu_preference_; }
 
   // Sends a message to the console.
   void SendConsoleMessage(int32 id, const std::string& message);
@@ skipping 82 matching lines @@
   // The group of contexts that share namespaces with this context.
   scoped_refptr<gpu::gles2::ContextGroup> context_group_;
 
   gfx::GLSurfaceHandle handle_;
   gfx::Size initial_size_;
   gpu::gles2::DisallowedFeatures disallowed_features_;
   std::string allowed_extensions_;
   std::vector<int32> requested_attribs_;
   gfx::GpuPreference gpu_preference_;
   int32 route_id_;
+  int32 surface_id_;
   bool software_;
-  bool client_has_memory_allocation_changed_callback_;
   uint32 last_flush_count_;
-  scoped_ptr<GpuCommandBufferStubBase::SurfaceState> surface_state_;
+  scoped_ptr<MemoryManagerState> memory_manager_state_;
 
   scoped_ptr<gpu::CommandBufferService> command_buffer_;
   scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
   scoped_ptr<gpu::GpuScheduler> scheduler_;
   scoped_refptr<gfx::GLContext> context_;
   scoped_refptr<gfx::GLSurface> surface_;
 
   // SetParent may be called before Initialize, in which case we need to keep
   // around the parent stub, so that Initialize can set the parent correctly.
   base::WeakPtr<GpuCommandBufferStub> parent_stub_for_initialization_;
@@ skipping 17 matching lines @@
 
   scoped_refptr<gpu::RefCountedCounter> preempt_by_counter_;
 
   GURL active_url_;
   size_t active_url_hash_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
 };
 
 #endif  // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_