From 1b6f65f5861c225c08d3d83d258a100546767094 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Tue, 12 Jan 2016 15:48:55 +0100
Subject: [PATCH] Backed out changeset 138c4e6a9b45 (bug 1231378)

---
 mfbt/FastBernoulliTrial.h                | 5 +----
 mfbt/ThreadLocal.h                       | 4 ----
 modules/libjar/nsJAR.cpp                 | 2 --
 modules/libjar/nsJAR.h                   | 5 ++---
 modules/libjar/nsJARChannel.cpp          | 1 -
 modules/libjar/nsJARInputStream.h        | 6 +++---
 modules/libjar/zipwriter/nsZipWriter.cpp | 7 +++----
 modules/libpref/nsPrefBranch.h           | 5 +----
 8 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/mfbt/FastBernoulliTrial.h b/mfbt/FastBernoulliTrial.h
index 7e38b70ab43..fbfc34b3cad 100644
--- a/mfbt/FastBernoulliTrial.h
+++ b/mfbt/FastBernoulliTrial.h
@@ -177,10 +177,7 @@ class FastBernoulliTrial {
    * random number generator; both may not be zero.
    */
   FastBernoulliTrial(double aProbability, uint64_t aState0, uint64_t aState1)
-   : mProbability(0)
-   , mInvLogNotProbability(0)
-   , mGenerator(aState0, aState1)
-   , mSkipCount(0)
+   : mGenerator(aState0, aState1)
   {
     setProbability(aProbability);
   }
diff --git a/mfbt/ThreadLocal.h b/mfbt/ThreadLocal.h
index eae84a21447..79da298f55d 100644
--- a/mfbt/ThreadLocal.h
+++ b/mfbt/ThreadLocal.h
@@ -95,10 +95,6 @@ class ThreadLocal
   };
 
 public:
-  ThreadLocal()
-    : mKey(0), mInited(false)
-  {}
-
   MOZ_WARN_UNUSED_RESULT inline bool init();
 
   inline T get() const;
diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp
index 3c8c4d35294..04ecc5e519f 100644
--- a/modules/libjar/nsJAR.cpp
+++ b/modules/libjar/nsJAR.cpp
@@ -84,7 +84,6 @@ nsJAR::nsJAR(): mZip(new nsZipArchive()),
                 mReleaseTime(PR_INTERVAL_NO_TIMEOUT),
                 mCache(nullptr),
                 mLock("nsJAR::mLock"),
-                mMtime(0),
                 mTotalItemsInManifest(0),
                 mOpened(false)
 {
@@ -1056,7 +1055,6 @@ NS_IMPL_ISUPPORTS(nsZipReaderCache, nsIZipReaderCache, nsIObserver, nsISupportsW
 
 nsZipReaderCache::nsZipReaderCache()
   : mLock("nsZipReaderCache.mLock")
-  , mCacheSize(0)
   , mZips()
 #ifdef ZIP_CACHE_HIT_RATE
     ,
diff --git a/modules/libjar/nsJAR.h b/modules/libjar/nsJAR.h
index 243f03c1663..914bf47b647 100644
--- a/modules/libjar/nsJAR.h
+++ b/modules/libjar/nsJAR.h
@@ -102,7 +102,7 @@ class nsJAR final : public nsIZipReader
     //-- Private data members
     nsCOMPtr<nsIFile>        mZipFile;        // The zip/jar file on disk
     nsCString                mOuterZipEntry;  // The entry in the zip this zip is reading from
-    RefPtr<nsZipArchive>     mZip;            // The underlying zip archive
+    RefPtr<nsZipArchive>   mZip;            // The underlying zip archive
     ManifestDataHashtable    mManifestData;   // Stores metadata for each entry
     bool                     mParsedManifest; // True if manifest has been parsed
     nsCOMPtr<nsIX509Cert>    mSigningCert;    // The entity which signed this file
@@ -166,8 +166,7 @@ public:
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIUTF8STRINGENUMERATOR
 
-    explicit nsJAREnumerator(nsZipFind *aFind)
-      : mFind(aFind), mName(nullptr), mNameLen(0) {
+    explicit nsJAREnumerator(nsZipFind *aFind) : mFind(aFind), mName(nullptr) {
       NS_ASSERTION(mFind, "nsJAREnumerator: Missing zipFind.");
     }
 
diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp
index e244e494ec4..c9ec701daf4 100644
--- a/modules/libjar/nsJARChannel.cpp
+++ b/modules/libjar/nsJARChannel.cpp
@@ -195,7 +195,6 @@ nsJARInputThunk::IsNonBlocking(bool *nonBlocking)
 
 nsJARChannel::nsJARChannel()
     : mOpened(false)
-    , mContentDisposition(0)
     , mAppURI(nullptr)
     , mContentLength(-1)
     , mLoadFlags(LOAD_NORMAL)
diff --git a/modules/libjar/nsJARInputStream.h b/modules/libjar/nsJARInputStream.h
index 1c396aa102e..959d8b73533 100644
--- a/modules/libjar/nsJARInputStream.h
+++ b/modules/libjar/nsJARInputStream.h
@@ -21,8 +21,8 @@ class nsJARInputStream final : public nsIInputStream
 {
   public:
     nsJARInputStream() : 
-        mOutSize(0), mInCrc(0), mOutCrc(0), mNameLen(0),
-        mCurPos(0), mArrPos(0), mMode(MODE_NOTINITED)
+        mOutSize(0), mInCrc(0), mOutCrc(0), mCurPos(0),
+        mMode(MODE_NOTINITED)
     { 
       memset(&mZs, 0, sizeof(z_stream));
     }
@@ -47,7 +47,7 @@ class nsJARInputStream final : public nsIInputStream
     z_stream               mZs;         // zip data structure
 
     /* For directory reading */
-    RefPtr<nsJAR>          mJar;        // string reference to zipreader
+    RefPtr<nsJAR>        mJar;        // string reference to zipreader
     uint32_t               mNameLen;    // length of dirname
     nsCString              mBuffer;     // storage for generated text of stream
     uint32_t               mCurPos;     // Current position in buffer
diff --git a/modules/libjar/zipwriter/nsZipWriter.cpp b/modules/libjar/zipwriter/nsZipWriter.cpp
index db2591d7164..2490aa33d60 100644
--- a/modules/libjar/zipwriter/nsZipWriter.cpp
+++ b/modules/libjar/zipwriter/nsZipWriter.cpp
@@ -52,10 +52,9 @@ NS_IMPL_ISUPPORTS(nsZipWriter, nsIZipWriter,
                   nsIRequestObserver)
 
 nsZipWriter::nsZipWriter()
-  : mCDSOffset(0)
-  , mCDSDirty(false)
-  , mInQueue(false)
-{}
+{
+    mInQueue = false;
+}
 
 nsZipWriter::~nsZipWriter()
 {
diff --git a/modules/libpref/nsPrefBranch.h b/modules/libpref/nsPrefBranch.h
index 79328cbfb77..e1123c80c4c 100644
--- a/modules/libpref/nsPrefBranch.h
+++ b/modules/libpref/nsPrefBranch.h
@@ -200,10 +200,7 @@ protected:
   virtual ~nsPrefBranch();
 
   nsPrefBranch()    /* disallow use of this constructer */
-    : mPrefRootLength(0)
-    , mIsDefault(false)
-    , mFreeingObserverList(false)
-  {}
+    { }
 
   nsresult   GetDefaultFromPropertiesFile(const char *aPrefName, char16_t **return_buf);
   // As SetCharPref, but without any check on the length of |aValue|