| Index: Source/core/html/HTMLFormControlElement.cpp
|
| diff --git a/Source/core/html/HTMLFormControlElement.cpp b/Source/core/html/HTMLFormControlElement.cpp
|
| index 127ee3a02c2c9298244c170b632a23567f755e6e..7acc0b5f686af90b59b026a087ea78204dd2a564 100644
|
| --- a/Source/core/html/HTMLFormControlElement.cpp
|
| +++ b/Source/core/html/HTMLFormControlElement.cpp
|
| @@ -34,6 +34,7 @@
|
| #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"
|
| @@ -58,7 +59,6 @@ HTMLFormControlElement::HTMLFormControlElement(const QualifiedName& tagName, Doc
|
| , m_willValidate(true)
|
| , m_isValid(true)
|
| , m_wasChangedSinceLastFormControlChangeEvent(false)
|
| - , m_wasFocusedByMouse(false)
|
| {
|
| setHasCustomStyleCallbacks();
|
| associateByParser(form);
|
| @@ -333,31 +333,12 @@ 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.
|
|
|