Follow-up to bug 585173 - correctly handle when the XUL runtime doesn't exist. r=smaug. a=bustage fix for not the same config as default Firefox builds.
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 01 Sep 2010 11:19:52 +0100
changeset 51828 51d17027ff45d6b9179601a3f06a6cc75830c855
parent 51827 f47972d054732237620655bd77d19e831d2efe19
child 51829 c38ea6cd0ea2e06291ea739698f9b9ed3d14dda0
child 54069 4cc93956c50ea42b5e5ef9d1bd29bb786dd78697
push id15442
push userbugzilla@standard8.plus.com
push dateWed, 01 Sep 2010 10:27:14 +0000
treeherdermozilla-central@51d17027ff45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug, bustage
bugs585173
milestone2.0b6pre
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
Follow-up to bug 585173 - correctly handle when the XUL runtime doesn't exist. r=smaug. a=bustage fix for not the same config as default Firefox builds.
content/base/src/nsFrameMessageManager.cpp
--- a/content/base/src/nsFrameMessageManager.cpp
+++ b/content/base/src/nsFrameMessageManager.cpp
@@ -51,17 +51,19 @@
 #include "nsScriptLoader.h"
 #include "nsIJSContextStack.h"
 #include "nsIXULRuntime.h"
 
 static PRBool
 IsChromeProcess()
 {
   nsCOMPtr<nsIXULRuntime> rt = do_GetService("@mozilla.org/xre/runtime;1");
-  NS_ABORT_IF_FALSE(rt, "We must have a xre runtime");
+  if (!rt)
+    return PR_TRUE;
+
   PRUint32 type;
   rt->GetProcessType(&type);
   return type == nsIXULRuntime::PROCESS_TYPE_DEFAULT;
 }
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsFrameMessageManager)
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsFrameMessageManager)