Auto merge of #6940 - pcwalton:inline-pseudo-repair-jumpiness, r=mbrubeck

layout: When repairing styles for incremental reflow, only repair styles of nodes that represent the dirty node, *including its pseudo-element*.

r? @mbrubeck

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

1 files changed, 3 insertions, 2 deletions

diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index 6d4d67e6bbb..78363d0451c 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -15,6 +15,7 @@ use incremental::{REFLOW, REFLOW_OUT_OF_FLOW, RESOLVE_GENERATED_CONTENT};
 use layout_debug;
 use model::IntrinsicISizesContribution;
 use text;
+use wrapper::PseudoElementType;
 
 use euclid::{Point2D, Rect, Size2D};
 use gfx::display_list::OpaqueNode;
@@ -1349,8 +1350,7 @@ impl Flow for InlineFlow {
             self.base.block_container_explicit_block_size;
         for fragment in self.fragments.fragments.iter_mut() {
             fragment.update_late_computed_replaced_inline_size_if_necessary();
-            fragment.assign_replaced_block_size_if_necessary(
-                containing_block_block_size);
+            fragment.assign_replaced_block_size_if_necessary(containing_block_block_size);
         }
 
         // Reset our state, so that we handle incremental reflow correctly.
@@ -1687,6 +1687,7 @@ impl fmt::Debug for InlineFlow {
 pub struct InlineFragmentNodeInfo {
     pub address: OpaqueNode,
     pub style: Arc<ComputedValues>,
+    pub pseudo: PseudoElementType<()>,
 }
 
 #[derive(Clone)]