Bug 1324661 part 1. When recreating style contexts for elements in stylo, use the right frame (not the primary fr draft
authorBoris Zbarsky <bzbarsky@mit.edu>
Sat, 18 Feb 2017 11:27:58 +1100
changeset 486850 6e8b727ddd83e0628e35c1d7c7dba05c2a62ec77
parent 486849 03c271989b1ae5b1d31f7ee1d157b9249cd7079d
child 486851 4c5e1db06908c024416732a7652f0e818ce56324
push id46076
push userxquan@mozilla.com
push dateMon, 20 Feb 2017 03:59:33 +0000
bugs1324661
milestone54.0a1
Bug 1324661 part 1. When recreating style contexts for elements in stylo, use the right frame (not the primary fr ame\!) for tables. r?bholley MozReview-Commit-ID: B7vtZpbJNlt
gfx/tests/crashtests/crashtests.list
layout/base/ServoRestyleManager.cpp
layout/base/crashtests/crashtests.list
layout/generic/crashtests/crashtests.list
layout/reftests/abs-pos/reftest-stylo.list
layout/reftests/bugs/reftest-stylo.list
layout/reftests/css-display/reftest-stylo.list
layout/reftests/flexbox/reftest-stylo.list
layout/reftests/margin-collapsing/reftest-stylo.list
layout/reftests/mathml/reftest-stylo.list
layout/reftests/pixel-rounding/reftest-stylo.list
layout/reftests/table-background/reftest-stylo.list
layout/reftests/table-bordercollapse/reftest-stylo.list
layout/reftests/table-width/reftest-stylo.list
layout/reftests/text/reftest-stylo.list
layout/reftests/w3c-css/received/reftest-stylo.list
layout/reftests/writing-mode/tables/reftest-stylo.list
layout/svg/crashtests/crashtests.list
layout/tables/crashtests/crashtests.list
layout/tables/reftests/reftest-stylo.list
widget/cocoa/crashtests/crashtests.list
--- a/gfx/tests/crashtests/crashtests.list
+++ b/gfx/tests/crashtests/crashtests.list
@@ -101,20 +101,20 @@ load 686190-1.html
 load 691581-1.html
 load 693143-1.html
 load 696936-1.html
 load 699563-1.html
 load 710149-1.html
 asserts-if(stylo,1) load 766452-1.html # bug 1324700
 load 766452-2.html
 load 768079-1.html
-asserts-if(stylo,2) load 783041-1.html # bug 1324661
-asserts-if(stylo,2-4) load 783041-2.html # bug 1324661
-asserts-if(stylo,2) load 783041-3.html # bug 1324661
-asserts-if(stylo,2) load 783041-4.html # bug 1324661
+load 783041-1.html
+load 783041-2.html
+load 783041-3.html
+load 783041-4.html
 load 798853.html # bug 868792
 load 805760-1.html
 skip-if(Android) load 815489.html # bug 1216304
 load 836225-1.html
 load 839745-1.html
 load 856784-1.html
 load 893572-1.html
 load 893572-2.html
--- a/layout/base/ServoRestyleManager.cpp
+++ b/layout/base/ServoRestyleManager.cpp
@@ -123,31 +123,60 @@ ServoRestyleManager::ClearDirtyDescendan
     if (n->IsElement()) {
       ClearDirtyDescendantsFromSubtree(n->AsElement());
     }
   }
 
   aElement->UnsetHasDirtyDescendantsForServo();
 }
 
