WIP: Towards merging OffscreenCanvas and Mus code

ui/compositor/test/in_process_context_factory.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_
 #define UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_
 
 #include <stdint.h>
 #include <memory>
 
@@ skipping 11 matching lines @@
 }
 
 namespace ui {
 class InProcessContextProvider;
 
 class InProcessContextFactory : public ContextFactory,
                                 public ContextFactoryPrivate {
  public:
   // surface_manager is owned by the creator of this and must outlive the
   // context factory.
-  InProcessContextFactory(bool context_factory_for_test,
-                          cc::SurfaceManager* surface_manager);
+  InProcessContextFactory(
+      bool context_factory_for_test,
+      display_compositor::DisplayCompositor* display_compositor);
   ~InProcessContextFactory() override;
 
   // If true (the default) an OutputSurface is created that does not display
   // anything. Set to false if you want to see results on the screen.
   void set_use_test_surface(bool use_test_surface) {
     use_test_surface_ = use_test_surface;
   }
 
   // This is used to call OnLostResources on all clients, to ensure they stop
   // using the SharedMainThreadContextProvider.
   void SendOnLostResources();
 
   // ContextFactory implementation
   void CreateCompositorFrameSink(base::WeakPtr<Compositor> compositor) override;
 
   std::unique_ptr<Reflector> CreateReflector(Compositor* mirrored_compositor,
                                              Layer* mirroring_layer) override;
   void RemoveReflector(Reflector* reflector) override;
 
   scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
   void RemoveCompositor(Compositor* compositor) override;
   bool DoesCreateTestContexts() override;
   uint32_t GetImageTextureTarget(gfx::BufferFormat format,
                                  gfx::BufferUsage usage) override;
   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
   cc::TaskGraphRunner* GetTaskGraphRunner() override;
   cc::FrameSinkId AllocateFrameSinkId() override;
   cc::SurfaceManager* GetSurfaceManager() override;
+  display_compositor::DisplayCompositor* GetDisplayCompositor() override;
   void SetDisplayVisible(ui::Compositor* compositor, bool visible) override;
   void ResizeDisplay(ui::Compositor* compositor,
                      const gfx::Size& size) override;
   void SetDisplayColorSpace(ui::Compositor* compositor,
                             const gfx::ColorSpace& color_space) override {}
   void SetAuthoritativeVSyncInterval(ui::Compositor* compositor,
                                      base::TimeDelta interval) override {}
   void SetDisplayVSyncParameters(ui::Compositor* compositor,
                                  base::TimeTicks timebase,
                                  base::TimeDelta interval) override {}
   void SetOutputIsSecure(ui::Compositor* compositor, bool secure) override {}
   void AddObserver(ContextFactoryObserver* observer) override;
   void RemoveObserver(ContextFactoryObserver* observer) override;
 
  private:
   struct PerCompositorData;
 
   PerCompositorData* CreatePerCompositorData(ui::Compositor* compositor);
 
   scoped_refptr<InProcessContextProvider> shared_main_thread_contexts_;
   scoped_refptr<InProcessContextProvider> shared_worker_context_provider_;
   cc::TestSharedBitmapManager shared_bitmap_manager_;
   cc::TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
   cc::TestImageFactory image_factory_;
   cc::TestTaskGraphRunner task_graph_runner_;
   uint32_t next_surface_sink_id_;
   bool use_test_surface_;
   bool context_factory_for_test_;
-  cc::SurfaceManager* surface_manager_;
+  display_compositor::DisplayCompositor* display_compositor_;
   base::ObserverList<ContextFactoryObserver> observer_list_;
 
   using PerCompositorDataMap =
       base::hash_map<ui::Compositor*, std::unique_ptr<PerCompositorData>>;
   PerCompositorDataMap per_compositor_data_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessContextFactory);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_