Index: content/browser/aura/gpu_process_transport_factory.h |
diff --git a/content/browser/aura/gpu_process_transport_factory.h b/content/browser/aura/gpu_process_transport_factory.h |
index 72b88d532bb8dbc8c33ec5bcc001476c7502826c..56d3e55498ab08809ab8d00c058e22a8ac775222 100644 |
--- a/content/browser/aura/gpu_process_transport_factory.h |
+++ b/content/browser/aura/gpu_process_transport_factory.h |
@@ -35,9 +35,7 @@ class GpuProcessTransportFactory |
scoped_ptr<WebGraphicsContext3DCommandBufferImpl> |
CreateOffscreenCommandBufferContext(); |
- // ContextFactory implementation. |
- virtual scoped_ptr<WebKit::WebGraphicsContext3D> CreateOffscreenContext() |
- OVERRIDE; |
+ // ui::ContextFactory implementation. |
virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface( |
ui::Compositor* compositor) OVERRIDE; |
virtual scoped_refptr<ui::Reflector> CreateReflector( |
@@ -46,6 +44,10 @@ class GpuProcessTransportFactory |
virtual void RemoveReflector( |
scoped_refptr<ui::Reflector> reflector) OVERRIDE; |
virtual void RemoveCompositor(ui::Compositor* compositor) OVERRIDE; |
+ virtual scoped_refptr<cc::ContextProvider> |
+ OffscreenContextProviderForMainThread() OVERRIDE; |
+ virtual scoped_refptr<cc::ContextProvider> |
+ OffscreenContextProviderForCompositorThread() OVERRIDE; |
virtual bool DoesCreateTestContexts() OVERRIDE; |
// ImageTransportFactory implementation. |
@@ -66,12 +68,6 @@ class GpuProcessTransportFactory |
virtual void RemoveObserver( |
ImageTransportFactoryObserver* observer) OVERRIDE; |
- // ui::ContextFactory implementation. |
- virtual scoped_refptr<cc::ContextProvider> |
- OffscreenContextProviderForMainThread() OVERRIDE; |
- virtual scoped_refptr<cc::ContextProvider> |
- OffscreenContextProviderForCompositorThread() OVERRIDE; |
- |
void OnLostContext(ui::Compositor* compositor); |
private: |