Auto merge of #6492 - pcwalton:even-more-jumpiness, r=mbrubeck

layout: Modify styles for replaced content as appropriate during incremental flow construction.

Fixes jumpiness on lots of Web sites.

r? @mbrubeck

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6492)
<!-- Reviewable:end -->

1 files changed, 4 insertions, 2 deletions

diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index 12eb258f8f5..cc67cc6c300 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -1249,7 +1249,7 @@ impl<'a> FlowConstructor<'a> {
 
         let mut layout_data_ref = node.mutate_layout_data();
         let layout_data = layout_data_ref.as_mut().expect("no layout data");
-        let style = (*node.get_style(&layout_data)).clone();
+        let mut style = (*node.get_style(&layout_data)).clone();
         let damage = layout_data.data.restyle_damage;
         match node.construction_result_mut(layout_data) {
             &mut ConstructionResult::None => true,
@@ -1297,8 +1297,10 @@ impl<'a> FlowConstructor<'a> {
                                                     .repair_style_and_bubble_inline_sizes(&style);
                         }
                         _ => {
+                            if node.is_replaced_content() {
+                                properties::modify_style_for_replaced_content(&mut style);
+                            }
                             fragment.repair_style(&style);
-                            return true
                         }
                     }
                 }