Sequential focus navigation staring point: Fix a case where clicked Text node has focusable sibling…

third_party/WebKit/Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 3711 matching lines @@
 
 void Document::setSequentialFocusNavigationStartingPoint(Node* node)
 {
     if (!node) {
         m_sequentialFocusNavigationStartingPoint = nullptr;
         return;
     }
     ASSERT(node->document() == this);
     if (!m_sequentialFocusNavigationStartingPoint)
         m_sequentialFocusNavigationStartingPoint = Range::create(*this);
-    m_sequentialFocusNavigationStartingPoint->selectNodeContents(node->isElementNode() ? node : node->parentOrShadowHostElement(), ASSERT_NO_EXCEPTION);
+    m_sequentialFocusNavigationStartingPoint->selectNodeContents(node, ASSERT_NO_EXCEPTION);
 }
 
 Element* Document::sequentialFocusNavigationStartingPoint(WebFocusType type) const
 {
     if (m_focusedElement)
         return m_focusedElement.get();
     if (!m_sequentialFocusNavigationStartingPoint)
         return nullptr;
     if (!m_sequentialFocusNavigationStartingPoint->collapsed()) {
         Node* node = m_sequentialFocusNavigationStartingPoint->startContainer();
         ASSERT(node == m_sequentialFocusNavigationStartingPoint->endContainer());
-        return node->isElementNode() ? toElement(node) : node->parentOrShadowHostElement();
+        if (node->isElementNode())
+            return toElement(node);
+        if (Element* neighborElement = type == WebFocusTypeForward ? ElementTraversal::previous(*node) : ElementTraversal::next(*node))
+            return neighborElement;
+        return node->parentOrShadowHostElement();
     }
 
     // Range::selectNodeContents didn't select contents because the element had
     // no children.
     if (m_sequentialFocusNavigationStartingPoint->startContainer()->isElementNode()
         && !m_sequentialFocusNavigationStartingPoint->startContainer()->hasChildren()
         && m_sequentialFocusNavigationStartingPoint->startOffset() == 0)
         return toElement(m_sequentialFocusNavigationStartingPoint->startContainer());
 
     // A node selected by Range::selectNodeContents was removed from the
@@ skipping 2239 matching lines @@
 #ifndef NDEBUG
 using namespace blink;
 void showLiveDocumentInstances()
 {
     Document::WeakDocumentSet& set = Document::liveDocumentSet();
     fprintf(stderr, "There are %u documents currently alive:\n", set.size());
     for (Document* document : set)
         fprintf(stderr, "- Document %p URL: %s\n", document, document->url().string().utf8().data());
 }
 #endif