aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/inline.rs
diff options
context:
space:
mode:
authorBobby Holley <bobbyholley@gmail.com>2016-12-15 16:00:40 -0800
committerBobby Holley <bobbyholley@gmail.com>2016-12-16 10:57:27 -0800
commit648ce1e44e65b194184b713e8b47695d5ff17921 (patch)
tree94a20912b289dd1799cc017720f6daf83ed6d121 /components/layout/inline.rs
parent1b2daae453e9276977059fd51c9b733e6400f35c (diff)
downloadservo-648ce1e44e65b194184b713e8b47695d5ff17921.tar.gz
servo-648ce1e44e65b194184b713e8b47695d5ff17921.zip
Make the DomTraversalContext own the SharedStyleContext and share it immutably across the traversal.
This allows us to get rid of a bunch of lifetimes and simplify a lot of code. It also lets us get rid of that nasty lifetime transmute, which is awesome. The situation with thread-local contexts is still suboptimal, but we fix that in subsequent patches.
Diffstat (limited to 'components/layout/inline.rs')
-rw-r--r--components/layout/inline.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index cefb77bb592..372aa2ea088 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -32,7 +32,7 @@ use std::sync::Arc;
use style::arc_ptr_eq;
use style::computed_values::{display, overflow_x, position, text_align, text_justify};
use style::computed_values::{vertical_align, white_space};
-use style::context::{SharedStyleContext, StyleContext};
+use style::context::SharedStyleContext;
use style::logical_geometry::{LogicalRect, LogicalSize, WritingMode};
use style::properties::{longhands, ServoComputedValues};
use style::servo::restyle_damage::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPOSITION, RESOLVE_GENERATED_CONTENT};