| Index: Source/WebCore/html/HTMLInputElement.cpp
|
| ===================================================================
|
| --- Source/WebCore/html/HTMLInputElement.cpp (revision 138207)
|
| +++ Source/WebCore/html/HTMLInputElement.cpp (working copy)
|
| @@ -163,7 +163,7 @@
|
| document()->formController()->checkedRadioButtons().removeButton(this);
|
| #if ENABLE(TOUCH_EVENTS)
|
| if (m_hasTouchEventHandler)
|
| - document()->didRemoveEventTargetNode(this);
|
| + document()->didRemoveTouchEventHandler(this);
|
| #endif
|
| }
|
|
|
| @@ -488,11 +488,11 @@
|
| #if ENABLE(TOUCH_EVENTS)
|
| bool hasTouchEventHandler = m_inputType->hasTouchEventHandler();
|
| if (hasTouchEventHandler != m_hasTouchEventHandler) {
|
| - if (hasTouchEventHandler)
|
| - document()->didAddTouchEventHandler(this);
|
| - else
|
| - document()->didRemoveTouchEventHandler(this);
|
| - m_hasTouchEventHandler = hasTouchEventHandler;
|
| + if (hasTouchEventHandler)
|
| + document()->didAddTouchEventHandler(this);
|
| + else
|
| + document()->didRemoveTouchEventHandler(this);
|
| + m_hasTouchEventHandler = hasTouchEventHandler;
|
| }
|
| #endif
|
|
|
| @@ -1499,20 +1499,11 @@
|
| oldDocument->unregisterForPageCacheSuspensionCallbacks(this);
|
| if (isRadioButton())
|
| oldDocument->formController()->checkedRadioButtons().removeButton(this);
|
| -#if ENABLE(TOUCH_EVENTS)
|
| - if (m_hasTouchEventHandler)
|
| - oldDocument->didRemoveEventTargetNode(this);
|
| -#endif
|
| }
|
|
|
| if (needsSuspensionCallback)
|
| document()->registerForPageCacheSuspensionCallbacks(this);
|
|
|
| -#if ENABLE(TOUCH_EVENTS)
|
| - if (m_hasTouchEventHandler)
|
| - document()->didAddTouchEventHandler(this);
|
| -#endif
|
| -
|
| HTMLTextFormControlElement::didMoveToNewDocument(oldDocument);
|
| }
|
|
|
|
|