Ensure that if the nsIDOMWindow provided is a frame inside an embed, we

2004-01-06  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/MozillaPrivate.cpp:

	Ensure that if the nsIDOMWindow provided is a frame inside an embed,
	we get the top-level window and then get the embed from that.
	Fixes bug #129028.

2 files changed, 20 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 51c5b0764..145cf19b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-06  Christian Persch  <chpe@cvs.gnome.org>
+
+	* embed/mozilla/MozillaPrivate.cpp:
+
+	Ensure that if the nsIDOMWindow provided is a frame inside an embed,
+	we get the top-level window and then get the embed from that. 
+	Fixes bug #129028.
+	   
 2003-12-29  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/mozilla/mozilla-embed-single.cpp:
diff --git a/embed/mozilla/MozillaPrivate.cpp b/embed/mozilla/MozillaPrivate.cpp
index 1950f0e6c..0c3af9818 100644
--- a/embed/mozilla/MozillaPrivate.cpp
+++ b/embed/mozilla/MozillaPrivate.cpp
@@ -17,12 +17,20 @@ GtkWidget *MozillaFindEmbed (nsIDOMWindow *aDOMWindow)
                 (do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
         if (!wwatch) return nsnull;
 
- 	nsCOMPtr<nsIDOMWindow> domWindow(aDOMWindow);
-	if (!domWindow)
+ 	nsCOMPtr<nsIDOMWindow> domWindow;
+	if (aDOMWindow)
 	{
-		result = wwatch->GetActiveWindow(getter_AddRefs(domWindow));
-		if (NS_FAILED(result) || !domWindow) return nsnull;
+		/* this DOM window may belong to some inner frame, we need
+		 * to get the topmost DOM window to get the embed
+		 */
+		aDOMWindow->GetTop (getter_AddRefs (domWindow));
 	}
+	else
+	{
+		/* get the active window */
+		wwatch->GetActiveWindow (getter_AddRefs(domWindow));
+	}
+	NS_ENSURE_TRUE (domWindow, nsnull);
 	
         nsCOMPtr<nsIWebBrowserChrome> windowChrome;
         result = wwatch->GetChromeForWindow (domWindow,