| Index: cc/trees/layer_tree_impl.cc
|
| diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
|
| index 465c9cc1df69dafe34245a917bc45014a5835255..ce609a8468ffefa2cd111e4c4fdf4e9e88fa6079 100644
|
| --- a/cc/trees/layer_tree_impl.cc
|
| +++ b/cc/trees/layer_tree_impl.cc
|
| @@ -5,13 +5,13 @@
|
| #include "cc/trees/layer_tree_impl.h"
|
|
|
| #include "base/debug/trace_event.h"
|
| +#include "base/debug/traced_value.h"
|
| #include "cc/animation/keyframed_animation_curve.h"
|
| #include "cc/animation/scrollbar_animation_controller.h"
|
| #include "cc/animation/scrollbar_animation_controller_linear_fade.h"
|
| #include "cc/animation/scrollbar_animation_controller_thinning.h"
|
| #include "cc/base/math_util.h"
|
| #include "cc/base/util.h"
|
| -#include "cc/debug/traced_value.h"
|
| #include "cc/layers/heads_up_display_layer_impl.h"
|
| #include "cc/layers/layer.h"
|
| #include "cc/layers/layer_iterator.h"
|
| @@ -754,7 +754,7 @@ AnimationRegistrar* LayerTreeImpl::animationRegistrar() const {
|
|
|
| scoped_ptr<base::Value> LayerTreeImpl::AsValue() const {
|
| scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
|
| - TracedValue::MakeDictIntoImplicitSnapshot(
|
| + base::debug::TracedValue::MakeDictIntoImplicitSnapshot(
|
| state.get(), "cc::LayerTreeImpl", this);
|
|
|
| state->Set("root_layer", root_layer_->AsValue().release());
|
| @@ -766,7 +766,8 @@ scoped_ptr<base::Value> LayerTreeImpl::AsValue() const {
|
| &render_surface_layer_list_); it != end; ++it) {
|
| if (!it.represents_itself())
|
| continue;
|
| - render_surface_layer_list->Append(TracedValue::CreateIDRef(*it).release());
|
| + render_surface_layer_list->Append(
|
| + base::debug::TracedValue::CreateIDRef(*it).release());
|
| }
|
|
|
| state->Set("render_surface_layer_list",
|
|
|