Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(635)

Unified Diff: Source/core/html/HTMLInputElement.cpp

Issue 14296003: Remove TOUCH_EVENTS and TOUCH_EVENT_TRACKING compile-time flags. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLInputElement.h ('k') | Source/core/html/InputType.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLInputElement.cpp
diff --git a/Source/core/html/HTMLInputElement.cpp b/Source/core/html/HTMLInputElement.cpp
index 11076c5977ed2555a59036b9acbc1b37dce5c757..b3232c0695529d5dc5ca207dadc5fff5d38219f3 100644
--- a/Source/core/html/HTMLInputElement.cpp
+++ b/Source/core/html/HTMLInputElement.cpp
@@ -70,6 +70,7 @@
#include "ShadowRoot.h"
#include "ScriptEventListener.h"
#include "StyleResolver.h"
+#include "TouchEvent.h"
#include <wtf/MathExtras.h>
#include <wtf/StdLibExtras.h>
@@ -81,10 +82,6 @@
#include "RuntimeEnabledFeatures.h"
#endif
-#if ENABLE(TOUCH_EVENTS)
-#include "TouchEvent.h"
-#endif
-
using namespace std;
namespace WebCore {
@@ -133,9 +130,7 @@ HTMLInputElement::HTMLInputElement(const QualifiedName& tagName, Document* docum
, m_valueAttributeWasUpdatedAfterParsing(false)
, m_wasModifiedByUser(false)
, m_canReceiveDroppedFiles(false)
-#if ENABLE(TOUCH_EVENTS)
, m_hasTouchEventHandler(false)
-#endif
, m_inputType(InputType::createText(this))
{
ASSERT(hasTagName(inputTag) || hasTagName(isindexTag));
@@ -176,10 +171,8 @@ HTMLInputElement::~HTMLInputElement()
// We should unregister it to avoid accessing a deleted object.
if (isRadioButton())
document()->formController()->checkedRadioButtons().removeButton(this);
-#if ENABLE(TOUCH_EVENTS)
if (m_hasTouchEventHandler)
document()->didRemoveEventTargetNode(this);
-#endif
}
const AtomicString& HTMLInputElement::name() const
@@ -486,7 +479,6 @@ void HTMLInputElement::updateType()
m_inputType = newType.release();
m_inputType->createShadowSubtree();
-#if ENABLE(TOUCH_EVENTS)
bool hasTouchEventHandler = m_inputType->hasTouchEventHandler();
if (hasTouchEventHandler != m_hasTouchEventHandler) {
if (hasTouchEventHandler)
@@ -495,7 +487,6 @@ void HTMLInputElement::updateType()
document()->didRemoveTouchEventHandler(this);
m_hasTouchEventHandler = hasTouchEventHandler;
}
-#endif
setNeedsWillValidateCheck();
@@ -1135,13 +1126,11 @@ void HTMLInputElement::defaultEventHandler(Event* evt)
return;
}
-#if ENABLE(TOUCH_EVENTS)
if (evt->isTouchEvent()) {
m_inputType->handleTouchEvent(static_cast<TouchEvent*>(evt));
if (evt->defaultHandled())
return;
}
-#endif
if (evt->isKeyboardEvent() && evt->type() == eventNames().keydownEvent) {
m_inputType->handleKeydownEvent(static_cast<KeyboardEvent*>(evt));
@@ -1529,19 +1518,15 @@ void HTMLInputElement::didMoveToNewDocument(Document* oldDocument)
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);
}
« no previous file with comments | « Source/core/html/HTMLInputElement.h ('k') | Source/core/html/InputType.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698