Reland 179911 and 179910

content/common/gpu/gpu_channel.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_CHANNEL_H_
 #define CONTENT_COMMON_GPU_GPU_CHANNEL_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 18 matching lines @@
 #endif
 
 struct GPUCreateCommandBufferConfig;
 
 namespace base {
 class MessageLoopProxy;
 class WaitableEvent;
 }
 
 namespace gpu {
-struct RefCountedCounter;
+class PreemptionFlag;
 namespace gles2 {
 class ImageManager;
 }
 }
 
 #if defined(OS_ANDROID)
 namespace content {
 class StreamTextureManagerAndroid;
 }
 #endif
 
 namespace content {
 class GpuChannelManager;
 class GpuWatchdog;
+class SyncPointMessageFilter;
 
 // Encapsulates an IPC channel between the GPU process and one renderer
 // process. On the renderer side there's a corresponding GpuChannelHost.
 class GpuChannel : public IPC::Listener,
                    public IPC::Sender,
                    public base::RefCountedThreadSafe<GpuChannel> {
  public:
   // Takes ownership of the renderer process handle.
   GpuChannel(GpuChannelManager* gpu_channel_manager,
              GpuWatchdog* watchdog,
@@ skipping 58 matching lines @@
   // Destroy channel and all contained contexts.
   void DestroySoon();
 
   // Generate a route ID guaranteed to be unique for this channel.
   int GenerateRouteID();
 
   // Called to add/remove a listener for a particular message routing ID.
   void AddRoute(int32 route_id, IPC::Listener* listener);
   void RemoveRoute(int32 route_id);
 
-  gpu::RefCountedCounter* MessagesPendingCount() {
-    return unprocessed_messages_.get();
+  gpu::PreemptionFlag* GetPreemptionFlag() {
+    return processing_stalled_.get();
   }
 
-  // If preempt_by_counter->count is non-zero, any stub on this channel
+  // If |preemption_flag->IsSet()|, any stub on this channel
   // should stop issuing GL commands. Setting this to NULL stops deferral.
-  void SetPreemptByCounter(
-      scoped_refptr<gpu::RefCountedCounter> preempt_by_counter);
+  void SetPreemptByFlag(
+      scoped_refptr<gpu::PreemptionFlag> preemption_flag);
 
 #if defined(OS_ANDROID)
   StreamTextureManagerAndroid* stream_texture_manager() {
     return stream_texture_manager_.get();
   }
 #endif
 
  protected:
   virtual ~GpuChannel();
 
@@ skipping 23 matching lines @@
   // through binder thread.
   void OnEstablishStreamTexture(
       int32 stream_id, SurfaceTexturePeer::SurfaceTextureTarget type,
       int32 primary_id, int32 secondary_id);
 #endif
 
   // Collect rendering stats.
   void OnCollectRenderingStatsForSurface(
       int32 surface_id, IPC::Message* reply_message);
 
+  // Decrement the count of unhandled IPC messages and defer preemption.
+  void MessageProcessed();
+
   // The lifetime of objects of this class is managed by a GpuChannelManager.
   // The GpuChannelManager destroy all the GpuChannels that they own when they
   // are destroyed. So a raw pointer is safe.
   GpuChannelManager* gpu_channel_manager_;
 
   scoped_ptr<IPC::SyncChannel> channel_;
 
-  // Number of routed messages for pending processing on a stub.
-  scoped_refptr<gpu::RefCountedCounter> unprocessed_messages_;
+  // Pointer to number of routed messages that are pending processing on a
+  // stub. The lifetime is properly managed because we pass ownership to a
+  // SyncPointMessageFilter, which we hold a reference to.
+  base::AtomicRefCount* unprocessed_messages_;
+
+  // Whether the processing of IPCs on this channel is stalled.
+  scoped_refptr<gpu::PreemptionFlag> processing_stalled_;
 
   // If non-NULL, all stubs on this channel should stop processing GL
-  // commands (via their GpuScheduler) when preempt_by_counter_->count
-  // is non-zero.
-  scoped_refptr<gpu::RefCountedCounter> preempt_by_counter_;
+  // commands (via their GpuScheduler) when preemption_flag_->IsSet()
+  scoped_refptr<gpu::PreemptionFlag> preemption_flag_;
 
   std::deque<IPC::Message*> deferred_messages_;
 
   // The id of the client who is on the other side of the channel.
   int client_id_;
 
   // Uniquely identifies the channel within this GPU process.
   std::string channel_id_;
 
   // Used to implement message routing functionality to CommandBuffer objects
@@ skipping 18 matching lines @@
   bool handle_messages_scheduled_;
   bool processed_get_state_fast_;
   IPC::Message* currently_processing_message_;
 
 #if defined(OS_ANDROID)
   scoped_ptr<StreamTextureManagerAndroid> stream_texture_manager_;
 #endif
 
   base::WeakPtrFactory<GpuChannel> weak_factory_;
 
+  scoped_refptr<SyncPointMessageFilter> filter_;
+  scoped_refptr<base::MessageLoopProxy> io_message_loop_;
+
   DISALLOW_COPY_AND_ASSIGN(GpuChannel);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_CHANNEL_H_