Bug 1084500 part 2: Promote & rename ComputeBackgroundAnchorPoint to nsImageRenderer::ComputeObjectAnchorPoint. r=seth
Bug 1084500 part 3: Make documentation for ComputeObjectAnchorPoint cover non-background use cases. r=seth
Bug 1087496 - Optimize codegen for IsNullOrLikeUndefined* instructions. r=h4writer

--HG--
extra : rebase_source : 4699073583913d1d471ba7f72487dac305d0eb0b
Bug 1086612 - CSP: Let source expression be the empty set in case no valid source can be parsed (r=sstamm)
Bug 1086612 - CSP: Let source expression be the empty set in case no valid source can be parsed - tests (r=sstamm)
Merge b2g-inbound to m-c a=merge
Merge fx-team to m-c a=merge
Bug 1086612 - CSP: Let source expression be the empty set in case no valid source can be parsed - update parser tests (r=sstamm)
Bug 1074611 - pass NDEF info to Content. r=smaug, dimi.

From 03c850ef46ffd4baeb84596fa219e39788eb0571 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        | 19 ++++++++++++++---
 dom/nfc/gonk/NfcGonkMessage.h      |  9 --------
 dom/nfc/gonk/NfcMessageHandler.cpp |  8 +++----
 dom/nfc/gonk/NfcOptions.h          | 10 +++++----
 dom/nfc/gonk/NfcService.cpp        |  9 ++++++--
 dom/nfc/nsINfcContentHelper.idl    | 11 +++++++++-
 dom/nfc/nsNfc.js                   | 28 +++++++++++++++++++++----
 dom/webidl/MozNFCTag.webidl        | 43 ++++++++++++++++++++++++++++++++++++++
 dom/webidl/NfcOptions.webidl       |  5 +++--
 9 files changed, 113 insertions(+), 29 deletions(-)
Back out 50f2a49570ce (bug 1085027) on suspicion of making Win7 opt mochitest-4 permaorange, a=backout
CLOSED TREE
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/379c5a8dd25e
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #25337 from tauzen/Bug1084160_ndef_formatable_removal

Bug 1084160 - [NFC] NDEF_FORMATABLE, NDEF_WRITABLE removal from NfcManager, r=gweng

========

https://hg.mozilla.org/integration/gaia-central/rev/976be8377da7
Author: Krzysztof Mioduszewski <kmioduszewski@gmail.com>
Desc: Bug 1084160 - [NFC] NDEF_FORMATABLE, NDEF_WRITABLE removal from NfcManager, r=gweng
Bumping manifests a=b2g-bump
Bug 1087356: make e10s/non-e10s window options appear when no windows are open on Mac, r=felipe
Bug 1086991 - Reduce JS/Java message passing for reader mode (Reader:Add*). r=rnewman
Bug 1086991 - Reduce JS/Java message passing for reader mode (Reader:Remove*). r=rnewman
Backout bug 1084412 for Gij bustage and causing Gaia tree closures
Bug 1083866 - Add test case to check for GC during bailouts. r=nbp
Bug 1083866 - Only remove instructions from the JitActivation after the bailout. r=jandem
Bug 1083866 - Mark bailout frames. r=jandem
Bug 1083866 - Handle potential invalidation of the bailing frame. r=jandem