WIP: delegatesFocus

Source/core/page/FocusController.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nuanti Ltd.
  *
  * 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 508 matching lines @@
     ASSERT(!currentNode || !isNonFocusableShadowHost(*currentNode));
     Node* found = findFocusableNodeRecursivelyBackward(scope, currentNode);
 
     // If there's no focusable node to advance to, move up the focus scopes until we find one.
     FocusNavigationScope currentScope = scope;
     while (!found) {
         Node* owner = currentScope.owner();
         if (!owner)
             break;
         currentScope = FocusNavigationScope::focusNavigationScopeOf(*owner);
-        if (isKeyboardFocusableShadowHost(*owner) && toElement(owner)->tabStop()) {
+        if (isKeyboardFocusableShadowHost(*owner) && !toElement(owner)->shadowRoot()->delegatesFocus()) {
             found = owner;
             break;
         }
         found = findFocusableNodeRecursivelyBackward(currentScope, owner);
     }
     return findFocusableNodeDecendingDownIntoFrameDocument(WebFocusTypeBackward, found);
 }
 
 Node* FocusController::findFocusableNodeRecursively(WebFocusType type, const FocusNavigationScope& scope, Node* start)
 {
     return (type == WebFocusTypeForward) ?
         findFocusableNodeRecursivelyForward(scope, start) :
         findFocusableNodeRecursivelyBackward(scope, start);
 }
 
 Node* FocusController::findFocusableNodeRecursivelyForward(const FocusNavigationScope& scope, Node* start)
 {
     // Starting node is exclusive.
     Node* found = findFocusableNode(WebFocusTypeForward, scope, start);
     if (!found)
         return nullptr;
-    if (found->isElementNode() && !toElement(found)->tabStop()) {
+    // TODO(kochi): simplify this logic further.
+    if (found->isElementNode() && toElement(found)->shadowRoot() && toElement(found)->shadowRoot()->delegatesFocus()) {
         if (isShadowHostWithoutCustomFocusLogic(*found)) {
             FocusNavigationScope innerScope = FocusNavigationScope::ownedByShadowHost(*found);
             Node* foundInInnerFocusScope = findFocusableNodeRecursivelyForward(innerScope, nullptr);
             return foundInInnerFocusScope ? foundInInnerFocusScope : findFocusableNodeRecursivelyForward(scope, found);
         }
         // Skip to the next node.
         if (!isNonFocusableFocusScopeOwner(*found))
             found = findFocusableNodeRecursivelyForward(scope, found);
     }
     if (!found || !isNonFocusableFocusScopeOwner(*found))
@@ skipping 15 matching lines @@
         return nullptr;
 
     // Now |found| is on a focusable shadow host.
     // Find inside shadow backwards. If any focusable element is found, return it, otherwise return
     // the host itself.
     if (isKeyboardFocusableShadowHost(*found)) {
         FocusNavigationScope innerScope = FocusNavigationScope::ownedByShadowHost(*found);
         Node* foundInInnerFocusScope = findFocusableNodeRecursivelyBackward(innerScope, nullptr);
         if (foundInInnerFocusScope)
             return foundInInnerFocusScope;
-        if (found->isElementNode() && !toElement(found)->tabStop())
+        // TODO(kochi): Simplify this logic further.
+        if (found->isElementNode() && toElement(found)->shadowRoot() && toElement(found)->shadowRoot()->delegatesFocus())
             found = findFocusableNodeRecursivelyBackward(scope, found);
         return found;
     }
 
     // Now |found| is on a non focusable scope owner (either shadow host or <shadow>).
     // Find focusable node in decendant scope. If not found, find next focusable node within the
     // current scope.
     if (isNonFocusableFocusScopeOwner(*found)) {
         FocusNavigationScope innerScope = FocusNavigationScope::ownedByNonFocusableFocusScopeOwner(*found);
         Node* foundInInnerFocusScope = findFocusableNodeRecursivelyBackward(innerScope, nullptr);
         return foundInInnerFocusScope ? foundInInnerFocusScope : findFocusableNodeRecursivelyBackward(scope, found);
     }
 
-    return found->isElementNode() && toElement(found)->tabStop() ? found : findFocusableNodeRecursivelyBackward(scope, found);
+    return found->isElementNode() && !(toElement(found)->shadowRoot() && toElement(found)->shadowRoot()->delegatesFocus()) ? found : findFocusableNodeRecursivelyBackward(scope, found);
 }
 
 static Node* findNodeWithExactTabIndex(Node* start, int tabIndex, WebFocusType type)
 {
     // Search is inclusive of start
     for (Node* node = start; node; node = type == WebFocusTypeForward ? NodeTraversal::next(*node) : NodeTraversal::previous(*node)) {
         if (shouldVisit(*node) && adjustedTabIndex(*node) == tabIndex)
             return node;
     }
     return nullptr;
@@ skipping 398 matching lines @@
     return consumed;
 }
 
 DEFINE_TRACE(FocusController)
 {
     visitor->trace(m_page);
     visitor->trace(m_focusedFrame);
 }
 
 } // namespace blink