Remove the blocking touch handlers for the input[type=range] and add touch-action instead

third_party/WebKit/Source/core/html/HTMLInputElement.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, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2012 Samsung Electronics. All rights reserved.
@@ skipping 29 matching lines @@
 #include "core/dom/IdTargetObserver.h"
 #include "core/dom/StyleChangeReason.h"
 #include "core/dom/shadow/InsertionPoint.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/spellcheck/SpellChecker.h"
 #include "core/events/BeforeTextInsertedEvent.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
 #include "core/events/ScopedEventQueue.h"
-#include "core/events/TouchEvent.h"
 #include "core/frame/Deprecation.h"
-#include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLCollection.h"
 #include "core/html/HTMLDataListElement.h"
 #include "core/html/HTMLDataListOptionsCollection.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLImageLoader.h"
 #include "core/html/HTMLOptionElement.h"
@@ skipping 43 matching lines @@
     , m_isChecked(false)
     , m_dirtyCheckedness(false)
     , m_isIndeterminate(false)
     , m_isActivatedSubmit(false)
     , m_autocomplete(Uninitialized)
     , m_hasNonEmptyList(false)
     , m_stateRestored(false)
     , m_parsingInProgress(createdByParser)
     , m_valueAttributeWasUpdatedAfterParsing(false)
     , m_canReceiveDroppedFiles(false)
