| Index: content/renderer/pepper/video_decoder_shim.cc
|
| diff --git a/content/renderer/pepper/video_decoder_shim.cc b/content/renderer/pepper/video_decoder_shim.cc
|
| index 2b01901eaeb458a32718249fcb16381116fbe31f..9c873550e44f15a90ce3048e44d508925416e6b2 100644
|
| --- a/content/renderer/pepper/video_decoder_shim.cc
|
| +++ b/content/renderer/pepper/video_decoder_shim.cc
|
| @@ -16,7 +16,7 @@
|
| #include "base/numerics/safe_conversions.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/thread_task_runner_handle.h"
|
| -#include "cc/blink/context_provider_web_context.h"
|
| +#include "content/common/gpu/client/context_provider_command_buffer.h"
|
| #include "content/public/renderer/render_thread.h"
|
| #include "content/renderer/pepper/pepper_video_decoder_host.h"
|
| #include "content/renderer/render_thread_impl.h"
|
| @@ -61,7 +61,7 @@ bool IsCodecSupported(media::VideoCodec codec) {
|
| // YUV->RGB converter class using a shader and FBO.
|
| class VideoDecoderShim::YUVConverter {
|
| public:
|
| - YUVConverter(const scoped_refptr<cc_blink::ContextProviderWebContext>&);
|
| + YUVConverter(scoped_refptr<ContextProviderCommandBuffer>);
|
| ~YUVConverter();
|
| bool Initialize();
|
| void Convert(const scoped_refptr<media::VideoFrame>& frame, GLuint tex_out);
|
| @@ -72,7 +72,7 @@ class VideoDecoderShim::YUVConverter {
|
| GLuint CreateProgram(const char* name, GLuint vshader, GLuint fshader);
|
| GLuint CreateTexture();
|
|
|
| - scoped_refptr<cc_blink::ContextProviderWebContext> context_provider_;
|
| + scoped_refptr<ContextProviderCommandBuffer> context_provider_;
|
| gpu::gles2::GLES2Interface* gl_;
|
| GLuint frame_buffer_;
|
| GLuint vertex_buffer_;
|
| @@ -102,8 +102,8 @@ class VideoDecoderShim::YUVConverter {
|
| };
|
|
|
| VideoDecoderShim::YUVConverter::YUVConverter(
|
| - const scoped_refptr<cc_blink::ContextProviderWebContext>& context_provider)
|
| - : context_provider_(context_provider),
|
| + scoped_refptr<ContextProviderCommandBuffer> context_provider)
|
| + : context_provider_(std::move(context_provider)),
|
| gl_(context_provider_->ContextGL()),
|
| frame_buffer_(0),
|
| vertex_buffer_(0),
|
|
|