Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / browser / compositor / gpu_process_transport_factory.h

diff --git a/src/content/browser/compositor/gpu_process_transport_factory.h b/src/content/browser/compositor/gpu_process_transport_factory.h
index 3f04dd5..3fdeefa 100644 (file)
--- a/src/content/browser/compositor/gpu_process_transport_factory.h
+++ b/src/content/browser/compositor/gpu_process_transport_factory.h
@@ -44,20 +44,13 @@ class GpuProcessTransportFactory
       scoped_refptr<ui::Reflector> reflector) OVERRIDE;
   virtual void RemoveCompositor(ui::Compositor* compositor) OVERRIDE;
   virtual scoped_refptr<cc::ContextProvider>
-      OffscreenCompositorContextProvider() OVERRIDE;
-  virtual scoped_refptr<cc::ContextProvider>
       SharedMainThreadContextProvider() OVERRIDE;
   virtual bool DoesCreateTestContexts() OVERRIDE;
+  virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE;
 
   // ImageTransportFactory implementation.
-  virtual ui::ContextFactory* AsContextFactory() OVERRIDE;
+  virtual ui::ContextFactory* GetContextFactory() OVERRIDE;
   virtual gfx::GLSurfaceHandle GetSharedSurfaceHandle() OVERRIDE;
-  virtual scoped_refptr<ui::Texture> CreateTransportClient(
-      float device_scale_factor) OVERRIDE;
-  virtual scoped_refptr<ui::Texture> CreateOwnedTexture(
-      const gfx::Size& size,
-      float device_scale_factor,
-      unsigned int texture_id) OVERRIDE;
   virtual GLHelper* GetGLHelper() OVERRIDE;
   virtual void AddObserver(ImageTransportFactoryObserver* observer) OVERRIDE;
   virtual void RemoveObserver(
@@ -75,12 +68,10 @@ class GpuProcessTransportFactory
 
   typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap;
   PerCompositorDataMap per_compositor_data_;
-  scoped_refptr<ContextProviderCommandBuffer> offscreen_compositor_contexts_;
   scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_;
   scoped_ptr<GLHelper> gl_helper_;
   ObserverList<ImageTransportFactoryObserver> observer_list_;
   base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_;
-  bool offscreen_content_bound_to_other_thread_;
 
   // The contents of this map and its methods may only be used on the compositor
   // thread.