| OLD | NEW |
| 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 namespace cc { | 7 namespace cc { |
| 8 namespace frame_viewer_instrumentation { | 8 namespace frame_viewer_instrumentation { |
| 9 namespace { | 9 namespace { |
| 10 | 10 |
| 11 const char kCategory[] = "cc," TRACE_DISABLED_BY_DEFAULT("devtools.timeline"); | 11 const char kCategory[] = "cc," TRACE_DISABLED_BY_DEFAULT("devtools.timeline"); |
| 12 const char kTileData[] = "tileData"; | 12 const char kTileData[] = "tileData"; |
| 13 const char kLayerId[] = "layerId"; | 13 const char kLayerId[] = "layerId"; |
| 14 const char kTileId[] = "tileId"; | 14 const char kTileId[] = "tileId"; |
| 15 const char kTileResolution[] = "tileResolution"; | 15 const char kTileResolution[] = "tileResolution"; |
| 16 const char kSourceFrameNumber[] = "sourceFrameNumber"; | 16 const char kSourceFrameNumber[] = "sourceFrameNumber"; |
| 17 | 17 |
| 18 const char kAnalyzeTask[] = "AnalyzeTask"; | 18 const char kAnalyzeTask[] = "AnalyzeTask"; |
| 19 const char kRasterTask[] = "RasterTask"; | 19 const char kRasterTask[] = "RasterTask"; |
| 20 | 20 |
| 21 scoped_refptr<base::debug::ConvertableToTraceFormat> TileDataAsValue( | 21 scoped_refptr<base::trace_event::ConvertableToTraceFormat> TileDataAsValue( |
| 22 const void* tile_id, | 22 const void* tile_id, |
| 23 TileResolution tile_resolution, | 23 TileResolution tile_resolution, |
| 24 int source_frame_number, | 24 int source_frame_number, |
| 25 int layer_id) { | 25 int layer_id) { |
| 26 scoped_refptr<base::debug::TracedValue> res(new base::debug::TracedValue()); | 26 scoped_refptr<base::trace_event::TracedValue> res( |
| 27 new base::trace_event::TracedValue()); |
| 27 TracedValue::SetIDRef(tile_id, res.get(), kTileId); | 28 TracedValue::SetIDRef(tile_id, res.get(), kTileId); |
| 28 res->SetString(kTileResolution, TileResolutionToString(tile_resolution)); | 29 res->SetString(kTileResolution, TileResolutionToString(tile_resolution)); |
| 29 res->SetInteger(kSourceFrameNumber, source_frame_number); | 30 res->SetInteger(kSourceFrameNumber, source_frame_number); |
| 30 res->SetInteger(kLayerId, layer_id); | 31 res->SetInteger(kLayerId, layer_id); |
| 31 return res; | 32 return res; |
| 32 } | 33 } |
| 33 | 34 |
| 34 } // namespace | 35 } // namespace |
| 35 | 36 |
| 36 ScopedAnalyzeTask::ScopedAnalyzeTask(const void* tile_id, | 37 ScopedAnalyzeTask::ScopedAnalyzeTask(const void* tile_id, |
| (...skipping 17 matching lines...) Expand all Loading... |
| 54 kCategory, kRasterTask, kTileData, | 55 kCategory, kRasterTask, kTileData, |
| 55 TileDataAsValue(tile_id, tile_resolution, source_frame_number, layer_id)); | 56 TileDataAsValue(tile_id, tile_resolution, source_frame_number, layer_id)); |
| 56 } | 57 } |
| 57 | 58 |
| 58 ScopedRasterTask::~ScopedRasterTask() { | 59 ScopedRasterTask::~ScopedRasterTask() { |
| 59 TRACE_EVENT_END0(kCategory, kRasterTask); | 60 TRACE_EVENT_END0(kCategory, kRasterTask); |
| 60 } | 61 } |
| 61 | 62 |
| 62 } // namespace frame_viewer_instrumentation | 63 } // namespace frame_viewer_instrumentation |
| 63 } // namespace cc | 64 } // namespace cc |
| OLD | NEW |