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 MOJO_AURA_CONTEXT_FACTORY_MOJO_H_ | 5 #ifndef MOJO_AURA_CONTEXT_FACTORY_MOJO_H_ |
6 #define MOJO_AURA_CONTEXT_FACTORY_MOJO_H_ | 6 #define MOJO_AURA_CONTEXT_FACTORY_MOJO_H_ |
7 | 7 |
8 #include "ui/compositor/compositor.h" | 8 #include "ui/compositor/compositor.h" |
9 | 9 |
10 namespace mojo { | 10 namespace mojo { |
(...skipping 11 matching lines...) Expand all Loading... |
22 virtual scoped_refptr<ui::Reflector> CreateReflector( | 22 virtual scoped_refptr<ui::Reflector> CreateReflector( |
23 ui::Compositor* mirrored_compositor, | 23 ui::Compositor* mirrored_compositor, |
24 ui::Layer* mirroring_layer) OVERRIDE; | 24 ui::Layer* mirroring_layer) OVERRIDE; |
25 virtual void RemoveReflector(scoped_refptr<ui::Reflector> reflector) OVERRIDE; | 25 virtual void RemoveReflector(scoped_refptr<ui::Reflector> reflector) OVERRIDE; |
26 virtual scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() | 26 virtual scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() |
27 OVERRIDE; | 27 OVERRIDE; |
28 virtual void RemoveCompositor(ui::Compositor* compositor) OVERRIDE; | 28 virtual void RemoveCompositor(ui::Compositor* compositor) OVERRIDE; |
29 virtual bool DoesCreateTestContexts() OVERRIDE; | 29 virtual bool DoesCreateTestContexts() OVERRIDE; |
30 virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE; | 30 virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE; |
31 virtual base::MessageLoopProxy* GetCompositorMessageLoop() OVERRIDE; | 31 virtual base::MessageLoopProxy* GetCompositorMessageLoop() OVERRIDE; |
| 32 virtual scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() |
| 33 OVERRIDE; |
32 | 34 |
33 scoped_ptr<cc::SharedBitmapManager> shared_bitmap_manager_; | 35 scoped_ptr<cc::SharedBitmapManager> shared_bitmap_manager_; |
| 36 uint32_t next_surface_id_namespace_; |
34 | 37 |
35 DISALLOW_COPY_AND_ASSIGN(ContextFactoryMojo); | 38 DISALLOW_COPY_AND_ASSIGN(ContextFactoryMojo); |
36 }; | 39 }; |
37 | 40 |
38 } // namespace mojo | 41 } // namespace mojo |
39 | 42 |
40 #endif // MOJO_AURA_CONTEXT_FACTORY_MOJO_H_ | 43 #endif // MOJO_AURA_CONTEXT_FACTORY_MOJO_H_ |
OLD | NEW |