Merge m-c to b-i
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 04 Dec 2013 20:30:29 -0800
changeset 173591 2b13afaebb1d4cb9da1fc2d211ff2fc7a7f99065
parent 173590 7cfb12b2785d3b3103f633dfe7ed6161efcfc191 (current diff)
parent 173491 725c36b5de1a4667ce33a0ced6143b1d8162edff (diff)
child 173592 9d27443233412e2dd8a51b69daa454db47719caf
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to b-i
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -4250,23 +4250,16 @@ pref("layers.scroll-graph", false);
 // Set the default values, and then override per-platform as needed
 pref("layers.offmainthreadcomposition.enabled", false);
 // Whether to use the deprecated texture architecture rather than the new one.
 pref("layers.use-deprecated-textures", true);
 // Asynchonous video compositing using the ImageBridge IPDL protocol.
 // requires off-main-thread compositing.
 pref("layers.async-video.enabled",false);
 
-// For now, only nightly users get OMTC on windows.
-// Windows OMTC riding the trains is blocked on bugs 913503 and 904890,
-// and general stability.
-#if defined(XP_WIN) && defined(NIGHTLY_BUILD)
-pref("layers.offmainthreadcomposition.enabled", true);
-#endif
-
 #ifdef XP_MACOSX
 pref("layers.offmainthreadcomposition.enabled", true);
 pref("layers.use-deprecated-textures", false);
 pref("layers.async-video.enabled",true);
 #endif
 
 // ANDROID covers android and b2g
 #ifdef ANDROID