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