Backout of 35a679df430b due to bustage
authorDoug Turner <dougt@dougt.org>
Thu, 16 Jun 2011 12:47:37 -0700
changeset 71703 079c171b6323b3524294dc6c758ef00e84250d94
parent 71702 1ba686855348cab9ec1ad345daec6190e49961ff
child 71704 fb60f6e2f89ebe729b7e50e9c29b29551f372617
push id159
push usereakhgari@mozilla.com
push dateTue, 16 Aug 2011 17:53:11 +0000
treeherdermozilla-beta@8786e3e49240 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone7.0a1
backs out35a679df430bf16a68b4db18926b97ae9ab6304c
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
Backout of 35a679df430b due to bustage
dom/ipc/ContentParent.cpp
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -96,17 +96,16 @@
 
 #include "nsIMemoryReporter.h"
 #include "nsMemoryReporterManager.h"
 #include "mozilla/dom/PMemoryReportRequestParent.h"
 
 #ifdef ANDROID
 #include "gfxAndroidPlatform.h"
 #include "AndroidBridge.h"
-#include "nsSystemInfo.h"
 #endif
 
 #include "nsIClipboard.h"
 #include "nsWidgetsCID.h"
 #include "nsISupportsPrimitives.h"
 static NS_DEFINE_CID(kCClipboardCID, NS_CLIPBOARD_CID);
 static const char* sClipboardTextFlavors[] = { kUnicodeMime };
 
@@ -215,27 +214,18 @@ ContentParent::OnChannelConnected(int32 
         branch->GetIntPref("dom.ipc.content.nice", &nice);
 
         // Environment variable overrides preference
         char* relativeNicenessStr = getenv("MOZ_CHILD_PROCESS_RELATIVE_NICENESS");
         if (relativeNicenessStr) {
             nice = atoi(relativeNicenessStr);
         }
 
-        /* make the GUI thread have higher priority on single-cpu devices */
-        nsCOMPtr<nsIPropertyBag2> infoService = do_GetService(NS_SYSTEMINFO_CONTRACTID);
-        if (infoService) {
-            PRInt32 cpus;
-            nsresult rv = infoService->GetPropertyAsInt32(NS_LITERAL_STRING("cpucount"), &cpus);
-            if (NS_FAILED(rv)) {
-                cpus = 1;
-            }
-            if (nice != 0 && cpus == 1) {
-                setpriority(PRIO_PROCESS, pid, getpriority(PRIO_PROCESS, pid) + nice);
-            }
+        if (nice != 0) {
+           setpriority(PRIO_PROCESS, pid, getpriority(PRIO_PROCESS, pid) + nice);
         }
 #endif
     }
 }
 
 namespace {
 void
 DelayedDeleteSubprocess(GeckoChildProcessHost* aSubprocess)