Bug 1394935: Add a (commented out for now) assertion about clobbering dirty bits. r?bholley draft
authorEmilio Cobos Álvarez <emilio@crisal.io>
Wed, 30 Aug 2017 23:32:38 +0200
changeset 656230 b1339e3148ff11286304a002712dda9a68a2cd2e
parent 656229 ac44a77a1e69068d594e14db8d0e36a9e0f058ce
child 656231 513b2039e111a0f9fdb1ab914590fc9346d4ba6e
push id77122
push userbmo:emilio@crisal.io
push dateWed, 30 Aug 2017 21:45:24 +0000
reviewersbholley
bugs1394935
milestone57.0a1
Bug 1394935: Add a (commented out for now) assertion about clobbering dirty bits. r?bholley Will get this fixed tomorrow, I have patches but forgot to push to try. MozReview-Commit-ID: 3Dcb1MTo8g5
dom/base/nsIDocumentInlines.h
--- a/dom/base/nsIDocumentInlines.h
+++ b/dom/base/nsIDocumentInlines.h
@@ -59,16 +59,20 @@ nsIDocument::FindDocStyleSheetInsertionP
 }
 
 inline void
 nsIDocument::SetServoRestyleRoot(nsINode* aRoot, uint32_t aDirtyBits)
 {
   MOZ_ASSERT(aRoot);
   MOZ_ASSERT(aDirtyBits);
   MOZ_ASSERT((aDirtyBits & ~Element::kAllServoDescendantBits) == 0);
+  // FIXME(emilio): This should hold, but we're clobbering it from
+  // nsCSSFrameConstructor::ConstructDocElementFrame, which is wrong!
+  //
+  // MOZ_ASSERT((aDirtyBits & mServoRestyleRootDirtyBits) == mServoRestyleRootDirtyBits);
 
   MOZ_ASSERT(!mServoRestyleRoot ||
              mServoRestyleRoot == aRoot ||
              nsContentUtils::ContentIsFlattenedTreeDescendantOf(mServoRestyleRoot, aRoot));
   MOZ_ASSERT(aRoot == aRoot->OwnerDocAsNode() ||
              (aRoot->IsElement() && aRoot->IsInComposedDoc()));
   mServoRestyleRoot = aRoot;
   mServoRestyleRootDirtyBits = aDirtyBits;