Make anchors mouse-focusable

Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 121 matching lines @@
 }
 
 PassRefPtrWillBeRawPtr<Element> Element::create(const QualifiedName& tagName, Document* document)
 {
     return adoptRefWillBeNoop(new Element(tagName, document, CreateElement));
 }
 
 Element::Element(const QualifiedName& tagName, Document* document, ConstructionType type)
     : ContainerNode(document, type)
     , m_tagName(tagName)
+    , m_wasFocusedByMouse(false)
 {
     ScriptWrappable::init(this);
 }
 
 Element::~Element()
 {
     ASSERT(needsAttach());
 
 #if !ENABLE(OILPAN)
     if (hasRareData())
@@ skipping 1967 matching lines @@
 {
     // FIXME: supportsFocus() can be called when layout is not up to date.
     // Logic that deals with the renderer should be moved to rendererIsFocusable().
     // But supportsFocus must return true when the element is editable, or else
     // it won't be focusable. Furthermore, supportsFocus cannot just return true
     // always or else tabIndex() will change for all HTML elements.
     return hasElementFlag(TabIndexWasSetExplicitly) || (hasEditableStyle() && parentNode() && !parentNode()->hasEditableStyle())
         || supportsSpatialNavigationFocus();
 }
 
+bool Element::shouldHaveFocusAppearance() const
+{
+    ASSERT(focused());
+    return shouldShowFocusRingOnMouseFocus() || !m_wasFocusedByMouse;
+}
+
 bool Element::supportsSpatialNavigationFocus() const
 {
     // This function checks whether the element satisfies the extended criteria
     // for the element to be focusable, introduced by spatial navigation feature,
     // i.e. checks if click or keyboard event handler is specified.
     // This is the way to make it possible to navigate to (focus) elements
     // which web designer meant for being active (made them respond to click events).
 
     if (!document().settings() || !document().settings()->spatialNavigationEnabled())
         return false;
@@ skipping 18 matching lines @@
 bool Element::isKeyboardFocusable() const
 {
     return isFocusable() && tabIndex() >= 0;
 }
 
 bool Element::isMouseFocusable() const
 {
     return isFocusable();
 }
 
-void Element::dispatchFocusEvent(Element* oldFocusedElement, FocusType)
+void Element::willCallDefaultEventHandler(const Event& event)
 {
+    if (!m_wasFocusedByMouse)
+        return;
+    if (!event.isKeyboardEvent() || event.type() != EventTypeNames::keydown)
+        return;
+    m_wasFocusedByMouse = false;
+    // Focus changes could affect the focus ring appearance if the focus ring is not shown by default on mouse focus.
+    if (!shouldShowFocusRingOnMouseFocus() && renderer())
+        renderer()->setShouldDoFullPaintInvalidation(true);
+}
+
+void Element::dispatchFocusEvent(Element* oldFocusedElement, FocusType type)
+{
+    if (type != FocusTypePage)
+        m_wasFocusedByMouse = type == FocusTypeMouse;
+
     RefPtrWillBeRawPtr<FocusEvent> event = FocusEvent::create(EventTypeNames::focus, false, false, document().domWindow(), 0, oldFocusedElement);
     EventDispatcher::dispatchEvent(this, FocusEventDispatchMediator::create(event.release()));
 }
 
 void Element::dispatchBlurEvent(Element* newFocusedElement)
 {
     RefPtrWillBeRawPtr<FocusEvent> event = FocusEvent::create(EventTypeNames::blur, false, false, document().domWindow(), 0, newFocusedElement);
     EventDispatcher::dispatchEvent(this, BlurEventDispatchMediator::create(event.release()));
 }
 
@@ skipping 1069 matching lines @@
 {
 #if ENABLE(OILPAN)
     if (hasRareData())
         visitor->trace(elementRareData());
     visitor->trace(m_elementData);
 #endif
     ContainerNode::trace(visitor);
 }
 
 } // namespace blink