Chromium Code Reviews| Index: content/renderer/compositor_bindings/web_layer_impl.cc |
| diff --git a/content/renderer/compositor_bindings/web_layer_impl.cc b/content/renderer/compositor_bindings/web_layer_impl.cc |
| index 1dde06b22787636b2d6b086786555e168c15466b..1f2f40730a79adc0ef3fea5d0ce8c03add3be76f 100644 |
| --- a/content/renderer/compositor_bindings/web_layer_impl.cc |
| +++ b/content/renderer/compositor_bindings/web_layer_impl.cc |
| @@ -4,6 +4,8 @@ |
| #include "content/renderer/compositor_bindings/web_layer_impl.h" |
| +#include <vector> |
| + |
| #include "base/bind.h" |
| #include "base/debug/trace_event_impl.h" |
| #include "base/lazy_instance.h" |
| @@ -183,17 +185,17 @@ blink::WebFloatPoint3D WebLayerImpl::transformOrigin() const { |
| return layer_->transform_origin(); |
| } |
| -void WebLayerImpl::setAnchorPoint(const blink::WebFloatPoint&) {} |
| +void WebLayerImpl::setAnchorPoint(const blink::WebFloatPoint& point) {} |
| blink::WebFloatPoint WebLayerImpl::anchorPoint() const { |
| return blink::WebFloatPoint(); |
| } |
| -void WebLayerImpl::setAnchorPointZ(float) {} |
| +void WebLayerImpl::setAnchorPointZ(float z) {} |
| float WebLayerImpl::anchorPointZ() const { |
| return 0.f; |
| -}; |
| +} |
| SkMatrix44 WebLayerImpl::transform() const { |
| return layer_->transform().matrix(); |
| @@ -358,6 +360,29 @@ WebVector<WebRect> WebLayerImpl::nonFastScrollableRegion() const { |
| return result; |
| } |
| +void WebLayerImpl::setDrawFrameRequestRects(const WebVector<std::pair<int64_t, |
| + WebRect> >& rects) { |
| + std::vector<std::pair<int64_t, gfx::Rect> > gfxRects(rects.size()); |
| + for (size_t i = 0; i < rects.size(); ++i) { |
| + gfx::Rect gfxRect(rects[i].second); |
|
enne (OOO)
2014/07/22 20:44:26
style nit: This file should be in Chrome style, so
Mike B
2014/07/25 23:09:41
Done.
|
| + gfxRects[i] = std::make_pair(rects[i].first, gfxRect); |
| + } |
| + layer_->SetDrawFrameRequestRects(gfxRects); |
| +} |
| + |
| +WebVector<std::pair<int64_t, WebRect> > |
| +WebLayerImpl::drawFrameRequestRects() const { |
| + std::vector<std::pair<int64_t, gfx::Rect> > rects = |
| + layer_->draw_frame_request_rects(); |
| + size_t num_rects = rects.size(); |
| + WebVector<std::pair<int64_t, WebRect> > result(num_rects); |
| + for (size_t i = 0; i < num_rects; ++i) { |
| + WebRect rect(rects[i].second); |
| + result[i] = std::make_pair(rects[i].first, rect); |
| + } |
| + return result; |
| +} |
| + |
| void WebLayerImpl::setTouchEventHandlerRegion(const WebVector<WebRect>& rects) { |
| cc::Region region; |
| for (size_t i = 0; i < rects.size(); ++i) |
| @@ -486,4 +511,3 @@ Layer* WebLayerImpl::layer() const { |
| } |
| } // namespace content |
| - |