Bug 552605 - Fix some whitespace issues that crept in. r=jrmuizel
authorJoe Drew <joe@drew.ca>
Fri, 01 Jul 2011 13:03:30 -0400
changeset 72710 5202f8aa66423f418260b260416e44f40a1ca3ee
parent 72709 c1fec89e3bce5c04d7accde005017965eac5deb1
child 72711 e8f2637924374e30b6ad10ac0168d24f2d3fda15
push id159
push usereakhgari@mozilla.com
push dateTue, 16 Aug 2011 17:53:11 +0000
treeherdermozilla-beta@8786e3e49240 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs552605
milestone7.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 552605 - Fix some whitespace issues that crept in. r=jrmuizel
modules/libpr0n/src/imgLoader.cpp
modules/libpr0n/src/imgRequest.cpp
--- a/modules/libpr0n/src/imgLoader.cpp
+++ b/modules/libpr0n/src/imgLoader.cpp
@@ -285,17 +285,18 @@ NS_IMPL_ISUPPORTS1(imgMemoryReporter, ns
  */
 class nsProgressNotificationProxy : public nsIProgressEventSink
                                   , public nsIChannelEventSink
                                   , public nsIInterfaceRequestor
 {
   public:
     nsProgressNotificationProxy(nsIChannel* channel,
                                 imgIRequest* proxy)
-        : mImageRequest(proxy) {
+        : mImageRequest(proxy)
+    {
       channel->GetNotificationCallbacks(getter_AddRefs(mOriginalCallbacks));
     }
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSIPROGRESSEVENTSINK
     NS_DECL_NSICHANNELEVENTSINK
     NS_DECL_NSIINTERFACEREQUESTOR
   private:
@@ -309,17 +310,18 @@ NS_IMPL_ISUPPORTS3(nsProgressNotificatio
                      nsIProgressEventSink,
                      nsIChannelEventSink,
                      nsIInterfaceRequestor)
 
 NS_IMETHODIMP
 nsProgressNotificationProxy::OnProgress(nsIRequest* request,
                                         nsISupports* ctxt,
                                         PRUint64 progress,
-                                        PRUint64 progressMax) {
+                                        PRUint64 progressMax)
+{
   nsCOMPtr<nsILoadGroup> loadGroup;
   request->GetLoadGroup(getter_AddRefs(loadGroup));
 
   nsCOMPtr<nsIProgressEventSink> target;
   NS_QueryNotificationCallbacks(mOriginalCallbacks,
                                 loadGroup,
                                 NS_GET_IID(nsIProgressEventSink),
                                 getter_AddRefs(target));
@@ -327,17 +329,18 @@ nsProgressNotificationProxy::OnProgress(
     return NS_OK;
   return target->OnProgress(mImageRequest, ctxt, progress, progressMax);
 }
 
 NS_IMETHODIMP
 nsProgressNotificationProxy::OnStatus(nsIRequest* request,
                                       nsISupports* ctxt,
                                       nsresult status,
-                                      const PRUnichar* statusArg) {
+                                      const PRUnichar* statusArg)
+{
   nsCOMPtr<nsILoadGroup> loadGroup;
   request->GetLoadGroup(getter_AddRefs(loadGroup));
 
   nsCOMPtr<nsIProgressEventSink> target;
   NS_QueryNotificationCallbacks(mOriginalCallbacks,
                                 loadGroup,
                                 NS_GET_IID(nsIProgressEventSink),
                                 getter_AddRefs(target));
@@ -345,17 +348,18 @@ nsProgressNotificationProxy::OnStatus(ns
     return NS_OK;
   return target->OnStatus(mImageRequest, ctxt, status, statusArg);
 }
 
 NS_IMETHODIMP
 nsProgressNotificationProxy::AsyncOnChannelRedirect(nsIChannel *oldChannel,
                                                     nsIChannel *newChannel,
                                                     PRUint32 flags,
-                                                    nsIAsyncVerifyRedirectCallback *cb) {
+                                                    nsIAsyncVerifyRedirectCallback *cb)
+{
   // Tell the original original callbacks about it too
   nsCOMPtr<nsILoadGroup> loadGroup;
   newChannel->GetLoadGroup(getter_AddRefs(loadGroup));
   nsCOMPtr<nsIChannelEventSink> target;
   NS_QueryNotificationCallbacks(mOriginalCallbacks,
                                 loadGroup,
                                 NS_GET_IID(nsIChannelEventSink),
                                 getter_AddRefs(target));
@@ -365,17 +369,18 @@ nsProgressNotificationProxy::AsyncOnChan
   }
 
   // Delegate to |target| if set, reusing |cb|
   return target->AsyncOnChannelRedirect(oldChannel, newChannel, flags, cb);
 }
 
 NS_IMETHODIMP
 nsProgressNotificationProxy::GetInterface(const nsIID& iid,
-                                          void** result) {
+                                          void** result)
+{
   if (iid.Equals(NS_GET_IID(nsIProgressEventSink))) {
     *result = static_cast<nsIProgressEventSink*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
   if (iid.Equals(NS_GET_IID(nsIChannelEventSink))) {
     *result = static_cast<nsIChannelEventSink*>(this);
     NS_ADDREF_THIS();
--- a/modules/libpr0n/src/imgRequest.cpp
+++ b/modules/libpr0n/src/imgRequest.cpp
@@ -1248,27 +1248,27 @@ imgRequest::AsyncOnChannelRedirect(nsICh
     nsresult rv = sink->AsyncOnChannelRedirect(oldChannel, newChannel, flags,
                                                this);
     if (NS_FAILED(rv)) {
         mRedirectCallback = nsnull;
         mNewRedirectChannel = nsnull;
     }
     return rv;
   }
-  
+
   (void) OnRedirectVerifyCallback(NS_OK);
   return NS_OK;
 }
 
 NS_IMETHODIMP
 imgRequest::OnRedirectVerifyCallback(nsresult result)
 {
   NS_ASSERTION(mRedirectCallback, "mRedirectCallback not set in callback");
   NS_ASSERTION(mNewRedirectChannel, "mNewRedirectChannel not set in callback");
-    
+
   if (NS_FAILED(result)) {
       mRedirectCallback->OnRedirectVerifyCallback(result);
       mRedirectCallback = nsnull;
       mNewRedirectChannel = nsnull;
       return NS_OK;
   }
 
   mChannel = mNewRedirectChannel;
@@ -1315,17 +1315,17 @@ imgRequest::OnRedirectVerifyCallback(nsr
       // ourselves back in the cache.
       if (mCacheEntry)
         imgLoader::RemoveFromCache(mCacheEntry);
       else
         imgLoader::RemoveFromCache(mKeyURI);
     }
 
     mKeyURI = newURI;
- 
+
     if (mIsInCache) {
       // If we don't still have a URI or cache entry, we don't want to put
       // ourselves back into the cache.
       if (mKeyURI && mCacheEntry)
         imgLoader::PutIntoCache(mKeyURI, mCacheEntry);
     }
   }