Revert removal of events

Source/WebKit/chromium/src/WebInputEventConversion.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 307 matching lines @@
 bool PlatformKeyboardEventBuilder::isCharacterKey() const
 {
     switch (windowsVirtualKeyCode()) {
     case VKEY_BACK:
     case VKEY_ESCAPE:
         return false;
     }
     return true;
 }
 
+#if ENABLE(TOUCH_EVENTS)
 inline PlatformEvent::Type toPlatformTouchEventType(const WebInputEvent::Type type)
 {
     switch (type) {
     case WebInputEvent::TouchStart:
         return PlatformEvent::TouchStart;
     case WebInputEvent::TouchMove:
         return PlatformEvent::TouchMove;
     case WebInputEvent::TouchEnd:
         return PlatformEvent::TouchEnd;
     case WebInputEvent::TouchCancel:
@@ skipping 61 matching lines @@
     if (event.modifiers & WebInputEvent::AltKey)
         m_modifiers |= PlatformEvent::AltKey;
     if (event.modifiers & WebInputEvent::MetaKey)
         m_modifiers |= PlatformEvent::MetaKey;
 
     m_timestamp = event.timeStampSeconds;
 
     for (unsigned i = 0; i < event.touchesLength; ++i)
         m_touchPoints.append(PlatformTouchPointBuilder(widget, event.touches[i]));
 }
+#endif
 
 static int getWebInputModifiers(const UIEventWithKeyState& event)
 {
     int modifiers = 0;
     if (event.ctrlKey())
         modifiers |= WebInputEvent::ControlKey;
     if (event.shiftKey())
         modifiers |= WebInputEvent::ShiftKey;
     if (event.altKey())
         modifiers |= WebInputEvent::AltKey;
@@ skipping 149 matching lines @@
         return;
     nativeKeyCode = event.keyEvent()->nativeVirtualKeyCode();
     unsigned numberOfCharacters = std::min(event.keyEvent()->text().length(), static_cast<unsigned>(textLengthCap));
     for (unsigned i = 0; i < numberOfCharacters; ++i) {
         text[i] = event.keyEvent()->text()[i];
         unmodifiedText[i] = event.keyEvent()->unmodifiedText()[i];
     }
     memcpy(keyIdentifier, event.keyIdentifier().ascii().data(), event.keyIdentifier().length());
 }
 
+#if ENABLE(TOUCH_EVENTS)
+
 static void addTouchPoints(const Widget* widget, const AtomicString& touchType, TouchList* touches, WebTouchPoint* touchPoints, unsigned* touchPointsLength, const WebCore::RenderObject* renderObject)
 {
     unsigned numberOfTouches = std::min(touches->length(), static_cast<unsigned>(WebTouchEvent::touchesLengthCap));
     for (unsigned i = 0; i < numberOfTouches; ++i) {
         const Touch* touch = touches->item(i);
 
         WebTouchPoint point;
         point.id = touch->identifier();
         point.screenPosition = WebPoint(touch->screenX(), touch->screenY());
         point.position = convertAbsoluteLocationForRenderObject(touch->absoluteLocation(), *renderObject);
@@ skipping 25 matching lines @@
     }
 
     modifiers = getWebInputModifiers(event);
     timeStampSeconds = event.timeStamp() / millisPerSecond;
 
     addTouchPoints(widget, event.type(), event.touches(), touches, &touchesLength, renderObject);
     addTouchPoints(widget, event.type(), event.changedTouches(), changedTouches, &changedTouchesLength, renderObject);
     addTouchPoints(widget, event.type(), event.targetTouches(), targetTouches, &targetTouchesLength, renderObject);
 }
 
+#endif // ENABLE(TOUCH_EVENTS)
+
 WebGestureEventBuilder::WebGestureEventBuilder(const Widget* widget, const WebCore::RenderObject* renderObject, const GestureEvent& event)
 {
     if (event.type() == eventNames().gesturetapEvent)
         type = GestureTap;
     else if (event.type() == eventNames().gesturetapdownEvent)
         type = GestureTapDown;
     else if (event.type() == eventNames().gesturescrollstartEvent)
         type = GestureScrollBegin;
     else if (event.type() == eventNames().gesturescrollendEvent)
         type = GestureScrollEnd;
     else if (event.type() == eventNames().gesturescrollupdateEvent) {
         type = GestureScrollUpdate;
         data.scrollUpdate.deltaX = event.deltaX();
         data.scrollUpdate.deltaY = event.deltaY();
     }
 
     timeStampSeconds = event.timeStamp() / millisPerSecond;
     modifiers = getWebInputModifiers(event);
 
     globalX = event.screenX();
     globalY = event.screenY();
     IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteLocation(), *renderObject);
     x = localPoint.x();
     y = localPoint.y();
 }
 
 } // namespace WebKit