mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
layout: Do not inherit node and fragment flags in anonymous boxes (#31586)
This doesn't really have observable behavior right now, as much as I tried to trigger some kind of bug. On the other hand, it's just wrong and is very obvious when you dump the Fragment tree. If you create a `display: table-cell` that is a child of the `<body>` all parts of the anonymous table are flagged as if they are the `<body>` element.
This commit is contained in:
parent
55f908653f
commit
1f23ec2b27
7 changed files with 73 additions and 38 deletions
|
@ -26,7 +26,7 @@ use crate::formatting_contexts::{
|
|||
IndependentFormattingContext, NonReplacedFormattingContext,
|
||||
NonReplacedFormattingContextContents,
|
||||
};
|
||||
use crate::fragment_tree::{BaseFragmentInfo, FragmentFlags, Tag};
|
||||
use crate::fragment_tree::BaseFragmentInfo;
|
||||
use crate::style_ext::{DisplayGeneratingBox, DisplayLayoutInternal};
|
||||
|
||||
/// A reference to a slot and its coordinates in the table
|
||||
|
@ -87,7 +87,7 @@ impl Table {
|
|||
&PseudoElement::ServoAnonymousTable,
|
||||
&parent_info.style,
|
||||
);
|
||||
let anonymous_info = parent_info.new_replacing_style(anonymous_style.clone());
|
||||
let anonymous_info = parent_info.new_anonymous(anonymous_style.clone());
|
||||
|
||||
let mut table_builder =
|
||||
TableBuilderTraversal::new(context, &anonymous_info, propagated_text_decoration_line);
|
||||
|
@ -642,7 +642,7 @@ where
|
|||
&PseudoElement::ServoAnonymousTableCell,
|
||||
&self.info.style,
|
||||
);
|
||||
let anonymous_info = self.info.new_replacing_style(anonymous_style);
|
||||
let anonymous_info = self.info.new_anonymous(anonymous_style);
|
||||
let mut row_builder =
|
||||
TableRowBuilder::new(self, &anonymous_info, self.current_text_decoration_line);
|
||||
|
||||
|
@ -756,8 +756,12 @@ where
|
|||
::std::mem::forget(box_slot)
|
||||
},
|
||||
DisplayLayoutInternal::TableColumn => {
|
||||
let node = info.node.to_threadsafe();
|
||||
let span = (node.get_span().unwrap_or(1) as usize).min(1000);
|
||||
let span = info
|
||||
.node
|
||||
.and_then(|node| node.to_threadsafe().get_span())
|
||||
.unwrap_or(1)
|
||||
.min(1000);
|
||||
|
||||
for _ in 0..span + 1 {
|
||||
self.builder.table.columns.push(TableTrack {
|
||||
base_fragment_info: info.into(),
|
||||
|
@ -785,8 +789,11 @@ where
|
|||
|
||||
let first_column = self.builder.table.columns.len();
|
||||
if column_group_builder.columns.is_empty() {
|
||||
let node = info.node.to_threadsafe();
|
||||
let span = (node.get_span().unwrap_or(1) as usize).min(1000);
|
||||
let span = info
|
||||
.node
|
||||
.and_then(|node| node.to_threadsafe().get_span())
|
||||
.unwrap_or(1)
|
||||
.min(1000) as usize;
|
||||
|
||||
self.builder.table.columns.extend(
|
||||
repeat(TableTrack {
|
||||
|
@ -894,7 +901,7 @@ where
|
|||
&PseudoElement::ServoAnonymousTableCell,
|
||||
&self.info.style,
|
||||
);
|
||||
let anonymous_info = self.info.new_replacing_style(anonymous_style);
|
||||
let anonymous_info = self.info.new_anonymous(anonymous_style);
|
||||
let mut builder =
|
||||
BlockContainerBuilder::new(context, &anonymous_info, self.text_decoration_line);
|
||||
|
||||
|
@ -914,22 +921,13 @@ where
|
|||
}
|
||||
}
|
||||
|
||||
let tag = Tag::new_pseudo(
|
||||
self.info.node.opaque(),
|
||||
Some(PseudoElement::ServoAnonymousTableCell),
|
||||
);
|
||||
let base_fragment_info = BaseFragmentInfo {
|
||||
tag,
|
||||
flags: FragmentFlags::empty(),
|
||||
};
|
||||
|
||||
let block_container = builder.finish();
|
||||
self.table_traversal.builder.add_cell(TableSlotCell {
|
||||
contents: BlockFormattingContext::from_block_container(block_container),
|
||||
colspan: 1,
|
||||
rowspan: 1,
|
||||
style: anonymous_info.style,
|
||||
base_fragment_info,
|
||||
base_fragment_info: BaseFragmentInfo::anonymous(),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -965,9 +963,12 @@ where
|
|||
// 65534 and `colspan` to 1000, so we also enforce the same limits
|
||||
// when dealing with arbitrary DOM elements (perhaps created via
|
||||
// script).
|
||||
let node = info.node.to_threadsafe();
|
||||
let rowspan = (node.get_rowspan().unwrap_or(1) as usize).min(65534);
|
||||
let colspan = (node.get_colspan().unwrap_or(1) as usize).min(1000);
|
||||
let (rowspan, colspan) = info.node.map_or((1, 1), |node| {
|
||||
let node = node.to_threadsafe();
|
||||
let rowspan = node.get_rowspan().unwrap_or(1).min(65534) as usize;
|
||||
let colspan = node.get_colspan().unwrap_or(1).min(1000) as usize;
|
||||
(rowspan, colspan)
|
||||
});
|
||||
|
||||
let contents = match contents.try_into() {
|
||||
Ok(non_replaced_contents) => {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue