Reland 179911 and 179910

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 79 matching lines @@
   // GpuMemoryManagerClient implementation:
   virtual gfx::Size GetSurfaceSize() const OVERRIDE;
   virtual gpu::gles2::MemoryTracker* GetMemoryTracker() const OVERRIDE;
   virtual void SetMemoryAllocation(
       const GpuMemoryAllocation& allocation) OVERRIDE;
   virtual bool GetTotalGpuMemory(size_t* bytes) OVERRIDE;
 
   // Whether this command buffer can currently handle IPC messages.
   bool IsScheduled();
 
+  // If the command buffer is pre-empted and cannot process commands.
+  bool IsPreempted() const {
+    return scheduler_.get() && scheduler_->IsPreempted();
+  }
+
   // Whether there are commands in the buffer that haven't been processed.
   bool HasUnprocessedCommands();
 
   // 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_; }
 
@@ skipping 13 matching lines @@
 
   gfx::GLSurface* surface() const { return surface_; }
 
   void AddDestructionObserver(DestructionObserver* observer);
   void RemoveDestructionObserver(DestructionObserver* observer);
 
   // Associates a sync point to this stub. When the stub is destroyed, it will
   // retire all sync points that haven't been previously retired.
   void AddSyncPoint(uint32 sync_point);
 
-  void SetPreemptByCounter(scoped_refptr<gpu::RefCountedCounter> counter);
+  void SetPreemptByFlag(scoped_refptr<gpu::PreemptionFlag> flag);
 
  private:
   GpuMemoryManager* GetMemoryManager();
   bool MakeCurrent();
   void Destroy();
 
   // Cleans up and sends reply if OnInitialize failed.
   void OnInitializeFailed(IPC::Message* reply_message);
 
   // Message handlers:
@@ skipping 93 matching lines @@
   IDMap<GpuVideoDecodeAccelerator, IDMapOwnPointer> video_decoders_;
 
   ObserverList<DestructionObserver> destruction_observers_;
 
   // A queue of sync points associated with this stub.
   std::deque<uint32> sync_points_;
   int sync_point_wait_count_;
 
   bool delayed_work_scheduled_;
 
-  scoped_refptr<gpu::RefCountedCounter> preempt_by_counter_;
+  scoped_refptr<gpu::PreemptionFlag> preemption_flag_;
 
   GURL active_url_;
   size_t active_url_hash_;
 
   size_t total_gpu_memory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_