Index: webkit/compositor_bindings/web_layer_impl.cc |
diff --git a/webkit/compositor_bindings/web_layer_impl.cc b/webkit/compositor_bindings/web_layer_impl.cc |
index e7292e2810a29aae93c7a59ed21cdac357ad476e..8ab91dcfbf0d3ae73461c689d0a6888509cb1f55 100644 |
--- a/webkit/compositor_bindings/web_layer_impl.cc |
+++ b/webkit/compositor_bindings/web_layer_impl.cc |
@@ -8,8 +8,10 @@ |
#include "cc/animation/animation.h" |
#include "cc/base/region.h" |
#include "cc/layers/layer.h" |
+#include "cc/layers/layer_position_constraint.h" |
#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" |
#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" |
+#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerPositionConstraint.h" |
#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
#include "third_party/skia/include/utils/SkMatrix44.h" |
#include "webkit/compositor_bindings/web_animation_impl.h" |
@@ -311,12 +313,31 @@ bool WebLayerImpl::isContainerForFixedPositionLayers() const { |
return layer_->is_container_for_fixed_position_layers(); |
} |
-void WebLayerImpl::setFixedToContainerLayer(bool enable) { |
- layer_->SetFixedToContainerLayer(enable); |
+static WebKit::WebLayerPositionConstraint toWebLayerPositionConstraint( |
+ const cc::LayerPositionConstraint& constraint) { |
+ WebKit::WebLayerPositionConstraint web_constraint; |
+ web_constraint.isFixedPosition = constraint.is_fixed_position(); |
+ web_constraint.isFixedToRightEdge = constraint.is_fixed_to_right_edge(); |
+ web_constraint.isFixedToBottomEdge = constraint.is_fixed_to_bottom_edge(); |
+ return web_constraint; |
} |
-bool WebLayerImpl::fixedToContainerLayer() const { |
- return layer_->fixed_to_container_layer(); |
+static cc::LayerPositionConstraint toLayerPositionConstraint( |
+ const WebKit::WebLayerPositionConstraint& web_constraint) { |
+ cc::LayerPositionConstraint constraint; |
+ constraint.SetIsFixedPosition(web_constraint.isFixedPosition); |
+ constraint.SetIsFixedToRightEdge(web_constraint.isFixedToRightEdge); |
+ constraint.SetIsFixedToBottomEdge(web_constraint.isFixedToBottomEdge); |
+ return constraint; |
+} |
+ |
+void WebLayerImpl::setPositionConstraint( |
+ const WebKit::WebLayerPositionConstraint& constraint) { |
+ layer_->SetPositionConstraint(toLayerPositionConstraint(constraint)); |
+} |
+ |
+WebKit::WebLayerPositionConstraint WebLayerImpl::positionConstraint() const { |
+ return toWebLayerPositionConstraint(layer_->position_constraint()); |
} |
void WebLayerImpl::setScrollClient( |