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

layout: white_space::pre should not yield ignorable whitespace.

Browse source 
Improves the Google home page.
This commit is contained in:
Patrick Walton 2014-10-04 19:17:39 -07:00
parent 543f11b62b
commit d30762bb9f
5 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/layout/fragment.rs
View file

@ -1501,10 +1501,17 @@ impl Fragment {
} }
} }
/// Returns true if this fragment is an unscanned text fragment that consists entirely of whitespace. /// Returns true if this fragment is an unscanned text fragment that consists entirely of
pub fn is_whitespace_only(&self) -> bool { /// whitespace that should be stripped.
pub fn is_ignorable_whitespace(&self) -> bool {
match self.white_space() {
white_space::pre => return false,
white_space::normal | white_space::nowrap => {}
}
match self.specific { match self.specific {
UnscannedTextFragment(ref text_fragment_info) => is_whitespace(text_fragment_info.text.as_slice()), UnscannedTextFragment(ref text_fragment_info) => {
is_whitespace(text_fragment_info.text.as_slice())
}
_ => false, _ => false,
} }
} }

5
components/layout/inline.rs
View file

@ -708,7 +708,7 @@ impl InlineFragments {
let mut new_fragments = Vec::new(); let mut new_fragments = Vec::new();
let mut skipping = true; let mut skipping = true;
for fragment in fragments { for fragment in fragments {
if skipping && fragment.is_whitespace_only() { if skipping && fragment.is_ignorable_whitespace() {
debug!("stripping ignorable whitespace from start"); debug!("stripping ignorable whitespace from start");
continue continue
} }
@ -727,7 +727,8 @@ impl InlineFragments {
} }
let mut new_fragments = self.fragments.clone(); let mut new_fragments = self.fragments.clone();
while new_fragments.len() > 0 && new_fragments.as_slice().last().as_ref().unwrap().is_whitespace_only() { while new_fragments.len() > 0 &&
new_fragments.as_slice().last().as_ref().unwrap().is_ignorable_whitespace() {
debug!("stripping ignorable whitespace from end"); debug!("stripping ignorable whitespace from end");
drop(new_fragments.pop()); drop(new_fragments.pop());
} }

1
tests/ref/basic.list
View file

@ -165,3 +165,4 @@ fragment=top != ../html/acid2.html acid2_ref.html
== inline_hypothetical_box_a.html inline_hypothetical_box_ref.html == inline_hypothetical_box_a.html inline_hypothetical_box_ref.html
== box_sizing_border_box_a.html box_sizing_border_box_ref.html == box_sizing_border_box_a.html box_sizing_border_box_ref.html
!= input_height_a.html input_height_ref.html != input_height_a.html input_height_ref.html
== pre_ignorable_whitespace_a.html pre_ignorable_whitespace_ref.html

7
tests/ref/pre_ignorable_whitespace_a.html Normal file
View file

@ -0,0 +1,7 @@
<!DOCTYPE html>
<html>
<body>
<span style="background: yellow; white-space: pre">yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa<span> </span></span>
</body>
</html>

7
tests/ref/pre_ignorable_whitespace_ref.html Normal file
View file

@ -0,0 +1,7 @@
<!DOCTYPE html>
<html>
<body>
<span style="background: yellow">yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa<span style="white-space: pre"> </span></span>
</body>
</html>