Plumb debug name via debug info

webkit/renderer/compositor_bindings/web_layer_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event_impl.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
@@ skipping 387 matching lines @@
     layer_->set_did_scroll_callback(base::Closure());
   }
 }
 
 bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); }
 
 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.
   explicit TracedDebugInfo(blink::WebGraphicsLayerDebugInfo* debug_info) :
     debug_info_(debug_info) {}
   virtual void AppendAsTraceFormat(std::string* out) const OVERRIDE {
     DCHECK(thread_checker_.CalledOnValidThread());
     blink::WebString web_string;
     debug_info_->appendAsTraceFormat(&web_string);
     out->append(web_string.utf8());
   }
  private:
   virtual ~TracedDebugInfo() {}
   scoped_ptr<blink::WebGraphicsLayerDebugInfo> debug_info_;
   base::ThreadChecker thread_checker_;
 };
 
 scoped_refptr<base::debug::ConvertableToTraceFormat>
     WebLayerImpl::TakeDebugInfo() {
   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);
   else
     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)
     scroll_parent = static_cast<WebLayerImpl*>(parent)->layer();
   layer_->SetScrollParent(scroll_parent);
 }
 
 void WebLayerImpl::setClipParent(blink::WebLayer* parent) {
   cc::Layer* clip_parent = NULL;
   if (parent)
     clip_parent = static_cast<WebLayerImpl*>(parent)->layer();
   layer_->SetClipParent(clip_parent);
 }
 
 Layer* WebLayerImpl::layer() const { return layer_.get(); }
 
 }  // namespace webkit