| Index: cc/blink/web_layer_impl.cc
|
| diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
|
| index bcebfecfc64035b55b969cc2a195d57e465a40ab..2d5e4596db3b2800958f83b784a02732d92e6941 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 @@ WebVector<WebRect> WebLayerImpl::nonFastScrollableRegion() const {
|
| 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 @@ 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)
|
| @@ -476,7 +489,7 @@ class TracedDebugInfo : public base::debug::ConvertableToTraceFormat {
|
| base::ThreadChecker thread_checker_;
|
| };
|
|
|
| -scoped_refptr<base::debug::ConvertableToTraceFormat>
|
| +scoped_refptr<base::trace_event::ConvertableToTraceFormat>
|
| WebLayerImpl::TakeDebugInfo() {
|
| if (!web_layer_client_)
|
| return nullptr;
|
|
|