Backed out changeset 85740a5fc12f (bug 1259466) for conflicting down with merge from m-c
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 05 Apr 2016 10:32:42 +0200
changeset 347758 0847a24d311053f3b17f36b5680e208dd862857a
parent 347757 1d7ff58884f4f9937d92a08b0648be580d0066aa
child 347759 9b307318175cf1864f30a5d31e6494fb356a7c45
push id14653
push userolivier@olivieryiptong.com
push dateTue, 05 Apr 2016 19:21:01 +0000
bugs1259466
milestone48.0a1
backs out85740a5fc12fb0264ab964a262fa8bf6a45d7c55
Backed out changeset 85740a5fc12f (bug 1259466) for conflicting down with merge from m-c
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4417,18 +4417,16 @@ pref("layers.tile-height", 256);
 pref("layers.max-active", -1);
 // If this is set the tile size will only be treated as a suggestion.
 // On B2G we will round this to the stride of the underlying allocation.
 // On any platform we may later use the screen size and ignore
 // tile-width/tile-height entirely. Its recommended to turn this off
 // if you change the tile size.
 pref("layers.tiles.adjust", true);
 
-// Set the default values, and then override per-platform as needed
-pref("layers.offmainthreadcomposition.force-disabled", false);
 // Compositor target frame rate. NOTE: If vsync is enabled the compositor
 // frame rate will still be capped.
 // -1 -> default (match layout.frame_rate or 60 FPS)
 // 0  -> full-tilt mode: Recomposite even if not transaction occured.
 pref("layers.offmainthreadcomposition.frame-rate", -1);
 
 #ifdef XP_MACOSX
 pref("layers.enable-tiles", true);