Permalink
Browse files

Bug 670235 - Remove nsIDOMWindowInternal; r=sicking

  • Loading branch information...
1 parent 13c0653 commit 6e1be6cbce334ad1710c063a6fba0ec7f89cf64c @Ms2ger Ms2ger committed Jul 15, 2011
Showing with 624 additions and 783 deletions.
  1. +0 −5 accessible/src/atk/nsMaiInterfaceComponent.cpp
  2. +4 −6 accessible/src/base/nsCoreUtils.cpp
  3. +1 −1 accessible/src/html/nsHTMLImageAccessible.cpp
  4. +0 −2 accessible/src/html/nsHyperTextAccessible.cpp
  5. +1 −1 browser/base/content/test/browser_bug553455.js
  6. +2 −2 browser/base/content/test/browser_sanitize-download-history.js
  7. +1 −1 browser/components/migration/src/nsProfileMigrator.cpp
  8. +1 −1 browser/components/preferences/tests/browser_permissions.js
  9. +1 −1 browser/components/wintaskbar/test/browser_taskbar_preview.js
  10. +1 −1 browser/fuel/src/fuelApplication.js
  11. +1 −1 browser/fuel/test/browser_Application.js
  12. +1 −1 caps/src/nsScriptSecurityManager.cpp
  13. +7 −9 chrome/src/nsChromeRegistry.cpp
  14. +2 −2 chrome/src/nsChromeRegistry.h
  15. +2 −2 content/base/src/nsContentSink.cpp
  16. +3 −4 content/base/src/nsDocument.cpp
  17. +1 −0 content/base/src/nsStyledElement.cpp
  18. +2 −2 content/events/src/nsDOMUIEvent.cpp
  19. +2 −16 content/events/src/nsEventStateManager.cpp
  20. +3 −3 content/html/content/public/nsIFormSubmitObserver.idl
  21. +0 −1 content/html/content/src/nsHTMLImageElement.cpp
  22. +3 −4 content/html/content/src/nsHTMLInputElement.cpp
  23. +1 −1 content/html/document/src/nsHTMLDocument.cpp
  24. +1 −1 content/smil/nsDOMTimeEvent.cpp
  25. +2 −2 content/xbl/src/nsXBLPrototypeHandler.cpp
  26. +0 −1 content/xbl/src/nsXBLWindowKeyHandler.cpp
  27. +0 −1 content/xml/document/src/nsXMLContentSink.cpp
  28. +1 −1 content/xul/content/src/nsXULPopupListener.cpp
  29. +1 −1 content/xul/document/public/nsIController.idl
  30. +1 −1 content/xul/document/src/nsXULCommandDispatcher.cpp
  31. +4 −5 docshell/base/nsDSURIContentListener.cpp
  32. +10 −17 docshell/base/nsDocShell.cpp
  33. +3 −4 docshell/base/nsIContentViewerFile.idl
  34. +3 −2 dom/base/nsBarProps.cpp
  35. +3 −9 dom/base/nsDOMClassInfo.cpp
  36. +27 −37 dom/base/nsGlobalWindow.cpp
  37. +4 −8 dom/base/nsGlobalWindow.h
  38. +2 −2 dom/base/nsHistory.cpp
  39. +6 −6 dom/base/nsPIDOMWindow.h
  40. +3 −6 dom/base/nsWindowRoot.cpp
  41. +0 −1 dom/interfaces/base/Makefile.in
  42. +0 −1 dom/interfaces/base/domstubs.idl
  43. +3 −3 dom/interfaces/base/nsIDOMJSWindow.idl
  44. +253 −6 dom/interfaces/base/nsIDOMWindow.idl
  45. +0 −266 dom/interfaces/base/nsIDOMWindowInternal.idl
  46. +5 −18 editor/composer/src/nsEditingSession.cpp
  47. +2 −4 embedding/browser/webBrowser/nsWebBrowser.cpp
  48. +1 −1 embedding/browser/webBrowser/nsWebBrowser.h
  49. +2 −8 embedding/components/commandhandler/src/nsCommandManager.cpp
  50. +4 −4 embedding/components/printingui/src/mac/nsPrintProgress.cpp
  51. +3 −3 embedding/components/printingui/src/mac/nsPrintProgress.h
  52. +4 −4 embedding/components/printingui/src/os2/nsPrintProgress.cpp
  53. +3 −3 embedding/components/printingui/src/os2/nsPrintProgress.h
  54. +8 −13 embedding/components/printingui/src/os2/nsPrintingPromptService.cpp
  55. +4 −4 embedding/components/printingui/src/unixshared/nsPrintProgress.cpp
  56. +3 −3 embedding/components/printingui/src/unixshared/nsPrintProgress.h
  57. +7 −12 embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp
  58. +4 −4 embedding/components/printingui/src/win/nsPrintProgress.cpp
  59. +3 −3 embedding/components/printingui/src/win/nsPrintProgress.h
  60. +7 −12 embedding/components/printingui/src/win/nsPrintingPromptService.cpp
  61. +1 −1 embedding/components/windowwatcher/public/nsPIWindowWatcher.idl
  62. +1 −3 embedding/components/windowwatcher/src/nsWindowWatcher.cpp
  63. +1 −1 js/src/xpconnect/src/dom_quickstubs.qsconf
  64. +0 −5 layout/base/nsCSSFrameConstructor.cpp
  65. +3 −3 layout/base/nsDocumentViewer.cpp
  66. +1 −1 layout/forms/nsFileControlFrame.cpp
  67. +0 −1 layout/generic/nsCanvasFrame.cpp
  68. +0 −2 layout/inspector/public/inIFlasher.idl
  69. +2 −2 layout/inspector/src/inDOMUtils.cpp
  70. +2 −2 layout/inspector/src/inFlasher.cpp
  71. +3 −8 layout/inspector/src/inLayoutUtils.cpp
  72. +3 −3 layout/inspector/src/inLayoutUtils.h
  73. +3 −3 layout/printing/nsIPrintProgress.idl
  74. +3 −3 layout/printing/nsIPrintStatusFeedback.idl
  75. +2 −2 layout/svg/base/src/nsSVGOuterSVGFrame.cpp
  76. +0 −1 layout/xul/base/src/nsMenuBarFrame.cpp
  77. +1 −3 layout/xul/base/src/nsXULPopupManager.cpp
  78. +1 −1 mobile/components/HelperAppDialog.js
  79. +1 −1 netwerk/test/browser/browser_NetUtil.js
  80. +3 −3 security/manager/boot/src/nsSecureBrowserUIImpl.cpp
  81. +1 −1 security/manager/boot/src/nsSecureBrowserUIImpl.h
  82. +1 −1 security/manager/pki/src/nsFormSigningDialog.cpp
  83. +3 −9 security/manager/pki/src/nsNSSDialogHelper.cpp
  84. +2 −2 security/manager/pki/src/nsNSSDialogHelper.h
  85. +16 −24 security/manager/pki/src/nsNSSDialogs.cpp
  86. +3 −4 security/manager/ssl/src/nsNSSComponent.cpp
  87. +3 −2 toolkit/components/alerts/nsAlertsService.cpp
  88. +1 −1 toolkit/components/console/hudservice/HUDService.jsm
  89. +3 −3 toolkit/components/downloads/nsDownloadManager.cpp
  90. +1 −1 toolkit/components/places/PlacesUtils.jsm
  91. +1 −1 toolkit/components/remote/nsGTKRemoteService.cpp
  92. +1 −2 toolkit/components/startup/nsAppStartup.cpp
  93. +1 −1 toolkit/components/startup/tests/browser/browser_bug511456.js
  94. +1 −1 toolkit/components/startup/tests/browser/browser_bug537449.js
  95. +2 −2 toolkit/mozapps/downloads/nsHelperAppDlg.js
  96. +1 −1 toolkit/mozapps/downloads/tests/chrome/utils.js
  97. +1 −1 toolkit/mozapps/downloads/tests/unit/test_privatebrowsing_downloadLastDir.js
  98. +1 −1 toolkit/mozapps/extensions/AddonManager.jsm
  99. +6 −6 toolkit/mozapps/extensions/amIWebInstallListener.idl
  100. +2 −2 toolkit/mozapps/extensions/amIWebInstaller.idl
  101. +1 −1 toolkit/mozapps/extensions/test/browser/browser_bug567127.js
  102. +1 −1 toolkit/mozapps/extensions/test/browser/browser_dragdrop.js
  103. +1 −1 toolkit/mozapps/extensions/test/browser/head.js
  104. +1 −1 toolkit/mozapps/extensions/test/xpinstall/head.js
  105. +1 −1 toolkit/mozapps/update/test/chrome/utils.js
  106. +1 −1 toolkit/mozapps/update/test/unit/test_0081_prompt_uiAlreadyOpen.js
  107. +3 −2 toolkit/xre/nsAppRunner.cpp
  108. +3 −3 toolkit/xre/nsNativeAppSupportCocoa.mm
  109. +5 −5 toolkit/xre/nsNativeAppSupportOS2.cpp
  110. +3 −4 toolkit/xre/nsNativeAppSupportUnix.cpp
  111. +6 −6 toolkit/xre/nsNativeAppSupportWin.cpp
  112. +0 −1 uriloader/base/nsURILoader.cpp
  113. +5 −7 uriloader/exthandler/nsExternalHelperAppService.cpp
  114. +2 −2 uriloader/exthandler/nsExternalHelperAppService.h
  115. +2 −4 widget/src/xpwidgets/nsPrintOptionsImpl.cpp
  116. +5 −5 widget/tests/TestWinTSF.cpp
  117. +7 −7 xpcom/tests/SizeTest06.cpp
  118. +5 −5 xpfe/appshell/public/nsIAppShellService.idl
  119. +5 −4 xpfe/appshell/public/nsIWindowMediator.idl
  120. +9 −9 xpfe/appshell/src/nsAppShellService.cpp
  121. +3 −4 xpfe/appshell/src/nsAppShellWindowEnumerator.cpp
  122. +0 −1 xpfe/appshell/src/nsChromeTreeOwner.cpp
  123. +4 −4 xpfe/appshell/src/nsContentTreeOwner.cpp
  124. +4 −5 xpfe/appshell/src/nsWindowMediator.cpp
  125. +7 −7 xpfe/appshell/src/nsXULWindow.cpp
  126. +3 −3 xpfe/appshell/src/nsXULWindow.h
  127. +0 −1 xpfe/components/directory/nsDirectoryViewer.cpp
  128. +2 −2 xpfe/components/windowds/nsIWindowDataSource.idl
  129. +3 −4 xpfe/components/windowds/nsWindowDataSource.cpp
  130. +2 −2 xpinstall/public/nsIXPIInstallInfo.idl
  131. +1 −1 xpinstall/src/nsInstallTrigger.cpp
  132. +3 −3 xpinstall/src/nsJSInstallTriggerGlobal.cpp
  133. +3 −3 xpinstall/src/nsXPIInstallInfo.cpp
  134. +3 −3 xpinstall/src/nsXPIInstallInfo.h
  135. +6 −6 xpinstall/src/nsXPInstallManager.cpp
  136. +4 −4 xpinstall/src/nsXPInstallManager.h
  137. +1 −1 xpinstall/tests/harness.js
