Add layer name into frame viewer

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/strings/string_util.h"
 #include "cc/animation/animation.h"
 #include "cc/base/region.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_position_constraint.h"
 #include "third_party/WebKit/public/platform/WebCompositingReasons.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
+#include "third_party/WebKit/public/platform/WebLayerClient.h"
 #include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h"
 #include "third_party/WebKit/public/platform/WebLayerScrollClient.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
 #include "webkit/renderer/compositor_bindings/web_animation_impl.h"
 #include "webkit/renderer/compositor_bindings/web_filter_operations_impl.h"
 #include "webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.h"
 
 using cc::Animation;
 using cc::Layer;
 using WebKit::WebLayer;
 using WebKit::WebFloatPoint;
 using WebKit::WebVector;
 using WebKit::WebRect;
 using WebKit::WebSize;
 using WebKit::WebColor;
 using WebKit::WebFilterOperations;
 
 namespace webkit {
 
-WebLayerImpl::WebLayerImpl() : layer_(Layer::Create()) {}
+WebLayerImpl::WebLayerImpl() : layer_(Layer::Create()) {
+  web_layer_client_ = NULL;
+  layer_->SetLayerClient(this);
+}
 
-WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer) : layer_(layer) {}
+WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer) : layer_(layer) {
+  web_layer_client_ = NULL;
+  layer_->SetLayerClient(this);
+}
 
 WebLayerImpl::~WebLayerImpl() {
   layer_->ClearRenderSurface();
   layer_->set_layer_animation_delegate(NULL);
+  web_layer_client_ = NULL;
 }
 
 int WebLayerImpl::id() const { return layer_->id(); }
 
 void WebLayerImpl::invalidateRect(const WebKit::WebFloatRect& rect) {
   layer_->SetNeedsDisplayRect(rect);
 }
 
 void WebLayerImpl::invalidate() { layer_->SetNeedsDisplay(); }
 
@@ skipping 114 matching lines @@
 void WebLayerImpl::setBackgroundFilters(const WebFilterOperations& filters) {
   const WebFilterOperationsImpl& filters_impl =
       static_cast<const WebFilterOperationsImpl&>(filters);
   layer_->SetBackgroundFilters(filters_impl.AsFilterOperations());
 }
 
 void WebLayerImpl::setFilter(SkImageFilter* filter) {
   layer_->SetFilter(skia::SharePtr(filter));
 }
 
-void WebLayerImpl::setDebugName(WebKit::WebString name) {
-  layer_->SetDebugName(UTF16ToASCII(name));
-}
-
 void WebLayerImpl::setCompositingReasons(
     WebKit::WebCompositingReasons reasons) {
   layer_->SetCompositingReasons(reasons);
 }
 
 void WebLayerImpl::setAnimationDelegate(
       WebKit::WebAnimationDelegate* delegate) {
   animation_delegate_adapter_.reset(
       new WebToCCAnimationDelegateAdapter(delegate));
   layer_->set_layer_animation_delegate(animation_delegate_adapter_.get());
@@ skipping 168 matching lines @@
     layer_->set_did_scroll_callback(base::Closure());
   }
 }
 
 bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); }
 
 void WebLayerImpl::setWebLayerClient(WebKit::WebLayerClient* client) {
   web_layer_client_ = client;
 }
 
+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;
+}
+
 Layer* WebLayerImpl::layer() const { return layer_.get(); }
 
 }  // namespace webkit