Merge 217276 "Add media::VideoEncodeAccelerator with WebRTC inte..."

content/common/gpu/gpu_channel.h

Index: content/common/gpu/gpu_channel.h
===================================================================
--- content/common/gpu/gpu_channel.h	(revision 217687)
+++ content/common/gpu/gpu_channel.h	(working copy)
@@ -11,6 +11,7 @@
 #include "base/id_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process.h"
 #include "build/build_config.h"
@@ -49,9 +50,10 @@
 
 namespace content {
 class GpuChannelManager;
+class GpuChannelMessageFilter;
 struct GpuRenderingStats;
+class GpuVideoEncodeAccelerator;
 class GpuWatchdog;
-class GpuChannelMessageFilter;
 
 // Encapsulates an IPC channel between the GPU process and one renderer
 // process. On the renderer side there's a corresponding GpuChannelHost.
@@ -173,6 +175,8 @@
       const GPUCreateCommandBufferConfig& init_params,
       int32* route_id);
   void OnDestroyCommandBuffer(int32 route_id);
+  void OnCreateVideoEncoder(int32* route_id);
+  void OnDestroyVideoEncoder(int32 route_id);
 
 #if defined(OS_ANDROID)
   // Register the StreamTextureProxy class with the gpu process so that all
@@ -238,6 +242,9 @@
   StubMap stubs_;
 #endif  // defined (ENABLE_GPU)
 
+  typedef IDMap<GpuVideoEncodeAccelerator, IDMapOwnPointer> EncoderMap;
+  EncoderMap video_encoders_;
+
   bool log_messages_;  // True if we should log sent and received messages.
   gpu::gles2::DisallowedFeatures disallowed_features_;
   GpuWatchdog* watchdog_;