| 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 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1163 | 1163 |
| 1164 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( | 1164 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( |
| 1165 const TouchEventWithLatencyInfo& touch, | 1165 const TouchEventWithLatencyInfo& touch, |
| 1166 InputEventAckState ack_result) { | 1166 InputEventAckState ack_result) { |
| 1167 ScopedVector<ui::TouchEvent> events; | 1167 ScopedVector<ui::TouchEvent> events; |
| 1168 aura::WindowTreeHost* host = window_->GetHost(); | 1168 aura::WindowTreeHost* host = window_->GetHost(); |
| 1169 // |host| is NULL during tests. | 1169 // |host| is NULL during tests. |
| 1170 if (!host) | 1170 if (!host) |
| 1171 return; | 1171 return; |
| 1172 | 1172 |
| 1173 // The TouchScrollStarted event is generated & consumed downstream from the |
| 1174 // TouchEventQueue. So we don't expect an ACK up here. |
| 1175 DCHECK(touch.event.type != blink::WebInputEvent::TouchScrollStarted); |
| 1176 |
| 1173 ui::EventResult result = (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED) | 1177 ui::EventResult result = (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED) |
| 1174 ? ui::ER_HANDLED | 1178 ? ui::ER_HANDLED |
| 1175 : ui::ER_UNHANDLED; | 1179 : ui::ER_UNHANDLED; |
| 1176 | 1180 |
| 1177 blink::WebTouchPoint::State required_state; | 1181 blink::WebTouchPoint::State required_state; |
| 1178 switch (touch.event.type) { | 1182 switch (touch.event.type) { |
| 1179 case blink::WebInputEvent::TouchStart: | 1183 case blink::WebInputEvent::TouchStart: |
| 1180 required_state = blink::WebTouchPoint::StatePressed; | 1184 required_state = blink::WebTouchPoint::StatePressed; |
| 1181 break; | 1185 break; |
| 1182 case blink::WebInputEvent::TouchEnd: | 1186 case blink::WebInputEvent::TouchEnd: |
| (...skipping 1766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2949 | 2953 |
| 2950 //////////////////////////////////////////////////////////////////////////////// | 2954 //////////////////////////////////////////////////////////////////////////////// |
| 2951 // RenderWidgetHostViewBase, public: | 2955 // RenderWidgetHostViewBase, public: |
| 2952 | 2956 |
| 2953 // static | 2957 // static |
| 2954 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2958 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 2955 GetScreenInfoForWindow(results, NULL); | 2959 GetScreenInfoForWindow(results, NULL); |
| 2956 } | 2960 } |
| 2957 | 2961 |
| 2958 } // namespace content | 2962 } // namespace content |
| OLD | NEW |