| Index: content/common/gpu/gpu_channel.h
|
| diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h
|
| index 710b31ab285b3dd01235faefacaab6c8f3561572..10f77ce65f1df20c2e1f4dbd3f394cb606849d37 100644
|
| --- a/content/common/gpu/gpu_channel.h
|
| +++ b/content/common/gpu/gpu_channel.h
|
| @@ -18,6 +18,7 @@
|
| #include "content/common/gpu/gpu_command_buffer_stub.h"
|
| #include "content/common/gpu/gpu_memory_manager.h"
|
| #include "content/common/gpu/gpu_result_codes.h"
|
| +#include "content/common/gpu/media/gpu_jpeg_decode_accelerator.h"
|
| #include "content/common/message_router.h"
|
| #include "gpu/command_buffer/service/valuebuffer_manager.h"
|
| #include "ipc/ipc_sync_channel.h"
|
| @@ -48,6 +49,7 @@ class MessageFilter;
|
| namespace content {
|
| class GpuChannelManager;
|
| class GpuChannelMessageFilter;
|
| +class GpuJpegDecodeAccelerator;
|
| class GpuWatchdog;
|
|
|
| // Encapsulates an IPC channel between the GPU process and one renderer
|
| @@ -184,6 +186,7 @@ class GpuChannel : public IPC::Listener, public IPC::Sender,
|
| int32 route_id,
|
| bool* succeeded);
|
| void OnDestroyCommandBuffer(int32 route_id);
|
| + void OnCreateJpegDecoder(int32 route_id, IPC::Message* reply_msg);
|
|
|
| // Decrement the count of unhandled IPC messages and defer preemption.
|
| void MessageProcessed();
|
| @@ -229,6 +232,8 @@ class GpuChannel : public IPC::Listener, public IPC::Sender,
|
| typedef IDMap<GpuCommandBufferStub, IDMapOwnPointer> StubMap;
|
| StubMap stubs_;
|
|
|
| + scoped_ptr<GpuJpegDecodeAccelerator> jpeg_decoder_;
|
| +
|
| bool log_messages_; // True if we should log sent and received messages.
|
| gpu::gles2::DisallowedFeatures disallowed_features_;
|
| GpuWatchdog* watchdog_;
|
|
|