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

Side by Side Diff: cc/debug/devtools_instrumentation.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/debug/debug_rect_history.cc ('k') | cc/debug/frame_rate_counter.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_DEBUG_DEVTOOLS_INSTRUMENTATION_H_ 5 #ifndef CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_
6 #define CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_ 6 #define CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/trace_event/trace_event.h" 13 #include "base/trace_event/trace_event.h"
13 #include "base/trace_event/trace_event_argument.h" 14 #include "base/trace_event/trace_event_argument.h"
14 15
15 namespace cc { 16 namespace cc {
16 namespace devtools_instrumentation { 17 namespace devtools_instrumentation {
17 18
18 namespace internal { 19 namespace internal {
19 const char kCategory[] = TRACE_DISABLED_BY_DEFAULT("devtools.timeline"); 20 const char kCategory[] = TRACE_DISABLED_BY_DEFAULT("devtools.timeline");
20 const char kCategoryFrame[] = 21 const char kCategoryFrame[] =
21 TRACE_DISABLED_BY_DEFAULT("devtools.timeline.frame"); 22 TRACE_DISABLED_BY_DEFAULT("devtools.timeline.frame");
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 } 142 }
142 143
143 inline void DidRequestMainThreadFrame(int layer_tree_host_id) { 144 inline void DidRequestMainThreadFrame(int layer_tree_host_id) {
144 TRACE_EVENT_INSTANT1(internal::kCategoryFrame, 145 TRACE_EVENT_INSTANT1(internal::kCategoryFrame,
145 internal::kRequestMainThreadFrame, 146 internal::kRequestMainThreadFrame,
146 TRACE_EVENT_SCOPE_THREAD, 147 TRACE_EVENT_SCOPE_THREAD,
147 internal::kLayerTreeId, 148 internal::kLayerTreeId,
148 layer_tree_host_id); 149 layer_tree_host_id);
149 } 150 }
150 151
151 inline scoped_ptr<base::trace_event::ConvertableToTraceFormat> 152 inline std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
152 BeginMainThreadFrameData(int frame_id) { 153 BeginMainThreadFrameData(int frame_id) {
153 scoped_ptr<base::trace_event::TracedValue> value( 154 std::unique_ptr<base::trace_event::TracedValue> value(
154 new base::trace_event::TracedValue()); 155 new base::trace_event::TracedValue());
155 value->SetInteger("frameId", frame_id); 156 value->SetInteger("frameId", frame_id);
156 return std::move(value); 157 return std::move(value);
157 } 158 }
158 159
159 inline void WillBeginMainThreadFrame(int layer_tree_host_id, int frame_id) { 160 inline void WillBeginMainThreadFrame(int layer_tree_host_id, int frame_id) {
160 TRACE_EVENT_INSTANT2( 161 TRACE_EVENT_INSTANT2(
161 internal::kCategoryFrame, internal::kBeginMainThreadFrame, 162 internal::kCategoryFrame, internal::kBeginMainThreadFrame,
162 TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id, 163 TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id,
163 internal::kData, BeginMainThreadFrameData(frame_id)); 164 internal::kData, BeginMainThreadFrameData(frame_id));
164 } 165 }
165 166
166 inline scoped_ptr<base::trace_event::ConvertableToTraceFormat> 167 inline std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
167 NeedsBeginFrameData(bool needs_begin_frame) { 168 NeedsBeginFrameData(bool needs_begin_frame) {
168 scoped_ptr<base::trace_event::TracedValue> value( 169 std::unique_ptr<base::trace_event::TracedValue> value(
169 new base::trace_event::TracedValue()); 170 new base::trace_event::TracedValue());
170 value->SetInteger("needsBeginFrame", needs_begin_frame); 171 value->SetInteger("needsBeginFrame", needs_begin_frame);
171 return std::move(value); 172 return std::move(value);
172 } 173 }
173 174
174 inline void NeedsBeginFrameChanged(int layer_tree_host_id, bool new_value) { 175 inline void NeedsBeginFrameChanged(int layer_tree_host_id, bool new_value) {
175 TRACE_EVENT_INSTANT2( 176 TRACE_EVENT_INSTANT2(
176 internal::kCategoryFrame, internal::kNeedsBeginFrameChanged, 177 internal::kCategoryFrame, internal::kNeedsBeginFrameChanged,
177 TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id, 178 TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id,
178 internal::kData, NeedsBeginFrameData(new_value)); 179 internal::kData, NeedsBeginFrameData(new_value));
179 } 180 }
180 181
181 } // namespace devtools_instrumentation 182 } // namespace devtools_instrumentation
182 } // namespace cc 183 } // namespace cc
183 184
184 #endif // CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_ 185 #endif // CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_
OLDNEW
« no previous file with comments | « cc/debug/debug_rect_history.cc ('k') | cc/debug/frame_rate_counter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698