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.
Bug 782311; put back D3D10_RESOURCE_MISC_GDI_COMPATIBLE. r=Bas
Merge fx-team to m-c.
No bug, Automated blocklist update from host slice - a=blocklist-update
Bug 487587 - In mathml formulas, the content of many <mo> elements is not highlighted when selected. r=roc
Bug 786926 - updateBookmark doesn't set DATE_MODIFIED. r=mfinkle
Bug 804040 - Selection event not fired when selection of ARIA tab changes, r=tbsaunde
Bug 804441: Put our NSPR and NSS header wrappers before OS_INCLUDES, r=ted

This allows inline functions in headers to call NSPR/NSS functions without
causing linking errors.

--HG--
extra : rebase_source : f89df8a53d6e8f624c84fc3b84982c4dd92d5f38
Bug 772365, Part 0: remove nsNSSCertHeader.h, r=honzab

--HG--
extra : rebase_source : b58ac957c58f647180f67a6e13be3cc81915d90c
Bug 802302: Remove obsolete OCSP responder override UI and API, r=honzab

--HG--
extra : rebase_source : 5d241a8b9573f442c37d0aeef0689ae5054dd08d
Bug 790338 - Sweep debugger objects in the same group as their debugees r=billm

--HG--
extra : rebase_source : a97bb6aefa4291496a40b643887b4f712bc18119