| Index: content/renderer/render_thread_impl.h
|
| diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
|
| index e204c63ddc10b87f11b107db748492809b436980..cba9562c2b210d6efd0f0b67ed78c1fb99a84580 100644
|
| --- a/content/renderer/render_thread_impl.h
|
| +++ b/content/renderer/render_thread_impl.h
|
| @@ -56,6 +56,10 @@ namespace cc {
|
| class ContextProvider;
|
| }
|
|
|
| +namespace cc_blink {
|
| +class ContextProviderWebContext;
|
| +}
|
| +
|
| namespace IPC {
|
| class MessageFilter;
|
| }
|
| @@ -69,13 +73,6 @@ namespace v8 {
|
| class Extension;
|
| }
|
|
|
| -namespace webkit {
|
| -namespace gpu {
|
| -class ContextProviderWebContext;
|
| -class GrContextForWebGraphicsContext3D;
|
| -}
|
| -}
|
| -
|
| namespace content {
|
|
|
| class AppCacheDispatcher;
|
| @@ -324,8 +321,8 @@ class CONTENT_EXPORT RenderThreadImpl
|
|
|
| scoped_refptr<media::GpuVideoAcceleratorFactories> GetGpuFactories();
|
|
|
| - scoped_refptr<webkit::gpu::ContextProviderWebContext>
|
| - SharedMainThreadContextProvider();
|
| + scoped_refptr<cc_blink::ContextProviderWebContext>
|
| + SharedMainThreadContextProvider();
|
|
|
| // AudioRendererMixerManager instance which manages renderer side mixer
|
| // instances shared based on configured audio parameters. Lazily created on
|
| @@ -566,7 +563,7 @@ class CONTENT_EXPORT RenderThreadImpl
|
| scoped_ptr<InputHandlerManager> input_handler_manager_;
|
| scoped_refptr<CompositorForwardingMessageFilter> compositor_message_filter_;
|
|
|
| - scoped_refptr<webkit::gpu::ContextProviderWebContext>
|
| + scoped_refptr<cc_blink::ContextProviderWebContext>
|
| shared_main_thread_contexts_;
|
|
|
| ObserverList<RenderProcessObserver> observers_;
|
|
|