Revert "layout: Implement ordered lists, CSS counters, and `quotes` per CSS 2.1"

This reverts commit 30fd28d1077fbb3f47140f6ab1252c0d24f44d23.

1 files changed, 11 insertions, 37 deletions

diff --git a/components/layout/incremental.rs b/components/layout/incremental.rs
index 2bf7a67ee7a..b163a8fbf29 100644
--- a/components/layout/incremental.rs
+++ b/components/layout/incremental.rs
@@ -2,7 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use flow::{self, AFFECTS_COUNTERS, Flow, HAS_COUNTER_AFFECTING_CHILDREN, IS_ABSOLUTELY_POSITIONED};
+use flow::{self, Flow};
+use flow::{IS_ABSOLUTELY_POSITIONED};
 
 use std::fmt;
 use std::sync::Arc;
@@ -31,12 +32,8 @@ bitflags! {
         #[doc = "top-down."]
         const REFLOW = 0x08,
 
-        #[doc = "Re-resolve generated content. \
-                 Propagates up the flow tree because the computation is inorder."]
-        const RESOLVE_GENERATED_CONTENT = 0x10,
-
         #[doc = "The entire flow needs to be reconstructed."]
-        const RECONSTRUCT_FLOW = 0x20
+        const RECONSTRUCT_FLOW = 0x10
     }
 }
 
@@ -53,9 +50,9 @@ impl RestyleDamage {
     /// we should add to the *parent* of this flow.
     pub fn damage_for_parent(self, child_is_absolutely_positioned: bool) -> RestyleDamage {
         if child_is_absolutely_positioned {
-            self & (REPAINT | REFLOW_OUT_OF_FLOW | RESOLVE_GENERATED_CONTENT)
+            self & (REPAINT | REFLOW_OUT_OF_FLOW)
         } else {
-            self & (REPAINT | REFLOW | REFLOW_OUT_OF_FLOW | RESOLVE_GENERATED_CONTENT)
+            self & (REPAINT | REFLOW | REFLOW_OUT_OF_FLOW)
         }
     }
 
@@ -94,11 +91,10 @@ impl fmt::Debug for RestyleDamage {
         let mut first_elem = true;
 
         let to_iter =
-            [ (REPAINT, "Repaint")
-            , (BUBBLE_ISIZES, "BubbleISizes")
+            [ (REPAINT,         "Repaint")
+            , (BUBBLE_ISIZES,    "BubbleISizes")
             , (REFLOW_OUT_OF_FLOW, "ReflowOutOfFlow")
-            , (REFLOW, "Reflow")
-            , (RESOLVE_GENERATED_CONTENT, "ResolveGeneratedContent")
+            , (REFLOW,          "Reflow")
             , (RECONSTRUCT_FLOW, "ReconstructFlow")
             ];
 
@@ -130,18 +126,10 @@ macro_rules! add_if_not_equal(
     })
 );
 
-/// Returns a bitmask that represents a fully damaged flow.
-///
-/// Use this instead of `RestyleDamage::all()` because `RestyleDamage::all()` will result in
-/// unnecessary sequential resolution of generated content.
-pub fn all() -> RestyleDamage {
-    REPAINT | BUBBLE_ISIZES | REFLOW_OUT_OF_FLOW | REFLOW | RECONSTRUCT_FLOW
-}
-
 pub fn compute_damage(old: &Option<Arc<ComputedValues>>, new: &ComputedValues) -> RestyleDamage {
     let old: &ComputedValues =
         match old.as_ref() {
-            None => return all(),
+            None => return RestyleDamage::all(),
             Some(cv) => &**cv,
         };
 
@@ -198,9 +186,6 @@ impl<'a> LayoutDamageComputation for &'a mut (Flow + 'a) {
         let mut special_damage = SpecialRestyleDamage::empty();
         let is_absolutely_positioned = flow::base(self).flags.contains(IS_ABSOLUTELY_POSITIONED);
 
-        // In addition to damage, we use this phase to compute whether nodes affect CSS counters.
-        let mut has_counter_affecting_children = false;
-
         {
             let self_base = flow::mut_base(self);
             for kid in self_base.children.iter_mut() {
@@ -214,32 +199,21 @@ impl<'a> LayoutDamageComputation for &'a mut (Flow + 'a) {
                 self_base.restyle_damage
                          .insert(flow::base(kid).restyle_damage.damage_for_parent(
                                  child_is_absolutely_positioned));
-
-                has_counter_affecting_children = has_counter_affecting_children ||
-                    flow::base(kid).flags.intersects(AFFECTS_COUNTERS |
-                                                     HAS_COUNTER_AFFECTING_CHILDREN);
-
             }
         }
 
-        let self_base = flow::mut_base(self);
+        let self_base = flow::base(self);
         if self_base.flags.float_kind() != float::T::none &&
                 self_base.restyle_damage.intersects(REFLOW) {
             special_damage.insert(REFLOW_ENTIRE_DOCUMENT);
         }
 
-        if has_counter_affecting_children {
-            self_base.flags.insert(HAS_COUNTER_AFFECTING_CHILDREN)
-        } else {
-            self_base.flags.remove(HAS_COUNTER_AFFECTING_CHILDREN)
-        }
-
         special_damage
     }
 
     fn reflow_entire_document(self) {
         let self_base = flow::mut_base(self);
-        self_base.restyle_damage.insert(all());
+        self_base.restyle_damage.insert(RestyleDamage::all());
         self_base.restyle_damage.remove(RECONSTRUCT_FLOW);
         for kid in self_base.children.iter_mut() {
             kid.reflow_entire_document();