Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 46861. nsIDOMWindow is now split into two interfaces: a public interface (still called nsIDOMWindow) for embedders and an internal interface (nsIDOMWindowInternal) for internal use. The union of the two interfaces is still visible from JavaScript. r=jst@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@77828 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
vidur%netscape.com
2000-09-01 01:54:35 +00:00
parent c6daadf5b5
commit b10d4adc57
201 changed files with 2718 additions and 2496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/xpfe/appshell/src/nsXULWindow.cpp
View File

@@ -38,7 +38,7 @@
#include "nsIDocument.h"
#include "nsIDOMDocument.h"
#include "nsIDOMElement.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMXULDocument.h"
#include "nsIInterfaceRequestor.h"
#include "nsIIOService.h"
@@ -834,7 +834,7 @@ NS_IMETHODIMP nsXULWindow::PersistPositionAndSize(PRBool aPosition, PRBool aSize
return NS_OK;
}
NS_IMETHODIMP nsXULWindow::GetWindowDOMWindow(nsIDOMWindow** aDOMWindow)
NS_IMETHODIMP nsXULWindow::GetWindowDOMWindow(nsIDOMWindowInternal** aDOMWindow)
{
NS_ENSURE_STATE(mDocShell);
@@ -1182,9 +1182,9 @@ void nsXULWindow::ActivateParent() {
if (!windowMediator)
return;
nsCOMPtr<nsIDOMWindow> topDOMWindow;
nsCOMPtr<nsIDOMWindowInternal> topDOMWindow;
windowMediator->GetMostRecentWindow(nsnull, getter_AddRefs(topDOMWindow));
nsCOMPtr<nsIDOMWindow> ourDOMWindow(do_GetInterface(mDocShell));
nsCOMPtr<nsIDOMWindowInternal> ourDOMWindow(do_GetInterface(mDocShell));
if (ourDOMWindow != topDOMWindow)
return;