1 files changed, 43 insertions, 24 deletions

diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index 4099e1f9af5..ee961942300 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -13,6 +13,7 @@
 
 #![deny(unsafe_code)]
 
+use app_units::Au;
 use block::BlockFlow;
 use context::LayoutContext;
 use data::{HAS_NEWLY_CONSTRUCTED_FLOW, PrivateLayoutData};
@@ -808,7 +809,9 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode>
         let mut abs_descendants = AbsoluteDescendants::new();
 
         // Concatenate all the fragments of our kids, creating {ib} splits as necessary.
+        let mut is_empty = true;
         for kid in node.children() {
+            is_empty = false;
             if kid.get_pseudo_element_type() != PseudoElementType::Normal {
                 self.process(&kid);
             }
@@ -889,6 +892,22 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode>
             }
         }
 
+        if is_empty && node.style().has_padding_or_border() {
+            // An empty inline box needs at least one fragment to draw its background and borders.
+            let info = SpecificFragmentInfo::UnscannedText(
+                box UnscannedTextFragmentInfo::new(String::new(), None));
+            let mut modified_style = node.style().clone();
+            properties::modify_style_for_replaced_content(&mut modified_style);
+            properties::modify_style_for_text(&mut modified_style);
+            let fragment = Fragment::from_opaque_node_and_style(node.opaque(),
+                                                                node.get_pseudo_element_type().strip(),
+                                                                modified_style,
+                                                                node.selected_style().clone(),
+                                                                node.restyle_damage(),
+                                                                info);
+            fragment_accumulator.fragments.fragments.push_back(fragment)
+        }
+
         // Finally, make a new construction result.
         if opt_inline_block_splits.len() > 0 || !fragment_accumulator.fragments.is_empty()
                 || abs_descendants.len() > 0 {
@@ -923,8 +942,6 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode>
         }
 
         // If this node is ignorable whitespace, bail out now.
-        //
-        // FIXME(#2001, pcwalton): Don't do this if there's padding or borders.
         if node.is_ignorable_whitespace() {
             return ConstructionResult::ConstructionItem(ConstructionItem::Whitespace(
                 node.opaque(),
@@ -1779,28 +1796,7 @@ pub fn strip_ignorable_whitespace_from_start(this: &mut LinkedList<Fragment>) {
             WhitespaceStrippingResult::FragmentContainedOnlyWhitespace => {
                 let removed_fragment = this.pop_front().unwrap();
                 if let Some(ref mut remaining_fragment) = this.front_mut() {
-                    if let Some(ref mut inline_context_of_remaining_fragment) =
-                            remaining_fragment.inline_context {
-                        if let Some(ref inline_context_of_removed_fragment) =
-                                removed_fragment.inline_context {
-                            for (inline_context_node_from_removed_fragment,
-                                 inline_context_node_from_remaining_fragment) in
-                                    inline_context_of_removed_fragment.nodes.iter().rev().zip(
-                                        inline_context_of_remaining_fragment.nodes.iter_mut().rev()
-                                    ) {
-                                if !inline_context_node_from_removed_fragment.flags.contains(
-                                        FIRST_FRAGMENT_OF_ELEMENT) {
-                                    continue
-                                }
-                                if inline_context_node_from_removed_fragment.address !=
-                                        inline_context_node_from_remaining_fragment.address {
-                                    continue
-                                }
-                                inline_context_node_from_remaining_fragment.flags.insert(
-                                    FIRST_FRAGMENT_OF_ELEMENT);
-                            }
-                        }
-                    }
+                    remaining_fragment.meld_with_prev_inline_fragment(&removed_fragment);
                 }
             }
         }
@@ -1865,6 +1861,7 @@ fn control_chars_to_fragment(node: &InlineFragmentNodeInfo,
     let info = SpecificFragmentInfo::UnscannedText(
         box UnscannedTextFragmentInfo::new(String::from(text), None));
     let mut style = node.style.clone();
+    properties::modify_style_for_replaced_content(&mut style);
     properties::modify_style_for_text(&mut style);
     Fragment::from_opaque_node_and_style(node.address,
                                          node.pseudo,
@@ -1873,3 +1870,25 @@ fn control_chars_to_fragment(node: &InlineFragmentNodeInfo,
                                          restyle_damage,
                                          info)
 }
+
+/// Convenience methods for computed CSS values
+trait ComputedValueUtils {
+    /// Returns true if this node has non-zero padding or border.
+    fn has_padding_or_border(&self) -> bool;
+}
+
+impl ComputedValueUtils for ServoComputedValues {
+    fn has_padding_or_border(&self) -> bool {
+        let padding = self.get_padding();
+        let border = self.get_border();
+
+        !padding.padding_top.is_definitely_zero() ||
+           !padding.padding_right.is_definitely_zero() ||
+           !padding.padding_bottom.is_definitely_zero() ||
+           !padding.padding_left.is_definitely_zero() ||
+           border.border_top_width != Au(0) ||
+           border.border_right_width != Au(0) ||
+           border.border_bottom_width != Au(0) ||
+           border.border_left_width != Au(0)
+    }
+}