diff --git a/config/stl-headers b/config/stl-headers
index 723c42b33b..d4786f1c99 100644
--- a/config/stl-headers
+++ b/config/stl-headers
@@ -34,6 +34,7 @@ ostream
set
stack
string
+type_traits
utility
vector
cassert
diff --git a/config/system-headers b/config/system-headers
index 811086b63a..d3d282931c 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -1114,6 +1114,7 @@ ToolUtils.h
tr1/functional
trace.h
Traps.h
+type_traits
typeinfo
types.h
Types.h
diff --git a/docshell/base/crashtests/1257730-1.html b/docshell/base/crashtests/1257730-1.html
new file mode 100644
index 0000000000..028a1adb88
--- /dev/null
+++ b/docshell/base/crashtests/1257730-1.html
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
diff --git a/docshell/base/crashtests/crashtests.list b/docshell/base/crashtests/crashtests.list
index aab882f152..2a1918d5f7 100644
--- a/docshell/base/crashtests/crashtests.list
+++ b/docshell/base/crashtests/crashtests.list
@@ -12,3 +12,4 @@ load 514779-1.xhtml
load 614499-1.html
load 678872-1.html
skip-if(Android||B2G) pref(dom.disable_open_during_load,false) load 914521.html
+pref(browser.send_pings,true) load 1257730-1.html
diff --git a/dom/apps/Langpacks.jsm b/dom/apps/Langpacks.jsm
index bf26a67e9a..ff0df80b52 100644
--- a/dom/apps/Langpacks.jsm
+++ b/dom/apps/Langpacks.jsm
@@ -18,7 +18,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
this.EXPORTED_SYMBOLS = ["Langpacks"];
-let debug;
+var debug;
function debugPrefObserver() {
debug = Services.prefs.getBoolPref("dom.mozApps.debug")
? (aMsg) => {
diff --git a/dom/base/crashtests/729431-1.xhtml b/dom/base/crashtests/729431-1.xhtml
new file mode 100644
index 0000000000..a9c93aa2e0
--- /dev/null
+++ b/dom/base/crashtests/729431-1.xhtml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
diff --git a/dom/base/crashtests/crashtests.list b/dom/base/crashtests/crashtests.list
index 03b0aed11b..40e97faee8 100644
--- a/dom/base/crashtests/crashtests.list
+++ b/dom/base/crashtests/crashtests.list
@@ -148,6 +148,7 @@ load 709954.html
load 713417-1.html
load 713417-2.html
load 715056.html
+load 729431-1.xhtml
load 741163-1.html
load 745495.html
load 752226-1.html
diff --git a/dom/base/test/browser_use_counters.js b/dom/base/test/browser_use_counters.js
index 80341bb2f4..0b1e36c692 100644
--- a/dom/base/test/browser_use_counters.js
+++ b/dom/base/test/browser_use_counters.js
@@ -172,7 +172,7 @@ var check_use_counter_iframe = Task.async(function* (file, use_counter_middlefix
}
});
-let check_use_counter_img = Task.async(function* (file, use_counter_middlefix) {
+var check_use_counter_img = Task.async(function* (file, use_counter_middlefix) {
info("checking " + file + " as image with histogram " + use_counter_middlefix);
let newTab = gBrowser.addTab("about:blank");
@@ -230,7 +230,7 @@ let check_use_counter_img = Task.async(function* (file, use_counter_middlefix) {
"document counts " + use_counter_middlefix + " after are correct");
});
-let check_use_counter_direct = Task.async(function* (file, use_counter_middlefix, xfail=false) {
+var check_use_counter_direct = Task.async(function* (file, use_counter_middlefix, xfail=false) {
info("checking " + file + " with histogram " + use_counter_middlefix);
let newTab = gBrowser.addTab( "about:blank");
diff --git a/dom/canvas/test/reftest/filters/global-alpha.html b/dom/canvas/test/reftest/filters/global-alpha.html
index 4676e00605..8b6eb97520 100644
--- a/dom/canvas/test/reftest/filters/global-alpha.html
+++ b/dom/canvas/test/reftest/filters/global-alpha.html
@@ -7,7 +7,7 @@
var canvas = document.getElementById('canvas');
var ctx = canvas.getContext('2d');
-ctx.filter = 'drop-shadow(0 10px black)';
+ctx.filter = 'drop-shadow(0 10px #000)';
ctx.globalAlpha = 0.5;
ctx.fillStyle = '#0f0';
ctx.fillRect(25, 25, 50, 40);
diff --git a/dom/canvas/test/reftest/filters/reftest.list b/dom/canvas/test/reftest/filters/reftest.list
index 9dd1d8c476..aba390d4b1 100644
--- a/dom/canvas/test/reftest/filters/reftest.list
+++ b/dom/canvas/test/reftest/filters/reftest.list
@@ -3,7 +3,7 @@ default-preferences pref(canvas.filters.enabled,true)
== default-color.html ref.html
== drop-shadow.html ref.html
== drop-shadow-transformed.html ref.html
-== global-alpha.html global-alpha-ref.html
+fuzzy-if(azureSkia,1,1500) == global-alpha.html global-alpha-ref.html
== global-composite-operation.html global-composite-operation-ref.html
== liveness.html ref.html
== multiple-drop-shadows.html shadow-ref.html
diff --git a/dom/canvas/test/reftest/filters/units-em.html b/dom/canvas/test/reftest/filters/units-em.html
index 1f280c1b5b..44f76dc4b4 100644
--- a/dom/canvas/test/reftest/filters/units-em.html
+++ b/dom/canvas/test/reftest/filters/units-em.html
@@ -10,8 +10,12 @@ var ctx = canvas.getContext('2d');
ctx.font = '20px sans-serif';
ctx.filter = 'drop-shadow(0 .5em black)';
ctx.fillStyle = '#0f0';
-ctx.fillRect(25, 25, 25, 40);
+ctx.fillRect(25, 25, 50, 40);
canvas.style.fontSize = '5px';
ctx.font = '4em sans-serif';
ctx.filter = 'drop-shadow(0 .5em black)';
+
+
+
+