Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-09 21:33:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1067340 - Don't use nsIDOMWindowUtils in the CSP code, because it's not meant to be used from C++; r=geekboy

Browse Source
This commit is contained in:
Ehsan Akhgari 2014-09-17 17:55:43 -04:00
parent cff5b616df
commit 5bab27d516
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
content/base/src/nsCSPContext.cpp
View File

@ -519,18 +519,14 @@ getInnerWindowID(nsIRequest* aRequest) {
return 0;
}
uint64_t id = 0;
nsCOMPtr<nsIDOMWindowUtils> du = do_GetInterface(window);
if (!du) {
nsCOMPtr<nsPIDOMWindow> pwindow = do_QueryInterface(window);
if (!pwindow) {
return 0;
}
rv = du->GetCurrentInnerWindowID(&id);
if (NS_FAILED(rv)) {
return 0;
}
nsPIDOMWindow* inner = pwindow->IsInnerWindow() ? pwindow.get() : pwindow->GetCurrentInnerWindow();
return id;
return inner->WindowID();
}
NS_IMETHODIMP