| Index: content/common/gpu/gpu_channel.h
|
| diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h
|
| index df2fd54576521d13adc53814647c3c37c1b8968d..e890a5833776efb300bb4b60898bfa97b9edae61 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"
|
| @@ -169,6 +170,8 @@ class GpuChannel : public IPC::Listener, public IPC::Sender,
|
| return pending_valuebuffer_state_.get();
|
| }
|
|
|
| + void ReleaseJpegDecoder();
|
| +
|
| private:
|
| friend class GpuChannelMessageFilter;
|
|
|
| @@ -185,6 +188,9 @@ class GpuChannel : public IPC::Listener, public IPC::Sender,
|
| int32 route_id,
|
| bool* succeeded);
|
| void OnDestroyCommandBuffer(int32 route_id);
|
| + void OnDevToolsStartEventsRecording(int32 route_id, bool* succeeded);
|
| + void OnDevToolsStopEventsRecording();
|
| + void OnCreateJpegDecoder(int32 route_id, bool* succeeded);
|
|
|
| // Decrement the count of unhandled IPC messages and defer preemption.
|
| void MessageProcessed();
|
| @@ -230,6 +236,8 @@ class GpuChannel : public IPC::Listener, public IPC::Sender,
|
| typedef IDMap<GpuCommandBufferStub, IDMapOwnPointer> StubMap;
|
| StubMap stubs_;
|
|
|
| + scoped_ptr<content::GpuJpegDecodeAccelerator> jpeg_decoder_;
|
| +
|
| bool log_messages_; // True if we should log sent and received messages.
|
| gpu::gles2::DisallowedFeatures disallowed_features_;
|
| GpuWatchdog* watchdog_;
|
|
|