From 321da8a95e8fdf59c01f77a19ecf68046371402e Mon Sep 17 00:00:00 2001
From: "danm%netscape.com"
 <danm%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 3 Jul 2003 21:13:01 +0000
Subject: [PATCH] active window must be a top-level docshell. bug 170693.
 r=blizzard,bryner

git-svn-id: svn://10.0.0.236/trunk@144446 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../components/windowwatcher/src/nsWindowWatcher.cpp      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
index ad930cfc899..17b47256a44 100644
--- a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
+++ b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
@@ -885,8 +885,12 @@ nsWindowWatcher::GetActiveWindow(nsIDOMWindow **aActiveWindow)
 NS_IMETHODIMP
 nsWindowWatcher::SetActiveWindow(nsIDOMWindow *aActiveWindow)
 {
-  mActiveWindow = aActiveWindow;
-  return NS_OK;
+  if (FindWindowEntry(aActiveWindow)) {
+    mActiveWindow = aActiveWindow;
+    return NS_OK;
+  }
+  NS_ERROR("invalid active window");
+  return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP