| Index: cc/resources/tile_manager.cc
|
| diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
|
| index d8fb17d5b5c3d1e93c893b1903b6f89aba9066ae..0359720807008bdcd8d782797e737bd0a67ca3d7 100644
|
| --- a/cc/resources/tile_manager.cc
|
| +++ b/cc/resources/tile_manager.cc
|
| @@ -9,12 +9,12 @@
|
| #include <string>
|
|
|
| #include "base/bind.h"
|
| +#include "base/debug/traced_value.h"
|
| #include "base/json/json_writer.h"
|
| #include "base/logging.h"
|
| #include "base/metrics/histogram.h"
|
| #include "cc/debug/devtools_instrumentation.h"
|
| #include "cc/debug/frame_viewer_instrumentation.h"
|
| -#include "cc/debug/traced_value.h"
|
| #include "cc/layers/picture_layer_impl.h"
|
| #include "cc/resources/raster_worker_pool.h"
|
| #include "cc/resources/rasterizer_delegate.h"
|
| @@ -710,11 +710,12 @@ void TileManager::ManageTiles(const GlobalStateThatImpactsTilePriority& state) {
|
| // Finally, schedule rasterizer tasks.
|
| ScheduleTasks(tiles_that_need_to_be_rasterized);
|
|
|
| - TRACE_EVENT_INSTANT1("cc",
|
| - "DidManage",
|
| - TRACE_EVENT_SCOPE_THREAD,
|
| - "state",
|
| - TracedValue::FromValue(BasicStateAsValue().release()));
|
| + TRACE_EVENT_INSTANT1(
|
| + "cc",
|
| + "DidManage",
|
| + TRACE_EVENT_SCOPE_THREAD,
|
| + "state",
|
| + base::debug::TracedValue::FromValue(BasicStateAsValue().release()));
|
|
|
| TRACE_COUNTER_ID1("cc",
|
| "unused_memory_bytes",
|
| @@ -729,13 +730,13 @@ bool TileManager::UpdateVisibleTiles() {
|
| rasterizer_delegate_->CheckForCompletedTasks();
|
| did_check_for_completed_tasks_since_last_schedule_tasks_ = true;
|
|
|
| - TRACE_EVENT_INSTANT1(
|
| - "cc",
|
| - "DidUpdateVisibleTiles",
|
| - TRACE_EVENT_SCOPE_THREAD,
|
| - "stats",
|
| - TracedValue::FromValue(RasterTaskCompletionStatsAsValue(
|
| - update_visible_tiles_stats_).release()));
|
| + TRACE_EVENT_INSTANT1("cc",
|
| + "DidUpdateVisibleTiles",
|
| + TRACE_EVENT_SCOPE_THREAD,
|
| + "stats",
|
| + base::debug::TracedValue::FromValue(
|
| + RasterTaskCompletionStatsAsValue(
|
| + update_visible_tiles_stats_).release()));
|
| update_visible_tiles_stats_ = RasterTaskCompletionStats();
|
|
|
| bool did_initialize_visible_tile = did_initialize_visible_tile_;
|
|
|