Bug 977596 - Fix build failure on flatfish r=jmuizelaar
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/fe8ce877d493
Author: gitmai <mri@tid.es>
Desc: Merge pull request #16610 from gitmai/bug-858017-network-alarm-complete

Bug 858017 - [COST CONTROL] Use Gecko native support for data usage alar...
r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/6fa0af39379e
Author: mai <mri@tid.es>
Desc: Bug 858017 - [COST CONTROL] Use Gecko native support for data usage alarms provided by NetworkStats API 2.0
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Bug 976120 - shell.js should respect crash reporting environment, r=fabrice
Bug 976120 - emulator.py should set crash environment, check for crashes on all marionette exceptions, r=jgriffin
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/2bb241995468
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Merge pull request #16621 from millermedeiros/972666-lines-over-events

Bug 972666 - [Calendar] lines over events longer than 2 hours r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/fab6c91479fd
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 972666 - [Calendar] lines over events longer than 2 hours

========

https://hg.mozilla.org/integration/gaia-central/rev/cf294dfce912
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Revert "Bug 942854 - [Calendar] Scrolling the week view results into results into overlapping artifacts. r=kgrandon"

This reverts commit 78dc0c0013d25de52175e750e4be46bfb2727ef3.
Bumping manifests a=b2g-bump
Merge inbound to m-c.
Bug 959847. Part 1. Retrieve the displayport of the root scroll frame the same way as everywhere else does in nsSubDocumentFrame::BuildDisplayList. r=roc
Bug 959847. Part 2. Don't ignore "ignore viewport scrolling" on subdocuments. r=roc

This means that the layer we create in nsSubDocumentFrame::BuildDisplayList becomes the scrollable layer for the document and we early early from ScrollFrameHelper::BuildDisplayList before it gets to the nsDisplayScrollLayer creation.
Bug 959847. Part 3. Make zoom items be contained in resolution items for subdocuments if they occur together. r=roc

Wrap the zoom item in the resolution item if we have both because we want the resolution scale applied on top of the app units per dev pixel conversion. Resolution is just a scale transform and app units per dev pixel affect layout, so conceptually the resolution gets applied after.
Bug 959847. Part 4. Call RecordFrameMetrics for subdocument layers. r=roc

We do this by creating a new display item type: nsDisplaySubDocument.

Original patch by Kartikaya Gupta <kgupta@mozilla.com>.
Bug 959847. Part 5. Only call RecordFrameMetrics for subdocuments if we are ignoring viewport scrolling so that we don't call it twice for the same scroll frame (the other one being the scroll layers created by nsGfxScrollFrame). r=roc
Bug 959847. Part 6. Only call RecordFrameMetrics from PaintForFrame if we are ignoring viewport scrolling so that we don't call it twice for the same scroll frame (the other one being the scroll layers created by nsGfxScrollFrame). r=roc
Bug 959847. Part 7. Move ignoreViewportScrolling computation lower, where we actually use it. r=roc
Bug 959847. Part 8. Don't let ProcessDisplayItems set the clip on subdocument items when they are being used to draw the display port content. r=roc
Bug 959847. Part 9. Subdocument items for subdocuments that have displayports need to expand the visibility region. r=roc
Bug 959847. Part 10. Implement GetBounds, GetOpaqueRegion, and ShouldBuildLayerEvenIfInvisible for nsDisplaySubDocument items that are being used as scrollable layers like scroll layer items. r=roc
Bug 959847. Part 11. Use nsLayoutUtils::ViewportHasDisplayPort instead of repeating boilerplate code. r=roc