Index: content/renderer/android/synchronous_compositor_factory.h |
diff --git a/content/renderer/android/synchronous_compositor_factory.h b/content/renderer/android/synchronous_compositor_factory.h |
index 3ee74a095944c965de54236e7c4d281be8b1aa62..7906f5f3ec8aaf1e17884429a37713c5a662d795 100644 |
--- a/content/renderer/android/synchronous_compositor_factory.h |
+++ b/content/renderer/android/synchronous_compositor_factory.h |
@@ -19,14 +19,12 @@ class ContextProvider; |
class OutputSurface; |
} |
-namespace gpu_blink { |
-class WebGraphicsContext3DInProcessCommandBufferImpl; |
-} |
- |
-namespace webkit { |
-namespace gpu { |
+namespace cc_blink { |
class ContextProviderWebContext; |
} |
+ |
+namespace gpu_blink { |
+class WebGraphicsContext3DInProcessCommandBufferImpl; |
} |
namespace content { |
@@ -59,10 +57,10 @@ class SynchronousCompositorFactory { |
virtual scoped_ptr<cc::BeginFrameSource> CreateExternalBeginFrameSource( |
int routing_id) = 0; |
- virtual scoped_refptr<webkit::gpu::ContextProviderWebContext> |
- CreateOffscreenContextProvider( |
- const blink::WebGraphicsContext3D::Attributes& attributes, |
- const std::string& debug_name) = 0; |
+ virtual scoped_refptr<cc_blink::ContextProviderWebContext> |
+ CreateOffscreenContextProvider( |
+ const blink::WebGraphicsContext3D::Attributes& attributes, |
+ const std::string& debug_name) = 0; |
virtual scoped_refptr<StreamTextureFactory> CreateStreamTextureFactory( |
int frame_id) = 0; |
virtual gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl* |