| Index: content/browser/renderer_host/input/immediate_input_router.cc
|
| diff --git a/content/browser/renderer_host/input/immediate_input_router.cc b/content/browser/renderer_host/input/immediate_input_router.cc
|
| index 444678fda27412acab88c21914cdf0a8ff814935..06bbc950e1d798a648fac65502f6c1c57365badc 100644
|
| --- a/content/browser/renderer_host/input/immediate_input_router.cc
|
| +++ b/content/browser/renderer_host/input/immediate_input_router.cc
|
| @@ -30,11 +30,11 @@
|
| using base::Time;
|
| using base::TimeDelta;
|
| using base::TimeTicks;
|
| -using WebKit::WebGestureEvent;
|
| -using WebKit::WebInputEvent;
|
| -using WebKit::WebKeyboardEvent;
|
| -using WebKit::WebMouseEvent;
|
| -using WebKit::WebMouseWheelEvent;
|
| +using blink::WebGestureEvent;
|
| +using blink::WebInputEvent;
|
| +using blink::WebKeyboardEvent;
|
| +using blink::WebMouseEvent;
|
| +using blink::WebMouseWheelEvent;
|
|
|
| namespace content {
|
| namespace {
|
| @@ -355,8 +355,8 @@ bool ImmediateInputRouter::OfferToOverscrollController(
|
|
|
| if (disposition == OverscrollController::SHOULD_FORWARD_TO_GESTURE_FILTER) {
|
| DCHECK(WebInputEvent::isGestureEventType(input_event.type));
|
| - const WebKit::WebGestureEvent& gesture_event =
|
| - static_cast<const WebKit::WebGestureEvent&>(input_event);
|
| + const blink::WebGestureEvent& gesture_event =
|
| + static_cast<const blink::WebGestureEvent&>(input_event);
|
| // An ACK is expected for the event, so mark it as consumed.
|
| consumed = !gesture_event_filter_->ShouldForward(
|
| GestureEventWithLatencyInfo(gesture_event, latency_info));
|
| @@ -497,7 +497,7 @@ void ImmediateInputRouter::ProcessInputEventAck(
|
| }
|
|
|
| void ImmediateInputRouter::ProcessKeyboardAck(
|
| - WebKit::WebInputEvent::Type type,
|
| + blink::WebInputEvent::Type type,
|
| InputEventAckState ack_result) {
|
| if (key_queue_.empty()) {
|
| ack_handler_->OnUnexpectedEventAck(InputAckHandler::UNEXPECTED_ACK);
|
| @@ -518,7 +518,7 @@ void ImmediateInputRouter::ProcessKeyboardAck(
|
| }
|
| }
|
|
|
| -void ImmediateInputRouter::ProcessMouseAck(WebKit::WebInputEvent::Type type,
|
| +void ImmediateInputRouter::ProcessMouseAck(blink::WebInputEvent::Type type,
|
| InputEventAckState ack_result) {
|
| if (type != WebInputEvent::MouseMove)
|
| return;
|
|
|