| Index: components/test_runner/test_plugin.cc
|
| diff --git a/components/test_runner/test_plugin.cc b/components/test_runner/test_plugin.cc
|
| index 7fb88ea0df9cdc189d1fbe42292744e42b49a0f8..84577697d0d25a3178445e32f83d4d725afe25e0 100644
|
| --- a/components/test_runner/test_plugin.cc
|
| +++ b/components/test_runner/test_plugin.cc
|
| @@ -549,120 +549,11 @@ GLuint TestPlugin::LoadProgram(const std::string& vertex_source,
|
| blink::WebInputEventResult TestPlugin::handleInputEvent(
|
| const blink::WebInputEvent& event,
|
| blink::WebCursorInfo& info) {
|
| - const char* event_name = 0;
|
| - switch (event.type) {
|
| - case blink::WebInputEvent::Undefined:
|
| - event_name = "unknown";
|
| - break;
|
| -
|
| - case blink::WebInputEvent::MouseDown:
|
| - event_name = "MouseDown";
|
| - break;
|
| - case blink::WebInputEvent::MouseUp:
|
| - event_name = "MouseUp";
|
| - break;
|
| - case blink::WebInputEvent::MouseMove:
|
| - event_name = "MouseMove";
|
| - break;
|
| - case blink::WebInputEvent::MouseEnter:
|
| - event_name = "MouseEnter";
|
| - break;
|
| - case blink::WebInputEvent::MouseLeave:
|
| - event_name = "MouseLeave";
|
| - break;
|
| - case blink::WebInputEvent::ContextMenu:
|
| - event_name = "ContextMenu";
|
| - break;
|
| -
|
| - case blink::WebInputEvent::MouseWheel:
|
| - event_name = "MouseWheel";
|
| - break;
|
| -
|
| - case blink::WebInputEvent::RawKeyDown:
|
| - event_name = "RawKeyDown";
|
| - break;
|
| - case blink::WebInputEvent::KeyDown:
|
| - event_name = "KeyDown";
|
| - break;
|
| - case blink::WebInputEvent::KeyUp:
|
| - event_name = "KeyUp";
|
| - break;
|
| - case blink::WebInputEvent::Char:
|
| - event_name = "Char";
|
| - break;
|
| -
|
| - case blink::WebInputEvent::GestureScrollBegin:
|
| - event_name = "GestureScrollBegin";
|
| - break;
|
| - case blink::WebInputEvent::GestureScrollEnd:
|
| - event_name = "GestureScrollEnd";
|
| - break;
|
| - case blink::WebInputEvent::GestureScrollUpdate:
|
| - event_name = "GestureScrollUpdate";
|
| - break;
|
| - case blink::WebInputEvent::GestureFlingStart:
|
| - event_name = "GestureFlingStart";
|
| - break;
|
| - case blink::WebInputEvent::GestureFlingCancel:
|
| - event_name = "GestureFlingCancel";
|
| - break;
|
| - case blink::WebInputEvent::GestureTap:
|
| - event_name = "GestureTap";
|
| - break;
|
| - case blink::WebInputEvent::GestureTapUnconfirmed:
|
| - event_name = "GestureTapUnconfirmed";
|
| - break;
|
| - case blink::WebInputEvent::GestureTapDown:
|
| - event_name = "GestureTapDown";
|
| - break;
|
| - case blink::WebInputEvent::GestureShowPress:
|
| - event_name = "GestureShowPress";
|
| - break;
|
| - case blink::WebInputEvent::GestureTapCancel:
|
| - event_name = "GestureTapCancel";
|
| - break;
|
| - case blink::WebInputEvent::GestureDoubleTap:
|
| - event_name = "GestureDoubleTap";
|
| - break;
|
| - case blink::WebInputEvent::GestureTwoFingerTap:
|
| - event_name = "GestureTwoFingerTap";
|
| - break;
|
| - case blink::WebInputEvent::GestureLongPress:
|
| - event_name = "GestureLongPress";
|
| - break;
|
| - case blink::WebInputEvent::GestureLongTap:
|
| - event_name = "GestureLongTap";
|
| - break;
|
| - case blink::WebInputEvent::GesturePinchBegin:
|
| - event_name = "GesturePinchBegin";
|
| - break;
|
| - case blink::WebInputEvent::GesturePinchEnd:
|
| - event_name = "GesturePinchEnd";
|
| - break;
|
| - case blink::WebInputEvent::GesturePinchUpdate:
|
| - event_name = "GesturePinchUpdate";
|
| - break;
|
| -
|
| - case blink::WebInputEvent::TouchStart:
|
| - event_name = "TouchStart";
|
| - break;
|
| - case blink::WebInputEvent::TouchMove:
|
| - event_name = "TouchMove";
|
| - break;
|
| - case blink::WebInputEvent::TouchEnd:
|
| - event_name = "TouchEnd";
|
| - break;
|
| - case blink::WebInputEvent::TouchCancel:
|
| - event_name = "TouchCancel";
|
| - break;
|
| - default:
|
| - NOTREACHED() << "Received unexpected event type: " << event.type;
|
| - event_name = "unknown";
|
| - break;
|
| - }
|
| -
|
| - delegate_->PrintMessage(std::string("Plugin received event: ") +
|
| - (event_name ? event_name : "unknown") + "\n");
|
| + const char* event_name = blink::WebInputEvent::GetName(event.type);
|
| + if (!strcmp(event_name, "") || !strcmp(event_name, "Undefined"))
|
| + event_name = "unknown";
|
| + delegate_->PrintMessage(std::string("Plugin received event: ") + event_name +
|
| + "\n");
|
| if (print_event_details_)
|
| PrintEventDetails(delegate_, event);
|
| if (print_user_gesture_status_)
|
|
|