From c4c1b82bb793657e79cd5c1f218f398a4f259e6d Mon Sep 17 00:00:00 2001
From: Neil Deakin <neil@mozilla.com>
Date: Wed, 2 Dec 2015 09:34:42 -0500
Subject: [PATCH] Bug 1227461, don't iterate multiple times past the top-level
 document during tab navigation, prevents hang navigating in page info dialog,
 r=smaug

---
 dom/base/nsFocusManager.cpp                   |  5 ++++
 .../mochitest/chrome/window_focus_docnav.xul  | 28 +++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index 8b269c00b97c..b921f854f828 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -2827,6 +2827,11 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
         return FocusFirst(root, aNextContent);
       }
 
+      // Once we have hit the top-level and have iterated to the end again, we
+      // just want to break out next time we hit this spot to prevent infinite
+      // iteration.
+      mayFocusRoot = true;
+
       // reset the tab index and start again from the beginning or end
       startContent = rootContent;
       tabIndex = forward ? 1 : 0;
diff --git a/dom/tests/mochitest/chrome/window_focus_docnav.xul b/dom/tests/mochitest/chrome/window_focus_docnav.xul
index d2b6e50fef75..a4e0a56919f9 100644
--- a/dom/tests/mochitest/chrome/window_focus_docnav.xul
+++ b/dom/tests/mochitest/chrome/window_focus_docnav.xul
@@ -7,10 +7,11 @@
 <script type="application/javascript"
         src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
 
-<textbox id="textbox"/>
+<textbox id="textbox1"/>
+<textbox id="textbox2"/>
 
 <panel id="panel" onpopupshown="runTests(this, 1);"
-                  onpopuphidden="done()">
+                  onpopuphidden="noChildrenTest()">
   <textbox id="p1textbox" value="Popup1"/>
 </panel>
 <panel id="panel2" onpopupshown="runTests(this, 2);" onpopuphidden="document.getElementById('panel').hidePopup()">
@@ -28,6 +29,27 @@ var fm = Components.classes["@mozilla.org/focus-manager;1"].
 function is(l, r, n) { window.opener.wrappedJSObject.SimpleTest.is(l,r,n); }
 function ok(v, n) { window.opener.wrappedJSObject.SimpleTest.ok(v,n); }
 
+function noChildrenTest()
+{
+  // Remove the browser element and test navigation when there are no other documents.
+  // The focus should move or stay on the first focusable element.
+  let browser = document.getElementById("browser");
+  browser.parentNode.removeChild(browser);
+
+  let textbox1 = document.getElementById("textbox1");
+  let textbox2 = document.getElementById("textbox2");
+
+  textbox2.focus();
+  next(window, textbox1.inputField, "Focus forward when no child documents");
+  next(window, textbox1.inputField, "Focus forward again when no child documents");
+
+  textbox2.focus();
+  previous(window, textbox1.inputField, "Focus backward when no child documents");
+  previous(window, textbox1.inputField, "Focus backward again when no child documents");
+
+  done();
+}
+
 function done()
 {
   var opener = window.opener;
@@ -81,7 +103,7 @@ function runTests(panel, popupCount)
     previous(window, document.getElementById("p1textbox").inputField, "First back from popup 1 with " + popupCount);
   }
 
-  previous(window, document.getElementById("textbox").inputField, "First back with " + popupCount);
+  previous(window, document.getElementById("textbox1").inputField, "First back with " + popupCount);
 
   if (panel == document.getElementById("panel"))
     document.getElementById("panel2").openPopup(null, "after_start", 100, 20);