| Index: cc/resources/picture_layer_tiling.cc
|
| diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc
|
| index 2809d70be41ea05b59040ba0aabf3f3334123adf..64661c1a6981eb87541742fd56e69ae43b691ffc 100644
|
| --- a/cc/resources/picture_layer_tiling.cc
|
| +++ b/cc/resources/picture_layer_tiling.cc
|
| @@ -9,7 +9,6 @@
|
| #include <limits>
|
|
|
| #include "base/debug/trace_event.h"
|
| -#include "base/debug/trace_event_argument.h"
|
| #include "cc/base/math_util.h"
|
| #include "cc/resources/tile.h"
|
| #include "cc/resources/tile_priority.h"
|
| @@ -659,12 +658,12 @@
|
| }
|
| }
|
|
|
| -void PictureLayerTiling::AsValueInto(base::debug::TracedValue* state) const {
|
| +scoped_ptr<base::Value> PictureLayerTiling::AsValue() const {
|
| + scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
|
| state->SetInteger("num_tiles", tiles_.size());
|
| state->SetDouble("content_scale", contents_scale_);
|
| - state->BeginDictionary("tiling_size");
|
| - MathUtil::AddToTracedValue(tiling_size(), state);
|
| - state->EndDictionary();
|
| + state->Set("tiling_size", MathUtil::AsValue(tiling_size()).release());
|
| + return state.PassAs<base::Value>();
|
| }
|
|
|
| size_t PictureLayerTiling::GPUMemoryUsageInBytes() const {
|
|
|