Backed out changesets 4f35e943f939 and da5fa63e90cb (bug 896250) for causing frequent OSX debug asserts on a CLOSED TREE.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 26 Jul 2013 01:22:40 -0400
changeset 140003 46d73e889cb4
parent 140002 c6eaf5f8e721
child 140099 52f9e8ffe111
child 140100 37567e5bbe9f
child 140107 2b5495d36218
child 155601 61678b88455b
push id25012
push userryanvm@gmail.com
push dateFri, 26 Jul 2013 05:22:54 +0000
treeherdermozilla-central@46d73e889cb4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs896250
milestone25.0a1
backs out4f35e943f939
da5fa63e90cb
first release with
nightly linux32
46d73e889cb4 / 25.0a1 / 20130726030203 / files
nightly linux64
46d73e889cb4 / 25.0a1 / 20130726030203 / files
nightly mac
46d73e889cb4 / 25.0a1 / 20130726030203 / files
nightly win32
46d73e889cb4 / 25.0a1 / 20130726030203 / files
nightly win64
46d73e889cb4 / 25.0a1 / 20130726030203 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changesets 4f35e943f939 and da5fa63e90cb (bug 896250) for causing frequent OSX debug asserts on a CLOSED TREE.
layout/base/nsDisplayList.cpp
mobile/android/app/mobile.js
--- 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);