| Index: Source/web/android/WebInputEventFactory.cpp
 | 
| diff --git a/Source/web/android/WebInputEventFactory.cpp b/Source/web/android/WebInputEventFactory.cpp
 | 
| deleted file mode 100644
 | 
| index 5b204cdbb5fe68473deaaabe1817ff0c6c62562f..0000000000000000000000000000000000000000
 | 
| --- a/Source/web/android/WebInputEventFactory.cpp
 | 
| +++ /dev/null
 | 
| @@ -1,179 +0,0 @@
 | 
| -/*
 | 
| - * Copyright (C) 2011 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
 | 
| - * copyright notice, this list of conditions and the following disclaimer
 | 
| - * in the documentation and/or other materials provided with the
 | 
| - * distribution.
 | 
| - *     * Neither the name of Google Inc. nor the names of its
 | 
| - * contributors may be used to endorse or promote products derived from
 | 
| - * this software without specific prior written permission.
 | 
| - *
 | 
| - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 | 
| - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 | 
| - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 | 
| - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 | 
| - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 | 
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 | 
| - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 | 
| - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 | 
| - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 | 
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 | 
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 | 
| - */
 | 
| -
 | 
| -#include "config.h"
 | 
| -#include "WebInputEventFactory.h"
 | 
| -
 | 
| -#include "WebInputEvent.h"
 | 
| -#include "core/platform/chromium/KeyCodeConversion.h"
 | 
| -#include "core/platform/chromium/KeyboardCodes.h"
 | 
| -#include "wtf/Assertions.h"
 | 
| -
 | 
