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

Remove ClearSide enum (#30035)

Browse source 
Just use Clear instead, they have the same values.
This commit is contained in:
Oriol Brufau 2023-07-27 11:46:15 +02:00 • committed by GitHub
parent 4d627318af
commit 77c6a61dfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/layout_2020/flow/mod.rs
View file

@ -7,7 +7,7 @@
use self::float::PlacementAmongFloats;
use crate::cell::ArcRefCell;
use crate::context::LayoutContext;
use crate::flow::float::{ClearSide, ContainingBlockPositionInfo, FloatBox, SequentialLayoutState};
use crate::flow::float::{ContainingBlockPositionInfo, FloatBox, SequentialLayoutState};
use crate::flow::inline::InlineFormattingContext;
use crate::formatting_contexts::{
IndependentFormattingContext, IndependentLayout, NonReplacedFormattingContext,
@ -222,7 +222,7 @@ impl BlockFormattingContext {
// (https://drafts.csswg.org/css2/#root-height), we implement this by imagining there is
// an element with `clear: both` after the actual contents.
let clearance = sequential_layout_state.and_then(|sequential_layout_state| {
sequential_layout_state.calculate_clearance(ClearSide::Both, &CollapsedMargin::zero())
sequential_layout_state.calculate_clearance(Clear::Both, &CollapsedMargin::zero())
});
IndependentLayout {
@ -654,7 +654,7 @@ fn layout_in_flow_non_replaced_block_level_same_formatting_context(
// Introduce clearance if necessary.
clearance = sequential_layout_state
.calculate_clearance(ClearSide::from_style(style), &block_start_margin);
.calculate_clearance(style.get_box().clear, &block_start_margin);
if clearance.is_some() {
sequential_layout_state.collapse_margins();
}
@ -877,7 +877,7 @@ impl NonReplacedFormattingContext {
let block_start_margin = CollapsedMargin::new(margin.block_start);
let clearance = sequential_layout_state
.calculate_clearance(ClearSide::from_style(&self.style), &block_start_margin);
.calculate_clearance(self.style.get_box().clear, &block_start_margin);
let layout = self.layout(
layout_context,
@ -1037,8 +1037,8 @@ fn layout_in_flow_replaced_block_level<'a>(
let mut adjustment_from_floats = Vec2::zero();
if let Some(ref mut sequential_layout_state) = sequential_layout_state {
let block_start_margin = CollapsedMargin::new(margin.block_start);
let clearance = sequential_layout_state
.calculate_clearance(ClearSide::from_style(style), &block_start_margin);
let clearance =
sequential_layout_state.calculate_clearance(style.get_box().clear, &block_start_margin);
// We calculate a hypothetical value for `bfc_relative_block_position`,
// assuming that there was no adjustment from floats. The real value will