Bug 1263110 - Part 3 - Remove the remains of the old crash loop detection. r=mfinkle,sebastian draft
authorJan Henning <jh+bugzilla@buttercookie.de>
Sat, 09 Apr 2016 17:51:57 +0200
changeset 356906 a39c8987e95a9bc690302327c1cfb7dd3144ddfc
parent 356905 c2f238d98a3808c69fa403d7ec8146b9213ae278
child 356907 751dcc2b0c4e291c9f1aaace6b3ad6277c8ae72e
push id16637
push usermozilla@buttercookie.de
push dateWed, 27 Apr 2016 13:50:52 +0000
reviewersmfinkle, sebastian
bugs1263110
milestone49.0a1
Bug 1263110 - Part 3 - Remove the remains of the old crash loop detection. r=mfinkle,sebastian The number of recent successive crashes is now tracked wholly within Java, so we can remove the old Gecko pref and the associated reset code. MozReview-Commit-ID: 7bR9wqJsLoi
mobile/android/app/mobile.js
widget/android/nsAppShell.cpp
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -132,17 +132,16 @@ pref("browser.sessionhistory.max_entries
 pref("browser.sessionhistory.contentViewerTimeout", 360);
 
 /* session store */
 pref("browser.sessionstore.resume_session_once", false);
 pref("browser.sessionstore.resume_from_crash", true);
 pref("browser.sessionstore.interval", 10000); // milliseconds
 pref("browser.sessionstore.max_tabs_undo", 5);
 pref("browser.sessionstore.max_resumed_crashes", 1);
-pref("browser.sessionstore.recent_crashes", 0);
 pref("browser.sessionstore.privacy_level", 0); // saving data: 0 = all, 1 = unencrypted sites, 2 = never
 pref("browser.sessionstore.debug_logging", false);
 
 /* these should help performance */
 pref("mozilla.widget.force-24bpp", true);
 pref("mozilla.widget.use-buffer-pixmap", true);
 pref("mozilla.widget.disable-native-theme", true);
 pref("layout.reflow.synthMouseMove", false);
--- a/widget/android/nsAppShell.cpp
+++ b/widget/android/nsAppShell.cpp
@@ -228,22 +228,16 @@ public:
             nsCacheService::GlobalInstance()->Shutdown();
         }
 
         // We really want to send a notification like profile-before-change,
         // but profile-before-change ends up shutting some things down instead
         // of flushing data
         nsIPrefService* prefs = Preferences::GetService();
         if (prefs) {
-            // reset the crash loop state
-            nsCOMPtr<nsIPrefBranch> prefBranch;
-            prefs->GetBranch("browser.sessionstore.", getter_AddRefs(prefBranch));
-            if (prefBranch)
-                prefBranch->SetIntPref("recent_crashes", 0);
-
             prefs->SavePrefFile(nullptr);
         }
     }
 
     static void OnResume()
     {
         MOZ_ASSERT(NS_IsMainThread());