mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
layout: Remove IndependentNonReplacedContents
(#37971)
With the work to unify the layout logic for replaced and non-replaced boxes (#37942), I think the `IndependentNonReplacedContents` enum does no longer make much sense. Therefore, this removes `IndependentNonReplacedContents`, merging its values into `IndependentFormattingContextContents`. The methods defined on `IndependentFormattingContextContents` can now be on `IndependentFormattingContext`, in particular this implies that the layout results of a replaced box will now be cached. Testing: Unneeded (no behavior change) This part of #37942 Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
parent
07247cd4fd
commit
ff050b71fa
7 changed files with 245 additions and 323 deletions
|
@ -123,9 +123,7 @@ use crate::context::LayoutContext;
|
|||
use crate::dom_traversal::NodeAndStyleInfo;
|
||||
use crate::flow::CollapsibleWithParentStartMargin;
|
||||
use crate::flow::float::{FloatBox, SequentialLayoutState};
|
||||
use crate::formatting_contexts::{
|
||||
Baselines, IndependentFormattingContext, IndependentNonReplacedContents,
|
||||
};
|
||||
use crate::formatting_contexts::{Baselines, IndependentFormattingContext};
|
||||
use crate::fragment_tree::{
|
||||
BoxFragment, CollapsedBlockMargins, CollapsedMargin, Fragment, FragmentFlags,
|
||||
PositioningFragment,
|
||||
|
@ -2153,9 +2151,7 @@ impl IndependentFormattingContext {
|
|||
BaselineSource::First => baselines.first,
|
||||
BaselineSource::Last => baselines.last,
|
||||
BaselineSource::Auto => match &self.contents {
|
||||
IndependentFormattingContextContents::NonReplaced(
|
||||
IndependentNonReplacedContents::Flow(_),
|
||||
) => baselines.last,
|
||||
IndependentFormattingContextContents::Flow(_) => baselines.last,
|
||||
_ => baselines.first,
|
||||
},
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue