Merge mozilla-central and mozilla-inbound
authorMarco Bonardo <mbonardo@mozilla.com>
Thu, 18 Aug 2011 10:38:39 +0200
changeset 75456 f69a10f23bf334215464758d71ad900542856f5a
parent 75455 21dd913a5c92471d01e9be79ebbb941fa685e824 (current diff)
parent 75413 8b970cb862f2e83f942a59261a5602400f726441 (diff)
child 75465 fb919f4fa210316d936e4cc4677462b0bf4fab68
child 75481 805cd41a9b9fa7a7255a8be7ec568e46e5a30ae7
push id21023
push usermak77@bonardo.net
push dateThu, 18 Aug 2011 09:39:20 +0000
treeherdermozilla-central@f69a10f23bf3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone9.0a1
first release with
nightly linux32
f69a10f23bf3 / 9.0a1 / 20110818030747 / files
nightly linux64
f69a10f23bf3 / 9.0a1 / 20110818030747 / files
nightly mac
f69a10f23bf3 / 9.0a1 / 20110818030747 / files
nightly win32
f69a10f23bf3 / 9.0a1 / 20110818030747 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Merge mozilla-central and mozilla-inbound
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1049,17 +1049,17 @@ pref("devtools.editor.expandtab", true);
 //
 // Available components:
 //   "textarea" - this is a basic text editor, like an HTML <textarea>.
 //
 //   "orion" - this is the Orion source code editor from the Eclipse project. It
 //   provides programmer-specific editor features such as syntax highlighting,
 //   indenting and bracket recognition. It may not be appropriate for all
 //   locales (esp. RTL) or a11y situations.
-pref("devtools.editor.component", "textarea");
+pref("devtools.editor.component", "orion");
 
 // Whether the character encoding menu is under the main Firefox button. This
 // preference is a string so that localizers can alter it.
 pref("browser.menu.showCharacterEncoding", "chrome://browser/locale/browser.properties");
 
 // Allow using tab-modal prompts when possible.
 pref("prompts.tab_modal.enabled", true);
 // Whether the Panorama should animate going in/out of tabs
--- a/xpcom/tests/TestHarness.h
+++ b/xpcom/tests/TestHarness.h
@@ -39,16 +39,24 @@
  * Test harness for XPCOM objects, providing a scoped XPCOM initializer,
  * nsCOMPtr, nsRefPtr, do_CreateInstance, do_GetService, ns(Auto|C|)String,
  * and stdio.h/stdlib.h.
  */
 
 #ifndef TestHarness_h__
 #define TestHarness_h__
 
+#if defined(_MSC_VER) && defined(MOZ_STATIC_JS)
+/*
+ * Including jsdbgapi.h may cause build break with --disable-shared-js
+ * This is a workaround for bug 673616.
+ */
+#define STATIC_JS_API
+#endif
+
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
 #include "nsStringGlue.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"