Bug 887394 - Don't collect state right after startup when restoring the initial session; r=yoric
Bug 883220 - Raise the toolbox window if breakpoint is hit, r=vporof
Bug 656273 - Create a toolbar for Scratchpad; r=dcamp
Bug 828038 - Change profile recording UI and behavior; r=dcamp
Bug 888120 - Add an image file for the profiler stopwatch button; r=me
Merge mozilla-central and fx-team
Bug 886137 - Can't inspect objects in the webconsole, while debugging and inspecting; r=past
Bug 886036 - Port pseudoclass lock to the inspector actor. r=harth

--HG--
extra : rebase_source : c515e1a85da5d484686e1ae8b55c4dbfd90f214f
Bug 883178 - [MMI] Implement DOMMMIResult and DOMMMIError. Part 1: DOMError. r=sicking, sr=peterv
Bug 883178 - [MMI] Implement DOMMMIResult and DOMMMIError. Part 2: DOMMMIResult and DOMMMIError. r=vicamo, sr=sicking
Bumping gaia.json for 6 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/c201d63425a6
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #10708 from ferjm/mmiresultfinal

MMI localization support (multiple commits)

========

https://hg.mozilla.org/integration/gaia-central/rev/110a490561bb
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 879685 - (mmi-localization-cw) [MMI] Localization of Call Waiting functionality. r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/a24294e33110
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 879694 - (mmi-localization-cb) [MMI] Localization of Call Barring functionality. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/f21ed81960ce
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Bug 879680 - (mmi-result-cf) [MMI] Use MMIResult for Call Forwarding related functionality. r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/acea7c21c021
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 874000 - (mmi-result-pin) [MMI] Use MMIResult for PIN/PIN2/PUK related functionality. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/bb0646386fb4
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 884349 - [MMI] Use MMIResult for get IMEI. r=rik
Bug 865745 - Stop depending on mCx during frame script execution. r=smaug
Bug 865745 - Rename nsFrameScriptExecutor::DidCreateCx. r=smaug
Bug 865745 - Hold a strong ref to the global for the duration that each nsFrameScriptCx is on the stack. r=smaug

These things currently do a complicated refcounting dance to avoid destroying the
cx until all the consumers of it are gone. That stuff can mostly go away now that
we're just using the SafeJSContext, but DestroyCx also nulls out the global, so
we should make sure to keep that alive for anyone that might be using it.
Bug 865745 - Use an AutoSafeJSContext in nsFrameMessageManager::ReceiveMessage. r=smaug

This function proceeds to push its cx and enters a compartment, so it can't be
depending on any compartment or callstack state of the cx it's using. The only
potential issue would then be reporting the error to the correct DOM window, but
this stuff is used only for chrome, where that doesn't matter. The safe JSContext
uses the same error reporter as JSMs and such, which is probably fine.
Bug 865745 - Remove redundant cx push. r=smaug

AutoSafeJSContext will always push.
Bug 865745 - Use a SafeJSContext in TabChildParent. r=smaug

This is just used for rooting, but happens to be a consumer of
nsFrameMessageManager::GetJSContext, which we're about to remove.
Bug 865745 - Remove mContext from nsFrameMessageManager. r=smaug
Bug 865745 - Check mGlobal instead of mCx to see if we're in a functional state. r=smaug

Their lifetimes should be the same, and the latter is going away.
Bug 865745 - Return the safe JSContext for Tab Children in GetJSContextForEventHandlers. r=smaug