Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2701)

Unified Diff: content/renderer/pepper/pepper_video_decoder_host.cc

Issue 1827123002: Move content/common/gpu/client to gpu/ipc/client (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/video_capture_impl.cc ('k') | content/renderer/pepper/pepper_video_encoder_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_video_decoder_host.cc
diff --git a/content/renderer/pepper/pepper_video_decoder_host.cc b/content/renderer/pepper/pepper_video_decoder_host.cc
index 636e30cc76a06ef90b59d6593d563c333a1ba7f2..714d407b51b4cc5179560928a9cbccf0545ec3d8 100644
--- a/content/renderer/pepper/pepper_video_decoder_host.cc
+++ b/content/renderer/pepper/pepper_video_decoder_host.cc
@@ -9,7 +9,6 @@
#include "base/bind.h"
#include "base/memory/shared_memory.h"
#include "build/build_config.h"
-#include "content/common/gpu/client/command_buffer_proxy_impl.h"
#include "content/common/gpu/client/gpu_video_decode_accelerator_host.h"
#include "content/common/pepper_file_util.h"
#include "content/public/common/content_client.h"
@@ -19,6 +18,7 @@
#include "content/renderer/pepper/gfx_conversion.h"
#include "content/renderer/pepper/ppb_graphics_3d_impl.h"
#include "content/renderer/pepper/video_decoder_shim.h"
+#include "gpu/ipc/client/command_buffer_proxy_impl.h"
#include "media/base/limits.h"
#include "media/video/video_decode_accelerator.h"
#include "ppapi/c/pp_completion_callback.h"
@@ -134,7 +134,8 @@ int32_t PepperVideoDecoderHost::OnHostMsgInitialize(
PPB_Graphics3D_Impl* graphics3d =
static_cast<PPB_Graphics3D_Impl*>(enter_graphics.object());
- CommandBufferProxyImpl* command_buffer = graphics3d->GetCommandBufferProxy();
+ gpu::CommandBufferProxyImpl* command_buffer =
+ graphics3d->GetCommandBufferProxy();
if (!command_buffer)
return PP_ERROR_FAILED;
@@ -146,7 +147,7 @@ int32_t PepperVideoDecoderHost::OnHostMsgInitialize(
if (acceleration != PP_HARDWAREACCELERATION_NONE) {
// 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));
« no previous file with comments | « content/renderer/media/video_capture_impl.cc ('k') | content/renderer/pepper/pepper_video_encoder_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698