--HG--
extra : rebase_source : 1729b4b927fde0678872b9de62a7466381aa07c3

--HG--
extra : rebase_source : e8f576e1b5b189b47807c613c0cff79f5c8038e7

--HG--
extra : rebase_source : a65039a407daab45360a5b375b53cbf1bc05b7f6

Currently the GC finalizes on the background thread only objects with null
JSClass::finalize. However, this implies that any object that uses
JS_FinalizeStub for the finalizer would be prevented from the background
finalization.

To fix this the patch removes JS_FinalizeStub replacing it with NULL in all
cases when the class has no custom finalizer. For style consistency the patch
also removed the usage of JSCLASS_NO_OPTIONAL_MEMBERS in the static
declarations as the compiler fills the missing fields with null in any cases.

--HG--
extra : rebase_source : 91fc77dca316018652d4d99f6d4cc8d0f7195e6e

Disable the hang detector for bug 429592 while running the startup cache tests because they intentionally hang the browser to trigger the startup timeout. feedback=mwu on IRC

--HG--
extra : rebase_source : cede9fe3c3355bd84aec501c7ae12a54ebe3bacf

Landing on a CLOSED TREE

Disable the hang detector for bug 429592 while running the startup cache tests because they intentionally hang the browser to trigger the startup timeout. feedback=mwu on IRC

--HG--
rename : tools/trace-malloc/bloatblame.c => tools/trace-malloc/bloatblame.cpp

Bug 659621 - Remove EXTRA_DSO_LIBS, EXTRA_DSO_LDOPTS, OS_LIBS from makefiles containing LIBXUL_LIBRARY = 1, now that libxul is always built; r=ted

Bug 653936: fix: StartupCache uses nsZipItemPtr without ensuring that the JAR module is loaded, causes leak r=mwu

Backout the latest cedar merge wholesale until I test the correctness of the merge locally.  This commit takes the tree state back to changeset 8d3f6093c425 (the last known good changeset before the merge)

We now store two independent locations for an omni.jar, allowing GRE/XRE and
XUL application to each have their own omni.jar. And since xulrunner setups
are very independent from the XUL applications, we implement support for both
omni.jar and non omni.jar cases in the same runtime, with the side effect of
allowing to switch from one to the other manually without rebuilding the
binaries.

We let the mozilla::Omnijar API handle both cases, so that callers don't need
too much work to support them.

We also make the preferences service load the same set of preferences in all
the various cases (unified vs. separate, omni.jar vs. no omni.jar).

The child process launcher for IPC is modified to pass the base directories
needed for the mozilla::Omnijar API initialization in the child process.

Finally, the startupcache file name canonicalization is modified to separate
APP and GRE resources.

We now store two independent locations for an omni.jar, allowing GRE/XRE and
XUL application to each have their own omni.jar. And since xulrunner setups
are very independent from the XUL applications, we implement support for both
omni.jar and non omni.jar cases in the same runtime, with the side effect of
allowing to switch from one to the other manually without rebuilding the
binaries.

We let the mozilla::Omnijar API handle both cases, so that callers don't need
too much work to support them.

We also make the preferences service load the same set of preferences in all
the various cases (unified vs. separate, omni.jar vs. no omni.jar).

The child process launcher for IPC is modified to pass the base directories
needed for the mozilla::Omnijar API initialization in the child process.

Finally, the startupcache file name canonicalization is modified to separate
APP and GRE resources.

Bug 562406 - Omnijar js components from startupcache during build(disabled by default, landing for mobile use) r=bsmedberg a=approval2.0