| Index: webkit/renderer/compositor_bindings/web_layer_impl.cc
|
| diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.cc b/webkit/renderer/compositor_bindings/web_layer_impl.cc
|
| index 5ce5df308631609536015b36f80f9b0c92eaa601..7c1248032300ebd869fc48f1faf8258c92a668b6 100644
|
| --- a/webkit/renderer/compositor_bindings/web_layer_impl.cc
|
| +++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc
|
| @@ -405,7 +405,6 @@ void WebLayerImpl::setWebLayerClient(blink::WebLayerClient* client) {
|
| web_layer_client_ = client;
|
| }
|
|
|
| -// TODO(chrishtr): move DebugName into this class.
|
| class TracedDebugInfo : public base::debug::ConvertableToTraceFormat {
|
| public:
|
| // This object takes ownership of the debug_info object.
|
| @@ -428,7 +427,7 @@ scoped_refptr<base::debug::ConvertableToTraceFormat>
|
| if (!web_layer_client_)
|
| return NULL;
|
| blink::WebGraphicsLayerDebugInfo* debug_info =
|
| - web_layer_client_->takeDebugInfo();
|
| + web_layer_client_->takeDebugInfoFor(this);
|
|
|
| if (debug_info)
|
| return new TracedDebugInfo(debug_info);
|
| @@ -436,15 +435,6 @@ scoped_refptr<base::debug::ConvertableToTraceFormat>
|
| return NULL;
|
| }
|
|
|
| -std::string WebLayerImpl::DebugName() {
|
| - if (!web_layer_client_)
|
| - return std::string();
|
| -
|
| - std::string name = web_layer_client_->debugName(this).utf8();
|
| - DCHECK(IsStringASCII(name));
|
| - return name;
|
| -}
|
| -
|
| void WebLayerImpl::setScrollParent(blink::WebLayer* parent) {
|
| cc::Layer* scroll_parent = NULL;
|
| if (parent)
|
|
|