Bug 896114 - Don't initialize UserAgentOverrides on desktop. r=dolske

Bug 899415 - OdinMonkey: split out declarations/definitions better across AsmJS .h/.cpp files (r=bbouvier)

bug 896254 - disable WebGL 2 interfaces - r=jilbert,ehsan

Bug 860490 - Mark _pluginthreadasynccall calls as safe to re-enter gecko. r=bsmedberg,roc

Only test IDN nodes against kMaxDNSNodeLen on string-prepped IDNs that we're going to send to DNS, not the Unicode form for display only. Bug 892370, r=honzab

bug 898221 - search backwards for the last punycode delimiter instead of forwards. r=hurley

Backed out changeset 4aeb00521c9d (bug 896890) for build bustage. CLOSED TREE

Merge m-c to inbound.

Bug 896555 - Remember requested permission for a session. r=mfinkle, r=wesj

Bug 899230 - domUtils.getCSSValuesForProperty doesn't return "logical" and "physical" any list. r=bz This patch prevents inIDOMUtils from returning logical and physical from any list.

Bug 897094 - Mismatched parenthesis in some CSS functions do not prevent parsing of subsequent CSS properties. r=heycam

Bug 832960 - Geolocation and desktop notification should require a manifest entry for apps on Android. r=mfinkle

Bug 899623 - Ensure activeTileset is bound before calling methods on it. r=jimm

Bug 896890 - TabContent::HasOwnApp() should be true iff TabContext::GetOwnApp() is non-null. r=khuey This change reworks how TabContext stores its data. Before, it stored an app-id and translated that into an app; now we do the reverse. This lets us guarantee that HasOwnApp() is true iff GetOwnApp() is non-null. We added a new class, MaybeInvalidTabContext to assist with converting from an IPCTabContext to a TabContext. This allows us to ensure that a TabContext object is never invalid.

Bug 896992 - Activity looping if GeckoApp has been killed and Settings is launched from notification. r=kats

Bug 895322 - Part 5: Stop #defining MOZ_STATIC_ASSERT in C++ code; r=Waldo

Bug 895322 - Part 4: Only use MOZ_STATIC_ASSERT in mar.h when we're compiling C code; r=Waldo

Bug 895322 - Part 3: Stop generating MOZ_STATIC_ASSERT in Web IDL bindings; r=Waldo

Bug 895322 - Part 2: Stop generating MOZ_STATIC_ASSERT in the telemetry code; r=Waldo

Bug 895322 - Part 1: Replace the usages of MOZ_STATIC_ASSERT with C++11 static_assert; r=Waldo This patch was mostly generated by running the following scripts on the codebase, with some manual changes made afterwards: # static_assert.sh #!/bin/bash # Command to convert an NSPR integer type to the equivalent standard integer type function convert() { echo "Converting $1 to $2..." find . ! -wholename "*nsprpub*" \ ! -wholename "*security/nss*" \ ! -wholename "*/.hg*" \ ! -wholename "obj-ff-dbg*" \ ! -name nsXPCOMCID.h \ ! -name prtypes.h \ -type f \ \( -iname "*.cpp" \ -o -iname "*.h" \ -o -iname "*.cc" \ -o -iname "*.mm" \) | \ xargs -n 1 `dirname $0`/assert_replacer.py #sed -i -e "s/\b$1\b/$2/g" } convert MOZ_STATIC_ASSERT static_assert hg rev --no-backup mfbt/Assertions.h \ media/webrtc/signaling/src/sipcc/core/includes/ccapi.h \ modules/libmar/src/mar_private.h \ modules/libmar/src/mar.h # assert_replacer.py #!/usr/bin/python import sys import re pattern = re.compile(r"\bMOZ_STATIC_ASSERT\b") def replaceInPlace(fname): print fname f = open(fname, "rw+") lines = f.readlines() for i in range(0, len(lines)): while True: index = re.search(pattern, lines[i]) if index != None: index = index.start() lines[i] = lines[i][0:index] + "static_assert" + lines[i][index+len("MOZ_STATIC_ASSERT"):] for j in range(i + 1, len(lines)): if lines[j].find(" ", index) == index: lines[j] = lines[j][0:index] + lines[j][index+4:] else: break else: break f.seek(0, 0) f.truncate() f.write("".join(lines)) f.close() argc = len(sys.argv) for i in range(1, argc): replaceInPlace(sys.argv[i])