Merge m-c to f-t
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 04 Dec 2013 20:29:00 -0800
changeset 173559 fe80b1695a66063ae1eb301986b6a1518cff10ce
parent 173558 cea439ce0f0d7add541505e002ec11009a9d3e8e (current diff)
parent 173491 725c36b5de1a4667ce33a0ced6143b1d8162edff (diff)
child 173560 d379a9103c5bebe8bc12b4b2b6212e31d0e9b072
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 f-t
modules/libpref/src/init/all.js
--- 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