diff options
| -rw-r--r-- | components/layout/construct.rs | 5 | ||||
| -rw-r--r-- | components/layout/fragment.rs | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 7985fac3f73..dc6ca7b3cb1 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -686,7 +686,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> /// FIXME(pcwalton): It is not clear to me that there isn't a cleaner way to handle /// `<textarea>`. fn build_flow_for_block_like(&mut self, flow: FlowRef, node: &ConcreteThreadSafeLayoutNode) - -> ConstructionResult { + -> ConstructionResult { let mut initial_fragments = IntermediateInlineFragments::new(); let node_is_input_or_text_area = node.type_id() == Some(NodeTypeId::Element(ElementTypeId::HTMLElement( @@ -1023,7 +1023,8 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> /// This is an annoying case, because the computed `display` value is `block`, but the /// hypothetical box is inline. - fn build_fragment_for_absolutely_positioned_inline(&mut self, node: &ConcreteThreadSafeLayoutNode) + fn build_fragment_for_absolutely_positioned_inline(&mut self, + node: &ConcreteThreadSafeLayoutNode) -> ConstructionResult { let block_flow_result = self.build_flow_for_block(node, None); let (block_flow, abs_descendants) = match block_flow_result { diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 9d90a9fca07..6a6e112e679 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -1031,7 +1031,8 @@ impl Fragment { let mut specified = Au(0); if flags.contains(INTRINSIC_INLINE_SIZE_INCLUDES_SPECIFIED) { - specified = MaybeAuto::from_style(style.content_inline_size(), Au(0)).specified_or_zero(); + specified = MaybeAuto::from_style(style.content_inline_size(), + Au(0)).specified_or_zero(); specified = max(model::specified(style.min_inline_size(), Au(0)), specified); if let Some(max) = model::specified_or_none(style.max_inline_size(), Au(0)) { specified = min(specified, max) @@ -1070,7 +1071,8 @@ impl Fragment { pub fn calculate_line_height(&self, layout_context: &LayoutContext) -> Au { let font_style = self.style.get_font_arc(); - let font_metrics = text::font_metrics_for_style(&mut layout_context.font_context(), font_style); + let font_metrics = text::font_metrics_for_style(&mut layout_context.font_context(), + font_style); text::line_height_from_style(&*self.style, &font_metrics) } |