commit 386015ac0826e00ff392125637654a91f73e623a
author Etienne Membrives <etiennej@chromium.org> Thu Feb 19 17:27:12 2015 +0100
committer Etienne Membrives <etiennej@chromium.org> Thu Feb 19 17:27:12 2015 +0100
tree 2ffe861c587c70371629542799fa8d8a8d592143
parent a320116a02ede2a34d66fda9efbc667aaa66ba46

Update from https://crrev.com/316786

List of manually-modified files:
gpu/command_buffer/service/in_process_command_buffer.cc
examples/sample_app/BUILD.gn
examples/sample_app/spinning_cube.cc
mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java
mojo/cc/context_provider_mojo.cc
mojo/cc/context_provider_mojo.h
mojo/common/trace_controller_impl.cc
mojo/gles2/command_buffer_client_impl.cc
mojo/gles2/command_buffer_client_impl.h
services/gles2/gpu_impl.cc
shell/android/apk/src/org/chromium/mojo/shell/MojoShellApplication.java
sky/engine/core/dom/Node.cpp
sky/shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java
ui/events/latency_info.cc
ui/gfx/transform.cc
ui/gfx/transform.h
ui/gfx/transform_util.cc
ui/gfx/transform_util.h

Review URL: https://codereview.chromium.org/935333002

cc/blink/web_layer_impl.cc

diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
index bcebfec..2d5e459 100644
--- a/cc/blink/web_layer_impl.cc
+++ b/cc/blink/web_layer_impl.cc
@@ -4,6 +4,9 @@
 
 #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"
@@ -358,6 +361,16 @@
   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)
@@ -458,7 +471,7 @@
   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)
@@ -476,7 +489,7 @@
   base::ThreadChecker thread_checker_;
 };
 
-scoped_refptr<base::debug::ConvertableToTraceFormat>
+scoped_refptr<base::trace_event::ConvertableToTraceFormat>
 WebLayerImpl::TakeDebugInfo() {
   if (!web_layer_client_)
     return nullptr;