Bug 819000: Only PreloadSlowThings() when prelaunch is enabled. r=jlebar
authorChris Jones <jones.chris.g@gmail.com>
Thu, 24 Jan 2013 16:40:11 -0800
changeset 118321 b17104b59d897fac40180e354749be4535300820
parent 118320 2f4d164bbef532834fd06f87e2254b38b3365c8f
child 118322 4c2f07276d9e498e177f98838d10fe820cd5277a
push id350
push usercjones@mozilla.com
push dateFri, 25 Jan 2013 00:40:17 +0000
reviewersjlebar
bugs819000
milestone18.0
Bug 819000: Only PreloadSlowThings() when prelaunch is enabled. r=jlebar
dom/ipc/ContentChild.cpp
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -1146,18 +1146,19 @@ PreloadSlowThings()
     TabChild::PreloadSlowThings();
 }
 
 bool
 ContentChild::RecvAppInfo(const nsCString& version, const nsCString& buildID)
 {
     mAppInfo.version.Assign(version);
     mAppInfo.buildID.Assign(buildID);
-
-    PreloadSlowThings();
+    if (Preferences::GetBool("dom.ipc.processPrelaunch.enabled", false)) {
+        PreloadSlowThings();
+    }
     return true;
 }
 
 bool
 ContentChild::RecvLastPrivateDocShellDestroyed()
 {
     nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
     obs->NotifyObservers(nullptr, "last-pb-context-exited", nullptr);