Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Remove absolute_static_i_offset and fixed_static_i_offset.

Browse source 
They haven't been used for hypothetical box calculation in quite some
time.
This commit is contained in:
Patrick Walton 2015-04-28 15:39:44 -07:00
parent b5beebbc62
commit 132658856f
2 changed files with 0 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/layout/block.rs
View file

@ -1227,19 +1227,6 @@ impl BlockFlow {
let mut inline_end_floats_impact_child = let mut inline_end_floats_impact_child =
self.base.flags.contains(IMPACTED_BY_RIGHT_FLOATS); self.base.flags.contains(IMPACTED_BY_RIGHT_FLOATS);
let absolute_static_i_offset = if self.is_positioned() {
// This flow is the containing block. The static inline offset will be the inline-start
// padding edge.
self.fragment.border_padding.inline_start
- self.fragment.style().logical_border_width().inline_start
} else {
// For kids, the inline-start margin edge will be at our inline-start content edge. The
// current static offset is at our inline-start margin edge. So move in to the
// inline-start content edge.
self.base.absolute_static_i_offset + inline_start_content_edge
};
let fixed_static_i_offset = self.base.fixed_static_i_offset + inline_start_content_edge;
let flags = self.base.flags.clone(); let flags = self.base.flags.clone();
// Remember the inline-sizes of the last left and right floats, if there were any. These // Remember the inline-sizes of the last left and right floats, if there were any. These
@ -1291,8 +1278,6 @@ impl BlockFlow {
{ {
let kid_base = flow::mut_base(kid); let kid_base = flow::mut_base(kid);
kid_base.block_container_explicit_block_size = explicit_content_size; kid_base.block_container_explicit_block_size = explicit_content_size;
kid_base.absolute_static_i_offset = absolute_static_i_offset;
kid_base.fixed_static_i_offset = fixed_static_i_offset;
} }
// Determine float impaction, and update the inline size speculations if necessary. // Determine float impaction, and update the inline size speculations if necessary.

11
components/layout/flow.rs
View file

@ -790,20 +790,11 @@ pub struct BaseFlow {
/// depend on content heights). Used for computing percentage values for `height`. /// depend on content heights). Used for computing percentage values for `height`.
pub block_container_explicit_block_size: Option<Au>, pub block_container_explicit_block_size: Option<Au>,
/// Offset wrt the nearest positioned ancestor - aka the Containing Block
/// for any absolutely positioned elements.
pub absolute_static_i_offset: Au,
/// Offset wrt the Initial Containing Block.
pub fixed_static_i_offset: Au,
/// Reference to the Containing Block, if this flow is absolutely positioned. /// Reference to the Containing Block, if this flow is absolutely positioned.
pub absolute_cb: ContainingBlockLink, pub absolute_cb: ContainingBlockLink,
/// Information needed to compute absolute (i.e. viewport-relative) flow positions (not to be /// Information needed to compute absolute (i.e. viewport-relative) flow positions (not to be
/// confused with absolutely-positioned flows). /// confused with absolutely-positioned flows).
///
/// FIXME(pcwalton): Merge with `absolute_static_i_offset` and `fixed_static_i_offset` above?
pub absolute_position_info: AbsolutePositionInfo, pub absolute_position_info: AbsolutePositionInfo,
/// The clipping region for this flow and its descendants, in layer coordinates. /// The clipping region for this flow and its descendants, in layer coordinates.
@ -968,8 +959,6 @@ impl BaseFlow {
collapsible_margins: CollapsibleMargins::new(), collapsible_margins: CollapsibleMargins::new(),
stacking_relative_position: Point2D::zero(), stacking_relative_position: Point2D::zero(),
abs_descendants: Descendants::new(), abs_descendants: Descendants::new(),
absolute_static_i_offset: Au(0),
fixed_static_i_offset: Au(0),
block_container_inline_size: Au(0), block_container_inline_size: Au(0),
block_container_writing_mode: writing_mode, block_container_writing_mode: writing_mode,
block_container_explicit_block_size: None, block_container_explicit_block_size: None,