Index: cc/layers/layer.cc |
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc |
index e0ffb5cd9356998102fb6ff4081bcd6d73bff045..1d42a6ead65954558363970c72b1a7294c1b0f8d 100644 |
--- a/cc/layers/layer.cc |
+++ b/cc/layers/layer.cc |
@@ -929,6 +929,8 @@ void Layer::PushPropertiesTo(LayerImpl* layer) { |
needs_push_properties_ = false; |
num_dependents_need_push_properties_ = 0; |
+ |
+ layer->SetDebugInfo(debug_info_); |
enne (OOO)
2013/11/25 20:16:45
ConvertableToTraceFormat is not thread-safe refcou
chrishtr_gmail.com
2013/11/25 22:48:25
Good catch. I'll try the approach we discussed off
chrishtr_gmail.com
2013/11/26 21:49:04
Updated to not store the debug_Info_ object at all
|
} |
scoped_ptr<LayerImpl> Layer::CreateLayerImpl(LayerTreeImpl* tree_impl) { |
@@ -958,6 +960,10 @@ bool Layer::Update(ResourceUpdateQueue* queue, |
return false; |
} |
+void Layer::SetDebugInfo(base::debug::ConvertableToTraceFormat* debug_info) { |
+ debug_info_ = debug_info; |
+} |
+ |
bool Layer::NeedMoreUpdates() { |
return false; |
} |