From bc39f4aca9e5fd592894a371109bf64905861ab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 8 Nov 2017 07:28:47 -0600
Subject: [PATCH] servo: Merge #19149 - style: minor cleanups (from
 emilio:random-cleanup); r=nox

Source-Repo: https://github.com/servo/servo
Source-Revision: cbf2ac35f7ba4188f20ba20284d5c218280537d7

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 1c15073d124dd5d4f1f76758e34103f6489fdcf7
---
 servo/components/style/gecko/pseudo_element.rs | 7 +++----
 servo/components/style/matching.rs             | 7 +------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/servo/components/style/gecko/pseudo_element.rs b/servo/components/style/gecko/pseudo_element.rs
index 0a3d4647e006..8da1c2832ca2 100644
--- a/servo/components/style/gecko/pseudo_element.rs
+++ b/servo/components/style/gecko/pseudo_element.rs
@@ -160,12 +160,11 @@ impl PseudoElement {
 
     /// Whether this pseudo-element should actually exist if it has
     /// the given styles.
-    pub fn should_exist(&self, style: &ComputedValues) -> bool
-    {
-        let display = style.get_box().clone_display();
-        if display == display::T::none {
+    pub fn should_exist(&self, style: &ComputedValues) -> bool {
+        if style.get_box().clone_display() == display::T::none {
             return false;
         }
+
         if self.is_before_or_after() && style.ineffective_content_property() {
             return false;
         }
diff --git a/servo/components/style/matching.rs b/servo/components/style/matching.rs
index 5f140b54ca0d..848fd77f9b21 100644
--- a/servo/components/style/matching.rs
+++ b/servo/components/style/matching.rs
@@ -340,12 +340,7 @@ trait PrivateMatchMethods: TElement {
         pseudo: Option<&PseudoElement>,
     ) -> ChildCascadeRequirement {
         debug!("accumulate_damage_for: {:?}", self);
-
-        // Don't accumulate damage if we're in a forgetful traversal.
-        if shared_context.traversal_flags.contains(TraversalFlags::Forgetful) {
-            debug!(" > forgetful traversal");
-            return ChildCascadeRequirement::MustCascadeChildren;
-        }
+        debug_assert!(!shared_context.traversal_flags.contains(TraversalFlags::Forgetful));
 
         let difference =
             self.compute_style_difference(old_values, new_values, pseudo);