Update from https://crrev.com/316786

cc/blink/web_layer_impl.cc

 // Copyright 2014 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/blink/web_layer_impl.h"
 
+#include <utility>
+#include <vector>
+
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_checker.h"
 #include "base/trace_event/trace_event_impl.h"
 #include "cc/animation/animation.h"
 #include "cc/base/region.h"
 #include "cc/base/switches.h"
 #include "cc/blink/web_animation_impl.h"
 #include "cc/blink/web_blend_mode.h"
@@ skipping 334 matching lines @@
   size_t i = 0;
   for (cc::Region::Iterator region_rects(layer_->non_fast_scrollable_region());
        region_rects.has_rect();
        region_rects.next()) {
     result[i] = region_rects.rect();
     ++i;
   }
   return result;
 }
 
+void WebLayerImpl::setFrameTimingRequests(
+    const WebVector<std::pair<int64_t, WebRect>>& requests) {
+  std::vector<cc::FrameTimingRequest> frame_timing_requests(requests.size());
+  for (size_t i = 0; i < requests.size(); ++i) {
+    frame_timing_requests.push_back(cc::FrameTimingRequest(
+        requests[i].first, gfx::Rect(requests[i].second)));
+  }
+  layer_->SetFrameTimingRequests(frame_timing_requests);
+}
+
 void WebLayerImpl::setTouchEventHandlerRegion(const WebVector<WebRect>& rects) {
   cc::Region region;
   for (size_t i = 0; i < rects.size(); ++i)
     region.Union(rects[i]);
   layer_->SetTouchEventHandlerRegion(region);
 }
 
 WebVector<WebRect> WebLayerImpl::touchEventHandlerRegion() const {
   size_t num_rects = 0;
   for (cc::Region::Iterator region_rects(layer_->touch_event_handler_region());
@@ skipping 80 matching lines @@
 }
 
 bool WebLayerImpl::isOrphan() const {
   return !layer_->layer_tree_host();
 }
 
 void WebLayerImpl::setWebLayerClient(blink::WebLayerClient* client) {
   web_layer_client_ = client;
 }
 
-class TracedDebugInfo : public base::debug::ConvertableToTraceFormat {
+class TracedDebugInfo : public base::trace_event::ConvertableToTraceFormat {
  public:
   // This object takes ownership of the debug_info object.
   explicit TracedDebugInfo(blink::WebGraphicsLayerDebugInfo* debug_info)
       : debug_info_(debug_info) {}
   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:
   ~TracedDebugInfo() override {}
   scoped_ptr<blink::WebGraphicsLayerDebugInfo> debug_info_;
   base::ThreadChecker thread_checker_;
 };
 
-scoped_refptr<base::debug::ConvertableToTraceFormat>
+scoped_refptr<base::trace_event::ConvertableToTraceFormat>
 WebLayerImpl::TakeDebugInfo() {
   if (!web_layer_client_)
     return nullptr;
   blink::WebGraphicsLayerDebugInfo* debug_info =
       web_layer_client_->takeDebugInfoFor(this);
 
   if (debug_info)
     return new TracedDebugInfo(debug_info);
   else
     return nullptr;
@@ skipping 11 matching lines @@
   if (parent)
     clip_parent = static_cast<WebLayerImpl*>(parent)->layer();
   layer_->SetClipParent(clip_parent);
 }
 
 Layer* WebLayerImpl::layer() const {
   return layer_.get();
 }
 
 }  // namespace cc_blink