| Index: content/renderer/pepper/video_decoder_shim.h
|
| diff --git a/content/renderer/pepper/video_decoder_shim.h b/content/renderer/pepper/video_decoder_shim.h
|
| index 42335c1f87c1dd5e536c2462d53c9b24b56c48f0..3a0f32ae592ed93c1331ea24d64c58c52a9943c4 100644
|
| --- a/content/renderer/pepper/video_decoder_shim.h
|
| +++ b/content/renderer/pepper/video_decoder_shim.h
|
| @@ -23,6 +23,10 @@ namespace base {
|
| class SingleThreadTaskRunner;
|
| }
|
|
|
| +namespace cc_blink {
|
| +class ContextProviderWebContext;
|
| +}
|
| +
|
| namespace gpu {
|
| namespace gles2 {
|
| class GLES2Interface;
|
| @@ -33,12 +37,6 @@ namespace media {
|
| class DecoderBuffer;
|
| }
|
|
|
| -namespace webkit {
|
| -namespace gpu {
|
| -class ContextProviderWebContext;
|
| -}
|
| -}
|
| -
|
| namespace content {
|
|
|
| class PepperVideoDecoderHost;
|
| @@ -92,7 +90,7 @@ class VideoDecoderShim : public media::VideoDecodeAccelerator {
|
|
|
| PepperVideoDecoderHost* host_;
|
| scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
|
| - scoped_refptr<webkit::gpu::ContextProviderWebContext> context_provider_;
|
| + scoped_refptr<cc_blink::ContextProviderWebContext> context_provider_;
|
|
|
| // The current decoded frame size.
|
| gfx::Size texture_size_;
|
|
|