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

Side by Side Diff: ui/ozone/demo/software_renderer.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/ozone/demo/ozone_demo.cc ('k') | ui/ozone/demo/surfaceless_gl_renderer.h » ('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 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_OZONE_DEMO_SOFTWARE_RENDERER_H_ 5 #ifndef UI_OZONE_DEMO_SOFTWARE_RENDERER_H_
6 #define UI_OZONE_DEMO_SOFTWARE_RENDERER_H_ 6 #define UI_OZONE_DEMO_SOFTWARE_RENDERER_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
11 #include "base/timer/timer.h" 12 #include "base/timer/timer.h"
12 #include "ui/ozone/demo/renderer_base.h" 13 #include "ui/ozone/demo/renderer_base.h"
13 14
14 namespace gfx { 15 namespace gfx {
15 class VSyncProvider; 16 class VSyncProvider;
16 } // namespace gfx 17 } // namespace gfx
17 18
18 namespace ui { 19 namespace ui {
19 20
20 class SurfaceOzoneCanvas; 21 class SurfaceOzoneCanvas;
21 22
22 class SoftwareRenderer : public RendererBase { 23 class SoftwareRenderer : public RendererBase {
23 public: 24 public:
24 SoftwareRenderer(gfx::AcceleratedWidget widget, const gfx::Size& size); 25 SoftwareRenderer(gfx::AcceleratedWidget widget, const gfx::Size& size);
25 ~SoftwareRenderer() override; 26 ~SoftwareRenderer() override;
26 27
27 // Renderer: 28 // Renderer:
28 bool Initialize() override; 29 bool Initialize() override;
29 30
30 private: 31 private:
31 void RenderFrame(); 32 void RenderFrame();
32 33
33 void UpdateVSyncParameters(const base::TimeTicks timebase, 34 void UpdateVSyncParameters(const base::TimeTicks timebase,
34 const base::TimeDelta interval); 35 const base::TimeDelta interval);
35 36
36 scoped_ptr<SurfaceOzoneCanvas> software_surface_; 37 std::unique_ptr<SurfaceOzoneCanvas> software_surface_;
37 38
38 scoped_ptr<gfx::VSyncProvider> vsync_provider_; 39 std::unique_ptr<gfx::VSyncProvider> vsync_provider_;
39 40
40 // Timer for animation. 41 // Timer for animation.
41 base::RepeatingTimer timer_; 42 base::RepeatingTimer timer_;
42 43
43 base::TimeDelta vsync_period_; 44 base::TimeDelta vsync_period_;
44 45
45 base::WeakPtrFactory<SoftwareRenderer> weak_ptr_factory_; 46 base::WeakPtrFactory<SoftwareRenderer> weak_ptr_factory_;
46 47
47 DISALLOW_COPY_AND_ASSIGN(SoftwareRenderer); 48 DISALLOW_COPY_AND_ASSIGN(SoftwareRenderer);
48 }; 49 };
49 50
50 } // namespace ui 51 } // namespace ui
51 52
52 #endif // UI_OZONE_DEMO_SOFTWARE_RENDERER_H_ 53 #endif // UI_OZONE_DEMO_SOFTWARE_RENDERER_H_
OLDNEW
« no previous file with comments | « ui/ozone/demo/ozone_demo.cc ('k') | ui/ozone/demo/surfaceless_gl_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698