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

Side by Side Diff: cc/surfaces/display_scheduler.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase 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 | « cc/surfaces/display_client.h ('k') | cc/surfaces/display_scheduler_unittest.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 CC_SURFACES_DISPLAY_SCHEDULER_H_ 5 #ifndef CC_SURFACES_DISPLAY_SCHEDULER_H_
6 #define CC_SURFACES_DISPLAY_SCHEDULER_H_ 6 #define CC_SURFACES_DISPLAY_SCHEDULER_H_
7 7
8 #include <memory>
9
8 #include "base/cancelable_callback.h" 10 #include "base/cancelable_callback.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
13 #include "cc/scheduler/begin_frame_source.h" 14 #include "cc/scheduler/begin_frame_source.h"
14 #include "cc/surfaces/surface_id.h" 15 #include "cc/surfaces/surface_id.h"
15 #include "cc/surfaces/surfaces_export.h" 16 #include "cc/surfaces/surfaces_export.h"
16 17
17 namespace cc { 18 namespace cc {
18 19
19 class OutputSurface; 20 class OutputSurface;
20 class BeginFrameSource; 21 class BeginFrameSource;
21 22
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 DisplaySchedulerClient* client_; 64 DisplaySchedulerClient* client_;
64 BeginFrameSource* begin_frame_source_; 65 BeginFrameSource* begin_frame_source_;
65 base::SingleThreadTaskRunner* task_runner_; 66 base::SingleThreadTaskRunner* task_runner_;
66 67
67 BeginFrameArgs current_begin_frame_args_; 68 BeginFrameArgs current_begin_frame_args_;
68 base::Closure begin_frame_deadline_closure_; 69 base::Closure begin_frame_deadline_closure_;
69 base::CancelableClosure begin_frame_deadline_task_; 70 base::CancelableClosure begin_frame_deadline_task_;
70 base::TimeTicks begin_frame_deadline_task_time_; 71 base::TimeTicks begin_frame_deadline_task_time_;
71 72
72 // TODO(tansell): Set this to something useful. 73 // TODO(tansell): Set this to something useful.
73 scoped_ptr<BeginFrameSource> begin_frame_source_for_children_; 74 std::unique_ptr<BeginFrameSource> begin_frame_source_for_children_;
74 75
75 bool output_surface_lost_; 76 bool output_surface_lost_;
76 bool root_surface_resources_locked_; 77 bool root_surface_resources_locked_;
77 78
78 bool inside_begin_frame_deadline_interval_; 79 bool inside_begin_frame_deadline_interval_;
79 bool needs_draw_; 80 bool needs_draw_;
80 bool expecting_root_surface_damage_because_of_resize_; 81 bool expecting_root_surface_damage_because_of_resize_;
81 bool all_active_child_surfaces_ready_to_draw_; 82 bool all_active_child_surfaces_ready_to_draw_;
82 83
83 int pending_swaps_; 84 int pending_swaps_;
(...skipping 11 matching lines...) Expand all
95 96
96 base::WeakPtrFactory<DisplayScheduler> weak_ptr_factory_; 97 base::WeakPtrFactory<DisplayScheduler> weak_ptr_factory_;
97 98
98 private: 99 private:
99 DISALLOW_COPY_AND_ASSIGN(DisplayScheduler); 100 DISALLOW_COPY_AND_ASSIGN(DisplayScheduler);
100 }; 101 };
101 102
102 } // namespace cc 103 } // namespace cc
103 104
104 #endif // CC_SURFACES_DISPLAY_SCHEDULER_H_ 105 #endif // CC_SURFACES_DISPLAY_SCHEDULER_H_
OLDNEW
« no previous file with comments | « cc/surfaces/display_client.h ('k') | cc/surfaces/display_scheduler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698