| Index: cc/resources/tile.cc
|
| diff --git a/cc/resources/tile.cc b/cc/resources/tile.cc
|
| index f976cfe3462d6a4b34a52d983f516eff2e63adde..fcc03c082afc66c97e8a7203603a9b23ad3cd73e 100644
|
| --- a/cc/resources/tile.cc
|
| +++ b/cc/resources/tile.cc
|
| @@ -6,8 +6,8 @@
|
|
|
| #include <algorithm>
|
|
|
| +#include "base/debug/traced_value.h"
|
| #include "cc/base/math_util.h"
|
| -#include "cc/debug/traced_value.h"
|
| #include "cc/resources/tile_manager.h"
|
| #include "third_party/khronos/GLES2/gl2.h"
|
|
|
| @@ -61,10 +61,11 @@ void Tile::MarkRequiredForActivation() {
|
|
|
| scoped_ptr<base::Value> Tile::AsValue() const {
|
| scoped_ptr<base::DictionaryValue> res(new base::DictionaryValue());
|
| - TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
|
| + base::debug::TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
|
| TRACE_DISABLED_BY_DEFAULT("cc.debug"), res.get(), "cc::Tile", this);
|
| - res->Set("picture_pile",
|
| - TracedValue::CreateIDRef(picture_pile_.get()).release());
|
| + res->Set(
|
| + "picture_pile",
|
| + base::debug::TracedValue::CreateIDRef(picture_pile_.get()).release());
|
| res->SetDouble("contents_scale", contents_scale_);
|
| res->Set("content_rect", MathUtil::AsValue(content_rect_).release());
|
| res->SetInteger("layer_id", layer_id_);
|
|
|