| Index: cc/layers/layer_impl.h
|
| diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
|
| index b5f2ee25183d93fee72f2c4b3e77dbaf73c61df4..1b7519a72b1bd8f9e0493cd0cb5ef37726083cc2 100644
|
| --- a/cc/layers/layer_impl.h
|
| +++ b/cc/layers/layer_impl.h
|
| @@ -47,7 +47,6 @@
|
|
|
| namespace base {
|
| namespace trace_event {
|
| -class ConvertableToTraceFormat;
|
| class TracedValue;
|
| }
|
| class DictionaryValue;
|
| @@ -55,6 +54,7 @@ class DictionaryValue;
|
|
|
| namespace cc {
|
|
|
| +class LayerDebugInfo;
|
| class LayerTreeHostImpl;
|
| class LayerTreeImpl;
|
| class MicroBenchmarkImpl;
|
| @@ -619,8 +619,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
|
|
| virtual void RunMicroBenchmark(MicroBenchmarkImpl* benchmark);
|
|
|
| - virtual void SetDebugInfo(
|
| - scoped_refptr<base::trace_event::ConvertableToTraceFormat> other);
|
| + void SetDebugInfo(scoped_refptr<LayerDebugInfo> debug_info);
|
|
|
| bool IsDrawnRenderSurfaceLayerListMember() const;
|
|
|
| @@ -861,7 +860,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| DrawProperties draw_properties_;
|
| PerformanceProperties<LayerImpl> performance_properties_;
|
|
|
| - scoped_refptr<base::trace_event::ConvertableToTraceFormat> debug_info_;
|
| + scoped_refptr<LayerDebugInfo> debug_info_;
|
| scoped_ptr<RenderSurfaceImpl> render_surface_;
|
|
|
| bool force_render_surface_;
|
|
|