Index: cc/trees/layer_tree_host_impl.h |
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h |
index 821028fa64595c087bf1cbc21aa4e4ccb12729ff..7b3c3fdfb95105cd8e05c444a0ff5d91a22f86bf 100644 |
--- a/cc/trees/layer_tree_host_impl.h |
+++ b/cc/trees/layer_tree_host_impl.h |
@@ -165,7 +165,7 @@ |
struct CC_EXPORT FrameData : public RenderPassSink { |
FrameData(); |
virtual ~FrameData(); |
- void AsValueInto(base::debug::TracedValue* value) const; |
+ scoped_ptr<base::Value> AsValue() const; |
std::vector<gfx::Rect> occluding_screen_space_rects; |
std::vector<gfx::Rect> non_occluding_screen_space_rects; |
@@ -434,17 +434,9 @@ |
return begin_impl_frame_interval_; |
} |
- void AsValueInto(base::debug::TracedValue* value) const { |
- return AsValueWithFrameInto(NULL, value); |
- } |
- void AsValueWithFrameInto(FrameData* frame, |
- base::debug::TracedValue* value) const; |
- scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const; |
- scoped_refptr<base::debug::ConvertableToTraceFormat> AsValueWithFrame( |
- FrameData* frame) const; |
- scoped_refptr<base::debug::ConvertableToTraceFormat> ActivationStateAsValue() |
- const; |
- void ActivationStateAsValueInto(base::debug::TracedValue* value) const; |
+ scoped_ptr<base::Value> AsValue() const { return AsValueWithFrame(NULL); } |
+ scoped_ptr<base::Value> AsValueWithFrame(FrameData* frame) const; |
+ scoped_ptr<base::Value> ActivationStateAsValue() const; |
bool page_scale_animation_active() const { return !!page_scale_animation_; } |