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
2003-07-03 21:13:01 +00:00
parent 39e30b7a20
commit 321da8a95e
1 changed files with 6 additions and 2 deletions
--- 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