popup blocker once again tolerates window.open targeted to _self, _top, et.al. reinstatement of bug 177526 (rev 1.557) messed up by rev 1.605, now bug 232933 r=bzbarsky,caillon

dom/src/base/nsGlobalWindow.cpp

@@ -3222,20 +3222,22 @@ PRBool GlobalWindowImpl::CheckOpenAllow(PRUint32 aAbuseLevel,
     nsAutoString name(aName);
     // _main is an IE target which should be case-insensitive but isn't
     // see bug 217886 for details
-    if (!name.IsEmpty() &&
-        !name.EqualsIgnoreCase("_top") &&
-        !name.EqualsIgnoreCase("_self") &&
-        !name.EqualsIgnoreCase("_content") &&
-        !name.Equals(NS_LITERAL_STRING("_main"))) {
-
-      nsCOMPtr<nsIWindowWatcher> wwatch =
-          do_GetService(NS_WINDOWWATCHER_CONTRACTID);
-      if (wwatch) {
-        nsCOMPtr<nsIDOMWindow> namedWindow;
-        wwatch->GetWindowByName(PromiseFlatString(aName).get(), this,
-                                getter_AddRefs(namedWindow));
-        if (namedWindow)
-          allowWindow = PR_TRUE;
+    if (!name.IsEmpty()) {
+      if (name.EqualsIgnoreCase("_top") ||
+          name.EqualsIgnoreCase("_self") ||
+          name.EqualsIgnoreCase("_content") ||
+          name.Equals(NS_LITERAL_STRING("_main")))
+        allowWindow = PR_TRUE;
+      else {
+        nsCOMPtr<nsIWindowWatcher> wwatch =
+            do_GetService(NS_WINDOWWATCHER_CONTRACTID);
+        if (wwatch) {
+          nsCOMPtr<nsIDOMWindow> namedWindow;
+          wwatch->GetWindowByName(PromiseFlatString(aName).get(), this,
+                                  getter_AddRefs(namedWindow));
+          if (namedWindow)
+            allowWindow = PR_TRUE;
+        }
       }
     }
   }