Reland 179911 and 179910

content/common/gpu/image_transport_surface.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_IMAGE_TRANSPORT_SURFACE_H_
 #define CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_
 
 #if defined(ENABLE_GPU)
 
 #include <vector>
@@ skipping 16 matching lines @@
 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
 struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
 struct GpuHostMsg_AcceleratedSurfaceRelease_Params;
 
 namespace gfx {
 class GLSurface;
 }
 
 namespace gpu {
 class GpuScheduler;
-struct RefCountedCounter;
+class PreemptionFlag;
 namespace gles2 {
 class GLES2Decoder;
 }
 }
 
 namespace content {
 class GpuChannelManager;
 class GpuCommandBufferStub;
 
 // The GPU process is agnostic as to how it displays results. On some platforms
@@ skipping 69 matching lines @@
       GpuHostMsg_AcceleratedSurfaceRelease_Params params);
   void SendResizeView(const gfx::Size& size);
   void SendUpdateVSyncParameters(
       base::TimeTicks timebase, base::TimeDelta interval);
 
   // Whether or not we should execute more commands.
   void SetScheduled(bool is_scheduled);
 
   void DeferToFence(base::Closure task);
 
-  void SetPreemptByCounter(
-      scoped_refptr<gpu::RefCountedCounter> preempt_by_counter);
+  void SetPreemptByFlag(
+      scoped_refptr<gpu::PreemptionFlag> preemption_flag);
 
   // Make the surface's context current.
   bool MakeCurrent();
 
   // Set the default swap interval on the surface.
   static void SetSwapInterval(gfx::GLContext* context);
 
   void Suspend();
 
   GpuChannelManager* manager() const { return manager_; }
@@ skipping 61 matching lines @@
   bool did_set_swap_interval_;
 
   DISALLOW_COPY_AND_ASSIGN(PassThroughImageTransportSurface);
 };
 
 }  // namespace content
 
 #endif  // defined(ENABLE_GPU)
 
 #endif  // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_