Make anchors mouse-focusable

Source/core/svg/SVGAElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 39 matching lines @@
 #include "platform/network/ResourceRequest.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 inline SVGAElement::SVGAElement(Document& document)
     : SVGGraphicsElement(SVGNames::aTag, document)
     , SVGURIReference(this)
     , m_svgTarget(SVGAnimatedString::create(this, SVGNames::targetAttr, SVGString::create()))
+    , m_wasFocusedByMouse(false)
 {
     ScriptWrappable::init(this);
     addToPropertyMap(m_svgTarget);
 }
 
 DEFINE_NODE_FACTORY(SVGAElement)
 
 String SVGAElement::title() const
 {
     // If the xlink:title is set (non-empty string), use it.
@@ skipping 83 matching lines @@
 }
 
 bool SVGAElement::supportsFocus() const
 {
     if (hasEditableStyle())
         return SVGGraphicsElement::supportsFocus();
     // If not a link we should still be able to focus the element if it has tabIndex.
     return isLink() || Element::supportsFocus();
 }
 
+bool SVGAElement::shouldHaveFocusAppearance() const
+{
+    ASSERT(focused());
+    return !m_wasFocusedByMouse || Element::supportsFocus();

[pdr., 2014/08/10 20:21:52]

This should be SVGElement::supportsFocus();

[robwu, 2014/08/10 23:37:19]

Neither of the two, it should be SVGGraphicsElement. If
SVGElement::supportsFocus is used, then the focus ring would never show up for
mouse focus, even if tabIndex is set (SVGElement::supportsFocus returns false).
I have replaced Element with SVGGraphicsElement, which in turn calls to
Element::supportsFocus.

+}
+
+void SVGAElement::dispatchFocusEvent(Element* oldFocusedElement, FocusType type)
+{
+    if (type != FocusTypePage)
+        m_wasFocusedByMouse = type == FocusTypeMouse;
+    Element::dispatchFocusEvent(oldFocusedElement, type);
+}
+
+void SVGAElement::willCallDefaultEventHandler(const Event& event)
+{
+    if (!event.isKeyboardEvent() || event.type() != EventTypeNames::keydown)
+        return;
+    if (!m_wasFocusedByMouse)
+        return;
+    m_wasFocusedByMouse = false;
+}
+
 bool SVGAElement::isURLAttribute(const Attribute& attribute) const
 {
     return attribute.name().localName() == hrefAttr || SVGGraphicsElement::isURLAttribute(attribute);
 }
 
 bool SVGAElement::isMouseFocusable() const
 {
-    // Links are focusable by default, but only allow links with tabindex or contenteditable to be mouse focusable.
-    // https://bugs.webkit.org/show_bug.cgi?id=26856
     if (isLink())
-        return Element::supportsFocus();
+        return supportsFocus();
 
     return SVGElement::isMouseFocusable();
 }
 
 bool SVGAElement::isKeyboardFocusable() const
 {
     if (isFocusable() && Element::supportsFocus())
         return SVGElement::isKeyboardFocusable();
 
     if (isLink())
         return document().frameHost()->chrome().client().tabsToLinks();
     return SVGElement::isKeyboardFocusable();
 }
 
 bool SVGAElement::canStartSelection() const
 {
     if (!isLink())
         return SVGElement::canStartSelection();
     return hasEditableStyle();
 }
 
 bool SVGAElement::willRespondToMouseClickEvents()
 {
     return isLink() || SVGGraphicsElement::willRespondToMouseClickEvents();
 }
 
 } // namespace blink