diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-02 20:01:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 20:01:10 -0500 |
| commit | 7b1006936a27232fb77fef5893cc141e66bb12b7 (patch) | |
| tree | 750a15b93482d99f1aadd7afe507dd910516a6d1 /components/layout/flex.rs | |
| parent | 536d63c67028c7368dff780945626283d2c48f1c (diff) | |
| parent | fd1c814e7812e68e1207165c9387ddcfd8a6379b (diff) | |
| download | servo-7b1006936a27232fb77fef5893cc141e66bb12b7.tar.gz servo-7b1006936a27232fb77fef5893cc141e66bb12b7.zip | |
Auto merge of #16702 - bholley:custom_arc, r=emilio
Use a custom arc in the style system
See https://bugzilla.mozilla.org/show_bug.cgi?id=1360889
<!-- 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/16702)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/flex.rs')
| -rw-r--r-- | components/layout/flex.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/components/layout/flex.rs b/components/layout/flex.rs index cf77455afa8..dd990c61510 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -21,7 +21,6 @@ use model::{IntrinsicISizes, MaybeAuto, SizeConstraint}; use model::{specified, specified_or_none}; use std::cmp::{max, min}; use std::ops::Range; -use std::sync::Arc; use style::computed_values::{align_content, align_self, flex_direction, flex_wrap, justify_content}; use style::computed_values::border_collapse; use style::logical_geometry::{Direction, LogicalSize}; @@ -970,7 +969,7 @@ impl Flow for FlexFlow { self.block_flow.collect_stacking_contexts(state); } - fn repair_style(&mut self, new_style: &Arc<ServoComputedValues>) { + fn repair_style(&mut self, new_style: &::StyleArc<ServoComputedValues>) { self.block_flow.repair_style(new_style) } |