diff options
Diffstat (limited to 'components/layout/block.rs')
| -rw-r--r-- | components/layout/block.rs | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/components/layout/block.rs b/components/layout/block.rs index 399b3e5a9f4..51d09e6cf28 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -989,9 +989,10 @@ impl BlockFlow { let mut block_size = cur_b - block_start_offset; let is_root = self.is_root(); if is_root { - let screen_size = LogicalSize::from_physical(self.fragment.style.writing_mode, - layout_context.shared.screen_size); - block_size = max(screen_size.block, block_size) + let viewport_size = + LogicalSize::from_physical(self.fragment.style.writing_mode, + layout_context.shared.viewport_size); + block_size = max(viewport_size.block, block_size) } if is_root || self.formatting_context_type() != FormattingContextType::None || @@ -1156,9 +1157,9 @@ impl BlockFlow { pub fn explicit_block_containing_size(&self, layout_context: &LayoutContext) -> Option<Au> { if self.is_root() || self.is_fixed() { - let screen_size = LogicalSize::from_physical(self.fragment.style.writing_mode, - layout_context.shared.screen_size); - Some(screen_size.block) + let viewport_size = LogicalSize::from_physical(self.fragment.style.writing_mode, + layout_context.shared.viewport_size); + Some(viewport_size.block) } else if self.base.flags.contains(IS_ABSOLUTELY_POSITIONED) && self.base.block_container_explicit_block_size.is_none() { self.base.absolute_cb.explicit_block_containing_size(layout_context) @@ -1223,7 +1224,7 @@ impl BlockFlow { fn calculate_absolute_block_size_and_margins(&mut self, layout_context: &LayoutContext) { let opaque_self = OpaqueFlow::from_flow(self); let containing_block_block_size = - self.containing_block_size(&layout_context.shared.screen_size, opaque_self).block; + self.containing_block_size(&layout_context.shared.viewport_size, opaque_self).block; // This is the stored content block-size value from assign-block-size let content_block_size = self.fragment.border_box.size.block; @@ -1381,7 +1382,7 @@ impl BlockFlow { // Calculate containing block inline size. let containing_block_size = if flags.contains(IS_ABSOLUTELY_POSITIONED) { - self.containing_block_size(&layout_context.shared.screen_size, opaque_self).inline + self.containing_block_size(&layout_context.shared.viewport_size, opaque_self).inline } else { content_inline_size }; @@ -1714,7 +1715,7 @@ impl Flow for BlockFlow { debug!("Setting root position"); self.base.position.start = LogicalPoint::zero(self.base.writing_mode); self.base.block_container_inline_size = LogicalSize::from_physical( - self.base.writing_mode, layout_context.shared.screen_size).inline; + self.base.writing_mode, layout_context.shared.viewport_size).inline; self.base.block_container_writing_mode = self.base.writing_mode; // The root element is never impacted by floats. @@ -1979,12 +1980,12 @@ impl Flow for BlockFlow { let visible_rect = match layout_context.shared.visible_rects.get(&self.layer_id()) { Some(visible_rect) => *visible_rect, - None => Rect::new(Point2D::zero(), layout_context.shared.screen_size), + None => Rect::new(Point2D::zero(), layout_context.shared.viewport_size), }; - let screen_size = layout_context.shared.screen_size; - visible_rect.inflate(screen_size.width * DISPLAY_PORT_SIZE_FACTOR, - screen_size.height * DISPLAY_PORT_SIZE_FACTOR) + let viewport_size = layout_context.shared.viewport_size; + visible_rect.inflate(viewport_size.width * DISPLAY_PORT_SIZE_FACTOR, + viewport_size.height * DISPLAY_PORT_SIZE_FACTOR) } else if is_stacking_context { self.base .stacking_relative_position_of_display_port @@ -2705,7 +2706,7 @@ impl ISizeAndMarginsComputer for AbsoluteNonReplaced { layout_context: &LayoutContext) -> Au { let opaque_block = OpaqueFlow::from_flow(block); - block.containing_block_size(&layout_context.shared.screen_size, opaque_block).inline + block.containing_block_size(&layout_context.shared.viewport_size, opaque_block).inline } fn set_inline_position_of_flow_if_necessary(&self, @@ -2817,7 +2818,7 @@ impl ISizeAndMarginsComputer for AbsoluteReplaced { -> MaybeAuto { let opaque_block = OpaqueFlow::from_flow(block); let containing_block_inline_size = - block.containing_block_size(&layout_context.shared.screen_size, opaque_block).inline; + block.containing_block_size(&layout_context.shared.viewport_size, opaque_block).inline; let fragment = block.fragment(); fragment.assign_replaced_inline_size_if_necessary(containing_block_inline_size); // For replaced absolute flow, the rest of the constraint solving will @@ -2831,7 +2832,7 @@ impl ISizeAndMarginsComputer for AbsoluteReplaced { layout_context: &LayoutContext) -> Au { let opaque_block = OpaqueFlow::from_flow(block); - block.containing_block_size(&layout_context.shared.screen_size, opaque_block).inline + block.containing_block_size(&layout_context.shared.viewport_size, opaque_block).inline } fn set_inline_position_of_flow_if_necessary(&self, |