diff options
author | Nicolas Silva <nical@fastmail.com> | 2017-06-02 14:50:26 +0200 |
---|---|---|
committer | Nicolas Silva <nical@fastmail.com> | 2017-06-14 16:00:59 +0200 |
commit | 8617320500491fab91979404cec2087bac7ef362 (patch) | |
tree | 7db5b5b5a17fb59bb727a2a59ba27f351d01fb90 /components/layout/sequential.rs | |
parent | 5dce166266d1f74e2ae88dbe52ca5ced75c2349b (diff) | |
download | servo-8617320500491fab91979404cec2087bac7ef362.tar.gz servo-8617320500491fab91979404cec2087bac7ef362.zip |
Bump euclid to 0.14.
Diffstat (limited to 'components/layout/sequential.rs')
-rw-r--r-- | components/layout/sequential.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs index 404d29a44d1..c944f0adb83 100644 --- a/components/layout/sequential.rs +++ b/components/layout/sequential.rs @@ -7,7 +7,7 @@ use app_units::Au; use context::LayoutContext; use display_list_builder::DisplayListBuildState; -use euclid::point::Point2D; +use euclid::{Point2D, Vector2D}; use floats::SpeculatedFloatPlacement; use flow::{self, Flow, ImmutableFlowUtils, InorderFlowTraversal, MutableFlowUtils}; use flow::{PostorderFlowTraversal, PreorderFlowTraversal}; @@ -108,17 +108,17 @@ pub fn iterate_through_flow_tree_fragment_border_boxes(root: &mut Flow, iterator let mut stacking_context_position = *stacking_context_position; if kid.is_block_flow() && kid.as_block().fragment.establishes_stacking_context() { stacking_context_position = Point2D::new(kid.as_block().fragment.margin.inline_start, Au(0)) + - flow::base(kid).stacking_relative_position + - stacking_context_position; + flow::base(kid).stacking_relative_position.to_vector() + + stacking_context_position.to_vector(); let relative_position = kid.as_block() .stacking_relative_position(CoordinateSystem::Own); if let Some(matrix) = kid.as_block() .fragment .transform_matrix(&relative_position) { - let transform_matrix = matrix.transform_point(&Point2D::zero()); + let transform_matrix = matrix.transform_point2d(&Point2D::zero()); stacking_context_position = stacking_context_position + - Point2D::new(Au::from_f32_px(transform_matrix.x), - Au::from_f32_px(transform_matrix.y)) + Vector2D::new(Au::from_f32_px(transform_matrix.x), + Au::from_f32_px(transform_matrix.y)) } } doit(kid, level + 1, iterator, &stacking_context_position); |