Bug 1192189 - Fix assertion condition to use to-be-restyled element's composed document. r=dbaron
authorCameron McCormack <cam@mcc.id.au>
Wed, 11 Nov 2015 16:46:43 +1100
changeset 272068 584e6acd0f06b84a4ab1ba5b0a9bc283866ba83b
parent 272067 7697a472772a9a4351de31f5d54bab8a5cb9c384
child 272069 7629efc5f5e7ee3c92465e0cfbbe4c321d5a0318
push id29659
push usercbook@mozilla.com
push dateWed, 11 Nov 2015 11:43:09 +0000
treeherdermozilla-central@84a7cf29f4f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1192189
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1192189 - Fix assertion condition to use to-be-restyled element's composed document. r=dbaron
layout/base/RestyleTracker.cpp
--- a/layout/base/RestyleTracker.cpp
+++ b/layout/base/RestyleTracker.cpp
@@ -119,17 +119,17 @@ CollectRestyles(nsISupports* aElement,
     return PL_DHASH_NEXT;
   }
 
   NS_ASSERTION(!element->HasFlag(collector->tracker->RootBit()) ||
                // Maybe we're just not reachable via the frame tree?
                (element->GetFlattenedTreeParent() &&
                 (!element->GetFlattenedTreeParent()->GetPrimaryFrame() ||
                  element->GetFlattenedTreeParent()->GetPrimaryFrame()->IsLeaf() ||
-                 element->GetCurrentDoc()->GetShell()->FrameManager()
+                 element->GetCrossShadowCurrentDoc()->GetShell()->FrameManager()
                    ->GetDisplayContentsStyleFor(element))) ||
                // Or not reachable due to an async reinsert we have
                // pending?  If so, we'll have a reframe hint around.
                // That incidentally makes it safe that we still have
                // the bit, since any descendants that didn't get added
                // to the roots list because we had the bits will be
                // completely restyled in a moment.
                (aData->mChangeHint & nsChangeHint_ReconstructFrame),