Composite to cc::Display from ui::InProcessContextFactory.

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 "cc/test/test_gpu_memory_buffer_manager.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "ui/compositor/compositor.h"
 
 namespace base {
 class Thread;
 }
 
+namespace cc {
+class OnscreenDisplayClient;
+class SurfaceManager;
+}
+
 namespace ui {
 
 class InProcessContextFactory : public ContextFactory {
  public:
-  explicit InProcessContextFactory(bool context_factory_for_test);
+  InProcessContextFactory(bool context_factory_for_test,
+                          cc::SurfaceManager* surface_manager);

[sky, 2015/02/03 00:44:58]

nit: document ownership.

[jbauman, 2015/02/03 01:47:21]

Done.

   ~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;
   }
 
   // ContextFactory implementation
   void CreateOutputSurface(base::WeakPtr<Compositor> compositor,
@@ skipping 13 matching lines @@
   void ResizeDisplay(ui::Compositor* compositor,
                      const gfx::Size& size) override;
 
  private:
   scoped_ptr<base::Thread> compositor_thread_;
   scoped_refptr<cc::ContextProvider> shared_main_thread_contexts_;
   cc::TestSharedBitmapManager shared_bitmap_manager_;
   cc::TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
   uint32_t next_surface_id_namespace_;
   bool use_test_surface_;
+  bool context_factory_for_test_;
+  cc::SurfaceManager* surface_manager_;
 
-  const bool context_factory_for_test_;
+  base::hash_map<Compositor*, cc::OnscreenDisplayClient*> per_compositor_data_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessContextFactory);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_