| Index: content/renderer/pepper/ppb_video_decoder_impl.cc
|
| diff --git a/content/renderer/pepper/ppb_video_decoder_impl.cc b/content/renderer/pepper/ppb_video_decoder_impl.cc
|
| index 454eec48688a64957d85e6f54f708e33f569585c..718d290a4f572aefc1ba14edce2cc9ebb84e1f50 100644
|
| --- a/content/renderer/pepper/ppb_video_decoder_impl.cc
|
| +++ b/content/renderer/pepper/ppb_video_decoder_impl.cc
|
| @@ -9,7 +9,6 @@
|
| #include "base/logging.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/metrics/histogram.h"
|
| -#include "content/common/gpu/client/command_buffer_proxy_impl.h"
|
| #include "content/common/gpu/client/gpu_video_decode_accelerator_host.h"
|
| #include "content/renderer/pepper/host_globals.h"
|
| #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
|
| @@ -17,6 +16,7 @@
|
| #include "content/renderer/pepper/ppb_buffer_impl.h"
|
| #include "content/renderer/pepper/ppb_graphics_3d_impl.h"
|
| #include "content/renderer/render_thread_impl.h"
|
| +#include "gpu/ipc/client/command_buffer_proxy_impl.h"
|
| #include "media/video/picture.h"
|
| #include "media/video/video_decode_accelerator.h"
|
| #include "ppapi/c/dev/pp_video_dev.h"
|
| @@ -119,7 +119,8 @@ bool PPB_VideoDecoder_Impl::Init(PP_Resource graphics_context,
|
| PPB_Graphics3D_Impl* graphics_3d =
|
| static_cast<PPB_Graphics3D_Impl*>(enter_context.object());
|
|
|
| - CommandBufferProxyImpl* command_buffer = graphics_3d->GetCommandBufferProxy();
|
| + gpu::CommandBufferProxyImpl* command_buffer =
|
| + graphics_3d->GetCommandBufferProxy();
|
| if (!command_buffer)
|
| return false;
|
|
|
| @@ -128,7 +129,7 @@ bool PPB_VideoDecoder_Impl::Init(PP_Resource graphics_context,
|
|
|
| // This is not synchronous, but subsequent IPC messages will be buffered, so
|
| // it is okay to immediately send IPC messages.
|
| - GpuChannelHost* channel = command_buffer->channel();
|
| + gpu::GpuChannelHost* channel = command_buffer->channel();
|
| if (channel) {
|
| decoder_.reset(new GpuVideoDecodeAcceleratorHost(channel, command_buffer));
|
| return decoder_->Initialize(PPToMediaProfile(profile), this);
|
|
|