From 5ef7c8a6a70875d4430752d146bdcb069605d71d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 21 Aug 2012 10:57:44 +0200 Subject: Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147) New snapshot including various build fixes for newer Qt 5 --- Source/WebCore/html/HTMLInputElement.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'Source/WebCore/html/HTMLInputElement.cpp') diff --git a/Source/WebCore/html/HTMLInputElement.cpp b/Source/WebCore/html/HTMLInputElement.cpp index e07067c66..461e39d51 100644 --- a/Source/WebCore/html/HTMLInputElement.cpp +++ b/Source/WebCore/html/HTMLInputElement.cpp @@ -36,6 +36,7 @@ #include "Document.h" #include "EventNames.h" #include "ExceptionCode.h" +#include "FileInputType.h" #include "FileList.h" #include "FormController.h" #include "Frame.h" @@ -56,7 +57,6 @@ #include "SearchInputType.h" #include "ShadowRoot.h" #include "ScriptEventListener.h" -#include "WheelEvent.h" #include #include @@ -160,6 +160,11 @@ const AtomicString& HTMLInputElement::name() const return m_name.isNull() ? emptyAtom : m_name; } +Vector HTMLInputElement::filesFromFileInputFormControlState(const FormControlState& state) +{ + return FileInputType::filesFromFormControlState(state); +} + HTMLElement* HTMLInputElement::containerElement() const { return m_inputType->containerElement(); @@ -439,10 +444,9 @@ void HTMLInputElement::updateType() #if ENABLE(TOUCH_EVENTS) bool hasTouchEventHandler = m_inputType->hasTouchEventHandler(); if (hasTouchEventHandler != m_hasTouchEventHandler) { - if (hasTouchEventHandler) { + if (hasTouchEventHandler) document()->didAddTouchEventHandler(); - document()->addListenerType(Document::TOUCH_LISTENER); - } else + else document()->didRemoveTouchEventHandler(); m_hasTouchEventHandler = hasTouchEventHandler; } @@ -850,7 +854,7 @@ void HTMLInputElement::setChecked(bool nowChecked, TextFieldEventBehavior eventB // RenderTextView), but it's not possible to do it at the moment // because of the way the code is structured. if (renderer() && AXObjectCache::accessibilityEnabled()) - renderer()->document()->axObjectCache()->checkedStateChanged(renderer()); + renderer()->document()->axObjectCache()->checkedStateChanged(this); // Only send a change event for items in the document (avoid firing during // parsing) and don't send a change event for a radio button that's getting @@ -1155,12 +1159,6 @@ void HTMLInputElement::defaultEventHandler(Event* evt) if (evt->isBeforeTextInsertedEvent()) m_inputType->handleBeforeTextInsertedEvent(static_cast(evt)); - if (evt->hasInterface(eventNames().interfaceForWheelEvent)) { - m_inputType->handleWheelEvent(static_cast(evt)); - if (evt->defaultHandled()) - return; - } - if (evt->isMouseEvent() && evt->type() == eventNames().mousedownEvent) { m_inputType->handleMouseDownEvent(static_cast(evt)); if (evt->defaultHandled()) -- cgit v1.2.1