| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| index 8d4124abd4fb984d70cc79530b59edb662f318ce..b5905bc84b14a805be1dc43187064e9e22a0845b 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -111,15 +111,6 @@ BOOL CALLBACK ShowWindowsCallback(HWND window, LPARAM param) {
|
| }
|
| #endif
|
|
|
| -ui::TouchStatus DecideTouchStatus(const WebKit::WebTouchEvent& event,
|
| - WebKit::WebTouchPoint* point) {
|
| - if (event.type == WebKit::WebInputEvent::TouchEnd &&
|
| - event.touchesLength == 0)
|
| - return ui::TOUCH_STATUS_QUEUED_END;
|
| -
|
| - return ui::TOUCH_STATUS_QUEUED;
|
| -}
|
| -
|
| void UpdateWebTouchEventAfterDispatch(WebKit::WebTouchEvent* event,
|
| WebKit::WebTouchPoint* point) {
|
| if (point->state != WebKit::WebTouchPoint::StateReleased)
|
| @@ -1546,8 +1537,7 @@ ui::EventResult RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
|
| return ui::ER_HANDLED;
|
| }
|
|
|
| -ui::TouchStatus RenderWidgetHostViewAura::OnTouchEvent(
|
| - ui::TouchEvent* event) {
|
| +ui::EventResult RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) {
|
| TRACE_EVENT0("browser", "RenderWidgetHostViewAura::OnTouchEvent");
|
| // Update the touch event first.
|
| WebKit::WebTouchPoint* point = UpdateWebTouchEvent(event,
|
| @@ -1558,10 +1548,10 @@ ui::TouchStatus RenderWidgetHostViewAura::OnTouchEvent(
|
| if (point && host_->has_touch_handler()) {
|
| host_->ForwardTouchEvent(touch_event_);
|
| UpdateWebTouchEventAfterDispatch(&touch_event_, point);
|
| - return DecideTouchStatus(touch_event_, point);
|
| + return ui::ER_ASYNC;
|
| }
|
|
|
| - return ui::TOUCH_STATUS_UNKNOWN;
|
| + return ui::ER_UNHANDLED;
|
| }
|
|
|
| ui::EventResult RenderWidgetHostViewAura::OnGestureEvent(
|
|
|