| Index: content/common/input/web_input_event_traits.cc
|
| diff --git a/content/common/input/web_input_event_traits.cc b/content/common/input/web_input_event_traits.cc
|
| index 2f2eb7f098fe67e217d0e3a16159c56bb9f8722e..48787a298c844e0e3841964e4a3a0646c937c91e 100644
|
| --- a/content/common/input/web_input_event_traits.cc
|
| +++ b/content/common/input/web_input_event_traits.cc
|
| @@ -6,12 +6,12 @@
|
|
|
| #include "base/logging.h"
|
|
|
| -using WebKit::WebGestureEvent;
|
| -using WebKit::WebInputEvent;
|
| -using WebKit::WebKeyboardEvent;
|
| -using WebKit::WebMouseEvent;
|
| -using WebKit::WebMouseWheelEvent;
|
| -using WebKit::WebTouchEvent;
|
| +using blink::WebGestureEvent;
|
| +using blink::WebInputEvent;
|
| +using blink::WebKeyboardEvent;
|
| +using blink::WebMouseEvent;
|
| +using blink::WebMouseWheelEvent;
|
| +using blink::WebTouchEvent;
|
|
|
| namespace content {
|
| namespace {
|
| @@ -106,8 +106,8 @@ void Coalesce(const WebTouchEvent& event_to_coalesce, WebTouchEvent* event) {
|
| WebTouchEvent old_event = *event;
|
| *event = event_to_coalesce;
|
| for (unsigned i = 0; i < event->touchesLength; ++i) {
|
| - if (old_event.touches[i].state == WebKit::WebTouchPoint::StateMoved)
|
| - event->touches[i].state = WebKit::WebTouchPoint::StateMoved;
|
| + if (old_event.touches[i].state == blink::WebTouchPoint::StateMoved)
|
| + event->touches[i].state = blink::WebTouchPoint::StateMoved;
|
| }
|
| }
|
|
|
| @@ -237,7 +237,7 @@ const char* WebInputEventTraits::GetName(WebInputEvent::Type type) {
|
| CASE_TYPE(TouchEnd);
|
| CASE_TYPE(TouchCancel);
|
| default:
|
| - // Must include default to let WebKit::WebInputEvent add new event types
|
| + // Must include default to let blink::WebInputEvent add new event types
|
| // before they're added here.
|
| DLOG(WARNING) <<
|
| "Unhandled WebInputEvent type in WebInputEventTraits::GetName.\n";
|
|
|