Skip to content
This repository has been archived by the owner on Oct 3, 2020. It is now read-only.

Commit

Permalink
Bug 670235 - Remove nsIDOMWindowInternal; r=sicking
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ms2ger
Ms2ger committed Jul 15, 2011
1 parent 13c0653 commit 6e1be6c
Show file tree
Hide file tree
Showing 137 changed files with 624 additions and 783 deletions.
5 changes: 0 additions & 5 deletions accessible/src/atk/nsMaiInterfaceComponent.cpp
View file
Expand Up @@ -43,11 +43,6 @@
#include "nsAccUtils.h" #include "nsAccUtils.h"
#include "nsCoreUtils.h" #include "nsCoreUtils.h"


#include "nsIDOMDocument.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDocShellTreeItem.h"
#include "nsIInterfaceRequestorUtils.h"

void void
componentInterfaceInitCB(AtkComponentIface *aIface) componentInterfaceInitCB(AtkComponentIface *aIface)
{ {
Expand Down
10 changes: 4 additions & 6 deletions accessible/src/base/nsCoreUtils.cpp
View file
Expand Up @@ -46,9 +46,8 @@
#include "nsIDOMDocument.h" #include "nsIDOMDocument.h"
#include "nsIDOMHTMLDocument.h" #include "nsIDOMHTMLDocument.h"
#include "nsIDOMHTMLElement.h" #include "nsIDOMHTMLElement.h"
#include "nsIDOMNodeList.h"
#include "nsIDOMRange.h" #include "nsIDOMRange.h"
#include "nsIDOMWindowInternal.h" #include "nsIDOMWindow.h"
#include "nsIDOMXULElement.h" #include "nsIDOMXULElement.h"
#include "nsIDocShell.h" #include "nsIDocShell.h"
#include "nsIContentViewer.h" #include "nsIContentViewer.h"
Expand Down Expand Up @@ -427,12 +426,11 @@ nsCoreUtils::GetScreenCoordsForWindow(nsINode *aNode)


nsCOMPtr<nsIDOMWindow> window; nsCOMPtr<nsIDOMWindow> window;
domDoc->GetDefaultView(getter_AddRefs(window)); domDoc->GetDefaultView(getter_AddRefs(window));
nsCOMPtr<nsIDOMWindowInternal> windowInter(do_QueryInterface(window)); if (!window)
if (!windowInter)
return coords; return coords;


windowInter->GetScreenX(&coords.x); window->GetScreenX(&coords.x);
windowInter->GetScreenY(&coords.y); window->GetScreenY(&coords.y);
return coords; return coords;
} }


Expand Down
2 changes: 1 addition & 1 deletion accessible/src/html/nsHTMLImageAccessible.cpp
View file
Expand Up @@ -179,7 +179,7 @@ nsHTMLImageAccessible::DoAction(PRUint8 aIndex)


