auto merge of #3640 : cgaebel/servo/incremental-flow-construction, r=pcwalton

This also hides the not-yet-working parts of incremental reflow behind a runtime
flag. As I get the failing reftests passing, I'll send pull requests for them one
by one.

1 files changed, 6 insertions, 0 deletions

diff --git a/components/util/time.rs b/components/util/time.rs
index d3e9b5df65d..8ac5bd05943 100644
--- a/components/util/time.rs
+++ b/components/util/time.rs
@@ -68,6 +68,8 @@ pub enum TimeProfilerCategory {
     CompositingCategory,
     LayoutPerformCategory,
     LayoutStyleRecalcCategory,
+    LayoutRestyleDamagePropagation,
+    LayoutNonIncrementalReset,
     LayoutSelectorMatchCategory,
     LayoutTreeBuilderCategory,
     LayoutDamagePropagateCategory,
@@ -86,6 +88,8 @@ impl Formatable for TimeProfilerCategory {
     fn format(&self) -> String {
         let padding = match *self {
             LayoutStyleRecalcCategory |
+            LayoutRestyleDamagePropagation |
+            LayoutNonIncrementalReset |
             LayoutMainCategory |
             LayoutDispListBuildCategory |
             LayoutShapingCategory |
@@ -99,6 +103,8 @@ impl Formatable for TimeProfilerCategory {
             CompositingCategory => "Compositing",
             LayoutPerformCategory => "Layout",
             LayoutStyleRecalcCategory => "Style Recalc",
+            LayoutRestyleDamagePropagation => "Restyle Damage Propagation",
+            LayoutNonIncrementalReset => "Non-incremental reset (temporary)",
             LayoutSelectorMatchCategory => "Selector Matching",
             LayoutTreeBuilderCategory => "Tree Building",
             LayoutDamagePropagateCategory => "Damage Propagation",