mozilla
/
mozilla-history
зеркало из https://github.com/mozilla/mozilla-history.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

This commit is contained in:
vidur%netscape.com 2000-09-01 01:54:35 +00:00
Родитель 46e3f70cba
Коммит 4a41eee18d
201 изменённых файлов: 2713 добавлений и 2983 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
chrome/src/nsChromeRegistry.cpp
Просмотреть файл

@ -51,7 +51,7 @@
#include "nsIFileLocator.h"
#include "nsIXBLService.h"
#include "nsPIDOMWindow.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMWindowCollection.h"
#include "nsIDOMLocation.h"
#include "nsIWindowMediator.h"
@ -1069,7 +1069,7 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins()
nsCOMPtr<nsISupports> protoWindow;
rv = windowEnumerator->GetNext(getter_AddRefs(protoWindow));
if (NS_SUCCEEDED(rv) && protoWindow) {
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(protoWindow);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(protoWindow);
if (domWindow) {
rv = RefreshWindow(domWindow);
if (NS_FAILED(rv)) return rv;
@ -1103,7 +1103,7 @@ static PRBool IsChromeURI(nsIURI* aURI)
return PR_FALSE;
}
NS_IMETHODIMP nsChromeRegistry::RefreshWindow(nsIDOMWindow* aWindow)
NS_IMETHODIMP nsChromeRegistry::RefreshWindow(nsIDOMWindowInternal* aWindow)
{
nsresult rv;
// Get the DOM document.

4
chrome/src/nsChromeRegistry.h
Просмотреть файл

@ -32,7 +32,7 @@ class nsISimpleEnumerator;
class nsSupportsHashtable;
class nsIRDFContainer;
class nsIRDFContainerUtils;
class nsIDOMWindow;
class nsIDOMWindowInternal;
class nsIDocument;
#include "nsIRDFCompositeDataSource.h"
@ -83,7 +83,7 @@ private:
NS_IMETHOD GetProfileRoot(nsCString& aFileURL);
NS_IMETHOD GetInstallRoot(nsCString& aFileURL);
NS_IMETHOD RefreshWindow(nsIDOMWindow* aWindow);
NS_IMETHOD RefreshWindow(nsIDOMWindowInternal* aWindow);
NS_IMETHOD GetArcs(nsIRDFDataSource* aDataSource,
const nsCString& aType,

2
chrome/src/nsChromeUIDataSource.h
Просмотреть файл

@ -29,7 +29,7 @@ class nsICSSLoader;
class nsISimpleEnumerator;
class nsSupportsHashtable;
class nsIRDFContainer;
class nsIDOMWindow;
class nsIDOMWindowInternal;
class nsIDocument;
#include "nsIRDFDataSource.h"

14
content/base/src/nsDocument.cpp
Просмотреть файл

@ -104,7 +104,7 @@
#include "nsIPrivateDOMImplementation.h"
#include "nsIInterfaceRequestor.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMElement.h"
#include "nsIAnonymousContentCreator.h"
@ -2409,7 +2409,7 @@ NS_IMETHODIMP
nsDocument::GetLocation(jsval* aLocation)
{
if (mScriptGlobalObject) {
nsCOMPtr<nsIDOMWindow> window(do_QueryInterface(mScriptGlobalObject));
nsCOMPtr<nsIDOMWindowInternal> window(do_QueryInterface(mScriptGlobalObject));
if(window) {
return window->GetLocation(aLocation);
}
@ -2421,7 +2421,7 @@ NS_IMETHODIMP
nsDocument::SetLocation(jsval aLocation)
{
if (mScriptGlobalObject) {
nsCOMPtr<nsIDOMWindow> window(do_QueryInterface(mScriptGlobalObject));
nsCOMPtr<nsIDOMWindowInternal> window(do_QueryInterface(mScriptGlobalObject));
if(window) {
return window->SetLocation(aLocation);
}
@ -2457,8 +2457,8 @@ nsDocument::GetDefaultView(nsIDOMAbstractView** aDefaultView)
nsCOMPtr<nsIInterfaceRequestor> ifrq(do_QueryInterface(container));
NS_ENSURE_TRUE(ifrq, NS_OK);
nsCOMPtr<nsIDOMWindow> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindow), getter_AddRefs(window));
nsCOMPtr<nsIDOMWindowInternal> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindowInternal), getter_AddRefs(window));
NS_ENSURE_TRUE(window, NS_OK);
window->QueryInterface(NS_GET_IID(nsIDOMAbstractView),
@ -2497,8 +2497,8 @@ nsDocument::GetPlugins(nsIDOMPluginArray** aPlugins)
nsCOMPtr<nsIInterfaceRequestor> ifrq(do_QueryInterface(container));
NS_ENSURE_TRUE(ifrq, NS_OK);
nsCOMPtr<nsIDOMWindow> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindow), getter_AddRefs(window));
nsCOMPtr<nsIDOMWindowInternal> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindowInternal), getter_AddRefs(window));
NS_ENSURE_TRUE(window, NS_OK);
nsCOMPtr<nsIDOMNavigator> navigator;

4
content/base/src/nsDocumentViewer.cpp
Просмотреть файл

@ -27,7 +27,7 @@
#include "nsIContent.h"
#include "nsIContentViewerContainer.h"
#include "nsIDocumentViewer.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIImageGroup.h"
#include "nsIImageObserver.h"
@ -1838,7 +1838,7 @@ NS_IMETHODIMP nsDocViwerSelectionListener::NotifySelectionChanged(nsIDOMDocument
nsCOMPtr<nsIScriptGlobalObject> scriptGlobalObject;
theDoc->GetScriptGlobalObject(getter_AddRefs(scriptGlobalObject));
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(scriptGlobalObject);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(scriptGlobalObject);
if (!domWindow) return NS_ERROR_FAILURE;
domWindow->UpdateCommands(NS_ConvertToString("select"));

6
content/events/src/nsDOMEvent.cpp
Просмотреть файл

@ -36,7 +36,7 @@
#include "nsIScrollableView.h"
#include "nsIDOMEventTarget.h"
#include "nsIInterfaceRequestor.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMAbstractView.h"
#include "prmem.h"
#include "nsLayoutAtoms.h"
@ -296,8 +296,8 @@ nsDOMEvent::GetView(nsIDOMAbstractView** aView)
nsCOMPtr<nsIInterfaceRequestor> ifrq(do_QueryInterface(container));
NS_ENSURE_TRUE(ifrq, NS_OK);
nsCOMPtr<nsIDOMWindow> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindow), getter_AddRefs(window));
nsCOMPtr<nsIDOMWindowInternal> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindowInternal), getter_AddRefs(window));
NS_ENSURE_TRUE(window, NS_OK);
window->QueryInterface(NS_GET_IID(nsIDOMAbstractView), (void **)aView);

14
content/events/src/nsEventStateManager.cpp
Просмотреть файл

