--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -4134,27 +4134,29 @@ pref("layers.acceleration.draw-fps", fal
 
 pref("layers.draw-borders", false);
 pref("layers.draw-tile-borders", false);
 pref("layers.draw-bigimage-borders", false);
 pref("layers.frame-counter", false);
 // Max number of layers per container. See Overwrite in mobile prefs.
 pref("layers.max-active", -1);
 
-// Whether to use the deprecated texture architecture rather than the new one.
 #ifdef XP_MACOSX
 pref("layers.offmainthreadcomposition.enabled", true);
-pref("layers.use-deprecated-textures", false);
+#endif
+
+#ifdef MOZ_WIDGET_GONK
+pref("layers.offmainthreadcomposition.enabled", true);
+#endif
+
+// Whether to use the deprecated texture architecture rather than the new one.
+#ifdef XP_WIN
+pref("layers.use-deprecated-textures", true);
 #else
-#ifdef MOZ_WIDGET_GONK
 pref("layers.use-deprecated-textures", false);
-#else
-pref("layers.offmainthreadcomposition.enabled", false);
-pref("layers.use-deprecated-textures", true);
-#endif
 #endif
 
 // same effect as layers.offmainthreadcomposition.enabled, but specifically for
 // use with tests.
 pref("layers.offmainthreadcomposition.testing.enabled", false);
 
 // whether to allow use of the basic compositor
 pref("layers.offmainthreadcomposition.force-basic", false);