| Index: cc/resources/tile_manager.h
|
| diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
|
| index d4c549c3f542fb429d30a60af0b0811593f1e5d4..686d0d06aae9d1513915100210c1de18bb91fd1c 100644
|
| --- a/cc/resources/tile_manager.h
|
| +++ b/cc/resources/tile_manager.h
|
| @@ -27,13 +27,6 @@
|
| #include "cc/resources/resource_pool.h"
|
| #include "cc/resources/tile.h"
|
|
|
| -namespace base {
|
| -namespace debug {
|
| -class ConvertableToTraceFormat;
|
| -class TracedValue;
|
| -}
|
| -}
|
| -
|
| namespace cc {
|
| class PictureLayerImpl;
|
| class ResourceProvider;
|
| @@ -77,8 +70,8 @@
|
| size_t completed_count;
|
| size_t canceled_count;
|
| };
|
| -scoped_refptr<base::debug::ConvertableToTraceFormat>
|
| - RasterTaskCompletionStatsAsValue(const RasterTaskCompletionStats& stats);
|
| +scoped_ptr<base::Value> RasterTaskCompletionStatsAsValue(
|
| + const RasterTaskCompletionStats& stats);
|
|
|
| // This class manages tiles, deciding which should get rasterized and which
|
| // should no longer have any memory assigned to them. Tile objects are "owned"
|
| @@ -109,10 +102,8 @@
|
| int source_frame_number,
|
| int flags);
|
|
|
| - scoped_refptr<base::debug::ConvertableToTraceFormat> BasicStateAsValue()
|
| - const;
|
| - void BasicStateAsValueInto(base::debug::TracedValue* dict) const;
|
| - void AllTilesAsValueInto(base::debug::TracedValue* array) const;
|
| + scoped_ptr<base::Value> BasicStateAsValue() const;
|
| + scoped_ptr<base::Value> AllTilesAsValue() const;
|
| const MemoryHistory::Entry& memory_stats_from_last_assign() const {
|
| return memory_stats_from_last_assign_;
|
| }
|
|
|