| Index: content/common/gpu/gpu_channel.h
|
| diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h
|
| index 8d775f095fd28f23e43ddcc4ed7a6ab60d5564c7..0692b903b4fab7128f9c171a3c6a8dd24fcdc945 100644
|
| --- a/content/common/gpu/gpu_channel.h
|
| +++ b/content/common/gpu/gpu_channel.h
|
| @@ -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 @@ class StreamTextureManagerAndroid;
|
|
|
| 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 @@ class GpuChannel : public IPC::Listener,
|
| 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 @@ class GpuChannel : public IPC::Listener,
|
| 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_;
|
|
|