mozilla-central: changeset 313060:4589f5daf170465565e2b091fcc094baea83d872

author	Mason Chang <mchang@mozilla.com>
	Wed, 07 Sep 2016 09:53:38 -0700
changeset 313060	4589f5daf170465565e2b091fcc094baea83d872
parent 313059	da216b2fc7dc009f228f0cf078b74b3b59008da0
child 313061	1530103e032c225c93bf7ac8fc581ccbab898275
push id	30669
push user	kwierso@gmail.com
push date	Thu, 08 Sep 2016 00:56:12 +0000
treeherder	mozilla-central@77940cbf0c2a [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	lsalzman
bugs	1301111
milestone	51.0a1
first release with	nightly linux32 938ce16be25f / 51.0a1 / 20160908030434 / files nightly linux64 938ce16be25f / 51.0a1 / 20160908030434 / files nightly mac 938ce16be25f / 51.0a1 / 20160908030434 / files nightly win32 938ce16be25f / 51.0a1 / 20160908030434 / files nightly win64 938ce16be25f / 51.0a1 / 20160908030434 / files
last release without	nightly linux32 91c2b9d5c135 / 51.0a1 / 20160907030427 / files nightly linux64 91c2b9d5c135 / 51.0a1 / 20160907030427 / files nightly mac 91c2b9d5c135 / 51.0a1 / 20160907030427 / files nightly win32 91c2b9d5c135 / 51.0a1 / 20160907030427 / files nightly win64 91c2b9d5c135 / 51.0a1 / 20160907030427 / files

--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -753,18 +753,24 @@ pref("gfx.font_rendering.directwrite.use
 #endif
 
 pref("gfx.font_rendering.opentype_svg.enabled", true);
 
 #ifdef XP_WIN
 // comma separated list of backends to use in order of preference
 // e.g., pref("gfx.canvas.azure.backends", "direct2d,skia,cairo");
 pref("gfx.canvas.azure.backends", "direct2d1.1,skia,cairo");
+
+#ifdef NIGHTLY_BUILD
 pref("gfx.content.azure.backends", "direct2d1.1,skia,cairo");
 #else
+pref("gfx.content.azure.backends", "direct2d1.1,cairo");
+#endif
+
+#else
 #ifdef XP_MACOSX
 pref("gfx.content.azure.backends", "skia");
 pref("gfx.canvas.azure.backends", "skia");
 // Accelerated cg canvas where available (10.7+)
 pref("gfx.canvas.azure.accelerated", true);
 #else
 pref("gfx.canvas.azure.backends", "skia");
 pref("gfx.content.azure.backends", "skia");