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

Side by Side Diff: cc/debug/frame_viewer_instrumentation.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_unittest.cc ('k') | cc/debug/invalidation_benchmark.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 #include "cc/debug/frame_viewer_instrumentation.h" 5 #include "cc/debug/frame_viewer_instrumentation.h"
6 6
7 #include "cc/debug/traced_value.h" 7 #include "cc/debug/traced_value.h"
8 8
9 namespace cc { 9 namespace cc {
10 namespace frame_viewer_instrumentation { 10 namespace frame_viewer_instrumentation {
11 11
12 const char kCategoryLayerTree[] = 12 const char kCategoryLayerTree[] =
13 TRACE_DISABLED_BY_DEFAULT("cc.debug") "," 13 TRACE_DISABLED_BY_DEFAULT("cc.debug") ","
14 TRACE_DISABLED_BY_DEFAULT("cc.debug.quads") "," 14 TRACE_DISABLED_BY_DEFAULT("cc.debug.quads") ","
15 TRACE_DISABLED_BY_DEFAULT("devtools.timeline.layers"); 15 TRACE_DISABLED_BY_DEFAULT("devtools.timeline.layers");
16 16
17 namespace { 17 namespace {
18 18
19 const char kCategory[] = "cc," TRACE_DISABLED_BY_DEFAULT("devtools.timeline"); 19 const char kCategory[] = "cc," TRACE_DISABLED_BY_DEFAULT("devtools.timeline");
20 const char kTileData[] = "tileData"; 20 const char kTileData[] = "tileData";
21 const char kLayerId[] = "layerId"; 21 const char kLayerId[] = "layerId";
22 const char kTileId[] = "tileId"; 22 const char kTileId[] = "tileId";
23 const char kTileResolution[] = "tileResolution"; 23 const char kTileResolution[] = "tileResolution";
24 const char kSourceFrameNumber[] = "sourceFrameNumber"; 24 const char kSourceFrameNumber[] = "sourceFrameNumber";
25 25
26 const char kAnalyzeTask[] = "AnalyzeTask"; 26 const char kAnalyzeTask[] = "AnalyzeTask";
27 const char kRasterTask[] = "RasterTask"; 27 const char kRasterTask[] = "RasterTask";
28 28
29 scoped_ptr<base::trace_event::ConvertableToTraceFormat> TileDataAsValue( 29 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> TileDataAsValue(
30 const void* tile_id, 30 const void* tile_id,
31 TileResolution tile_resolution, 31 TileResolution tile_resolution,
32 int source_frame_number, 32 int source_frame_number,
33 int layer_id) { 33 int layer_id) {
34 scoped_ptr<base::trace_event::TracedValue> res( 34 std::unique_ptr<base::trace_event::TracedValue> res(
35 new base::trace_event::TracedValue()); 35 new base::trace_event::TracedValue());
36 TracedValue::SetIDRef(tile_id, res.get(), kTileId); 36 TracedValue::SetIDRef(tile_id, res.get(), kTileId);
37 res->SetString(kTileResolution, TileResolutionToString(tile_resolution)); 37 res->SetString(kTileResolution, TileResolutionToString(tile_resolution));
38 res->SetInteger(kSourceFrameNumber, source_frame_number); 38 res->SetInteger(kSourceFrameNumber, source_frame_number);
39 res->SetInteger(kLayerId, layer_id); 39 res->SetInteger(kLayerId, layer_id);
40 return std::move(res); 40 return std::move(res);
41 } 41 }
42 42
43 } // namespace 43 } // namespace
44 44
(...skipping 24 matching lines...) Expand all
69 } 69 }
70 70
71 bool IsTracingLayerTreeSnapshots() { 71 bool IsTracingLayerTreeSnapshots() {
72 bool category_enabled; 72 bool category_enabled;
73 TRACE_EVENT_CATEGORY_GROUP_ENABLED(kCategoryLayerTree, &category_enabled); 73 TRACE_EVENT_CATEGORY_GROUP_ENABLED(kCategoryLayerTree, &category_enabled);
74 return category_enabled; 74 return category_enabled;
75 } 75 }
76 76
77 } // namespace frame_viewer_instrumentation 77 } // namespace frame_viewer_instrumentation
78 } // namespace cc 78 } // namespace cc
OLDNEW
« no previous file with comments | « cc/debug/frame_timing_tracker_unittest.cc ('k') | cc/debug/invalidation_benchmark.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698