OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/blink/web_layer_impl.h" | 5 #include "cc/blink/web_layer_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
358 result[i] = region_rects.rect(); | 358 result[i] = region_rects.rect(); |
359 ++i; | 359 ++i; |
360 } | 360 } |
361 return result; | 361 return result; |
362 } | 362 } |
363 | 363 |
364 void WebLayerImpl::setFrameTimingRequests( | 364 void WebLayerImpl::setFrameTimingRequests( |
365 const WebVector<std::pair<int64_t, WebRect>>& requests) { | 365 const WebVector<std::pair<int64_t, WebRect>>& requests) { |
366 std::vector<cc::FrameTimingRequest> frame_timing_requests(requests.size()); | 366 std::vector<cc::FrameTimingRequest> frame_timing_requests(requests.size()); |
367 for (size_t i = 0; i < requests.size(); ++i) { | 367 for (size_t i = 0; i < requests.size(); ++i) { |
368 frame_timing_requests.push_back(cc::FrameTimingRequest( | 368 frame_timing_requests[i] = cc::FrameTimingRequest( |
369 requests[i].first, gfx::Rect(requests[i].second))); | 369 requests[i].first, gfx::Rect(requests[i].second)); |
370 } | 370 } |
371 layer_->SetFrameTimingRequests(frame_timing_requests); | 371 layer_->SetFrameTimingRequests(frame_timing_requests); |
372 } | 372 } |
373 | 373 |
| 374 WebVector<std::pair<int64_t, WebRect>> WebLayerImpl::frameTimingRequests() |
| 375 const { |
| 376 const std::vector<cc::FrameTimingRequest>& frame_timing_requests = |
| 377 layer_->FrameTimingRequests(); |
| 378 |
| 379 size_t num_requests = frame_timing_requests.size(); |
| 380 |
| 381 WebVector<std::pair<int64_t, WebRect>> result(num_requests); |
| 382 for (size_t i = 0; i < num_requests; ++i) { |
| 383 result[i] = std::make_pair(frame_timing_requests[i].id(), |
| 384 frame_timing_requests[i].rect()); |
| 385 } |
| 386 return result; |
| 387 } |
| 388 |
374 void WebLayerImpl::setTouchEventHandlerRegion(const WebVector<WebRect>& rects) { | 389 void WebLayerImpl::setTouchEventHandlerRegion(const WebVector<WebRect>& rects) { |
375 cc::Region region; | 390 cc::Region region; |
376 for (size_t i = 0; i < rects.size(); ++i) | 391 for (size_t i = 0; i < rects.size(); ++i) |
377 region.Union(rects[i]); | 392 region.Union(rects[i]); |
378 layer_->SetTouchEventHandlerRegion(region); | 393 layer_->SetTouchEventHandlerRegion(region); |
379 } | 394 } |
380 | 395 |
381 WebVector<WebRect> WebLayerImpl::touchEventHandlerRegion() const { | 396 WebVector<WebRect> WebLayerImpl::touchEventHandlerRegion() const { |
382 size_t num_rects = 0; | 397 size_t num_rects = 0; |
383 for (cc::Region::Iterator region_rects(layer_->touch_event_handler_region()); | 398 for (cc::Region::Iterator region_rects(layer_->touch_event_handler_region()); |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
514 if (parent) | 529 if (parent) |
515 clip_parent = static_cast<WebLayerImpl*>(parent)->layer(); | 530 clip_parent = static_cast<WebLayerImpl*>(parent)->layer(); |
516 layer_->SetClipParent(clip_parent); | 531 layer_->SetClipParent(clip_parent); |
517 } | 532 } |
518 | 533 |
519 Layer* WebLayerImpl::layer() const { | 534 Layer* WebLayerImpl::layer() const { |
520 return layer_.get(); | 535 return layer_.get(); |
521 } | 536 } |
522 | 537 |
523 } // namespace cc_blink | 538 } // namespace cc_blink |
OLD | NEW |