Bug 363934 � keyboard tab bar navigation broken, r=gavin, sr=neil

toolkit/content/widgets/tabbrowser.xml

@@ -665,8 +665,12 @@
                 this.mCurrentBrowser.focusedElement = document.commandDispatcher.focusedElement;
               }
 
-              if (this.mCurrentBrowser.focusedElement) {
-                // Clear focus outline before we draw on top of it
+              if (this.mCurrentBrowser.focusedElement &&
+                  this.mCurrentBrowser.focusedElement.parentNode !=
+                  this.mCurrentTab.parentNode) {
+                // Clear focus outline before we draw on top of it.
+                // Only blur the focused element if it isn't a tab, 
+                // to avoid breaking keyboard tab navigation
                 this.mCurrentBrowser.focusedElement.blur();
               }
               this.mCurrentBrowser.setAttribute("type", "content-targetable");

xpfe/global/resources/content/bindings/tabbrowser.xml

@@ -707,8 +707,12 @@
                 this.mCurrentBrowser.focusedElement = document.commandDispatcher.focusedElement;
               }
 
-              if (this.mCurrentBrowser.focusedElement) {
-                // Clear focus outline before we draw on top of it
+              if (this.mCurrentBrowser.focusedElement &&
+                  this.mCurrentBrowser.focusedElement.parentNode !=
+                  this.mCurrentTab.parentNode) {
+                // Clear focus outline before we draw on top of it.
+                // Only blur the focused element if it isn't a tab, 
+                // to avoid breaking keyboard tab navigation
                 this.mCurrentBrowser.focusedElement.blur();
               }
               this.mCurrentBrowser.setAttribute("type", "content-targetable");