Compositor thread plumbing for layout rectangle 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/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/WebGraphicsLayerDebugInfo.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;
@@ skipping 339 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 {
+    blink::WebString web_string;
+    debug_info_->appendAsTraceFormat(&web_string);
+    out->append(web_string.utf8());
+  }
+ private:
+  virtual ~TracedDebugInfo() {}
+  scoped_ptr<blink::WebGraphicsLayerDebugInfo> debug_info_;
+};
+
+scoped_refptr<base::debug::ConvertableToTraceFormat>
+    WebLayerImpl::TakeDebugInfo() {
+  if (!web_layer_client_)
+    return NULL;
+  blink::WebGraphicsLayerDebugInfo* debug_info =
+      web_layer_client_->takeDebugInfo();
+
+  if (debug_info)
+    return scoped_refptr<base::debug::ConvertableToTraceFormat>(

[danakj, 2013/12/03 00:38:18]

nit: you don't need to wrap this with the constructor, you can implicitly
convert T* to scoped_refptr<T>().

You need {} here and on the else{} if you make this span multiple lines.

[chrishtr_gmail.com, 2013/12/03 00:44:08]

Done.

+        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