HUD: Show first paint invalidation in red

cc/blink/web_layer_impl.cc

Index: cc/blink/web_layer_impl.cc
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
index c1f67fbed3af08fbe712b402c8c9e47b58a24ddb..5d3586c93f92a0a3bcc2d202f5f47e0052dc8b0f 100644
--- a/cc/blink/web_layer_impl.cc
+++ b/cc/blink/web_layer_impl.cc
@@ -5,13 +5,12 @@
 #include "cc/blink/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"
-#include "base/threading/thread_checker.h"
 #include "cc/animation/animation.h"
 #include "cc/base/region.h"
 #include "cc/base/switches.h"
+#include "cc/blink/blink_layer_debug_info.h"
 #include "cc/blink/web_animation_impl.h"
 #include "cc/blink/web_blend_mode.h"
 #include "cc/blink/web_filter_operations_impl.h"
@@ -21,7 +20,6 @@
 #include "cc/trees/layer_tree_host.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"
@@ -427,33 +425,14 @@ void WebLayerImpl::setWebLayerClient(blink::WebLayerClient* client) {
   web_layer_client_ = client;
 }
 
-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() {
+scoped_refptr<cc::LayerDebugInfo> WebLayerImpl::TakeDebugInfo() {
   if (!web_layer_client_)
     return NULL;
   blink::WebGraphicsLayerDebugInfo* debug_info =
       web_layer_client_->takeDebugInfoFor(this);
 
   if (debug_info)
-    return new TracedDebugInfo(debug_info);
+    return new BlinkLayerDebugInfo(debug_info);
   else
     return NULL;
 }