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

Temporarily convert existing cfg(debug_assertions) crashes to warnings (#30578)

Browse source
This commit is contained in:
Delan Azabani 2023-10-18 21:16:11 +08:00 • committed by GitHub
parent 351b5036bf
commit 66258bfbbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 53 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/block.rs
View file

@ -1762,7 +1762,11 @@ impl BlockFlow {
}
// If you remove the might_have_floats_in conditional, this will go off.
debug_assert!(!self.is_inline_flex_item());
// TODO(servo#30572) revert to debug_assert!() once underlying bug is fixed
#[cfg(debug_assertions)]
if !(!self.is_inline_flex_item()) {
log::warn!("debug assertion failed! !self.is_inline_flex_item()");
}
// Compute the available space for us, based on the actual floats.
let rect = self.base.floats.available_rect(

4
components/layout/floats.rs
View file

@ -163,7 +163,9 @@ impl Floats {
/// Adjusts the recorded offset of the flow relative to the first float.
pub fn translate(&mut self, delta: LogicalSize<Au>) {
self.offset = self.offset + delta
// TODO(servo#30577) revert once underlying bug is fixed
// self.offset = self.offset + delta
self.offset = self.offset.add_or_warn(delta)
}
/// Returns the position of the last float in flow coordinates.

6
components/layout/flow.rs
View file

@ -1376,7 +1376,11 @@ impl MutableOwnedFlowUtils for FlowRef {
let base = FlowRef::deref_mut(self).mut_base();
for descendant_link in abs_descendants.descendant_links.iter_mut() {
debug_assert!(!descendant_link.has_reached_containing_block);
// TODO(servo#30573) revert to debug_assert!() once underlying bug is fixed
#[cfg(debug_assertions)]
if !(!descendant_link.has_reached_containing_block) {
log::warn!("debug assertion failed! !descendant_link.has_reached_containing_block");
}
let descendant_base = FlowRef::deref_mut(&mut descendant_link.flow).mut_base();
descendant_base.absolute_cb.set(this.clone());
}

4
components/layout/fragment.rs
View file

@ -1517,7 +1517,9 @@ impl Fragment {
if let Some(ref inline_fragment_context) = self.inline_context {
for node in &inline_fragment_context.nodes {
if node.style.get_box().position == Position::Relative {
rel_pos = rel_pos + from_style(&*node.style, containing_block_size);
// TODO(servo#30577) revert once underlying bug is fixed
// rel_pos = rel_pos + from_style(&*node.style, containing_block_size);
rel_pos = rel_pos.add_or_warn(from_style(&*node.style, containing_block_size));
}
}
}