| Index: cc/blink/web_layer_impl.h
|
| diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h
|
| index 3a8130e30b4b068fa45108b7cbf1bdc3aa123bf2..5f40a238be38af292889d3178af048f9168c8ab8 100644
|
| --- a/cc/blink/web_layer_impl.h
|
| +++ b/cc/blink/web_layer_impl.h
|
| @@ -29,18 +29,13 @@ class WebLayerClient;
|
| struct WebFloatRect;
|
| }
|
|
|
| -namespace base {
|
| -namespace debug {
|
| -class ConvertableToTraceFormat;
|
| -}
|
| -}
|
| -
|
| namespace cc {
|
| class Layer;
|
| }
|
|
|
| namespace cc_blink {
|
|
|
| +class TracedDebugInfo;
|
| class WebToCCAnimationDelegateAdapter;
|
|
|
| class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
|
| @@ -131,8 +126,7 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
|
| virtual void setWebLayerClient(blink::WebLayerClient* client);
|
|
|
| // LayerClient implementation.
|
| - virtual scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo()
|
| - OVERRIDE;
|
| + virtual scoped_refptr<cc::LayerDebugInfo> TakeDebugInfo() OVERRIDE;
|
|
|
| virtual void setScrollParent(blink::WebLayer* parent);
|
| virtual void setClipParent(blink::WebLayer* parent);
|
|
|