Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_ | 5 #ifndef MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_ |
| 6 #define MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_ | 6 #define MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_ |
| 7 | 7 |
| 8 #include "mandoline/ui/aura/surface_binding.h" | 8 #include "mandoline/ui/aura/surface_binding.h" |
| 9 #include "ui/compositor/compositor.h" | 9 #include "ui/compositor/compositor.h" |
| 10 | 10 |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 23 private: | 23 private: |
| 24 // ContextFactory: | 24 // ContextFactory: |
| 25 void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor) override; | 25 void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor) override; |
| 26 scoped_ptr<ui::Reflector> CreateReflector( | 26 scoped_ptr<ui::Reflector> CreateReflector( |
| 27 ui::Compositor* mirrored_compositor, | 27 ui::Compositor* mirrored_compositor, |
| 28 ui::Layer* mirroring_layer) override; | 28 ui::Layer* mirroring_layer) override; |
| 29 void RemoveReflector(ui::Reflector* reflector) override; | 29 void RemoveReflector(ui::Reflector* reflector) override; |
| 30 scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override; | 30 scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override; |
| 31 void RemoveCompositor(ui::Compositor* compositor) override; | 31 void RemoveCompositor(ui::Compositor* compositor) override; |
| 32 bool DoesCreateTestContexts() override; | 32 bool DoesCreateTestContexts() override; |
| 33 uint32 GetImageTextureTarget() override; | 33 uint32 GetMapImageTextureTarget() override; |
| 34 uint32 GetPersistentMapImageTextureTarget() override; | |
|
reveman
2015/05/20 19:25:59
I assume this is a leftover from previous patch an
danakj
2015/05/20 20:50:43
Oops ya
| |
| 34 cc::SharedBitmapManager* GetSharedBitmapManager() override; | 35 cc::SharedBitmapManager* GetSharedBitmapManager() override; |
| 35 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; | 36 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; |
| 36 cc::TaskGraphRunner* GetTaskGraphRunner() override; | 37 cc::TaskGraphRunner* GetTaskGraphRunner() override; |
| 37 scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override; | 38 scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override; |
| 38 void ResizeDisplay(ui::Compositor* compositor, | 39 void ResizeDisplay(ui::Compositor* compositor, |
| 39 const gfx::Size& size) override; | 40 const gfx::Size& size) override; |
| 40 | 41 |
| 41 SurfaceBinding surface_binding_; | 42 SurfaceBinding surface_binding_; |
| 42 uint32_t next_surface_id_namespace_; | 43 uint32_t next_surface_id_namespace_; |
| 43 | 44 |
| 44 DISALLOW_COPY_AND_ASSIGN(SurfaceContextFactory); | 45 DISALLOW_COPY_AND_ASSIGN(SurfaceContextFactory); |
| 45 }; | 46 }; |
| 46 | 47 |
| 47 } // namespace mandoline | 48 } // namespace mandoline |
| 48 | 49 |
| 49 #endif // MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_ | 50 #endif // MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_ |
| OLD | NEW |