From ae5da1b1b1b51a03efa9727e33d8647f16271c28 Mon Sep 17 00:00:00 2001
From: "troy%netscape.com"
 <troy%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 13 Nov 1998 17:00:54 +0000
Subject: [PATCH] Changed it so that if there's a NULL URL then we set the
 mLoadImageFailed flag and don't try and load the broken image URL. Only on
 Windows for now until Mac and Unix support the image icons

git-svn-id: svn://10.0.0.236/trunk@14596 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsImageFrame.cpp       | 5 +++++
 mozilla/layout/html/base/src/nsImageFrame.cpp | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp
index e53df77d6af..36fbc5879e6 100644
--- a/mozilla/layout/generic/nsImageFrame.cpp
+++ b/mozilla/layout/generic/nsImageFrame.cpp
@@ -145,7 +145,12 @@ nsHTMLImageLoader::StartLoadImage(nsIPresContext* aPresContext,
   nsresult rv;
   nsAutoString src;
   if (mLoadImageFailed || (nsnull == mURLSpec)) {
+#ifdef _WIN32
+    mLoadImageFailed = PR_TRUE;
+    return NS_OK;
+#else
     src.Append(BROKEN_IMAGE_URL);
+#endif
   } else {
     nsAutoString baseURL;
     if (nsnull != mBaseHREF) {
diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp
index e53df77d6af..36fbc5879e6 100644
--- a/mozilla/layout/html/base/src/nsImageFrame.cpp
+++ b/mozilla/layout/html/base/src/nsImageFrame.cpp
@@ -145,7 +145,12 @@ nsHTMLImageLoader::StartLoadImage(nsIPresContext* aPresContext,
   nsresult rv;
   nsAutoString src;
   if (mLoadImageFailed || (nsnull == mURLSpec)) {
+#ifdef _WIN32
+    mLoadImageFailed = PR_TRUE;
+    return NS_OK;
+#else
     src.Append(BROKEN_IMAGE_URL);
+#endif
   } else {
     nsAutoString baseURL;
     if (nsnull != mBaseHREF) {