+static void
+UpdateStyleContextForTableWrapper(nsIFrame* aTableWrapper,
+                                  nsStyleContext* aTableStyleContext,
+                                  ServoStyleSet* aStyleSet)
+{
+  MOZ_ASSERT(aTableWrapper->GetType() == nsGkAtoms::tableWrapperFrame);
+  MOZ_ASSERT(aTableWrapper->StyleContext()->GetPseudo() ==
+             nsCSSAnonBoxes::tableWrapper);
+  RefPtr<nsStyleContext> newContext =
+    aStyleSet->ResolveAnonymousBoxStyle(nsCSSAnonBoxes::tableWrapper,
+                                        aTableStyleContext);
+  aTableWrapper->SetStyleContext(newContext);
+}
+
 void
 ServoRestyleManager::RecreateStyleContexts(Element* aElement,
                                            nsStyleContext* aParentContext,
                                            ServoStyleSet* aStyleSet,
                                            nsStyleChangeList& aChangeListToProcess)
 {
-  nsIFrame* primaryFrame = aElement->GetPrimaryFrame();
+  nsIFrame* styleFrame = nsLayoutUtils::GetStyleFrame(aElement);
+  bool isTable = styleFrame != aElement->GetPrimaryFrame();
 
   nsChangeHint changeHint = Servo_TakeChangeHint(aElement);
   // Although we shouldn't generate non-ReconstructFrame hints for elements with
   // no frames, we can still get them here if they were explicitly posted by
   // PostRestyleEvent, such as a RepaintFrame hint when a :link changes to be
   // :visited.  Skip processing these hints if there is no frame.
-  if ((primaryFrame || changeHint & nsChangeHint_ReconstructFrame) && changeHint) {
-    aChangeListToProcess.AppendChange(primaryFrame, aElement, changeHint);
+  if ((styleFrame || (changeHint & nsChangeHint_ReconstructFrame)) && changeHint) {
+    if (isTable) {
+      // This part is a bit annoying: when isTable, that means the style frame
+      // is actually a _child_ of the primary frame.  In that situation, we want
+      // to go ahead and append the changeHint for the _parent_ but also append
+      // all the parts of it not handled for descendants for the _child_.
+      MOZ_ASSERT(styleFrame, "Or else GetPrimaryFrame() would be null too");
+      MOZ_ASSERT(styleFrame->GetParent() == aElement->GetPrimaryFrame(),
+                 "How did that happen?");
+      aChangeListToProcess.AppendChange(aElement->GetPrimaryFrame(), aElement,
+                                        changeHint);
+      aChangeListToProcess.AppendChange(styleFrame, aElement,
+                                        NS_HintsNotHandledForDescendantsIn(changeHint));
+    } else {
+      aChangeListToProcess.AppendChange(styleFrame, aElement, changeHint);
+    }
   }
 
   // If our change hint is reconstruct, we delegate to the frame constructor,
   // which consumes the new style and expects the old style to be on the frame.
   //
   // XXXbholley: We should teach the frame constructor how to clear the dirty
   // descendants bit to avoid the traversal here.
   if (changeHint & nsChangeHint_ReconstructFrame) {
@@ -158,17 +187,17 @@ ServoRestyleManager::RecreateStyleContex
   // TODO(emilio): We could avoid some refcount traffic here, specially in the
   // ServoComputedValues case, which uses atomic refcounting.
   //
   // Hold the old style context alive, because it could become a dangling
   // pointer during the replacement. In practice it's not a huge deal (on
   // GetNextContinuationWithSameStyle the pointer is not dereferenced, only
   // compared), but better not playing with dangling pointers if not needed.
   RefPtr<nsStyleContext> oldStyleContext =
-    primaryFrame ? primaryFrame->StyleContext() : nullptr;
+    styleFrame ? styleFrame->StyleContext() : nullptr;
 
   RefPtr<ServoComputedValues> computedValues =
     aStyleSet->ResolveServoStyle(aElement);
 
   // Note that we rely in the fact that we don't cascade pseudo-element styles
   // separately right now (that is, if a pseudo style changes, the normal style
   // changes too).
   //
@@ -184,21 +213,29 @@ ServoRestyleManager::RecreateStyleContex
   if (recreateContext) {
     RefPtr<nsStyleContext> newContext =
       aStyleSet->GetContext(computedValues.forget(), aParentContext, nullptr,
                             CSSPseudoElementType::NotPseudo, aElement);
 
     // XXX This could not always work as expected: there are kinds of content
     // with the first split and the last sharing style, but others not. We
     // should handle those properly.
-    for (nsIFrame* f = primaryFrame; f;
+    for (nsIFrame* f = styleFrame; f;
          f = GetNextContinuationWithSameStyle(f, oldStyleContext)) {
       f->SetStyleContext(newContext);
     }
 
+    if (isTable) {
+      nsIFrame* primaryFrame = aElement->GetPrimaryFrame();
+      MOZ_ASSERT(primaryFrame->StyleContext()->GetPseudo() ==
+                   nsCSSAnonBoxes::tableWrapper,
+                 "What sort of frame is this?");
+      UpdateStyleContextForTableWrapper(primaryFrame, newContext, aStyleSet);
+    }
+
     // Update pseudo-elements state if appropriate.
     const static CSSPseudoElementType pseudosToRestyle[] = {
       CSSPseudoElementType::before,
       CSSPseudoElementType::after,
     };
 
     for (CSSPseudoElementType pseudoType : pseudosToRestyle) {
       nsIAtom* pseudoTag = nsCSSPseudoElements::GetPseudoAtom(pseudoType);
@@ -230,30 +267,30 @@ ServoRestyleManager::RecreateStyleContex
   }
 
   bool traverseElementChildren = aElement->HasDirtyDescendantsForServo();
   bool traverseTextChildren = recreateContext;
   if (traverseElementChildren || traverseTextChildren) {
     StyleChildrenIterator it(aElement);
     for (nsIContent* n = it.GetNextChild(); n; n = it.GetNextChild()) {
       if (traverseElementChildren && n->IsElement()) {
-        if (!primaryFrame) {
+        if (!styleFrame) {
           // The frame constructor presumably decided to suppress frame
           // construction on this subtree. Just clear the dirty descendants
           // bit from the subtree, since there's no point in harvesting the
           // change hints.
           MOZ_ASSERT(!n->AsElement()->GetPrimaryFrame(),
                      "Only display:contents should do this, and we don't handle that yet");
           ClearDirtyDescendantsFromSubtree(n->AsElement());
         } else {
-          RecreateStyleContexts(n->AsElement(), primaryFrame->StyleContext(),
+          RecreateStyleContexts(n->AsElement(), styleFrame->StyleContext(),
                                 aStyleSet, aChangeListToProcess);
         }
       } else if (traverseTextChildren && n->IsNodeOfType(nsINode::eTEXT)) {
-        RecreateStyleContextsForText(n, primaryFrame->StyleContext(),
+        RecreateStyleContextsForText(n, styleFrame->StyleContext(),
                                      aStyleSet);
       }
     }
   }
 
   aElement->UnsetHasDirtyDescendantsForServo();
 }
 
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -212,17 +212,17 @@ load 403569-1.xhtml
 load 403569-2.xhtml
 load 403569-3.xhtml
 skip-if(stylo) load 404218-1.xhtml # bug 1338761
 load 404491-1.html
 load 404721-1.xhtml
 load 404721-2.xhtml
 load 405049-1.xul
 load 405184-1.xhtml
-asserts-if(stylo,2) load 405186-1.xhtml # bug 1324661
+load 405186-1.xhtml
 load 406675-1.html
 load 408292.html
 load 408299.html
 load 408450-1.xhtml
 load 409461-1.xhtml
 load 409513.html
 load 410967.html
 load 411870-1.html
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -638,12 +638,12 @@ load 1278007.html
 load 1278080.html
 load 1279814.html
 load large-border-radius-dashed.html
 load large-border-radius-dashed2.html
 load large-border-radius-dotted.html
 load large-border-radius-dotted2.html
 load 1278461-1.html
 load 1278461-2.html
-asserts-if(stylo,6) load 1281102.html # bug 1324661
+load 1281102.html
 load 1297427-non-equal-centers.html
 load 1304441.html
 load 1316649.html
--- a/layout/reftests/abs-pos/reftest-stylo.list
+++ b/layout/reftests/abs-pos/reftest-stylo.list
@@ -1,15 +1,15 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 == font-size-wrap.html font-size-wrap.html
 == abs-pos-auto-margin-1.html abs-pos-auto-margin-1.html
 fails == auto-offset-inline-block-1.html auto-offset-inline-block-1.html
 == fieldset-1.html fieldset-1.html
-fails asserts-if(stylo,4) == table-1.html table-1.html # bug 1324661
-fails asserts-if(stylo,4) == table-2.html table-2.html # bug 1324661
+== table-1.html table-1.html
+== table-2.html table-2.html
 == table-3.html table-3.html
 == table-caption-1.html table-caption-1.html
 == table-caption-2.html table-caption-2.html
 == table-caption-3.html table-caption-3.html
 == table-caption-4.html table-caption-4.html
 == table-caption-5.html table-caption-5.html
 == table-cell-1.html table-cell-1.html
 == table-cell-2.html table-cell-2.html
--- a/layout/reftests/bugs/reftest-stylo.list
+++ b/layout/reftests/bugs/reftest-stylo.list
@@ -94,17 +94,17 @@ fails == 84400-2.html 84400-2.html
 == 97777-1.html 97777-1.html
 fails == 97777-2.html 97777-2.html
 == 98223-1.html 98223-1.html
 == 98223-2.html 98223-2.html
 # == 99850-1a.html 99850-1a.html # bug 1337695
 # == 99850-1b.html 99850-1b.html # bug 1337695
 fails == 99850-1c.html 99850-1c.html
 # == 99850-1d.html 99850-1d.html # bug 1337695
-asserts-if(stylo,6-8) == 105030-1.html 105030-1.html # bug 1324661
+== 105030-1.html 105030-1.html
 == 109735-1.html 109735-1.html
 == 116882-1.html 116882-1.html
 == 120834-1a.html 120834-1a.html
 == 120834-2a.html 120834-2a.html
 # == 120834-2b.html 120834-2b.html
 == 120834-2c.html 120834-2c.html
 == 120834-2d.html 120834-2d.html
 == 120834-2e.html 120834-2e.html
@@ -139,17 +139,17 @@ fails == 139550-1b.html 139550-1b.html
 fails == 142233-1.html 142233-1.html
 == 144004-1.html 144004-1.html
 == 144004-2.html 144004-2.html
 == 144004-3.html 144004-3.html
 fails == 163504-1a.html 163504-1a.html
 fails == 163504-1b.html 163504-1b.html
 fails == 163504-2a.html 163504-2a.html
 fails == 163504-2b.html 163504-2b.html
-asserts-if(stylo,4) == 167496-1.html 167496-1.html # bug 1324661
+== 167496-1.html 167496-1.html
 == 169749-1.html 169749-1.html
 == 172073-1.html 172073-1.html
 fails == 175190-1.html 175190-1.html
 fails == 179596-1a.html 179596-1a.html
 fails == 179596-1b.html 179596-1b.html
 # == 179596-2.html 179596-2.html
 # == 179596-2.html 179596-2.html
 # == 179596-2.html 179596-2.html
@@ -206,17 +206,17 @@ fails == 212563-1.html 212563-1.html
 fails == 213834-1.html 213834-1.html
 fails == 214077-1a.html 214077-1a.html
 fails == 214077-1b.html 214077-1b.html
 == 218473-1.html 218473-1.html
 fuzzy-if(skiaContent,1,4) == 220165-1.svg 220165-1.svg
 fails == 223809-1.html 223809-1.html
 == 228856-1.html 228856-1.html
 == 228856-2.html 228856-2.html
-asserts-if(stylo,4) == 229591-1.html 229591-1.html # bug 1324661
+== 229591-1.html 229591-1.html
 # == 231823-1.html 231823-1.html
 == 232990-1a.xhtml 232990-1a.xhtml
 == 232990-1b.xhtml 232990-1b.xhtml
 fails == 233094-1.html 233094-1.html
 fails == 233094-2a.html 233094-2a.html
 fails == 233094-2b.html 233094-2b.html
 fails == 233094-2c.html 233094-2c.html
 == 234686-1.html 234686-1.html
@@ -248,24 +248,24 @@ fails == 240933-1.html 240933-1.html
 fails == 240933-2.html 240933-2.html
 == 243266-1.html 243266-1.html
 == 243302-1.html 243302-1.html
 fails == 243519-1.html 243519-1.html
 == 243519-2.html 243519-2.html
 == 243519-3.html 243519-3.html
 == 243519-4a.html 243519-4a.html
 == 243519-4b.html 243519-4b.html
-asserts-if(stylo,2) == 243519-4c.html 243519-4c.html # bug 1324661
-asserts-if(stylo,1) == 243519-4d.html 243519-4d.html # bug 1324661
+== 243519-4c.html 243519-4c.html
+== 243519-4d.html 243519-4d.html
 == 243519-4e.html 243519-4e.html
 == 243519-4f.html 243519-4f.html
 == 243519-5a.html 243519-5a.html
-asserts-if(stylo,2) == 243519-5b.html 243519-5b.html # bug 1324661
+== 243519-5b.html 243519-5b.html
 == 243519-5c.html 243519-5c.html
-asserts-if(stylo,1) == 243519-5d.html 243519-5d.html # bug 1324661
+== 243519-5d.html 243519-5d.html
 == 243519-6.html 243519-6.html
 fails == 243519-7.html 243519-7.html
 == 243519-8.svg 243519-8.svg
 == 243519-9a.html 243519-9a.html
 == 243519-9b.html 243519-9b.html
 == 243519-9c.html 243519-9c.html
 == 243519-9d.html 243519-9d.html
 == 243519-9e.html 243519-9e.html
@@ -308,17 +308,17 @@ fails == 281241-2.xhtml 281241-2.xhtml
 fails == 289384-1.xhtml 289384-1.xhtml
 # == 289480.html#top 289480.html#top
 fails == 290129-1.html 290129-1.html
 fails == 291078-1.html 291078-1.html
 fails == 291078-2.html 291078-2.html
 == 291262-1.html 291262-1.html
 # == 294306-1.html 294306-1.html
 # == 294306-1.html 294306-1.html
-asserts-if(stylo,4) fails == 296361-1.html 296361-1.html # bug 1324661
+fails == 296361-1.html 296361-1.html
 == 296904-1.html 296904-1.html
 fails == 299136-1.html 299136-1.html
 == 299837-1.html 299837-1.html
 == 299837-2.xul 299837-2.xul
 random-if(d2d) == 299837-3.xul 299837-3.xul
 fails == 300691-1a.html 300691-1a.html
 fails == 300691-1b.html 300691-1b.html
 fails == 300691-1c.html 300691-1c.html
@@ -420,18 +420,18 @@ fails == 315920-30.html 315920-30.html
 == 321738-1.html 321738-1.html
 == 322436-1.html 322436-1.html
 == 322461-1.xml 322461-1.xml
 == 323656-1.html 323656-1.html
 == 323656-2.html 323656-2.html
 fails == 323656-3.html 323656-3.html
 == 323656-4.html 323656-4.html
 == 323656-5.svg 323656-5.svg
-fails asserts-if(stylo,12) == 323656-6.html 323656-6.html # bug 1324661
-fails asserts-if(stylo,4) == 325292-1.html 325292-1.html
+== 323656-6.html 323656-6.html
+fails == 325292-1.html 325292-1.html
 fails == 325486-1.html 325486-1.html
 == 328111-1.html 328111-1.html
 random == 328829-1.xhtml 328829-1.xhtml
 == 328829-2.xhtml 328829-2.xhtml
 == 329359-1.html 329359-1.html
 fails == 331809-1.html 331809-1.html
 == 332360.html 332360.html
 # == 332360-ltr.html 332360-ltr.html
@@ -468,17 +468,17 @@ fails == 346774-1c.html 346774-1c.html
 fails == 347348-1.xhtml 347348-1.xhtml
 fails == 347496-1.xhtml 347496-1.xhtml
 == 347912-1.html 347912-1.html
 fails == 348049-1.xhtml 348049-1.xhtml
 fails == 348516-1.html 348516-1.html
 # == 348516-2.html 348516-2.html
 # == 348516-2.html 348516-2.html
 fails == 348516-3.html 348516-3.html
-asserts-if(stylo,6) == 348597-1.html 348597-1.html # bug 1324661
+== 348597-1.html 348597-1.html
 == 348809-1a.html 348809-1a.html
 == 348809-1b.html 348809-1b.html
 == 348809-1c.html 348809-1c.html
 == 348809-1d.html 348809-1d.html
 == 348809-1e.html 348809-1e.html
 == 348809-1f.html 348809-1f.html
 fails == 348809-2a.html 348809-2a.html
 fails == 348809-2b.html 348809-2b.html
@@ -520,17 +520,17 @@ fails == 352980-3c.html 352980-3c.html
 fails == 352980-3d.html 352980-3d.html
 fails == 352980-3e.html 352980-3e.html
 fails == 352980-3f.html 352980-3f.html
 == 355548-1.xml 355548-1.xml
 == 355548-2.xml 355548-2.xml
 == 355548-3.xml 355548-3.xml
 == 355548-4.xml 355548-4.xml
 == 355548-5.xml 355548-5.xml
-asserts-if(stylo,4) == 356774-1.html 356774-1.html # bug 1324661
+== 356774-1.html 356774-1.html
 == 356775-1.html 356775-1.html
 fails == 359869-1.html 359869-1.html
 fails == 359903-1.html 359903-1.html
 fails == 359903-2.html 359903-2.html
 == 360065-1.html 360065-1.html
 # == 360746-1.html 360746-1.html
 == 360757-1a.html 360757-1a.html
 == 360757-1b.html 360757-1b.html
@@ -668,23 +668,23 @@ fails == 373433-1.html 373433-1.html
 == 373533-2.xhtml 373533-2.xhtml
 == 373533-3.xhtml 373533-3.xhtml
 == 374038-1.xul 374038-1.xul
 == 374038-2.xul 374038-2.xul
 random-if(d2d) == 374719-1.xul 374719-1.xul
 == 374927-1.html 374927-1.html
 == 375508-1.html 375508-1.html
 == 375716-1.html 375716-1.html
-asserts-if(stylo,6) == 375827-1.html 375827-1.html # bug 1324661
+== 375827-1.html 375827-1.html
 fails == 376375-1.html 376375-1.html
 == 376484-1.html 376484-1.html
 == 376532-1.html 376532-1.html
 == 376532-2.html 376532-2.html
 == 376532-3.html 376532-3.html
-fails asserts-if(stylo,4) == 377603-1.html 377603-1.html # bug 1324661
+== 377603-1.html 377603-1.html
 == 377918.html 377918.html
 == 378535-1.html 378535-1.html
 fails == 378933-1.html 378933-1.html
 fails == 378935-1.html 378935-1.html
 fails == 378937-1.html 378937-1.html
 == 379178-xhtml.xhtml 379178-xhtml.xhtml
 fails == 379178-html.html 379178-html.html
 == 379178-svg.svg 379178-svg.svg
@@ -704,17 +704,17 @@ fails == 379361-2.html 379361-2.html
 fails == 379361-3.html 379361-3.html
 == 379461-1.xhtml 379461-1.xhtml
 == 379461-2.xhtml 379461-2.xhtml
 # == 379461-3-container-xhtml.html 379461-3-container-xhtml.html
 # == 379461-3-container-xhtml.html 379461-3-container-xhtml.html
 fails == 380004-1.html 380004-1.html
 fails == 380227-1.html 380227-1.html
 fails == 380825-1.html 380825-1.html
-fails == 380842-1.html 380842-1.html
+== 380842-1.html 380842-1.html
 == 381130-1.html 381130-1.html
 fails == 381507-1.html 381507-1.html
 == 381746-1.html 381746-1.html
 fails == 382600-1.html 382600-1.html
 fails == 382916-1.html 382916-1.html
 fails == 383035-1.html 383035-1.html
 fails == 383035-2.html 383035-2.html
 == 383488-1.html 383488-1.html
@@ -734,19 +734,19 @@ fails HTTP(..) == 385569-1a.html 385569-
 fails HTTP(..) == 385569-1b.html 385569-1b.html
 == 385607-1.html 385607-1.html
 fails == 385823-1.html 385823-1.html
 fails == 385823-2a.html 385823-2a.html
 fails == 385823-2b.html 385823-2b.html
 fails == 385823-2c.html 385823-2c.html
 fails == 385870-1.html 385870-1.html
 fails == 385870-2.html 385870-2.html
-fails asserts-if(stylo,3) == 386014-1a.html 386014-1a.html # bug 1324661
-fails asserts-if(stylo,6) == 386014-1b.html 386014-1b.html # bug 1324661
-fails == 386014-1c.html 386014-1c.html
+== 386014-1a.html 386014-1a.html
+== 386014-1b.html 386014-1b.html
+== 386014-1c.html 386014-1c.html
 fails == 386065-1.html 386065-1.html
 == 386065-2.html 386065-2.html
 fails test-pref(layout.float-fragments-inside-column.enabled,false) fails == 386147-1.html 386147-1.html
 fails test-pref(layout.float-fragments-inside-column.enabled,true) == 386147-1.html 386147-1.html
 == 386310-1a.html 386310-1a.html
 == 386310-1b.html 386310-1b.html
 == 386310-1c.html 386310-1c.html
 == 386310-1d.html 386310-1d.html
@@ -766,21 +766,21 @@ fails == 386470-1b.html 386470-1b.html
 == 387876-1.html 387876-1.html
 == 387876-2.html 387876-2.html
 == 387876-3a.html 387876-3a.html
 == 387876-3b.html 387876-3b.html
 == 388026-1.html 388026-1.html
 fails == 389074-1.html 389074-1.html
 # == 389224-1.html 389224-1.html
 # == 389224-2.html 389224-2.html
-fails asserts-if(stylo,9) == 389468-1.html 389468-1.html # bug 1324661
+fails == 389468-1.html 389468-1.html
 == 389623-1.html 389623-1.html
 == 389636-1.html 389636-1.html
 # == 389924-1a.html 389924-1a.html
-fails asserts-if(stylo,10) == 389924-1b.html 389924-1b.html # bug 1324661
+== 389924-1b.html 389924-1b.html
 # == 389924-1a.html 389924-1a.html
 == 390318-1a.html 390318-1a.html
 == 390318-1b.html 390318-1b.html
 == 390318-1c.html 390318-1c.html
 == 390318-1d.html 390318-1d.html
 == 390318-1e.html 390318-1e.html
 == 390318-1f.html 390318-1f.html
 skip-if(!winWidget) == 391045.html 391045.html
@@ -874,17 +874,17 @@ fails == 403249-1a.html 403249-1a.html
 fails == 403249-1b.html 403249-1b.html
 fails == 403249-2a.html 403249-2a.html
 fails == 403249-2b.html 403249-2b.html
 == 403328-1.html 403328-1.html
 == 403426-1.html 403426-1.html
 fails == 403455-1.html 403455-1.html
 == 403505-1.xml 403505-1.xml
 #== 403519-1.html 403519-1.html
-asserts-if(stylo,4) == 403519-2.html 403519-2.html # bug 1324661
+== 403519-2.html 403519-2.html
 fails == 403656-1.html 403656-1.html
 fails == 403656-2.html 403656-2.html
 fails == 403656-3.html 403656-3.html
 fails == 403656-4.html 403656-4.html
 fails == 403656-5.html 403656-5.html
 #== 403657-1.html 403657-1.html
 fails == 403733-1.html 403733-1.html
 # == 403962-1.xhtml 403962-1.xhtml
@@ -909,18 +909,18 @@ fails == 404666-2.html 404666-2.html
 fails == 405305-1.html 405305-1.html
 == 405380-1.html 405380-1.html
 == 405517-1.xhtml 405517-1.xhtml
 fails == 405577-1.html 405577-1.html
 == 405584-1.html 405584-1.html
 # == 405952-1.html 405952-1.html
 == 406484-1.html 406484-1.html
 == 406568-1.html 406568-1.html
-fails asserts-if(stylo,8) == 407016-1-a.html 407016-1-a.html # bug 1324661
-fails asserts-if(stylo,8) == 407016-1-b.html 407016-1-b.html # bug 1324661
+fails == 407016-1-a.html 407016-1-a.html
+fails == 407016-1-b.html 407016-1-b.html
 fails == 407078-1.html 407078-1.html
 fails == 407095-1.html 407095-1.html
 fails == 407111-1.html 407111-1.html
 fails == 407227-1.html 407227-1.html
 fails == 407243-1.html 407243-1.html
 == 407419-1.html 407419-1.html
 == 407937-1.html 407937-1.html
 == 408493-1.html 408493-1.html
@@ -1013,17 +1013,17 @@ fails == 420790-1.xhtml 420790-1.xhtml
 == 421239-2.html 421239-2.html
 == 421419-1.html 421419-1.html
 == 421436-1a.html 421436-1a.html
 == 421436-1b.html 421436-1b.html
 fails asserts-if(stylo,0-4) == 421632-1.html 421632-1.html # bug 1335314
 fails == 421710-1.html 421710-1.html
 fails-if(Android) fails-if(usesRepeatResampling) == 421885-1.xml 421885-1.xml
 == 421955-1.html 421955-1.html
-fails asserts-if(stylo,2) == 422249-1.html 422249-1.html # bug 1324661
+fails == 422249-1.html 422249-1.html
 fails == 422394-1.html 422394-1.html
 fails == 422678-1.html 422678-1.html
 == 423130-1.html 423130-1.html
 == 423385-1.html 423385-1.html
 fails == 423599-1.html 423599-1.html
 fails == 423676-1.html 423676-1.html
 fails == 423823-1.html 423823-1.html
 == 424074-1.xul 424074-1.xul
@@ -1035,33 +1035,33 @@ random-if(gtkWidget) == 424074-1-ref2.xu
 == 424236-4.html 424236-4.html
 == 424236-5.html 424236-5.html
 == 424236-6.html 424236-6.html
 == 424236-7.html 424236-7.html
 == 424236-8.html 424236-8.html
 == 424236-9.html 424236-9.html
 == 424236-10.html 424236-10.html
 == 424236-11.html 424236-11.html
-asserts-if(stylo,4) == 424434-1.html 424434-1.html # bug 1324661
-fails asserts-if(stylo,4) == 424465-1.html 424465-1.html # bug 1324661
+== 424434-1.html 424434-1.html
+fails == 424465-1.html 424465-1.html
 == 424631-1.html 424631-1.html
 == 424710-1.html 424710-1.html
 fails == 424766-1.html 424766-1.html
 # == 425972-1.html 425972-1.html
 fails == 425972-2.html 425972-2.html
 # == 425972-1.html 425972-1.html
 fails == 426629-1.html 426629-1.html
 asserts(3-6) == 427017-1.xhtml 427017-1.xhtml
 == 427129-scrollframe.html 427129-scrollframe.html
 == 427129-table.html 427129-table.html
 == 427129-image.html 427129-image.html
 == 427129-table-caption.html 427129-table-caption.html
 == 427370-1.html 427370-1.html
 fails == 427730-1.html 427730-1.html
-asserts-if(stylo,6) == 428278.html 428278.html # bug 1324661
+== 428278.html 428278.html
 == 428423-1a.html 428423-1a.html
 == 428423-1b.html 428423-1b.html
 fails == 428521-1a.html 428521-1a.html
 fails == 428521-1b.html 428521-1b.html
 fails == 428521-1c.html 428521-1c.html
 # == 428810-1a-ltr.html 428810-1a-ltr.html
 # == 428810-1b-ltr.html 428810-1b-ltr.html
 # == 428810-1c-ltr.html 428810-1c-ltr.html
@@ -1159,18 +1159,18 @@ fails == 444015-1.html 444015-1.html
 == 444375-1.html 444375-1.html
 fails == 444928-1.html 444928-1.html
 fails == 444928-2.html 444928-2.html
 fails == 444928-3.html 444928-3.html
 fails random == 445004-1.html 445004-1.html
 == 445142-1a.html 445142-1a.html
 == 445142-1b.html 445142-1b.html
 == 445142-1c.html 445142-1c.html
-asserts-if(stylo,72) == 445142-2a.html 445142-2a.html # bug 1324661
-asserts-if(stylo,72) == 445142-2b.html 445142-2b.html # bug 1324661
+== 445142-2a.html 445142-2a.html
+== 445142-2b.html 445142-2b.html
 fails-if(usesRepeatResampling) == 446100-1a.html 446100-1a.html
 fails-if(Android) fails-if(usesRepeatResampling) == 446100-1b.html 446100-1b.html
 fails-if(Android) fails-if(usesRepeatResampling) == 446100-1c.html 446100-1c.html
 fails-if(usesRepeatResampling) == 446100-1d.html 446100-1d.html
 fails-if(usesRepeatResampling) == 446100-1e.html 446100-1e.html
 == 446100-1f.html 446100-1f.html
 fails-if(usesRepeatResampling) fails-if(Android) == 446100-1g.html 446100-1g.html
 == 446100-1h.html 446100-1h.html
@@ -1182,18 +1182,18 @@ fails == 449149-1b.html 449149-1b.html
 fails test-pref(dom.use_xbl_scopes_for_remote_xul,true) == 449149-1a.html 449149-1a.html
 fails test-pref(dom.use_xbl_scopes_for_remote_xul,true) == 449149-1b.html 449149-1b.html
 == 449149-2.html 449149-2.html
 == 449171-1.html 449171-1.html
 fails == 449362-1.html 449362-1.html
 == 449519-1.html 449519-1.html
 == 450670-1.html 450670-1.html
 fails == 451168-1.html 451168-1.html
-asserts-if(stylo,2) == 451876-1.html 451876-1.html # bug 1324661
-asserts-if(stylo,2) == 451876-2.html 451876-2.html # bug 1324661
+== 451876-1.html 451876-1.html
+== 451876-2.html 451876-2.html
 == 452915-1.html 452915-1.html
 == 452964-1.html 452964-1.html
 # == 454361.html 454361.html
 == 455105-1.html 455105-1.html
 == 455105-2.html 455105-2.html
 fails == 455171-5.html 455171-5.html
 fails == 455280-1.xhtml 455280-1.xhtml
 fails == 455826-1.html 455826-1.html
@@ -1325,18 +1325,18 @@ fails-if(Android) random-if(winWidget) f
 == 482398-1.html 482398-1.html
 fails == 482592-1a.xhtml 482592-1a.xhtml
 fails == 482592-1b.xhtml 482592-1b.xhtml
 == 482659-1a.html 482659-1a.html
 == 482659-1b.html 482659-1b.html
 == 482659-1c.html 482659-1c.html
 == 482659-1d.html 482659-1d.html
 == 483565.xul 483565.xul
-asserts-if(stylo,4) == 484256-1.html 484256-1.html # bug 1324661
-asserts-if(stylo,4) == 484256-2.html 484256-2.html # bug 1324661
+== 484256-1.html 484256-1.html
+== 484256-2.html 484256-2.html
 == 485012-1.html 485012-1.html
 fails == 485275-1.html 485275-1.html
 fails == 485275-1.svg 485275-1.svg
 == 486052-1.html 486052-1.html
 == 486052-2a.html 486052-2a.html
 == 486052-2b.html 486052-2b.html
 == 486052-2c.html 486052-2c.html
 == 486052-2d.html 486052-2d.html
@@ -1753,17 +1753,17 @@ fails == 776265-2d.html 776265-2d.html
 == 814677.html 814677.html
 fails == 814952-1.html 814952-1.html
 fails == 815593-1.html 815593-1.html
 == 816359-1.html 816359-1.html
 fails == 816458-1.html 816458-1.html
 fails == 816948-1.html 816948-1.html
 == 817019-1.html 817019-1.html
 fails == 818276-1.html 818276-1.html
-fails asserts-if(stylo,0-4) == 825999.html 825999.html # bug 1324661
+fails == 825999.html 825999.html
 == 827577-1a.html 827577-1a.html
 == 827577-1b.html 827577-1b.html
 fails == 827799-1.html 827799-1.html
 == 829958.html 829958.html
 == 836844-1.html 836844-1.html
 == 841192-1.html 841192-1.html
 fails == 844178.html 844178.html
 == 846144-1.html 846144-1.html
@@ -1846,17 +1846,17 @@ fails == 1042104-1.html 1042104-1.html
 fails == 1053035-1-flex.html 1053035-1-flex.html
 fails test-pref(layout.css.grid.enabled,true) == 1053035-1-grid.html 1053035-1-grid.html
 == 1059167-1.html 1059167-1.html
 fails == 1059498-1.html 1059498-1.html
 fails == 1059498-2.html 1059498-2.html
 fails == 1059498-3.html 1059498-3.html
 == 1062108-1.html 1062108-1.html
 fails == 1062792-1.html 1062792-1.html
-fails == 1062963-floatmanager-reflow.html 1062963-floatmanager-reflow.html
+== 1062963-floatmanager-reflow.html 1062963-floatmanager-reflow.html
 # test-pref(dom.webcomponents.enabled,true) == 1066554-1.html 1066554-1.html
 fails == 1069716-1.html 1069716-1.html
 == 1078262-1.html 1078262-1.html
 test-pref(layout.testing.overlay-scrollbars.always-visible,false) == 1081072-1.html 1081072-1.html
 == 1081185-1.html 1081185-1.html
 == 1097437-1.html 1097437-1.html
 == 1103258-1.html 1103258-1.html
 fails == 1105137-1.html 1105137-1.html
--- a/layout/reftests/css-display/reftest-stylo.list
+++ b/layout/reftests/css-display/reftest-stylo.list
@@ -1,16 +1,16 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 # Tests for CSS Display spec features.
 # http://dev.w3.org/csswg/css-display
 
 fails == display-contents-acid.html display-contents-acid.html
 # fuzzy-if(Android,8,604) == display-contents-acid-dyn-1.html display-contents-acid-dyn-1.html
-fails asserts-if(stylo,5) == display-contents-acid-dyn-2.html display-contents-acid-dyn-2.html # bug 1337700
-fails asserts-if(stylo,2) == display-contents-acid-dyn-3.html display-contents-acid-dyn-3.html # bug 1324661
+fails == display-contents-acid-dyn-2.html display-contents-acid-dyn-2.html # bug 1337700
+fails == display-contents-acid-dyn-3.html display-contents-acid-dyn-3.html
 # == display-contents-generated-content.html display-contents-generated-content.html
 # == display-contents-generated-content-2.html display-contents-generated-content-2.html
 fails == display-contents-style-inheritance-1.html display-contents-style-inheritance-1.html
 fails == display-contents-style-inheritance-1-stylechange.html display-contents-style-inheritance-1-stylechange.html
 # == display-contents-style-inheritance-1-dom-mutations.html display-contents-style-inheritance-1-dom-mutations.html
 == display-contents-tables.xhtml display-contents-tables.xhtml
 == display-contents-tables-2.xhtml display-contents-tables-2.xhtml
 == display-contents-tables-3.xhtml display-contents-tables-3.xhtml
@@ -19,11 +19,11 @@ fails == display-contents-style-inherita
 # == display-contents-495385-2d.html display-contents-495385-2d.html
 fails == display-contents-xbl.xhtml display-contents-xbl.xhtml
 # fuzzy-if(Android,7,1186) pref(dom.webcomponents.enabled,true) == display-contents-shadow-dom-1.html display-contents-shadow-dom-1.html
 == display-contents-xbl-2.xul display-contents-xbl-2.xul
 asserts(2) == display-contents-xbl-3.xul display-contents-xbl-3.xul
 # == display-contents-xbl-4.xul display-contents-xbl-4.xul
 # == display-contents-fieldset.html display-contents-fieldset.html
 asserts(2-10) == display-contents-xbl-5.xul display-contents-xbl-5.xul
-# == display-contents-list-item-child.html display-contents-list-item-child.html
+# == display-contents-list-item-child.html display-contents-list-item-child.html # disabled for bug 1340607
 == display-contents-writing-mode-1.html display-contents-writing-mode-1.html
 fails == display-contents-writing-mode-2.html display-contents-writing-mode-2.html
--- a/layout/reftests/flexbox/reftest-stylo.list
+++ b/layout/reftests/flexbox/reftest-stylo.list
@@ -89,18 +89,18 @@ fails == flexbox-inlinecontent-horiz-1b.
 fails == flexbox-inlinecontent-horiz-2.xhtml flexbox-inlinecontent-horiz-2.xhtml
 fails == flexbox-inlinecontent-horiz-3a.xhtml flexbox-inlinecontent-horiz-3a.xhtml
 fails == flexbox-inlinecontent-horiz-3b.xhtml flexbox-inlinecontent-horiz-3b.xhtml
 fails == flexbox-inlinecontent-horiz-3c.xhtml flexbox-inlinecontent-horiz-3c.xhtml
 == flexbox-inlinecontent-horiz-4.xhtml flexbox-inlinecontent-horiz-4.xhtml
 fails == flexbox-inlinecontent-horiz-5.xhtml flexbox-inlinecontent-horiz-5.xhtml
 
 # Tests for intrinsic sizing of flexboxes
-fails asserts-if(stylo,36) == flexbox-intrinsic-sizing-horiz-1a.xhtml flexbox-intrinsic-sizing-horiz-1a.xhtml # bug 1324661
-fails asserts-if(stylo,36) == flexbox-intrinsic-sizing-horiz-1b.xhtml flexbox-intrinsic-sizing-horiz-1b.xhtml # bug 1324661
+fails == flexbox-intrinsic-sizing-horiz-1a.xhtml flexbox-intrinsic-sizing-horiz-1a.xhtml
+fails == flexbox-intrinsic-sizing-horiz-1b.xhtml flexbox-intrinsic-sizing-horiz-1b.xhtml
 fails == flexbox-intrinsic-sizing-horiz-2a.xhtml flexbox-intrinsic-sizing-horiz-2a.xhtml
 fails == flexbox-intrinsic-sizing-horiz-2b.xhtml flexbox-intrinsic-sizing-horiz-2b.xhtml
 
 # Tests for invalidation after dynamic modifications
 == flexbox-invalidation-1.html flexbox-invalidation-1.html
 
 # Tests for flexbox in an iframe that gets resized.
 fails == flexbox-resizeviewport-1.xhtml flexbox-resizeviewport-1.xhtml
--- a/layout/reftests/margin-collapsing/reftest-stylo.list
+++ b/layout/reftests/margin-collapsing/reftest-stylo.list
@@ -685,24 +685,24 @@ fails == block-overflow-5c-dyn.html bloc
 == table-caption-bottom-outside-1-dyn.html table-caption-bottom-outside-1-dyn.html
 == table-caption-bottom-outside-2-dyn.html table-caption-bottom-outside-2-dyn.html
 == caption-sibling-1a.html caption-sibling-1a.html
 == caption-sibling-1a.html caption-sibling-1a.html
 == caption-sibling-1b.html caption-sibling-1b.html
 == caption-sibling-1b.html caption-sibling-1b.html
 == caption-sibling-1c.html caption-sibling-1c.html
 == caption-sibling-1c.html caption-sibling-1c.html
-asserts-if(stylo,2) == caption-sibling-1a-dyn.html caption-sibling-1a-dyn.html # bug 1337703
-asserts-if(stylo,2) == caption-sibling-1a-dyn.html caption-sibling-1a-dyn.html # bug 1337703
-asserts-if(stylo,2) == caption-sibling-1b-dyn.html caption-sibling-1b-dyn.html # bug 1337703
-asserts-if(stylo,2) == caption-sibling-1b-dyn.html caption-sibling-1b-dyn.html # bug 1337703
-asserts-if(stylo,2) == caption-sibling-1c-dyn.html caption-sibling-1c-dyn.html # bug 1337703
-asserts-if(stylo,2) == caption-sibling-1c-dyn.html caption-sibling-1c-dyn.html # bug 1337703
-asserts-if(stylo,2) == caption-sibling-2-dyn.html caption-sibling-2-dyn.html # bug 1337700
-asserts-if(stylo,2) == caption-sibling-2-dyn.html caption-sibling-2-dyn.html # bug 1337700
+== caption-sibling-1a-dyn.html caption-sibling-1a-dyn.html
+== caption-sibling-1a-dyn.html caption-sibling-1a-dyn.html
+== caption-sibling-1b-dyn.html caption-sibling-1b-dyn.html
+== caption-sibling-1b-dyn.html caption-sibling-1b-dyn.html
+== caption-sibling-1c-dyn.html caption-sibling-1c-dyn.html
+== caption-sibling-1c-dyn.html caption-sibling-1c-dyn.html
+== caption-sibling-2-dyn.html caption-sibling-2-dyn.html
+== caption-sibling-2-dyn.html caption-sibling-2-dyn.html
 == caption-child-1.html caption-child-1.html
 == caption-child-1-dyn.html caption-child-1-dyn.html
 # * Multi-column elements, per CSS Multi-column Layout Module
 # (Candidate Recommendation 12 April 2011):
 # "A multi-column element establishes a new block formatting context [...]"
 == column-sibling-1a.html column-sibling-1a.html
 == column-sibling-1b.html column-sibling-1b.html
 == column-sibling-1c.html column-sibling-1c.html
--- a/layout/reftests/mathml/reftest-stylo.list
+++ b/layout/reftests/mathml/reftest-stylo.list
@@ -319,17 +319,17 @@ fails == rowlines-1c.html rowlines-1c.ht
 fails == rowlines-2a.html rowlines-2a.html
 fails == rowlines-2b.html rowlines-2b.html
 fails == rowlines-3-1.html rowlines-3-1.html
 fails == rowlines-3-2.html rowlines-3-2.html
 fails == tablespacing-1.html tablespacing-1.html
 fails == tablespacing-2.html tablespacing-2.html
 fails == tablespacing-3.html tablespacing-3.html
 fails == tablespacing-4.html tablespacing-4.html
-fails asserts-if(stylo,0-2) == tablespacing-5.html tablespacing-5.html # bug 1324661
+fails == tablespacing-5.html tablespacing-5.html
 fails == tablespacing-5a.html tablespacing-5a.html
 fails == tablespacing-6.html tablespacing-6.html
 fails == tablespacing-7.html tablespacing-7.html
 fails == tablespacing-8a.html tablespacing-8a.html
 fails == tablespacing-8b.html tablespacing-8b.html
 fails == op-dict-1.html op-dict-1.html
 fails == op-dict-2.html op-dict-2.html
 == op-dict-3.html op-dict-3.html
--- a/layout/reftests/pixel-rounding/reftest-stylo.list
+++ b/layout/reftests/pixel-rounding/reftest-stylo.list
@@ -76,28 +76,28 @@
 == background-image-height-top-5.html background-image-height-top-5.html
 == background-image-height-top-6.html background-image-height-top-6.html
 == background-image-width-left-4.html background-image-width-left-4.html
 == background-image-width-left-5.html background-image-width-left-5.html
 == background-image-width-left-6.html background-image-width-left-6.html
 
 
 # These all fail due bug 371180, plus a bunch of other bugs that ought to be filed.
-asserts-if(stylo,40) == collapsed-border-height-4.html collapsed-border-height-4.html # bug 1324661
-asserts-if(stylo,40) == collapsed-border-height-5.html collapsed-border-height-5.html # bug 1324661
-asserts-if(stylo,40) == collapsed-border-height-6.html collapsed-border-height-6.html # bug 1324661
-asserts-if(stylo,40) == collapsed-border-width-4.html collapsed-border-width-4.html # bug 1324661
-asserts-if(stylo,40) == collapsed-border-width-5.html collapsed-border-width-5.html # bug 1324661
-asserts-if(stylo,40) == collapsed-border-width-6.html collapsed-border-width-6.html # bug 1324661
-asserts-if(stylo,40) == collapsed-border-left-4.html collapsed-border-left-4.html # bug 1324661
-asserts-if(stylo,40) == collapsed-border-left-5.html collapsed-border-left-5.html # bug 1324661
-asserts-if(stylo,40) == collapsed-border-left-6.html collapsed-border-left-6.html # bug 1324661
-asserts-if(stylo,40) == collapsed-border-top-4.html collapsed-border-top-4.html # bug 1324661
-asserts-if(stylo,40) == collapsed-border-top-5.html collapsed-border-top-5.html # bug 1324661
-asserts-if(stylo,40) == collapsed-border-top-6.html collapsed-border-top-6.html # bug 1324661
+== collapsed-border-height-4.html collapsed-border-height-4.html
+== collapsed-border-height-5.html collapsed-border-height-5.html
+== collapsed-border-height-6.html collapsed-border-height-6.html
+== collapsed-border-width-4.html collapsed-border-width-4.html
+== collapsed-border-width-5.html collapsed-border-width-5.html
+== collapsed-border-width-6.html collapsed-border-width-6.html
+== collapsed-border-left-4.html collapsed-border-left-4.html
+== collapsed-border-left-5.html collapsed-border-left-5.html
+== collapsed-border-left-6.html collapsed-border-left-6.html
+== collapsed-border-top-4.html collapsed-border-top-4.html
+== collapsed-border-top-5.html collapsed-border-top-5.html
+== collapsed-border-top-6.html collapsed-border-top-6.html
 
 
 == image-base-ref.html image-base-ref.html
 == image-height-4.html image-height-4.html
 == image-height-5.html image-height-5.html
 == image-height-6.html image-height-6.html
 == image-base-ref.html image-base-ref.html
 == image-top-4.html image-top-4.html
--- a/layout/reftests/table-background/reftest-stylo.list
+++ b/layout/reftests/table-background/reftest-stylo.list
@@ -1,63 +1,63 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 # these could be moved to crashtests
-fails asserts-if(stylo,4) == backgr_border-table-cell.html backgr_border-table-cell.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_border-table-column-group.html backgr_border-table-column-group.html # bug 1324661
+fails == backgr_border-table-cell.html backgr_border-table-cell.html
+fails == backgr_border-table-column-group.html backgr_border-table-column-group.html
 # This seems to be caused by bug 527825
-fails asserts-if(stylo,4) == backgr_border-table-column.html backgr_border-table-column.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_border-table-quirks.html backgr_border-table-quirks.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_border-table-row-group.html backgr_border-table-row-group.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_border-table-row.html backgr_border-table-row.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_border-table.html backgr_border-table.html # bug 1324661
-fails asserts-if(stylo,8) == backgr_fixed-bg.html backgr_fixed-bg.html # bug 1324661
+fails == backgr_border-table-column.html backgr_border-table-column.html
+fails == backgr_border-table-quirks.html backgr_border-table-quirks.html
+fails == backgr_border-table-row-group.html backgr_border-table-row-group.html
+fails == backgr_border-table-row.html backgr_border-table-row.html
+fails == backgr_border-table.html backgr_border-table.html
+fails == backgr_fixed-bg.html backgr_fixed-bg.html
 fails == backgr_index.html backgr_index.html
-fails asserts-if(stylo,4) == backgr_layers-hide.html backgr_layers-hide.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_layers-opacity.html backgr_layers-opacity.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_layers-show.html backgr_layers-show.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_position-table-cell.html backgr_position-table-cell.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_position-table-column-group.html backgr_position-table-column-group.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_position-table-column.html backgr_position-table-column.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_position-table-row-group.html backgr_position-table-row-group.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_position-table-row.html backgr_position-table-row.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_position-table.html backgr_position-table.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_simple-table-cell.html backgr_simple-table-cell.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_simple-table-column-group.html backgr_simple-table-column-group.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_simple-table-column.html backgr_simple-table-column.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_simple-table-row-group.html backgr_simple-table-row-group.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_simple-table-row.html backgr_simple-table-row.html # bug 1324661
-fails asserts-if(stylo,4) == backgr_simple-table.html backgr_simple-table.html # bug 1324661
+fails == backgr_layers-hide.html backgr_layers-hide.html
+fails == backgr_layers-opacity.html backgr_layers-opacity.html
+fails == backgr_layers-show.html backgr_layers-show.html
+fails == backgr_position-table-cell.html backgr_position-table-cell.html
+fails == backgr_position-table-column-group.html backgr_position-table-column-group.html
+fails == backgr_position-table-column.html backgr_position-table-column.html
+fails == backgr_position-table-row-group.html backgr_position-table-row-group.html
+fails == backgr_position-table-row.html backgr_position-table-row.html
+fails == backgr_position-table.html backgr_position-table.html
+fails == backgr_simple-table-cell.html backgr_simple-table-cell.html
+fails == backgr_simple-table-column-group.html backgr_simple-table-column-group.html
+fails == backgr_simple-table-column.html backgr_simple-table-column.html
+fails == backgr_simple-table-row-group.html backgr_simple-table-row-group.html
+fails == backgr_simple-table-row.html backgr_simple-table-row.html
+fails == backgr_simple-table.html backgr_simple-table.html
 
 # would also be good to test table-header-group and table-footer-group
 # (and rows and row groups in the presence of their reordering)
 # Also need to test different values of background-origin and background-clip.
-asserts-if(stylo,12) == border-separate-table-cell.html border-separate-table-cell.html # bug 1324661
-asserts-if(stylo,12) == border-separate-table-column-group.html border-separate-table-column-group.html # bug 1324661
-asserts-if(stylo,12) == border-separate-table-column.html border-separate-table-column.html # bug 1324661
-asserts-if(stylo,12) == border-separate-table-row-group.html border-separate-table-row-group.html # bug 1324661
-asserts-if(stylo,12) == border-separate-table-row.html border-separate-table-row.html # bug 1324661
-asserts-if(stylo,12) == border-separate-table.html border-separate-table.html # bug 1324661
-asserts-if(stylo,12) == border-collapse-table-cell.html border-collapse-table-cell.html # bug 1324661
-asserts-if(stylo,12) == border-collapse-table-column-group.html border-collapse-table-column-group.html # bug 1324661
-asserts-if(stylo,12) == border-collapse-table-column.html border-collapse-table-column.html # bug 1324661
-asserts-if(stylo,12) == border-collapse-table-row-group.html border-collapse-table-row-group.html # bug 1324661
-asserts-if(stylo,12) == border-collapse-table-row.html border-collapse-table-row.html # bug 1324661
-asserts-if(stylo,12) == border-collapse-table.html border-collapse-table.html # bug 1324661
-asserts-if(stylo,12) == border-collapse-opacity-table-cell.html border-collapse-opacity-table-cell.html # bug 1324661
-asserts-if(stylo,12) == border-collapse-opacity-table-column-group.html border-collapse-opacity-table-column-group.html # bug 1324661
-asserts-if(stylo,12) == border-collapse-opacity-table-column.html border-collapse-opacity-table-column.html # bug 1324661
-# asserts-if(stylo,12) fuzzy-if(d2d,1,16359) fuzzy-if(skiaContent,1,17000) == border-collapse-opacity-table-row-group.html border-collapse-opacity-table-row-group.html # bug 1324661
-asserts-if(stylo,12) fuzzy-if(d2d,1,5453) fuzzy-if(skiaContent,1,11000) == border-collapse-opacity-table-row.html border-collapse-opacity-table-row.html # bug 1324661
-# asserts-if(stylo,12) fuzzy-if(stylo||d2d||skiaContent,1,60000) == border-collapse-opacity-table.html border-collapse-opacity-table.html # bug 1324661
-asserts-if(stylo,12) == border-separate-opacity-table-cell.html border-separate-opacity-table-cell.html # bug 1324661
-asserts-if(stylo,12) == border-separate-opacity-table-column-group.html border-separate-opacity-table-column-group.html # bug 1324661
-asserts-if(stylo,12) == border-separate-opacity-table-column.html border-separate-opacity-table-column.html # bug 1324661
-asserts-if(stylo,12) fuzzy-if(d2d,1,37170) fuzzy-if(skiaContent,1,38000) == border-separate-opacity-table-row-group.html border-separate-opacity-table-row-group.html # bug 1324661
-asserts-if(stylo,12) fuzzy-if(d2d,1,12390) fuzzy-if(skiaContent,1,13000) == border-separate-opacity-table-row.html border-separate-opacity-table-row.html # bug 1324661
-# asserts-if(stylo,12) fuzzy-if(stylo||d2d||skiaContent,1,95000) == border-separate-opacity-table.html border-separate-opacity-table.html # bug 1324661
+== border-separate-table-cell.html border-separate-table-cell.html
+== border-separate-table-column-group.html border-separate-table-column-group.html
+== border-separate-table-column.html border-separate-table-column.html
+== border-separate-table-row-group.html border-separate-table-row-group.html
+== border-separate-table-row.html border-separate-table-row.html
+== border-separate-table.html border-separate-table.html
+== border-collapse-table-cell.html border-collapse-table-cell.html
+== border-collapse-table-column-group.html border-collapse-table-column-group.html
+== border-collapse-table-column.html border-collapse-table-column.html
+== border-collapse-table-row-group.html border-collapse-table-row-group.html
+== border-collapse-table-row.html border-collapse-table-row.html
+== border-collapse-table.html border-collapse-table.html
+== border-collapse-opacity-table-cell.html border-collapse-opacity-table-cell.html
+== border-collapse-opacity-table-column-group.html border-collapse-opacity-table-column-group.html
+== border-collapse-opacity-table-column.html border-collapse-opacity-table-column.html
+# fuzzy-if(d2d,1,16359) fuzzy-if(skiaContent,1,17000) == border-collapse-opacity-table-row-group.html border-collapse-opacity-table-row-group.html
+fuzzy-if(d2d,1,5453) fuzzy-if(skiaContent,1,11000) == border-collapse-opacity-table-row.html border-collapse-opacity-table-row.html
+# fuzzy-if(stylo||d2d||skiaContent,1,60000) == border-collapse-opacity-table.html border-collapse-opacity-table.html
+== border-separate-opacity-table-cell.html border-separate-opacity-table-cell.html
+== border-separate-opacity-table-column-group.html border-separate-opacity-table-column-group.html
+== border-separate-opacity-table-column.html border-separate-opacity-table-column.html
+fuzzy-if(d2d,1,37170) fuzzy-if(skiaContent,1,38000) == border-separate-opacity-table-row-group.html border-separate-opacity-table-row-group.html
+fuzzy-if(d2d,1,12390) fuzzy-if(skiaContent,1,13000) == border-separate-opacity-table-row.html border-separate-opacity-table-row.html
+# fuzzy-if(stylo||d2d||skiaContent,1,95000) == border-separate-opacity-table.html border-separate-opacity-table.html
 # == scrollable-rowgroup-collapse-background.html scrollable-rowgroup-collapse-background.html
 == scrollable-rowgroup-collapse-border.html scrollable-rowgroup-collapse-border.html
 # == scrollable-rowgroup-separate-background.html scrollable-rowgroup-separate-background.html
 == scrollable-rowgroup-separate-border.html scrollable-rowgroup-separate-border.html
 == empty-cells-default-1.html empty-cells-default-1.html
 == empty-cells-default-2.html empty-cells-default-2.html
 == table-row-opacity-dynamic-1.html table-row-opacity-dynamic-1.html
 # == table-row-opacity-dynamic-2.html table-row-opacity-dynamic-2.html
--- a/layout/reftests/table-bordercollapse/reftest-stylo.list
+++ b/layout/reftests/table-bordercollapse/reftest-stylo.list
@@ -11,75 +11,75 @@
 == bc_dyn_rg2.html bc_dyn_rg2.html
 == bc_dyn_rg3.html bc_dyn_rg3.html
 == bc_dyn_col1.html bc_dyn_col1.html
 == bc_dyn_col2.html bc_dyn_col2.html
 == bc_dyn_col3.html bc_dyn_col3.html
 == bc_dyn_cg1.html bc_dyn_cg1.html
 == bc_dyn_cg2.html bc_dyn_cg2.html
 == bc_dyn_cg3.html bc_dyn_cg3.html
-fails asserts-if(stylo,4) == bc_dyn_table1.html bc_dyn_table1.html # bug 1324661
-fails asserts-if(stylo,6) == bc_dyn_table2.html bc_dyn_table2.html # bug 1324661
-fails asserts-if(stylo,2) == bc_dyn_table3.html bc_dyn_table3.html # bug 1324661
+== bc_dyn_table1.html bc_dyn_table1.html
+== bc_dyn_table2.html bc_dyn_table2.html
+== bc_dyn_table3.html bc_dyn_table3.html
 == bc_borderoffset1.html bc_borderoffset1.html
 == bc_borderoffset2.html bc_borderoffset2.html
-asserts-if(stylo,4) == frame_above_rules_all.html frame_above_rules_all.html # bug 1324661
-asserts-if(stylo,4) == frame_above_rules_cols.html frame_above_rules_cols.html # bug 1324661
-asserts-if(stylo,4) == frame_above_rules_groups.html frame_above_rules_groups.html # bug 1324661
-asserts-if(stylo,4) == frame_above_rules_none.html frame_above_rules_none.html # bug 1324661
-asserts-if(stylo,4) == frame_above_rules_rows.html frame_above_rules_rows.html # bug 1324661
-asserts-if(stylo,4) == frame_below_rules_all.html frame_below_rules_all.html # bug 1324661
-asserts-if(stylo,4) == frame_below_rules_cols.html frame_below_rules_cols.html # bug 1324661
-asserts-if(stylo,4) == frame_below_rules_groups.html frame_below_rules_groups.html # bug 1324661
-asserts-if(stylo,4) == frame_below_rules_none.html frame_below_rules_none.html # bug 1324661
-asserts-if(stylo,4) == frame_below_rules_rows.html frame_below_rules_rows.html # bug 1324661
-asserts-if(stylo,4) == frame_border_rules_all.html frame_border_rules_all.html # bug 1324661
-asserts-if(stylo,4) == frame_border_rules_cols.html frame_border_rules_cols.html # bug 1324661
-asserts-if(stylo,4) == frame_border_rules_groups.html frame_border_rules_groups.html # bug 1324661
-asserts-if(stylo,7) == frame_border_rules_none.html frame_border_rules_none.html # bug 1324661
-asserts-if(stylo,4) == frame_border_rules_rows.html frame_border_rules_rows.html # bug 1324661
-asserts-if(stylo,4) == frame_box_rules_all.html frame_box_rules_all.html # bug 1324661
-asserts-if(stylo,4) == frame_box_rules_cols.html frame_box_rules_cols.html # bug 1324661
-asserts-if(stylo,4) == frame_box_rules_groups.html frame_box_rules_groups.html # bug 1324661
-asserts-if(stylo,7) == frame_box_rules_none.html frame_box_rules_none.html # bug 1324661
-asserts-if(stylo,4) == frame_box_rules_none-collapse.html frame_box_rules_none-collapse.html # bug 1324661
-asserts-if(stylo,4) == frame_box_rules_rows.html frame_box_rules_rows.html # bug 1324661
-asserts-if(stylo,4) == frame_hsides_rules_all.html frame_hsides_rules_all.html # bug 1324661
-asserts-if(stylo,4) == frame_hsides_rules_cols.html frame_hsides_rules_cols.html # bug 1324661
-asserts-if(stylo,4) == frame_hsides_rules_groups.html frame_hsides_rules_groups.html # bug 1324661
-asserts-if(stylo,4) == frame_hsides_rules_none.html frame_hsides_rules_none.html # bug 1324661
-asserts-if(stylo,4) == frame_hsides_rules_rows.html frame_hsides_rules_rows.html # bug 1324661
-asserts-if(stylo,4) == frame_lhs_rules_all.html frame_lhs_rules_all.html # bug 1324661
-asserts-if(stylo,4) == frame_lhs_rules_cols.html frame_lhs_rules_cols.html # bug 1324661
-asserts-if(stylo,4) == frame_lhs_rules_groups.html frame_lhs_rules_groups.html # bug 1324661
-asserts-if(stylo,4) == frame_lhs_rules_none.html frame_lhs_rules_none.html # bug 1324661
-asserts-if(stylo,4) == frame_lhs_rules_rows.html frame_lhs_rules_rows.html # bug 1324661
-asserts-if(stylo,4) == frame_rhs_rules_all.html frame_rhs_rules_all.html # bug 1324661
-asserts-if(stylo,4) == frame_rhs_rules_cols.html frame_rhs_rules_cols.html # bug 1324661
-asserts-if(stylo,4) == frame_rhs_rules_groups.html frame_rhs_rules_groups.html # bug 1324661
-asserts-if(stylo,4) == frame_rhs_rules_none.html frame_rhs_rules_none.html # bug 1324661
-asserts-if(stylo,4) == frame_rhs_rules_rows.html frame_rhs_rules_rows.html # bug 1324661
+== frame_above_rules_all.html frame_above_rules_all.html
+== frame_above_rules_cols.html frame_above_rules_cols.html
+== frame_above_rules_groups.html frame_above_rules_groups.html
+== frame_above_rules_none.html frame_above_rules_none.html
+== frame_above_rules_rows.html frame_above_rules_rows.html
+== frame_below_rules_all.html frame_below_rules_all.html
+== frame_below_rules_cols.html frame_below_rules_cols.html
+== frame_below_rules_groups.html frame_below_rules_groups.html
+== frame_below_rules_none.html frame_below_rules_none.html
+== frame_below_rules_rows.html frame_below_rules_rows.html
+== frame_border_rules_all.html frame_border_rules_all.html
+== frame_border_rules_cols.html frame_border_rules_cols.html
+== frame_border_rules_groups.html frame_border_rules_groups.html
+== frame_border_rules_none.html frame_border_rules_none.html
+== frame_border_rules_rows.html frame_border_rules_rows.html
+== frame_box_rules_all.html frame_box_rules_all.html
+== frame_box_rules_cols.html frame_box_rules_cols.html
+== frame_box_rules_groups.html frame_box_rules_groups.html
+== frame_box_rules_none.html frame_box_rules_none.html
+== frame_box_rules_none-collapse.html frame_box_rules_none-collapse.html
+== frame_box_rules_rows.html frame_box_rules_rows.html
+== frame_hsides_rules_all.html frame_hsides_rules_all.html
+== frame_hsides_rules_cols.html frame_hsides_rules_cols.html
+== frame_hsides_rules_groups.html frame_hsides_rules_groups.html
+== frame_hsides_rules_none.html frame_hsides_rules_none.html
+== frame_hsides_rules_rows.html frame_hsides_rules_rows.html
+== frame_lhs_rules_all.html frame_lhs_rules_all.html
+== frame_lhs_rules_cols.html frame_lhs_rules_cols.html
+== frame_lhs_rules_groups.html frame_lhs_rules_groups.html
+== frame_lhs_rules_none.html frame_lhs_rules_none.html
+== frame_lhs_rules_rows.html frame_lhs_rules_rows.html
+== frame_rhs_rules_all.html frame_rhs_rules_all.html
+== frame_rhs_rules_cols.html frame_rhs_rules_cols.html
+== frame_rhs_rules_groups.html frame_rhs_rules_groups.html
+== frame_rhs_rules_none.html frame_rhs_rules_none.html
+== frame_rhs_rules_rows.html frame_rhs_rules_rows.html
 == frame_void_rules_all.html frame_void_rules_all.html
 == frame_void_rules_cols.html frame_void_rules_cols.html
 == frame_void_rules_groups.html frame_void_rules_groups.html
 == frame_void_rules_none.html frame_void_rules_none.html
 == frame_void_rules_rows.html frame_void_rules_rows.html
-asserts-if(stylo,4) == frame_vsides_rules_all.html frame_vsides_rules_all.html # bug 1324661
-asserts-if(stylo,4) == frame_vsides_rules_cols.html frame_vsides_rules_cols.html # bug 1324661
-asserts-if(stylo,4) == frame_vsides_rules_groups.html frame_vsides_rules_groups.html # bug 1324661
-asserts-if(stylo,4) == frame_vsides_rules_none.html frame_vsides_rules_none.html # bug 1324661
-asserts-if(stylo,4) == frame_vsides_rules_rows.html frame_vsides_rules_rows.html # bug 1324661
+== frame_vsides_rules_all.html frame_vsides_rules_all.html
+== frame_vsides_rules_cols.html frame_vsides_rules_cols.html
+== frame_vsides_rules_groups.html frame_vsides_rules_groups.html
+== frame_vsides_rules_none.html frame_vsides_rules_none.html
+== frame_vsides_rules_rows.html frame_vsides_rules_rows.html
 fails == borderhandling-1.html borderhandling-1.html
 fails == borderhandling-2.html borderhandling-2.html
 fails == borderhandling-3.html borderhandling-3.html
 fails == borderhandling-4.html borderhandling-4.html
 fails == borderhandling-5.xhtml borderhandling-5.xhtml
 fails == borderhandling-6.xhtml borderhandling-6.xhtml
 fails == borderhandling-7.xhtml borderhandling-7.xhtml
-asserts-if(stylo,4) == borderhandling-8.html borderhandling-8.html # bug 1324661
+== borderhandling-8.html borderhandling-8.html
 fails == borderhandling-frame-border.html borderhandling-frame-border.html
 fails == borderhandling-rules-border-empty-quirks.html borderhandling-rules-border-empty-quirks.html
 fails == borderhandling-rules-border-rules-quirks.html borderhandling-rules-border-rules-quirks.html
 fails == borderhandling-rules-border-none-quirks.html borderhandling-rules-border-none-quirks.html
 fails == borderhandling-rules-border-groups-quirks.html borderhandling-rules-border-groups-quirks.html
 fails == borderhandling-rules-border-rows-quirks.html borderhandling-rules-border-rows-quirks.html
 fails == borderhandling-rules-border-cols-quirks.html borderhandling-rules-border-cols-quirks.html
 fails == borderhandling-rules-border-all-quirks.html borderhandling-rules-border-all-quirks.html
@@ -87,20 +87,20 @@ fails == borderhandling-rules-border-emp
 fails == borderhandling-rules-border-rules-strict.html borderhandling-rules-border-rules-strict.html
 fails == borderhandling-rules-border-none-strict.html borderhandling-rules-border-none-strict.html
 fails == borderhandling-rules-border-groups-strict.html borderhandling-rules-border-groups-strict.html
 fails == borderhandling-rules-border-rows-strict.html borderhandling-rules-border-rows-strict.html
 fails == borderhandling-rules-border-cols-strict.html borderhandling-rules-border-cols-strict.html
 fails == borderhandling-rules-border-all-strict.html borderhandling-rules-border-all-strict.html
 fails == bordercolor-1.html bordercolor-1.html
 fails == bordercolor-2.html bordercolor-2.html
-fails asserts-if(stylo,4) == bordercolor-3.html bordercolor-3.html # bug 1324661
+fails == bordercolor-3.html bordercolor-3.html
 fails == bordercolor-4.html bordercolor-4.html
-asserts-if(stylo,4) == empty-toprow.html empty-toprow.html # bug 1324661
-asserts-if(stylo,4) == double_borders.html double_borders.html # bug 1324661
+== empty-toprow.html empty-toprow.html
+== double_borders.html double_borders.html
 # == border-collapse-rtl.html border-collapse-rtl.html
 # Fuzzy because for some reason the corner beveling is antialiased differently.
 # So get 40 pixels of fuzz, 20 at each beveled corner (because the border width
 # is 20px).
 == border-style-outset-becomes-groove.html border-style-outset-becomes-groove.html
 # Fuzzy because for some reason the corner beveling is antialiased differently.
 # So get 40 pixels of fuzz, 20 at each beveled corner (because the border width
 # is 20px).
--- a/layout/reftests/table-width/reftest-stylo.list
+++ b/layout/reftests/table-width/reftest-stylo.list
@@ -1,51 +1,51 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 fails == spacing-invariance-quirks-min.html spacing-invariance-quirks-min.html
 fails == spacing-invariance-quirks-pref.html spacing-invariance-quirks-pref.html
 fails == spacing-invariance-standards-min.html spacing-invariance-standards-min.html
 fails == spacing-invariance-standards-pref.html spacing-invariance-standards-pref.html
 # == min-width.html min-width.html
 == pref-width.html pref-width.html
 == min-width-ref.html min-width-ref.html
-fails asserts-if(stylo,4) == percent-large.html percent-large.html # bug 1324661
+fails == percent-large.html percent-large.html
 == percent-large-min.html percent-large-min.html
-fails == percent-large-nested.html percent-large-nested.html # bug 1324661
-fails asserts-if(stylo,4) == percent-small.html percent-small.html
+fails == percent-large-nested.html percent-large-nested.html
+fails == percent-small.html percent-small.html
 == percent-small-min.html percent-small-min.html
 fails == percent-small-nested.html percent-small-nested.html
-fails asserts-if(stylo,8) == percent-small-2.html percent-small-2.html # bug 1324661
-fails asserts-if(stylo,8) == percent-zero.html percent-zero.html # bug 1324661
+fails == percent-small-2.html percent-small-2.html
+fails == percent-zero.html percent-zero.html
 == shrink-wrap-pref.html shrink-wrap-pref.html
 == shrink-wrap-avail.html shrink-wrap-avail.html
 == shrink-wrap-min.html shrink-wrap-min.html
 == shrink-wrap-min-ref.html shrink-wrap-min-ref.html
 == shrink-wrap-pref-ref.html shrink-wrap-pref-ref.html
 == shrink-wrap-avail-ref.html shrink-wrap-avail-ref.html
-fails asserts-if(stylo,4) == conflicting-widths-1.html conflicting-widths-1.html # bug 1324661
-fails asserts-if(stylo,4) == conflicting-widths-2.html conflicting-widths-2.html # bug 1324661
-fails asserts-if(stylo,4) == conflicting-widths-3.html conflicting-widths-3.html # bug 1324661
-fails asserts-if(stylo,4) == conflicting-widths-4.html conflicting-widths-4.html # bug 1324661
-fails asserts-if(stylo,4) == conflicting-widths-5.html conflicting-widths-5.html # bug 1324661
-asserts-if(stylo,4) == conflicting-widths-6.html conflicting-widths-6.html # bug 1324661
-fails asserts-if(stylo,4) == conflicting-widths-7.html conflicting-widths-7.html # bug 1324661
-fails asserts-if(stylo,4) == conflicting-widths-8.html conflicting-widths-8.html # bug 1324661
-asserts-if(stylo,4) == conflicting-widths-9.html conflicting-widths-9.html # bug 1324661
-asserts-if(stylo,4) == conflicting-widths-10.html conflicting-widths-10.html # bug 1324661
+fails == conflicting-widths-1.html conflicting-widths-1.html
+fails == conflicting-widths-2.html conflicting-widths-2.html
+fails == conflicting-widths-3.html conflicting-widths-3.html
+fails == conflicting-widths-4.html conflicting-widths-4.html
+fails == conflicting-widths-5.html conflicting-widths-5.html
+== conflicting-widths-6.html conflicting-widths-6.html
+fails == conflicting-widths-7.html conflicting-widths-7.html
+fails == conflicting-widths-8.html conflicting-widths-8.html
+== conflicting-widths-9.html conflicting-widths-9.html
+== conflicting-widths-10.html conflicting-widths-10.html
 fails == conflicting-percent-widths-1.html conflicting-percent-widths-1.html
 == conflicting-percent-widths-2.html conflicting-percent-widths-2.html
 == conflicting-percent-widths-3.html conflicting-percent-widths-3.html
-fails asserts-if(stylo,4) == percent-truncation-1.html percent-truncation-1.html # bug 1324661
+fails == percent-truncation-1.html percent-truncation-1.html
 fails == percent-truncation-2.html percent-truncation-2.html
 fails == percent-truncation-3.html percent-truncation-3.html
 fails == balancing-1.html balancing-1.html
 fails == balancing-2.html balancing-2.html
 # == cellpadding.html cellpadding.html
-fails asserts-if(stylo,4) == cellspacing.html cellspacing.html # bug 1324661
-fails asserts-if(stylo,16) == percent-basis.html percent-basis.html # bug 1324661
+fails == cellspacing.html cellspacing.html
+fails == percent-basis.html percent-basis.html
 fails == default-box-sizing-separate-standards.html default-box-sizing-separate-standards.html
 fails == default-box-sizing-separate-quirks.html default-box-sizing-separate-quirks.html
 fails == default-box-sizing-collapse-standards.html default-box-sizing-collapse-standards.html
 fails == default-box-sizing-collapse-quirks.html default-box-sizing-collapse-quirks.html
 fails == colspan-percent-distribution-1.html colspan-percent-distribution-1.html
 == colspan-percent-distribution-2.html colspan-percent-distribution-2.html
 == spanning-cell-sort-1-small.html spanning-cell-sort-1-small.html
 == spanning-cell-sort-1-large.html spanning-cell-sort-1-large.html
--- a/layout/reftests/text/reftest-stylo.list
+++ b/layout/reftests/text/reftest-stylo.list
@@ -40,17 +40,17 @@ fails == pre-wrap-1.html pre-wrap-1.html
 == soft-hyphens-1b.html soft-hyphens-1b.html
 == soft-hyphens-1c.html soft-hyphens-1c.html
 == soft-hyphens-break-word-1a.html soft-hyphens-break-word-1a.html
 == soft-hyphens-break-word-1b.html soft-hyphens-break-word-1b.html
 == soft-hyphens-break-word-1c.html soft-hyphens-break-word-1c.html
 # Tests for soft hyphens in table cells, bug 418975
 # == soft-hyphen-in-table-1.html soft-hyphen-in-table-1.html
 # == soft-hyphen-in-table-1.html soft-hyphen-in-table-1.html
-asserts-if(stylo,4) == soft-hyphen-in-table-2.html soft-hyphen-in-table-2.html # bug 1324661
+== soft-hyphen-in-table-2.html soft-hyphen-in-table-2.html
 # Cairo's FreeType and GDI backends snap glyphs to pixels, while Mac (usually),
 # D2D, and Skia have subpixel positioning.  The tests for pixel-snapping assume that
 # 1 CSS pixel == 1 device device
 fails-if(Android) skip-if(d2d||cocoaWidget||skiaContent) == subpixel-glyphs-x-1a.html subpixel-glyphs-x-1a.html
 # Platforms with subpixel positioning already have inconsistent glyphs by
 # design, but that is considered more tolerable because they are subpixel
 # inconsistencies.  On those platforms we just test that glyph positions are
 # subpixel.
--- a/layout/reftests/w3c-css/received/reftest-stylo.list
+++ b/layout/reftests/w3c-css/received/reftest-stylo.list
@@ -110,17 +110,17 @@ fails == css-multicol-1/multicol-margin-
 fails == css-multicol-1/multicol-nested-002.xht css-multicol-1/multicol-nested-002.xht
 fails == css-multicol-1/multicol-nested-005.xht css-multicol-1/multicol-nested-005.xht
 fails == css-multicol-1/multicol-nested-column-rule-001.xht css-multicol-1/multicol-nested-column-rule-001.xht
 fails == css-multicol-1/multicol-nested-margin-001.xht css-multicol-1/multicol-nested-margin-001.xht
 fails == css-multicol-1/multicol-nested-margin-002.xht css-multicol-1/multicol-nested-margin-002.xht
 fails == css-multicol-1/multicol-nested-margin-003.xht css-multicol-1/multicol-nested-margin-003.xht
 fails == css-multicol-1/multicol-nested-margin-004.xht css-multicol-1/multicol-nested-margin-004.xht
 fails == css-multicol-1/multicol-nested-margin-005.xht css-multicol-1/multicol-nested-margin-005.xht
-fails asserts-if(stylo,4) == css-multicol-1/multicol-overflow-000.xht css-multicol-1/multicol-overflow-000.xht # bug 1324661
+fails == css-multicol-1/multicol-overflow-000.xht css-multicol-1/multicol-overflow-000.xht
 fails == css-multicol-1/multicol-overflowing-001.xht css-multicol-1/multicol-overflowing-001.xht
 fails == css-multicol-1/multicol-reduce-000.xht css-multicol-1/multicol-reduce-000.xht
 fails == css-multicol-1/multicol-rule-000.xht css-multicol-1/multicol-rule-000.xht
 fails == css-multicol-1/multicol-rule-001.xht css-multicol-1/multicol-rule-001.xht
 fails == css-multicol-1/multicol-rule-002.xht css-multicol-1/multicol-rule-002.xht
 fails == css-multicol-1/multicol-rule-003.xht css-multicol-1/multicol-rule-003.xht
 == css-multicol-1/multicol-rule-004.xht css-multicol-1/multicol-rule-004.xht
 fails == css-multicol-1/multicol-rule-color-001.xht css-multicol-1/multicol-rule-color-001.xht
@@ -140,20 +140,20 @@ fails == css-multicol-1/multicol-rule-la
 fails == css-multicol-1/multicol-rule-outset-000.xht css-multicol-1/multicol-rule-outset-000.xht
 fails == css-multicol-1/multicol-rule-percent-001.xht css-multicol-1/multicol-rule-percent-001.xht
 fails == css-multicol-1/multicol-rule-px-001.xht css-multicol-1/multicol-rule-px-001.xht
 fails == css-multicol-1/multicol-rule-ridge-000.xht css-multicol-1/multicol-rule-ridge-000.xht
 == css-multicol-1/multicol-rule-samelength-001.xht css-multicol-1/multicol-rule-samelength-001.xht
 == css-multicol-1/multicol-rule-shorthand-001.xht css-multicol-1/multicol-rule-shorthand-001.xht
 fails == css-multicol-1/multicol-rule-solid-000.xht css-multicol-1/multicol-rule-solid-000.xht
 fails == css-multicol-1/multicol-rule-stacking-001.xht css-multicol-1/multicol-rule-stacking-001.xht
-asserts-if(stylo,4) == css-multicol-1/multicol-rule-style-groove-001.xht css-multicol-1/multicol-rule-style-groove-001.xht # bug 1324661
-asserts-if(stylo,4) == css-multicol-1/multicol-rule-style-inset-001.xht css-multicol-1/multicol-rule-style-inset-001.xht # bug 1324661
-asserts-if(stylo,4) == css-multicol-1/multicol-rule-style-outset-001.xht css-multicol-1/multicol-rule-style-outset-001.xht # bug 1324661
-asserts-if(stylo,4) == css-multicol-1/multicol-rule-style-ridge-001.xht css-multicol-1/multicol-rule-style-ridge-001.xht # bug 1324661
+== css-multicol-1/multicol-rule-style-groove-001.xht css-multicol-1/multicol-rule-style-groove-001.xht
+== css-multicol-1/multicol-rule-style-inset-001.xht css-multicol-1/multicol-rule-style-inset-001.xht
+== css-multicol-1/multicol-rule-style-outset-001.xht css-multicol-1/multicol-rule-style-outset-001.xht
+== css-multicol-1/multicol-rule-style-ridge-001.xht css-multicol-1/multicol-rule-style-ridge-001.xht
 fails == css-multicol-1/multicol-shorthand-001.xht css-multicol-1/multicol-shorthand-001.xht
 fails == css-multicol-1/multicol-span-000.xht css-multicol-1/multicol-span-000.xht
 fails == css-multicol-1/multicol-span-all-001.xht css-multicol-1/multicol-span-all-001.xht
 fails == css-multicol-1/multicol-span-all-002.xht css-multicol-1/multicol-span-all-002.xht
 fails == css-multicol-1/multicol-span-all-003.xht css-multicol-1/multicol-span-all-003.xht
 == css-multicol-1/multicol-span-all-block-sibling-003.xht css-multicol-1/multicol-span-all-block-sibling-003.xht
 fails == css-multicol-1/multicol-span-all-child-001.xht css-multicol-1/multicol-span-all-child-001.xht
 == css-multicol-1/multicol-span-all-child-002.xht css-multicol-1/multicol-span-all-child-002.xht
--- a/layout/reftests/writing-mode/tables/reftest-stylo.list
+++ b/layout/reftests/writing-mode/tables/reftest-stylo.list
@@ -4,18 +4,18 @@
 == vertical-table-2a.html vertical-table-2a.html
 == vertical-table-2b.html vertical-table-2b.html
 == vertical-table-rowspan-1.html vertical-table-rowspan-1.html
 == vertical-table-rowspan-2.html vertical-table-rowspan-2.html
 == vertical-table-colspan-1.html vertical-table-colspan-1.html
 == vertical-table-colspan-2.html vertical-table-colspan-2.html
 == vertical-table-specified-width-1.html vertical-table-specified-width-1.html
 asserts(1-2) == vertical-table-specified-width-2.html vertical-table-specified-width-2.html
-asserts-if(stylo,4) == vertical-border-collapse-1.html vertical-border-collapse-1.html # bug 1324661
-asserts-if(stylo,4) == vertical-border-collapse-2.html vertical-border-collapse-2.html # bug 1324661
+== vertical-border-collapse-1.html vertical-border-collapse-1.html
+== vertical-border-collapse-2.html vertical-border-collapse-2.html
 
 # == fixed-table-layout-002-vlr.html fixed-table-layout-002-vlr.html
 # == fixed-table-layout-003-vlr.html fixed-table-layout-003-vlr.html
 # == fixed-table-layout-004-vlr.html fixed-table-layout-004-vlr.html
 # == fixed-table-layout-005-vlr.html fixed-table-layout-005-vlr.html
 # == fixed-table-layout-006-vlr.html fixed-table-layout-006-vlr.html
 # == fixed-table-layout-007-vlr.html fixed-table-layout-007-vlr.html
 # == fixed-table-layout-009-vlr.html fixed-table-layout-009-vlr.html
@@ -63,22 +63,22 @@ asserts-if(stylo,4) == vertical-border-c
 # == fixed-table-layout-029-vrl.html fixed-table-layout-029-vrl.html
 # == fixed-table-layout-030-vrl.html fixed-table-layout-030-vrl.html
 # == fixed-table-layout-031-vrl.html fixed-table-layout-031-vrl.html
 
 # HTTP(../..) == s72-border-spacing-002.xht s72-border-spacing-002.xht
 # HTTP(../..) == s72-border-spacing-003.xht s72-border-spacing-003.xht
 # HTTP(../..) == s72-border-spacing-004.xht s72-border-spacing-004.xht
 # HTTP(../..) == s72-border-spacing-005.xht s72-border-spacing-005.xht
-fails asserts-if(stylo,4) == wm-row-progression-002.xht wm-row-progression-002.xht # bug 1324661
-fails asserts-if(stylo,4) == wm-row-progression-003.xht wm-row-progression-003.xht # bug 1324661
-fails asserts-if(stylo,4) == wm-row-progression-004.xht wm-row-progression-004.xht # bug 1324661
-fails asserts-if(stylo,4) == wm-row-progression-005.xht wm-row-progression-005.xht # bug 1324661
-fails asserts-if(stylo,4) == wm-row-progression-006.xht wm-row-progression-006.xht # bug 1324661
-fails asserts-if(stylo,4) == wm-row-progression-007.xht wm-row-progression-007.xht # bug 1324661
+fails == wm-row-progression-002.xht wm-row-progression-002.xht
+fails == wm-row-progression-003.xht wm-row-progression-003.xht
+fails == wm-row-progression-004.xht wm-row-progression-004.xht
+== wm-row-progression-004.xht wm-row-progression-005.xht
+== wm-row-progression-004.xht wm-row-progression-006.xht
+fails == wm-row-progression-007.xht wm-row-progression-007.xht
 
 # == table-caption-top-1.html table-caption-top-1.html
 # == table-caption-bottom-1.html table-caption-bottom-1.html
 # == table-caption-left-1.html table-caption-left-1.html
 # == table-caption-right-1.html table-caption-right-1.html
 
 fuzzy-if(stylo,1,7400) == border-collapse-bevels-1a.html border-collapse-bevels-1a.html
 fuzzy-if(stylo,1,7400) fuzzy-if(cocoaWidget,23,162) == border-collapse-bevels-1b.html border-collapse-bevels-1b.html
--- a/layout/svg/crashtests/crashtests.list
+++ b/layout/svg/crashtests/crashtests.list
@@ -100,17 +100,17 @@ load 515288-1.html
 load 522394-1.svg
 load 522394-2.svg
 load 522394-3.svg
 load 566216-1.svg
 load 587336-1.html
 load 590291-1.svg
 load 601999-1.html
 load 605626-1.svg
-asserts(2) load 606914.xhtml # bug 606914
+asserts-if(!stylo,2) load 606914.xhtml # bug 606914, bug 1340561 tracks the stylo bit
 load 610594-1.html
 load 610954-1.html
 load 612662-1.svg
 load 612662-2.svg
 load 612736-1.svg
 load 612736-2.svg
 load 614367-1.svg
 load 620034-1.html
--- a/layout/tables/crashtests/crashtests.list
+++ b/layout/tables/crashtests/crashtests.list
@@ -5,31 +5,31 @@ load 55789-1.html
 load 78623-1.html
 load 110523-1.html
 load 138725-1.html
 load 159359-1.html
 load 187779-1.html
 load 189751-1.html
 load 197015-1.html
 load 220536-1.html
-asserts-if(stylo,4) load 223458-1.html # bug 1324661
+load 223458-1.html
 load 237421-1.html
 load 237421-2.html
 load 238909-1.html
 load 239294-1.html
 load 240854-1.html
 load 266015-1.html
-asserts-if(stylo,10) load 267418.html # bug 1324661
+load 267418.html
 load 275625.html
 load 277062-1.html
 load 278385-1.html
 load 282175-1.html
 load 284844-1.html
 load 284844-1.html
-asserts-if(stylo,12) load 284852.html # bug 1324661
+load 284852.html
 load 300912.html
 load 308752-1.html
 load 308752-2.html
 load 316636-1.html
 load 317876.html
 load 322779-1.xul
 load 323489-1.html
 load 323604-1.html
@@ -97,18 +97,18 @@ load 403579-1.html
 skip-if(stylo) load 404301-1.xhtml # bug 1323652
 load 408753-1.xhtml
 load 410426-1.html
 load 410428-1.xhtml
 load 411582.xhtml
 load 413091.xhtml
 load 413180-1.html
 load 416845-1.xhtml
-asserts-if(stylo,4) load 416845-2.xhtml # bug 1324661
-asserts-if(stylo,2) load 416845-3.html # bug 1324661
+load 416845-2.xhtml
+load 416845-3.html
 load 420242-1.xhtml
 asserts(8) asserts-if(stylo,4) load 420654-1.xhtml # bug 458238, bug 436123, bug 457397 # bug 1324682
 load 423514-1.xhtml
 load 430374.html
 load 444431-1.html
 load 444702-1.html
 asserts-if(stylo,1) load 448988-1.xhtml # bug 1324681
 load 450311-1.html
@@ -135,17 +135,17 @@ load 573354-1.xhtml
 load 576890-1.html
 load 576890-2.html
 load 576890-3.html
 load 580481-1.xhtml
 asserts(1) asserts-if(stylo,0) load 595758-1.xhtml # Bug 714667
 load 595758-2.xhtml
 load 678447-1.html
 load 691824-1.xhtml
-asserts-if(stylo,4) load 695430-1.html # bug 1324661
+load 695430-1.html
 load 696640-1.html
 load 696640-2.html
 load 705996-1.html
 load 705996-2.html
 load 707622-1.html
 load 710098-1.html
 load 711864-1.html
 asserts-if(gtkWidget&&browserIsRemote,5) asserts-if(stylo,1-7) load 759249-1.html # Bug 1195474 # bug 1324704
--- a/layout/tables/reftests/reftest-stylo.list
+++ b/layout/tables/reftests/reftest-stylo.list
@@ -1,10 +1,10 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 fails == 1031934.html 1031934.html
-asserts-if(stylo,6) == 1220621-1a.html 1220621-1a.html # bug 1324661
-asserts-if(stylo,6) == 1220621-1b.html 1220621-1b.html # bug 1324661
-asserts-if(stylo,6) == 1220621-1c.html 1220621-1c.html # bug 1324661
-asserts-if(stylo,6) == 1220621-1d.html 1220621-1d.html # bug 1324661
-asserts-if(stylo,6) == 1220621-1e.html 1220621-1e.html # bug 1324661
-asserts-if(stylo,6) == 1220621-1f.html 1220621-1f.html # bug 1324661
-asserts-if(stylo,6) == 1220621-2a.html 1220621-2a.html # bug 1324661
-asserts-if(stylo,6) == 1220621-2b.html 1220621-2b.html # bug 1324661
+== 1220621-1a.html 1220621-1a.html
+== 1220621-1b.html 1220621-1b.html
+== 1220621-1c.html 1220621-1c.html
+== 1220621-1d.html 1220621-1d.html
+== 1220621-1e.html 1220621-1e.html
+== 1220621-1f.html 1220621-1f.html
+== 1220621-2a.html 1220621-2a.html
+== 1220621-2b.html 1220621-2b.html
--- a/widget/cocoa/crashtests/crashtests.list
+++ b/widget/cocoa/crashtests/crashtests.list
@@ -2,10 +2,10 @@ load 373122-1.html
 load 397209-1.html
 load 403296-1.xhtml
 load 419737-1.html
 load 435223-1.html
 load 444260-1.xul
 load 444864-1.html
 load 449111-1.html
 load 460349-1.xhtml
-asserts-if(stylo,4) load 460387-1.html # bug 1324661
+load 460387-1.html
 load 464589-1.html