Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Lay absolutely-positioned blocks with inline containing blocks out of

Browse source 
flow.

Removes the long space before the site-specific drop-down in the Google SERPs.
This commit is contained in:
Patrick Walton 2015-09-03 11:41:24 -07:00
parent 05deb3dcc8
commit dba3e41a63
5 changed files with 40 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/layout/fragment.rs
View file

@ -2378,6 +2378,13 @@ impl Fragment {
self.style.get_box().position == position::T::absolute self.style.get_box().position == position::T::absolute
} }
pub fn is_inline_absolute(&self) -> bool {
match self.specific {
SpecificFragmentInfo::InlineAbsolute(..) => true,
_ => false,
}
}
pub fn meld_with_next_inline_fragment(&mut self, next_fragment: &Fragment) { pub fn meld_with_next_inline_fragment(&mut self, next_fragment: &Fragment) {
if let Some(ref mut inline_context_of_this_fragment) = self.inline_context { if let Some(ref mut inline_context_of_this_fragment) = self.inline_context {
if let Some(ref inline_context_of_next_fragment) = next_fragment.inline_context { if let Some(ref inline_context_of_next_fragment) = next_fragment.inline_context {

25
components/layout/inline.rs
View file

@ -738,13 +738,17 @@ impl LineBreaker {
layout_context: &LayoutContext) { layout_context: &LayoutContext) {
let indentation = self.indentation_for_pending_fragment(); let indentation = self.indentation_for_pending_fragment();
self.pending_line.range.extend_by(FragmentIndex(1)); self.pending_line.range.extend_by(FragmentIndex(1));
self.pending_line.bounds.size.inline = self.pending_line.bounds.size.inline +
fragment.margin_box_inline_size() + if !fragment.is_inline_absolute() {
indentation; self.pending_line.bounds.size.inline = self.pending_line.bounds.size.inline +
self.pending_line.inline_metrics = fragment.margin_box_inline_size() +
self.new_inline_metrics_for_line(&fragment, layout_context); indentation;
self.pending_line.bounds.size.block = self.pending_line.inline_metrics =
self.new_block_size_for_line(&fragment, layout_context); self.new_inline_metrics_for_line(&fragment, layout_context);
self.pending_line.bounds.size.block =
self.new_block_size_for_line(&fragment, layout_context);
}
self.new_fragments.push(fragment); self.new_fragments.push(fragment);
} }
@ -1079,8 +1083,11 @@ impl InlineFlow {
fragment.border_box.size.inline, fragment.border_box.size.inline,
fragment.border_box.size.block); fragment.border_box.size.block);
fragment.update_late_computed_inline_position_if_necessary(); fragment.update_late_computed_inline_position_if_necessary();
inline_start_position_for_fragment = inline_start_position_for_fragment +
fragment.border_box.size.inline + fragment.margin.inline_end; if !fragment.is_inline_absolute() {
inline_start_position_for_fragment = inline_start_position_for_fragment +
fragment.border_box.size.inline + fragment.margin.inline_end;
}
} }
} }
} }

1
tests/ref/basic.list
View file

@ -159,6 +159,7 @@ prefs:"layout.writing-mode.enabled" == iframe/size_attributes_vertical_writing_m
== incremental_float_a.html incremental_float_ref.html == incremental_float_a.html incremental_float_ref.html
== incremental_inline_layout_a.html incremental_inline_layout_ref.html == incremental_inline_layout_a.html incremental_inline_layout_ref.html
== inline_absolute_hypothetical_clip_a.html inline_absolute_hypothetical_clip_ref.html == inline_absolute_hypothetical_clip_a.html inline_absolute_hypothetical_clip_ref.html
== inline_absolute_out_of_flow_a.html inline_absolute_out_of_flow_ref.html
!= inline_background_a.html inline_background_ref.html != inline_background_a.html inline_background_ref.html
== inline_block_baseline_a.html inline_block_baseline_ref.html == inline_block_baseline_a.html inline_block_baseline_ref.html
== inline_block_block_direction_margins_a.html inline_block_block_direction_margins_ref.html == inline_block_block_direction_margins_a.html inline_block_block_direction_margins_ref.html

13
tests/ref/inline_absolute_out_of_flow_a.html Normal file
View file

@ -0,0 +1,13 @@
<!DOCTYPE html>
<style>
#a {
display: inline;
position: relative;
}
#b {
position: absolute;
display: block;
}
</style>
<div>A<span id=a><div id=b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div></span>B</div>

3
tests/ref/inline_absolute_out_of_flow_ref.html Normal file
View file

@ -0,0 +1,3 @@
<!DOCTYPE html>
<div>AB</div>