| Index: content/common/gpu/gpu_channel.cc
|
| diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc
|
| index 8ff66a115f2ac647fc098a295988f523824e1f44..b446d7979c7803d35285392f40a102fbe22214ed 100644
|
| --- a/content/common/gpu/gpu_channel.cc
|
| +++ b/content/common/gpu/gpu_channel.cc
|
| @@ -20,7 +20,6 @@
|
| #include "content/common/gpu/devtools_gpu_agent.h"
|
| #include "content/common/gpu/gpu_channel_manager.h"
|
| #include "content/common/gpu/gpu_messages.h"
|
| -#include "content/common/gpu/media/gpu_video_encode_accelerator.h"
|
| #include "content/common/gpu/sync_point_manager.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "gpu/command_buffer/common/mailbox.h"
|
| @@ -706,9 +705,6 @@ bool GpuChannel::OnControlMessageReceived(const IPC::Message& msg) {
|
| OnCreateOffscreenCommandBuffer)
|
| IPC_MESSAGE_HANDLER(GpuChannelMsg_DestroyCommandBuffer,
|
| OnDestroyCommandBuffer)
|
| - IPC_MESSAGE_HANDLER(GpuChannelMsg_CreateVideoEncoder, OnCreateVideoEncoder)
|
| - IPC_MESSAGE_HANDLER(GpuChannelMsg_DestroyVideoEncoder,
|
| - OnDestroyVideoEncoder)
|
| IPC_MESSAGE_HANDLER(GpuChannelMsg_DevToolsStartEventsRecording,
|
| OnDevToolsStartEventsRecording)
|
| IPC_MESSAGE_HANDLER(GpuChannelMsg_DevToolsStopEventsRecording,
|
| @@ -843,26 +839,6 @@ void GpuChannel::OnDestroyCommandBuffer(int32 route_id) {
|
| }
|
| }
|
|
|
| -void GpuChannel::OnCreateVideoEncoder(int32* route_id) {
|
| - TRACE_EVENT0("gpu", "GpuChannel::OnCreateVideoEncoder");
|
| -
|
| - *route_id = GenerateRouteID();
|
| - GpuVideoEncodeAccelerator* encoder =
|
| - new GpuVideoEncodeAccelerator(this, *route_id);
|
| - router_.AddRoute(*route_id, encoder);
|
| - video_encoders_.AddWithID(encoder, *route_id);
|
| -}
|
| -
|
| -void GpuChannel::OnDestroyVideoEncoder(int32 route_id) {
|
| - TRACE_EVENT1(
|
| - "gpu", "GpuChannel::OnDestroyVideoEncoder", "route_id", route_id);
|
| - GpuVideoEncodeAccelerator* encoder = video_encoders_.Lookup(route_id);
|
| - if (!encoder)
|
| - return;
|
| - router_.RemoveRoute(route_id);
|
| - video_encoders_.Remove(route_id);
|
| -}
|
| -
|
| void GpuChannel::OnDevToolsStartEventsRecording(int32* route_id) {
|
| devtools_gpu_agent_->StartEventsRecording(route_id);
|
| }
|
|
|