Bug 1179451 - Part 1: Rewrite some ternary operators as if/else. r=froydnj

2015-08-13 15:22:48 +03:00
parent 6c5d0d5488
commit c1bd5a2ced
15 changed files with 71 additions and 18 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -4338,7 +4338,10 @@ nsDocShell::GetDocument()
 nsPIDOMWindow*
 nsDocShell::GetWindow()
 {
-  return NS_SUCCEEDED(EnsureScriptEnvironment()) ? mScriptGlobal : nullptr;
+  if (NS_FAILED(EnsureScriptEnvironment())) {
+    return nullptr;
+  }
+  return mScriptGlobal;
 }

 NS_IMETHODIMP