| -namespace WebKit {
 | 
| -
 | 
| -WebKeyboardEvent WebInputEventFactory::keyboardEvent(WebInputEvent::Type type,
 | 
| -                                                     int modifiers,
 | 
| -                                                     double timeStampSeconds,
 | 
| -                                                     int keycode,
 | 
| -                                                     WebUChar unicodeCharacter,
 | 
| -                                                     bool isSystemKey)
 | 
| -{
 | 
| -    WebKeyboardEvent result;
 | 
| -
 | 
| -    result.type = type;
 | 
| -    result.modifiers = modifiers;
 | 
| -    result.timeStampSeconds = timeStampSeconds;
 | 
| -    int windowsKeyCode = WebCore::windowsKeyCodeForKeyEvent(keycode);
 | 
| -    result.windowsKeyCode = WebKeyboardEvent::windowsKeyCodeWithoutLocation(windowsKeyCode);
 | 
| -    result.modifiers |= WebKeyboardEvent::locationModifiersFromWindowsKeyCode(windowsKeyCode);
 | 
| -    result.nativeKeyCode = keycode;
 | 
| -    result.unmodifiedText[0] = unicodeCharacter;
 | 
| -    if (result.windowsKeyCode == WebCore::VKEY_RETURN) {
 | 
| -        // This is the same behavior as GTK:
 | 
| -        // We need to treat the enter key as a key press of character \r. This
 | 
| -        // is apparently just how webkit handles it and what it expects.
 | 
| -        result.unmodifiedText[0] = '\r';
 | 
| -    }
 | 
| -    result.text[0] = result.unmodifiedText[0];
 | 
| -    result.setKeyIdentifierFromWindowsKeyCode();
 | 
| -    result.isSystemKey = isSystemKey;
 | 
| -
 | 
| -    return result;
 | 
| -}
 | 
| -
 | 
| -WebMouseEvent WebInputEventFactory::mouseEvent(MouseEventType type,
 | 
| -                                               WebMouseEvent::Button button,
 | 
| -                                               double timeStampSeconds,
 | 
| -                                               int windowX,
 | 
| -                                               int windowY,
 | 
| -                                               int modifiers,
 | 
| -                                               int clickCount)
 | 
| -{
 | 
| -    WebMouseEvent result;
 | 
| -
 | 
| -    result.x = windowX;
 | 
| -    result.y = windowY;
 | 
| -    result.windowX = windowX;
 | 
| -    result.windowY = windowY;
 | 
| -    result.timeStampSeconds = timeStampSeconds;
 | 
| -    result.clickCount = clickCount;
 | 
| -    result.modifiers = modifiers;
 | 
| -
 | 
| -    switch (type) {
 | 
| -    case MouseEventTypeDown:
 | 
| -        result.type = WebInputEvent::MouseDown;
 | 
| -        result.button = button;
 | 
| -        break;
 | 
| -    case MouseEventTypeUp:
 | 
| -        result.type = WebInputEvent::MouseUp;
 | 
| -        result.button = button;
 | 
| -        break;
 | 
| -    case MouseEventTypeMove:
 | 
| -        result.type = WebInputEvent::MouseMove;
 | 
| -        result.button = WebMouseEvent::ButtonNone;
 | 
| -        break;
 | 
| -    };
 | 
| -
 | 
| -    return result;
 | 
| -}
 | 
| -
 | 
| -// WebMouseWheelEvent ------------------------------------------------------------
 | 
| -
 | 
| -WebMouseWheelEvent WebInputEventFactory::mouseWheelEvent(MouseWheelDirectionType direction,
 | 
| -                                                         double timeStampSeconds,
 | 
| -                                                         int windowX,
 | 
| -                                                         int windowY)
 | 
| -{
 | 
| -    WebMouseWheelEvent result;
 | 
| -
 | 
| -    result.type = WebInputEvent::MouseWheel;
 | 
| -    result.x = windowX;
 | 
| -    result.y = windowY;
 | 
| -    result.windowX = windowX;
 | 
| -    result.windowY = windowY;
 | 
| -    result.timeStampSeconds = timeStampSeconds;
 | 
| -    result.button = WebMouseEvent::ButtonNone;
 | 
| -
 | 
| -    // The below choices are matched from GTK.
 | 
| -    static const float scrollbarPixelsPerTick = 160.0f / 3.0f;
 | 
| -
 | 
| -    switch (direction) {
 | 
| -    case MouseWheelDirectionTypeUp:
 | 
| -        result.deltaY = scrollbarPixelsPerTick;
 | 
| -        result.wheelTicksY = 1;
 | 
| -        break;
 | 
| -    case MouseWheelDirectionTypeDown:
 | 
| -        result.deltaY = -scrollbarPixelsPerTick;
 | 
| -        result.wheelTicksY = -1;
 | 
| -        break;
 | 
| -    case MouseWheelDirectionTypeLeft:
 | 
| -        result.deltaX = scrollbarPixelsPerTick;
 | 
| -        result.wheelTicksX = 1;
 | 
| -        break;
 | 
| -    case MouseWheelDirectionTypeRight:
 | 
| -        result.deltaX = -scrollbarPixelsPerTick;
 | 
| -        result.wheelTicksX = -1;
 | 
| -        break;
 | 
| -    }
 | 
| -
 | 
| -    return result;
 | 
| -}
 | 
| -
 | 
| -// WebGestureEvent ------------------------------------------------------------
 | 
| -
 | 
| -// FIXME: remove this obsolete version
 | 
| -WebGestureEvent WebInputEventFactory::gestureEvent(WebInputEvent::Type type,
 | 
| -                                                   double timeStampSeconds,
 | 
| -                                                   int x,
 | 
| -                                                   int y,
 | 
| -                                                   float,
 | 
| -                                                   float,
 | 
| -                                                   int modifiers) {
 | 
| -    return gestureEvent(type, timeStampSeconds, x, y, modifiers);
 | 
| -}
 | 
| -
 | 
| -WebGestureEvent WebInputEventFactory::gestureEvent(WebInputEvent::Type type,
 | 
| -                                                   double timeStampSeconds,
 | 
| -                                                   int x,
 | 
| -                                                   int y,
 | 
| -                                                   int modifiers)
 | 
| -{
 | 
| -    WebGestureEvent result;
 | 
| -
 | 
| -    result.type = type;
 | 
| -    result.x = x;
 | 
| -    result.y = y;
 | 
| -    result.timeStampSeconds = timeStampSeconds;
 | 
| -    result.modifiers = modifiers;
 | 
| -
 | 
| -    return result;
 | 
| -}
 | 
| -
 | 
| -} // namespace WebKit
 | 
| 
 |