@ -53,7 +53,7 @@
#include "nsIScriptGlobalObject.h"
#include "nsIPrivateDOMEvent.h"
#include "nsIGfxTextControlFrame.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsPIDOMWindow.h"
#include "nsIEnumerator.h"
#include "nsFrameTraversal.h"
@ -342,7 +342,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
nsCOMPtr<nsIScriptGlobalObject> ourGlobal;
gLastFocusedDocument->GetScriptGlobalObject(getter_AddRefs(ourGlobal));
nsCOMPtr<nsIDOMWindow> rootWindow;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(ourGlobal);
if(ourWindow) {
ourWindow->GetRootCommandDispatcher(gLastFocusedDocument, getter_AddRefs(commandDispatcher));
@ -406,7 +406,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
nsCOMPtr<nsIDOMXULCommandDispatcher> commandDispatcher;
nsCOMPtr<nsIDOMElement> focusedElement;
nsCOMPtr<nsIDOMWindow> focusedWindow;
nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
nsCOMPtr<nsIDOMXULDocument> xulDoc = do_QueryInterface(mDocument);
if (xulDoc) {
@ -432,7 +432,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
{
nsCOMPtr<nsPIDOMWindow> privateWindow = do_QueryInterface(focusedWindow);
if(privateWindow){
nsCOMPtr<nsIDOMWindow> privateRootWindow;
nsCOMPtr<nsIDOMWindowInternal> privateRootWindow;
privateWindow->GetPrivateRoot(getter_AddRefs(privateRootWindow));
if(privateRootWindow) {
nsCOMPtr<nsIDOMDocument> privateParentDoc;
@ -508,7 +508,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
// focused sub-window and sub-element for this top-level
// window.
nsCOMPtr<nsIDOMXULCommandDispatcher> commandDispatcher;
nsCOMPtr<nsIDOMWindow> rootWindow;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(ourGlobal);
if(ourWindow) {
ourWindow->GetPrivateRoot(getter_AddRefs(rootWindow));
@ -780,14 +780,14 @@ nsEventStateManager::ChangeTextSize(PRInt32 change)
{
nsCOMPtr<nsIScriptGlobalObject> ourGlobal;
gLastFocusedDocument->GetScriptGlobalObject(getter_AddRefs(ourGlobal));
nsCOMPtr<nsIDOMWindow> rootWindow;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(ourGlobal);
NS_ENSURE_TRUE(ourWindow, NS_ERROR_FAILURE);
ourWindow->GetPrivateRoot(getter_AddRefs(rootWindow));
NS_ENSURE_TRUE(rootWindow, NS_ERROR_FAILURE);
nsCOMPtr<nsIDOMWindow> windowContent;
nsCOMPtr<nsIDOMWindowInternal> windowContent;
rootWindow->Get_content(getter_AddRefs(windowContent));
NS_ENSURE_TRUE(windowContent, NS_ERROR_FAILURE);

4
content/html/content/public/nsIFormSubmitObserver.h
Просмотреть файл

@ -32,7 +32,7 @@
#include "nsISupports.h"
#include "prtypes.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIURI.h"
class nsString;
@ -55,7 +55,7 @@ public:
* will be loaded in (form could have target attribute set)
* @param actionURL- URL to which the form will be submitted.
*/
NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindow* window, nsIURI* actionURL) = 0;
NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindowInternal* window, nsIURI* actionURL) = 0;
};

6
content/html/content/src/nsHTMLImageElement.cpp
Просмотреть файл

@ -37,7 +37,7 @@
#include "nsIJSNativeInitializer.h"
#include "nsSize.h"
#include "nsIDocument.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMDocument.h"
#include "nsIScriptContext.h"
#include "nsIScriptGlobalObject.h"
@ -649,7 +649,7 @@ nsHTMLImageElement::GetCallerSourceURL(JSContext* cx,
nsCOMPtr<nsIScriptGlobalObject> global;
nsLayoutUtils::GetDynamicScriptGlobal(cx, getter_AddRefs(global));
if (global) {
nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(global);
nsCOMPtr<nsIDOMWindowInternal> window = do_QueryInterface(global);
if (window) {
nsCOMPtr<nsIDOMDocument> domDoc;
@ -763,7 +763,7 @@ nsHTMLImageElement::Initialize(JSContext* aContext,
nsLayoutUtils::GetStaticScriptGlobal(aContext, aObj,
getter_AddRefs(globalObject));;
if (globalObject) {
nsIDOMWindow* domWindow;
nsIDOMWindowInternal* domWindow;
result = globalObject->QueryInterface(kIDOMWindowIID, (void**)&domWindow);
if (NS_SUCCEEDED(result)) {
nsIDOMDocument* domDocument;

2
content/html/content/src/nsHTMLSpacerElement.cpp
Просмотреть файл

@ -35,7 +35,7 @@
#include "nsIJSScriptObject.h"
#include "nsSize.h"
#include "nsIDocument.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMDocument.h"
#include "nsIScriptContext.h"
#include "nsIScriptGlobalObject.h"

4
content/html/document/src/nsHTMLDocument.cpp
Просмотреть файл

@ -46,7 +46,7 @@
#include "nsIDOMComment.h"
#include "nsIDOMDOMImplementation.h"
#include "nsIDOMDocumentType.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMHTMLFormElement.h"
#include "nsIStreamListener.h"
#include "nsIURL.h"
@ -2007,7 +2007,7 @@ nsHTMLDocument::GetSourceDocumentURL(JSContext* cx,
nsCOMPtr<nsIScriptGlobalObject> global;
nsLayoutUtils::GetDynamicScriptGlobal(cx, getter_AddRefs(global));
if (global) {
nsCOMPtr<nsIDOMWindow> window(do_QueryInterface(global, &result));
nsCOMPtr<nsIDOMWindowInternal> window(do_QueryInterface(global, &result));
if (window) {
nsCOMPtr<nsIDOMDocument> document;

4
content/xul/content/src/nsXULPopupListener.cpp
Просмотреть файл

@ -42,7 +42,7 @@
#include "nsRDFCID.h"
#include "nsIScriptGlobalObject.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMXULDocument.h"
#include "nsIDocument.h"
#include "nsIContent.h"
@ -645,7 +645,7 @@ XULPopupListenerImpl::LaunchPopup(PRInt32 aClientX, PRInt32 aClientY)
if (global) {
if (NS_OK == global->GetContext(getter_AddRefs(context))) {
// Get the DOM window
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(global);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(global);
if (domWindow != nsnull) {
// Find out if we're anchored.
nsAutoString anchorAlignment; anchorAlignment.AssignWithConversion("none");

22
content/xul/document/src/nsXULCommandDispatcher.cpp
Просмотреть файл

@ -37,7 +37,7 @@
#include "nsIDOMNSHTMLInputElement.h"
#include "nsIDOMNSHTMLTextAreaElement.h"
#include "nsIDOMUIEvent.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMXULElement.h"
#include "nsIDocument.h"
#include "nsIPresContext.h"
@ -134,7 +134,7 @@ nsXULCommandDispatcher::GetFocusedElement(nsIDOMElement** aElement)
}
NS_IMETHODIMP
nsXULCommandDispatcher::GetFocusedWindow(nsIDOMWindow** aWindow)
nsXULCommandDispatcher::GetFocusedWindow(nsIDOMWindowInternal** aWindow)
{
*aWindow = mCurrentWindow;
NS_IF_ADDREF(*aWindow);
@ -153,7 +153,7 @@ nsXULCommandDispatcher::SetFocusedElement(nsIDOMElement* aElement)
}
NS_IMETHODIMP
nsXULCommandDispatcher::SetFocusedWindow(nsIDOMWindow* aWindow)
nsXULCommandDispatcher::SetFocusedWindow(nsIDOMWindowInternal* aWindow)
{
mCurrentWindow = aWindow;
return NS_OK;
@ -350,7 +350,7 @@ nsXULCommandDispatcher::GetControllers(nsIControllers** aResult)
return htmlInputElement->GetControllers(aResult);
}
else if (mCurrentWindow) {
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(mCurrentWindow);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(mCurrentWindow);
if (domWindow)
return domWindow->GetControllers(aResult);
}
@ -398,7 +398,7 @@ nsXULCommandDispatcher::Focus(nsIDOMEvent* aEvent)
// but we don't hear the subsequent focus to the Ender window.
nsCOMPtr<nsIDOMDocument> ownerDoc;
domElement->GetOwnerDocument(getter_AddRefs(ownerDoc));
nsCOMPtr<nsIDOMWindow> domWindow;
nsCOMPtr<nsIDOMWindowInternal> domWindow;
GetParentWindowFromDocument(ownerDoc, getter_AddRefs(domWindow));
if (domWindow)
SetFocusedWindow(domWindow);
@ -406,7 +406,7 @@ nsXULCommandDispatcher::Focus(nsIDOMEvent* aEvent)
else {
// We're focusing a window. We only want to do an update commands
// if no element is focused.
nsCOMPtr<nsIDOMWindow> domWindow;
nsCOMPtr<nsIDOMWindowInternal> domWindow;
nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(t);
if (domDoc) {
GetParentWindowFromDocument(domDoc, getter_AddRefs(domWindow));
@ -463,7 +463,7 @@ nsXULCommandDispatcher::Blur(nsIDOMEvent* aEvent)
SetFocusedElement(nsnull);
}
nsCOMPtr<nsIDOMWindow> domWindow;
nsCOMPtr<nsIDOMWindowInternal> domWindow;
nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(t);
if (domDoc) {
GetParentWindowFromDocument(domDoc, getter_AddRefs(domWindow));
@ -530,7 +530,7 @@ nsXULCommandDispatcher::Matches(const nsString& aList,
nsresult
nsXULCommandDispatcher::GetParentWindowFromDocument(nsIDOMDocument* aDocument, nsIDOMWindow** aWindow)
nsXULCommandDispatcher::GetParentWindowFromDocument(nsIDOMDocument* aDocument, nsIDOMWindowInternal** aWindow)
{
nsCOMPtr<nsIDocument> objectOwner = do_QueryInterface(aDocument);
if(!objectOwner) return NS_OK;
@ -539,7 +539,7 @@ nsXULCommandDispatcher::GetParentWindowFromDocument(nsIDOMDocument* aDocument, n
objectOwner->GetScriptGlobalObject(getter_AddRefs(globalObject));
if(!globalObject) return NS_OK;
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(globalObject);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(globalObject);
*aWindow = domWindow;
NS_IF_ADDREF(*aWindow);
return NS_OK;
@ -568,7 +568,7 @@ nsXULCommandDispatcher::GetControllerForCommand(const nsAReadableString& aComman
// Move up to the window.
nsCOMPtr<nsIDOMDocument> domDoc;
mCurrentElement->GetOwnerDocument(getter_AddRefs(domDoc));
nsCOMPtr<nsIDOMWindow> domWindow;
nsCOMPtr<nsIDOMWindowInternal> domWindow;
GetParentWindowFromDocument(domDoc, getter_AddRefs(domWindow));
currentWindow = do_QueryInterface(domWindow);
}
@ -579,7 +579,7 @@ nsXULCommandDispatcher::GetControllerForCommand(const nsAReadableString& aComman
else return NS_OK;
while(currentWindow) {
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(currentWindow);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(currentWindow);
if(domWindow) {
nsCOMPtr<nsIControllers> controllers2;
domWindow->GetControllers(getter_AddRefs(controllers2));

4
content/xul/document/src/nsXULCommandDispatcher.h
Просмотреть файл

@ -76,7 +76,7 @@ public:
NS_IMETHOD SetScriptObject(void *aScriptObject);
public:
static nsresult GetParentWindowFromDocument(nsIDOMDocument* aElement, nsIDOMWindow** aWindow);
static nsresult GetParentWindowFromDocument(nsIDOMDocument* aElement, nsIDOMWindowInternal** aWindow);
protected:
void* mScriptObject; // ????
@ -85,7 +85,7 @@ protected:
// waiting to happen! If somebody deletes the node, then asks us
// for the focus, we'll get killed!
nsCOMPtr<nsIDOMElement> mCurrentElement; // [OWNER]
nsCOMPtr<nsIDOMWindow> mCurrentWindow; // [OWNER]
nsCOMPtr<nsIDOMWindowInternal> mCurrentWindow; // [OWNER]
PRBool mSuppressFocus;
PRBool mSuppressFocusScroll;

10
content/xul/document/src/nsXULDocument.cpp
Просмотреть файл

@ -115,7 +115,7 @@
#include "nsRDFCID.h"
#include "nsRDFDOMNodeList.h"
#include "nsXPIDLString.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsXULCommandDispatcher.h"
#include "nsXULDocument.h"
#include "nsXULElement.h"
@ -2798,8 +2798,8 @@ nsXULDocument::GetDefaultView(nsIDOMAbstractView** aDefaultView)
nsCOMPtr<nsIInterfaceRequestor> ifrq(do_QueryInterface(container));
NS_ENSURE_TRUE(ifrq, NS_OK);
nsCOMPtr<nsIDOMWindow> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindow), getter_AddRefs(window));
nsCOMPtr<nsIDOMWindowInternal> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindowInternal), getter_AddRefs(window));
NS_ENSURE_TRUE(window, NS_OK);
window->QueryInterface(NS_GET_IID(nsIDOMAbstractView),
@ -2999,7 +2999,7 @@ NS_IMETHODIMP
nsXULDocument::GetLocation(jsval* aLocation)
{
if (mScriptGlobalObject) {
nsCOMPtr<nsIDOMWindow> window(do_QueryInterface(mScriptGlobalObject));
nsCOMPtr<nsIDOMWindowInternal> window(do_QueryInterface(mScriptGlobalObject));
if(window) {
return window->GetLocation(aLocation);
}
@ -3011,7 +3011,7 @@ NS_IMETHODIMP
nsXULDocument::SetLocation(jsval aLocation)
{
if (mScriptGlobalObject) {
nsCOMPtr<nsIDOMWindow> window(do_QueryInterface(mScriptGlobalObject));
nsCOMPtr<nsIDOMWindowInternal> window(do_QueryInterface(mScriptGlobalObject));
if(window) {
return window->SetLocation(aLocation);
}

4
content/xul/document/src/nsXULPrototypeDocument.cpp
Просмотреть файл

@ -67,7 +67,7 @@ public:
NS_IMETHOD SetNewDocument(nsIDOMDocument *aDocument);
NS_IMETHOD SetDocShell(nsIDocShell *aDocShell);
NS_IMETHOD GetDocShell(nsIDocShell **aDocShell);
NS_IMETHOD SetOpenerWindow(nsIDOMWindow *aOpener);
NS_IMETHOD SetOpenerWindow(nsIDOMWindowInternal *aOpener);
NS_IMETHOD SetGlobalObjectOwner(nsIScriptGlobalObjectOwner* aOwner);
NS_IMETHOD GetGlobalObjectOwner(nsIScriptGlobalObjectOwner** aOwner);
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext,
@ -526,7 +526,7 @@ nsXULPDGlobalObject::GetDocShell(nsIDocShell **aDocShell)
NS_IMETHODIMP
nsXULPDGlobalObject::SetOpenerWindow(nsIDOMWindow *aOpener)
nsXULPDGlobalObject::SetOpenerWindow(nsIDOMWindowInternal *aOpener)
{
NS_NOTREACHED("waaah!");
return NS_ERROR_UNEXPECTED;

11
docshell/base/nsDocShell.cpp
Просмотреть файл

@ -37,7 +37,7 @@
#include "nsIMarkupDocumentViewer.h"
#include "nsXPIDLString.h"
#include "nsIChromeEventHandler.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIWebBrowserChrome.h"
#include "nsPoint.h"
#include "nsGfxCIID.h"
@ -175,6 +175,13 @@ NS_IMETHODIMP nsDocShell::GetInterface(const nsIID& aIID, void** aSink)
{
*aSink = mScriptGlobal;
}
else if(aIID.Equals(NS_GET_IID(nsIDOMWindowInternal)) &&
NS_SUCCEEDED(EnsureScriptEnvironment()))
{
NS_ENSURE_SUCCESS(mScriptGlobal->QueryInterface(NS_GET_IID(nsIDOMWindowInternal),
aSink), NS_ERROR_FAILURE);
return NS_OK;
}
else if(aIID.Equals(NS_GET_IID(nsIDOMWindow)) &&
NS_SUCCEEDED(EnsureScriptEnvironment()))
{
@ -3055,7 +3062,7 @@ NS_IMETHODIMP nsDocShell::GetCurrentDocumentOwner(nsISupports** aOwner)
nsCOMPtr<nsIDocShellTreeItem> parentItem;
rv = GetSameTypeParent(getter_AddRefs(parentItem));
if (NS_FAILED(rv) || !parentItem) return rv;
nsCOMPtr<nsIDOMWindow> parentWindow(do_GetInterface(parentItem));
nsCOMPtr<nsIDOMWindowInternal> parentWindow(do_GetInterface(parentItem));
if (!parentWindow) return NS_OK;
nsCOMPtr<nsIDOMDocument> parentDomDoc;
rv = parentWindow->GetDocument(getter_AddRefs(parentDomDoc));

9
docshell/base/nsWebShell.cpp
Просмотреть файл

@ -105,7 +105,7 @@ typedef unsigned long HMTX;
#include "nsIDocShellTreeNode.h"
#include "nsIDocShellTreeOwner.h"
#include "nsCURILoader.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsEscape.h"
#include "nsIPlatformCharset.h"
#include "nsICharsetConverterManager.h"
@ -365,6 +365,13 @@ nsWebShell::GetInterface(const nsIID &aIID, void** aInstancePtr)
NS_ADDREF((nsISupports*)*aInstancePtr);
return NS_OK;
}
else if(aIID.Equals(NS_GET_IID(nsIDOMWindowInternal)))
{
NS_ENSURE_SUCCESS(EnsureScriptEnvironment(), NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(mScriptGlobal->QueryInterface(NS_GET_IID(nsIDOMWindowInternal),
aInstancePtr), NS_ERROR_FAILURE);
return NS_OK;
}
else if(aIID.Equals(NS_GET_IID(nsIDOMWindow)))
{
NS_ENSURE_SUCCESS(EnsureScriptEnvironment(), NS_ERROR_FAILURE);

1
dom/public/base/MANIFEST
Просмотреть файл

@ -21,6 +21,7 @@
#
nsIDOMWindow.h
nsIDOMWindowInternal.h
nsIDOMLocation.h
nsIDOMNSLocation.h
nsIDOMNavigator.h

1
dom/public/base/Makefile.in
Просмотреть файл

@ -30,6 +30,7 @@ MODULE = dom
EXPORTS = \
nsIDOMWindow.h \
nsIDOMWindowInternal.h \
nsIDOMNavigator.h \
nsIDOMLocation.h \
nsIDOMNSLocation.h \

3
dom/public/base/makefile.win
Просмотреть файл

@ -23,7 +23,8 @@ DEPTH=..\..\..
DEFINES=-D_IMPL_NS_DOM
EXPORTS=nsIDOMWindow.h nsIDOMNavigator.h nsIDOMLocation.h nsIDOMNSLocation.h \
EXPORTS=nsIDOMWindow.h nsIDOMWindowInternal.h nsIDOMNavigator.h \
nsIDOMLocation.h nsIDOMNSLocation.h \
nsIDOMWindowCollection.h nsIDOMScreen.h nsIDOMHistory.h \
nsIDOMMimeType.h nsIDOMMimeTypeArray.h \
nsIDOMPlugin.h nsIDOMPluginArray.h nsIDOMBarProp.h \

317
dom/public/base/nsIDOMWindow.h
Просмотреть файл

@ -27,22 +27,12 @@
#include "nsISupports.h"
#include "nsString.h"
#include "nsIScriptContext.h"
#include "jsapi.h"
class nsIDOMNavigator;
class nsIPrompt;
class nsIDOMDocument;
class nsIDOMSelection;
class nsIDOMBarProp;
class nsIDOMScreen;
class nsIDOMHistory;
class nsIDOMWindowCollection;
class nsIDOMEvent;
class nsISidebar;
class nsIDOMPkcs11;
class nsIDOMCrypto;
class nsIDOMWindow;
class nsIControllers;
#define NS_IDOMWINDOW_IID \
{ 0xa6cf906b, 0x15b3, 0x11d2, \
@ -52,366 +42,59 @@ class nsIDOMWindow : public nsISupports {
public:
static const nsIID& GetIID() { static nsIID iid = NS_IDOMWINDOW_IID; return iid; }
NS_IMETHOD GetWindow(nsIDOMWindow** aWindow)=0;
NS_IMETHOD GetSelf(nsIDOMWindow** aSelf)=0;
NS_IMETHOD GetDocument(nsIDOMDocument** aDocument)=0;
NS_IMETHOD GetNavigator(nsIDOMNavigator** aNavigator)=0;
NS_IMETHOD GetScreen(nsIDOMScreen** aScreen)=0;
NS_IMETHOD GetHistory(nsIDOMHistory** aHistory)=0;
NS_IMETHOD GetParent(nsIDOMWindow** aParent)=0;
NS_IMETHOD GetTop(nsIDOMWindow** aTop)=0;
NS_IMETHOD Get_content(nsIDOMWindow** a_content)=0;
NS_IMETHOD GetSidebar(nsISidebar** aSidebar)=0;
NS_IMETHOD GetPrompter(nsIPrompt** aPrompter)=0;
NS_IMETHOD GetMenubar(nsIDOMBarProp** aMenubar)=0;
NS_IMETHOD GetToolbar(nsIDOMBarProp** aToolbar)=0;
NS_IMETHOD GetLocationbar(nsIDOMBarProp** aLocationbar)=0;
NS_IMETHOD GetPersonalbar(nsIDOMBarProp** aPersonalbar)=0;
NS_IMETHOD GetStatusbar(nsIDOMBarProp** aStatusbar)=0;
NS_IMETHOD GetScrollbars(nsIDOMBarProp** aScrollbars)=0;
NS_IMETHOD GetDirectories(nsIDOMBarProp** aDirectories)=0;
NS_IMETHOD GetClosed(PRBool* aClosed)=0;
NS_IMETHOD GetFrames(nsIDOMWindowCollection** aFrames)=0;
NS_IMETHOD GetCrypto(nsIDOMCrypto** aCrypto)=0;
NS_IMETHOD GetPkcs11(nsIDOMPkcs11** aPkcs11)=0;
NS_IMETHOD GetControllers(nsIControllers** aControllers)=0;
NS_IMETHOD GetOpener(nsIDOMWindow** aOpener)=0;
NS_IMETHOD SetOpener(nsIDOMWindow* aOpener)=0;
NS_IMETHOD GetStatus(nsAWritableString& aStatus)=0;
NS_IMETHOD SetStatus(const nsAReadableString& aStatus)=0;
NS_IMETHOD GetDefaultStatus(nsAWritableString& aDefaultStatus)=0;
NS_IMETHOD SetDefaultStatus(const nsAReadableString& aDefaultStatus)=0;
NS_IMETHOD GetName(nsAWritableString& aName)=0;
NS_IMETHOD SetName(const nsAReadableString& aName)=0;
NS_IMETHOD GetLocation(jsval* aLocation)=0;
NS_IMETHOD SetLocation(jsval aLocation)=0;
NS_IMETHOD GetTitle(nsAWritableString& aTitle)=0;
NS_IMETHOD SetTitle(const nsAReadableString& aTitle)=0;
NS_IMETHOD GetInnerWidth(PRInt32* aInnerWidth)=0;
NS_IMETHOD SetInnerWidth(PRInt32 aInnerWidth)=0;
NS_IMETHOD GetInnerHeight(PRInt32* aInnerHeight)=0;
NS_IMETHOD SetInnerHeight(PRInt32 aInnerHeight)=0;
NS_IMETHOD GetOuterWidth(PRInt32* aOuterWidth)=0;
NS_IMETHOD SetOuterWidth(PRInt32 aOuterWidth)=0;
NS_IMETHOD GetOuterHeight(PRInt32* aOuterHeight)=0;
NS_IMETHOD SetOuterHeight(PRInt32 aOuterHeight)=0;
NS_IMETHOD GetScreenX(PRInt32* aScreenX)=0;
NS_IMETHOD SetScreenX(PRInt32 aScreenX)=0;
NS_IMETHOD GetScreenY(PRInt32* aScreenY)=0;
NS_IMETHOD SetScreenY(PRInt32 aScreenY)=0;
NS_IMETHOD GetPageXOffset(PRInt32* aPageXOffset)=0;
NS_IMETHOD SetPageXOffset(PRInt32 aPageXOffset)=0;
NS_IMETHOD GetPageYOffset(PRInt32* aPageYOffset)=0;
NS_IMETHOD SetPageYOffset(PRInt32 aPageYOffset)=0;
NS_IMETHOD GetScrollX(PRInt32* aScrollX)=0;
NS_IMETHOD GetScrollY(PRInt32* aScrollY)=0;
NS_IMETHOD GetLength(PRUint32* aLength)=0;
NS_IMETHOD Dump(const nsAReadableString& aStr)=0;
NS_IMETHOD Alert(JSContext* cx, jsval* argv, PRUint32 argc)=0;
NS_IMETHOD Confirm(JSContext* cx, jsval* argv, PRUint32 argc, PRBool* aReturn)=0;
NS_IMETHOD Prompt(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn)=0;
NS_IMETHOD Focus()=0;
NS_IMETHOD Blur()=0;
NS_IMETHOD Back()=0;
NS_IMETHOD Forward()=0;
NS_IMETHOD Home()=0;
NS_IMETHOD Stop()=0;
NS_IMETHOD Print()=0;
NS_IMETHOD MoveTo(PRInt32 aXPos, PRInt32 aYPos)=0;
NS_IMETHOD MoveBy(PRInt32 aXDif, PRInt32 aYDif)=0;
NS_IMETHOD ResizeTo(PRInt32 aWidth, PRInt32 aHeight)=0;
NS_IMETHOD ResizeBy(PRInt32 aWidthDif, PRInt32 aHeightDif)=0;
NS_IMETHOD SizeToContent()=0;
NS_IMETHOD GetAttention()=0;
NS_IMETHOD Scroll(PRInt32 aXScroll, PRInt32 aYScroll)=0;
NS_IMETHOD ScrollTo(PRInt32 aXScroll, PRInt32 aYScroll)=0;
NS_IMETHOD ScrollBy(PRInt32 aXScrollDif, PRInt32 aYScrollDif)=0;
NS_IMETHOD ClearTimeout(PRInt32 aTimerID)=0;
NS_IMETHOD ClearInterval(PRInt32 aTimerID)=0;
NS_IMETHOD SetTimeout(JSContext* cx, jsval* argv, PRUint32 argc, PRInt32* aReturn)=0;
NS_IMETHOD SetInterval(JSContext* cx, jsval* argv, PRUint32 argc, PRInt32* aReturn)=0;
NS_IMETHOD CaptureEvents(PRInt32 aEventFlags)=0;
NS_IMETHOD ReleaseEvents(PRInt32 aEventFlags)=0;
NS_IMETHOD RouteEvent(nsIDOMEvent* aEvt)=0;
NS_IMETHOD EnableExternalCapture()=0;
NS_IMETHOD DisableExternalCapture()=0;
NS_IMETHOD SetCursor(const nsAReadableString& aCursor)=0;
NS_IMETHOD Open(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMWindow** aReturn)=0;
NS_IMETHOD OpenDialog(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMWindow** aReturn)=0;
NS_IMETHOD Close()=0;
NS_IMETHOD Close(JSContext* cx, jsval* argv, PRUint32 argc)=0;
NS_IMETHOD UpdateCommands(const nsAReadableString& aAction)=0;
NS_IMETHOD Escape(const nsAReadableString& aStr, nsAWritableString& aReturn)=0;
NS_IMETHOD Unescape(const nsAReadableString& aStr, nsAWritableString& aReturn)=0;
NS_IMETHOD GetSelection(nsIDOMSelection** aReturn)=0;
};
#define NS_DECL_IDOMWINDOW \
NS_IMETHOD GetWindow(nsIDOMWindow** aWindow); \
NS_IMETHOD GetSelf(nsIDOMWindow** aSelf); \
NS_IMETHOD GetDocument(nsIDOMDocument** aDocument); \
NS_IMETHOD GetNavigator(nsIDOMNavigator** aNavigator); \
NS_IMETHOD GetScreen(nsIDOMScreen** aScreen); \
NS_IMETHOD GetHistory(nsIDOMHistory** aHistory); \
NS_IMETHOD GetParent(nsIDOMWindow** aParent); \
NS_IMETHOD GetTop(nsIDOMWindow** aTop); \
NS_IMETHOD Get_content(nsIDOMWindow** a_content); \
NS_IMETHOD GetSidebar(nsISidebar** aSidebar); \
NS_IMETHOD GetPrompter(nsIPrompt** aPrompter); \
NS_IMETHOD GetMenubar(nsIDOMBarProp** aMenubar); \
NS_IMETHOD GetToolbar(nsIDOMBarProp** aToolbar); \
NS_IMETHOD GetLocationbar(nsIDOMBarProp** aLocationbar); \
NS_IMETHOD GetPersonalbar(nsIDOMBarProp** aPersonalbar); \
NS_IMETHOD GetStatusbar(nsIDOMBarProp** aStatusbar); \
NS_IMETHOD GetScrollbars(nsIDOMBarProp** aScrollbars); \
NS_IMETHOD GetDirectories(nsIDOMBarProp** aDirectories); \
NS_IMETHOD GetClosed(PRBool* aClosed); \
NS_IMETHOD GetFrames(nsIDOMWindowCollection** aFrames); \
NS_IMETHOD GetCrypto(nsIDOMCrypto** aCrypto); \
NS_IMETHOD GetPkcs11(nsIDOMPkcs11** aPkcs11); \
NS_IMETHOD GetControllers(nsIControllers** aControllers); \
NS_IMETHOD GetOpener(nsIDOMWindow** aOpener); \
NS_IMETHOD SetOpener(nsIDOMWindow* aOpener); \
NS_IMETHOD GetStatus(nsAWritableString& aStatus); \
NS_IMETHOD SetStatus(const nsAReadableString& aStatus); \
NS_IMETHOD GetDefaultStatus(nsAWritableString& aDefaultStatus); \
NS_IMETHOD SetDefaultStatus(const nsAReadableString& aDefaultStatus); \
NS_IMETHOD GetName(nsAWritableString& aName); \
NS_IMETHOD SetName(const nsAReadableString& aName); \
NS_IMETHOD GetLocation(jsval* aLocation); \
NS_IMETHOD SetLocation(jsval aLocation); \
NS_IMETHOD GetTitle(nsAWritableString& aTitle); \
NS_IMETHOD SetTitle(const nsAReadableString& aTitle); \
NS_IMETHOD GetInnerWidth(PRInt32* aInnerWidth); \
NS_IMETHOD SetInnerWidth(PRInt32 aInnerWidth); \
NS_IMETHOD GetInnerHeight(PRInt32* aInnerHeight); \
NS_IMETHOD SetInnerHeight(PRInt32 aInnerHeight); \
NS_IMETHOD GetOuterWidth(PRInt32* aOuterWidth); \
NS_IMETHOD SetOuterWidth(PRInt32 aOuterWidth); \
NS_IMETHOD GetOuterHeight(PRInt32* aOuterHeight); \
NS_IMETHOD SetOuterHeight(PRInt32 aOuterHeight); \
NS_IMETHOD GetScreenX(PRInt32* aScreenX); \
NS_IMETHOD SetScreenX(PRInt32 aScreenX); \
NS_IMETHOD GetScreenY(PRInt32* aScreenY); \
NS_IMETHOD SetScreenY(PRInt32 aScreenY); \
NS_IMETHOD GetPageXOffset(PRInt32* aPageXOffset); \
NS_IMETHOD SetPageXOffset(PRInt32 aPageXOffset); \
NS_IMETHOD GetPageYOffset(PRInt32* aPageYOffset); \
NS_IMETHOD SetPageYOffset(PRInt32 aPageYOffset); \
NS_IMETHOD GetScrollX(PRInt32* aScrollX); \
NS_IMETHOD GetScrollY(PRInt32* aScrollY); \
NS_IMETHOD GetLength(PRUint32* aLength); \
NS_IMETHOD Dump(const nsAReadableString& aStr); \
NS_IMETHOD Alert(JSContext* cx, jsval* argv, PRUint32 argc); \
NS_IMETHOD Confirm(JSContext* cx, jsval* argv, PRUint32 argc, PRBool* aReturn); \
NS_IMETHOD Prompt(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn); \
NS_IMETHOD Focus(); \
NS_IMETHOD Blur(); \
NS_IMETHOD Back(); \
NS_IMETHOD Forward(); \
NS_IMETHOD Home(); \
NS_IMETHOD Stop(); \
NS_IMETHOD Print(); \
NS_IMETHOD MoveTo(PRInt32 aXPos, PRInt32 aYPos); \
NS_IMETHOD MoveBy(PRInt32 aXDif, PRInt32 aYDif); \
NS_IMETHOD ResizeTo(PRInt32 aWidth, PRInt32 aHeight); \
NS_IMETHOD ResizeBy(PRInt32 aWidthDif, PRInt32 aHeightDif); \
NS_IMETHOD SizeToContent(); \
NS_IMETHOD GetAttention(); \
NS_IMETHOD Scroll(PRInt32 aXScroll, PRInt32 aYScroll); \
NS_IMETHOD ScrollTo(PRInt32 aXScroll, PRInt32 aYScroll); \
NS_IMETHOD ScrollBy(PRInt32 aXScrollDif, PRInt32 aYScrollDif); \
NS_IMETHOD ClearTimeout(PRInt32 aTimerID); \
NS_IMETHOD ClearInterval(PRInt32 aTimerID); \
NS_IMETHOD SetTimeout(JSContext* cx, jsval* argv, PRUint32 argc, PRInt32* aReturn); \
NS_IMETHOD SetInterval(JSContext* cx, jsval* argv, PRUint32 argc, PRInt32* aReturn); \
NS_IMETHOD CaptureEvents(PRInt32 aEventFlags); \
NS_IMETHOD ReleaseEvents(PRInt32 aEventFlags); \
NS_IMETHOD RouteEvent(nsIDOMEvent* aEvt); \
NS_IMETHOD EnableExternalCapture(); \
NS_IMETHOD DisableExternalCapture(); \
NS_IMETHOD SetCursor(const nsAReadableString& aCursor); \
NS_IMETHOD Open(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMWindow** aReturn); \
NS_IMETHOD OpenDialog(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMWindow** aReturn); \
NS_IMETHOD Close(); \
NS_IMETHOD Close(JSContext* cx, jsval* argv, PRUint32 argc); \
NS_IMETHOD UpdateCommands(const nsAReadableString& aAction); \
NS_IMETHOD Escape(const nsAReadableString& aStr, nsAWritableString& aReturn); \
NS_IMETHOD Unescape(const nsAReadableString& aStr, nsAWritableString& aReturn); \
NS_IMETHOD GetSelection(nsIDOMSelection** aReturn); \
#define NS_FORWARD_IDOMWINDOW(_to) \
NS_IMETHOD GetWindow(nsIDOMWindow** aWindow) { return _to GetWindow(aWindow); } \
NS_IMETHOD GetSelf(nsIDOMWindow** aSelf) { return _to GetSelf(aSelf); } \
NS_IMETHOD GetDocument(nsIDOMDocument** aDocument) { return _to GetDocument(aDocument); } \
NS_IMETHOD GetNavigator(nsIDOMNavigator** aNavigator) { return _to GetNavigator(aNavigator); } \
NS_IMETHOD GetScreen(nsIDOMScreen** aScreen) { return _to GetScreen(aScreen); } \
NS_IMETHOD GetHistory(nsIDOMHistory** aHistory) { return _to GetHistory(aHistory); } \
NS_IMETHOD GetParent(nsIDOMWindow** aParent) { return _to GetParent(aParent); } \
NS_IMETHOD GetTop(nsIDOMWindow** aTop) { return _to GetTop(aTop); } \
NS_IMETHOD Get_content(nsIDOMWindow** a_content) { return _to Get_content(a_content); } \
NS_IMETHOD GetSidebar(nsISidebar** aSidebar) { return _to GetSidebar(aSidebar); } \
NS_IMETHOD GetPrompter(nsIPrompt** aPrompter) { return _to GetPrompter(aPrompter); } \
NS_IMETHOD GetMenubar(nsIDOMBarProp** aMenubar) { return _to GetMenubar(aMenubar); } \
NS_IMETHOD GetToolbar(nsIDOMBarProp** aToolbar) { return _to GetToolbar(aToolbar); } \
NS_IMETHOD GetLocationbar(nsIDOMBarProp** aLocationbar) { return _to GetLocationbar(aLocationbar); } \
NS_IMETHOD GetPersonalbar(nsIDOMBarProp** aPersonalbar) { return _to GetPersonalbar(aPersonalbar); } \
NS_IMETHOD GetStatusbar(nsIDOMBarProp** aStatusbar) { return _to GetStatusbar(aStatusbar); } \
NS_IMETHOD GetScrollbars(nsIDOMBarProp** aScrollbars) { return _to GetScrollbars(aScrollbars); } \
NS_IMETHOD GetDirectories(nsIDOMBarProp** aDirectories) { return _to GetDirectories(aDirectories); } \
NS_IMETHOD GetClosed(PRBool* aClosed) { return _to GetClosed(aClosed); } \
NS_IMETHOD GetFrames(nsIDOMWindowCollection** aFrames) { return _to GetFrames(aFrames); } \
NS_IMETHOD GetCrypto(nsIDOMCrypto** aCrypto) { return _to GetCrypto(aCrypto); } \
NS_IMETHOD GetPkcs11(nsIDOMPkcs11** aPkcs11) { return _to GetPkcs11(aPkcs11); } \
NS_IMETHOD GetControllers(nsIControllers** aControllers) { return _to GetControllers(aControllers); } \
NS_IMETHOD GetOpener(nsIDOMWindow** aOpener) { return _to GetOpener(aOpener); } \
NS_IMETHOD SetOpener(nsIDOMWindow* aOpener) { return _to SetOpener(aOpener); } \
NS_IMETHOD GetStatus(nsAWritableString& aStatus) { return _to GetStatus(aStatus); } \
NS_IMETHOD SetStatus(const nsAReadableString& aStatus) { return _to SetStatus(aStatus); } \
NS_IMETHOD GetDefaultStatus(nsAWritableString& aDefaultStatus) { return _to GetDefaultStatus(aDefaultStatus); } \
NS_IMETHOD SetDefaultStatus(const nsAReadableString& aDefaultStatus) { return _to SetDefaultStatus(aDefaultStatus); } \
NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \
NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \
NS_IMETHOD GetLocation(jsval* aLocation) { return _to GetLocation(aLocation); } \
NS_IMETHOD SetLocation(jsval aLocation) { return _to SetLocation(aLocation); } \
NS_IMETHOD GetTitle(nsAWritableString& aTitle) { return _to GetTitle(aTitle); } \
NS_IMETHOD SetTitle(const nsAReadableString& aTitle) { return _to SetTitle(aTitle); } \
NS_IMETHOD GetInnerWidth(PRInt32* aInnerWidth) { return _to GetInnerWidth(aInnerWidth); } \
NS_IMETHOD SetInnerWidth(PRInt32 aInnerWidth) { return _to SetInnerWidth(aInnerWidth); } \
NS_IMETHOD GetInnerHeight(PRInt32* aInnerHeight) { return _to GetInnerHeight(aInnerHeight); } \
NS_IMETHOD SetInnerHeight(PRInt32 aInnerHeight) { return _to SetInnerHeight(aInnerHeight); } \
NS_IMETHOD GetOuterWidth(PRInt32* aOuterWidth) { return _to GetOuterWidth(aOuterWidth); } \
NS_IMETHOD SetOuterWidth(PRInt32 aOuterWidth) { return _to SetOuterWidth(aOuterWidth); } \
NS_IMETHOD GetOuterHeight(PRInt32* aOuterHeight) { return _to GetOuterHeight(aOuterHeight); } \
NS_IMETHOD SetOuterHeight(PRInt32 aOuterHeight) { return _to SetOuterHeight(aOuterHeight); } \
NS_IMETHOD GetScreenX(PRInt32* aScreenX) { return _to GetScreenX(aScreenX); } \
NS_IMETHOD SetScreenX(PRInt32 aScreenX) { return _to SetScreenX(aScreenX); } \
NS_IMETHOD GetScreenY(PRInt32* aScreenY) { return _to GetScreenY(aScreenY); } \
NS_IMETHOD SetScreenY(PRInt32 aScreenY) { return _to SetScreenY(aScreenY); } \
NS_IMETHOD GetPageXOffset(PRInt32* aPageXOffset) { return _to GetPageXOffset(aPageXOffset); } \
NS_IMETHOD SetPageXOffset(PRInt32 aPageXOffset) { return _to SetPageXOffset(aPageXOffset); } \
NS_IMETHOD GetPageYOffset(PRInt32* aPageYOffset) { return _to GetPageYOffset(aPageYOffset); } \
NS_IMETHOD SetPageYOffset(PRInt32 aPageYOffset) { return _to SetPageYOffset(aPageYOffset); } \
NS_IMETHOD GetScrollX(PRInt32* aScrollX) { return _to GetScrollX(aScrollX); } \
NS_IMETHOD GetScrollY(PRInt32* aScrollY) { return _to GetScrollY(aScrollY); } \
NS_IMETHOD GetLength(PRUint32* aLength) { return _to GetLength(aLength); } \
NS_IMETHOD Dump(const nsAReadableString& aStr) { return _to Dump(aStr); } \
NS_IMETHOD Alert(JSContext* cx, jsval* argv, PRUint32 argc) { return _to Alert(cx, argv, argc); } \
NS_IMETHOD Confirm(JSContext* cx, jsval* argv, PRUint32 argc, PRBool* aReturn) { return _to Confirm(cx, argv, argc, aReturn); } \
NS_IMETHOD Prompt(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn) { return _to Prompt(cx, argv, argc, aReturn); } \
NS_IMETHOD Focus() { return _to Focus(); } \
NS_IMETHOD Blur() { return _to Blur(); } \
NS_IMETHOD Back() { return _to Back(); } \
NS_IMETHOD Forward() { return _to Forward(); } \
NS_IMETHOD Home() { return _to Home(); } \
NS_IMETHOD Stop() { return _to Stop(); } \
NS_IMETHOD Print() { return _to Print(); } \
NS_IMETHOD MoveTo(PRInt32 aXPos, PRInt32 aYPos) { return _to MoveTo(aXPos, aYPos); } \
NS_IMETHOD MoveBy(PRInt32 aXDif, PRInt32 aYDif) { return _to MoveBy(aXDif, aYDif); } \
NS_IMETHOD ResizeTo(PRInt32 aWidth, PRInt32 aHeight) { return _to ResizeTo(aWidth, aHeight); } \
NS_IMETHOD ResizeBy(PRInt32 aWidthDif, PRInt32 aHeightDif) { return _to ResizeBy(aWidthDif, aHeightDif); } \
NS_IMETHOD SizeToContent() { return _to SizeToContent(); } \
NS_IMETHOD GetAttention() { return _to GetAttention(); } \
NS_IMETHOD Scroll(PRInt32 aXScroll, PRInt32 aYScroll) { return _to Scroll(aXScroll, aYScroll); } \
NS_IMETHOD ScrollTo(PRInt32 aXScroll, PRInt32 aYScroll) { return _to ScrollTo(aXScroll, aYScroll); } \
NS_IMETHOD ScrollBy(PRInt32 aXScrollDif, PRInt32 aYScrollDif) { return _to ScrollBy(aXScrollDif, aYScrollDif); } \
NS_IMETHOD ClearTimeout(PRInt32 aTimerID) { return _to ClearTimeout(aTimerID); } \
NS_IMETHOD ClearInterval(PRInt32 aTimerID) { return _to ClearInterval(aTimerID); } \
NS_IMETHOD SetTimeout(JSContext* cx, jsval* argv, PRUint32 argc, PRInt32* aReturn) { return _to SetTimeout(cx, argv, argc, aReturn); } \
NS_IMETHOD SetInterval(JSContext* cx, jsval* argv, PRUint32 argc, PRInt32* aReturn) { return _to SetInterval(cx, argv, argc, aReturn); } \
NS_IMETHOD CaptureEvents(PRInt32 aEventFlags) { return _to CaptureEvents(aEventFlags); } \
NS_IMETHOD ReleaseEvents(PRInt32 aEventFlags) { return _to ReleaseEvents(aEventFlags); } \
NS_IMETHOD RouteEvent(nsIDOMEvent* aEvt) { return _to RouteEvent(aEvt); } \
NS_IMETHOD EnableExternalCapture() { return _to EnableExternalCapture(); } \
NS_IMETHOD DisableExternalCapture() { return _to DisableExternalCapture(); } \
NS_IMETHOD SetCursor(const nsAReadableString& aCursor) { return _to SetCursor(aCursor); } \
NS_IMETHOD Open(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMWindow** aReturn) { return _to Open(cx, argv, argc, aReturn); } \
NS_IMETHOD OpenDialog(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMWindow** aReturn) { return _to OpenDialog(cx, argv, argc, aReturn); } \
NS_IMETHOD Close() { return _to Close(); } \
NS_IMETHOD Close(JSContext* cx, jsval* argv, PRUint32 argc) { return _to Close(cx, argv, argc); } \
NS_IMETHOD UpdateCommands(const nsAReadableString& aAction) { return _to UpdateCommands(aAction); } \
NS_IMETHOD Escape(const nsAReadableString& aStr, nsAWritableString& aReturn) { return _to Escape(aStr, aReturn); } \
NS_IMETHOD Unescape(const nsAReadableString& aStr, nsAWritableString& aReturn) { return _to Unescape(aStr, aReturn); } \
NS_IMETHOD GetSelection(nsIDOMSelection** aReturn) { return _to GetSelection(aReturn); } \

4
dom/public/base/nsPIDOMWindow.h
Просмотреть файл

@ -33,7 +33,7 @@
#include "nsIDocument.h"
class nsIDocShell;
class nsIDOMWindow;
class nsIDOMWindowInternal;
#define NS_PIDOMWINDOW_IID \
{ 0x3aa80781, 0x7e6a, 0x11d3, { 0xbf, 0x87, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } }
@ -44,7 +44,7 @@ public:
static const nsIID& GetIID() { static nsIID iid = NS_PIDOMWINDOW_IID; return iid; }
NS_IMETHOD GetPrivateParent(nsPIDOMWindow** aResult)=0;
NS_IMETHOD GetPrivateRoot(nsIDOMWindow** aResult)=0;
NS_IMETHOD GetPrivateRoot(nsIDOMWindowInternal** aResult)=0;
NS_IMETHOD GetLocation(nsIDOMLocation** aLocation) = 0;

4
dom/public/domstubs.idl
Просмотреть файл

@ -66,6 +66,9 @@ interface nsIDOMWindowCollection : nsISupports {};
[scriptable, uuid(a6cf906b-15b3-11d2-932e-00805f8add32)]
interface nsIDOMWindow : nsISupports {};
[scriptable, uuid(9c911860-7dd9-11d4-9a83-000064657374)]
interface nsIDOMWindowInternal : nsIDOMWindow {};
[scriptable, uuid(a6cf9076-15b3-11d2-932e-00805f8add32)]
interface nsIDOMDocumentFragment : nsIDOMNode {};
@ -97,6 +100,7 @@ interface nsIDOMSelectionListener : nsISupports {};
class nsIDOMBarProp;
class nsIDOMWindowCollection;
class nsIDOMWindow;
class nsIDOMWindowInternal;
class nsIDOMDocumentFragment;
class nsIDOMRange;
class nsIDOMSelection;

40
dom/public/idl/base/Window.idl
Просмотреть файл

@ -1,16 +1,30 @@
interface Window {
/* IID: { 0xa6cf906b, 0x15b3, 0x11d2, \
{ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } */
readonly attribute Document document;
readonly attribute Window parent;
readonly replaceable attribute Window top;
readonly attribute BarProp scrollbars;
readonly attribute WindowCollection frames;
attribute wstring name;
readonly attribute long scrollX;
readonly attribute long scrollY;
void scrollTo(in long xScroll, in long yScroll);
void scrollBy(in long xScrollDif, in long yScrollDif);
Selection getSelection();
};
interface WindowInternal : Window {
/* IID: { 0x9c911860, 0x7dd9, 0x11d4, \
{ 0x9a, 0x83, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74 } } */
readonly attribute Window window;
readonly attribute Window self;
readonly attribute Document document;
readonly attribute WindowInternal window;
readonly attribute WindowInternal self;
readonly attribute Navigator navigator;
readonly attribute Screen screen;
readonly attribute History history;
readonly attribute Window parent;
readonly replaceable attribute Window top;
readonly replaceable attribute Window _content;
readonly replaceable attribute WindowInternal _content;
readonly replaceable attribute xpidl nsISidebar sidebar;
readonly replaceable attribute xpidl nsIPrompt prompter;
@ -19,17 +33,14 @@ interface Window {
readonly replaceable attribute BarProp locationbar;
readonly replaceable attribute BarProp personalbar;
readonly attribute BarProp statusbar;
readonly attribute BarProp scrollbars;
readonly attribute BarProp directories;
readonly attribute boolean closed;
readonly attribute WindowCollection frames;
readonly attribute Crypto crypto;
readonly attribute Pkcs11 pkcs11;
readonly replaceable attribute xpidl nsIControllers controllers;
attribute Window opener;
attribute WindowInternal opener;
attribute wstring status;
attribute wstring defaultStatus;
attribute wstring name;
attribute jsval location;
attribute DOMString title;
attribute long innerWidth;
@ -40,8 +51,6 @@ interface Window {
attribute long screenY;
attribute long pageXOffset;
attribute long pageYOffset;
readonly attribute long scrollX;
readonly attribute long scrollY;
readonly attribute unsigned long length;
void dump(in wstring str);
@ -66,8 +75,6 @@ interface Window {
void sizeToContent();
void GetAttention();
void scroll(in long xScroll, in long yScroll);
void scrollTo(in long xScroll, in long yScroll);
void scrollBy(in long xScrollDif, in long yScrollDif);
void clearTimeout(in long timerID);
void clearInterval(in long timerID);
@ -81,8 +88,8 @@ interface Window {
void disableExternalCapture();
void setCursor(in DOMString cursor);
Window open(/* ... */);
Window openDialog(/* ... */);
WindowInternal open(/* ... */);
WindowInternal openDialog(/* ... */);
noscript void close();
void close(/* ... */);
@ -90,7 +97,6 @@ interface Window {
DOMString escape(in DOMString str);
DOMString unescape(in DOMString str);
Selection getSelection();
};

132
dom/public/nsDOMPropEnums.h
Просмотреть файл

@ -931,84 +931,18 @@ enum nsDOMProp {
NS_DOM_PROP_UIEVENT_INITUIEVENT,
NS_DOM_PROP_UIEVENT_VIEW,
NS_DOM_PROP_VIEWCSS_GETCOMPUTEDSTYLE,
NS_DOM_PROP_WINDOW__CONTENT,
NS_DOM_PROP_WINDOW_ALERT,
NS_DOM_PROP_WINDOW_BACK,
NS_DOM_PROP_WINDOW_BLUR,
NS_DOM_PROP_WINDOW_CAPTUREEVENTS,
NS_DOM_PROP_WINDOW_CLEARINTERVAL,
NS_DOM_PROP_WINDOW_CLEARTIMEOUT,
NS_DOM_PROP_WINDOW_CLOSE,
NS_DOM_PROP_WINDOW_CLOSED,
NS_DOM_PROP_WINDOW_CONFIRM,
NS_DOM_PROP_WINDOW_CONTROLLERS,
NS_DOM_PROP_WINDOW_CRYPTO,
NS_DOM_PROP_WINDOW_DEFAULTSTATUS,
NS_DOM_PROP_WINDOW_DIRECTORIES,
NS_DOM_PROP_WINDOW_DISABLEEXTERNALCAPTURE,
NS_DOM_PROP_WINDOW_DOCUMENT,
NS_DOM_PROP_WINDOW_DUMP,
NS_DOM_PROP_WINDOW_ENABLEEXTERNALCAPTURE,
NS_DOM_PROP_WINDOW_ESCAPE,
NS_DOM_PROP_WINDOW_FOCUS,
NS_DOM_PROP_WINDOW_FORWARD,
NS_DOM_PROP_WINDOW_FRAMES,
NS_DOM_PROP_WINDOW_GETATTENTION,
NS_DOM_PROP_WINDOW_GETSELECTION,
NS_DOM_PROP_WINDOW_HISTORY,
NS_DOM_PROP_WINDOW_HOME,
NS_DOM_PROP_WINDOW_INNERHEIGHT,
NS_DOM_PROP_WINDOW_INNERWIDTH,
NS_DOM_PROP_WINDOW_LENGTH,
NS_DOM_PROP_WINDOW_LOCATION,
NS_DOM_PROP_WINDOW_LOCATIONBAR,
NS_DOM_PROP_WINDOW_MENUBAR,
NS_DOM_PROP_WINDOW_MOVEBY,
NS_DOM_PROP_WINDOW_MOVETO,
NS_DOM_PROP_WINDOW_NAME,
NS_DOM_PROP_WINDOW_NAVIGATOR,
NS_DOM_PROP_WINDOW_OPEN,
NS_DOM_PROP_WINDOW_OPENDIALOG,
NS_DOM_PROP_WINDOW_OPENER,
NS_DOM_PROP_WINDOW_OUTERHEIGHT,
NS_DOM_PROP_WINDOW_OUTERWIDTH,
NS_DOM_PROP_WINDOW_PAGEXOFFSET,
NS_DOM_PROP_WINDOW_PAGEYOFFSET,
NS_DOM_PROP_WINDOW_PARENT,
NS_DOM_PROP_WINDOW_PERSONALBAR,
NS_DOM_PROP_WINDOW_PKCS11,
NS_DOM_PROP_WINDOW_PRINT,
NS_DOM_PROP_WINDOW_PROMPT,
NS_DOM_PROP_WINDOW_PROMPTER,
NS_DOM_PROP_WINDOW_RELEASEEVENTS,
NS_DOM_PROP_WINDOW_RESIZEBY,
NS_DOM_PROP_WINDOW_RESIZETO,
NS_DOM_PROP_WINDOW_ROUTEEVENT,
NS_DOM_PROP_WINDOW_SCREEN,
NS_DOM_PROP_WINDOW_SCREENX,
NS_DOM_PROP_WINDOW_SCREENY,
NS_DOM_PROP_WINDOW_SCRIPTGLOBALS,
NS_DOM_PROP_WINDOW_SCROLL,
NS_DOM_PROP_WINDOW_SCROLLBARS,
NS_DOM_PROP_WINDOW_SCROLLBY,
NS_DOM_PROP_WINDOW_SCROLLTO,
NS_DOM_PROP_WINDOW_SCROLLX,
NS_DOM_PROP_WINDOW_SCROLLY,
NS_DOM_PROP_WINDOW_SELF,
NS_DOM_PROP_WINDOW_SETCURSOR,
NS_DOM_PROP_WINDOW_SETINTERVAL,
NS_DOM_PROP_WINDOW_SETTIMEOUT,
NS_DOM_PROP_WINDOW_SIDEBAR,
NS_DOM_PROP_WINDOW_SIZETOCONTENT,
NS_DOM_PROP_WINDOW_STATUS,
NS_DOM_PROP_WINDOW_STATUSBAR,
NS_DOM_PROP_WINDOW_STOP,
NS_DOM_PROP_WINDOW_TITLE,
NS_DOM_PROP_WINDOW_TOOLBAR,
NS_DOM_PROP_WINDOW_TOP,
NS_DOM_PROP_WINDOW_UNESCAPE,
NS_DOM_PROP_WINDOW_UPDATECOMMANDS,
NS_DOM_PROP_WINDOW_WINDOW,
NS_DOM_PROP_WINDOWCOLLECTION_ITEM,
NS_DOM_PROP_WINDOWCOLLECTION_LENGTH,
NS_DOM_PROP_WINDOWCOLLECTION_NAMEDITEM,
@ -1036,6 +970,72 @@ enum nsDOMProp {
NS_DOM_PROP_WINDOWEVENTOWNER_ONSELECT,
NS_DOM_PROP_WINDOWEVENTOWNER_ONSUBMIT,
NS_DOM_PROP_WINDOWEVENTOWNER_ONUNLOAD,
NS_DOM_PROP_WINDOWINTERNAL__CONTENT,
NS_DOM_PROP_WINDOWINTERNAL_ALERT,
NS_DOM_PROP_WINDOWINTERNAL_BACK,
NS_DOM_PROP_WINDOWINTERNAL_BLUR,
NS_DOM_PROP_WINDOWINTERNAL_CAPTUREEVENTS,
NS_DOM_PROP_WINDOWINTERNAL_CLEARINTERVAL,
NS_DOM_PROP_WINDOWINTERNAL_CLEARTIMEOUT,
NS_DOM_PROP_WINDOWINTERNAL_CLOSE,
NS_DOM_PROP_WINDOWINTERNAL_CLOSED,
NS_DOM_PROP_WINDOWINTERNAL_CONFIRM,
NS_DOM_PROP_WINDOWINTERNAL_CONTROLLERS,
NS_DOM_PROP_WINDOWINTERNAL_CRYPTO,
NS_DOM_PROP_WINDOWINTERNAL_DEFAULTSTATUS,
NS_DOM_PROP_WINDOWINTERNAL_DIRECTORIES,
NS_DOM_PROP_WINDOWINTERNAL_DISABLEEXTERNALCAPTURE,
NS_DOM_PROP_WINDOWINTERNAL_DUMP,
NS_DOM_PROP_WINDOWINTERNAL_ENABLEEXTERNALCAPTURE,
NS_DOM_PROP_WINDOWINTERNAL_ESCAPE,
NS_DOM_PROP_WINDOWINTERNAL_FOCUS,
NS_DOM_PROP_WINDOWINTERNAL_FORWARD,
NS_DOM_PROP_WINDOWINTERNAL_GETATTENTION,
NS_DOM_PROP_WINDOWINTERNAL_HISTORY,
NS_DOM_PROP_WINDOWINTERNAL_HOME,
NS_DOM_PROP_WINDOWINTERNAL_INNERHEIGHT,
NS_DOM_PROP_WINDOWINTERNAL_INNERWIDTH,
NS_DOM_PROP_WINDOWINTERNAL_LENGTH,
NS_DOM_PROP_WINDOWINTERNAL_LOCATION,
NS_DOM_PROP_WINDOWINTERNAL_LOCATIONBAR,
NS_DOM_PROP_WINDOWINTERNAL_MENUBAR,
NS_DOM_PROP_WINDOWINTERNAL_MOVEBY,
NS_DOM_PROP_WINDOWINTERNAL_MOVETO,
NS_DOM_PROP_WINDOWINTERNAL_NAVIGATOR,
NS_DOM_PROP_WINDOWINTERNAL_OPEN,
NS_DOM_PROP_WINDOWINTERNAL_OPENDIALOG,
NS_DOM_PROP_WINDOWINTERNAL_OPENER,
NS_DOM_PROP_WINDOWINTERNAL_OUTERHEIGHT,
NS_DOM_PROP_WINDOWINTERNAL_OUTERWIDTH,
NS_DOM_PROP_WINDOWINTERNAL_PAGEXOFFSET,
NS_DOM_PROP_WINDOWINTERNAL_PAGEYOFFSET,
NS_DOM_PROP_WINDOWINTERNAL_PERSONALBAR,
NS_DOM_PROP_WINDOWINTERNAL_PKCS11,
NS_DOM_PROP_WINDOWINTERNAL_PRINT,
NS_DOM_PROP_WINDOWINTERNAL_PROMPT,
NS_DOM_PROP_WINDOWINTERNAL_PROMPTER,
NS_DOM_PROP_WINDOWINTERNAL_RELEASEEVENTS,
NS_DOM_PROP_WINDOWINTERNAL_RESIZEBY,
NS_DOM_PROP_WINDOWINTERNAL_RESIZETO,
NS_DOM_PROP_WINDOWINTERNAL_ROUTEEVENT,
NS_DOM_PROP_WINDOWINTERNAL_SCREEN,
NS_DOM_PROP_WINDOWINTERNAL_SCREENX,
NS_DOM_PROP_WINDOWINTERNAL_SCREENY,
NS_DOM_PROP_WINDOWINTERNAL_SCROLL,
NS_DOM_PROP_WINDOWINTERNAL_SELF,
NS_DOM_PROP_WINDOWINTERNAL_SETCURSOR,
NS_DOM_PROP_WINDOWINTERNAL_SETINTERVAL,
NS_DOM_PROP_WINDOWINTERNAL_SETTIMEOUT,
NS_DOM_PROP_WINDOWINTERNAL_SIDEBAR,
NS_DOM_PROP_WINDOWINTERNAL_SIZETOCONTENT,
NS_DOM_PROP_WINDOWINTERNAL_STATUS,
NS_DOM_PROP_WINDOWINTERNAL_STATUSBAR,
NS_DOM_PROP_WINDOWINTERNAL_STOP,
NS_DOM_PROP_WINDOWINTERNAL_TITLE,
NS_DOM_PROP_WINDOWINTERNAL_TOOLBAR,
NS_DOM_PROP_WINDOWINTERNAL_UNESCAPE,
NS_DOM_PROP_WINDOWINTERNAL_UPDATECOMMANDS,
NS_DOM_PROP_WINDOWINTERNAL_WINDOW,
NS_DOM_PROP_XULBROWSERELEMENT_WEBBROWSER,
NS_DOM_PROP_XULCOMMANDDISPATCHER_ACTIVE,
NS_DOM_PROP_XULCOMMANDDISPATCHER_ADDCOMMANDUPDATER,

132
dom/public/nsDOMPropNames.h
Просмотреть файл

@ -929,84 +929,18 @@
"uievent.inituievent", \
"uievent.view", \
"viewcss.getcomputedstyle", \
"window._content", \
"window.alert", \
"window.back", \
"window.blur", \
"window.captureevents", \
"window.clearinterval", \
"window.cleartimeout", \
"window.close", \
"window.closed", \
"window.confirm", \
"window.controllers", \
"window.crypto", \
"window.defaultstatus", \
"window.directories", \
"window.disableexternalcapture", \
"window.document", \
"window.dump", \
"window.enableexternalcapture", \
"window.escape", \
"window.focus", \
"window.forward", \
"window.frames", \
"window.getattention", \
"window.getselection", \
"window.history", \
"window.home", \
"window.innerheight", \
"window.innerwidth", \
"window.length", \
"window.location", \
"window.locationbar", \
"window.menubar", \
"window.moveby", \
"window.moveto", \
"window.name", \
"window.navigator", \
"window.open", \
"window.opendialog", \
"window.opener", \
"window.outerheight", \
"window.outerwidth", \
"window.pagexoffset", \
"window.pageyoffset", \
"window.parent", \
"window.personalbar", \
"window.pkcs11", \
"window.print", \
"window.prompt", \
"window.prompter", \
"window.releaseevents", \
"window.resizeby", \
"window.resizeto", \
"window.routeevent", \
"window.screen", \
"window.screenx", \
"window.screeny", \
"window.scriptglobals", \
"window.scroll", \
"window.scrollbars", \
"window.scrollby", \
"window.scrollto", \
"window.scrollx", \
"window.scrolly", \
"window.self", \
"window.setcursor", \
"window.setinterval", \
"window.settimeout", \
"window.sidebar", \
"window.sizetocontent", \
"window.status", \
"window.statusbar", \
"window.stop", \
"window.title", \
"window.toolbar", \
"window.top", \
"window.unescape", \
"window.updatecommands", \
"window.window", \
"windowcollection.item", \
"windowcollection.length", \
"windowcollection.nameditem", \
@ -1034,6 +968,72 @@
"windoweventowner.onselect", \
"windoweventowner.onsubmit", \
"windoweventowner.onunload", \
"windowinternal._content", \
"windowinternal.alert", \
"windowinternal.back", \
"windowinternal.blur", \
"windowinternal.captureevents", \
"windowinternal.clearinterval", \
"windowinternal.cleartimeout", \
"windowinternal.close", \
"windowinternal.closed", \
"windowinternal.confirm", \
"windowinternal.controllers", \
"windowinternal.crypto", \
"windowinternal.defaultstatus", \
"windowinternal.directories", \
"windowinternal.disableexternalcapture", \
"windowinternal.dump", \
"windowinternal.enableexternalcapture", \
"windowinternal.escape", \
"windowinternal.focus", \
"windowinternal.forward", \
"windowinternal.getattention", \
"windowinternal.history", \
"windowinternal.home", \
"windowinternal.innerheight", \
"windowinternal.innerwidth", \
"windowinternal.length", \
"windowinternal.location", \
"windowinternal.locationbar", \
"windowinternal.menubar", \
"windowinternal.moveby", \
"windowinternal.moveto", \
"windowinternal.navigator", \
"windowinternal.open", \
"windowinternal.opendialog", \
"windowinternal.opener", \
"windowinternal.outerheight", \
"windowinternal.outerwidth", \
"windowinternal.pagexoffset", \
"windowinternal.pageyoffset", \
"windowinternal.personalbar", \
"windowinternal.pkcs11", \
"windowinternal.print", \
"windowinternal.prompt", \
"windowinternal.prompter", \
"windowinternal.releaseevents", \
"windowinternal.resizeby", \
"windowinternal.resizeto", \
"windowinternal.routeevent", \
"windowinternal.screen", \
"windowinternal.screenx", \
"windowinternal.screeny", \
"windowinternal.scroll", \
"windowinternal.self", \
"windowinternal.setcursor", \
"windowinternal.setinterval", \
"windowinternal.settimeout", \
"windowinternal.sidebar", \
"windowinternal.sizetocontent", \
"windowinternal.status", \
"windowinternal.statusbar", \
"windowinternal.stop", \
"windowinternal.title", \
"windowinternal.toolbar", \
"windowinternal.unescape", \
"windowinternal.updatecommands", \
"windowinternal.window", \
"xulbrowserelement.webbrowser", \
"xulcommanddispatcher.active", \
"xulcommanddispatcher.addcommandupdater", \

4
dom/public/nsIScriptGlobalObject.h
Просмотреть файл

@ -32,7 +32,7 @@ class nsIDOMDocument;
class nsIDOMEvent;
class nsIPresContext;
class nsIDocShell;
class nsIDOMWindow;
class nsIDOMWindowInternal;
class nsIScriptGlobalObjectOwner;
#define NS_ISCRIPTGLOBALOBJECT_IID \
@ -53,7 +53,7 @@ public:
NS_IMETHOD SetNewDocument(nsIDOMDocument *aDocument)=0;
NS_IMETHOD SetDocShell(nsIDocShell *aDocShell)=0;
NS_IMETHOD GetDocShell(nsIDocShell **aDocShell)=0;
NS_IMETHOD SetOpenerWindow(nsIDOMWindow *aOpener)=0;
NS_IMETHOD SetOpenerWindow(nsIDOMWindowInternal *aOpener)=0;
/**
* Let the script global object know who its owner is.

14
dom/public/xul/nsIDOMXULCommandDispatcher.h
Просмотреть файл

@ -30,7 +30,7 @@
class nsIController;
class nsIDOMElement;
class nsIDOMWindow;
class nsIDOMWindowInternal;
class nsIControllers;
#define NS_IDOMXULCOMMANDDISPATCHER_IID \
@ -44,8 +44,8 @@ public:
NS_IMETHOD GetFocusedElement(nsIDOMElement** aFocusedElement)=0;
NS_IMETHOD SetFocusedElement(nsIDOMElement* aFocusedElement)=0;
NS_IMETHOD GetFocusedWindow(nsIDOMWindow** aFocusedWindow)=0;
NS_IMETHOD SetFocusedWindow(nsIDOMWindow* aFocusedWindow)=0;
NS_IMETHOD GetFocusedWindow(nsIDOMWindowInternal** aFocusedWindow)=0;
NS_IMETHOD SetFocusedWindow(nsIDOMWindowInternal* aFocusedWindow)=0;
NS_IMETHOD GetSuppressFocus(PRBool* aSuppressFocus)=0;
NS_IMETHOD SetSuppressFocus(PRBool aSuppressFocus)=0;
@ -71,8 +71,8 @@ public:
#define NS_DECL_IDOMXULCOMMANDDISPATCHER \
NS_IMETHOD GetFocusedElement(nsIDOMElement** aFocusedElement); \
NS_IMETHOD SetFocusedElement(nsIDOMElement* aFocusedElement); \
NS_IMETHOD GetFocusedWindow(nsIDOMWindow** aFocusedWindow); \
NS_IMETHOD SetFocusedWindow(nsIDOMWindow* aFocusedWindow); \
NS_IMETHOD GetFocusedWindow(nsIDOMWindowInternal** aFocusedWindow); \
NS_IMETHOD SetFocusedWindow(nsIDOMWindowInternal* aFocusedWindow); \
NS_IMETHOD GetSuppressFocus(PRBool* aSuppressFocus); \
NS_IMETHOD SetSuppressFocus(PRBool aSuppressFocus); \
NS_IMETHOD GetSuppressFocusScroll(PRBool* aSuppressFocusScroll); \
@ -90,8 +90,8 @@ public:
#define NS_FORWARD_IDOMXULCOMMANDDISPATCHER(_to) \
NS_IMETHOD GetFocusedElement(nsIDOMElement** aFocusedElement) { return _to GetFocusedElement(aFocusedElement); } \
NS_IMETHOD SetFocusedElement(nsIDOMElement* aFocusedElement) { return _to SetFocusedElement(aFocusedElement); } \
NS_IMETHOD GetFocusedWindow(nsIDOMWindow** aFocusedWindow) { return _to GetFocusedWindow(aFocusedWindow); } \
NS_IMETHOD SetFocusedWindow(nsIDOMWindow* aFocusedWindow) { return _to SetFocusedWindow(aFocusedWindow); } \
NS_IMETHOD GetFocusedWindow(nsIDOMWindowInternal** aFocusedWindow) { return _to GetFocusedWindow(aFocusedWindow); } \
NS_IMETHOD SetFocusedWindow(nsIDOMWindowInternal* aFocusedWindow) { return _to SetFocusedWindow(aFocusedWindow); } \
NS_IMETHOD GetSuppressFocus(PRBool* aSuppressFocus) { return _to GetSuppressFocus(aSuppressFocus); } \
NS_IMETHOD SetSuppressFocus(PRBool aSuppressFocus) { return _to SetSuppressFocus(aSuppressFocus); } \
NS_IMETHOD GetSuppressFocusScroll(PRBool* aSuppressFocusScroll) { return _to GetSuppressFocusScroll(aSuppressFocusScroll); } \

4
dom/src/base/nsBarProps.cpp
Просмотреть файл

@ -25,7 +25,7 @@
#include "nscore.h"
#include "nsBarProps.h"
#include "nsIWebBrowserChrome.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIScriptGlobalObject.h"
//
@ -57,7 +57,7 @@ NS_IMETHODIMP BarPropImpl::GetScriptObject(nsIScriptContext *aContext,
{
nsCOMPtr<nsIScriptGlobalObject> global;
global = aContext->GetGlobalObject();
nsCOMPtr<nsIDOMWindow> domWindow(do_QueryInterface(global));
nsCOMPtr<nsIDOMWindowInternal> domWindow(do_QueryInterface(global));
NS_ENSURE_SUCCESS(NS_NewScriptBarProp(aContext,
NS_STATIC_CAST(nsIDOMBarProp*, this), domWindow, &mScriptObject),
NS_ERROR_FAILURE);

85
dom/src/base/nsGlobalWindow.cpp
Просмотреть файл

@ -169,10 +169,11 @@ NS_IMPL_RELEASE(GlobalWindowImpl)
NS_INTERFACE_MAP_BEGIN(GlobalWindowImpl)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptGlobalObject)
NS_INTERFACE_MAP_ENTRY(nsIDOMWindowInternal)
NS_INTERFACE_MAP_ENTRY(nsIDOMWindow)
NS_INTERFACE_MAP_ENTRY(nsIScriptObjectOwner)
NS_INTERFACE_MAP_ENTRY(nsIScriptGlobalObject)
NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal)
NS_INTERFACE_MAP_ENTRY(nsIDOMWindow)
NS_INTERFACE_MAP_ENTRY(nsIJSScriptObject)
NS_INTERFACE_MAP_ENTRY(nsIDOMEventReceiver)
NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget)
@ -391,7 +392,7 @@ NS_IMETHODIMP GlobalWindowImpl::GetDocShell(nsIDocShell ** aDocShell)
return NS_OK;
}
NS_IMETHODIMP GlobalWindowImpl::SetOpenerWindow(nsIDOMWindow* aOpener)
NS_IMETHODIMP GlobalWindowImpl::SetOpenerWindow(nsIDOMWindowInternal* aOpener)
{
mOpener = aOpener;
return NS_OK;
@ -512,20 +513,6 @@ NS_IMETHODIMP GlobalWindowImpl::GetPrincipal(nsIPrincipal** result)
// GlobalWindowImpl::nsIDOMWindow
//*****************************************************************************
NS_IMETHODIMP GlobalWindowImpl::GetWindow(nsIDOMWindow** aWindow)
{
*aWindow = NS_STATIC_CAST(nsIDOMWindow *, this);
NS_ADDREF(*aWindow);
return NS_OK;
}
NS_IMETHODIMP GlobalWindowImpl::GetSelf(nsIDOMWindow** aWindow)
{
*aWindow = NS_STATIC_CAST(nsIDOMWindow *, this);
NS_ADDREF(*aWindow);
return NS_OK;
}
NS_IMETHODIMP GlobalWindowImpl::GetDocument(nsIDOMDocument** aDocument)
{
*aDocument = mDocument;
@ -533,6 +520,24 @@ NS_IMETHODIMP GlobalWindowImpl::GetDocument(nsIDOMDocument** aDocument)
return NS_OK;
}
//*****************************************************************************
// GlobalWindowImpl::nsIDOMWindowInternal
//*****************************************************************************
NS_IMETHODIMP GlobalWindowImpl::GetWindow(nsIDOMWindowInternal** aWindow)
{
*aWindow = NS_STATIC_CAST(nsIDOMWindowInternal *, this);
NS_ADDREF(*aWindow);
return NS_OK;
}
NS_IMETHODIMP GlobalWindowImpl::GetSelf(nsIDOMWindowInternal** aWindow)
{
*aWindow = NS_STATIC_CAST(nsIDOMWindowInternal *, this);
NS_ADDREF(*aWindow);
return NS_OK;
}
NS_IMETHODIMP GlobalWindowImpl::GetNavigator(nsIDOMNavigator** aNavigator)
{
if (!mNavigator) {
@ -591,7 +596,7 @@ NS_IMETHODIMP GlobalWindowImpl::GetParent(nsIDOMWindow** aParent)
NS_ERROR_FAILURE);
}
else {
*aParent = NS_STATIC_CAST(nsIDOMWindow *, this);
*aParent = NS_STATIC_CAST(nsIDOMWindowInternal *, this);
NS_ADDREF(*aParent);
}
return NS_OK;
@ -616,7 +621,7 @@ NS_IMETHODIMP GlobalWindowImpl::GetTop(nsIDOMWindow** aTop)
return ret;
}
NS_IMETHODIMP GlobalWindowImpl::Get_content(nsIDOMWindow** aContent)
NS_IMETHODIMP GlobalWindowImpl::Get_content(nsIDOMWindowInternal** aContent)
{
*aContent = nsnull;
@ -627,7 +632,7 @@ NS_IMETHODIMP GlobalWindowImpl::Get_content(nsIDOMWindow** aContent)
nsCOMPtr<nsIDocShellTreeItem> primaryContent;
treeOwner->GetPrimaryContentShell(getter_AddRefs(primaryContent));
nsCOMPtr<nsIDOMWindow> domWindow(do_GetInterface(primaryContent));
nsCOMPtr<nsIDOMWindowInternal> domWindow(do_GetInterface(primaryContent));
*aContent = domWindow;
NS_IF_ADDREF(*aContent);
@ -643,7 +648,7 @@ NS_IMETHODIMP GlobalWindowImpl::GetSidebar(nsISidebar** aSidebar)
mSidebar = do_CreateInstance(NS_SIDEBAR_PROGID, &rv);
if (mSidebar) {
nsIDOMWindow *win = NS_STATIC_CAST(nsIDOMWindow *, this);
nsIDOMWindowInternal *win = NS_STATIC_CAST(nsIDOMWindowInternal *, this);
/* no addref */
mSidebar->SetWindow(win);
}
@ -850,14 +855,14 @@ NS_IMETHODIMP GlobalWindowImpl::GetControllers(nsIControllers** aResult)
return NS_OK;
}
NS_IMETHODIMP GlobalWindowImpl::GetOpener(nsIDOMWindow** aOpener)
NS_IMETHODIMP GlobalWindowImpl::GetOpener(nsIDOMWindowInternal** aOpener)
{
*aOpener = mOpener;
NS_IF_ADDREF(*aOpener);
return NS_OK;
}
NS_IMETHODIMP GlobalWindowImpl::SetOpener(nsIDOMWindow* aOpener)
NS_IMETHODIMP GlobalWindowImpl::SetOpener(nsIDOMWindowInternal* aOpener)
{
mOpener = aOpener;
return NS_OK;
@ -1013,7 +1018,7 @@ GlobalWindowImpl::SetTitle(const nsAReadableString& aTitle)
NS_IMETHODIMP GlobalWindowImpl::GetInnerWidth(PRInt32* aInnerWidth)
{
nsCOMPtr<nsIDOMWindow> parent;
nsCOMPtr<nsIDOMWindowInternal> parent;
nsCOMPtr<nsIBaseWindow> docShellWin(do_QueryInterface(mDocShell));
*aInnerWidth = 0;
@ -1053,7 +1058,7 @@ NS_IMETHODIMP GlobalWindowImpl::SetInnerWidth(PRInt32 aInnerWidth)
NS_IMETHODIMP GlobalWindowImpl::GetInnerHeight(PRInt32* aInnerHeight)
{
nsCOMPtr<nsIDOMWindow> parent;
nsCOMPtr<nsIDOMWindowInternal> parent;
FlushPendingNotifications();
@ -1899,7 +1904,7 @@ NS_IMETHODIMP GlobalWindowImpl::SetCursor(const nsAReadableString& aCursor)
}
NS_IMETHODIMP GlobalWindowImpl::Open(JSContext* cx, jsval* argv, PRUint32 argc,
nsIDOMWindow** aReturn)
nsIDOMWindowInternal** aReturn)
{
return OpenInternal(cx, argv, argc, PR_FALSE, aReturn);
}
@ -1908,7 +1913,7 @@ NS_IMETHODIMP GlobalWindowImpl::Open(JSContext* cx, jsval* argv, PRUint32 argc,
// [features] as a JS property named "arguments"
NS_IMETHODIMP GlobalWindowImpl::OpenDialog(JSContext* cx,
jsval* argv, PRUint32 argc,
nsIDOMWindow** aReturn)
nsIDOMWindowInternal** aReturn)
{
return OpenInternal(cx, argv, argc, PR_TRUE, aReturn);
}
@ -1969,7 +1974,7 @@ NS_IMETHODIMP GlobalWindowImpl::UpdateCommands(const nsAReadableString& anAction
if (!doc)
return NS_ERROR_NULL_POINTER;
doc->GetScriptGlobalObject(getter_AddRefs(global));
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(global);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(global);
return domWindow->UpdateCommands(anAction);
}
else {
@ -1997,7 +2002,8 @@ NS_IMETHODIMP GlobalWindowImpl::UpdateCommands(const nsAReadableString& anAction
if (NS_STATIC_CAST(nsIDOMWindow *, this) == parent.get())
return NS_OK;
return parent->UpdateCommands(anAction);
nsCOMPtr<nsIDOMWindowInternal> parentInternal = do_QueryInterface(parent);
return parentInternal->UpdateCommands(anAction);
}
return NS_OK;
@ -2429,7 +2435,7 @@ NS_IMETHODIMP GlobalWindowImpl::GetPrivateParent(nsPIDOMWindow ** aParent)
return NS_OK;
}
NS_IMETHODIMP GlobalWindowImpl::GetPrivateRoot(nsIDOMWindow ** aParent)
NS_IMETHODIMP GlobalWindowImpl::GetPrivateRoot(nsIDOMWindowInternal ** aParent)
{
*aParent = nsnull; // Set to null so we can bail out later
@ -2451,14 +2457,15 @@ NS_IMETHODIMP GlobalWindowImpl::GetPrivateRoot(nsIDOMWindow ** aParent)
doc->GetScriptGlobalObject(getter_AddRefs(globalObject));
parent = do_QueryInterface(globalObject);
parent->GetTop(aParent); // Addref done here.
nsCOMPtr<nsIDOMWindow> tempParent;
parent->GetTop(getter_AddRefs(tempParent));
CallQueryInterface(tempParent, aParent);
return NS_OK;
}
}
if (parent) {
*aParent = parent.get();
NS_ADDREF(*aParent);
CallQueryInterface(parent, aParent);
}
return NS_OK;
@ -2662,7 +2669,7 @@ GlobalWindowImpl::GetRootCommandDispatcher(nsIDocument *aDoc,
nsCOMPtr<nsIDOMXULCommandDispatcher> commandDispatcher;
nsCOMPtr<nsIScriptGlobalObject> ourGlobal;
aDoc->GetScriptGlobalObject(getter_AddRefs(ourGlobal));
nsCOMPtr<nsIDOMWindow> rootWindow;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(ourGlobal);
if (ourWindow) {
ourWindow->GetPrivateRoot(getter_AddRefs(rootWindow));
@ -2764,7 +2771,7 @@ NS_IMETHODIMP GlobalWindowImpl::GetDocument(nsIDOMDocumentView ** aDocumentView)
NS_IMETHODIMP GlobalWindowImpl::OpenInternal(JSContext *cx,
jsval *argv, PRUint32 argc,
PRBool aDialog,
nsIDOMWindow ** aReturn)
nsIDOMWindowInternal ** aReturn)
{
PRUint32 chromeFlags;
nsAutoString name;
@ -2973,7 +2980,7 @@ NS_IMETHODIMP GlobalWindowImpl::OpenInternal(JSContext *cx,
// attach the given array of JS values to the given window, as a property array
// named "arguments"
NS_IMETHODIMP GlobalWindowImpl::AttachArguments(nsIDOMWindow *aWindow,
NS_IMETHODIMP GlobalWindowImpl::AttachArguments(nsIDOMWindowInternal *aWindow,
jsval *argv, PRUint32 argc)
{
if (argc == 0)
@ -3315,13 +3322,13 @@ GlobalWindowImpl::SizeOpenedDocShellItem(nsIDocShellTreeItem *aDocShellItem,
return NS_OK;
}
// Return the nsIDOMWindow corresponding to the given nsIWebShell.
// Return the nsIDOMWindowInternal corresponding to the given nsIWebShell.
// Note this forces the creation of a script context, if one has not already
// been created. Note it also sets the window's opener to this -- because
// it's just convenient, that's all.
NS_IMETHODIMP
GlobalWindowImpl::ReadyOpenedDocShellItem(nsIDocShellTreeItem *aDocShellItem,
nsIDOMWindow **aDOMWindow)
nsIDOMWindowInternal **aDOMWindow)
{
nsresult res;
@ -3401,7 +3408,7 @@ PRInt32 GlobalWindowImpl::WinHasOption(char *aOptions, const char *aName,
void GlobalWindowImpl::CloseWindow(nsISupports *aWindow)
{
nsCOMPtr<nsIDOMWindow> win(do_QueryInterface(aWindow));
nsCOMPtr<nsIDOMWindowInternal> win(do_QueryInterface(aWindow));
win->Close();
}
@ -4756,7 +4763,7 @@ NS_INTERFACE_MAP_BEGIN(nsDOMWindowController)
NS_INTERFACE_MAP_END
//NS_IMPL_QUERY_INTERFACE1(nsDOMWindowController, nsIController)
nsDOMWindowController::nsDOMWindowController(nsIDOMWindow *aWindow)
nsDOMWindowController::nsDOMWindowController(nsIDOMWindowInternal *aWindow)
{
NS_INIT_REFCNT();
mWindow = aWindow;

23
dom/src/base/nsGlobalWindow.h
Просмотреть файл

@ -40,7 +40,7 @@
#include "nsIDOMEventReceiver.h"
#include "nsIDOMNavigator.h"
#include "nsIDOMNSLocation.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMWindowEventOwner.h"
#include "nsIJSScriptObject.h"
#include "nsIScriptGlobalObject.h"
@ -77,7 +77,7 @@ class nsIDocShellLoadInfo;
// GlobalWindowImpl: Global Object for Scripting
//*****************************************************************************
class GlobalWindowImpl : public nsIScriptGlobalObject,
public nsIDOMWindow,
public nsIDOMWindowInternal,
public nsIJSScriptObject,
public nsIScriptObjectPrincipal,
public nsIDOMEventReceiver,
@ -100,7 +100,7 @@ public:
NS_IMETHOD SetNewDocument(nsIDOMDocument *aDocument);
NS_IMETHOD SetDocShell(nsIDocShell* aDocShell);
NS_IMETHOD GetDocShell(nsIDocShell** aDocShell);
NS_IMETHOD SetOpenerWindow(nsIDOMWindow *aOpener);
NS_IMETHOD SetOpenerWindow(nsIDOMWindowInternal *aOpener);
NS_IMETHOD SetGlobalObjectOwner(nsIScriptGlobalObjectOwner* aOwner);
NS_IMETHOD GetGlobalObjectOwner(nsIScriptGlobalObjectOwner** aOwner);
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext, nsEvent* aEvent,
@ -113,6 +113,9 @@ public:
// nsIDOMWindow
NS_DECL_IDOMWINDOW
// nsIDOMWindowInternal
NS_DECL_IDOMWINDOWINTERNAL
// nsIJSScriptObject
virtual PRBool AddProperty(JSContext *aContext, JSObject *aObj,
jsval aID, jsval *aVp);
@ -145,7 +148,7 @@ public:
// nsPIDOMWindow
NS_IMETHOD GetPrivateParent(nsPIDOMWindow** aResult);
NS_IMETHOD GetPrivateRoot(nsIDOMWindow** aResult);
NS_IMETHOD GetPrivateRoot(nsIDOMWindowInternal** aResult);
NS_IMETHOD GetLocation(nsIDOMLocation** aLocation);
@ -184,13 +187,13 @@ protected:
// Window Control Functions
NS_IMETHOD OpenInternal(JSContext* cx, jsval* argv, PRUint32 argc,
PRBool aDialog, nsIDOMWindow** aReturn);
NS_IMETHOD AttachArguments(nsIDOMWindow* aWindow, jsval* argv, PRUint32 argc);
PRBool aDialog, nsIDOMWindowInternal** aReturn);
NS_IMETHOD AttachArguments(nsIDOMWindowInternal* aWindow, jsval* argv, PRUint32 argc);
PRUint32 CalculateChromeFlags(char* aFeatures, PRBool aDialog);
NS_IMETHOD SizeOpenedDocShellItem(nsIDocShellTreeItem* aDocShellItem,
char* aFeatures, PRUint32 aChromeFlags);
NS_IMETHOD ReadyOpenedDocShellItem(nsIDocShellTreeItem* aDocShellItem,
nsIDOMWindow** aDOMWindow);
nsIDOMWindowInternal** aDOMWindow);
NS_IMETHOD CheckWindowName(JSContext* cx, nsString& aName);
PRInt32 WinHasOption(char* aOptions, const char* aName, PRInt32 aDefault, PRBool* aPresenceFlag);
static void CloseWindow(nsISupports* aWindow);
@ -222,7 +225,7 @@ protected:
protected:
nsCOMPtr<nsIScriptContext> mContext;
nsCOMPtr<nsIDOMDocument> mDocument;
nsCOMPtr<nsIDOMWindow> mOpener;
nsCOMPtr<nsIDOMWindowInternal> mOpener;
nsCOMPtr<nsIControllers> mControllers;
nsCOMPtr<nsIEventListenerManager> mListenerManager;
nsCOMPtr<nsISidebar> mSidebar;
@ -385,7 +388,7 @@ class nsISelectionController;
class nsDOMWindowController : public nsIController
{
public:
nsDOMWindowController( nsIDOMWindow* aWindow );
nsDOMWindowController( nsIDOMWindowInternal* aWindow );
NS_DECL_ISUPPORTS
NS_DECL_NSICONTROLLER
@ -394,7 +397,7 @@ private:
nsresult GetEditInterface( nsIContentViewerEdit** aEditInterface);
nsresult GetSelectionController(nsISelectionController ** aSelCon);
nsIDOMWindow *mWindow;
nsIDOMWindowInternal *mWindow;
};
#endif // DOM_CONTROLLER

2
dom/src/base/nsHistory.cpp
Просмотреть файл

@ -24,7 +24,7 @@
#include "nsCOMPtr.h"
#include "nscore.h"
#include "nsHistory.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIScriptGlobalObject.h"
#include "nsIWebShell.h"
#include "nsIDocShell.h"

2
dom/src/base/nsJSEnvironment.cpp
Просмотреть файл

@ -25,7 +25,7 @@
#include "nsIScriptContextOwner.h"
#include "nsIScriptGlobalObject.h"
#include "nsIScriptGlobalObjectOwner.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMNode.h"
#include "nsIDOMElement.h"
#include "nsIDOMDocument.h"

3162
dom/src/base/nsJSWindow.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

6
dom/src/events/nsJSEvent.cpp
Просмотреть файл

@ -531,15 +531,15 @@ extern "C" NS_DOM nsresult NS_InitEventClass(nsIScriptContext *aContext, void **
if ((PR_TRUE == JS_LookupProperty(jscontext, global, "Event", &vp)) &&
JSVAL_IS_OBJECT(vp) &&
((constructor = JSVAL_TO_OBJECT(vp)) != nsnull)) {
vp = INT_TO_JSVAL(nsIDOMEvent::BUBBLING_PHASE);
JS_SetProperty(jscontext, constructor, "BUBBLING_PHASE", &vp);
vp = INT_TO_JSVAL(nsIDOMEvent::CAPTURING_PHASE);
JS_SetProperty(jscontext, constructor, "CAPTURING_PHASE", &vp);
vp = INT_TO_JSVAL(nsIDOMEvent::AT_TARGET);
JS_SetProperty(jscontext, constructor, "AT_TARGET", &vp);
vp = INT_TO_JSVAL(nsIDOMEvent::BUBBLING_PHASE);
JS_SetProperty(jscontext, constructor, "BUBBLING_PHASE", &vp);
vp = INT_TO_JSVAL(nsIDOMEvent::MOUSEDOWN);
JS_SetProperty(jscontext, constructor, "MOUSEDOWN", &vp);

6
dom/src/jsurl/nsJSProtocolHandler.cpp
Просмотреть файл

@ -45,7 +45,7 @@
#include "nsXPIDLString.h"
#include "nsIByteArrayInputStream.h"
#include "nsIWindowMediator.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
@ -183,7 +183,7 @@ nsEvaluateStringProxy::BringUpConsole()
if (NS_FAILED(rv)) return rv;
// Next, find out whether there's a console already open.
nsCOMPtr<nsIDOMWindow> console;
nsCOMPtr<nsIDOMWindowInternal> console;
rv = windowMediator->GetMostRecentWindow(NS_LITERAL_STRING("global:console"),
getter_AddRefs(console));
if (NS_FAILED(rv)) return rv;
@ -214,7 +214,7 @@ nsEvaluateStringProxy::BringUpConsole()
if (NS_FAILED(rv)) return rv;
// Finally, QI global to nsIDOMWindow and open the console.
nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(global, &rv);
nsCOMPtr<nsIDOMWindowInternal> window = do_QueryInterface(global, &rv);
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
JSContext *cx = (JSContext*) scriptContext->GetNativeContext();

6
dom/src/xul/nsJSXULCommandDispatcher.cpp
Просмотреть файл

@ -37,7 +37,7 @@
#include "nsIController.h"
#include "nsIDOMElement.h"
#include "nsIDOMXULCommandDispatcher.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIControllers.h"
@ -98,7 +98,7 @@ GetXULCommandDispatcherProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v
{
rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDWINDOW, PR_FALSE);
if (NS_SUCCEEDED(rv)) {
nsIDOMWindow* prop;
nsIDOMWindowInternal* prop;
rv = a->GetFocusedWindow(&prop);
if (NS_SUCCEEDED(rv)) {
// get the js object
@ -197,7 +197,7 @@ SetXULCommandDispatcherProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v
{
rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDWINDOW, PR_TRUE);
if (NS_SUCCEEDED(rv)) {
nsIDOMWindow* prop;
nsIDOMWindowInternal* prop;
if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop,
kIWindowIID, NS_ConvertASCIItoUCS2("Window"),
cx, *vp)) {

6
editor/base/nsComposerCommands.cpp
Просмотреть файл

@ -31,7 +31,7 @@
#include "nsIDOMSelection.h"
#include "nsIDOMNode.h"
#include "nsIDOMElement.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMDocument.h"
#include "nsIClipboard.h"
@ -57,7 +57,7 @@ nsBaseComposerCommand::GetInterfaceNode(const PRUnichar* nodeID, nsIEditorShell*
*outNode = nsnull;
NS_ASSERTION(editorShell, "Should have an editorShell here");
nsCOMPtr<nsIDOMWindow> webshellWindow;
nsCOMPtr<nsIDOMWindowInternal> webshellWindow;
editorShell->GetWebShellWindow(getter_AddRefs(webshellWindow));
if (!webshellWindow) return NS_ERROR_FAILURE;
@ -946,7 +946,7 @@ nsRemoveStylesCommand::DoCommand(const PRUnichar *aCommand, nsISupports * refCon
if (NS_FAILED(rv)) return rv;
// now get all the style buttons to update
nsCOMPtr<nsIDOMWindow> contentWindow;
nsCOMPtr<nsIDOMWindowInternal> contentWindow;
editorShell->GetContentWindow(getter_AddRefs(contentWindow));
if (contentWindow)
contentWindow->UpdateCommands(NS_ConvertASCIItoUCS2("style"));

40
editor/base/nsEditorShell.cpp
Просмотреть файл

@ -38,7 +38,7 @@
#include "nsIDOMHTMLDocument.h"
#include "nsIDiskDocument.h"
#include "nsIDocument.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMNode.h"
#include "nsIDOMNodeList.h"
#include "nsICSSLoader.h"
@ -618,7 +618,7 @@ nsEditorShell::PrepareDocumentForEditing(nsIDocumentLoader* aLoader, nsIURI *aUr
{
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
cwP->Focus();
@ -639,7 +639,7 @@ nsresult nsEditorShell::GetDocumentEventReceiver(nsIDOMEventReceiver **aEventRec
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
cwP->GetDocument(getter_AddRefs(domDoc));
//mContentWindow->GetDocument(getter_AddRefs(domDoc));
@ -663,7 +663,7 @@ nsresult nsEditorShell::GetDocumentEventReceiver(nsIDOMEventReceiver **aEventRec
NS_IMETHODIMP
nsEditorShell::SetContentWindow(nsIDOMWindow* aWin)
nsEditorShell::SetContentWindow(nsIDOMWindowInternal* aWin)
{
NS_PRECONDITION(aWin != nsnull, "null ptr");
if (!aWin)
@ -690,7 +690,7 @@ nsEditorShell::SetContentWindow(nsIDOMWindow* aWin)
nsCOMPtr<nsIControllers> controllers;
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
cwP->GetControllers(getter_AddRefs(controllers));
//rv = mContentWindow->GetControllers(getter_AddRefs(controllers));
@ -729,13 +729,13 @@ nsEditorShell::SetContentWindow(nsIDOMWindow* aWin)
NS_IMETHODIMP
nsEditorShell::GetContentWindow(nsIDOMWindow * *aContentWindow)
nsEditorShell::GetContentWindow(nsIDOMWindowInternal * *aContentWindow)
{
NS_ENSURE_ARG_POINTER(aContentWindow);
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP)
return NS_ERROR_NOT_INITIALIZED;
@ -745,7 +745,7 @@ nsEditorShell::GetContentWindow(nsIDOMWindow * *aContentWindow)
NS_IMETHODIMP
nsEditorShell::SetWebShellWindow(nsIDOMWindow* aWin)
nsEditorShell::SetWebShellWindow(nsIDOMWindowInternal* aWin)
{
NS_PRECONDITION(aWin != nsnull, "null ptr");
if (!aWin)
@ -784,7 +784,7 @@ nsEditorShell::SetWebShellWindow(nsIDOMWindow* aWin)
}
NS_IMETHODIMP
nsEditorShell::GetWebShellWindow(nsIDOMWindow * *aWebShellWindow)
nsEditorShell::GetWebShellWindow(nsIDOMWindowInternal * *aWebShellWindow)
{
NS_ENSURE_ARG_POINTER(aWebShellWindow);
NS_IF_ADDREF(*aWebShellWindow = mWebShellWindow);
@ -1603,7 +1603,7 @@ nsEditorShell::TransferDocumentStateListeners()
}
NS_IMETHODIMP
nsEditorShell::CheckOpenWindowForURLMatch(const PRUnichar* inFileURL, nsIDOMWindow* inCheckWindow, PRBool *aDidFind)
nsEditorShell::CheckOpenWindowForURLMatch(const PRUnichar* inFileURL, nsIDOMWindowInternal* inCheckWindow, PRBool *aDidFind)
{
if (!inCheckWindow) return NS_ERROR_NULL_POINTER;
*aDidFind = PR_FALSE;
@ -1615,7 +1615,7 @@ nsEditorShell::CheckOpenWindowForURLMatch(const PRUnichar* inFileURL, nsIDOMWind
nsFileURL fileURL(fileURLString);
nsFileSpec fileSpec(fileURL);
nsCOMPtr<nsIDOMWindow> contentWindow;
nsCOMPtr<nsIDOMWindowInternal> contentWindow;
inCheckWindow->Get_content(getter_AddRefs(contentWindow));
if (contentWindow)
{
@ -1701,7 +1701,7 @@ nsEditorShell::SaveDocument(PRBool saveAs, PRBool saveCopy, PRBool *_retval)
PRBool retVal = PR_FALSE;
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
res = dialog->Prompt(cwP, captionStr.GetUnicode(), msgStr1.GetUnicode(),
@ -1854,7 +1854,7 @@ nsEditorShell::SaveDocument(PRBool saveAs, PRBool saveCopy, PRBool *_retval)
fileWidget->SetDefaultString(fileName);
nsFileDlgResults dialogResult;
// 1ST PARAM SHOULD BE nsIDOMWindow*, not nsIWidget*
// 1ST PARAM SHOULD BE nsIDOMWindowInternal*, not nsIWidget*
dialogResult = fileWidget->PutFile(nsnull, promptString, docFileSpec);
delete [] titles;
delete [] filters;
@ -1945,7 +1945,7 @@ nsEditorShell::Print()
}
NS_IMETHODIMP
nsEditorShell::GetLocalFileURL(nsIDOMWindow *parent, const PRUnichar *filterType, PRUnichar **_retval)
nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *filterType, PRUnichar **_retval)
{
nsAutoString FilterType(filterType);
PRBool htmlFilter = FilterType.EqualsIgnoreCase("html");
@ -2895,7 +2895,7 @@ nsEditorShell::DoFind(PRBool aFindNext)
{
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
rv = findComponent->CreateContext(cwP, nsnull, getter_AddRefs(mSearchContext));
}
@ -3038,7 +3038,7 @@ nsEditorShell::ConfirmWithCancel(const nsString& aTitle, const nsString& aQuesti
PRInt32 buttonPressed = 0;
if(!mContentWindow)
return result;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return result;
rv = dialog->DoDialog( cwP, block, "chrome://global/content/commonDialog.xul" );
block->GetInt( nsICommonDialogs::eButtonPressed, &buttonPressed );
@ -3063,7 +3063,7 @@ nsEditorShell::Confirm(const nsString& aTitle, const nsString& aQuestion)
{
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
rv = dialog->Confirm(cwP, aTitle.GetUnicode(), aQuestion.GetUnicode(), &result);
}
@ -3082,7 +3082,7 @@ nsEditorShell::AlertWithTitle(const PRUnichar *aTitle, const PRUnichar *aMsg)
{
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
rv = dialog->Alert(cwP, aTitle, aMsg);
}
@ -3099,7 +3099,7 @@ nsEditorShell::Alert(const nsString& aTitle, const nsString& aMsg)
{
if(!mContentWindow)
return;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return;
rv = dialog->Alert(cwP, aTitle.GetUnicode(), aMsg.GetUnicode());
}
@ -5256,7 +5256,7 @@ nsEditorShell::DoControllerCommand(nsString& aCommand)
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
nsresult rv = cwP->GetControllers(getter_AddRefs(controllers));
if (NS_FAILED(rv)) return rv;

8
editor/base/nsEditorShell.h
Просмотреть файл

@ -53,7 +53,7 @@
class nsIDocShell;
class nsIScriptContext;
class nsIDOMWindow;
class nsIDOMWindowInternal;
class nsIDOMElement;
class nsIDOMNode;
class nsIURI;
@ -137,7 +137,7 @@ class nsEditorShell : public nsIEditorShell,
const nsString *aYesString, const nsString *aNoString);
// this returns an AddReffed nsIScriptContext. You must relase it.
nsIScriptContext* GetScriptContext(nsIDOMWindow * aWin);
nsIScriptContext* GetScriptContext(nsIDOMWindowInternal * aWin);
// Get a string from the string bundle file
void GetBundleString(const nsString& name, nsString &outString);
@ -197,8 +197,8 @@ class nsEditorShell : public nsIEditorShell,
// so we need to track it separately
PRBool mHTMLSourceMode;
nsIDOMWindow *mWebShellWindow; // weak reference
//nsIDOMWindow *mContentWindow; // weak reference
nsIDOMWindowInternal *mWebShellWindow; // weak reference
//nsIDOMWindowInternal *mContentWindow; // weak reference
nsWeakPtr mContentWindow; // weak reference
nsEditorParserObserver *mParserObserver; // we hold the owning ref to this.

4
editor/base/nsInterfaceState.cpp
Просмотреть файл

@ -35,7 +35,7 @@
#include "nsIDOMSelection.h"
#include "nsIDOMAttr.h"
#include "nsIScriptGlobalObject.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsITimer.h"
#include "nsIEditor.h"
@ -308,7 +308,7 @@ nsresult nsInterfaceState::CallUpdateCommands(const nsString& aCommand)
nsCOMPtr<nsIScriptGlobalObject> scriptGlobalObject;
theDoc->GetScriptGlobalObject(getter_AddRefs(scriptGlobalObject));
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(scriptGlobalObject);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(scriptGlobalObject);
if (!domWindow) return NS_ERROR_FAILURE;
mDOMWindow = domWindow;
}

2
editor/base/nsInterfaceState.h
Просмотреть файл

@ -115,7 +115,7 @@ protected:
nsIHTMLEditor* mEditor; // the HTML editor
nsIDOMDocument* mChromeDoc; // XUL document for the chrome area
nsIDOMWindow* mDOMWindow; // nsIDOMWindow used for calling UpdateCommands
nsIDOMWindowInternal* mDOMWindow; // nsIDOMWindowInternal used for calling UpdateCommands
nsCOMPtr<nsITimer> mUpdateTimer;

6
editor/composer/src/nsComposerCommands.cpp
Просмотреть файл

@ -31,7 +31,7 @@
#include "nsIDOMSelection.h"
#include "nsIDOMNode.h"
#include "nsIDOMElement.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMDocument.h"
#include "nsIClipboard.h"
@ -57,7 +57,7 @@ nsBaseComposerCommand::GetInterfaceNode(const PRUnichar* nodeID, nsIEditorShell*
*outNode = nsnull;
NS_ASSERTION(editorShell, "Should have an editorShell here");
nsCOMPtr<nsIDOMWindow> webshellWindow;
nsCOMPtr<nsIDOMWindowInternal> webshellWindow;
editorShell->GetWebShellWindow(getter_AddRefs(webshellWindow));
if (!webshellWindow) return NS_ERROR_FAILURE;
@ -946,7 +946,7 @@ nsRemoveStylesCommand::DoCommand(const PRUnichar *aCommand, nsISupports * refCon
if (NS_FAILED(rv)) return rv;
// now get all the style buttons to update
nsCOMPtr<nsIDOMWindow> contentWindow;
nsCOMPtr<nsIDOMWindowInternal> contentWindow;
editorShell->GetContentWindow(getter_AddRefs(contentWindow));
if (contentWindow)
contentWindow->UpdateCommands(NS_ConvertASCIItoUCS2("style"));

40
editor/composer/src/nsEditorShell.cpp
Просмотреть файл

@ -38,7 +38,7 @@
#include "nsIDOMHTMLDocument.h"
#include "nsIDiskDocument.h"
#include "nsIDocument.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMNode.h"
#include "nsIDOMNodeList.h"
#include "nsICSSLoader.h"
@ -618,7 +618,7 @@ nsEditorShell::PrepareDocumentForEditing(nsIDocumentLoader* aLoader, nsIURI *aUr
{
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
cwP->Focus();
@ -639,7 +639,7 @@ nsresult nsEditorShell::GetDocumentEventReceiver(nsIDOMEventReceiver **aEventRec
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
cwP->GetDocument(getter_AddRefs(domDoc));
//mContentWindow->GetDocument(getter_AddRefs(domDoc));
@ -663,7 +663,7 @@ nsresult nsEditorShell::GetDocumentEventReceiver(nsIDOMEventReceiver **aEventRec
NS_IMETHODIMP
nsEditorShell::SetContentWindow(nsIDOMWindow* aWin)
nsEditorShell::SetContentWindow(nsIDOMWindowInternal* aWin)
{
NS_PRECONDITION(aWin != nsnull, "null ptr");
if (!aWin)
@ -690,7 +690,7 @@ nsEditorShell::SetContentWindow(nsIDOMWindow* aWin)
nsCOMPtr<nsIControllers> controllers;
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
cwP->GetControllers(getter_AddRefs(controllers));
//rv = mContentWindow->GetControllers(getter_AddRefs(controllers));
@ -729,13 +729,13 @@ nsEditorShell::SetContentWindow(nsIDOMWindow* aWin)
NS_IMETHODIMP
nsEditorShell::GetContentWindow(nsIDOMWindow * *aContentWindow)
nsEditorShell::GetContentWindow(nsIDOMWindowInternal * *aContentWindow)
{
NS_ENSURE_ARG_POINTER(aContentWindow);
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP)
return NS_ERROR_NOT_INITIALIZED;
@ -745,7 +745,7 @@ nsEditorShell::GetContentWindow(nsIDOMWindow * *aContentWindow)
NS_IMETHODIMP
nsEditorShell::SetWebShellWindow(nsIDOMWindow* aWin)
nsEditorShell::SetWebShellWindow(nsIDOMWindowInternal* aWin)
{
NS_PRECONDITION(aWin != nsnull, "null ptr");
if (!aWin)
@ -784,7 +784,7 @@ nsEditorShell::SetWebShellWindow(nsIDOMWindow* aWin)
}
NS_IMETHODIMP
nsEditorShell::GetWebShellWindow(nsIDOMWindow * *aWebShellWindow)
nsEditorShell::GetWebShellWindow(nsIDOMWindowInternal * *aWebShellWindow)
{
NS_ENSURE_ARG_POINTER(aWebShellWindow);
NS_IF_ADDREF(*aWebShellWindow = mWebShellWindow);
@ -1603,7 +1603,7 @@ nsEditorShell::TransferDocumentStateListeners()
}
NS_IMETHODIMP
nsEditorShell::CheckOpenWindowForURLMatch(const PRUnichar* inFileURL, nsIDOMWindow* inCheckWindow, PRBool *aDidFind)
nsEditorShell::CheckOpenWindowForURLMatch(const PRUnichar* inFileURL, nsIDOMWindowInternal* inCheckWindow, PRBool *aDidFind)
{
if (!inCheckWindow) return NS_ERROR_NULL_POINTER;
*aDidFind = PR_FALSE;
@ -1615,7 +1615,7 @@ nsEditorShell::CheckOpenWindowForURLMatch(const PRUnichar* inFileURL, nsIDOMWind
nsFileURL fileURL(fileURLString);
nsFileSpec fileSpec(fileURL);
nsCOMPtr<nsIDOMWindow> contentWindow;
nsCOMPtr<nsIDOMWindowInternal> contentWindow;
inCheckWindow->Get_content(getter_AddRefs(contentWindow));
if (contentWindow)
{
@ -1701,7 +1701,7 @@ nsEditorShell::SaveDocument(PRBool saveAs, PRBool saveCopy, PRBool *_retval)
PRBool retVal = PR_FALSE;
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
res = dialog->Prompt(cwP, captionStr.GetUnicode(), msgStr1.GetUnicode(),
@ -1854,7 +1854,7 @@ nsEditorShell::SaveDocument(PRBool saveAs, PRBool saveCopy, PRBool *_retval)
fileWidget->SetDefaultString(fileName);
nsFileDlgResults dialogResult;
// 1ST PARAM SHOULD BE nsIDOMWindow*, not nsIWidget*
// 1ST PARAM SHOULD BE nsIDOMWindowInternal*, not nsIWidget*
dialogResult = fileWidget->PutFile(nsnull, promptString, docFileSpec);
delete [] titles;
delete [] filters;
@ -1945,7 +1945,7 @@ nsEditorShell::Print()
}
NS_IMETHODIMP
nsEditorShell::GetLocalFileURL(nsIDOMWindow *parent, const PRUnichar *filterType, PRUnichar **_retval)
nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *filterType, PRUnichar **_retval)
{
nsAutoString FilterType(filterType);
PRBool htmlFilter = FilterType.EqualsIgnoreCase("html");
@ -2895,7 +2895,7 @@ nsEditorShell::DoFind(PRBool aFindNext)
{
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
rv = findComponent->CreateContext(cwP, nsnull, getter_AddRefs(mSearchContext));
}
@ -3038,7 +3038,7 @@ nsEditorShell::ConfirmWithCancel(const nsString& aTitle, const nsString& aQuesti
PRInt32 buttonPressed = 0;
if(!mContentWindow)
return result;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return result;
rv = dialog->DoDialog( cwP, block, "chrome://global/content/commonDialog.xul" );
block->GetInt( nsICommonDialogs::eButtonPressed, &buttonPressed );
@ -3063,7 +3063,7 @@ nsEditorShell::Confirm(const nsString& aTitle, const nsString& aQuestion)
{
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
rv = dialog->Confirm(cwP, aTitle.GetUnicode(), aQuestion.GetUnicode(), &result);
}
@ -3082,7 +3082,7 @@ nsEditorShell::AlertWithTitle(const PRUnichar *aTitle, const PRUnichar *aMsg)
{
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
rv = dialog->Alert(cwP, aTitle, aMsg);
}
@ -3099,7 +3099,7 @@ nsEditorShell::Alert(const nsString& aTitle, const nsString& aMsg)
{
if(!mContentWindow)
return;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return;
rv = dialog->Alert(cwP, aTitle.GetUnicode(), aMsg.GetUnicode());
}
@ -5256,7 +5256,7 @@ nsEditorShell::DoControllerCommand(nsString& aCommand)
if(!mContentWindow)
return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDOMWindow> cwP = do_QueryReferent(mContentWindow);
nsCOMPtr<nsIDOMWindowInternal> cwP = do_QueryReferent(mContentWindow);
if (!cwP) return NS_ERROR_NOT_INITIALIZED;
nsresult rv = cwP->GetControllers(getter_AddRefs(controllers));
if (NS_FAILED(rv)) return rv;

8
editor/composer/src/nsEditorShell.h
Просмотреть файл

@ -53,7 +53,7 @@
class nsIDocShell;
class nsIScriptContext;
class nsIDOMWindow;
class nsIDOMWindowInternal;
class nsIDOMElement;
class nsIDOMNode;
class nsIURI;
@ -137,7 +137,7 @@ class nsEditorShell : public nsIEditorShell,
const nsString *aYesString, const nsString *aNoString);
// this returns an AddReffed nsIScriptContext. You must relase it.
nsIScriptContext* GetScriptContext(nsIDOMWindow * aWin);
nsIScriptContext* GetScriptContext(nsIDOMWindowInternal * aWin);
// Get a string from the string bundle file
void GetBundleString(const nsString& name, nsString &outString);
@ -197,8 +197,8 @@ class nsEditorShell : public nsIEditorShell,
// so we need to track it separately
PRBool mHTMLSourceMode;
nsIDOMWindow *mWebShellWindow; // weak reference
//nsIDOMWindow *mContentWindow; // weak reference
nsIDOMWindowInternal *mWebShellWindow; // weak reference
//nsIDOMWindowInternal *mContentWindow; // weak reference
nsWeakPtr mContentWindow; // weak reference
nsEditorParserObserver *mParserObserver; // we hold the owning ref to this.

4
editor/composer/src/nsInterfaceState.cpp
Просмотреть файл

@ -35,7 +35,7 @@
#include "nsIDOMSelection.h"
#include "nsIDOMAttr.h"
#include "nsIScriptGlobalObject.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsITimer.h"
#include "nsIEditor.h"
@ -308,7 +308,7 @@ nsresult nsInterfaceState::CallUpdateCommands(const nsString& aCommand)
nsCOMPtr<nsIScriptGlobalObject> scriptGlobalObject;
theDoc->GetScriptGlobalObject(getter_AddRefs(scriptGlobalObject));
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(scriptGlobalObject);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(scriptGlobalObject);
if (!domWindow) return NS_ERROR_FAILURE;
mDOMWindow = domWindow;
}

2
editor/composer/src/nsInterfaceState.h
Просмотреть файл

@ -115,7 +115,7 @@ protected:
nsIHTMLEditor* mEditor; // the HTML editor
nsIDOMDocument* mChromeDoc; // XUL document for the chrome area
nsIDOMWindow* mDOMWindow; // nsIDOMWindow used for calling UpdateCommands
nsIDOMWindowInternal* mDOMWindow; // nsIDOMWindowInternal used for calling UpdateCommands
nsCOMPtr<nsITimer> mUpdateTimer;

10
editor/idl/nsIEditorShell.idl
Просмотреть файл

@ -29,7 +29,7 @@
%{C++
class nsIDOMWindow;
class nsIDOMWindowInternal;
class nsIDOMDocument;
class nsIDOMSelection;
class nsIDOMElement;
@ -47,8 +47,8 @@ interface nsIEditorShell : nsISupports
readonly attribute nsIDOMSelection editorSelection;
readonly attribute nsISelectionController selectionController;
attribute nsIDOMWindow webShellWindow;
attribute nsIDOMWindow contentWindow;
attribute nsIDOMWindowInternal webShellWindow;
attribute nsIDOMWindowInternal contentWindow;
attribute wstring editorType;
[noscript] readonly attribute nsIEditor editor;
@ -132,7 +132,7 @@ interface nsIEditorShell : nsISupports
in wstring yesButtonText, in wstring noButtonText);
/* check a particular window's URL to see if it matches the given URL */
boolean checkOpenWindowForURLMatch( in wstring inFileURL, in nsIDOMWindow inCheckWindow);
boolean checkOpenWindowForURLMatch( in wstring inFileURL, in nsIDOMWindowInternal inCheckWindow);
/* Commands */
/**
@ -595,7 +595,7 @@ interface nsIEditorShell : nsISupports
void DumpContentTree();
/* Utility */
wstring GetLocalFileURL(in nsIDOMWindow parent, in wstring filterType);
wstring GetLocalFileURL(in nsIDOMWindowInternal parent, in wstring filterType);
/**
* Tests if a node is a BLOCK element according the the HTML 4.0 DTD

4
embedding/browser/activex/src/control/MozillaBrowser.cpp
Просмотреть файл

@ -42,7 +42,7 @@
#include "nsIContentViewerFile.h"
#include "nsISelectionController.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsEmbedAPI.h"
@ -1068,7 +1068,7 @@ HRESULT CMozillaBrowser::GetDOMDocument(nsIDOMDocument **pDocument)
}
// Get the DOM window from the webbrowser
nsCOMPtr<nsIDOMWindow> window(do_GetInterface(mWebBrowser));
nsCOMPtr<nsIDOMWindowInternal> window(do_GetInterface(mWebBrowser));
if (window)
{
if (NS_SUCCEEDED(window->GetDocument(pDocument)) && *pDocument)

4
extensions/psm-glue/public/nsISecureBrowserUI.idl
Просмотреть файл

@ -24,13 +24,13 @@
#include "nsISupports.idl"
interface nsIDOMWindow;
interface nsIDOMWindowInternal;
interface nsIDOMElement;
[scriptable, uuid(081e31e0-a144-11d3-8c7c-00609792278c)]
interface nsSecureBrowserUI : nsISupports
{
void init(in nsIDOMWindow window, in nsIDOMElement button, in nsIDOMElement certauth);
void init(in nsIDOMWindowInternal window, in nsIDOMElement button, in nsIDOMElement certauth);
void displayPageInfoUI();
};

6
extensions/psm-glue/src/nsCrypto.cpp
Просмотреть файл

@ -28,7 +28,7 @@
#include "nsPSMComponent.h"
#include "nsDOMCID.h"
#include "nsIDOMScriptObjectFactory.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIEventQueueService.h"
#include "nsIEventQueue.h"
#include "nsIThreadManager.h"
@ -1134,7 +1134,7 @@ nsCrypto::SignText(JSContext *cx, jsval *argv, PRUint32 argc,
void
alertUser(char *message)
{
nsCOMPtr<nsIDOMWindow> hiddenWindow;
nsCOMPtr<nsIDOMWindowInternal> hiddenWindow;
JSContext *jsContext;
nsresult rv;
@ -1417,7 +1417,7 @@ nsPkcs11::GetScriptObject(nsIScriptContext *aContext,
PRBool
confirm_user(char *message)
{
nsCOMPtr<nsIDOMWindow> hiddenWindow;
nsCOMPtr<nsIDOMWindowInternal> hiddenWindow;
JSContext *jsContext;
PRBool confirmation = PR_FALSE;
nsresult rv;

8
extensions/psm-glue/src/nsPSMUICallbacks.cpp
Просмотреть файл

@ -39,7 +39,7 @@
// Interfaces Needed
#include "nsIAppShellService.h"
#include "nsIDocShell.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIInterfaceRequestor.h"
#include "nsIPrompt.h"
#include "nsIScriptGlobalObject.h"
@ -68,7 +68,7 @@ NS_METHOD
nsPSMUIHandlerImpl::DisplayURI(PRInt32 width, PRInt32 height, PRBool modal, const char *urlStr, nsIDOMWindow * win)
{
nsresult rv;
nsCOMPtr<nsIDOMWindow> parentWindow;
nsCOMPtr<nsIDOMWindowInternal> parentWindow;
JSContext *jsContext;
jsval *argv = NULL;
@ -87,7 +87,7 @@ nsPSMUIHandlerImpl::DisplayURI(PRInt32 width, PRInt32 height, PRBool modal, cons
jsContext = (JSContext*)scriptContext->GetNativeContext();
if (!jsContext) { rv = NS_ERROR_FAILURE; goto loser; }
parentWindow = win;
parentWindow = do_QueryInterface(win);
} else {
NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv);
if (NS_FAILED(rv)) {
@ -120,7 +120,7 @@ nsPSMUIHandlerImpl::DisplayURI(PRInt32 width, PRInt32 height, PRBool modal, cons
argv = JS_PushArguments(jsContext, &stackPtr, "sss", urlStr, "_blank", buffer);
if (argv) {
// open the window
nsIDOMWindow *newWindow;
nsIDOMWindowInternal *newWindow;
parentWindow->Open(jsContext, argv, 3, &newWindow);
newWindow->ResizeTo(width, height);
JS_PopArguments(jsContext, stackPtr);

8
extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp
Просмотреть файл

@ -45,7 +45,7 @@
#include "nsIDOMHTMLDocument.h"
#include "nsIDOMXULDocument.h"
#include "nsIDOMElement.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIContent.h"
#include "nsIWebProgress.h"
#include "nsIChannel.h"
@ -153,7 +153,7 @@ NS_IMPL_ISUPPORTS4(nsSecureBrowserUIImpl,
NS_IMETHODIMP
nsSecureBrowserUIImpl::Init(nsIDOMWindow *window, nsIDOMElement *button, nsIDOMElement *certauth)
nsSecureBrowserUIImpl::Init(nsIDOMWindowInternal *window, nsIDOMElement *button, nsIDOMElement *certauth)
{
mSecurityButton = button;
mCertificateAuthorityDisplay = certauth;
@ -247,7 +247,7 @@ static nsresult IsChildOfDomWindow(nsIDOMWindow *parent, nsIDOMWindow *child, PR
NS_IMETHODIMP
nsSecureBrowserUIImpl::Notify(nsIContent* formNode, nsIDOMWindow* window, nsIURI* actionURL)
nsSecureBrowserUIImpl::Notify(nsIContent* formNode, nsIDOMWindowInternal* window, nsIURI* actionURL)
{
// Return NS_OK unless we want to prevent this form from submitting.
@ -261,7 +261,7 @@ nsSecureBrowserUIImpl::Notify(nsIContent* formNode, nsIDOMWindow* window, nsIURI
nsCOMPtr<nsIScriptGlobalObject> globalObject;
document->GetScriptGlobalObject(getter_AddRefs(globalObject));
nsCOMPtr<nsIDOMWindow> postingWindow = do_QueryInterface(globalObject);
nsCOMPtr<nsIDOMWindowInternal> postingWindow = do_QueryInterface(globalObject);
PRBool isChild;
IsChildOfDomWindow(mWindow, postingWindow, &isChild);

6
extensions/psm-glue/src/nsSecureBrowserUIImpl.h
Просмотреть файл

@ -31,7 +31,7 @@
#include "nsIObserver.h"
#include "nsIDocumentLoaderObserver.h"
#include "nsIDOMElement.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIStringBundle.h"
#include "nsISecureBrowserUI.h"
#include "nsIDocShell.h"
@ -68,11 +68,11 @@ public:
// nsIObserver
NS_DECL_NSIOBSERVER
NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindow* window, nsIURI *actionURL);
NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindowInternal* window, nsIURI *actionURL);
protected:
nsCOMPtr<nsIDOMWindow> mWindow;
nsCOMPtr<nsIDOMWindowInternal> mWindow;
nsCOMPtr<nsIDOMElement> mSecurityButton;
nsCOMPtr<nsIDOMElement> mCertificateAuthorityDisplay;
nsCOMPtr<nsIDocumentLoaderObserver> mOldWebShellObserver;

6
extensions/wallet/cookieviewer/nsCookieViewer.cpp
Просмотреть файл

@ -26,7 +26,7 @@
#include "stdio.h"
#include "nsICookieService.h"
#include "nsIServiceManager.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsCOMPtr.h"
#include "nsIScriptGlobalObject.h"
#include "nsCookieViewer.h"
@ -88,7 +88,7 @@ CookieViewerImpl::GetPermissionValue(PRInt32 type, char** aValue)
}
NS_IMETHODIMP
CookieViewerImpl::SetValue(const char* aValue, nsIDOMWindow* win)
CookieViewerImpl::SetValue(const char* aValue, nsIDOMWindowInternal* win)
{
/* process the value */
NS_PRECONDITION(aValue != nsnull, "null ptr");
@ -121,7 +121,7 @@ CookieViewerImpl::BlockImage(const char* imageURL)
}
NS_IMETHODIMP
CookieViewerImpl::AddPermission(nsIDOMWindow* aWin, PRBool permission, PRInt32 type)
CookieViewerImpl::AddPermission(nsIDOMWindowInternal* aWin, PRBool permission, PRInt32 type)
{
nsresult rv;

6
extensions/wallet/cookieviewer/nsICookieViewer.idl
Просмотреть файл

@ -29,15 +29,15 @@
#include "nsISupports.idl"
#include "domstubs.idl"
%{C++
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
%}
[scriptable, uuid(BBB67DF0-214B-11d3-ABAA-0080C787AD96)]
interface nsICookieViewer : nsISupports
{
void SetValue(in string aValue, in nsIDOMWindow win);
void SetValue(in string aValue, in nsIDOMWindowInternal win);
void BlockImage(in string imageURL);
void AddPermission(in nsIDOMWindow win, in PRBool permission, in PRInt32 type);
void AddPermission(in nsIDOMWindowInternal win, in PRBool permission, in PRInt32 type);
string GetCookieValue();
string GetPermissionValue(in PRInt32 type);

4
extensions/wallet/editor/nsIWalletEditor.idl
Просмотреть файл

@ -29,13 +29,13 @@
#include "nsISupports.idl"
#include "domstubs.idl"
%{C++
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
%}
[scriptable, uuid(0A904580-1C88-11d3-ABA9-0080C787AD96)]
interface nsIWalletEditor : nsISupports
{
void SetValue(in wstring aValue, in nsIDOMWindow win);
void SetValue(in wstring aValue, in nsIDOMWindowInternal win);
wstring GetValue();
};

4
extensions/wallet/editor/nsWalletEditor.cpp
Просмотреть файл

@ -26,7 +26,7 @@
#include "stdio.h"
#include "nsIWalletService.h"
#include "nsIServiceManager.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsCOMPtr.h"
#include "nsIDocShell.h"
#include "nsIScriptGlobalObject.h"
@ -66,7 +66,7 @@ WalletEditorImpl::GetValue(PRUnichar** aValue)
}
NS_IMETHODIMP
WalletEditorImpl::SetValue(const PRUnichar* aValue, nsIDOMWindow* win)
WalletEditorImpl::SetValue(const PRUnichar* aValue, nsIDOMWindowInternal* win)
{
/* process the value */
NS_PRECONDITION(aValue != nsnull, "null ptr");

6
extensions/wallet/public/nsIWalletService.idl
Просмотреть файл

@ -52,12 +52,12 @@ interface nsIWalletService : nsISupports {
[noscript]void WALLET_PostEdit(in nsAutoString walletList);
boolean WALLET_ChangePassword();
void WALLET_DeleteAll();
PRUint32 WALLET_RequestToCapture(in nsIPresShell shell, in nsIDOMWindow win);
boolean WALLET_Prefill(in nsIPresShell shell, in boolean quick, in nsIDOMWindow win);
PRUint32 WALLET_RequestToCapture(in nsIPresShell shell, in nsIDOMWindowInternal win);
boolean WALLET_Prefill(in nsIPresShell shell, in boolean quick, in nsIDOMWindowInternal win);
[noscript]void WALLET_PrefillReturn(in nsAutoString results);
void WALLET_FetchFromNetCenter();
boolean WALLET_ExpirePassword();
void WALLET_InitReencryptCallback(in nsIDOMWindow win);
void WALLET_InitReencryptCallback(in nsIDOMWindowInternal win);
void SI_RemoveUser(in string key, in wstring userName);
void SI_StorePassword(in string key, in wstring userName, in wstring pwd);

4
extensions/wallet/signonviewer/nsISignonViewer.idl
Просмотреть файл

@ -29,13 +29,13 @@
#include "nsISupports.idl"
#include "domstubs.idl"
%{C++
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
%}
[scriptable, uuid(C425FAE0-20F0-11d3-ABAA-0080C787AD96)]
interface nsISignonViewer : nsISupports
{
void SetValue(in wstring aValue, in nsIDOMWindow win);
void SetValue(in wstring aValue, in nsIDOMWindowInternal win);
wstring GetSignonValue();
wstring GetRejectValue();
wstring GetNopreviewValue();

4
extensions/wallet/signonviewer/nsSignonViewer.cpp
Просмотреть файл

@ -27,7 +27,7 @@
#include "stdio.h"
#include "nsIWalletService.h"
#include "nsIServiceManager.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsCOMPtr.h"
#include "nsIScriptGlobalObject.h"
#include "nsSignonViewer.h"
@ -120,7 +120,7 @@ SignonViewerImpl::GetNocaptureValue(PRUnichar** aValue)
}
NS_IMETHODIMP
SignonViewerImpl::SetValue(const PRUnichar* aValue, nsIDOMWindow* win)
SignonViewerImpl::SetValue(const PRUnichar* aValue, nsIDOMWindowInternal* win)
{
/* process the value */
NS_PRECONDITION(aValue != nsnull, "null ptr");

10
extensions/wallet/src/nsWalletService.cpp
Просмотреть файл

@ -39,7 +39,7 @@
#include "nsIDOMHTMLInputElement.h"
#include "nsIFormControl.h"
#include "nsIDocShell.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsINetSupportDialogService.h"
#include "nsIInterfaceRequestor.h"
#include "nsIPrompt.h"
@ -89,12 +89,12 @@ NS_IMETHODIMP nsWalletlibService::WALLET_DeleteAll() {
return NS_OK;
}
NS_IMETHODIMP nsWalletlibService::WALLET_RequestToCapture(nsIPresShell* shell, nsIDOMWindow* win, PRUint32* status) {
NS_IMETHODIMP nsWalletlibService::WALLET_RequestToCapture(nsIPresShell* shell, nsIDOMWindowInternal* win, PRUint32* status) {
::WLLT_RequestToCapture(shell, win, status);
return NS_OK;
}
NS_IMETHODIMP nsWalletlibService::WALLET_Prefill(nsIPresShell* shell, PRBool quick, nsIDOMWindow* win, PRBool* status) {
NS_IMETHODIMP nsWalletlibService::WALLET_Prefill(nsIPresShell* shell, PRBool quick, nsIDOMWindowInternal* win, PRBool* status) {
return ::WLLT_Prefill(shell, quick, win);
}
@ -113,7 +113,7 @@ NS_IMETHODIMP nsWalletlibService::WALLET_ExpirePassword(PRBool* status){
return NS_OK;
}
NS_IMETHODIMP nsWalletlibService::WALLET_InitReencryptCallback(nsIDOMWindow* window){
NS_IMETHODIMP nsWalletlibService::WALLET_InitReencryptCallback(nsIDOMWindowInternal* window){
/* register callback to be used when encryption pref changes */
::WLLT_InitReencryptCallback(window);
return NS_OK;
@ -166,7 +166,7 @@ NS_IMETHODIMP nsWalletlibService::Observe(nsISupports*, const PRUnichar*, const
}
#define CRLF "\015\012"
NS_IMETHODIMP nsWalletlibService::Notify(nsIContent* formNode, nsIDOMWindow* window, nsIURI* actionURL)
NS_IMETHODIMP nsWalletlibService::Notify(nsIContent* formNode, nsIDOMWindowInternal* window, nsIURI* actionURL)
{
if (!formNode) {
return NS_ERROR_FAILURE;

4
extensions/wallet/src/nsWalletService.h
Просмотреть файл

@ -30,7 +30,7 @@
#include "nsWeakReference.h"
#include "nsIPasswordSink.h"
#include "nsIPrompt.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIURI.h"
class nsWalletlibService : public nsIWalletService,
@ -51,7 +51,7 @@ public:
nsWalletlibService();
// NS_DECL_NSIFORMSUBMITOBSERVER
NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindow* window, nsIURI* actionURL);
NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindowInternal* window, nsIURI* actionURL);
protected:
virtual ~nsWalletlibService();

10
extensions/wallet/src/singsign.cpp
Просмотреть файл

@ -347,12 +347,12 @@ SI_InitSignonFileName() {
***********/
PRIVATE PRBool
si_ConfirmYN(PRUnichar * szMessage, nsIDOMWindow* window) {
si_ConfirmYN(PRUnichar * szMessage, nsIDOMWindowInternal* window) {
return Wallet_ConfirmYN(szMessage, window);
}
PRIVATE PRInt32
si_3ButtonConfirm(PRUnichar * szMessage, nsIDOMWindow* window) {
si_3ButtonConfirm(PRUnichar * szMessage, nsIDOMWindowInternal* window) {
return Wallet_3ButtonConfirm(szMessage, window);
}
@ -1846,7 +1846,7 @@ si_SaveSignonDataLocked() {
/* Ask user if it is ok to save the signon data */
PRIVATE PRBool
si_OkToSave(const char *passwordRealm, const nsString& userName, nsIDOMWindow* window) {
si_OkToSave(const char *passwordRealm, const nsString& userName, nsIDOMWindowInternal* window) {
/* if url/user already exists, then it is safe to save it again */
if (si_CheckForUser(passwordRealm, userName)) {
@ -1892,7 +1892,7 @@ si_OkToSave(const char *passwordRealm, const nsString& userName, nsIDOMWindow* w
PRIVATE void
si_RememberSignonData
(nsIPrompt* dialog, const char* passwordRealm, nsVoidArray * signonData,
nsIDOMWindow* window)
nsIDOMWindowInternal* window)
{
int passwordCount = 0;
int pswd[3];
@ -2006,7 +2006,7 @@ si_RememberSignonData
PUBLIC void
SINGSIGN_RememberSignonData
(nsIPrompt* dialog, const char* passwordRealm, nsVoidArray * signonData,
nsIDOMWindow* window)
nsIDOMWindowInternal* window)
{
nsresult rv;
NS_WITH_SERVICE(nsIURL, uri, "component://netscape/network/standard-url", &rv);

4
extensions/wallet/src/singsign.h
Просмотреть файл

@ -33,7 +33,7 @@
#include "nsString.h"
#include "nsVoidArray.h"
#include "nsIPref.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
/* Duplicates defines as in nsIPrompt.idl -- keep in sync! */
#define SINGSIGN_SAVE_PASSWORD_NEVER 0
@ -121,7 +121,7 @@ SINGSIGN_ReencryptAll();
extern void
SINGSIGN_RememberSignonData
(nsIPrompt* dialog, const char* URLName, nsVoidArray * signonData, nsIDOMWindow* window);
(nsIPrompt* dialog, const char* URLName, nsVoidArray * signonData, nsIDOMWindowInternal* window);
XP_END_PROTOS

28
extensions/wallet/src/wallet.cpp
Просмотреть файл

@ -686,7 +686,7 @@ Wallet_Localize(char* genericString) {
/**********************/
PUBLIC PRBool
Wallet_Confirm(PRUnichar * szMessage, nsIDOMWindow* window)
Wallet_Confirm(PRUnichar * szMessage, nsIDOMWindowInternal* window)
{
PRBool retval = PR_TRUE; /* default value */
@ -704,7 +704,7 @@ Wallet_Confirm(PRUnichar * szMessage, nsIDOMWindow* window)
}
PUBLIC PRBool
Wallet_ConfirmYN(PRUnichar * szMessage, nsIDOMWindow* window) {
Wallet_ConfirmYN(PRUnichar * szMessage, nsIDOMWindowInternal* window) {
nsresult res;
nsCOMPtr<nsIPrompt> dialog;
window->GetPrompter(getter_AddRefs(dialog));
@ -744,7 +744,7 @@ Wallet_ConfirmYN(PRUnichar * szMessage, nsIDOMWindow* window) {
}
PUBLIC PRInt32
Wallet_3ButtonConfirm(PRUnichar * szMessage, nsIDOMWindow* window)
Wallet_3ButtonConfirm(PRUnichar * szMessage, nsIDOMWindowInternal* window)
{
nsresult res;
nsCOMPtr<nsIPrompt> dialog;
@ -789,7 +789,7 @@ Wallet_3ButtonConfirm(PRUnichar * szMessage, nsIDOMWindow* window)
}
PRIVATE void
wallet_Alert(PRUnichar * szMessage, nsIDOMWindow* window)
wallet_Alert(PRUnichar * szMessage, nsIDOMWindowInternal* window)
{
nsresult res;
nsCOMPtr<nsIPrompt> dialog;
@ -819,7 +819,7 @@ wallet_Alert(PRUnichar * szMessage, nsIPrompt* dialog)
PUBLIC PRBool
Wallet_CheckConfirmYN
(PRUnichar * szMessage, PRUnichar * szCheckMessage, PRBool* checkValue,
nsIDOMWindow* window) {
nsIDOMWindowInternal* window) {
nsresult res;
nsCOMPtr<nsIPrompt> dialog;
window->GetPrompter(getter_AddRefs(dialog));
@ -1931,7 +1931,7 @@ wallet_ReadFromURLFieldToSchemaFile
/*********************************************************************/
PUBLIC void
Wallet_GiveCaveat(nsIDOMWindow* window, nsIPrompt* dialog) {
Wallet_GiveCaveat(nsIDOMWindowInternal* window, nsIPrompt* dialog) {
/* test for first capturing of data ever and give caveat if so */
if (!SI_GetBoolPref(pref_Caveat, PR_FALSE)) {
SI_SetBoolPref(pref_Caveat, PR_TRUE);
@ -2648,7 +2648,7 @@ Wallet_SignonViewerReturn(const nsString& results)
* see if user wants to capture data on current page
*/
PRIVATE PRBool
wallet_OKToCapture(char* urlName, nsIDOMWindow* window) {
wallet_OKToCapture(char* urlName, nsIDOMWindowInternal* window) {
nsAutoString url; url.AssignWithConversion(urlName);
/* exit if pref is not set */
@ -3010,7 +3010,7 @@ if (!changingPassword) {
SI_SetBoolPref(pref_Crypto, SI_GetBoolPref(pref_Crypto, PR_TRUE));
// message = Wallet_Localize("Converted");
// wallet_Alert(message, (nsIDOMWindow *)window);
// wallet_Alert(message, (nsIDOMWindowInternal *)window);
// Recycle(message);
level--;
return 0; /* this is PREF_NOERROR but we no longer include prefapi.h */
@ -3020,16 +3020,16 @@ fail:
/* alert the user to the failure */
message = Wallet_Localize("NotConverted");
wallet_Alert(message, (nsIDOMWindow *)window);
wallet_Alert(message, (nsIDOMWindowInternal *)window);
Recycle(message);
level--;
return 1;
}
PUBLIC void
WLLT_InitReencryptCallback(nsIDOMWindow* window) {
WLLT_InitReencryptCallback(nsIDOMWindowInternal* window) {
static PRBool registered = PR_FALSE;
static nsIDOMWindow* lastWindow;
static nsIDOMWindowInternal* lastWindow;
if (registered) {
SI_UnregisterCallback(pref_Crypto, wallet_ReencryptAll, lastWindow);
}
@ -3169,7 +3169,7 @@ WLLT_PrefillReturn(const nsString& results)
* get the form elements on the current page and prefill them if possible
*/
PUBLIC nsresult
WLLT_Prefill(nsIPresShell* shell, PRBool quick, nsIDOMWindow* win)
WLLT_Prefill(nsIPresShell* shell, PRBool quick, nsIDOMWindowInternal* win)
{
nsAutoString urlName;
@ -3332,7 +3332,7 @@ WLLT_Prefill(nsIPresShell* shell, PRBool quick, nsIDOMWindow* win)
}
PUBLIC void
WLLT_RequestToCapture(nsIPresShell* shell, nsIDOMWindow* win, PRUint32* status) {
WLLT_RequestToCapture(nsIPresShell* shell, nsIDOMWindowInternal* win, PRUint32* status) {
/* starting with the present shell, get each form element and put them on a list */
nsresult result;
@ -3447,7 +3447,7 @@ public:
};
PUBLIC void
WLLT_OnSubmit(nsIContent* currentForm, nsIDOMWindow* window) {
WLLT_OnSubmit(nsIContent* currentForm, nsIDOMWindowInternal* window) {
nsCOMPtr<nsIDOMHTMLFormElement> currentFormNode(do_QueryInterface(currentForm));

14
extensions/wallet/src/wallet.h
Просмотреть файл

@ -61,10 +61,10 @@ extern void
WLLT_PrefillReturn(const nsString& results);
extern void
WLLT_RequestToCapture(nsIPresShell* shell, nsIDOMWindow * win, PRUint32* status);
WLLT_RequestToCapture(nsIPresShell* shell, nsIDOMWindowInternal * win, PRUint32* status);
extern nsresult
WLLT_Prefill(nsIPresShell* shell, PRBool quick, nsIDOMWindow* win);
WLLT_Prefill(nsIPresShell* shell, PRBool quick, nsIDOMWindowInternal* win);
extern void
WLLT_GetNopreviewListForViewer(nsString& aNopreviewList);
@ -76,7 +76,7 @@ extern void
WLLT_GetPrefillListForViewer(nsString& aPrefillList);
extern void
WLLT_OnSubmit(nsIContent* formNode, nsIDOMWindow* window);
WLLT_OnSubmit(nsIContent* formNode, nsIDOMWindowInternal* window);
extern void
WLLT_FetchFromNetCenter();
@ -85,7 +85,7 @@ extern void
WLLT_ExpirePassword(PRBool* status);
extern void
WLLT_InitReencryptCallback(nsIDOMWindow* window);
WLLT_InitReencryptCallback(nsIDOMWindowInternal* window);
extern nsresult
Wallet_Encrypt(const nsString& text, nsString& crypt);
@ -99,11 +99,11 @@ extern PRUnichar * Wallet_Localize(char * genericString);
extern char* Wallet_RandomName(char* suffix);
extern PRBool Wallet_ConfirmYN(PRUnichar * szMessage, nsIDOMWindow* window);
extern PRBool Wallet_ConfirmYN(PRUnichar * szMessage, nsIDOMWindowInternal* window);
extern PRInt32 Wallet_3ButtonConfirm(PRUnichar * szMessage, nsIDOMWindow* window);
extern PRInt32 Wallet_3ButtonConfirm(PRUnichar * szMessage, nsIDOMWindowInternal* window);
extern void Wallet_GiveCaveat(nsIDOMWindow* window, nsIPrompt* dialog);
extern void Wallet_GiveCaveat(nsIDOMWindowInternal* window, nsIPrompt* dialog);
extern nsresult
Wallet_Encrypt2(const nsString& text, nsString& crypt);

4
extensions/wallet/walletpreview/nsIWalletPreview.idl
Просмотреть файл

@ -29,13 +29,13 @@
#include "nsISupports.idl"
#include "domstubs.idl"
%{C++
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
%}
[scriptable, uuid(8F4CFE41-2152-11d3-ABAA-0080C787AD96)]
interface nsIWalletPreview : nsISupports
{
void SetValue(in wstring aValue, in nsIDOMWindow win);
void SetValue(in wstring aValue, in nsIDOMWindowInternal win);
wstring GetPrefillValue();
};

4
extensions/wallet/walletpreview/nsWalletPreview.cpp
Просмотреть файл

@ -26,7 +26,7 @@
#include "stdio.h"
#include "nsIWalletService.h"
#include "nsIServiceManager.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsCOMPtr.h"
#include "nsIScriptGlobalObject.h"
#include "nsWalletPreview.h"
@ -88,7 +88,7 @@ static void DOMWindowToTreeOwner(
}
NS_IMETHODIMP
WalletPreviewImpl::SetValue(const PRUnichar* aValue, nsIDOMWindow* win)
WalletPreviewImpl::SetValue(const PRUnichar* aValue, nsIDOMWindowInternal* win)
{
/* close the window */
if (!win) {

2
extensions/webservices/soap/src/nsSOAPCall.cpp
Просмотреть файл

@ -48,7 +48,7 @@ class nsScriptResponseListener : public nsISOAPResponseListener
{
public:
nsScriptResponseListener(JSObject* aScopeObj, JSObject* aFunctionObj);
~nsScriptResponseListener();
virtual ~nsScriptResponseListener();
NS_DECL_ISUPPORTS

2
extensions/xmlextras/soap/src/nsSOAPCall.cpp
Просмотреть файл

@ -48,7 +48,7 @@ class nsScriptResponseListener : public nsISOAPResponseListener
{
public:
nsScriptResponseListener(JSObject* aScopeObj, JSObject* aFunctionObj);
~nsScriptResponseListener();
virtual ~nsScriptResponseListener();
NS_DECL_ISUPPORTS

4
extensions/xmlterm/base/mozIXMLTermShell.idl
Просмотреть файл

@ -27,7 +27,7 @@
%{C++
class nsILineTerm;
class nsIDOMWindow;
class nsIDOMWindowInternal;
%}
[scriptable, uuid(0eb82b30-43a2-11d3-8e76-006008948af5)]
@ -43,7 +43,7 @@ interface mozIXMLTermShell : nsISupports
* @param args argument string to be passed to XMLterm
* (at the moment this just contains any initial input data)
*/
void Init(in nsIDOMWindow aContentWin, in wstring URL, in wstring args);
void Init(in nsIDOMWindowInternal aContentWin, in wstring URL, in wstring args);
/** Closes XMLterm, freeing resources
* @param aCookie document.cookie string for authentication

78
extensions/xmlterm/base/mozIXMLTermStream.h
Просмотреть файл

@ -1,78 +0,0 @@
/*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "MPL"); you may not use this file
* except in compliance with the MPL. You may obtain a copy of
* the MPL at http://www.mozilla.org/MPL/
*
* Software distributed under the MPL is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the MPL for the specific language governing
* rights and limitations under the MPL.
*
* The Original Code is XMLterm.
*
* The Initial Developer of the Original Code is Ramalingam Saravanan.
* Portions created by Ramalingam Saravanan <svn@xmlterm.org> are
* Copyright (C) 1999 Ramalingam Saravanan. All Rights Reserved.
*
* Contributor(s):
*/
// mozIXMLTermStream.h: interface to display HTML/XML streams as documents
// (unregistered)
#ifndef mozIXMLTermStream_h___
#define mozIXMLTermStream_h___
#include "nscore.h"
#include "nsISupports.h"
#include "nsIDOMDocument.h"
#include "nsIWebShell.h"
#include "nsIPresShell.h"
#include "nsIScriptContext.h"
#include "nsIInputStream.h"
/* {0eb82b40-43a2-11d3-8e76-006008948af5} */
#define MOZIXMLTERMSTREAM_IID_STR "0eb82b40-43a2-11d3-8e76-006008948af5"
#define MOZIXMLTERMSTREAM_IID \
{0x0eb82b40, 0x43a2, 0x11d3, \
{ 0x8e, 0x76, 0x00, 0x60, 0x08, 0x94, 0x8a, 0xf5 }}
class mozIXMLTermStream : public nsIInputStream
{
public:
NS_DEFINE_STATIC_IID_ACCESSOR(MOZIXMLTERMSTREAM_IID);
// mozIXMLTermStream interface
/** Open stream in specified frame, or in current frame if frameName is null
* @param aDOMWindow parent window
* @param frameName name of child frame in which to display stream, or null
* to display in parent window
* @param contentURL URL of stream content
* @param contentType MIME type of stream content
* @param maxResizeHeight maximum resize height (0=> do not resize)
* @return NS_OK on success
*/
NS_IMETHOD Open(nsIDOMWindow* aDOMWindow,
const char* frameName,
const char* contentURL,
const char* contentType,
PRInt32 maxResizeHeight) = 0;
/** Write Unicode string to stream (blocks until write is completed)
* @param buf string to write
* @return NS_OK on success
*/
NS_IMETHOD Write(const PRUnichar* buf) = 0;
};
#define MOZXMLTERMSTREAM_CID \
{ /* 0eb82b41-43a2-11d3-8e76-006008948af5 */ \
0x0eb82b41, 0x43a2, 0x11d3, \
{0x8e, 0x76, 0x00, 0x60, 0x08, 0x94, 0x8a, 0xf5} }
extern nsresult
NS_NewXMLTermStream(mozIXMLTermStream** aXMLTermStream);
#endif /* mozIXMLTermStream_h___ */

4
extensions/xmlterm/base/mozXMLTermSession.cpp
Просмотреть файл

@ -1361,7 +1361,7 @@ NS_IMETHODIMP mozXMLTermSession::InitStream(const nsString& streamURL,
if (NS_FAILED(result) || !docShell)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMWindow> outerDOMWindow;
nsCOMPtr<nsIDOMWindowInternal> outerDOMWindow;
result = mozXMLTermUtils::ConvertDocShellToDOMWindow(docShell,
getter_AddRefs(outerDOMWindow));
@ -2877,7 +2877,7 @@ NS_IMETHODIMP mozXMLTermSession::ScrollToBottomLeft(void)
if (NS_FAILED(result) || !docShell)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMWindow> domWindow;
nsCOMPtr<nsIDOMWindowInternal> domWindow;
result = mozXMLTermUtils::ConvertDocShellToDOMWindow(docShell,
getter_AddRefs(domWindow));

4
extensions/xmlterm/base/mozXMLTermShell.cpp
Просмотреть файл

@ -46,7 +46,7 @@
#include "nsIDOMDocument.h"
#include "nsIDOMSelection.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "mozXMLT.h"
#include "mozXMLTermUtils.h"
@ -210,7 +210,7 @@ NS_IMETHODIMP mozXMLTermShell::IgnoreKeyPress(PRBool aIgnore,
// Initialize XMLTermShell
NS_IMETHODIMP
mozXMLTermShell::Init(nsIDOMWindow* aContentWin,
mozXMLTermShell::Init(nsIDOMWindowInternal* aContentWin,
const PRUnichar* URL,
const PRUnichar* args)
{

4
extensions/xmlterm/base/mozXMLTermShell.h
Просмотреть файл

@ -55,7 +55,7 @@ class mozXMLTermShell : public mozIXMLTermShell
NS_IMETHOD IgnoreKeyPress(PRBool aIgnore,
const PRUnichar* aCookie);
NS_IMETHOD Init(nsIDOMWindow* aContentWin,
NS_IMETHOD Init(nsIDOMWindowInternal* aContentWin,
const PRUnichar* URL,
const PRUnichar* args);
@ -77,7 +77,7 @@ protected:
PRBool mInitialized;
/** non-owning reference to content window for XMLterm */
nsIDOMWindow* mContentWindow;
nsIDOMWindowInternal* mContentWindow;
/** non-owning reference (??) to doc shell for content window */
nsIDocShell* mContentAreaDocShell;

6
extensions/xmlterm/base/mozXMLTermStream.cpp
Просмотреть файл

@ -46,7 +46,7 @@
#include "nsIScriptContextOwner.h"
#include "nsIScriptGlobalObject.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMWindowCollection.h"
#include "nsIDOMElement.h"
#include "nsIDOMNode.h"
@ -158,7 +158,7 @@ mozXMLTermStream::QueryInterface(REFNSIID aIID,void** aInstancePtr)
* @param maxResizeHeight maximum resize height (0=> do not resize)
* @return NS_OK on success
*/
NS_IMETHODIMP mozXMLTermStream::Open(nsIDOMWindow* aDOMWindow,
NS_IMETHODIMP mozXMLTermStream::Open(nsIDOMWindowInternal* aDOMWindow,
const char* frameName,
const char* contentURL,
const char* contentType,
@ -227,7 +227,7 @@ NS_IMETHODIMP mozXMLTermStream::Open(nsIDOMWindow* aDOMWindow,
}
// Get inner DOM window by looking up the frames list
nsCOMPtr<nsIDOMWindow> innerDOMWindow;
nsCOMPtr<nsIDOMWindowInternal> innerDOMWindow;
result = mozXMLTermUtils::GetInnerDOMWindow(aDOMWindow, innerFrameName,
getter_AddRefs(innerDOMWindow));
if (NS_FAILED(result) || !innerDOMWindow)

4
extensions/xmlterm/base/mozXMLTermStream.h
Просмотреть файл

@ -46,7 +46,7 @@ class mozXMLTermStream : public mozIXMLTermStream
// mozIXMLTermStream interface
// Open stream in specified frame, or in current frame if frameName is null
NS_IMETHOD Open(nsIDOMWindow* aDOMWindow,
NS_IMETHOD Open(nsIDOMWindowInternal* aDOMWindow,
const char* frameName,
const char* contentURL,
const char* contentType,
@ -73,7 +73,7 @@ class mozXMLTermStream : public mozIXMLTermStream
PRInt32 mMaxResizeHeight;
/** DOM window in which to display stream */
nsCOMPtr<nsIDOMWindow> mDOMWindow;
nsCOMPtr<nsIDOMWindowInternal> mDOMWindow;
/** Frame element in which to display stream */
nsCOMPtr<nsIDOMElement> mDOMIFrameElement;

10
extensions/xmlterm/base/mozXMLTermUtils.cpp
Просмотреть файл

@ -53,7 +53,7 @@
*/
NS_EXPORT nsresult
mozXMLTermUtils::ConvertDocShellToDOMWindow(nsIDocShell* aDocShell,
nsIDOMWindow** aDOMWindow)
nsIDOMWindowInternal** aDOMWindow)
{
XMLT_LOG(mozXMLTermUtils::ConvertDocShellToDOMWindow,30,("\n"));
@ -64,7 +64,7 @@ mozXMLTermUtils::ConvertDocShellToDOMWindow(nsIDocShell* aDocShell,
nsCOMPtr<nsIScriptGlobalObject> scriptGlobalObject(do_GetInterface(aDocShell));
nsCOMPtr<nsIDOMWindow> domWindow(do_QueryInterface(scriptGlobalObject));
nsCOMPtr<nsIDOMWindowInternal> domWindow(do_QueryInterface(scriptGlobalObject));
if (!domWindow)
return NS_ERROR_FAILURE;
@ -81,7 +81,7 @@ mozXMLTermUtils::ConvertDocShellToDOMWindow(nsIDocShell* aDocShell,
* @return NS_OK on success
*/
NS_EXPORT nsresult
mozXMLTermUtils::ConvertDOMWindowToDocShell(nsIDOMWindow* aDOMWindow,
mozXMLTermUtils::ConvertDOMWindowToDocShell(nsIDOMWindowInternal* aDOMWindow,
nsIDocShell** aDocShell)
{
XMLT_LOG(mozXMLTermUtils::ConvertDOMWindowToDocShell,30,("\n"));
@ -106,9 +106,9 @@ mozXMLTermUtils::ConvertDOMWindowToDocShell(nsIDOMWindow* aDOMWindow,
* @return NS_OK on success
*/
NS_EXPORT nsresult
mozXMLTermUtils::GetInnerDOMWindow(nsIDOMWindow* outerDOMWindow,
mozXMLTermUtils::GetInnerDOMWindow(nsIDOMWindowInternal* outerDOMWindow,
const nsString& innerFrameName,
nsIDOMWindow** innerDOMWindow)
nsIDOMWindowInternal** innerDOMWindow)
{
nsresult result;

10
extensions/xmlterm/base/mozXMLTermUtils.h
Просмотреть файл

@ -29,7 +29,7 @@
#include "nsString.h"
#include "nsIDocShell.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMDocument.h"
class mozXMLTermUtils
@ -43,7 +43,7 @@ class mozXMLTermUtils
*/
static NS_EXPORT nsresult
ConvertDocShellToDOMWindow(nsIDocShell* aDocShell,
nsIDOMWindow** aDOMWindow);
nsIDOMWindowInternal** aDOMWindow);
/** Gets doc shell for DOM window
* @param aDOMWindow DOM window (frame)
@ -51,7 +51,7 @@ class mozXMLTermUtils
* @return NS_OK on success
*/
static NS_EXPORT nsresult
ConvertDOMWindowToDocShell(nsIDOMWindow* aDOMWindow,
ConvertDOMWindowToDocShell(nsIDOMWindowInternal* aDOMWindow,
nsIDocShell** aDocShell);
/** Locates named inner DOM window (frame) inside outer DOM window
@ -61,9 +61,9 @@ class mozXMLTermUtils
* @return NS_OK on success
*/
static NS_EXPORT nsresult
GetInnerDOMWindow(nsIDOMWindow* outerDOMWindow,
GetInnerDOMWindow(nsIDOMWindowInternal* outerDOMWindow,
const nsString& innerFrameName,
nsIDOMWindow** innerDOMWindow);
nsIDOMWindowInternal** innerDOMWindow);
/** Gets the scrollable view for presentation context
* @param aPresContext presentation context

2
extensions/xmlterm/base/mozXMLTerminal.cpp
Просмотреть файл

@ -377,7 +377,7 @@ NS_IMETHODIMP mozXMLTerminal::Activate(void)
return result;
}
nsCOMPtr<nsIDOMWindow> outerDOMWindow;
nsCOMPtr<nsIDOMWindowInternal> outerDOMWindow;
result = mozXMLTermUtils::ConvertDocShellToDOMWindow(mDocShell,
getter_AddRefs(outerDOMWindow));

8
gfx/src/gtk/nsDeviceContextSpecG.cpp
Просмотреть файл

@ -29,7 +29,7 @@
#include "prenv.h" /* for PR_GetEnv */
#include "nsIAppShellComponentImpl.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIServiceManager.h"
#include "nsIDialogParamBlock.h"
#include "nsINetSupportDialogService.h"
@ -144,8 +144,8 @@ NS_IMETHODIMP nsDeviceContextSpecGTK :: Init(PRBool aQuiet)
if (NS_SUCCEEDED(rv)) {
NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv);
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsIDOMWindow> hiddenWindow;
nsCOMPtr<nsIDOMWindow> mWindow;
nsCOMPtr<nsIDOMWindowInternal> hiddenWindow;
nsCOMPtr<nsIDOMWindowInternal> mWindow;
JSContext *jsContext;
rv = appShell->GetHiddenWindowAndJSContext(getter_AddRefs(hiddenWindow), &jsContext);
@ -160,7 +160,7 @@ NS_IMETHODIMP nsDeviceContextSpecGTK :: Init(PRBool aQuiet)
(const nsIID *) (&NS_GET_IID(nsIDialogParamBlock)),
(nsISupports *) ioParamBlock);
if (argv) {
nsCOMPtr<nsIDOMWindow> newWindow;
nsCOMPtr<nsIDOMWindowInternal> newWindow;
rv = hiddenWindow->OpenDialog(jsContext,
argv,

8
gfx/src/xlib/nsDeviceContextSpecXlib.cpp
Просмотреть файл

@ -29,7 +29,7 @@
#include "prenv.h" /* for PR_GetEnv */
#include "nsIAppShellComponentImpl.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIServiceManager.h"
#include "nsIDialogParamBlock.h"
#include "nsINetSupportDialogService.h"
@ -122,8 +122,8 @@ NS_IMETHODIMP nsDeviceContextSpecXlib::Init(PRBool aQuiet)
if (NS_SUCCEEDED(rv)) {
NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv);
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsIDOMWindow> hiddenWindow;
nsCOMPtr<nsIDOMWindow> mWindow;
nsCOMPtr<nsIDOMWindowInternal> hiddenWindow;
nsCOMPtr<nsIDOMWindowInternal> mWindow;
JSContext *jsContext;
rv = appShell->GetHiddenWindowAndJSContext(getter_AddRefs(hiddenWindow), &jsContext);
@ -138,7 +138,7 @@ NS_IMETHODIMP nsDeviceContextSpecXlib::Init(PRBool aQuiet)
(const nsIID *) (&NS_GET_IID(nsIDialogParamBlock)),
(nsISupports *) ioParamBlock);
if (argv) {
nsCOMPtr<nsIDOMWindow> newWindow;
nsCOMPtr<nsIDOMWindowInternal> newWindow;
rv = hiddenWindow->OpenDialog(jsContext,
argv,

2
layout/base/nsCSSFrameConstructor.cpp
Просмотреть файл

@ -80,7 +80,7 @@
#include "nsIBindingManager.h"
#include "nsIXBLBinding.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsPIDOMWindow.h"
#ifdef INCLUDE_XUL
#include "nsIDOMXULCommandDispatcher.h"

4
layout/base/nsDocumentViewer.cpp
Просмотреть файл

@ -27,7 +27,7 @@
#include "nsIContent.h"
#include "nsIContentViewerContainer.h"
#include "nsIDocumentViewer.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIImageGroup.h"
#include "nsIImageObserver.h"
@ -1838,7 +1838,7 @@ NS_IMETHODIMP nsDocViwerSelectionListener::NotifySelectionChanged(nsIDOMDocument
nsCOMPtr<nsIScriptGlobalObject> scriptGlobalObject;
theDoc->GetScriptGlobalObject(getter_AddRefs(scriptGlobalObject));
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(scriptGlobalObject);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(scriptGlobalObject);
if (!domWindow) return NS_ERROR_FAILURE;
domWindow->UpdateCommands(NS_ConvertToString("select"));

14
layout/base/nsPresShell.cpp
Просмотреть файл

@ -107,7 +107,7 @@
#include "nsIReflowCallback.h"
#include "nsIScriptGlobalObject.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsPIDOMWindow.h"
#ifdef INCLUDE_XUL
#include "nsIDOMXULDocument.h"
@ -1540,7 +1540,7 @@ static void CheckForFocus(nsIDocument* aDocument)
// of the command dispatcher moves into the embedding layer.
nsCOMPtr<nsIScriptGlobalObject> globalObject;
aDocument->GetScriptGlobalObject(getter_AddRefs(globalObject));
nsCOMPtr<nsIDOMWindow> rootWindow;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(globalObject);
ourWindow->GetPrivateRoot(getter_AddRefs(rootWindow));
nsCOMPtr<nsIDOMDocument> rootDocument;
@ -1554,7 +1554,7 @@ static void CheckForFocus(nsIDocument* aDocument)
if (commandDispatcher) {
// Suppress the command dispatcher.
commandDispatcher->SetSuppressFocus(PR_TRUE);
nsCOMPtr<nsIDOMWindow> focusedWindow;
nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
commandDispatcher->GetFocusedWindow(getter_AddRefs(focusedWindow));
// See if the command dispatcher is holding on to an orphan window.
@ -1571,7 +1571,7 @@ static void CheckForFocus(nsIDocument* aDocument)
}
}
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(ourWindow);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(ourWindow);
if (domWindow == focusedWindow) {
PRBool active;
commandDispatcher->GetActive(&active);
@ -1951,7 +1951,7 @@ PresShell::ScrollFrameIntoView(nsIFrame *aFrame){
nsCOMPtr<nsIDOMXULCommandDispatcher> commandDispatcher;
nsCOMPtr<nsIScriptGlobalObject> ourGlobal;
document->GetScriptGlobalObject(getter_AddRefs(ourGlobal));
nsCOMPtr<nsIDOMWindow> rootWindow;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(ourGlobal);
if(ourWindow) {
ourWindow->GetPrivateRoot(getter_AddRefs(rootWindow));
@ -2721,7 +2721,7 @@ PresShell::ScrollFrameIntoView(nsIFrame *aFrame,
nsCOMPtr<nsIDOMXULCommandDispatcher> commandDispatcher;
nsCOMPtr<nsIScriptGlobalObject> ourGlobal;
document->GetScriptGlobalObject(getter_AddRefs(ourGlobal));
nsCOMPtr<nsIDOMWindow> rootWindow;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(ourGlobal);
if(ourWindow) {
ourWindow->GetPrivateRoot(getter_AddRefs(rootWindow));
@ -2971,7 +2971,7 @@ PresShell::DoCopy()
// Now that we have copied, update the Paste menu item
nsCOMPtr<nsIScriptGlobalObject> globalObject;
doc->GetScriptGlobalObject(getter_AddRefs(globalObject));
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(globalObject);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(globalObject);
if (domWindow)
{
domWindow->UpdateCommands(NS_ConvertASCIItoUCS2("clipboard"));

14
layout/base/src/nsDocument.cpp
Просмотреть файл

@ -104,7 +104,7 @@
#include "nsIPrivateDOMImplementation.h"
#include "nsIInterfaceRequestor.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMElement.h"
#include "nsIAnonymousContentCreator.h"
@ -2409,7 +2409,7 @@ NS_IMETHODIMP
nsDocument::GetLocation(jsval* aLocation)
{
if (mScriptGlobalObject) {
nsCOMPtr<nsIDOMWindow> window(do_QueryInterface(mScriptGlobalObject));
nsCOMPtr<nsIDOMWindowInternal> window(do_QueryInterface(mScriptGlobalObject));
if(window) {
return window->GetLocation(aLocation);
}
@ -2421,7 +2421,7 @@ NS_IMETHODIMP
nsDocument::SetLocation(jsval aLocation)
{
if (mScriptGlobalObject) {
nsCOMPtr<nsIDOMWindow> window(do_QueryInterface(mScriptGlobalObject));
nsCOMPtr<nsIDOMWindowInternal> window(do_QueryInterface(mScriptGlobalObject));
if(window) {
return window->SetLocation(aLocation);
}
@ -2457,8 +2457,8 @@ nsDocument::GetDefaultView(nsIDOMAbstractView** aDefaultView)
nsCOMPtr<nsIInterfaceRequestor> ifrq(do_QueryInterface(container));
NS_ENSURE_TRUE(ifrq, NS_OK);
nsCOMPtr<nsIDOMWindow> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindow), getter_AddRefs(window));
nsCOMPtr<nsIDOMWindowInternal> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindowInternal), getter_AddRefs(window));
NS_ENSURE_TRUE(window, NS_OK);
window->QueryInterface(NS_GET_IID(nsIDOMAbstractView),
@ -2497,8 +2497,8 @@ nsDocument::GetPlugins(nsIDOMPluginArray** aPlugins)
nsCOMPtr<nsIInterfaceRequestor> ifrq(do_QueryInterface(container));
NS_ENSURE_TRUE(ifrq, NS_OK);
nsCOMPtr<nsIDOMWindow> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindow), getter_AddRefs(window));
nsCOMPtr<nsIDOMWindowInternal> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindowInternal), getter_AddRefs(window));
NS_ENSURE_TRUE(window, NS_OK);
nsCOMPtr<nsIDOMNavigator> navigator;

4
layout/base/src/nsDocumentViewer.cpp
Просмотреть файл

@ -27,7 +27,7 @@
#include "nsIContent.h"
#include "nsIContentViewerContainer.h"
#include "nsIDocumentViewer.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIImageGroup.h"
#include "nsIImageObserver.h"
@ -1838,7 +1838,7 @@ NS_IMETHODIMP nsDocViwerSelectionListener::NotifySelectionChanged(nsIDOMDocument
nsCOMPtr<nsIScriptGlobalObject> scriptGlobalObject;
theDoc->GetScriptGlobalObject(getter_AddRefs(scriptGlobalObject));
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(scriptGlobalObject);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(scriptGlobalObject);
if (!domWindow) return NS_ERROR_FAILURE;
domWindow->UpdateCommands(NS_ConvertToString("select"));

6
layout/events/src/nsDOMEvent.cpp
Просмотреть файл

@ -36,7 +36,7 @@
#include "nsIScrollableView.h"
#include "nsIDOMEventTarget.h"
#include "nsIInterfaceRequestor.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMAbstractView.h"
#include "prmem.h"
#include "nsLayoutAtoms.h"
@ -296,8 +296,8 @@ nsDOMEvent::GetView(nsIDOMAbstractView** aView)
nsCOMPtr<nsIInterfaceRequestor> ifrq(do_QueryInterface(container));
NS_ENSURE_TRUE(ifrq, NS_OK);
nsCOMPtr<nsIDOMWindow> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindow), getter_AddRefs(window));
nsCOMPtr<nsIDOMWindowInternal> window;
ifrq->GetInterface(NS_GET_IID(nsIDOMWindowInternal), getter_AddRefs(window));
NS_ENSURE_TRUE(window, NS_OK);
window->QueryInterface(NS_GET_IID(nsIDOMAbstractView), (void **)aView);

14
layout/events/src/nsEventStateManager.cpp
Просмотреть файл

@ -53,7 +53,7 @@
#include "nsIScriptGlobalObject.h"
#include "nsIPrivateDOMEvent.h"
#include "nsIGfxTextControlFrame.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsPIDOMWindow.h"
#include "nsIEnumerator.h"
#include "nsFrameTraversal.h"
@ -342,7 +342,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
nsCOMPtr<nsIScriptGlobalObject> ourGlobal;
gLastFocusedDocument->GetScriptGlobalObject(getter_AddRefs(ourGlobal));
nsCOMPtr<nsIDOMWindow> rootWindow;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(ourGlobal);
if(ourWindow) {
ourWindow->GetRootCommandDispatcher(gLastFocusedDocument, getter_AddRefs(commandDispatcher));
@ -406,7 +406,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
nsCOMPtr<nsIDOMXULCommandDispatcher> commandDispatcher;
nsCOMPtr<nsIDOMElement> focusedElement;
nsCOMPtr<nsIDOMWindow> focusedWindow;
nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
nsCOMPtr<nsIDOMXULDocument> xulDoc = do_QueryInterface(mDocument);
if (xulDoc) {
@ -432,7 +432,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
{
nsCOMPtr<nsPIDOMWindow> privateWindow = do_QueryInterface(focusedWindow);
if(privateWindow){
nsCOMPtr<nsIDOMWindow> privateRootWindow;
nsCOMPtr<nsIDOMWindowInternal> privateRootWindow;
privateWindow->GetPrivateRoot(getter_AddRefs(privateRootWindow));
if(privateRootWindow) {
nsCOMPtr<nsIDOMDocument> privateParentDoc;
@ -508,7 +508,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
// focused sub-window and sub-element for this top-level
// window.
nsCOMPtr<nsIDOMXULCommandDispatcher> commandDispatcher;
nsCOMPtr<nsIDOMWindow> rootWindow;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(ourGlobal);
if(ourWindow) {
ourWindow->GetPrivateRoot(getter_AddRefs(rootWindow));
@ -780,14 +780,14 @@ nsEventStateManager::ChangeTextSize(PRInt32 change)
{
nsCOMPtr<nsIScriptGlobalObject> ourGlobal;
gLastFocusedDocument->GetScriptGlobalObject(getter_AddRefs(ourGlobal));
nsCOMPtr<nsIDOMWindow> rootWindow;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(ourGlobal);
NS_ENSURE_TRUE(ourWindow, NS_ERROR_FAILURE);
ourWindow->GetPrivateRoot(getter_AddRefs(rootWindow));
NS_ENSURE_TRUE(rootWindow, NS_ERROR_FAILURE);
nsCOMPtr<nsIDOMWindow> windowContent;
nsCOMPtr<nsIDOMWindowInternal> windowContent;
rootWindow->Get_content(getter_AddRefs(windowContent));
NS_ENSURE_TRUE(windowContent, NS_ERROR_FAILURE);

6
layout/forms/nsFileControlFrame.cpp
Просмотреть файл

@ -51,7 +51,7 @@
#include "nsIStatefulFrame.h"
#include "nsISupportsPrimitives.h"
#include "nsIComponentManager.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIFilePicker.h"
#include "nsIDOMMouseEvent.h"
@ -251,7 +251,7 @@ nsFileControlFrame::MouseClick(nsIDOMEvent* aMouseEvent)
nsresult result;
// Get parent nsIDOMWindow object.
// Get parent nsIDOMWindowInternal object.
nsCOMPtr<nsIContent> content;
result = GetContent(getter_AddRefs(content));
if (!content)
@ -267,7 +267,7 @@ nsFileControlFrame::MouseClick(nsIDOMEvent* aMouseEvent)
if (!scriptGlobalObject)
return NS_FAILED(result) ? result : NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMWindow> parentWindow = do_QueryInterface(scriptGlobalObject);
nsCOMPtr<nsIDOMWindowInternal> parentWindow = do_QueryInterface(scriptGlobalObject);
if (!parentWindow)
return NS_ERROR_FAILURE;

14
layout/html/base/src/nsPresShell.cpp
Просмотреть файл

@ -107,7 +107,7 @@
#include "nsIReflowCallback.h"
#include "nsIScriptGlobalObject.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsPIDOMWindow.h"
#ifdef INCLUDE_XUL
#include "nsIDOMXULDocument.h"
@ -1540,7 +1540,7 @@ static void CheckForFocus(nsIDocument* aDocument)
// of the command dispatcher moves into the embedding layer.
nsCOMPtr<nsIScriptGlobalObject> globalObject;
aDocument->GetScriptGlobalObject(getter_AddRefs(globalObject));
nsCOMPtr<nsIDOMWindow> rootWindow;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(globalObject);
ourWindow->GetPrivateRoot(getter_AddRefs(rootWindow));
nsCOMPtr<nsIDOMDocument> rootDocument;
@ -1554,7 +1554,7 @@ static void CheckForFocus(nsIDocument* aDocument)
if (commandDispatcher) {
// Suppress the command dispatcher.
commandDispatcher->SetSuppressFocus(PR_TRUE);
nsCOMPtr<nsIDOMWindow> focusedWindow;
nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
commandDispatcher->GetFocusedWindow(getter_AddRefs(focusedWindow));
// See if the command dispatcher is holding on to an orphan window.
@ -1571,7 +1571,7 @@ static void CheckForFocus(nsIDocument* aDocument)
}
}
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(ourWindow);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(ourWindow);
if (domWindow == focusedWindow) {
PRBool active;
commandDispatcher->GetActive(&active);
@ -1951,7 +1951,7 @@ PresShell::ScrollFrameIntoView(nsIFrame *aFrame){
nsCOMPtr<nsIDOMXULCommandDispatcher> commandDispatcher;
nsCOMPtr<nsIScriptGlobalObject> ourGlobal;
document->GetScriptGlobalObject(getter_AddRefs(ourGlobal));
nsCOMPtr<nsIDOMWindow> rootWindow;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(ourGlobal);
if(ourWindow) {
ourWindow->GetPrivateRoot(getter_AddRefs(rootWindow));
@ -2721,7 +2721,7 @@ PresShell::ScrollFrameIntoView(nsIFrame *aFrame,
nsCOMPtr<nsIDOMXULCommandDispatcher> commandDispatcher;
nsCOMPtr<nsIScriptGlobalObject> ourGlobal;
document->GetScriptGlobalObject(getter_AddRefs(ourGlobal));
nsCOMPtr<nsIDOMWindow> rootWindow;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(ourGlobal);
if(ourWindow) {
ourWindow->GetPrivateRoot(getter_AddRefs(rootWindow));
@ -2971,7 +2971,7 @@ PresShell::DoCopy()
// Now that we have copied, update the Paste menu item
nsCOMPtr<nsIScriptGlobalObject> globalObject;
doc->GetScriptGlobalObject(getter_AddRefs(globalObject));
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(globalObject);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(globalObject);
if (domWindow)
{
domWindow->UpdateCommands(NS_ConvertASCIItoUCS2("clipboard"));

6
layout/html/content/src/nsHTMLImageElement.cpp
Просмотреть файл

@ -37,7 +37,7 @@
#include "nsIJSNativeInitializer.h"
#include "nsSize.h"
#include "nsIDocument.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMDocument.h"
#include "nsIScriptContext.h"
#include "nsIScriptGlobalObject.h"
@ -649,7 +649,7 @@ nsHTMLImageElement::GetCallerSourceURL(JSContext* cx,
nsCOMPtr<nsIScriptGlobalObject> global;
nsLayoutUtils::GetDynamicScriptGlobal(cx, getter_AddRefs(global));
if (global) {
nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(global);
nsCOMPtr<nsIDOMWindowInternal> window = do_QueryInterface(global);
if (window) {
nsCOMPtr<nsIDOMDocument> domDoc;
@ -763,7 +763,7 @@ nsHTMLImageElement::Initialize(JSContext* aContext,
nsLayoutUtils::GetStaticScriptGlobal(aContext, aObj,
getter_AddRefs(globalObject));;
if (globalObject) {
nsIDOMWindow* domWindow;
nsIDOMWindowInternal* domWindow;
result = globalObject->QueryInterface(kIDOMWindowIID, (void**)&domWindow);
if (NS_SUCCEEDED(result)) {
nsIDOMDocument* domDocument;

2
layout/html/content/src/nsHTMLSpacerElement.cpp
Просмотреть файл

@ -35,7 +35,7 @@
#include "nsIJSScriptObject.h"
#include "nsSize.h"
#include "nsIDocument.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMDocument.h"
#include "nsIScriptContext.h"
#include "nsIScriptGlobalObject.h"

4
layout/html/document/src/nsHTMLDocument.cpp
Просмотреть файл

@ -46,7 +46,7 @@
#include "nsIDOMComment.h"
#include "nsIDOMDOMImplementation.h"
#include "nsIDOMDocumentType.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMHTMLFormElement.h"
#include "nsIStreamListener.h"
#include "nsIURL.h"
@ -2007,7 +2007,7 @@ nsHTMLDocument::GetSourceDocumentURL(JSContext* cx,
nsCOMPtr<nsIScriptGlobalObject> global;
nsLayoutUtils::GetDynamicScriptGlobal(cx, getter_AddRefs(global));
if (global) {
nsCOMPtr<nsIDOMWindow> window(do_QueryInterface(global, &result));
nsCOMPtr<nsIDOMWindowInternal> window(do_QueryInterface(global, &result));
if (window) {
nsCOMPtr<nsIDOMDocument> document;

4
layout/html/forms/public/nsIFormSubmitObserver.h
Просмотреть файл

@ -32,7 +32,7 @@
#include "nsISupports.h"
#include "prtypes.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIURI.h"
class nsString;
@ -55,7 +55,7 @@ public:
* will be loaded in (form could have target attribute set)
* @param actionURL- URL to which the form will be submitted.
*/
NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindow* window, nsIURI* actionURL) = 0;
NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindowInternal* window, nsIURI* actionURL) = 0;
};

6
layout/html/forms/src/nsFileControlFrame.cpp
Просмотреть файл

@ -51,7 +51,7 @@
#include "nsIStatefulFrame.h"
#include "nsISupportsPrimitives.h"
#include "nsIComponentManager.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIFilePicker.h"
#include "nsIDOMMouseEvent.h"
@ -251,7 +251,7 @@ nsFileControlFrame::MouseClick(nsIDOMEvent* aMouseEvent)
nsresult result;
// Get parent nsIDOMWindow object.
// Get parent nsIDOMWindowInternal object.
nsCOMPtr<nsIContent> content;
result = GetContent(getter_AddRefs(content));
if (!content)
@ -267,7 +267,7 @@ nsFileControlFrame::MouseClick(nsIDOMEvent* aMouseEvent)
if (!scriptGlobalObject)
return NS_FAILED(result) ? result : NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMWindow> parentWindow = do_QueryInterface(scriptGlobalObject);
nsCOMPtr<nsIDOMWindowInternal> parentWindow = do_QueryInterface(scriptGlobalObject);
if (!parentWindow)
return NS_ERROR_FAILURE;

4
layout/html/forms/src/nsFormFrame.cpp
Просмотреть файл

@ -110,7 +110,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
// Security
#include "nsIScriptSecurityManager.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
static NS_DEFINE_CID(kPlatformCharsetCID, NS_PLATFORMCHARSET_CID);
@ -864,7 +864,7 @@ nsFormFrame::OnSubmit(nsIPresContext* aPresContext, nsIFrame* aFrame)
nsCOMPtr<nsIScriptGlobalObject> globalObject;
document->GetScriptGlobalObject(getter_AddRefs(globalObject));
nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(globalObject);
nsCOMPtr<nsIDOMWindowInternal> window = do_QueryInterface(globalObject);
for (theEnum->First(); theEnum->IsDone() != NS_OK; theEnum->Next()) {
result = theEnum->CurrentItem(getter_AddRefs(inst));

4
layout/html/forms/src/nsGfxTextControlFrame.cpp
Просмотреть файл

@ -46,7 +46,7 @@
#include "nsIFrameManager.h"
#include "nsIDOMHTMLInputElement.h"
#include "nsIDOMHTMLTextAreaElement.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIScrollbar.h"
#include "nsIScrollableFrame.h"
#include "nsIScriptGlobalObject.h"
@ -3539,7 +3539,7 @@ nsresult nsGfxTextControlFrame::UpdateTextControlCommands(const nsString& aComma
if (NS_FAILED(rv)) return rv;
if (!scriptGlobalObject) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(scriptGlobalObject);
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(scriptGlobalObject);
if (!domWindow) return NS_ERROR_FAILURE;
return domWindow->UpdateCommands(aCommand);

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше