[DevTools] Cleanup after moving input to browser.

Source/web/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 69 matching lines @@
             offset = rootView->inputEventsOffsetForEmulation();
             pinchViewport = flooredIntPoint(rootView->page()->frameHost().pinchViewport().visibleRect().location());
             overscrollOffset = rootView->elasticOverscroll();
         }
     }
     return FloatPoint(
         (point.x() - offset.width()) / scale + pinchViewport.x() + overscrollOffset.width(),
         (point.y() - offset.height()) / scale + pinchViewport.y() + overscrollOffset.height());
 }
 
-static int toWebEventModifiers(unsigned platformModifiers)
-{
-    int newModifiers = 0;
-    if (platformModifiers & PlatformEvent::ShiftKey)
-        newModifiers |= WebInputEvent::ShiftKey;
-    if (platformModifiers & PlatformEvent::CtrlKey)
-        newModifiers |= WebInputEvent::ControlKey;
-    if (platformModifiers & PlatformEvent::AltKey)
-        newModifiers |= WebInputEvent::AltKey;
-    if (platformModifiers & PlatformEvent::MetaKey)
-        newModifiers |= WebInputEvent::MetaKey;
-    return newModifiers;
-}
-
 static unsigned toPlatformEventModifiers(int webModifiers)
 {
     unsigned newModifiers = 0;
     if (webModifiers & WebInputEvent::ShiftKey)
         newModifiers |= PlatformEvent::ShiftKey;
     if (webModifiers & WebInputEvent::ControlKey)
         newModifiers |= PlatformEvent::CtrlKey;
     if (webModifiers & WebInputEvent::AltKey)
         newModifiers |= PlatformEvent::AltKey;
     if (webModifiers & WebInputEvent::MetaKey)
@@ skipping 477 matching lines @@
 
     button = WebMouseEvent::ButtonLeft;
     modifiers |= WebInputEvent::LeftButtonDown;
     clickCount = (type == MouseDown || type == MouseUp);
 
     IntPoint localPoint = convertAbsoluteLocationForLayoutObject(touch->absoluteLocation(), *layoutObject);
     x = localPoint.x();
     y = localPoint.y();
 }
 
-WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const PlatformMouseEvent& event)
-{
-    switch (event.type()) {
-    case PlatformEvent::MouseMoved:
-        type = MouseMove;
-        break;
-    case PlatformEvent::MousePressed:
-        type = MouseDown;
-        break;
-    case PlatformEvent::MouseReleased:
-        type = MouseUp;
-        break;
-    default:
-        ASSERT_NOT_REACHED();
-        type = Undefined;
-        return;
-    }
-
-    modifiers = toWebEventModifiers(event.modifiers());
-    timeStampSeconds = event.timestamp();
-
-    // FIXME: Widget is always toplevel, unless it's a popup. We may be able
-    // to get rid of this once we abstract popups into a WebKit API.
-    IntPoint position = widget->convertToContainingWindow(event.position());
-    float scale = 1;
-    if (widget) {
-        FrameView* rootView = toFrameView(widget->root());
-        if (rootView)
-            scale = rootView->inputEventsScaleFactor();
-    }
-    position.scale(scale, scale);
-    x = position.x();
-    y = position.y();
-    globalX = event.globalPosition().x();
-    globalY = event.globalPosition().y();
-    movementX = event.movementDelta().x() * scale;
-    movementY = event.movementDelta().y() * scale;
-
-    button = static_cast<Button>(event.button());
-    clickCount = event.clickCount();
-}
-
 WebMouseWheelEventBuilder::WebMouseWheelEventBuilder(const Widget* widget, const LayoutObject* layoutObject, const WheelEvent& event)
 {
     if (event.type() != EventTypeNames::wheel && event.type() != EventTypeNames::mousewheel)
         return;
     type = WebInputEvent::MouseWheel;
     updateWebMouseEventFromCoreMouseEvent(event, widget, *layoutObject, *this);
     deltaX = -event.deltaX();
     deltaY = -event.deltaY();
     wheelTicksX = event.ticksX();
     wheelTicksY = event.ticksY();
@@ skipping 47 matching lines @@
         return WebInputEvent::KeyDown;
     case PlatformEvent::RawKeyDown:
         return WebInputEvent::RawKeyDown;
     case PlatformEvent::Char:
         return WebInputEvent::Char;
     default:
         return WebInputEvent::Undefined;
     }
 }
 
-WebKeyboardEventBuilder::WebKeyboardEventBuilder(const PlatformKeyboardEvent& event)
-{
-    type = toWebKeyboardEventType(event.type());
-    modifiers = toWebEventModifiers(event.modifiers());
-    if (event.isAutoRepeat())
-        modifiers |= WebInputEvent::IsAutoRepeat;
-    if (event.isKeypad())
-        modifiers |= WebInputEvent::IsKeyPad;
-    isSystemKey = event.isSystemKey();
-    nativeKeyCode = event.nativeVirtualKeyCode();
-    domCode = Platform::current()->domEnumFromCodeString(event.code());
-
-    windowsKeyCode = windowsKeyCodeWithoutLocation(event.windowsVirtualKeyCode());
-    modifiers |= locationModifiersFromWindowsKeyCode(event.windowsVirtualKeyCode());
-
-    event.text().copyTo(text, 0, textLengthCap);
-    event.unmodifiedText().copyTo(unmodifiedText, 0, textLengthCap);
-    memcpy(keyIdentifier, event.keyIdentifier().ascii().data(), std::min(static_cast<unsigned>(keyIdentifierLengthCap), event.keyIdentifier().length()));
-}
-
 static WebTouchPoint toWebTouchPoint(const Touch* touch, const LayoutObject* layoutObject, WebTouchPoint::State state)
 {
     WebTouchPoint point;
     point.id = touch->identifier();
     point.screenPosition = touch->screenLocation();
     point.position = convertAbsoluteLocationForLayoutObjectFloat(touch->absoluteLocation(), *layoutObject);
     point.radiusX = touch->radiusX();
     point.radiusY = touch->radiusY();
     point.rotationAngle = touch->webkitRotationAngle();
     point.force = touch->force();
@@ skipping 75 matching lines @@
     modifiers = getWebInputModifiers(event);
 
     globalX = event.screenX();
     globalY = event.screenY();
     IntPoint localPoint = convertAbsoluteLocationForLayoutObject(event.absoluteLocation(), *layoutObject);
     x = localPoint.x();
     y = localPoint.y();
 }
 
 } // namespace blink