Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-27 20:25:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1524361 - Remove unnecessary warning from OpenInternal return codepath, r=smaug

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D18557

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nika Layzell 2019-02-05 00:03:28 +00:00
parent edbdb185d6
commit f7a1ca20a5
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom/base/nsGlobalWindowOuter.cpp
View File

@ -7208,13 +7208,8 @@ nsresult nsGlobalWindowOuter::OpenInternal(
MaybeAllowStorageForOpenedWindow(uri);
}
NS_ENSURE_TRUE(domReturn, NS_OK);
nsCOMPtr<nsPIDOMWindowOuter> outerReturn =
nsPIDOMWindowOuter::From(domReturn);
outerReturn.swap(*aReturn);
if (aDoJSFixups) {
nsCOMPtr<nsIDOMChromeWindow> chrome_win(do_QueryInterface(*aReturn));
if (domReturn && aDoJSFixups) {
nsCOMPtr<nsIDOMChromeWindow> chrome_win(do_QueryInterface(domReturn));
if (!chrome_win) {
// A new non-chrome window was created from a call to
// window.open() from JavaScript, make sure there's a document in
@ -7224,12 +7219,13 @@ nsresult nsGlobalWindowOuter::OpenInternal(
// XXXbz should this just use EnsureInnerWindow()?
// Force document creation.
nsCOMPtr<Document> doc = (*aReturn)->GetDoc();
nsCOMPtr<Document> doc = nsPIDOMWindowOuter::From(domReturn)->GetDoc();
Unused << doc;
}
}
return rv;
*aReturn = do_AddRef(nsPIDOMWindowOuter::From(domReturn)).take();
return NS_OK;
}
void nsGlobalWindowOuter::MaybeAllowStorageForOpenedWindow(nsIURI* aURI) {