From 444a1435da0ca7280fcdf0643b4f6135460b09e6 Mon Sep 17 00:00:00 2001
From: "kipp%netscape.com"
 <kipp%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 26 Nov 1998 18:06:47 +0000
Subject: [PATCH] Hide some noise; pass on Stop to content-viewer

git-svn-id: svn://10.0.0.236/trunk@15363 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsWebShell.cpp | 12 +++++++++++-
 mozilla/webshell/src/nsWebShell.cpp  | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 2f20696e580..548dd3bf5c5 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -58,6 +58,12 @@
 //XXX for nsIPostData; this is wrong; we shouldn't see the nsIDocument type
 #include "nsIDocument.h"
 
+#ifdef DEBUG
+#undef NOISY_LINKS
+#else
+#undef NOISY_LINKS
+#endif
+
 #ifdef NS_DEBUG
 /**
  * Note: the log module is created during initialization which
@@ -1235,6 +1241,10 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
 
 NS_IMETHODIMP nsWebShell::Stop(void)
 {
+  if (nsnull != mContentViewer) {
+    mContentViewer->Stop();
+  }
+
   // Cancel any timers that were set for this loader.
   CancelRefreshURLTimers();
 
@@ -1676,7 +1686,7 @@ nsWebShell::OnOverLink(nsIContent* aContent,
                        const PRUnichar* aTargetSpec)
 {
   if (!mOverURL.Equals(aURLSpec) || !mOverTarget.Equals(aTargetSpec)) {
-#ifdef NS_DEBUG
+#ifdef NOISY_LINKS
     fputs("Was '", stdout); 
     fputs(mOverURL, stdout); 
     fputs("' '", stdout); 
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index 2f20696e580..548dd3bf5c5 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -58,6 +58,12 @@
 //XXX for nsIPostData; this is wrong; we shouldn't see the nsIDocument type
 #include "nsIDocument.h"
 
+#ifdef DEBUG
+#undef NOISY_LINKS
+#else
+#undef NOISY_LINKS
+#endif
+
 #ifdef NS_DEBUG
 /**
  * Note: the log module is created during initialization which
@@ -1235,6 +1241,10 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
 
 NS_IMETHODIMP nsWebShell::Stop(void)
 {
+  if (nsnull != mContentViewer) {
+    mContentViewer->Stop();
+  }
+
   // Cancel any timers that were set for this loader.
   CancelRefreshURLTimers();
 
@@ -1676,7 +1686,7 @@ nsWebShell::OnOverLink(nsIContent* aContent,
                        const PRUnichar* aTargetSpec)
 {
   if (!mOverURL.Equals(aURLSpec) || !mOverTarget.Equals(aTargetSpec)) {
-#ifdef NS_DEBUG
+#ifdef NOISY_LINKS
     fputs("Was '", stdout); 
     fputs(mOverURL, stdout); 
     fputs("' '", stdout);