Merge inbound to mozilla-central. a=merge
authorMihai Alexandru Michis <malexandru@mozilla.com>
Sat, 06 Jul 2019 06:36:55 +0300
changeset 544376 2b1bee2c77347e39b4a6f0023cf1a7dabc4db607
parent 544364 ea6af5ad89e2040f1bfe28f49adcf14f6e65f4d5 (current diff)
parent 544375 2514efbfbb783ebbdbf6c84751e2c464a8d65d83 (diff)
child 544377 49b6eb1732c979a1129e7237ef75d4cb967e2489
child 545497 ac28a341ac7dec2b0949d6f16bd5162c8b3451f3
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [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 inbound to mozilla-central. a=merge
--- 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);
   }