| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1015 InputEventAckState ack_result) { | 1015 InputEventAckState ack_result) { |
| 1016 if (overscroll_controller_) { | 1016 if (overscroll_controller_) { |
| 1017 overscroll_controller_->ReceivedEventACK( | 1017 overscroll_controller_->ReceivedEventACK( |
| 1018 event, (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result)); | 1018 event, (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result)); |
| 1019 } | 1019 } |
| 1020 } | 1020 } |
| 1021 | 1021 |
| 1022 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( | 1022 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( |
| 1023 const TouchEventWithLatencyInfo& touch, | 1023 const TouchEventWithLatencyInfo& touch, |
| 1024 InputEventAckState ack_result) { | 1024 InputEventAckState ack_result) { |
| 1025 ScopedVector<ui::TouchEvent> events; | |
| 1026 aura::WindowTreeHost* host = window_->GetHost(); | 1025 aura::WindowTreeHost* host = window_->GetHost(); |
| 1027 // |host| is NULL during tests. | 1026 // |host| is NULL during tests. |
| 1028 if (!host) | 1027 if (!host) |
| 1029 return; | 1028 return; |
| 1030 | 1029 |
| 1031 // The TouchScrollStarted event is generated & consumed downstream from the | 1030 // The TouchScrollStarted event is generated & consumed downstream from the |
| 1032 // TouchEventQueue. So we don't expect an ACK up here. | 1031 // TouchEventQueue. So we don't expect an ACK up here. |
| 1033 DCHECK(touch.event.type() != blink::WebInputEvent::TouchScrollStarted); | 1032 DCHECK(touch.event.type() != blink::WebInputEvent::TouchScrollStarted); |
| 1034 | 1033 |
| 1035 ui::EventResult result = (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED) | 1034 ui::EventResult result = (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED) |
| (...skipping 1333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2369 | 2368 |
| 2370 void RenderWidgetHostViewAura::SetPopupChild( | 2369 void RenderWidgetHostViewAura::SetPopupChild( |
| 2371 RenderWidgetHostViewAura* popup_child_host_view) { | 2370 RenderWidgetHostViewAura* popup_child_host_view) { |
| 2372 popup_child_host_view_ = popup_child_host_view; | 2371 popup_child_host_view_ = popup_child_host_view; |
| 2373 event_handler_->SetPopupChild( | 2372 event_handler_->SetPopupChild( |
| 2374 popup_child_host_view, | 2373 popup_child_host_view, |
| 2375 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); | 2374 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); |
| 2376 } | 2375 } |
| 2377 | 2376 |
| 2378 } // namespace content | 2377 } // namespace content |
| OLD | NEW |