mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-04 21:18:35 +00:00
Fixed the merge.
This commit is contained in:
parent
9e5b4606dd
commit
79ca59ef74
@ -118,9 +118,6 @@ nsDOMWindowList::NamedItem(const nsString& aName, nsIDOMWindow** aReturn)
|
||||
nsCOMPtr<nsIScriptGlobalObject> globalObject(do_GetInterface(item));
|
||||
if (NS_WARN_IF_FALSE(globalObject, "Couldn't get to the globalObject")) {
|
||||
*aReturn = nsnull;
|
||||
NS_ASSERTION(globalObject != nsnull, "Couldn't get to the globalObject");
|
||||
if (globalObject) {
|
||||
CallQueryInterface(globalObject.get(), aReturn);
|
||||
}
|
||||
else {
|
||||
CallQueryInterface(globalObject.get(), aReturn);
|
||||
|
Loading…
x
Reference in New Issue
Block a user