From 27878120f557fc1891a5c0d5f578733ff8ba2f34 Mon Sep 17 00:00:00 2001
From: "dveditz%netscape.com" <dveditz%netscape.com>
Date: Fri, 1 Nov 2002 05:20:07 +0000
Subject: [PATCH] Don't fire popup blocked event if we decide to open the
 content in an existing named window (bug 174765 refinement) r=danm, sr=jag,
 a=roc

---
 dom/src/base/nsGlobalWindow.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/src/base/nsGlobalWindow.cpp
index 8537b23da176..110ec3588cf7 100644
--- a/dom/src/base/nsGlobalWindow.cpp
+++ b/dom/src/base/nsGlobalWindow.cpp
@@ -2871,10 +2871,7 @@ GlobalWindowImpl::CheckForAbusePoint ()
     return PR_FALSE;
   
   if (!mIsDocumentLoaded || mRunningTimeout) {
-    PRBool blocked = IsPopupBlocked(mDocument);
-    if (blocked)
-      FirePopupBlockedEvent(mDocument);
-    return blocked;
+    return IsPopupBlocked(mDocument);
   }
 
   PRInt32 clickDelay = 0;
@@ -2886,12 +2883,8 @@ GlobalWindowImpl::CheckForAbusePoint ()
     LL_SUB(ll_delta, now, mLastMouseButtonAction);
     LL_L2I(delta, ll_delta);
     delta /= 1000;
-    if (delta > clickDelay)
-    {
-      PRBool blocked = IsPopupBlocked(mDocument);
-      if (blocked)
-        FirePopupBlockedEvent(mDocument);
-      return blocked;
+    if (delta > clickDelay) {
+      return IsPopupBlocked(mDocument);
     }
   }
 
@@ -2955,6 +2948,7 @@ GlobalWindowImpl::Open(nsIDOMWindow **_retval)
    */
   if (CheckForAbusePoint()) {
     if (name.IsEmpty()) {
+      FirePopupBlockedEvent(mDocument);
       return NS_OK;
     }
 
@@ -2968,6 +2962,7 @@ GlobalWindowImpl::Open(nsIDOMWindow **_retval)
                             getter_AddRefs(namedWindow));
 
     if (!namedWindow) {
+      FirePopupBlockedEvent(mDocument);
       return NS_OK;
     }
   }