aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandrov Sergey <splavgm@gmail.com>2016-07-31 12:01:16 +0300
committerAlexandrov Sergey <splavgm@gmail.com>2016-08-11 10:11:11 +0300
commit49b50e45a393e0b60aae45d6e4d19800b5d0c551 (patch)
tree0800552330d497af1f02a7943c70e1a274b964b2
parent69769e44935a7e208efcf7a56ab161f0cddfe2d3 (diff)
downloadservo-49b50e45a393e0b60aae45d6e4d19800b5d0c551.tar.gz
servo-49b50e45a393e0b60aae45d6e4d19800b5d0c551.zip
do not merge inline fragments if there is space in between
-rw-r--r--components/layout/inline.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index 0bc24d76276..5d637b0f2da 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -358,6 +358,10 @@ impl LineBreaker {
let need_to_merge = match (&mut result.specific, &candidate.specific) {
(&mut SpecificFragmentInfo::ScannedText(ref mut result_info),
&SpecificFragmentInfo::ScannedText(ref candidate_info)) => {
+ result.margin.inline_end == Au(0) &&
+ candidate.margin.inline_start == Au(0) &&
+ result.border_padding.inline_end == Au(0) &&
+ candidate.border_padding.inline_start == Au(0) &&
result_info.selected() == candidate_info.selected() &&
arc_ptr_eq(&result_info.run, &candidate_info.run) &&
inline_contexts_are_equal(&result.inline_context,