diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-06-14 07:25:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 07:25:05 -0700 |
| commit | 18653f69581693a5bae1ce4e350e78bc16159b08 (patch) | |
| tree | c231afafc66f7f3e2404769e083c176d2a13057d /components/layout/inline.rs | |
| parent | 5dce166266d1f74e2ae88dbe52ca5ced75c2349b (diff) | |
| parent | 997608f11f6dfa79291ead25cae46a0538f2a3dc (diff) | |
| download | servo-18653f69581693a5bae1ce4e350e78bc16159b08.tar.gz servo-18653f69581693a5bae1ce4e350e78bc16159b08.zip | |
Auto merge of #17184 - nical:euclid-bump, r=SimonSapin
Bump euclid to 0.14.x.
- [x] `./mach build -d` does not report any errors (kinda, need webrender published and Cargo.toml fixed up)
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it is a refactoring in which the difference is mostly a compile-time/strong-typing thing with no change to the logic.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17184)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/inline.rs')
| -rw-r--r-- | components/layout/inline.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 8a54eac9e64..6e76cac5ddd 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -1600,11 +1600,11 @@ impl Flow for InlineFlow { block_flow.base .late_absolute_position_info .stacking_relative_position_of_absolute_containing_block = - stacking_relative_position + *padding_box_origin; + *padding_box_origin + stacking_relative_position; } block_flow.base.stacking_relative_position = - stacking_relative_content_box.origin; + stacking_relative_content_box.origin.to_vector(); // Write the clip in our coordinate system into the child flow. (The kid will // fix it up to be in its own coordinate system if necessary.) @@ -1617,7 +1617,7 @@ impl Flow for InlineFlow { self.base.late_absolute_position_info; block_flow.base.stacking_relative_position = - stacking_relative_border_box.origin; + stacking_relative_border_box.origin.to_vector(); // As above, this is in our coordinate system for now. block_flow.base.clip = self.base.clip.clone() @@ -1633,10 +1633,10 @@ impl Flow for InlineFlow { block_flow.base .late_absolute_position_info .stacking_relative_position_of_absolute_containing_block = - stacking_relative_position + *padding_box_origin; + *padding_box_origin + stacking_relative_position; block_flow.base.stacking_relative_position = - stacking_relative_border_box.origin; + stacking_relative_border_box.origin.to_vector(); // As above, this is in our coordinate system for now. block_flow.base.clip = self.base.clip.clone() @@ -1694,7 +1694,7 @@ impl Flow for InlineFlow { relative_containing_block_size, relative_containing_block_mode, CoordinateSystem::Own) - .translate(stacking_context_position)) + .translate(&stacking_context_position.to_vector())) } } |