Compositor thread plumbing for layout rectangle debug info.

cc/layers/layer_impl.cc

 // Copyright 2012 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/layer_impl.h"
 
 #include "base/debug/trace_event.h"
+#include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "cc/animation/animation_registrar.h"
 #include "cc/animation/scrollbar_animation_controller.h"
 #include "cc/animation/scrollbar_animation_controller_linear_fade.h"
 #include "cc/animation/scrollbar_animation_controller_thinning.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/debug/layer_tree_debug_state.h"
 #include "cc/debug/micro_benchmark_impl.h"
 #include "cc/debug/traced_value.h"
@@ skipping 130 matching lines @@
 
   // Having both a scroll parent and a scroll offset delegate is unsupported.
   DCHECK(!scroll_offset_delegate_);
 
   if (scroll_parent_)
     scroll_parent_->RemoveScrollChild(this);
 
   scroll_parent_ = parent;
 }
 
+void LayerImpl::SetDebugInfo(
+    scoped_refptr<base::debug::ConvertableToTraceFormat> other) {
+  debug_info_ = other;
+}
+
 void LayerImpl::SetScrollChildren(std::set<LayerImpl*>* children) {
   if (scroll_children_.get() == children)
     return;
   scroll_children_.reset(children);
 }
 
 void LayerImpl::RemoveScrollChild(LayerImpl* child) {
   DCHECK(scroll_children_);
   scroll_children_->erase(child);
   if (scroll_children_->empty())
@@ skipping 415 matching lines @@
   // update_rect here. The LayerImpl's update_rect needs to accumulate (i.e.
   // union) any update changes that have occurred on the main thread.
   update_rect_.Union(layer->update_rect());
   layer->set_update_rect(update_rect_);
 
   layer->SetStackingOrderChanged(stacking_order_changed_);
 
   // Reset any state that should be cleared for the next update.
   stacking_order_changed_ = false;
   update_rect_ = gfx::RectF();
+
+  layer->SetDebugInfo(debug_info_);
 }
 
 base::DictionaryValue* LayerImpl::LayerTreeAsJson() const {
   base::DictionaryValue* result = new base::DictionaryValue;
   result->SetString("LayerType", LayerTypeAsString());
 
   base::ListValue* list = new base::ListValue;
   list->AppendInteger(bounds().width());
   list->AppendInteger(bounds().height());
   result->Set("Bounds", list);
@@ skipping 754 matching lines @@
   state->SetBoolean("can_use_lcd_text", can_use_lcd_text());
   state->SetBoolean("contents_opaque", contents_opaque());
 
   if (layer_animation_controller_->IsAnimatingProperty(Animation::Transform) ||
       layer_animation_controller_->IsAnimatingProperty(Animation::Filter)) {
     gfx::BoxF box(bounds().width(), bounds().height(), 0.f);
     gfx::BoxF inflated;
     if (layer_animation_controller_->AnimatedBoundsForBox(box, &inflated))
       state->Set("animated_bounds", MathUtil::AsValue(inflated).release());
   }
+
+  if (debug_info_.get()) {
+    std::string str;
+    debug_info_->AppendAsTraceFormat(&str);
+    base::JSONReader json_reader;
+    // Parsing the JSON and re-encoding it is not very efficient,
+    // but it's the simplest way to achieve the desired effect, which
+    // is to output:
+    // {..., layout_rects: [{geometry_rect: ...}, ...], ...}
+    // rather than:
+    // {layout_rects: "[{geometry_rect: ...}, ...]", ...}
+    state->Set("layout_rects", json_reader.ReadToValue(str));
+  }
 }
 
 size_t LayerImpl::GPUMemoryUsageInBytes() const { return 0; }
 
 scoped_ptr<base::Value> LayerImpl::AsValue() const {
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   AsValueInto(state.get());
   return state.PassAs<base::Value>();
 }
 
 void LayerImpl::RunMicroBenchmark(MicroBenchmarkImpl* benchmark) {
   benchmark->RunOnLayer(this);
 }
 
 }  // namespace cc