Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / compositor / test / in_process_context_factory.h

diff --git a/src/ui/compositor/test/in_process_context_factory.h b/src/ui/compositor/test/in_process_context_factory.h
index 1179729..2f74ea6 100644 (file)
--- a/src/ui/compositor/test/in_process_context_factory.h
+++ b/src/ui/compositor/test/in_process_context_factory.h
@@ -5,6 +5,8 @@
 #ifndef UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_
 #define UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_
 
+#include "cc/test/test_gpu_memory_buffer_manager.h"
+#include "cc/test/test_shared_bitmap_manager.h"
 #include "ui/compositor/compositor.h"
 
 namespace base {
@@ -22,30 +24,31 @@ namespace ui {
 class InProcessContextFactory : public ContextFactory {
  public:
   InProcessContextFactory();
-  virtual ~InProcessContextFactory();
+  ~InProcessContextFactory() override;
 
   // ContextFactory implementation
-  virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(
-      Compositor* compositor,
-      bool software_fallback) OVERRIDE;
-
-  virtual scoped_refptr<Reflector> CreateReflector(
-      Compositor* mirrored_compositor,
-      Layer* mirroring_layer) OVERRIDE;
-  virtual void RemoveReflector(scoped_refptr<Reflector> reflector) OVERRIDE;
-
-  virtual scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider()
-      OVERRIDE;
-  virtual void RemoveCompositor(Compositor* compositor) OVERRIDE;
-  virtual bool DoesCreateTestContexts() OVERRIDE;
-  virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE;
-  virtual base::MessageLoopProxy* GetCompositorMessageLoop() OVERRIDE;
+  void CreateOutputSurface(base::WeakPtr<Compositor> compositor,
+                           bool software_fallback) override;
+
+  scoped_refptr<Reflector> CreateReflector(Compositor* mirrored_compositor,
+                                           Layer* mirroring_layer) override;
+  void RemoveReflector(scoped_refptr<Reflector> reflector) override;
+
+  scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
+  void RemoveCompositor(Compositor* compositor) override;
+  bool DoesCreateTestContexts() override;
+  cc::SharedBitmapManager* GetSharedBitmapManager() override;
+  gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
+  base::MessageLoopProxy* GetCompositorMessageLoop() override;
+  scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override;
 
  private:
   scoped_ptr<base::Thread> compositor_thread_;
   scoped_refptr<webkit::gpu::ContextProviderInProcess>
       shared_main_thread_contexts_;
-  scoped_ptr<cc::SharedBitmapManager> shared_bitmap_manager_;
+  cc::TestSharedBitmapManager shared_bitmap_manager_;
+  cc::TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
+  uint32_t next_surface_id_namespace_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessContextFactory);
 };