Index: cc/layers/layer_impl.cc |
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc |
index 8c7d9729c4f4182acfee3e4f8c6fa5cab7905e7f..f0e47e896a58c2a8d5c70cabe46968e41f9e55e8 100644 |
--- a/cc/layers/layer_impl.cc |
+++ b/cc/layers/layer_impl.cc |
@@ -71,7 +71,8 @@ LayerImpl::LayerImpl(LayerTreeImpl* tree_impl, int id) |
needs_push_properties_(false), |
num_dependents_need_push_properties_(0), |
sorting_context_id_(0), |
- current_draw_mode_(DRAW_MODE_NONE) { |
+ current_draw_mode_(DRAW_MODE_NONE), |
+ frame_timing_requests_dirty_(false) { |
DCHECK_GT(layer_id_, 0); |
DCHECK(layer_tree_impl_); |
layer_tree_impl_->RegisterLayer(this); |
@@ -613,6 +614,11 @@ void LayerImpl::PushPropertiesTo(LayerImpl* layer) { |
layer->SetStackingOrderChanged(stacking_order_changed_); |
layer->SetDebugInfo(debug_info_); |
+ if (frame_timing_requests_dirty_) { |
+ layer->SetFrameTimingRequests(frame_timing_requests_); |
+ frame_timing_requests_dirty_ = false; |
+ } |
+ |
// Reset any state that should be cleared for the next update. |
stacking_order_changed_ = false; |
update_rect_ = gfx::Rect(); |
@@ -1577,6 +1583,19 @@ void LayerImpl::AsValueInto(base::debug::TracedValue* state) const { |
NOTREACHED(); |
} |
} |
+ |
+ if (!frame_timing_requests_.empty()) { |
+ state->BeginArray("frame_timing_requests"); |
+ for (const auto& request : frame_timing_requests_) { |
+ state->BeginDictionary(); |
+ state->SetInteger("request_id", request.id()); |
+ state->BeginArray("request_rect"); |
+ MathUtil::AddToTracedValue(request.rect(), state); |
+ state->EndArray(); |
+ state->EndDictionary(); |
+ } |
+ state->EndArray(); |
+ } |
} |
bool LayerImpl::IsDrawnRenderSurfaceLayerListMember() const { |
@@ -1615,4 +1634,11 @@ void LayerImpl::SetHasRenderSurface(bool should_have_render_surface) { |
render_surface_.reset(); |
} |
+void LayerImpl::SetFrameTimingRequests( |
danakj
2015/01/23 18:08:45
same order as in the header please
vmpstr
2015/01/23 18:41:57
Done.
|
+ const std::vector<FrameTimingRequest>& requests) { |
+ frame_timing_requests_ = requests; |
+ frame_timing_requests_dirty_ = true; |
+ SetNeedsPushProperties(); |
+} |
+ |
} // namespace cc |