Roll Chrome into Mojo.

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/debug/trace_event_argument.h"
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
@@ skipping 52 matching lines @@
       transform_is_invertible_(true),
       is_container_for_fixed_position_layers_(false),
       background_color_(0),
       opacity_(1.0),
       blend_mode_(SkXfermode::kSrcOver_Mode),
       num_descendants_that_draw_content_(0),
       draw_depth_(0.f),
       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);
   AnimationRegistrar* registrar = layer_tree_impl_->animationRegistrar();
   layer_animation_controller_ =
       registrar->GetAnimationControllerForId(layer_id_);
   layer_animation_controller_->AddValueObserver(this);
   if (IsActive()) {
     layer_animation_controller_->set_value_provider(this);
     layer_animation_controller_->set_layer_animation_delegate(this);
@@ skipping 516 matching lines @@
   // If the main thread commits multiple times before the impl thread actually
   // draws, then damage tracking will become incorrect if we simply clobber the
   // 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->SetUpdateRect(update_rect_);
 
   layer->SetStackingOrderChanged(stacking_order_changed_);
   layer->SetDebugInfo(debug_info_);
 
+  if (frame_timing_requests_dirty_) {
+    layer->PassFrameTimingRequests(&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();
   needs_push_properties_ = false;
   num_dependents_need_push_properties_ = 0;
 }
 
 gfx::Vector2dF LayerImpl::FixedContainerSizeDelta() const {
   if (!scroll_clip_layer_)
     return gfx::Vector2dF();
@@ skipping 397 matching lines @@
   NoteLayerPropertyChangedForSubtree();
 }
 
 void LayerImpl::Set3dSortingContextId(int id) {
   if (id == sorting_context_id_)
     return;
   sorting_context_id_ = id;
   NoteLayerPropertyChangedForSubtree();
 }
 
+void LayerImpl::PassFrameTimingRequests(
+    std::vector<FrameTimingRequest>* requests) {
+  frame_timing_requests_.swap(*requests);
+  frame_timing_requests_dirty_ = true;
+  SetNeedsPushProperties();
+}
+
 void LayerImpl::SetTransform(const gfx::Transform& transform) {
   if (transform_ == transform)
     return;
 
   transform_ = transform;
   transform_is_invertible_ = transform_.IsInvertible();
   NoteLayerPropertyChangedForSubtree();
 }
 
 void LayerImpl::SetTransformAndInvertibility(const gfx::Transform& transform,
@@ skipping 508 matching lines @@
           debug_info_value->GetAsDictionary(&dictionary_value);
       DCHECK(converted_to_dictionary);
       for (base::DictionaryValue::Iterator it(*dictionary_value); !it.IsAtEnd();
            it.Advance()) {
         state->SetValue(it.key().data(), it.value().DeepCopy());
       }
     } else {
       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());
+      MathUtil::AddToTracedValue("request_rect", request.rect(), state);
+      state->EndDictionary();
+    }
+    state->EndArray();
+  }
 }
 
 bool LayerImpl::IsDrawnRenderSurfaceLayerListMember() const {
   return draw_properties_.last_drawn_render_surface_layer_list_id ==
          layer_tree_impl_->current_render_surface_list_id();
 }
 
 size_t LayerImpl::GPUMemoryUsageInBytes() const { return 0; }
 
 void LayerImpl::RunMicroBenchmark(MicroBenchmarkImpl* benchmark) {
@@ skipping 19 matching lines @@
   SetNeedsPushProperties();
   layer_tree_impl()->set_needs_update_draw_properties();
   if (should_have_render_surface) {
     render_surface_ = make_scoped_ptr(new RenderSurfaceImpl(this));
     return;
   }
   render_surface_.reset();
 }
 
 }  // namespace cc