Bug 1000322. Don't let the display port base be larger than the subdocuments root frame bounds. r=roc

The dirty rect can be larger.
Merge m-c to inbound
Bug 1000266. Don't purge the canvas fixed background image cache if we are only scrolling. r=mattwoodrow

Also NotifyRenderingChanged was on the canvas background color item, not the background image item.

Bug 818643 was a problem where the cache didn't get purged enough, but the fix meant we basically always purged the cached and never got to use it, making it useless. It meant that we purged the cache anytime the item has any type of invalidation whatsoever, even if the item would be drawn the same but the layer contents needed to be invalidated so that it would be redrawn (ie due to staying at the same position on screen but a different position in the layer).

This is really hacky, but NotifyRenderingChanged is only observed on one type of display item. So we just isolate the case where the only thing that changed is the offset (due to scrolling) and skip the NotifyRenderingChanged in that case.
Bug 100180 - Modal dialogs should try to cancel any drag sessions in progress. r=roc.
Backed out changeset a7289f22cafd (bug 981251) for WinXP test_bug343416.xul perma-fail.
CLOSED TREE
Bumping manifests a=b2g-bump
Bumping gaia.json for 9 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/9f73856885e9
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #18551 from mikehenrty/bug-975535-marketplace

Bug 975535 - marketplace update to include latest icons, r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/ef130e7f21e4
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 975535 - marketplace update to include latest icons

========

https://hg.mozilla.org/integration/gaia-central/rev/4546055494c9
Author: Ed Morley <emorley@mozilla.com>
Desc: Revert "Bug 999553 - Reenable most disabled unit tests on TBPL r=jgriffin" for render_test.js failures

This reverts commit ce1c1dee95a284d7dcc06862895108180168c08d.

========

https://hg.mozilla.org/integration/gaia-central/rev/03112c2078bb
Author: Dietrich Ayala <autonome@gmail.com>
Desc: Merge pull request #18497 from autonome/helper-shutdown

Bug 999110 - warning about no shutdown method in bootstrap.js for browse...

========

https://hg.mozilla.org/integration/gaia-central/rev/a2d64a9c3ee5
Author: Dietrich Ayala <autonome@gmail.com>
Desc: Bug 999110 - warning about no shutdown method in bootstrap.js for browser-helper

========

https://hg.mozilla.org/integration/gaia-central/rev/128f40e0b64c
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #18570 from timdream/fix-trust-ui-fxa2

Bug 993273 - Ensure FxA dialog is created hidden, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/5913e88e9c73
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 993273 - Ensure FxA dialog is created hidden

========

https://hg.mozilla.org/integration/gaia-central/rev/1efec860eb5f
Author: Jan Keromnes <janx@linux.com>
Desc: Merge pull request #18242 from jankeromnes/developermenu

Bug 995358 - [Settings] Reorganize developer menu entries. r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/3a50e1c8473d
Author: Jan Keromnes <janx@linux.com>
Desc: Bug 995358 - [Settings] Reorganize developer menu entries. r=arthurcc
Bumping manifests a=b2g-bump
Merge inbound to m-c.
bug 1000207: upload flame gecko/gaia mars to public ftp. r=aki DONTBUILD
Merge m-c to b2g-inbound. a=merge
Bug 999572 - Fix settingsService usage in NetworkGeolocationProvider.js. r=bent
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/17205e343e7e
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Merge pull request #18601 from gregorwagner/999572

Bug 999572 - Fix settingsService usage in NetworkGeolocationProvider.js

========

https://hg.mozilla.org/integration/gaia-central/rev/8ad0e3106fe3
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Bug 999572 - Fix settingsService usage in NetworkGeolocationProvider.js

========

https://hg.mozilla.org/integration/gaia-central/rev/d1c1d17679d5
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #18543 from KevinGrandon/bug_999676_app_manager_homescreen_visibility

Bug 999676 - [System] Remove un-needed homescreen visibility setting r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/3fd8382d7c5f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 999676 - [System] Remove un-needed homescreen visibility setting r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/be29770fd678
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #18594 from dmarcos/bug998478

Bug 998478 - [Camera] [Madai] The setting menu button when open doesn't ...

========

https://hg.mozilla.org/integration/gaia-central/rev/e4253836a5c8
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 998478 - [Camera] [Madai] The setting menu button when open doesn't overlap with the hud button
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/9f480d1c52a4
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #18429 from KevinGrandon/bug_997876_rocketbar_text_input

Bug 997876 - [Rocketbar] Input text should reset after entering homescreen

========

https://hg.mozilla.org/integration/gaia-central/rev/5b323487b93e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 997876 - [Rocketbar] Input text should reset after entering homescreen r=benfrancis
Bumping manifests a=b2g-bump
Bug 995041 - Fix browser_aboutHome.js to not touch the outside network and re-enable it on all trees. r=mak
Bug 998000 - Part 0: cancelEdit on back pressed, rather than stopEdit. r=lucasr
Bug 998000 - Part 1: Fix whitespace. r=lucasr
Bug 999760 - Apply padding to entire article item view. r=liuche