Index: cc/trees/layer_tree_host_impl.cc |
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc |
index 9797c974b27798cd7a65185f67220914cb8220ad..d8945aeb11234d1c7e404a422d2da288122e40ba 100644 |
--- a/cc/trees/layer_tree_host_impl.cc |
+++ b/cc/trees/layer_tree_host_impl.cc |
@@ -9,6 +9,7 @@ |
#include "base/basictypes.h" |
#include "base/containers/hash_tables.h" |
+#include "base/debug/traced_value.h" |
#include "base/json/json_writer.h" |
#include "base/metrics/histogram.h" |
#include "base/stl_util.h" |
@@ -24,7 +25,6 @@ |
#include "cc/debug/frame_rate_counter.h" |
#include "cc/debug/paint_time_counter.h" |
#include "cc/debug/rendering_stats_instrumentation.h" |
-#include "cc/debug/traced_value.h" |
#include "cc/input/page_scale_animation.h" |
#include "cc/input/top_controls_manager.h" |
#include "cc/layers/append_quads_data.h" |
@@ -1451,9 +1451,11 @@ void LayerTreeHostImpl::DrawLayers(FrameData* frame, |
} |
TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID( |
- TRACE_DISABLED_BY_DEFAULT("cc.debug") "," |
- TRACE_DISABLED_BY_DEFAULT("cc.debug.quads"), "cc::LayerTreeHostImpl", |
- this, TracedValue::FromValue(AsValueWithFrame(frame).release())); |
+ TRACE_DISABLED_BY_DEFAULT("cc.debug") "," TRACE_DISABLED_BY_DEFAULT( |
+ "cc.debug.quads"), |
+ "cc::LayerTreeHostImpl", |
+ this, |
+ base::debug::TracedValue::FromValue(AsValueWithFrame(frame).release())); |
// Because the contents of the HUD depend on everything else in the frame, the |
// contents of its texture are updated as the last thing before the frame is |
@@ -3016,7 +3018,7 @@ scoped_ptr<base::Value> LayerTreeHostImpl::AsValueWithFrame( |
scoped_ptr<base::Value> LayerTreeHostImpl::ActivationStateAsValue() const { |
scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); |
- state->Set("lthi", TracedValue::CreateIDRef(this).release()); |
+ state->Set("lthi", base::debug::TracedValue::CreateIDRef(this).release()); |
if (tile_manager_) |
state->Set("tile_manager", tile_manager_->BasicStateAsValue().release()); |
return state.PassAs<base::Value>(); |