diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-01-06 07:48:34 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-01-06 07:48:34 +0800 |
| commit | 40a63bdda52f097623de55b485e176b823b53c72 (patch) | |
| tree | f05d89ce507860b6f52518206faed2b9525787dd /embed/mozilla/MozillaPrivate.cpp | |
| parent | 6d6c4f96a6660b2861521b32477bc5e41baf1d5f (diff) | |
| download | gsoc2013-epiphany-40a63bdda52f097623de55b485e176b823b53c72.tar gsoc2013-epiphany-40a63bdda52f097623de55b485e176b823b53c72.tar.gz gsoc2013-epiphany-40a63bdda52f097623de55b485e176b823b53c72.tar.bz2 gsoc2013-epiphany-40a63bdda52f097623de55b485e176b823b53c72.tar.lz gsoc2013-epiphany-40a63bdda52f097623de55b485e176b823b53c72.tar.xz gsoc2013-epiphany-40a63bdda52f097623de55b485e176b823b53c72.tar.zst gsoc2013-epiphany-40a63bdda52f097623de55b485e176b823b53c72.zip | |
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.
Diffstat (limited to 'embed/mozilla/MozillaPrivate.cpp')
| -rw-r--r-- | embed/mozilla/MozillaPrivate.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
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, |