Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5a3152292828 Author: Andrew Sutherland <asutherland@asutherland.org> Desc: Merge pull request #33007 from asutherland/email-quote-reply Bug 1217809 - [Email] quoted reply generation is failing to inject newlines for the non-base-case. r=jrburke ======== https://hg.mozilla.org/integration/gaia-central/rev/fa13332ebd0b Author: Andrew Sutherland <asutherland@asutherland.org> Desc: Bug 1217809 - [Email] quoted reply generation is failing to inject newlines for the non-base-case. r=jrburke propagate https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/389

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2aefb47b6940 Author: Andrew Sutherland <asutherland@asutherland.org> Desc: Merge pull request #33002 from asutherland/email-sent-folder Bug 1178197 - Avoid browserbox's naive folder name inference logic. r=jrburke ======== https://hg.mozilla.org/integration/gaia-central/rev/72cc55825799 Author: Andrew Sutherland <asutherland@asutherland.org> Desc: Bug 1178197 - Avoid browserbox's naive folder name inference logic. r=jrburke propagate https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/398

Bumping manifests a=b2g-bump

Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e169dc4818bb Author: Wes Kocher <kwierso@gmail.com> Desc: Revert "Merge pull request #32978 from Cwiiis/bug1221195-homescreen-remove-system-xhr" for gij(22) failures This reverts commit 6d44ad8956e313e679718df3ac1c393bdd687aec, reversing changes made to 15d5b31c93bd6115e54cccd4e68c4212e17d0d38.

Bumping manifests a=b2g-bump

Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/be0084e28963 Author: Wes Kocher <kwierso@gmail.com> Desc: Revert "Merge pull request #32993 from mikehenrty/bug-1179587-option-menu-test-fix" to see if it fixes gij(22) permafail on b-i This reverts commit 15d5b31c93bd6115e54cccd4e68c4212e17d0d38, reversing changes made to 78f0df71c005fc2450c1b00ff411359c5fad026b.

Bug 1221030 - Tablets: Restore tab thumbnail aspect ratio. r?mcomella.

Bug 1218557 - Update copy for settings reorg. r=liuche

Bug 1217196 - (Part 2) Remove touch event handling from BrowserToolbar. r?mcomella This code seems to have handled scroll events that started on the toolbar in the past. But this does not work anymore (for quite some time) and in fact breaks touch event handling (See bug 1046591 for a side-effect of only partially consuming events here).

Bug 1217196 - (Part 1) Move context menu and click handler back to BrowserToolbar. r?mcomella This is more or less reverting the changes introduced in bug 1216114.

Bug 686281 - CSS Mask rendering. --- layout/base/nsCSSRendering.cpp | 187 ++++++++++++++++++----------------- layout/base/nsCSSRendering.h | 46 ++++----- layout/base/nsDisplayList.cpp | 14 +-- layout/svg/nsSVGIntegrationUtils.cpp | 52 ++++++++-- layout/svg/nsSVGIntegrationUtils.h | 1 + 5 files changed, 171 insertions(+), 129 deletions(-)

Bug 686281 - CSS Mask Style --- layout/base/nsCSSRendering.h | 26 ++- layout/base/nsDisplayList.cpp | 34 ++-- layout/base/nsLayoutUtils.cpp | 6 +- layout/generic/nsCanvasFrame.cpp | 2 +- layout/generic/nsCanvasFrame.h | 2 +- layout/generic/nsFrame.cpp | 43 +++- layout/generic/nsGfxScrollFrame.cpp | 2 +- layout/style/StyleAnimationValue.cpp | 42 ++-- layout/style/nsComputedDOMStyle.cpp | 298 ++++++++++++++++++++++------ layout/style/nsComputedDOMStyle.h | 21 +- layout/style/nsRuleNode.cpp | 370 ++++++++++++++++++++++------------- layout/style/nsRuleNode.h | 7 + layout/style/nsStyleConsts.h | 80 ++++---- layout/style/nsStyleStruct.cpp | 241 ++++++++++++++--------- layout/style/nsStyleStruct.h | 146 +++++++++----- layout/style/nsStyleUtil.cpp | 4 +- layout/tables/nsTablePainter.cpp | 2 +- 17 files changed, 903 insertions(+), 423 deletions(-)

Bug 686281 - CSS Mask prop. --- layout/inspector/inDOMUtils.cpp | 2 + layout/style/Declaration.cpp | 141 ++++++++- layout/style/nsCSSKeywordList.h | 4 + layout/style/nsCSSParser.cpp | 433 ++++++++++++++++++++------ layout/style/nsCSSPropList.h | 139 ++++++++- layout/style/nsCSSProps.cpp | 83 +++-- layout/style/nsCSSProps.h | 14 +- layout/style/nsCSSValue.cpp | 4 +- layout/style/nsComputedDOMStylePropertyList.h | 10 +- 9 files changed, 679 insertions(+), 151 deletions(-)

merge mozilla-inbound to mozilla-central a=merge

Bug 1219515 - IonMonkey: Fix ThrowIfNotConstructing was not declared. r=evilpie --- js/src/proxy/ScriptedDirectProxyHandler.cpp | 2 ++ 1 file changed, 2 insertions(+)

Bug 1220505 - IonMonkey: MIPS64: Fix workaround for Loongson3 in Assembler::bind. r=huangwenjun06 --- js/src/jit/mips64/Assembler-mips64.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)

Bug 1221610 - Remove ToIntMargin(). r=jrmuizel. It's now a no-op.

Bug 1111892 - Ensure gdk_ungrab_pointer is always called in the correct process r=jimm

Bug 1208635 part 3: Treat "-webkit-box" as a known CSS keyword, for better parsing performance. r=heycam