From 2a4e32e300f10c8e63849b468466a34e236586ea Mon Sep 17 00:00:00 2001 From: Joe Drew Date: Fri, 1 Jul 2011 13:03:30 -0400 Subject: [PATCH] Bug 552605 - Fix some whitespace issues that crept in. r=jrmuizel --- modules/libpr0n/src/imgLoader.cpp | 15 ++++++++++----- modules/libpr0n/src/imgRequest.cpp | 6 +++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/modules/libpr0n/src/imgLoader.cpp b/modules/libpr0n/src/imgLoader.cpp index 4546ee132298..99f669680a11 100644 --- a/modules/libpr0n/src/imgLoader.cpp +++ b/modules/libpr0n/src/imgLoader.cpp @@ -290,7 +290,8 @@ class nsProgressNotificationProxy : public nsIProgressEventSink public: nsProgressNotificationProxy(nsIChannel* channel, imgIRequest* proxy) - : mImageRequest(proxy) { + : mImageRequest(proxy) + { channel->GetNotificationCallbacks(getter_AddRefs(mOriginalCallbacks)); } @@ -314,7 +315,8 @@ NS_IMETHODIMP nsProgressNotificationProxy::OnProgress(nsIRequest* request, nsISupports* ctxt, PRUint64 progress, - PRUint64 progressMax) { + PRUint64 progressMax) +{ nsCOMPtr loadGroup; request->GetLoadGroup(getter_AddRefs(loadGroup)); @@ -332,7 +334,8 @@ NS_IMETHODIMP nsProgressNotificationProxy::OnStatus(nsIRequest* request, nsISupports* ctxt, nsresult status, - const PRUnichar* statusArg) { + const PRUnichar* statusArg) +{ nsCOMPtr loadGroup; request->GetLoadGroup(getter_AddRefs(loadGroup)); @@ -350,7 +353,8 @@ NS_IMETHODIMP nsProgressNotificationProxy::AsyncOnChannelRedirect(nsIChannel *oldChannel, nsIChannel *newChannel, PRUint32 flags, - nsIAsyncVerifyRedirectCallback *cb) { + nsIAsyncVerifyRedirectCallback *cb) +{ // Tell the original original callbacks about it too nsCOMPtr loadGroup; newChannel->GetLoadGroup(getter_AddRefs(loadGroup)); @@ -370,7 +374,8 @@ nsProgressNotificationProxy::AsyncOnChannelRedirect(nsIChannel *oldChannel, NS_IMETHODIMP nsProgressNotificationProxy::GetInterface(const nsIID& iid, - void** result) { + void** result) +{ if (iid.Equals(NS_GET_IID(nsIProgressEventSink))) { *result = static_cast(this); NS_ADDREF_THIS(); diff --git a/modules/libpr0n/src/imgRequest.cpp b/modules/libpr0n/src/imgRequest.cpp index ca0553e45604..1a91d78689dc 100644 --- a/modules/libpr0n/src/imgRequest.cpp +++ b/modules/libpr0n/src/imgRequest.cpp @@ -1253,7 +1253,7 @@ imgRequest::AsyncOnChannelRedirect(nsIChannel *oldChannel, } return rv; } - + (void) OnRedirectVerifyCallback(NS_OK); return NS_OK; } @@ -1263,7 +1263,7 @@ 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; @@ -1320,7 +1320,7 @@ imgRequest::OnRedirectVerifyCallback(nsresult result) } 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.