Add layer name into frame viewer

cc/layers/content_layer.cc

 // Copyright 2010 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 "cc/layers/content_layer.h"
 
 #include "base/auto_reset.h"
+#include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/resources/bitmap_content_layer_updater.h"
 #include "cc/resources/bitmap_skpicture_content_layer_updater.h"
 #include "cc/resources/layer_painter.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
 
@@ skipping 53 matching lines @@
                           const OcclusionTracker* occlusion,
                           RenderingStats* stats) {
   {
     base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
                                                   true);
 
     CreateUpdaterIfNeeded();
     UpdateCanUseLCDText();
   }
 
+  bool is_tracing;
+  TRACE_EVENT_CATEGORY_GROUP_ENABLED("cc", &is_tracing);
+  if (is_tracing)
+    SetDebugName(DebugName());
+  else
+    SetDebugName(std::string());
+
   TiledLayer::Update(queue, occlusion, stats);
   needs_display_ = false;
 }
 
 bool ContentLayer::NeedMoreUpdates() {
   return NeedsIdlePaint();
 }
 
 LayerUpdater* ContentLayer::Updater() const {
   return updater_.get();
@@ skipping 34 matching lines @@
 
   can_use_lcd_text_last_frame_ = can_use_lcd_text();
   if (client_)
     client_->DidChangeLayerCanUseLCDText();
 }
 
 bool ContentLayer::SupportsLCDText() const {
   return true;
 }
 
+std::string ContentLayer::DebugName() {
+  return client_->DebugName();
+}
+
 }  // namespace cc