@@ -43,11 +43,6 @@
#include "nsAccUtils.h"
#include "nsCoreUtils.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsIInterfaceRequestorUtils.h"
-
void
componentInterfaceInitCB(AtkComponentIface *aIface)
{
@@ -46,9 +46,8 @@
#include "nsIDOMDocument.h"
#include "nsIDOMHTMLDocument.h"
#include "nsIDOMHTMLElement.h"
-#include "nsIDOMNodeList.h"
#include "nsIDOMRange.h"
-#include "nsIDOMWindowInternal.h"
+#include "nsIDOMWindow.h"
#include "nsIDOMXULElement.h"
#include "nsIDocShell.h"
#include "nsIContentViewer.h"
@@ -427,12 +426,11 @@ nsCoreUtils::GetScreenCoordsForWindow(nsINode *aNode)
nsCOMPtr<nsIDOMWindow> window;
domDoc->GetDefaultView(getter_AddRefs(window));
- nsCOMPtr<nsIDOMWindowInternal> windowInter(do_QueryInterface(window));
- if (!windowInter)
+ if (!window)
return coords;
- windowInter->GetScreenX(&coords.x);
- windowInter->GetScreenY(&coords.y);
+ window->GetScreenX(&coords.x);
+ window->GetScreenY(&coords.y);
return coords;
}
@@ -179,7 +179,7 @@ nsHTMLImageAccessible::DoAction(PRUint8 aIndex)
nsIDocument* document = mContent->GetOwnerDoc();
nsCOMPtr<nsPIDOMWindow> piWindow = document->GetWindow();
- nsCOMPtr<nsIDOMWindowInternal> win(do_QueryInterface(piWindow));
+ nsCOMPtr<nsIDOMWindow> win = do_QueryInterface(piWindow);
NS_ENSURE_TRUE(win, NS_ERROR_FAILURE);
nsCOMPtr<nsIDOMWindow> tmp;
return win->Open(longDesc, EmptyString(), EmptyString(),
@@ -49,10 +49,8 @@
#include "nsContentCID.h"
#include "nsIDOMCharacterData.h"
#include "nsIDOMDocument.h"
-#include "nsPIDOMWindow.h"
#include "nsIDOMRange.h"
#include "nsIDOMNSRange.h"
-#include "nsIDOMWindowInternal.h"
#include "nsIDOMXULDocument.h"
#include "nsIEditingSession.h"
#include "nsIEditor.h"
@@ -50,7 +50,7 @@ function wait_for_install_dialog(aCallback) {
Services.wm.removeListener(this);
var domwindow = aXULWindow.QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIDOMWindowInternal);
+ .getInterface(Ci.nsIDOMWindow);
waitForFocus(function() {
info("Saw install dialog");
is(domwindow.document.location.href, XPINSTALL_URL, "Should have seen the right window open");
@@ -141,7 +141,7 @@ function test()
// Close the UI if necessary
let win = Services.ww.getWindowByName("Sanatize", null);
- if (win && (win instanceof Ci.nsIDOMWindowInternal))
+ if (win && (win instanceof Ci.nsIDOMWindow))
win.close();
// Start the test when the sanitize window loads
@@ -154,7 +154,7 @@ function test()
// Let the methods that run onload finish before we test
let doTest = function() setTimeout(function() {
let win = Services.ww.getWindowByName("Sanitize", null)
- .QueryInterface(Ci.nsIDOMWindowInternal);
+ .QueryInterface(Ci.nsIDOMWindow);
for (let i = 0; i < tests.length; i++)
tests[i](win);
@@ -39,7 +39,7 @@
#include "nsIBrowserProfileMigrator.h"
#include "nsIComponentManager.h"
-#include "nsIDOMWindowInternal.h"
+#include "nsIDOMWindow.h"
#include "nsILocalFile.h"
#include "nsIObserverService.h"
#include "nsIProperties.h"
@@ -295,7 +295,7 @@ function addWindowListener(aURL, aCallback) {
Services.wm.removeListener(this);
var domwindow = aXULWindow.QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIDOMWindowInternal);
+ .getInterface(Ci.nsIDOMWindow);
waitForFocus(function() {
is(domwindow.document.location.href, aURL, "should have seen the right window open");
domwindow.close();
@@ -129,7 +129,7 @@ function test() {
}
function getCanvas(width, height) {
- let win = window.QueryInterface(Ci.nsIDOMWindowInternal);
+ let win = window.QueryInterface(Ci.nsIDOMWindow);
let doc = win.document;
let canvas = doc.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
canvas.width = width;
@@ -222,7 +222,7 @@ BrowserTab.prototype = {
if (!(aEvent.originalTarget instanceof Ci.nsIDOMDocument))
return;
- if (aEvent.originalTarget.defaultView instanceof Ci.nsIDOMWindowInternal &&
+ if (aEvent.originalTarget.defaultView instanceof Ci.nsIDOMWindow &&
aEvent.originalTarget.defaultView.frameElement)
return;
}
@@ -34,7 +34,7 @@ WindowOpenListener.prototype = {
this.window = window;
this.domwindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIDOMWindowInternal);
+ .getInterface(Ci.nsIDOMWindow);
this.domwindow.addEventListener("load", this, false);
},
@@ -2712,7 +2712,7 @@ nsScriptSecurityManager::CheckConfirmDialog(JSContext* cx, nsIPrincipal* aPrinci
nsIScriptContext *scriptContext = GetScriptContext(cx);
if (scriptContext)
{
- nsCOMPtr<nsIDOMWindowInternal> domWin =
+ nsCOMPtr<nsIDOMWindow> domWin =
do_QueryInterface(scriptContext->GetGlobalObject());
if (domWin)
domWin->GetPrompter(getter_AddRefs(prompter));
@@ -64,7 +64,7 @@
#include "nsIDOMElement.h"
#include "nsIDOMLocation.h"
#include "nsIDOMWindowCollection.h"
-#include "nsIDOMWindowInternal.h"
+#include "nsIDOMWindow.h"
#include "nsIIOService.h"
#include "nsIJARProtocolHandler.h"
#include "nsIObserverService.h"
@@ -351,7 +351,7 @@ nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult)
// theme stuff
-static void FlushSkinBindingsForWindow(nsIDOMWindowInternal* aWindow)
+static void FlushSkinBindingsForWindow(nsIDOMWindow* aWindow)
{
// Get the DOM document.
nsCOMPtr<nsIDOMDocument> domDocument;
@@ -383,7 +383,7 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins()
nsCOMPtr<nsISupports> protoWindow;
windowEnumerator->GetNext(getter_AddRefs(protoWindow));
if (protoWindow) {
- nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(protoWindow);
+ nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(protoWindow);
if (domWindow)
FlushSkinBindingsForWindow(domWindow);
}
@@ -398,7 +398,7 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins()
nsCOMPtr<nsISupports> protoWindow;
windowEnumerator->GetNext(getter_AddRefs(protoWindow));
if (protoWindow) {
- nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(protoWindow);
+ nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(protoWindow);
if (domWindow)
RefreshWindow(domWindow);
}
@@ -428,7 +428,7 @@ static PRBool IsChromeURI(nsIURI* aURI)
}
// XXXbsmedberg: move this to windowmediator
-nsresult nsChromeRegistry::RefreshWindow(nsIDOMWindowInternal* aWindow)
+nsresult nsChromeRegistry::RefreshWindow(nsIDOMWindow* aWindow)
{
// Deal with our subframes first.
nsCOMPtr<nsIDOMWindowCollection> frames;
@@ -439,8 +439,7 @@ nsresult nsChromeRegistry::RefreshWindow(nsIDOMWindowInternal* aWindow)
for (j = 0; j < length; j++) {
nsCOMPtr<nsIDOMWindow> childWin;
frames->Item(j, getter_AddRefs(childWin));
- nsCOMPtr<nsIDOMWindowInternal> childInt(do_QueryInterface(childWin));
- RefreshWindow(childInt);
+ RefreshWindow(childWin);
}
nsresult rv;
@@ -568,8 +567,7 @@ nsChromeRegistry::ReloadChrome()
nsCOMPtr<nsISupports> protoWindow;
rv = windowEnumerator->GetNext(getter_AddRefs(protoWindow));
if (NS_SUCCEEDED(rv)) {
- nsCOMPtr<nsIDOMWindowInternal> domWindow =
- do_QueryInterface(protoWindow);
+ nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(protoWindow);
if (domWindow) {
nsCOMPtr<nsIDOMLocation> location;
domWindow->GetLocation(getter_AddRefs(location));
@@ -63,7 +63,7 @@
#include "mozilla/Omnijar.h"
-class nsIDOMWindowInternal;
+class nsIDOMWindow;
class nsIURL;
// The chrome registry is actually split between nsChromeRegistryChrome and
@@ -130,7 +130,7 @@ class nsChromeRegistry : public nsIToolkitChromeRegistry,
nsresult SelectLocaleFromPref(nsIPrefBranch* prefs);
- static nsresult RefreshWindow(nsIDOMWindowInternal* aWindow);
+ static nsresult RefreshWindow(nsIDOMWindow* aWindow);
static nsresult GetProviderAndPath(nsIURL* aChromeURL,
nsACString& aProvider, nsACString& aPath);
@@ -66,7 +66,7 @@
#include "nsIContentViewer.h"
#include "nsIAtom.h"
#include "nsGkAtoms.h"
-#include "nsIDOMWindowInternal.h"
+#include "nsIDOMWindow.h"
#include "nsIPrincipal.h"
#include "nsIScriptGlobalObject.h"
#include "nsNetCID.h"
@@ -515,7 +515,7 @@ nsContentSink::ProcessHeaderData(nsIAtom* aHeader, const nsAString& aValue,
NS_ENSURE_TRUE(codebaseURI, rv);
nsCOMPtr<nsIPrompt> prompt;
- nsCOMPtr<nsIDOMWindowInternal> window (do_QueryInterface(mDocument->GetScriptGlobalObject()));
+ nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(mDocument->GetScriptGlobalObject());
if (window) {
window->GetPrompter(getter_AddRefs(prompt));
}
@@ -116,7 +116,7 @@
#include "nsIScriptSecurityManager.h"
#include "nsIPrincipal.h"
-#include "nsIDOMWindowInternal.h"
+#include "nsIDOMWindow.h"
#include "nsPIDOMWindow.h"
#include "nsIDOMElement.h"
#include "nsFocusManager.h"
@@ -5095,7 +5095,7 @@ nsDocument::GetLocation(nsIDOMLocation **_retval)
NS_ENSURE_ARG_POINTER(_retval);
*_retval = nsnull;
- nsCOMPtr<nsIDOMWindowInternal> w(do_QueryInterface(mScriptGlobalObject));
+ nsCOMPtr<nsIDOMWindow> w = do_QueryInterface(mScriptGlobalObject);
if (!w) {
return NS_OK;
@@ -5108,8 +5108,7 @@ Element*
nsIDocument::GetHtmlElement()
{
Element* rootElement = GetRootElement();
- if (rootElement && rootElement->Tag() == nsGkAtoms::html &&
- rootElement->IsHTML())
+ if (rootElement && rootElement->IsHTML(nsGkAtoms::html))
return rootElement;
return nsnull;
}
@@ -53,6 +53,7 @@
#include "nsIDOMMutationEvent.h"
#include "nsXULElement.h"
#include "nsIDOMSVGStylable.h"
+#include "nsContentUtils.h"
namespace css = mozilla::css;
@@ -43,7 +43,7 @@
#include "nsDOMUIEvent.h"
#include "nsIPresShell.h"
#include "nsIInterfaceRequestorUtils.h"
-#include "nsIDOMWindowInternal.h"
+#include "nsIDOMWindow.h"
#include "nsIDOMNode.h"
#include "nsIContent.h"
#include "nsContentUtils.h"
@@ -95,7 +95,7 @@ nsDOMUIEvent::nsDOMUIEvent(nsPresContext* aPresContext, nsGUIEvent* aEvent)
nsCOMPtr<nsISupports> container = mPresContext->GetContainer();
if (container)
{
- nsCOMPtr<nsIDOMWindowInternal> window = do_GetInterface(container);
+ nsCOMPtr<nsIDOMWindow> window = do_GetInterface(container);
if (window)
mView = do_QueryInterface(window);
}
@@ -65,27 +65,14 @@
#include "nsIComboboxControlFrame.h"
#include "nsIScrollableFrame.h"
#include "nsIDOMNSHTMLElement.h"
-#include "nsIDOMHTMLAnchorElement.h"
-#include "nsIDOMHTMLInputElement.h"
-#include "nsIDOMHTMLLabelElement.h"
-#include "nsIDOMHTMLSelectElement.h"
-#include "nsIDOMHTMLTextAreaElement.h"
-#include "nsIDOMHTMLAreaElement.h"
-#include "nsIDOMHTMLButtonElement.h"
-#include "nsIDOMHTMLObjectElement.h"
-#include "nsIDOMHTMLImageElement.h"
-#include "nsIDOMHTMLMapElement.h"
-#include "nsIDOMHTMLBodyElement.h"
#include "nsIDOMXULControlElement.h"
-#include "nsIDOMXULTextboxElement.h"
#include "nsINameSpaceManager.h"
#include "nsIBaseWindow.h"
#include "nsIView.h"
#include "nsIViewManager.h"
#include "nsISelection.h"
#include "nsFrameSelection.h"
#include "nsIPrivateDOMEvent.h"
-#include "nsIDOMWindowInternal.h"
#include "nsPIDOMWindow.h"
#include "nsPIWindowRoot.h"
#include "nsIEnumerator.h"
@@ -116,7 +103,6 @@
#include "nsDOMDragEvent.h"
#include "nsIDOMNSEditableElement.h"
-#include "nsIDOMRange.h"
#include "nsCaret.h"
#include "nsILookAndFeel.h"
#include "nsWidgetsCID.h"
@@ -218,7 +204,7 @@ PrintDocTree(nsIDocShellTreeItem* aParentItem, int aLevel)
if (cv)
cv->GetDOMDocument(getter_AddRefs(domDoc));
nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
- nsCOMPtr<nsIDOMWindowInternal> domwin = doc ? doc->GetWindow() : nsnull;
+ nsCOMPtr<nsIDOMWindow> domwin = doc ? doc->GetWindow() : nsnull;
nsIURI* uri = doc ? doc->GetDocumentURI() : nsnull;
printf("DS %p Type %s Cnt %d Doc %p DW %p EM %p%c",
@@ -2421,7 +2407,7 @@ nsEventStateManager::GetMarkupDocumentViewer(nsIMarkupDocumentViewer** aMv)
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(focusedWindow);
if(!ourWindow) return NS_ERROR_FAILURE;
- nsIDOMWindowInternal *rootWindow = ourWindow->GetPrivateRoot();
+ nsIDOMWindow *rootWindow = ourWindow->GetPrivateRoot();
if(!rootWindow) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMWindow> contentWindow;
@@ -41,14 +41,14 @@
#include "nsISupports.idl"
interface nsIDOMHTMLFormElement;
-interface nsIDOMWindowInternal;
+interface nsIDOMWindow;
interface nsIURI;
interface nsIArray;
-[scriptable, uuid(0b3cc84d-25d2-448e-ae71-746ee6e41c2d)]
+[scriptable, uuid(534ab795-6a99-4195-bfab-cfdd7836657d)]
interface nsIFormSubmitObserver: nsISupports
{
- void notify(in nsIDOMHTMLFormElement formNode, in nsIDOMWindowInternal window, in nsIURI actionURL, out boolean cancelSubmit);
+ void notify(in nsIDOMHTMLFormElement formNode, in nsIDOMWindow window, in nsIURI actionURL, out boolean cancelSubmit);
void notifyInvalidSubmit(in nsIDOMHTMLFormElement formNode,
in nsIArray invalidElements);
@@ -45,7 +45,6 @@
#include "nsIJSNativeInitializer.h"
#include "nsSize.h"
#include "nsIDocument.h"
-#include "nsIDOMWindowInternal.h"
#include "nsIDOMDocument.h"
#include "nsIScriptContext.h"
#include "nsIURL.h"
Oops, something went wrong.

0 comments on commit 6e1be6c

Please sign in to comment.