nsIDocument* document = mContent->GetOwnerDoc(); nsIDocument* document = mContent->GetOwnerDoc();
nsCOMPtr<nsPIDOMWindow> piWindow = document->GetWindow(); nsCOMPtr<nsPIDOMWindow> piWindow = document->GetWindow();
nsCOMPtr<nsIDOMWindowInternal> win(do_QueryInterface(piWindow)); nsCOMPtr<nsIDOMWindow> win = do_QueryInterface(piWindow);
NS_ENSURE_TRUE(win, NS_ERROR_FAILURE); NS_ENSURE_TRUE(win, NS_ERROR_FAILURE);
nsCOMPtr<nsIDOMWindow> tmp; nsCOMPtr<nsIDOMWindow> tmp;
return win->Open(longDesc, EmptyString(), EmptyString(), return win->Open(longDesc, EmptyString(), EmptyString(),
Expand Down
2 changes: 0 additions & 2 deletions accessible/src/html/nsHyperTextAccessible.cpp
View file
Expand Up @@ -49,10 +49,8 @@
#include "nsContentCID.h" #include "nsContentCID.h"
#include "nsIDOMCharacterData.h" #include "nsIDOMCharacterData.h"
#include "nsIDOMDocument.h" #include "nsIDOMDocument.h"
#include "nsPIDOMWindow.h"
#include "nsIDOMRange.h" #include "nsIDOMRange.h"
#include "nsIDOMNSRange.h" #include "nsIDOMNSRange.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMXULDocument.h" #include "nsIDOMXULDocument.h"
#include "nsIEditingSession.h" #include "nsIEditingSession.h"
#include "nsIEditor.h" #include "nsIEditor.h"
Expand Down
2 changes: 1 addition & 1 deletion browser/base/content/test/browser_bug553455.js
View file
Expand Up @@ -50,7 +50,7 @@ function wait_for_install_dialog(aCallback) {
Services.wm.removeListener(this); Services.wm.removeListener(this);


var domwindow = aXULWindow.QueryInterface(Ci.nsIInterfaceRequestor) var domwindow = aXULWindow.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowInternal); .getInterface(Ci.nsIDOMWindow);
waitForFocus(function() { waitForFocus(function() {
info("Saw install dialog"); info("Saw install dialog");
is(domwindow.document.location.href, XPINSTALL_URL, "Should have seen the right window open"); is(domwindow.document.location.href, XPINSTALL_URL, "Should have seen the right window open");
Expand Down
4 changes: 2 additions & 2 deletions browser/base/content/test/browser_sanitize-download-history.js
View file
Expand Up @@ -141,7 +141,7 @@ function test()


// Close the UI if necessary // Close the UI if necessary
let win = Services.ww.getWindowByName("Sanatize", null); let win = Services.ww.getWindowByName("Sanatize", null);
if (win && (win instanceof Ci.nsIDOMWindowInternal)) if (win && (win instanceof Ci.nsIDOMWindow))
win.close(); win.close();


// Start the test when the sanitize window loads // Start the test when the sanitize window loads
Expand All @@ -154,7 +154,7 @@ function test()
// Let the methods that run onload finish before we test // Let the methods that run onload finish before we test
let doTest = function() setTimeout(function() { let doTest = function() setTimeout(function() {
let win = Services.ww.getWindowByName("Sanitize", null) let win = Services.ww.getWindowByName("Sanitize", null)
.QueryInterface(Ci.nsIDOMWindowInternal); .QueryInterface(Ci.nsIDOMWindow);


for (let i = 0; i < tests.length; i++) for (let i = 0; i < tests.length; i++)
tests[i](win); tests[i](win);
Expand Down
2 changes: 1 addition & 1 deletion browser/components/migration/src/nsProfileMigrator.cpp
View file
Expand Up @@ -39,7 +39,7 @@


#include "nsIBrowserProfileMigrator.h" #include "nsIBrowserProfileMigrator.h"
#include "nsIComponentManager.h" #include "nsIComponentManager.h"
#include "nsIDOMWindowInternal.h" #include "nsIDOMWindow.h"
#include "nsILocalFile.h" #include "nsILocalFile.h"
#include "nsIObserverService.h" #include "nsIObserverService.h"
#include "nsIProperties.h" #include "nsIProperties.h"
Expand Down
2 changes: 1 addition & 1 deletion browser/components/preferences/tests/browser_permissions.js
View file
Expand Up @@ -295,7 +295,7 @@ function addWindowListener(aURL, aCallback) {
Services.wm.removeListener(this); Services.wm.removeListener(this);


var domwindow = aXULWindow.QueryInterface(Ci.nsIInterfaceRequestor) var domwindow = aXULWindow.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowInternal); .getInterface(Ci.nsIDOMWindow);
waitForFocus(function() { waitForFocus(function() {
is(domwindow.document.location.href, aURL, "should have seen the right window open"); is(domwindow.document.location.href, aURL, "should have seen the right window open");
domwindow.close(); domwindow.close();
Expand Down
2 changes: 1 addition & 1 deletion browser/components/wintaskbar/test/browser_taskbar_preview.js
View file
Expand Up @@ -129,7 +129,7 @@ function test() {
} }


function getCanvas(width, height) { function getCanvas(width, height) {
let win = window.QueryInterface(Ci.nsIDOMWindowInternal); let win = window.QueryInterface(Ci.nsIDOMWindow);
let doc = win.document; let doc = win.document;
let canvas = doc.createElementNS("http://www.w3.org/1999/xhtml", "canvas"); let canvas = doc.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
canvas.width = width; canvas.width = width;
Expand Down
2 changes: 1 addition & 1 deletion browser/fuel/src/fuelApplication.js
View file
Expand Up @@ -222,7 +222,7 @@ BrowserTab.prototype = {
if (!(aEvent.originalTarget instanceof Ci.nsIDOMDocument)) if (!(aEvent.originalTarget instanceof Ci.nsIDOMDocument))
return; return;


if (aEvent.originalTarget.defaultView instanceof Ci.nsIDOMWindowInternal && if (aEvent.originalTarget.defaultView instanceof Ci.nsIDOMWindow &&
aEvent.originalTarget.defaultView.frameElement) aEvent.originalTarget.defaultView.frameElement)
return; return;
} }
Expand Down
2 changes: 1 addition & 1 deletion browser/fuel/test/browser_Application.js
View file
Expand Up @@ -34,7 +34,7 @@ WindowOpenListener.prototype = {


this.window = window; this.window = window;
this.domwindow = window.QueryInterface(Ci.nsIInterfaceRequestor) this.domwindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowInternal); .getInterface(Ci.nsIDOMWindow);
this.domwindow.addEventListener("load", this, false); this.domwindow.addEventListener("load", this, false);
}, },


Expand Down
2 changes: 1 addition & 1 deletion caps/src/nsScriptSecurityManager.cpp
View file
Expand Up @@ -2712,7 +2712,7 @@ nsScriptSecurityManager::CheckConfirmDialog(JSContext* cx, nsIPrincipal* aPrinci
nsIScriptContext *scriptContext = GetScriptContext(cx); nsIScriptContext *scriptContext = GetScriptContext(cx);
if (scriptContext) if (scriptContext)
{ {
nsCOMPtr<nsIDOMWindowInternal> domWin = nsCOMPtr<nsIDOMWindow> domWin =
do_QueryInterface(scriptContext->GetGlobalObject()); do_QueryInterface(scriptContext->GetGlobalObject());
if (domWin) if (domWin)
domWin->GetPrompter(getter_AddRefs(prompter)); domWin->GetPrompter(getter_AddRefs(prompter));
Expand Down
16 changes: 7 additions & 9 deletions chrome/src/nsChromeRegistry.cpp
View file
Expand Up @@ -64,7 +64,7 @@
#include "nsIDOMElement.h" #include "nsIDOMElement.h"
#include "nsIDOMLocation.h" #include "nsIDOMLocation.h"
#include "nsIDOMWindowCollection.h" #include "nsIDOMWindowCollection.h"
#include "nsIDOMWindowInternal.h" #include "nsIDOMWindow.h"
#include "nsIIOService.h" #include "nsIIOService.h"
#include "nsIJARProtocolHandler.h" #include "nsIJARProtocolHandler.h"
#include "nsIObserverService.h" #include "nsIObserverService.h"
Expand Down Expand Up @@ -351,7 +351,7 @@ nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult)
// theme stuff // theme stuff




static void FlushSkinBindingsForWindow(nsIDOMWindowInternal* aWindow) static void FlushSkinBindingsForWindow(nsIDOMWindow* aWindow)
{ {
// Get the DOM document. // Get the DOM document.
nsCOMPtr<nsIDOMDocument> domDocument; nsCOMPtr<nsIDOMDocument> domDocument;
Expand Down Expand Up @@ -383,7 +383,7 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins()
nsCOMPtr<nsISupports> protoWindow; nsCOMPtr<nsISupports> protoWindow;
windowEnumerator->GetNext(getter_AddRefs(protoWindow)); windowEnumerator->GetNext(getter_AddRefs(protoWindow));
if (protoWindow) { if (protoWindow) {
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(protoWindow); nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(protoWindow);
if (domWindow) if (domWindow)
FlushSkinBindingsForWindow(domWindow); FlushSkinBindingsForWindow(domWindow);
} }
Expand All @@ -398,7 +398,7 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins()
nsCOMPtr<nsISupports> protoWindow; nsCOMPtr<nsISupports> protoWindow;
windowEnumerator->GetNext(getter_AddRefs(protoWindow)); windowEnumerator->GetNext(getter_AddRefs(protoWindow));
if (protoWindow) { if (protoWindow) {
nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(protoWindow); nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(protoWindow);
if (domWindow) if (domWindow)
RefreshWindow(domWindow); RefreshWindow(domWindow);
} }
Expand Down Expand Up @@ -428,7 +428,7 @@ static PRBool IsChromeURI(nsIURI* aURI)
} }


// XXXbsmedberg: move this to windowmediator // XXXbsmedberg: move this to windowmediator
nsresult nsChromeRegistry::RefreshWindow(nsIDOMWindowInternal* aWindow) nsresult nsChromeRegistry::RefreshWindow(nsIDOMWindow* aWindow)
{ {
// Deal with our subframes first. // Deal with our subframes first.
nsCOMPtr<nsIDOMWindowCollection> frames; nsCOMPtr<nsIDOMWindowCollection> frames;
Expand All @@ -439,8 +439,7 @@ nsresult nsChromeRegistry::RefreshWindow(nsIDOMWindowInternal* aWindow)
for (j = 0; j < length; j++) { for (j = 0; j < length; j++) {
nsCOMPtr<nsIDOMWindow> childWin; nsCOMPtr<nsIDOMWindow> childWin;
frames->Item(j, getter_AddRefs(childWin)); frames->Item(j, getter_AddRefs(childWin));
nsCOMPtr<nsIDOMWindowInternal> childInt(do_QueryInterface(childWin)); RefreshWindow(childWin);
RefreshWindow(childInt);
} }


nsresult rv; nsresult rv;
Expand Down Expand Up @@ -568,8 +567,7 @@ nsChromeRegistry::ReloadChrome()
nsCOMPtr<nsISupports> protoWindow; nsCOMPtr<nsISupports> protoWindow;
rv = windowEnumerator->GetNext(getter_AddRefs(protoWindow)); rv = windowEnumerator->GetNext(getter_AddRefs(protoWindow));
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsIDOMWindowInternal> domWindow = nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(protoWindow);
do_QueryInterface(protoWindow);
if (domWindow) { if (domWindow) {
nsCOMPtr<nsIDOMLocation> location; nsCOMPtr<nsIDOMLocation> location;
domWindow->GetLocation(getter_AddRefs(location)); domWindow->GetLocation(getter_AddRefs(location));
Expand Down
4 changes: 2 additions & 2 deletions chrome/src/nsChromeRegistry.h
View file
Expand Up @@ -63,7 +63,7 @@


#include "mozilla/Omnijar.h" #include "mozilla/Omnijar.h"


class nsIDOMWindowInternal; class nsIDOMWindow;
class nsIURL; class nsIURL;


// The chrome registry is actually split between nsChromeRegistryChrome and // The chrome registry is actually split between nsChromeRegistryChrome and
Expand Down Expand Up @@ -130,7 +130,7 @@ class nsChromeRegistry : public nsIToolkitChromeRegistry,


nsresult SelectLocaleFromPref(nsIPrefBranch* prefs); nsresult SelectLocaleFromPref(nsIPrefBranch* prefs);


static nsresult RefreshWindow(nsIDOMWindowInternal* aWindow); static nsresult RefreshWindow(nsIDOMWindow* aWindow);
static nsresult GetProviderAndPath(nsIURL* aChromeURL, static nsresult GetProviderAndPath(nsIURL* aChromeURL,
nsACString& aProvider, nsACString& aPath); nsACString& aProvider, nsACString& aPath);


Expand Down
4 changes: 2 additions & 2 deletions content/base/src/nsContentSink.cpp
View file
Expand Up @@ -66,7 +66,7 @@
#include "nsIContentViewer.h" #include "nsIContentViewer.h"
#include "nsIAtom.h" #include "nsIAtom.h"
#include "nsGkAtoms.h" #include "nsGkAtoms.h"
#include "nsIDOMWindowInternal.h" #include "nsIDOMWindow.h"
#include "nsIPrincipal.h" #include "nsIPrincipal.h"
#include "nsIScriptGlobalObject.h" #include "nsIScriptGlobalObject.h"
#include "nsNetCID.h" #include "nsNetCID.h"
Expand Down Expand Up @@ -515,7 +515,7 @@ nsContentSink::ProcessHeaderData(nsIAtom* aHeader, const nsAString& aValue,
NS_ENSURE_TRUE(codebaseURI, rv); NS_ENSURE_TRUE(codebaseURI, rv);


nsCOMPtr<nsIPrompt> prompt; nsCOMPtr<nsIPrompt> prompt;
nsCOMPtr<nsIDOMWindowInternal> window (do_QueryInterface(mDocument->GetScriptGlobalObject())); nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(mDocument->GetScriptGlobalObject());
if (window) { if (window) {
window->GetPrompter(getter_AddRefs(prompt)); window->GetPrompter(getter_AddRefs(prompt));
} }
Expand Down
7 changes: 3 additions & 4 deletions content/base/src/nsDocument.cpp
View file
Expand Up @@ -116,7 +116,7 @@
#include "nsIScriptSecurityManager.h" #include "nsIScriptSecurityManager.h"
#include "nsIPrincipal.h" #include "nsIPrincipal.h"


#include "nsIDOMWindowInternal.h" #include "nsIDOMWindow.h"
#include "nsPIDOMWindow.h" #include "nsPIDOMWindow.h"
#include "nsIDOMElement.h" #include "nsIDOMElement.h"
#include "nsFocusManager.h" #include "nsFocusManager.h"
Expand Down Expand Up @@ -5095,7 +5095,7 @@ nsDocument::GetLocation(nsIDOMLocation **_retval)
NS_ENSURE_ARG_POINTER(_retval); NS_ENSURE_ARG_POINTER(_retval);
*_retval = nsnull; *_retval = nsnull;


nsCOMPtr<nsIDOMWindowInternal> w(do_QueryInterface(mScriptGlobalObject)); nsCOMPtr<nsIDOMWindow> w = do_QueryInterface(mScriptGlobalObject);


if (!w) { if (!w) {
return NS_OK; return NS_OK;
Expand All @@ -5108,8 +5108,7 @@ Element*
nsIDocument::GetHtmlElement() nsIDocument::GetHtmlElement()
{ {
Element* rootElement = GetRootElement(); Element* rootElement = GetRootElement();
if (rootElement && rootElement->Tag() == nsGkAtoms::html && if (rootElement && rootElement->IsHTML(nsGkAtoms::html))
rootElement->IsHTML())
return rootElement; return rootElement;
return nsnull; return nsnull;
} }
Expand Down
1 change: 1 addition & 0 deletions content/base/src/nsStyledElement.cpp
View file
Expand Up @@ -53,6 +53,7 @@
#include "nsIDOMMutationEvent.h" #include "nsIDOMMutationEvent.h"
#include "nsXULElement.h" #include "nsXULElement.h"
#include "nsIDOMSVGStylable.h" #include "nsIDOMSVGStylable.h"
#include "nsContentUtils.h"


namespace css = mozilla::css; namespace css = mozilla::css;


Expand Down
4 changes: 2 additions & 2 deletions content/events/src/nsDOMUIEvent.cpp
View file
Expand Up @@ -43,7 +43,7 @@
#include "nsDOMUIEvent.h" #include "nsDOMUIEvent.h"
#include "nsIPresShell.h" #include "nsIPresShell.h"
#include "nsIInterfaceRequestorUtils.h" #include "nsIInterfaceRequestorUtils.h"
#include "nsIDOMWindowInternal.h" #include "nsIDOMWindow.h"
#include "nsIDOMNode.h" #include "nsIDOMNode.h"
#include "nsIContent.h" #include "nsIContent.h"
#include "nsContentUtils.h" #include "nsContentUtils.h"
Expand Down Expand Up @@ -95,7 +95,7 @@ nsDOMUIEvent::nsDOMUIEvent(nsPresContext* aPresContext, nsGUIEvent* aEvent)
nsCOMPtr<nsISupports> container = mPresContext->GetContainer(); nsCOMPtr<nsISupports> container = mPresContext->GetContainer();
if (container) if (container)
{ {
nsCOMPtr<nsIDOMWindowInternal> window = do_GetInterface(container); nsCOMPtr<nsIDOMWindow> window = do_GetInterface(container);
if (window) if (window)
mView = do_QueryInterface(window); mView = do_QueryInterface(window);
} }
Expand Down
18 changes: 2 additions & 16 deletions content/events/src/nsEventStateManager.cpp
View file
Expand Up @@ -65,27 +65,14 @@
#include "nsIComboboxControlFrame.h" #include "nsIComboboxControlFrame.h"
#include "nsIScrollableFrame.h" #include "nsIScrollableFrame.h"
#include "nsIDOMNSHTMLElement.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 "nsIDOMXULControlElement.h"
#include "nsIDOMXULTextboxElement.h"
#include "nsINameSpaceManager.h" #include "nsINameSpaceManager.h"
#include "nsIBaseWindow.h" #include "nsIBaseWindow.h"
#include "nsIView.h" #include "nsIView.h"
#include "nsIViewManager.h" #include "nsIViewManager.h"
#include "nsISelection.h" #include "nsISelection.h"
#include "nsFrameSelection.h" #include "nsFrameSelection.h"
#include "nsIPrivateDOMEvent.h" #include "nsIPrivateDOMEvent.h"
#include "nsIDOMWindowInternal.h"
#include "nsPIDOMWindow.h" #include "nsPIDOMWindow.h"
#include "nsPIWindowRoot.h" #include "nsPIWindowRoot.h"
#include "nsIEnumerator.h" #include "nsIEnumerator.h"
Expand Down Expand Up @@ -116,7 +103,6 @@
#include "nsDOMDragEvent.h" #include "nsDOMDragEvent.h"
#include "nsIDOMNSEditableElement.h" #include "nsIDOMNSEditableElement.h"


#include "nsIDOMRange.h"
#include "nsCaret.h" #include "nsCaret.h"
#include "nsILookAndFeel.h" #include "nsILookAndFeel.h"
#include "nsWidgetsCID.h" #include "nsWidgetsCID.h"
Expand Down Expand Up @@ -218,7 +204,7 @@ PrintDocTree(nsIDocShellTreeItem* aParentItem, int aLevel)
if (cv) if (cv)
cv->GetDOMDocument(getter_AddRefs(domDoc)); cv->GetDOMDocument(getter_AddRefs(domDoc));
nsCOMPtr<nsIDocument> doc = do_QueryInterface(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; nsIURI* uri = doc ? doc->GetDocumentURI() : nsnull;


printf("DS %p Type %s Cnt %d Doc %p DW %p EM %p%c", printf("DS %p Type %s Cnt %d Doc %p DW %p EM %p%c",
Expand Down Expand Up @@ -2421,7 +2407,7 @@ nsEventStateManager::GetMarkupDocumentViewer(nsIMarkupDocumentViewer** aMv)
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(focusedWindow); nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(focusedWindow);
if(!ourWindow) return NS_ERROR_FAILURE; if(!ourWindow) return NS_ERROR_FAILURE;


nsIDOMWindowInternal *rootWindow = ourWindow->GetPrivateRoot(); nsIDOMWindow *rootWindow = ourWindow->GetPrivateRoot();
if(!rootWindow) return NS_ERROR_FAILURE; if(!rootWindow) return NS_ERROR_FAILURE;


nsCOMPtr<nsIDOMWindow> contentWindow; nsCOMPtr<nsIDOMWindow> contentWindow;
Expand Down
6 changes: 3 additions & 3 deletions content/html/content/public/nsIFormSubmitObserver.idl
View file
Expand Up @@ -41,14 +41,14 @@
#include "nsISupports.idl" #include "nsISupports.idl"


interface nsIDOMHTMLFormElement; interface nsIDOMHTMLFormElement;
interface nsIDOMWindowInternal; interface nsIDOMWindow;
interface nsIURI; interface nsIURI;
interface nsIArray; interface nsIArray;


[scriptable, uuid(0b3cc84d-25d2-448e-ae71-746ee6e41c2d)] [scriptable, uuid(534ab795-6a99-4195-bfab-cfdd7836657d)]
interface nsIFormSubmitObserver: nsISupports 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, void notifyInvalidSubmit(in nsIDOMHTMLFormElement formNode,
in nsIArray invalidElements); in nsIArray invalidElements);
Expand Down
1 change: 0 additions & 1 deletion content/html/content/src/nsHTMLImageElement.cpp
View file
Expand Up @@ -45,7 +45,6 @@
#include "nsIJSNativeInitializer.h" #include "nsIJSNativeInitializer.h"
#include "nsSize.h" #include "nsSize.h"
#include "nsIDocument.h" #include "nsIDocument.h"
#include "nsIDOMWindowInternal.h"
#include "nsIDOMDocument.h" #include "nsIDOMDocument.h"
#include "nsIScriptContext.h" #include "nsIScriptContext.h"
#include "nsIURL.h" #include "nsIURL.h"
Expand Down

0 comments on commit 6e1be6c

Please sign in to comment.