From 0b95d763be16ba0dd74095ce6a6ef818b9e35c67 Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Fri, 30 Jan 2009 13:13:52 -0600
Subject: [PATCH] Bug 455353 - Backout of code added to imagelib in Bug 355555.
 r=dougt

---
 modules/libpr0n/src/imgRequest.cpp      | 17 ++---------------
 modules/libpr0n/src/imgRequest.h        |  5 -----
 modules/libpr0n/src/imgRequestProxy.cpp |  9 +--------
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/modules/libpr0n/src/imgRequest.cpp b/modules/libpr0n/src/imgRequest.cpp
index f210be6f4893..58485eb8684b 100644
--- a/modules/libpr0n/src/imgRequest.cpp
+++ b/modules/libpr0n/src/imgRequest.cpp
@@ -83,8 +83,8 @@ NS_IMPL_ISUPPORTS8(imgRequest, imgILoad,
 
 imgRequest::imgRequest() : 
   mLoading(PR_FALSE), mProcessing(PR_FALSE), mHadLastPart(PR_FALSE),
-  mNetworkStatus(0), mImageStatus(imgIRequest::STATUS_NONE), mState(0),
-  mCacheId(0), mValidator(nsnull), mIsMultiPartChannel(PR_FALSE),
+  mImageStatus(imgIRequest::STATUS_NONE), mState(0), mCacheId(0),
+  mValidator(nsnull), mIsMultiPartChannel(PR_FALSE),
   mImageSniffers("image-sniffing-services") 
 {
   /* member initializers and constructor code */
@@ -781,7 +781,6 @@ NS_IMETHODIMP imgRequest::OnStopRequest(nsIRequest *aRequest, nsISupports *ctxt,
   // save the last status that we saw so that the
   // imgRequestProxy will have access to it.
   if (mRequest) {
-    mRequest->GetStatus(&mNetworkStatus);
     mRequest = nsnull;  // we no longer need the request
   }
 
@@ -992,18 +991,6 @@ imgRequest::SniffMimeType(const char *buf, PRUint32 len)
   }
 }
 
-nsresult 
-imgRequest::GetNetworkStatus()
-{
-  nsresult status;
-  if (mRequest)
-    mRequest->GetStatus(&status);
-  else
-    status = mNetworkStatus;
-
-  return status;
-}
-
 /** nsIInterfaceRequestor methods **/
 
 NS_IMETHODIMP
diff --git a/modules/libpr0n/src/imgRequest.h b/modules/libpr0n/src/imgRequest.h
index cc1b5d55d965..ee10190d2d8d 100644
--- a/modules/libpr0n/src/imgRequest.h
+++ b/modules/libpr0n/src/imgRequest.h
@@ -110,10 +110,6 @@ public:
   // being made...
   PRBool IsReusable(void *aCacheId) { return !mLoading || (aCacheId == mCacheId); }
 
-  // get the current or last network status from our
-  // internal nsIChannel.
-  nsresult GetNetworkStatus();
-
   // Cancel, but also ensure that all work done in Init() is undone. Call this
   // only when the channel has failed to open, and so calling Cancel() on it
   // won't be sufficient.
@@ -184,7 +180,6 @@ private:
   PRPackedBool mLoading;
   PRPackedBool mProcessing;
   PRPackedBool mHadLastPart;
-  PRUint32 mNetworkStatus;
   PRUint32 mImageStatus;
   PRUint32 mState;
   nsCString mContentType;
diff --git a/modules/libpr0n/src/imgRequestProxy.cpp b/modules/libpr0n/src/imgRequestProxy.cpp
index b028f3939341..c2d4205b3a6a 100644
--- a/modules/libpr0n/src/imgRequestProxy.cpp
+++ b/modules/libpr0n/src/imgRequestProxy.cpp
@@ -196,14 +196,7 @@ NS_IMETHODIMP imgRequestProxy::IsPending(PRBool *_retval)
 /* readonly attribute nsresult status; */
 NS_IMETHODIMP imgRequestProxy::GetStatus(nsresult *aStatus)
 {
-  // XXXbz this is wrong...  Canceling with a status should make that
-  // status the status of the request, generally.
-  if (!mOwner)
-    return NS_ERROR_FAILURE;
-
-  *aStatus = mOwner->GetNetworkStatus();
-
-  return NS_OK;
+  return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* void cancel (in nsresult status); */