Merge m-c to m-i to pick up Bug 725848.
authorKyle Huey <khuey@kylehuey.com>
Tue, 14 Feb 2012 14:37:20 -0800
changeset 86852 94f2faa4e9cf1570e7cb93a22fdd028a6729a271
parent 86851 d689f4d7e7ead259424140904fad429807109475 (current diff)
parent 86782 d45c7d7b0079239c093dcb2ef3c0dda82ec793b4 (diff)
child 86853 5561f15afa76036820edca5df1058f75afd5d29e
push id22058
push usermak77@bonardo.net
push dateWed, 15 Feb 2012 16:38:33 +0000
treeherdermozilla-central@46e22ce549b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs725848
milestone13.0a1
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
Merge m-c to m-i to pick up Bug 725848.
--- a/dom/workers/WorkerPrivate.h
+++ b/dom/workers/WorkerPrivate.h
@@ -144,17 +144,17 @@ protected:
 
 protected:
   friend class WorkerPrivate;
 
   WorkerSyncRunnable(WorkerPrivate* aWorkerPrivate, PRUint32 aSyncQueueKey,
                      bool aBypassSyncQueue = false,
                      ClearingBehavior aClearingBehavior = SkipWhenClearing)
   : WorkerRunnable(aWorkerPrivate, WorkerThread, UnchangedBusyCount,
-                   SkipWhenClearing),
+                   aClearingBehavior),
     mSyncQueueKey(aSyncQueueKey), mBypassSyncQueue(aBypassSyncQueue)
   { }
 
   virtual ~WorkerSyncRunnable()
   { }
 
   virtual bool
   DispatchInternal();
--- a/testing/mochitest/browser-test.js
+++ b/testing/mochitest/browser-test.js
@@ -210,16 +210,20 @@ Tester.prototype = {
       // Tests complete, notify the callback and return
       this.callback(this.tests);
       this.callback = null;
       this.tests = null;
     }
   },
 
   observe: function Tester_observe(aConsoleMessage) {
+    // Ignore empty messages.
+    if (!aConsoleMessage.message)
+      return;
+
     try {
       var msg = "Console message: " + aConsoleMessage.message;
       if (this.currentTest)
         this.currentTest.addResult(new testMessage(msg));
       else
         this.dumper.dump("TEST-INFO | (browser-test.js) | " + msg.replace(/\n$/, "") + "\n");
     } catch (ex) {
       // Swallow exception so we don't lead to another error being reported,
--- a/xpcom/stub/Makefile.in
+++ b/xpcom/stub/Makefile.in
@@ -67,16 +67,21 @@ else
 SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
 
 
 FORCE_SHARED_LIB = 1
 
 EXTRA_DSO_LDOPTS = $(LIBS_DIR)
 
+# Must be included before DEPENDENT_LIBS_LIST starts so that apps have a chance
+# of getting their stuff in before xul.
+# It is ok for this file not to exist
+-include $(topsrcdir)/$(MOZ_BUILD_APP)/extradependlibs.mk
+
 DEPENDENT_LIBS_LIST += \
 	$(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
 	$(DLL_PREFIX)plc4$(DLL_SUFFIX) \
 	$(DLL_PREFIX)plds4$(DLL_SUFFIX) \
 	$(DLL_PREFIX)mozalloc$(DLL_SUFFIX) \
 	$(NULL)
 
 ifndef MOZ_NATIVE_SQLITE
@@ -112,18 +117,15 @@ DEPENDENT_LIBS_LIST += $(DLL_PREFIX)xul$
 endif
 
 EXTRA_DSO_LDOPTS +=				\
 	$(EXTRA_DSO_LIBS)			\
 	$(NSPR_LIBS)				\
 	$(MOZALLOC_LIB)				\
 	$(NULL)
 
-# It is ok for this file not to exist
--include $(topsrcdir)/$(MOZ_BUILD_APP)/extradependlibs.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs:: $(FINAL_TARGET)/dependentlibs.list
 
 $(FINAL_TARGET)/dependentlibs.list: Makefile.in $(DEPTH)/config/autoconf.mk
 	$(EXIT_ON_ERROR) \
 	( $(foreach dlib,$(DEPENDENT_LIBS_LIST),echo $(dlib);) ) > $@