From e3c03410ef9d77008ad59123dbde67e99d1c09f5 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sun, 22 Feb 2015 22:00:56 -0800
Subject: [PATCH] Back out 66cf24f275b7 (bug 1124011) for frequent ASan crashes
 in test_memoryReporters.xul

---
 browser/app/profile/firefox.js                     |  2 --
 mobile/android/app/mobile.js                       |  3 ---
 toolkit/components/reader/AboutReader.jsm          | 12 ++----------
 toolkit/components/reader/content/aboutReader.html |  4 ++--
 toolkit/themes/windows/global/aboutReader.css      |  4 ----
 5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index ae194b83f09c..20fd6f382b3f 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1873,10 +1873,8 @@ pref("dom.ipc.reportProcessHangs", false);
 pref("dom.ipc.reportProcessHangs", true);
 #endif
 
-#ifndef NIGHTLY_BUILD
 // Disable reader mode by default.
 pref("reader.parse-on-load.enabled", false);
-#endif
 
 // Disable ReadingList by default.
 pref("browser.readinglist.enabled", false);
diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index d6a1cde3099b..a3b98e18328d 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -858,6 +858,3 @@ pref("reader.color_scheme.values", "[\"light\",\"dark\",\"auto\"]");
 
 // Whether to use a vertical or horizontal toolbar.
 pref("reader.toolbar.vertical", false);
-
-// Whether or not to display buttons related to reading list in reader view.
-pref("browser.readinglist.enabled", true);
diff --git a/toolkit/components/reader/AboutReader.jsm b/toolkit/components/reader/AboutReader.jsm
index 4e9cffdd4ffe..828cf53e8536 100644
--- a/toolkit/components/reader/AboutReader.jsm
+++ b/toolkit/components/reader/AboutReader.jsm
@@ -57,16 +57,9 @@ let AboutReader = function(mm, win) {
 
   this._setupStyleDropdown();
   this._setupButton("close-button", this._onReaderClose.bind(this), "aboutReader.toolbar.close");
+  this._setupButton("toggle-button", this._onReaderToggle.bind(this), "aboutReader.toolbar.addToReadingList");
   this._setupButton("share-button", this._onShare.bind(this), "aboutReader.toolbar.share");
-
-  try {
-    if (Services.prefs.getBoolPref("browser.readinglist.enabled")) {
-      this._setupButton("toggle-button", this._onReaderToggle.bind(this), "aboutReader.toolbar.addToReadingList");
-      this._setupButton("list-button", this._onList.bind(this), "aboutReader.toolbar.openReadingList");
-    }
-  } catch (e) {
-    // Pref doesn't exist.
-  }
+  this._setupButton("list-button", this._onList.bind(this), "aboutReader.toolbar.openReadingList");
 
   let colorSchemeValues = JSON.parse(Services.prefs.getCharPref("reader.color_scheme.values"));
   let colorSchemeOptions = colorSchemeValues.map((value) => {
@@ -706,7 +699,6 @@ AboutReader.prototype = {
 
   _setupButton: function Reader_setupButton(id, callback, titleEntity) {
     let button = this._doc.getElementById(id);
-    button.removeAttribute("hidden");
     button.setAttribute("title", gStrings.GetStringFromName(titleEntity));
 
     button.addEventListener("click", function(aEvent) {
diff --git a/toolkit/components/reader/content/aboutReader.html b/toolkit/components/reader/content/aboutReader.html
index 8bdbc8c9b798..955ce17dea8e 100644
--- a/toolkit/components/reader/content/aboutReader.html
+++ b/toolkit/components/reader/content/aboutReader.html
@@ -38,8 +38,8 @@
         <div class="dropdown-arrow"/>
       </li>
     </ul>
-    <li><button id="toggle-button" class="button toggle-button" hidden="true"/></li>
-    <li><button id="list-button" class="button list-button" hidden="true"/></li>
+    <li><button id="toggle-button" class="button toggle-button"/></li>
+    <li><button id="list-button" class="button list-button"/></li>
   </ul>
 
 </body>
diff --git a/toolkit/themes/windows/global/aboutReader.css b/toolkit/themes/windows/global/aboutReader.css
index ef7871159133..7ec8edacac4a 100644
--- a/toolkit/themes/windows/global/aboutReader.css
+++ b/toolkit/themes/windows/global/aboutReader.css
@@ -248,10 +248,6 @@ body {
   border-bottom: 1px solid #c1c1c1;
 }
 
-.button[hidden] {
-  display: none;
-}
-
 .dropdown {
   text-align: center;
   list-style: none;