<dialog>: don't focus non-form elements with tabindex < 0 when showModal() is called

third_party/WebKit/Source/core/html/HTMLDialogElement.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 36 matching lines @@
   for (Node* node = dialog->firstChild(); node; node = next) {
     if (isHTMLDialogElement(*node))
       next = NodeTraversal::nextSkippingChildren(*node, dialog);
     else
       next = NodeTraversal::next(*node, dialog);
 
     if (!node->isElementNode())
       continue;
     Element* element = toElement(node);
     if (element->isFormControlElement()) {
+      // TODO(dbeam): <button tabindex="-1"> or <a href="..." tabindex="-1">
+      // should not have precedence over <div tabindex="0"> but currently do.
       HTMLFormControlElement* control = toHTMLFormControlElement(node);
       if (control->isAutofocusable() && control->isFocusable()) {
         control->focus();
         return;
       }
     }
-    if (!focusableDescendant && element->isFocusable())
+    if (!focusableDescendant && element->isKeyboardFocusable())
       focusableDescendant = element;
   }
 
   if (focusableDescendant) {
     focusableDescendant->focus();
     return;
   }
 
+  // TODO(dbeam): should this be isKeyboardFocusable() instead?
   if (dialog->isFocusable()) {
     dialog->focus();
     return;
   }
 
   dialog->document().clearFocusedElement();
 }
 
 static void inertSubtreesChanged(Document& document) {
   // When a modal dialog opens or closes, nodes all over the accessibility
@@ skipping 124 matching lines @@
 void HTMLDialogElement::defaultEventHandler(Event* event) {
   if (event->type() == EventTypeNames::cancel) {
     closeDialog();
     event->setDefaultHandled();
     return;
   }
   HTMLElement::defaultEventHandler(event);
 }
 
 }  // namespace blink