Make anchors mouse-focusable

Source/core/html/HTMLFormControlElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * 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
@@ skipping 16 matching lines @@
 
 #include "core/events/Event.h"
 #include "core/html/HTMLDataListElement.h"
 #include "core/html/HTMLFieldSetElement.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLLegendElement.h"
 #include "core/html/ValidityState.h"
 #include "core/frame/UseCounter.h"
 #include "core/inspector/ConsoleMessage.h"
+#include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/page/ValidationMessageClient.h"
 #include "core/rendering/RenderBox.h"
 #include "core/rendering/RenderTheme.h"
 #include "platform/text/BidiTextRun.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 HTMLFormControlElement::HTMLFormControlElement(const QualifiedName& tagName, Document& document, HTMLFormElement* form)
     : LabelableElement(tagName, document)
     , m_disabled(false)
     , m_isAutofilled(false)
     , m_isReadOnly(false)
     , m_isRequired(false)
     , m_hasValidationMessage(false)
     , m_ancestorDisabledState(AncestorDisabledStateUnknown)
     , m_dataListAncestorState(Unknown)
     , m_willValidateInitialized(false)
     , m_willValidate(true)
     , m_isValid(true)
     , m_wasChangedSinceLastFormControlChangeEvent(false)
-    , m_wasFocusedByMouse(false)
 {
     setHasCustomStyleCallbacks();
     associateByParser(form);
 }
 
 HTMLFormControlElement::~HTMLFormControlElement()
 {
 #if !ENABLE(OILPAN)
     setForm(0);
 #endif
@@ skipping 254 matching lines @@
 {
     // Skip tabIndex check in a parent class.
     return isFocusable();
 }
 
 bool HTMLFormControlElement::shouldShowFocusRingOnMouseFocus() const
 {
     return false;
 }
 
-void HTMLFormControlElement::dispatchFocusEvent(Element* oldFocusedElement, FocusType type)
-{
-    if (type != FocusTypePage)
-        m_wasFocusedByMouse = type == FocusTypeMouse;
-    HTMLElement::dispatchFocusEvent(oldFocusedElement, type);
-}
-
 bool HTMLFormControlElement::shouldHaveFocusAppearance() const
 {
     ASSERT(focused());
-    return shouldShowFocusRingOnMouseFocus() || !m_wasFocusedByMouse;
+    return shouldShowFocusRingOnMouseFocus() || !document().page()->focusController().wasFocusedByMouse();
 }
 
-void HTMLFormControlElement::willCallDefaultEventHandler(const Event& event)
-{
-    if (!event.isKeyboardEvent() || event.type() != EventTypeNames::keydown)
-        return;
-    if (!m_wasFocusedByMouse)
-        return;
-    m_wasFocusedByMouse = false;
-    if (renderer())
-        renderer()->setShouldDoFullPaintInvalidation(true);
-}
-
-
 short HTMLFormControlElement::tabIndex() const
 {
     // Skip the supportsFocus check in HTMLElement.
     return Element::tabIndex();
 }
 
 bool HTMLFormControlElement::recalcWillValidate() const
 {
     if (m_dataListAncestorState == Unknown) {
         if (Traversal<HTMLDataListElement>::firstAncestor(*this))
@@ skipping 176 matching lines @@
 
 void HTMLFormControlElement::setFocus(bool flag)
 {
     LabelableElement::setFocus(flag);
 
     if (!flag && wasChangedSinceLastFormControlChangeEvent())
         dispatchFormControlChangeEvent();
 }
 
 } // namespace Webcore