Bug 1241764: Replace nsPIDOMWindow with nsPIDOMWindowInner/Outer. r=mrbkap,smaug

This commit is contained in:
Kyle Huey
2016-01-30 09:05:36 -08:00
parent 366da70c9f
commit e95edb30a9
806 changed files with 4709 additions and 5300 deletions

View File

@@ -657,7 +657,7 @@ HTMLFormElement::DoSubmit(WidgetEvent* aEvent)
// XXXbz if the script global is that for an sXBL/XBL2 doc, it won't
// be a window...
nsPIDOMWindow *window = OwnerDoc()->GetWindow();
nsPIDOMWindowOuter *window = OwnerDoc()->GetWindow();
if (window) {
mSubmitPopupState = window->GetPopupControlState();
@@ -903,7 +903,7 @@ HTMLFormElement::DoSecureToInsecureSubmitCheck(nsIURI* aActionURL,
return NS_OK;
}
nsCOMPtr<nsPIDOMWindow> window = OwnerDoc()->GetWindow();
nsCOMPtr<nsPIDOMWindowOuter> window = OwnerDoc()->GetWindow();
if (!window) {
return NS_ERROR_FAILURE;
}
@@ -1007,7 +1007,7 @@ HTMLFormElement::NotifySubmitObservers(nsIURI* aActionURL,
// XXXbz what do the submit observers actually want? The window
// of the document this is shown in? Or something else?
// sXBL/XBL2 issue
nsCOMPtr<nsPIDOMWindow> window = OwnerDoc()->GetWindow();
nsCOMPtr<nsPIDOMWindowOuter> window = OwnerDoc()->GetWindow();
bool loop = true;
while (NS_SUCCEEDED(theEnum->HasMoreElements(&loop)) && loop) {
@@ -1017,7 +1017,7 @@ HTMLFormElement::NotifySubmitObservers(nsIURI* aActionURL,
do_QueryInterface(inst));
if (formSubmitObserver) {
rv = formSubmitObserver->Notify(this,
window,
window->GetCurrentInnerWindow(),
aActionURL,
aCancelSubmit);
NS_ENSURE_SUCCESS(rv, rv);