Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 26 Jul 2013 01:24:55 -0400
changeset 140106 52f9e8ffe111884e934c7efeae4ffea67a44b128
parent 140102 bbf37166d07cc117d5e6304706e7f0d00b5415d5 (current diff)
parent 140105 46d73e889cb47c1497c9a967d055ab5123e05514 (diff)
child 140107 4716f738ef0a2bdb06e5efcb00716f84f2df13eb
child 140154 8da2f00eb92ea5dc7f8b0e2f312153f6c03fd607
child 140187 5652e8d703ef7fca01d681169cc722c29aaefceb
push id31595
push userryanvm@gmail.com
push dateFri, 26 Jul 2013 05:29:22 +0000
treeherdermozilla-inbound@52f9e8ffe111 [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 inbound.
gfx/layers/ipc/AsyncPanZoomController.cpp
--- 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);