Bug 1095608: Disable Direct2D 1.1. r=jrmuizel a=lsblakk
authorBas Schouten <bschouten@mozilla.com>
Thu, 13 Nov 2014 23:14:37 +0000
changeset 233878 9ff937d547f886c241c0f3e4d75fab1f527b1124
parent 233877 700fe4de52c8d121d205ceb280271831278055da
child 233879 751a34f8231f9d6b80359486adc943d2bef631e1
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel, lsblakk
bugs1095608
milestone35.0a2
Bug 1095608: Disable Direct2D 1.1. r=jrmuizel a=lsblakk
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -574,18 +574,18 @@ pref("gfx.font_rendering.directwrite.ena
 pref("gfx.font_rendering.directwrite.use_gdi_table_loading", true);
 #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,direct2d,skia,cairo");
-pref("gfx.content.azure.backends", "direct2d1.1,direct2d,cairo");
+pref("gfx.canvas.azure.backends", "direct2d,skia,cairo");
+pref("gfx.content.azure.backends", "direct2d,cairo");
 #else
 #ifdef XP_MACOSX
 pref("gfx.content.azure.backends", "cg");
 pref("gfx.canvas.azure.backends", "cg");
 // Accelerated cg canvas where available (10.7+)
 pref("gfx.canvas.azure.accelerated", false);
 #else
 pref("gfx.canvas.azure.backends", "cairo");
@@ -3925,17 +3925,17 @@ pref("gfx.apitrace.enabled",false);
 #ifdef MOZ_WIDGET_GTK
 pref("gfx.xrender.enabled",true);
 #endif
 #endif
 
 #ifdef XP_WIN
 // Whether to disable the automatic detection and use of direct2d.
 pref("gfx.direct2d.disabled", false);
-pref("gfx.direct2d.use1_1", true);
+pref("gfx.direct2d.use1_1", false);
 
 // Whether to attempt to enable Direct2D regardless of automatic detection or
 // blacklisting
 pref("gfx.direct2d.force-enabled", false);
 
 pref("layers.prefer-opengl", false);
 pref("layers.prefer-d3d9", false);
 #endif