Backed out changeset 7bcb6c9232a1 (bug 1130607)

--HG--
extra : rebase_source : 85bb38725eabf8d19052848575abdf75ebfd7ecc

image/src/imgRequest.cpp

@@ -647,12 +647,9 @@ NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt
     MOZ_ASSERT(!mIsMultiPartChannel, "Something went wrong");
   }
 
-  // If we're not multipart, we shouldn't have an image yet.
-  if (mImage && !mIsMultiPartChannel) {
-    MOZ_ASSERT_UNREACHABLE("Already have an image for a non-multipart request");
-    Cancel(NS_IMAGELIB_ERROR_FAILURE);
-    return NS_ERROR_FAILURE;
-  }
+  // If we're not multipart, we shouldn't have an image yet
+  MOZ_ASSERT(mIsMultiPartChannel || !mImage,
+             "Already have an image for non-multipart request");
 
   /*
    * If mRequest is null here, then we need to set it so that we'll be able to