Merge mozilla-central to autoland. a=merge CLOSED TREE
authorMihai Alexandru Michis <malexandru@mozilla.com>
Sat, 06 Jul 2019 06:42:14 +0300
changeset 541188 49b6eb1732c979a1129e7237ef75d4cb967e2489
parent 541185 948869e38bce72ae635e1ab629ab42ce0af444cc (current diff)
parent 541187 2b1bee2c77347e39b4a6f0023cf1a7dabc4db607 (diff)
child 541189 4762f5a28a7287d48d3f6c90fe7a9e7b2b8c0c10
push id11533
push userarchaeopteryx@coole-files.de
push dateMon, 08 Jul 2019 18:18:03 +0000
treeherdermozilla-beta@f4452e031aed [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone69.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
Merge mozilla-central to autoland. a=merge CLOSED TREE
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
@@ -11187,17 +11187,17 @@ void Document::SetReadyStateInternal(Rea
       default:
         NS_WARNING("Unexpected ReadyState value");
         break;
     }
   }
   // 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();
     }
   }
 
   if (updateTimingInformation) {
     RecordNavigationTiming(rs);
   }