| Index: blimp/net/input_message_generator.cc
|
| diff --git a/blimp/net/input_message_generator.cc b/blimp/net/input_message_generator.cc
|
| deleted file mode 100644
|
| index 4131ea7c772abfbe6342f9b8e6450f6a76e3d789..0000000000000000000000000000000000000000
|
| --- a/blimp/net/input_message_generator.cc
|
| +++ /dev/null
|
| @@ -1,225 +0,0 @@
|
| -// Copyright 2015 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "blimp/net/input_message_generator.h"
|
| -
|
| -#include "base/logging.h"
|
| -#include "blimp/common/create_blimp_message.h"
|
| -#include "blimp/common/proto/blimp_message.pb.h"
|
| -#include "blimp/common/proto/input.pb.h"
|
| -#include "blimp/net/blimp_message_processor.h"
|
| -#include "third_party/WebKit/public/platform/WebGestureDevice.h"
|
| -#include "third_party/WebKit/public/platform/WebGestureEvent.h"
|
| -
|
| -namespace blimp {
|
| -namespace {
|
| -
|
| -void CommonWebGestureToProto(const blink::WebGestureEvent& event,
|
| - InputMessage::Type type,
|
| - InputMessage* proto) {
|
| - proto->set_type(type);
|
| - proto->set_timestamp_seconds(event.timeStampSeconds());
|
| -
|
| - GestureCommon* common = proto->mutable_gesture_common();
|
| - common->set_x(event.x);
|
| - common->set_y(event.y);
|
| - common->set_global_x(event.globalX);
|
| - common->set_global_y(event.globalY);
|
| -}
|
| -
|
| -void GestureScrollBeginToProto(const blink::WebGestureEvent& event,
|
| - InputMessage* proto) {
|
| - CommonWebGestureToProto(event, InputMessage::Type_GestureScrollBegin, proto);
|
| -
|
| - GestureScrollBegin* details = proto->mutable_gesture_scroll_begin();
|
| - details->set_delta_x_hint(event.data.scrollBegin.deltaXHint);
|
| - details->set_delta_y_hint(event.data.scrollBegin.deltaYHint);
|
| - details->set_target_viewport(event.data.scrollBegin.targetViewport);
|
| -}
|
| -
|
| -void GestureScrollEndToProto(const blink::WebGestureEvent& event,
|
| - InputMessage* proto) {
|
| - CommonWebGestureToProto(event, InputMessage::Type_GestureScrollEnd, proto);
|
| -}
|
| -
|
| -void GestureScrollUpdateToProto(const blink::WebGestureEvent& event,
|
| - InputMessage* proto) {
|
| - CommonWebGestureToProto(event, InputMessage::Type_GestureScrollUpdate, proto);
|
| -
|
| - GestureScrollUpdate* details = proto->mutable_gesture_scroll_update();
|
| - details->set_delta_x(event.data.scrollUpdate.deltaX);
|
| - details->set_delta_y(event.data.scrollUpdate.deltaY);
|
| - details->set_velocity_x(event.data.scrollUpdate.velocityX);
|
| - details->set_velocity_y(event.data.scrollUpdate.velocityY);
|
| - details->set_previous_update_in_sequence_prevented(
|
| - event.data.scrollUpdate.previousUpdateInSequencePrevented);
|
| - details->set_prevent_propagation(
|
| - event.data.scrollUpdate.preventPropagation);
|
| - details->set_inertial(event.data.scrollUpdate.inertialPhase ==
|
| - blink::WebGestureEvent::MomentumPhase);
|
| -}
|
| -
|
| -void GestureFlingStartToProto(const blink::WebGestureEvent& event,
|
| - InputMessage* proto) {
|
| - CommonWebGestureToProto(event, InputMessage::Type_GestureFlingStart, proto);
|
| -
|
| - GestureFlingStart* details = proto->mutable_gesture_fling_start();
|
| - details->set_velocity_x(event.data.flingStart.velocityX);
|
| - details->set_velocity_y(event.data.flingStart.velocityY);
|
| - details->set_target_viewport(event.data.flingStart.targetViewport);
|
| -}
|
| -
|
| -void GestureFlingCancelToProto(const blink::WebGestureEvent& event,
|
| - InputMessage* proto) {
|
| - CommonWebGestureToProto(event, InputMessage::Type_GestureFlingCancel, proto);
|
| -
|
| - GestureFlingCancel* details = proto->mutable_gesture_fling_cancel();
|
| - details->set_prevent_boosting(event.data.flingCancel.preventBoosting);
|
| -}
|
| -
|
| -void GestureTapToProto(const blink::WebGestureEvent& event,
|
| - InputMessage* proto) {
|
| - CommonWebGestureToProto(event, InputMessage::Type_GestureTap, proto);
|
| -
|
| - GestureTap* details = proto->mutable_gesture_tap();
|
| - details->set_tap_count(event.data.tap.tapCount);
|
| - details->set_width(event.data.tap.width);
|
| - details->set_height(event.data.tap.height);
|
| -}
|
| -
|
| -void GesturePinchBeginToProto(const blink::WebGestureEvent& event,
|
| - InputMessage* proto) {
|
| - CommonWebGestureToProto(event, InputMessage::Type_GesturePinchBegin, proto);
|
| -}
|
| -
|
| -void GesturePinchEndToProto(const blink::WebGestureEvent& event,
|
| - InputMessage* proto) {
|
| - CommonWebGestureToProto(event, InputMessage::Type_GesturePinchEnd, proto);
|
| -}
|
| -
|
| -void GesturePinchUpdateToProto(const blink::WebGestureEvent& event,
|
| - InputMessage* proto) {
|
| - CommonWebGestureToProto(event, InputMessage::Type_GesturePinchUpdate, proto);
|
| -
|
| - GesturePinchUpdate* details = proto->mutable_gesture_pinch_update();
|
| - details->set_zoom_disabled(event.data.pinchUpdate.zoomDisabled);
|
| - details->set_scale(event.data.pinchUpdate.scale);
|
| -}
|
| -
|
| -void GestureTapDownToProto(const blink::WebGestureEvent& event,
|
| - InputMessage* proto) {
|
| - CommonWebGestureToProto(event, InputMessage::Type_GestureTapDown, proto);
|
| -
|
| - GestureTapDown* details = proto->mutable_gesture_tap_down();
|
| - details->set_width(event.data.tapDown.width);
|
| - details->set_height(event.data.tapDown.height);
|
| -}
|
| -
|
| -void GestureTapCancelToProto(const blink::WebGestureEvent& event,
|
| - InputMessage* proto) {
|
| - CommonWebGestureToProto(event, InputMessage::Type_GestureTapCancel, proto);
|
| -}
|
| -
|
| -void GestureTapUnconfirmedToProto(const blink::WebGestureEvent& event,
|
| - InputMessage* proto) {
|
| - CommonWebGestureToProto(event, InputMessage::Type_GestureTapUnconfirmed,
|
| - proto);
|
| -
|
| - GestureTap* details = proto->mutable_gesture_tap();
|
| - details->set_tap_count(event.data.tap.tapCount);
|
| - details->set_width(event.data.tap.width);
|
| - details->set_height(event.data.tap.height);
|
| -}
|
| -
|
| -void GestureShowPressToProto(const blink::WebGestureEvent& event,
|
| - InputMessage* proto) {
|
| - CommonWebGestureToProto(event, InputMessage::Type_GestureShowPress, proto);
|
| -
|
| - GestureShowPress* details = proto->mutable_gesture_show_press();
|
| - details->set_width(event.data.showPress.width);
|
| - details->set_height(event.data.showPress.height);
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -InputMessageGenerator::InputMessageGenerator() {}
|
| -
|
| -InputMessageGenerator::~InputMessageGenerator() {}
|
| -
|
| -std::unique_ptr<BlimpMessage> InputMessageGenerator::GenerateMessage(
|
| - const blink::WebGestureEvent& event) {
|
| - InputMessage* details;
|
| - std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&details);
|
| -
|
| - switch (event.type()) {
|
| - case blink::WebInputEvent::Type::GestureScrollBegin:
|
| - GestureScrollBeginToProto(event, details);
|
| - break;
|
| - case blink::WebInputEvent::Type::GestureScrollEnd:
|
| - GestureScrollEndToProto(event, details);
|
| - break;
|
| - case blink::WebInputEvent::Type::GestureScrollUpdate:
|
| - GestureScrollUpdateToProto(event, details);
|
| - break;
|
| - case blink::WebInputEvent::Type::GestureFlingStart:
|
| - GestureFlingStartToProto(event, details);
|
| - break;
|
| - case blink::WebInputEvent::Type::GestureFlingCancel:
|
| - GestureFlingCancelToProto(event, details);
|
| - break;
|
| - case blink::WebInputEvent::Type::GestureTap:
|
| - GestureTapToProto(event, details);
|
| - break;
|
| - case blink::WebInputEvent::Type::GesturePinchBegin:
|
| - GesturePinchBeginToProto(event, details);
|
| - break;
|
| - case blink::WebInputEvent::Type::GesturePinchEnd:
|
| - GesturePinchEndToProto(event, details);
|
| - break;
|
| - case blink::WebInputEvent::Type::GesturePinchUpdate:
|
| - GesturePinchUpdateToProto(event, details);
|
| - break;
|
| - case blink::WebInputEvent::Type::GestureShowPress:
|
| - GestureShowPressToProto(event, details);
|
| - break;
|
| - case blink::WebInputEvent::Type::GestureTapUnconfirmed:
|
| - GestureTapUnconfirmedToProto(event, details);
|
| - break;
|
| - case blink::WebInputEvent::Type::GestureTapDown:
|
| - GestureTapDownToProto(event, details);
|
| - break;
|
| - case blink::WebInputEvent::Type::GestureTapCancel:
|
| - GestureTapCancelToProto(event, details);
|
| - break;
|
| -
|
| - // Unsupported types:
|
| - case blink::WebInputEvent::Type::Undefined:
|
| - case blink::WebInputEvent::Type::MouseDown:
|
| - case blink::WebInputEvent::Type::MouseUp:
|
| - case blink::WebInputEvent::Type::MouseMove:
|
| - case blink::WebInputEvent::Type::MouseEnter:
|
| - case blink::WebInputEvent::Type::MouseLeave:
|
| - case blink::WebInputEvent::Type::ContextMenu:
|
| - case blink::WebInputEvent::Type::MouseWheel:
|
| - case blink::WebInputEvent::Type::RawKeyDown:
|
| - case blink::WebInputEvent::Type::KeyDown:
|
| - case blink::WebInputEvent::Type::KeyUp:
|
| - case blink::WebInputEvent::Type::Char:
|
| - case blink::WebInputEvent::Type::GestureDoubleTap:
|
| - case blink::WebInputEvent::Type::GestureTwoFingerTap:
|
| - case blink::WebInputEvent::Type::GestureLongPress:
|
| - case blink::WebInputEvent::Type::GestureLongTap:
|
| - case blink::WebInputEvent::Type::TouchStart:
|
| - case blink::WebInputEvent::Type::TouchMove:
|
| - case blink::WebInputEvent::Type::TouchEnd:
|
| - case blink::WebInputEvent::Type::TouchCancel:
|
| - case blink::WebInputEvent::Type::TouchScrollStarted:
|
| - DVLOG(1) << "Unsupported WebInputEvent type " << event.type();
|
| - return nullptr;
|
| - }
|
| -
|
| - return message;
|
| -}
|
| -
|
| -} // namespace blimp
|
|
|