diff options
Diffstat (limited to 'components/layout/query.rs')
| -rw-r--r-- | components/layout/query.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/components/layout/query.rs b/components/layout/query.rs index 252071e9bcd..5803a247e19 100644 --- a/components/layout/query.rs +++ b/components/layout/query.rs @@ -450,10 +450,10 @@ impl FragmentBorderBoxIterator for FragmentLocatingFragmentIterator { border_left_width: left_width, .. } = *fragment.style.get_border(); - self.client_rect.origin.y = top_width.to_px(); - self.client_rect.origin.x = left_width.to_px(); - self.client_rect.size.width = (border_box.size.width - left_width - right_width).to_px(); - self.client_rect.size.height = (border_box.size.height - top_width - bottom_width).to_px(); + self.client_rect.origin.y = top_width.0.to_px(); + self.client_rect.origin.x = left_width.0.to_px(); + self.client_rect.size.width = (border_box.size.width - left_width.0 - right_width.0).to_px(); + self.client_rect.size.height = (border_box.size.height - top_width.0 - bottom_width.0).to_px(); } fn should_process(&mut self, fragment: &Fragment) -> bool { @@ -476,10 +476,10 @@ impl FragmentBorderBoxIterator for UnioningFragmentScrollAreaIterator { border_left_width: left_border, .. } = *fragment.style.get_border(); - let right_padding = (border_box.size.width - right_border - left_border).to_px(); - let bottom_padding = (border_box.size.height - bottom_border - top_border).to_px(); - let top_padding = top_border.to_px(); - let left_padding = left_border.to_px(); + let right_padding = (border_box.size.width - right_border.0 - left_border.0).to_px(); + let bottom_padding = (border_box.size.height - bottom_border.0 - top_border.0).to_px(); + let top_padding = top_border.0.to_px(); + let left_padding = left_border.0.to_px(); match self.level { Some(start_level) if level <= start_level => { self.is_child = false; } @@ -702,7 +702,7 @@ pub fn process_resolved_style_request<'a, N>(context: &LayoutContext, thread_local: &mut tlc, }; - let styles = resolve_style(&mut context, element, RuleInclusion::All); + let styles = resolve_style(&mut context, element, RuleInclusion::All, false); let style = styles.primary(); let longhand_id = match *property { PropertyId::Longhand(id) => id, |