Bug 809677 - Refactor httpd.js to work when modules are functions; r=Waldo
Bug 810164: Disable bfcache for pages with active PeerConnections; r=smaug,jesup
Bug 810419 - Duplicate ambient-menuitems in the Social API keyboard-access menu. r=felipe
Bug 810419 followup - Update test description. DONTBUILD r=me
Backout Bug 810164 due to bustage. r=bustage
merge backout
Bug 805080 - Move more API users to CompileOptions; r=luke

There is no reason to have special methods for specific sets of CompileOptions
when the JS::Compile interface is so easy to use.  Other API methods can be
moved internal or removed entirely with this change.

--HG--
extra : rebase_source : f48fb221ebe02c0137e521ea605953532808825d
Bug 803376 - Add a new form of TRANSPLANT GC, with assertions for leaks (r=luke)

--HG--
extra : rebase_source : 5cd365e2b3917ad3b649a39613ab9dae47d27320
Bug 802366 - Prelude, part 1: Rename in-process-browser-frame-shown to in-process-browser-or-app-frame-shown. r=bz
Bug 802366 - Prelude, part 2: Rename GetParentIgnoreBrowserFrame to GetSameTypeParentIgnoreBrowserAndAppBoundaries. r=bz

It's a long name, but at least it's clear.
Bug 802366 - Prelude, part 3: Make some methods on nsIPrincipal infallible, and improve documentation on other methods. r=bz
Bug 802366 - Prelude, part 4: Use and simplify nsScriptSecurityManager::GetDocShellCodebasePrincipal. r=bz
Bug 802366 - Prelude, part 5: Improve comments in nsIDocShellTreeItem.idl and nsILoadContext.idl. r=bz
Bug 802366 - The main event: Let a browser process inherit its app's id. r=bz,cjones

The main bug fixed here is that in half of our interfaces, we use "is browser frame/element" to mean "browser or app", and in the other half, we use it to mean "is browser not app".

There's a related, functional bug also fixed here, which is that a browser process doesn't inherit its parent's app-id.  This causes problems e.g. for IndexedDB: If a browser inside an app uses IndexedDB, the DB should have the app's app-id.

I also modified Tab{Parent,Child} and nsFrameLoader to call "app" "ownOrContainingApp", to emphasize that we might have inherited the app from a parent process.  I left nsIDocShell::appId alone, because changing that would have necessitated changing nsILoadGroup and therefore a /lot/ of users in Necko; it's also not clear it would have clarified anything in those cases.
Bug 802366 - Use TabContext to make IDB handling more correct in TabParent. r=bent
Bug 802366 - Epilogue: Remove workaround for bug 802366 in Webapps.jsm. r=sicking
Bug 806127 - ThirdPartyUtil should not consider in-process <iframe mozbrowser/mozapp> to be third-party. r=bz
Bug 806127 - Test that cookies from pages inside <iframe mozbrowser> are not considered third-party. r=bz

The test for the other change in bug 806127 (which affects IndexedDB) is in bug 806168.
Bug 806168 - Test for bugs 802366 and 806127. r=bent

These new tests are disabled on Android because the test they're replacing, test_webapp_clearBrowserData.html, was also disabled on Android, and the new tests fail in the same way as the original test.

--HG--
rename : dom/indexedDB/test/test_webapp_clearBrowserData.html => dom/indexedDB/test/webapp_clearBrowserData.js
Bug 806168 - Remove extra indentation in webapp_clearBrowserData.js. r=bent

The extra indentaiton was necessary because we wanted hg/git to notice that webapp_clearBrowserData.js was actually a rename of test_webapp_clearBrowserData.html.