Revert of Decouple Media Service

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 <stddef.h>
 #include <stdint.h>
 
@@ skipping 39 matching lines @@
 }
 
 namespace IPC {
 class MessageFilter;
 }
 
 namespace content {
 class GpuChannelManager;
 class GpuChannelMessageFilter;
 class GpuChannelMessageQueue;
+class GpuJpegDecodeAccelerator;
 class GpuWatchdog;
 
 // Encapsulates an IPC channel between the GPU process and one renderer
 // process. On the renderer side there's a corresponding GpuChannelHost.
 class CONTENT_EXPORT GpuChannel
     : public IPC::Listener,
       public IPC::Sender,
       public gpu::gles2::SubscriptionRefSet::Observer {
  public:
   // Takes ownership of the renderer process handle.
   GpuChannel(GpuChannelManager* gpu_channel_manager,
              gpu::SyncPointManager* sync_point_manager,
              GpuWatchdog* watchdog,
              gfx::GLShareGroup* share_group,
              gpu::gles2::MailboxManager* mailbox_manager,
              gpu::PreemptionFlag* preempting_flag,
              gpu::PreemptionFlag* preempted_flag,
              base::SingleThreadTaskRunner* task_runner,
              base::SingleThreadTaskRunner* io_task_runner,
              int32_t client_id,
              uint64_t client_tracing_id,
              bool allow_view_command_buffers,
              bool allow_real_time_streams);
   ~GpuChannel() override;
 
   // Initializes the IPC channel. Caller takes ownership of the client FD in
   // the returned handle and is responsible for closing it.
   virtual IPC::ChannelHandle Init(base::WaitableEvent* shutdown_event);
 
-  void SetUnhandledMessageListener(IPC::Listener* listener);
-
   // Get the GpuChannelManager that owns this channel.
   GpuChannelManager* gpu_channel_manager() const {
     return gpu_channel_manager_;
   }
 
   const std::string& channel_id() const { return channel_id_; }
 
   virtual base::ProcessId GetClientPID() const;
 
   int client_id() const { return client_id_; }
 
   uint64_t client_tracing_id() const { return client_tracing_id_; }
 
-  base::WeakPtr<GpuChannel> AsWeakPtr();
-
   scoped_refptr<base::SingleThreadTaskRunner> io_task_runner() const {
     return io_task_runner_;
   }
 
   // IPC::Listener implementation:
   bool OnMessageReceived(const IPC::Message& msg) override;
   void OnChannelError() override;
 
   // IPC::Sender implementation:
   bool Send(IPC::Message* msg) override;
@@ skipping 27 matching lines @@
 
   scoped_refptr<gl::GLImage> CreateImageForGpuMemoryBuffer(
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
       gfx::BufferFormat format,
       uint32_t internalformat);
 
   void HandleUpdateValueState(unsigned int target,
                               const gpu::ValueState& state);
 
-  GpuChannelMessageFilter* filter() const { return filter_.get(); }
-
   // Visible for testing.
   const gpu::ValueStateMap* pending_valuebuffer_state() const {
     return pending_valuebuffer_state_.get();
   }
 
+  // Visible for testing.
+  GpuChannelMessageFilter* filter() const { return filter_.get(); }
+
   // Returns the global order number for the last processed IPC message.
   uint32_t GetProcessedOrderNum() const;
 
   // Returns the global order number for the last unprocessed IPC message.
   uint32_t GetUnprocessedOrderNum() const;
 
   // Returns the shared sync point global order data for the stream.
   scoped_refptr<gpu::SyncPointOrderData> GetSyncPointOrderData(
       int32_t stream_id);
 
@@ skipping 43 matching lines @@
       const gfx::GLSurfaceHandle& window,
       const GPUCreateCommandBufferConfig& init_params,
       int32_t route_id,
       bool* succeeded);
   void OnCreateOffscreenCommandBuffer(
       const gfx::Size& size,
       const GPUCreateCommandBufferConfig& init_params,
       int32_t route_id,
       bool* succeeded);
   void OnDestroyCommandBuffer(int32_t route_id);
+  void OnCreateJpegDecoder(int32_t route_id, IPC::Message* reply_msg);
 
   bool CreateCommandBuffer(const gfx::GLSurfaceHandle& window,
                            const gfx::Size& size,
                            const GPUCreateCommandBufferConfig& init_params,
                            int32_t route_id);
 
   // 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* const gpu_channel_manager_;
 
   // Sync point manager. Outlives the channel and is guaranteed to outlive the
   // message loop.
   gpu::SyncPointManager* const sync_point_manager_;
 
   scoped_ptr<IPC::SyncChannel> channel_;
 
-  IPC::Listener* unhandled_message_listener_;
-
   // Uniquely identifies the channel within this GPU process.
   std::string channel_id_;
 
   // Used to implement message routing functionality to CommandBuffer objects
   IPC::MessageRouter router_;
 
   // Whether the processing of IPCs on this channel is stalled and we should
   // preempt other GpuChannels.
   scoped_refptr<gpu::PreemptionFlag> preempting_flag_;
 
@@ skipping 14 matching lines @@
   // The share group that all contexts associated with a particular renderer
   // process use.
   scoped_refptr<gfx::GLShareGroup> share_group_;
 
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
 
   scoped_refptr<gpu::gles2::SubscriptionRefSet> subscription_ref_set_;
 
   scoped_refptr<gpu::ValueStateMap> pending_valuebuffer_state_;
 
+  scoped_ptr<GpuJpegDecodeAccelerator> jpeg_decoder_;
+
   gpu::gles2::DisallowedFeatures disallowed_features_;
   GpuWatchdog* const watchdog_;
 
   // Map of stream id to appropriate message queue.
   base::hash_map<int32_t, scoped_refptr<GpuChannelMessageQueue>> streams_;
 
   // Multimap of stream id to route ids.
   base::hash_map<int32_t, int> streams_to_num_routes_;
 
   // Map of route id to stream id;
@@ skipping 197 matching lines @@
   scoped_refptr<gpu::PreemptionFlag> preempting_flag_;
   scoped_refptr<gpu::PreemptionFlag> preempted_flag_;
   gpu::SyncPointManager* const sync_point_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelMessageQueue);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_CHANNEL_H_