OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 "webkit/compositor_bindings/web_layer_impl.h" | 5 #include "webkit/compositor_bindings/web_layer_impl.h" |
6 | 6 |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "cc/animation/animation.h" | 8 #include "cc/animation/animation.h" |
9 #include "cc/base/region.h" | 9 #include "cc/base/region.h" |
10 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
11 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" | 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" |
12 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" | 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" |
| 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerPositionCon
straint.h" |
13 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" | 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
14 #include "third_party/skia/include/utils/SkMatrix44.h" | 15 #include "third_party/skia/include/utils/SkMatrix44.h" |
15 #include "webkit/compositor_bindings/web_animation_impl.h" | 16 #include "webkit/compositor_bindings/web_animation_impl.h" |
16 | 17 |
17 using cc::Animation; | 18 using cc::Animation; |
18 using cc::Layer; | 19 using cc::Layer; |
19 using WebKit::WebLayer; | 20 using WebKit::WebLayer; |
20 using WebKit::WebFloatPoint; | 21 using WebKit::WebFloatPoint; |
21 using WebKit::WebVector; | 22 using WebKit::WebVector; |
22 using WebKit::WebRect; | 23 using WebKit::WebRect; |
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 } | 305 } |
305 | 306 |
306 void WebLayerImpl::setIsContainerForFixedPositionLayers(bool enable) { | 307 void WebLayerImpl::setIsContainerForFixedPositionLayers(bool enable) { |
307 layer_->SetIsContainerForFixedPositionLayers(enable); | 308 layer_->SetIsContainerForFixedPositionLayers(enable); |
308 } | 309 } |
309 | 310 |
310 bool WebLayerImpl::isContainerForFixedPositionLayers() const { | 311 bool WebLayerImpl::isContainerForFixedPositionLayers() const { |
311 return layer_->is_container_for_fixed_position_layers(); | 312 return layer_->is_container_for_fixed_position_layers(); |
312 } | 313 } |
313 | 314 |
314 void WebLayerImpl::setFixedToContainerLayer(bool enable) { | 315 void WebLayerImpl::setPositionConstraint( |
315 layer_->SetFixedToContainerLayer(enable); | 316 const WebKit::WebLayerPositionConstraint& constraint) { |
| 317 layer_->SetPositionConstraint(constraint); |
316 } | 318 } |
317 | 319 |
318 bool WebLayerImpl::fixedToContainerLayer() const { | 320 WebKit::WebLayerPositionConstraint WebLayerImpl::positionConstraint() const { |
319 return layer_->fixed_to_container_layer(); | 321 return layer_->position_constraint(); |
320 } | 322 } |
321 | 323 |
322 void WebLayerImpl::setScrollClient( | 324 void WebLayerImpl::setScrollClient( |
323 WebKit::WebLayerScrollClient* scroll_client) { | 325 WebKit::WebLayerScrollClient* scroll_client) { |
324 layer_->set_layer_scroll_client(scroll_client); | 326 layer_->set_layer_scroll_client(scroll_client); |
325 } | 327 } |
326 | 328 |
327 Layer* WebLayerImpl::layer() const { return layer_.get(); } | 329 Layer* WebLayerImpl::layer() const { return layer_.get(); } |
328 | 330 |
329 } // namespace WebKit | 331 } // namespace WebKit |
OLD | NEW |