Merge mozilla-central to autoland. a=merge CLOSED TREE

mozilla · Jul 6, 2019 · 201999f · 201999f
2 parents 4736d10 + 5e3c522
commit 201999f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
@@ -11192,7 +11192,7 @@ void Document::SetReadyStateInternal(ReadyState rs,
   // At the time of loading start, we don't have timing object, record time.
 
   if (READYSTATE_INTERACTIVE == rs) {
-    if (nsContentUtils::IsSystemPrincipal(NodePrincipal())) {
+    if (!mXULPersist && nsContentUtils::IsSystemPrincipal(NodePrincipal())) {
       mXULPersist = new XULPersist(this);
       mXULPersist->Init();
     }