Bug 660768 modules should use mozilla::Preferences r=roc+joe+tglek

Author: masayuki-nakano

modules/libjar/nsJARChannel.cpp

@@ -52,6 +52,10 @@
 #include "nsIPrincipal.h"
 #include "nsIFileURL.h"
 
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
+
 static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID);
 
 // the entry for a directory will either be empty (in the case of the
@@ -839,18 +843,9 @@ nsJARChannel::OnDownloadComplete(nsIDownloader *downloader,
         }
     }
 
-    if (NS_SUCCEEDED(status) && mIsUnsafe) {
-        PRBool allowUnpack = PR_FALSE;
-
-        nsCOMPtr<nsIPrefBranch> prefs =
-            do_GetService(NS_PREFSERVICE_CONTRACTID);
-        if (prefs) {
-            prefs->GetBoolPref("network.jar.open-unsafe-types", &allowUnpack);
-        }
-
-        if (!allowUnpack) {
-            status = NS_ERROR_UNSAFE_CONTENT_TYPE;
-        }
+    if (NS_SUCCEEDED(status) && mIsUnsafe &&
+        !Preferences::GetBool("network.jar.open-unsafe-types", PR_FALSE)) {
+        status = NS_ERROR_UNSAFE_CONTENT_TYPE;
     }
 
     if (NS_SUCCEEDED(status)) {

modules/libpr0n/src/DiscardTracker.cpp

@@ -35,14 +35,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsIServiceManager.h"
-#include "nsIPrefService.h"
-#include "nsIPrefBranch2.h"
-
 #include "nsComponentManagerUtils.h"
 #include "nsITimer.h"
 #include "RasterImage.h"
 #include "DiscardTracker.h"
+#include "mozilla/Preferences.h"
 
 namespace mozilla {
 namespace imagelib {
@@ -174,12 +171,7 @@ DiscardTracker::ReloadTimeout()
 
   // read the timeout pref
   PRInt32 discardTimeout;
-  nsCOMPtr<nsIPrefBranch2> branch = do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (!branch) {
-    NS_WARNING("nsIPrefBranch2 is not available!");
-    return;
-  }
-  rv = branch->GetIntPref(DISCARD_TIMEOUT_PREF, &discardTimeout);
+  rv = Preferences::GetInt(DISCARD_TIMEOUT_PREF, &discardTimeout);
 
   // If we got something bogus, return
   if (!NS_SUCCEEDED(rv) || discardTimeout <= 0)

modules/libpr0n/src/imgLoader.cpp

@@ -55,8 +55,6 @@
 #include "nsIHttpChannel.h"
 #include "nsICachingChannel.h"
 #include "nsIInterfaceRequestor.h"
-#include "nsIPrefBranch2.h"
-#include "nsIPrefService.h"
 #include "nsIProgressEventSink.h"
 #include "nsIChannelEventSink.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
@@ -90,7 +88,9 @@
 #include "nsIChannelPolicy.h"
 
 #include "mozilla/FunctionTimer.h"
+#include "mozilla/Preferences.h"
 
+using namespace mozilla;
 using namespace mozilla::imagelib;
 
 #if defined(DEBUG_pavlov) || defined(DEBUG_timeless)
@@ -851,19 +851,15 @@ nsresult imgLoader::InitCache()
   if (!sChromeCache.Init())
       return NS_ERROR_OUT_OF_MEMORY;
 
-  nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); 
-  if (NS_FAILED(rv))
-    return rv;
-
   PRInt32 timeweight;
-  rv = prefs->GetIntPref("image.cache.timeweight", &timeweight);
+  rv = Preferences::GetInt("image.cache.timeweight", &timeweight);
   if (NS_SUCCEEDED(rv))
     sCacheTimeWeight = timeweight / 1000.0;
   else
     sCacheTimeWeight = 0.5;
 
   PRInt32 cachesize;
-  rv = prefs->GetIntPref("image.cache.size", &cachesize);
+  rv = Preferences::GetInt("image.cache.size", &cachesize);
   if (NS_SUCCEEDED(rv))
     sCacheMaxSize = cachesize;
   else
@@ -884,13 +880,9 @@ nsresult imgLoader::InitCache()
 nsresult imgLoader::Init()
 {
   nsresult rv;
-  nsCOMPtr<nsIPrefBranch2> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); 
-  if (NS_FAILED(rv))
-    return rv;
-
-  ReadAcceptHeaderPref(prefs);
+  ReadAcceptHeaderPref();
 
-  prefs->AddObserver("image.http.accept", this, PR_TRUE);
+  Preferences::AddWeakObserver(this, "image.http.accept");
 
   // Listen for when we leave private browsing mode
   nsCOMPtr<nsIObserverService> obService = mozilla::services::GetObserverService();
@@ -906,8 +898,7 @@ imgLoader::Observe(nsISupports* aSubject, const char* aTopic, const PRUnichar* a
   // We listen for pref change notifications...
   if (!strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) {
     if (!strcmp(NS_ConvertUTF16toUTF8(aData).get(), "image.http.accept")) {
-      nsCOMPtr<nsIPrefBranch> prefs = do_QueryInterface(aSubject);
-      ReadAcceptHeaderPref(prefs);
+      ReadAcceptHeaderPref();
     }
   }
 
@@ -925,13 +916,10 @@ imgLoader::Observe(nsISupports* aSubject, const char* aTopic, const PRUnichar* a
   return NS_OK;
 }
 
-void imgLoader::ReadAcceptHeaderPref(nsIPrefBranch *aBranch)
+void imgLoader::ReadAcceptHeaderPref()
 {
-  NS_ASSERTION(aBranch, "Pref branch is null");
-
-  nsXPIDLCString accept;
-  nsresult rv = aBranch->GetCharPref("image.http.accept", getter_Copies(accept));
-  if (NS_SUCCEEDED(rv))
+  nsAdoptingCString accept = Preferences::GetCString("image.http.accept");
+  if (accept)
     mAcceptHeader = accept;
   else
     mAcceptHeader = "image/png,image/*;q=0.8,*/*;q=0.5";

modules/libpr0n/src/imgLoader.h

@@ -62,7 +62,6 @@ class imgRequestProxy;
 class imgIRequest;
 class imgIDecoderObserver;
 class nsILoadGroup;
-class nsIPrefBranch;
 
 class imgCacheEntry
 {
@@ -323,7 +322,7 @@ class imgLoader : public imgILoader,
                                     nsLoadFlags aLoadFlags, imgIRequest *aRequestProxy,
                                     imgIRequest **_retval);
 
-  void ReadAcceptHeaderPref(nsIPrefBranch *aBranch);
+  void ReadAcceptHeaderPref();
 
 
   typedef nsRefPtrHashtable<nsCStringHashKey, imgCacheEntry> imgCacheTable;

modules/libpr0n/src/imgRequest.cpp

@@ -80,8 +80,7 @@
 #include "nsNetUtil.h"
 #include "nsIProtocolHandler.h"
 
-#include "nsIPrefService.h"
-#include "nsIPrefBranch2.h"
+#include "mozilla/Preferences.h"
 
 #include "DiscardTracker.h"
 #include "nsAsyncRedirectVerifyHelper.h"
@@ -93,12 +92,20 @@
 #define MAXBYTESFORSYNC_PREF "image.mem.max_bytes_for_sync_decode"
 #define SVG_MIMETYPE "image/svg+xml"
 
+using namespace mozilla;
 using namespace mozilla::imagelib;
 
 /* Kept up to date by a pref observer. */
 static PRBool gDecodeOnDraw = PR_FALSE;
 static PRBool gDiscardable = PR_FALSE;
 
+static const char* kObservedPrefs[] = {
+  DISCARD_PREF,
+  DECODEONDRAW_PREF,
+  DISCARD_TIMEOUT_PREF,
+  nsnull
+};
+
 /*
  * Pref observer goop. Yuck.
  */
@@ -108,31 +115,28 @@ static PRBool gRegisteredPrefObserver = PR_FALSE;
 
 // Reloader
 static void
-ReloadPrefs(nsIPrefBranch *aBranch)
+ReloadPrefs()
 {
   // Discardable
-  PRBool discardable;
-  nsresult rv = aBranch->GetBoolPref(DISCARD_PREF, &discardable);
-  if (NS_SUCCEEDED(rv))
-    gDiscardable = discardable;
+  gDiscardable = Preferences::GetBool(DISCARD_PREF, gDiscardable);
 
   // Decode-on-draw
-  PRBool decodeondraw;
-  rv = aBranch->GetBoolPref(DECODEONDRAW_PREF, &decodeondraw);
-  if (NS_SUCCEEDED(rv))
-    gDecodeOnDraw = decodeondraw;
+  gDecodeOnDraw = Preferences::GetBool(DECODEONDRAW_PREF, gDecodeOnDraw);
 
   // Progressive decoding knobs
   PRInt32 bytesAtATime, maxMS, maxBytesForSync;
-  rv = aBranch->GetIntPref(BYTESATATIME_PREF, &bytesAtATime);
-  if (NS_SUCCEEDED(rv))
+  if (NS_SUCCEEDED(Preferences::GetInt(BYTESATATIME_PREF, &bytesAtATime))) {
     RasterImage::SetDecodeBytesAtATime(bytesAtATime);
-  rv = aBranch->GetIntPref(MAXMS_PREF, &maxMS);
-  if (NS_SUCCEEDED(rv))
+  }
+
+  if (NS_SUCCEEDED(Preferences::GetInt(MAXMS_PREF, &maxMS))) {
     RasterImage::SetMaxMSBeforeYield(maxMS);
-  rv = aBranch->GetIntPref(MAXBYTESFORSYNC_PREF, &maxBytesForSync);
-  if (NS_SUCCEEDED(rv))
+  }
+
+  if (NS_SUCCEEDED(Preferences::GetInt(MAXBYTESFORSYNC_PREF,
+                                       &maxBytesForSync))) {
     RasterImage::SetMaxBytesForSyncDecode(maxBytesForSync);
+  }
 
   // Discard timeout
   mozilla::imagelib::DiscardTracker::ReloadTimeout();
@@ -161,15 +165,8 @@ imgRequestPrefObserver::Observe(nsISupports     *aSubject,
       strcmp(NS_LossyConvertUTF16toASCII(aData).get(), DISCARD_TIMEOUT_PREF))
     return NS_OK;
 
-  // Get the pref branch
-  nsCOMPtr<nsIPrefBranch> branch = do_QueryInterface(aSubject);
-  if (!branch) {
-    NS_WARNING("Couldn't get pref branch within imgRequestPrefObserver::Observe!");
-    return NS_OK;
-  }
-
   // Process the change
-  ReloadPrefs(branch);
+  ReloadPrefs();
 
   return NS_OK;
 }
@@ -243,15 +240,10 @@ nsresult imgRequest::Init(nsIURI *aURI,
 
   // Register our pref observer if it hasn't been done yet.
   if (NS_UNLIKELY(!gRegisteredPrefObserver)) {
-    nsCOMPtr<nsIPrefBranch2> branch = do_GetService(NS_PREFSERVICE_CONTRACTID);
-    if (branch) {
-      nsCOMPtr<nsIObserver> observer(new imgRequestPrefObserver());
-      branch->AddObserver(DISCARD_PREF, observer, PR_FALSE);
-      branch->AddObserver(DECODEONDRAW_PREF, observer, PR_FALSE);
-      branch->AddObserver(DISCARD_TIMEOUT_PREF, observer, PR_FALSE);
-      ReloadPrefs(branch);
-      gRegisteredPrefObserver = PR_TRUE;
-    }
+    nsCOMPtr<nsIObserver> observer(new imgRequestPrefObserver());
+    Preferences::AddStrongObservers(observer, kObservedPrefs);
+    ReloadPrefs();
+    gRegisteredPrefObserver = PR_TRUE;
   }
 
   return NS_OK;