Back out bug 819000

dom/ipc/ContentChild.cpp

@@ -1151,9 +1151,8 @@ ContentChild::RecvAppInfo(const nsCString& version, const nsCString& buildID)
 {
     mAppInfo.version.Assign(version);
     mAppInfo.buildID.Assign(buildID);
-    if (Preferences::GetBool("dom.ipc.processPrelaunch.enabled", false)) {
-        PreloadSlowThings();
-    }
+
+    PreloadSlowThings();
     return true;
 }
 

dom/ipc/preload.js

@@ -69,11 +69,4 @@
   Cc["@mozilla.org/thread-manager;1"].getService(Ci["nsIThreadManager"]);
   Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci["nsIAppStartup"]);
   Cc["@mozilla.org/uriloader;1"].getService(Ci["nsIURILoader"]);
-
-  docShell.isActive = false;
-  docShell.QueryInterface(Ci.nsIWebNavigation)
-          .loadURI("about:blank",
-                   Ci.nsIWebNavigation.LOAD_FLAGS_NONE,
-                   null, null, null);
-
 })();

layout/base/nsPresShell.cpp

@@ -5246,10 +5246,6 @@ PresShell::Paint(nsIView*           aViewToPaint,
   NS_ASSERTION(!mIsDestroying, "painting a destroyed PresShell");
   NS_ASSERTION(aViewToPaint, "null view");
 
-  if (!mIsActive) {
-    return;
-  }
-
   nsAutoNotifyDidPaint notifyDidPaint(aWillSendDidPaint);
 
   nsPresContext* presContext = GetPresContext();