fix for bug 103477 r=jag sr=hyatt (not bug 103536 as previously stated)

layout/generic/nsImageFrame.cpp

@@ -1606,9 +1606,22 @@ void HaveFixedSize(const nsHTMLReflowState& aReflowState, PRPackedBool& aConstra
       heightUnit == eStyleUnit_Percent));
 }
 
-
 nsresult
 nsImageFrame::LoadImage(const nsAReadableString& aSpec, nsIPresContext *aPresContext, imgIRequest *aRequest)
+{
+  nsresult rv = RealLoadImage(aSpec, aPresContext, aRequest);
+
+  if (NS_FAILED(rv)) {
+    int whichLoad = GetImageLoad(aRequest);
+    if (whichLoad == -1) return NS_ERROR_FAILURE;
+    mLoads[whichLoad].mRequest = nsnull;
+  }
+
+  return rv;
+}
+
+nsresult
+nsImageFrame::RealLoadImage(const nsAReadableString& aSpec, nsIPresContext *aPresContext, imgIRequest *aRequest)
 {
   nsresult rv = NS_OK;
 

layout/generic/nsImageFrame.h

@@ -200,8 +200,7 @@ protected:
   void GetInnerArea(nsIPresContext* aPresContext,
                     nsRect& aInnerArea) const;
 
-
-  nsresult LoadImage(const nsAReadableString& aSpec, nsIPresContext *aPresContext, imgIRequest *aRequest);
+protected:
 
   inline PRBool CanLoadImage(nsIURI *aURI);
 
@@ -213,8 +212,9 @@ protected:
 
   void FireDOMEvent(PRUint32 aMessage);
 
-
 private:
+  nsresult LoadImage(const nsAReadableString& aSpec, nsIPresContext *aPresContext, imgIRequest *aRequest);
+  nsresult RealLoadImage(const nsAReadableString& aSpec, nsIPresContext *aPresContext, imgIRequest *aRequest);
   inline int GetImageLoad(imgIRequest *aRequest);
 
 

layout/html/base/src/nsImageFrame.cpp

@@ -1606,9 +1606,22 @@ void HaveFixedSize(const nsHTMLReflowState& aReflowState, PRPackedBool& aConstra
       heightUnit == eStyleUnit_Percent));
 }
 
-
 nsresult
 nsImageFrame::LoadImage(const nsAReadableString& aSpec, nsIPresContext *aPresContext, imgIRequest *aRequest)
+{
+  nsresult rv = RealLoadImage(aSpec, aPresContext, aRequest);
+
+  if (NS_FAILED(rv)) {
+    int whichLoad = GetImageLoad(aRequest);
+    if (whichLoad == -1) return NS_ERROR_FAILURE;
+    mLoads[whichLoad].mRequest = nsnull;
+  }
+
+  return rv;
+}
+
+nsresult
+nsImageFrame::RealLoadImage(const nsAReadableString& aSpec, nsIPresContext *aPresContext, imgIRequest *aRequest)
 {
   nsresult rv = NS_OK;
 

layout/html/base/src/nsImageFrame.h

@@ -200,8 +200,7 @@ protected:
   void GetInnerArea(nsIPresContext* aPresContext,
                     nsRect& aInnerArea) const;
 
-
-  nsresult LoadImage(const nsAReadableString& aSpec, nsIPresContext *aPresContext, imgIRequest *aRequest);
+protected:
 
   inline PRBool CanLoadImage(nsIURI *aURI);
 
@@ -213,8 +212,9 @@ protected:
 
   void FireDOMEvent(PRUint32 aMessage);
 
-
 private:
+  nsresult LoadImage(const nsAReadableString& aSpec, nsIPresContext *aPresContext, imgIRequest *aRequest);
+  nsresult RealLoadImage(const nsAReadableString& aSpec, nsIPresContext *aPresContext, imgIRequest *aRequest);
   inline int GetImageLoad(imgIRequest *aRequest);