corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
dom/plugins/base/nsNPAPIPlugin.cpp
View File

@@ -533,7 +533,7 @@ GetChannelFromNPP(NPP npp)
nsCOMPtr<nsIDocument> doc = GetDocumentFromNPP(npp);
if (!doc)
return nullptr;
nsCOMPtr<nsPIDOMWindow> domwindow = doc->GetWindow();
nsCOMPtr<nsPIDOMWindowOuter> domwindow = doc->GetWindow();
nsCOMPtr<nsIChannel> channel;
if (domwindow) {
nsCOMPtr<nsIDocShell> docShell = domwindow->GetDocShell();
@@ -1058,11 +1058,11 @@ _getwindowobject(NPP npp)
// we don't know what the plugin will do with it).
nsIDocument* doc = GetDocumentFromNPP(npp);
NS_ENSURE_TRUE(doc, nullptr);
nsCOMPtr<nsPIDOMWindow> outer = do_QueryInterface(doc->GetWindow());
nsCOMPtr<nsPIDOMWindowOuter> outer = doc->GetWindow();
NS_ENSURE_TRUE(outer, nullptr);
AutoJSContext cx;
JS::Rooted<JSObject*> global(cx, static_cast<nsGlobalWindow*>(outer.get())->GetGlobalJSObject());
JS::Rooted<JSObject*> global(cx, nsGlobalWindow::Cast(outer)->GetGlobalJSObject());
return nsJSObjWrapper::GetNewOrUsed(npp, cx, global);
}
@@ -1350,7 +1350,7 @@ _evaluate(NPP npp, NPObject* npobj, NPString *script, NPVariant *result)
nsIDocument *doc = GetDocumentFromNPP(npp);
NS_ENSURE_TRUE(doc, false);
nsGlobalWindow* win = static_cast<nsGlobalWindow*>(doc->GetInnerWindow());
nsGlobalWindow* win = nsGlobalWindow::Cast(doc->GetInnerWindow());
if (NS_WARN_IF(!win || !win->FastGetGlobalJSObject())) {
return false;
}