Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1069)

Side by Side Diff: ui/views/mus/surface_context_factory.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/views/mus/surface_binding.cc ('k') | ui/views/mus/surface_context_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_ 5 #ifndef UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_
6 #define UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_ 6 #define UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 17 matching lines...) Expand all
28 class VIEWS_MUS_EXPORT SurfaceContextFactory : public ui::ContextFactory { 28 class VIEWS_MUS_EXPORT SurfaceContextFactory : public ui::ContextFactory {
29 public: 29 public:
30 SurfaceContextFactory(mojo::Connector* connector, 30 SurfaceContextFactory(mojo::Connector* connector,
31 mus::Window* window, 31 mus::Window* window,
32 mus::mojom::SurfaceType surface_type); 32 mus::mojom::SurfaceType surface_type);
33 ~SurfaceContextFactory() override; 33 ~SurfaceContextFactory() override;
34 34
35 private: 35 private:
36 // ContextFactory: 36 // ContextFactory:
37 void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor) override; 37 void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor) override;
38 scoped_ptr<ui::Reflector> CreateReflector( 38 std::unique_ptr<ui::Reflector> CreateReflector(
39 ui::Compositor* mirrored_compositor, 39 ui::Compositor* mirrored_compositor,
40 ui::Layer* mirroring_layer) override; 40 ui::Layer* mirroring_layer) override;
41 void RemoveReflector(ui::Reflector* reflector) override; 41 void RemoveReflector(ui::Reflector* reflector) override;
42 scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override; 42 scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
43 void RemoveCompositor(ui::Compositor* compositor) override; 43 void RemoveCompositor(ui::Compositor* compositor) override;
44 bool DoesCreateTestContexts() override; 44 bool DoesCreateTestContexts() override;
45 uint32_t GetImageTextureTarget(gfx::BufferFormat format, 45 uint32_t GetImageTextureTarget(gfx::BufferFormat format,
46 gfx::BufferUsage usage) override; 46 gfx::BufferUsage usage) override;
47 cc::SharedBitmapManager* GetSharedBitmapManager() override; 47 cc::SharedBitmapManager* GetSharedBitmapManager() override;
48 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; 48 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
49 cc::TaskGraphRunner* GetTaskGraphRunner() override; 49 cc::TaskGraphRunner* GetTaskGraphRunner() override;
50 scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override; 50 std::unique_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override;
51 void ResizeDisplay(ui::Compositor* compositor, 51 void ResizeDisplay(ui::Compositor* compositor,
52 const gfx::Size& size) override; 52 const gfx::Size& size) override;
53 53
54 SurfaceBinding surface_binding_; 54 SurfaceBinding surface_binding_;
55 uint32_t next_surface_id_namespace_; 55 uint32_t next_surface_id_namespace_;
56 gles2::RasterThreadHelper raster_thread_helper_; 56 gles2::RasterThreadHelper raster_thread_helper_;
57 mus::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_; 57 mus::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(SurfaceContextFactory); 59 DISALLOW_COPY_AND_ASSIGN(SurfaceContextFactory);
60 }; 60 };
61 61
62 } // namespace views 62 } // namespace views
63 63
64 #endif // UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_ 64 #endif // UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_
OLDNEW
« no previous file with comments | « ui/views/mus/surface_binding.cc ('k') | ui/views/mus/surface_context_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698