OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_ | 5 #ifndef UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_ |
6 #define UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_ | 6 #define UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_ |
7 | 7 |
8 #include "ui/compositor/compositor.h" | 8 #include "ui/compositor/compositor.h" |
9 | 9 |
10 namespace base { | 10 namespace base { |
(...skipping 22 matching lines...) Expand all Loading... |
33 Compositor* mirrored_compositor, | 33 Compositor* mirrored_compositor, |
34 Layer* mirroring_layer) OVERRIDE; | 34 Layer* mirroring_layer) OVERRIDE; |
35 virtual void RemoveReflector(scoped_refptr<Reflector> reflector) OVERRIDE; | 35 virtual void RemoveReflector(scoped_refptr<Reflector> reflector) OVERRIDE; |
36 | 36 |
37 virtual scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() | 37 virtual scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() |
38 OVERRIDE; | 38 OVERRIDE; |
39 virtual void RemoveCompositor(Compositor* compositor) OVERRIDE; | 39 virtual void RemoveCompositor(Compositor* compositor) OVERRIDE; |
40 virtual bool DoesCreateTestContexts() OVERRIDE; | 40 virtual bool DoesCreateTestContexts() OVERRIDE; |
41 virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE; | 41 virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE; |
42 virtual base::MessageLoopProxy* GetCompositorMessageLoop() OVERRIDE; | 42 virtual base::MessageLoopProxy* GetCompositorMessageLoop() OVERRIDE; |
| 43 virtual scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() |
| 44 OVERRIDE; |
43 | 45 |
44 private: | 46 private: |
45 scoped_ptr<base::Thread> compositor_thread_; | 47 scoped_ptr<base::Thread> compositor_thread_; |
46 scoped_refptr<webkit::gpu::ContextProviderInProcess> | 48 scoped_refptr<webkit::gpu::ContextProviderInProcess> |
47 shared_main_thread_contexts_; | 49 shared_main_thread_contexts_; |
48 scoped_ptr<cc::SharedBitmapManager> shared_bitmap_manager_; | 50 scoped_ptr<cc::SharedBitmapManager> shared_bitmap_manager_; |
| 51 uint32_t next_surface_id_namespace_; |
49 | 52 |
50 DISALLOW_COPY_AND_ASSIGN(InProcessContextFactory); | 53 DISALLOW_COPY_AND_ASSIGN(InProcessContextFactory); |
51 }; | 54 }; |
52 | 55 |
53 } // namespace ui | 56 } // namespace ui |
54 | 57 |
55 #endif // UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_ | 58 #endif // UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_ |
OLD | NEW |