Merge m-c to birch.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 26 Jul 2013 01:23:45 -0400
changeset 152392 2b5495d36218814c095166843bda7d1e1d658e3b
parent 152391 61f9f0f58609bdfe3d432d7b7c7d931e6eaa17d0 (current diff)
parent 152288 46d73e889cb47c1497c9a967d055ab5123e05514 (diff)
child 152393 64852e44af63c1e23bcadfddca8538be7350b78b
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone25.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 birch.
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1495,25 +1495,25 @@ nsDisplayItem::ForceActiveLayers()
   }
 
   return sForce;
 }
 
 /* static */ int32_t
 nsDisplayItem::MaxActiveLayers()
 {
-  static int32_t sMaxLayers = -1;
+  static int32_t sMaxLayers = false;
   static bool sMaxLayersCached = false;
 
   if (!sMaxLayersCached) {
     Preferences::AddIntVarCache(&sMaxLayers, "layers.max-active", -1);
     sMaxLayersCached = true;
   }
 
-  return sMaxLayers;
+  return sMaxLayersCached;
 }
 
 bool
 nsDisplayItem::RecomputeVisibility(nsDisplayListBuilder* aBuilder,
                                    nsRegion* aVisibleRegion) {
   nsRect bounds = GetClippedBounds(aBuilder);
 
   nsRegion itemVisible;
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -546,17 +546,17 @@ pref("layers.async-video.enabled", true)
 pref("layers.progressive-paint", true);
 pref("layers.low-precision-buffer", true);
 pref("layers.low-precision-resolution", 250);
 // We want to limit layers for two reasons:
 // 1) We can't scroll smoothly if we have to many draw calls
 // 2) Pages that have too many layers consume too much memory and crash.
 // By limiting the number of layers on mobile we're making the main thread
 // work harder keep scrolling smooth and memory low.
-pref("layers.max-active", 1);
+pref("layers.max-active", 20);
 
 pref("notification.feature.enabled", true);
 pref("dom.webnotifications.enabled", true);
 
 // prevent tooltips from showing up
 pref("browser.chrome.toolbar_tips", false);
 pref("indexedDB.feature.enabled", true);
 pref("dom.indexedDB.warningQuota", 5);