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

Side by Side Diff: cc/debug/frame_timing_tracker.cc

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/debug/frame_timing_tracker.h ('k') | cc/debug/frame_timing_tracker_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 #include "cc/debug/frame_timing_tracker.h" 5 #include "cc/debug/frame_timing_tracker.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <limits> 10 #include <limits>
11 11
12 #include "base/memory/ptr_util.h"
12 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
13 #include "cc/trees/layer_tree_host_impl.h" 14 #include "cc/trees/layer_tree_host_impl.h"
14 #include "cc/trees/proxy.h" 15 #include "cc/trees/proxy.h"
15 16
16 namespace cc { 17 namespace cc {
17 namespace { 18 namespace {
18 int kSendTimingIntervalMS = 200; 19 int kSendTimingIntervalMS = 200;
19 } 20 }
20 21
21 FrameTimingTracker::CompositeTimingEvent::CompositeTimingEvent( 22 FrameTimingTracker::CompositeTimingEvent::CompositeTimingEvent(
22 int _frame_id, 23 int _frame_id,
23 base::TimeTicks _timestamp) 24 base::TimeTicks _timestamp)
24 : frame_id(_frame_id), timestamp(_timestamp) { 25 : frame_id(_frame_id), timestamp(_timestamp) {
25 } 26 }
26 27
27 FrameTimingTracker::CompositeTimingEvent::~CompositeTimingEvent() { 28 FrameTimingTracker::CompositeTimingEvent::~CompositeTimingEvent() {
28 } 29 }
29 30
30 FrameTimingTracker::MainFrameTimingEvent::MainFrameTimingEvent( 31 FrameTimingTracker::MainFrameTimingEvent::MainFrameTimingEvent(
31 int frame_id, 32 int frame_id,
32 base::TimeTicks timestamp, 33 base::TimeTicks timestamp,
33 base::TimeTicks end_time) 34 base::TimeTicks end_time)
34 : frame_id(frame_id), timestamp(timestamp), end_time(end_time) { 35 : frame_id(frame_id), timestamp(timestamp), end_time(end_time) {
35 } 36 }
36 37
37 FrameTimingTracker::MainFrameTimingEvent::~MainFrameTimingEvent() { 38 FrameTimingTracker::MainFrameTimingEvent::~MainFrameTimingEvent() {
38 } 39 }
39 40
40 // static 41 // static
41 scoped_ptr<FrameTimingTracker> FrameTimingTracker::Create( 42 std::unique_ptr<FrameTimingTracker> FrameTimingTracker::Create(
42 LayerTreeHostImpl* layer_tree_host_impl) { 43 LayerTreeHostImpl* layer_tree_host_impl) {
43 return make_scoped_ptr(new FrameTimingTracker(layer_tree_host_impl)); 44 return base::WrapUnique(new FrameTimingTracker(layer_tree_host_impl));
44 } 45 }
45 46
46 FrameTimingTracker::FrameTimingTracker(LayerTreeHostImpl* layer_tree_host_impl) 47 FrameTimingTracker::FrameTimingTracker(LayerTreeHostImpl* layer_tree_host_impl)
47 : layer_tree_host_impl_(layer_tree_host_impl), 48 : layer_tree_host_impl_(layer_tree_host_impl),
48 post_events_notifier_( 49 post_events_notifier_(
49 layer_tree_host_impl_->GetTaskRunner(), 50 layer_tree_host_impl_->GetTaskRunner(),
50 base::Bind(&FrameTimingTracker::PostEvents, base::Unretained(this)), 51 base::Bind(&FrameTimingTracker::PostEvents, base::Unretained(this)),
51 base::TimeDelta::FromMilliseconds(kSendTimingIntervalMS)) {} 52 base::TimeDelta::FromMilliseconds(kSendTimingIntervalMS)) {}
52 53
53 FrameTimingTracker::~FrameTimingTracker() { 54 FrameTimingTracker::~FrameTimingTracker() {
(...skipping 21 matching lines...) Expand all
75 main_frame_events_.reset(new MainFrameTimingSet); 76 main_frame_events_.reset(new MainFrameTimingSet);
76 for (const auto& request : request_ids) { 77 for (const auto& request : request_ids) {
77 std::vector<MainFrameTimingEvent>& events = (*main_frame_events_)[request]; 78 std::vector<MainFrameTimingEvent>& events = (*main_frame_events_)[request];
78 events.push_back( 79 events.push_back(
79 MainFrameTimingEvent(source_frame_number, main_frame_time, end_time)); 80 MainFrameTimingEvent(source_frame_number, main_frame_time, end_time));
80 } 81 }
81 if (!post_events_notifier_.HasPendingNotification()) 82 if (!post_events_notifier_.HasPendingNotification())
82 post_events_notifier_.Schedule(); 83 post_events_notifier_.Schedule();
83 } 84 }
84 85
85 scoped_ptr<FrameTimingTracker::CompositeTimingSet> 86 std::unique_ptr<FrameTimingTracker::CompositeTimingSet>
86 FrameTimingTracker::GroupCompositeCountsByRectId() { 87 FrameTimingTracker::GroupCompositeCountsByRectId() {
87 if (!composite_events_) 88 if (!composite_events_)
88 return make_scoped_ptr(new CompositeTimingSet); 89 return base::WrapUnique(new CompositeTimingSet);
89 for (auto& infos : *composite_events_) { 90 for (auto& infos : *composite_events_) {
90 std::sort( 91 std::sort(
91 infos.second.begin(), infos.second.end(), 92 infos.second.begin(), infos.second.end(),
92 [](const CompositeTimingEvent& lhs, const CompositeTimingEvent& rhs) { 93 [](const CompositeTimingEvent& lhs, const CompositeTimingEvent& rhs) {
93 return lhs.timestamp < rhs.timestamp; 94 return lhs.timestamp < rhs.timestamp;
94 }); 95 });
95 } 96 }
96 return std::move(composite_events_); 97 return std::move(composite_events_);
97 } 98 }
98 99
99 scoped_ptr<FrameTimingTracker::MainFrameTimingSet> 100 std::unique_ptr<FrameTimingTracker::MainFrameTimingSet>
100 FrameTimingTracker::GroupMainFrameCountsByRectId() { 101 FrameTimingTracker::GroupMainFrameCountsByRectId() {
101 if (!main_frame_events_) 102 if (!main_frame_events_)
102 return make_scoped_ptr(new MainFrameTimingSet); 103 return base::WrapUnique(new MainFrameTimingSet);
103 for (auto& infos : *main_frame_events_) { 104 for (auto& infos : *main_frame_events_) {
104 std::sort( 105 std::sort(
105 infos.second.begin(), infos.second.end(), 106 infos.second.begin(), infos.second.end(),
106 [](const MainFrameTimingEvent& lhs, const MainFrameTimingEvent& rhs) { 107 [](const MainFrameTimingEvent& lhs, const MainFrameTimingEvent& rhs) {
107 return lhs.timestamp < rhs.timestamp; 108 return lhs.timestamp < rhs.timestamp;
108 }); 109 });
109 } 110 }
110 return std::move(main_frame_events_); 111 return std::move(main_frame_events_);
111 } 112 }
112 113
113 void FrameTimingTracker::PostEvents() { 114 void FrameTimingTracker::PostEvents() {
114 layer_tree_host_impl_->PostFrameTimingEvents(GroupCompositeCountsByRectId(), 115 layer_tree_host_impl_->PostFrameTimingEvents(GroupCompositeCountsByRectId(),
115 GroupMainFrameCountsByRectId()); 116 GroupMainFrameCountsByRectId());
116 } 117 }
117 118
118 } // namespace cc 119 } // namespace cc
OLDNEW
« no previous file with comments | « cc/debug/frame_timing_tracker.h ('k') | cc/debug/frame_timing_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698