Add EventHandlerRegistry

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 19 matching lines @@
 #include "core/html/HTMLInputElement.h"
 
 #include "CSSPropertyNames.h"
 #include "HTMLNames.h"
 #include "RuntimeEnabledFeatures.h"
 #include "bindings/v8/ExceptionMessages.h"
 #include "bindings/v8/ExceptionState.h"
 #include "bindings/v8/ScriptEventListener.h"
 #include "core/accessibility/AXObjectCache.h"
 #include "core/dom/Document.h"
+#include "core/dom/EventHandlerRegistry.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/IdTargetObserver.h"
 #include "core/dom/shadow/ElementShadow.h"
 #include "core/dom/shadow/InsertionPoint.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/SpellChecker.h"
 #include "core/events/BeforeTextInsertedEvent.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
@@ skipping 111 matching lines @@
 HTMLInputElement::~HTMLInputElement()
 {
     // Need to remove form association while this is still an HTMLInputElement
     // so that virtual functions are called correctly.
     setForm(0);
     // setForm(0) may register this to a document-level radio button group.
     // We should unregister it to avoid accessing a deleted object.
     if (isRadioButton())
         document().formController().radioButtonGroupScope().removeButton(this);
     if (m_hasTouchEventHandler)
-        document().didRemoveTouchEventHandler(this);
+        EventHandlerRegistry::from(document())->didRemoveEventHandler(*this, EventTypeNames::touchstart);

[Rick Byers, 2014/03/27 16:43:31]

It's a bit of a lie here to pass just touchstart (eg. what if we make a future
optmization to handle touchstart and touchmove separately?).  It's not a big
deal (I can live with this), but I wonder if it's worth considering exposing a
version that takes just the event class...

[Sami, 2014/04/02 19:58:05]

Done.

 }
 
 const AtomicString& HTMLInputElement::name() const
 {
     return m_name.isNull() ? emptyAtom : m_name;
 }
 
 Vector<FileChooserFileInfo> HTMLInputElement::filesFromFileInputFormControlState(const FormControlState& state)
 {
     return FileInputType::filesFromFormControlState(state);
@@ skipping 243 matching lines @@
     m_inputType = newType.release();
     if (hasAuthorShadowRoot())
         m_inputTypeView = InputTypeView::create(*this);
     else
         m_inputTypeView = m_inputType;
     m_inputTypeView->createShadowSubtree();
 
     bool hasTouchEventHandler = m_inputTypeView->hasTouchEventHandler();
     if (hasTouchEventHandler != m_hasTouchEventHandler) {
         if (hasTouchEventHandler)
-            document().didAddTouchEventHandler(this);
+            EventHandlerRegistry::from(document())->didAddEventHandler(*this, EventTypeNames::touchstart);
         else
-            document().didRemoveTouchEventHandler(this);
+            EventHandlerRegistry::from(document())->didRemoveEventHandler(*this, EventTypeNames::touchstart);
         m_hasTouchEventHandler = hasTouchEventHandler;
     }
 
     setNeedsWillValidateCheck();
 
     bool willStoreValue = m_inputType->storesValueSeparateFromAttribute();
 
     if (didStoreValue && !willStoreValue && hasDirtyValue()) {
         setAttribute(valueAttr, AtomicString(m_valueIfDirty));
         m_valueIfDirty = String();
@@ skipping 990 matching lines @@
 }
 
 void HTMLInputElement::didMoveToNewDocument(Document& oldDocument)
 {
     if (hasImageLoader())
         imageLoader()->elementDidMoveToNewDocument();
 
     if (isRadioButton())
         oldDocument.formController().radioButtonGroupScope().removeButton(this);
     if (m_hasTouchEventHandler)
-        oldDocument.didRemoveTouchEventHandler(this);
+        EventHandlerRegistry::from(oldDocument)->didRemoveEventHandler(*this, EventTypeNames::touchstart);
 
     if (m_hasTouchEventHandler)
-        document().didAddTouchEventHandler(this);
+        EventHandlerRegistry::from(document())->didAddEventHandler(*this, EventTypeNames::touchstart);
 
     HTMLTextFormControlElement::didMoveToNewDocument(oldDocument);
 }
 
 void HTMLInputElement::removeAllEventListeners()
 {
     HTMLTextFormControlElement::removeAllEventListeners();
     m_hasTouchEventHandler = false;
 }
 
@@ skipping 416 matching lines @@
 }
 
 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 PassRefPtr<RenderStyle> HTMLInputElement::customStyleForRenderer()
 {
     return m_inputTypeView->customStyleForRenderer(originalStyleForRenderer());
 }
 #endif
 
 } // namespace