-    , m_hasTouchEventHandler(false)
     , m_shouldRevealPassword(false)
     , m_needsToUpdateViewValue(true)
     , m_isPlaceholderVisible(false)
     // |m_inputType| is lazily created when constructed by the parser to avoid
     // constructing unnecessarily a text inputType and its shadow subtree, just
     // to destroy them when the |type| attribute gets set by the parser to
     // something else than 'text'.
     , m_inputType(createdByParser ? nullptr : InputType::createText(*this))
     , m_inputTypeView(m_inputType ? m_inputType->createView() : nullptr)
 {
@@ skipping 267 matching lines @@
 {
     m_inputType->disableSecureTextInput();
     m_inputTypeView->handleBlurEvent();
 }
 
 void HTMLInputElement::setType(const AtomicString& type)
 {
     setAttribute(typeAttr, type);
 }
 
-void HTMLInputElement::updateTouchEventHandlerRegistry()
-{
-    DCHECK(m_inputTypeView);
-
-    bool hasTouchEventHandler = m_inputTypeView->hasTouchEventHandler();
-    if (hasTouchEventHandler == !!m_hasTouchEventHandler)
-        return;
-    // If the Document is being or has been stopped, don't register any handlers.
-    if (document().frameHost() && document().lifecycle().state() < DocumentLifecycle::Stopping) {
-        EventHandlerRegistry& registry = document().frameHost()->eventHandlerRegistry();
-        // TODO(dtapuska): Make this passive touch listener see crbug.com/584438
-        if (hasTouchEventHandler)
-            registry.didAddEventHandler(*this, EventHandlerRegistry::TouchStartOrMoveEventBlocking);
-        else
-            registry.didRemoveEventHandler(*this, EventHandlerRegistry::TouchStartOrMoveEventBlocking);
-        m_hasTouchEventHandler = hasTouchEventHandler;
-    }
-}
-
 void HTMLInputElement::initializeTypeInParsing()
 {
     DCHECK(m_parsingInProgress);
     DCHECK(!m_inputType);
     DCHECK(!m_inputTypeView);
 
     const AtomicString& newTypeName = InputType::normalizeTypeName(fastGetAttribute(typeAttr));
     m_inputType = InputType::create(*this, newTypeName);
     m_inputTypeView = m_inputType->createView();
     ensureUserAgentShadowRoot();
 
-    updateTouchEventHandlerRegistry();
-
     setNeedsWillValidateCheck();
 
     m_inputType->warnIfValueIsInvalid(fastGetAttribute(valueAttr).getString());
 
     m_inputTypeView->updateView();
     setTextAsOfLastFormControlChangeEvent(value());
     setChangedSinceLastFormControlChangeEvent(false);
 }
 
 void HTMLInputElement::updateType()
@@ skipping 12 matching lines @@
     bool didRespectHeightAndWidth = m_inputType->shouldRespectHeightAndWidthAttributes();
     bool couldBeSuccessfulSubmitButton = canBeSuccessfulSubmitButton();
 
     m_inputTypeView->destroyShadowSubtree();
     lazyReattachIfAttached();
 
     m_inputType = newType;
     m_inputTypeView = m_inputType->createView();
     m_inputTypeView->createShadowSubtree();
 
-    updateTouchEventHandlerRegistry();
-
     setNeedsWillValidateCheck();
 
     bool willStoreValue = m_inputType->storesValueSeparateFromAttribute();
 
     if (didStoreValue && !willStoreValue && hasDirtyValue()) {
         setAttribute(valueAttr, AtomicString(m_valueIfDirty));
         m_valueIfDirty = String();
     }
     if (!didStoreValue && willStoreValue) {
         AtomicString valueString = fastGetAttribute(valueAttr);
@@ skipping 674 matching lines @@
 }
 
 void HTMLInputElement::defaultEventHandler(Event* evt)
 {
     if (evt->isMouseEvent() && evt->type() == EventTypeNames::click && toMouseEvent(evt)->button() == static_cast<short>(WebPointerProperties::Button::Left)) {
         m_inputTypeView->handleClickEvent(toMouseEvent(evt));
         if (evt->defaultHandled())
             return;
     }
 
-    if (evt->isTouchEvent() && m_inputTypeView->hasTouchEventHandler()) {
-        m_inputTypeView->handleTouchEvent(toTouchEvent(evt));
-        if (evt->defaultHandled())
-            return;
-    }
-
     if (evt->isKeyboardEvent() && evt->type() == EventTypeNames::keydown) {
         m_inputTypeView->handleKeydownEvent(toKeyboardEvent(evt));
         if (evt->defaultHandled())
             return;
     }
 
     // Call the base event handler before any of our own event handling for almost all events in text fields.
     // Makes editing keyboard handling take precedence over the keydown and keypress handling in this function.
     bool callBaseClassEarly = isTextField() && (evt->type() == EventTypeNames::keydown || evt->type() == EventTypeNames::keypress);
     if (callBaseClassEarly) {
@@ skipping 319 matching lines @@
 
 void HTMLInputElement::didMoveToNewDocument(Document& oldDocument)
 {
     if (imageLoader())
         imageLoader()->elementDidMoveToNewDocument();
 
     // FIXME: Remove type check.
     if (type() == InputTypeNames::radio)
         treeScope().radioButtonGroupScope().removeButton(this);
 
-    updateTouchEventHandlerRegistry();
-
     HTMLTextFormControlElement::didMoveToNewDocument(oldDocument);
 }
 
-void HTMLInputElement::removeAllEventListeners()
-{
-    HTMLTextFormControlElement::removeAllEventListeners();
-    m_hasTouchEventHandler = false;
-}
-
 bool HTMLInputElement::recalcWillValidate() const
 {
     return m_inputType->supportsValidation() && HTMLTextFormControlElement::recalcWillValidate();
 }
 
 void HTMLInputElement::requiredAttributeChanged()
 {
     HTMLTextFormControlElement::requiredAttributeChanged();
     if (RadioButtonGroupScope* scope = radioButtonGroupScope())
         scope->requiredAttributeChanged(this);
@@ skipping 419 matching lines @@
 {
     return m_inputTypeView->hasFallbackContent();
 }
 
 void HTMLInputElement::setFilesFromPaths(const Vector<String>& paths)
 {
     return m_inputType->setFilesFromPaths(paths);
 }
 
 } // namespace blink