Chromium Code Reviews| 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 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1148 | 1148 |
| 1149 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( | 1149 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( |
| 1150 const TouchEventWithLatencyInfo& touch, | 1150 const TouchEventWithLatencyInfo& touch, |
| 1151 InputEventAckState ack_result) { | 1151 InputEventAckState ack_result) { |
| 1152 ScopedVector<ui::TouchEvent> events; | 1152 ScopedVector<ui::TouchEvent> events; |
| 1153 aura::WindowTreeHost* host = window_->GetHost(); | 1153 aura::WindowTreeHost* host = window_->GetHost(); |
| 1154 // |host| is NULL during tests. | 1154 // |host| is NULL during tests. |
| 1155 if (!host) | 1155 if (!host) |
| 1156 return; | 1156 return; |
| 1157 | 1157 |
| 1158 DCHECK(touch.event.type != blink::WebInputEvent::TouchScrollStarted); | |
|
tdresser
2016/03/30 19:19:01
Add comment.
mustaq
2016/03/30 20:21:05
Done.
| |
| 1159 | |
| 1158 ui::EventResult result = (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED) | 1160 ui::EventResult result = (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED) |
| 1159 ? ui::ER_HANDLED | 1161 ? ui::ER_HANDLED |
| 1160 : ui::ER_UNHANDLED; | 1162 : ui::ER_UNHANDLED; |
| 1161 | 1163 |
| 1162 blink::WebTouchPoint::State required_state; | 1164 blink::WebTouchPoint::State required_state; |
| 1163 switch (touch.event.type) { | 1165 switch (touch.event.type) { |
| 1164 case blink::WebInputEvent::TouchStart: | 1166 case blink::WebInputEvent::TouchStart: |
| 1165 required_state = blink::WebTouchPoint::StatePressed; | 1167 required_state = blink::WebTouchPoint::StatePressed; |
| 1166 break; | 1168 break; |
| 1167 case blink::WebInputEvent::TouchEnd: | 1169 case blink::WebInputEvent::TouchEnd: |
| (...skipping 1762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2930 | 2932 |
| 2931 //////////////////////////////////////////////////////////////////////////////// | 2933 //////////////////////////////////////////////////////////////////////////////// |
| 2932 // RenderWidgetHostViewBase, public: | 2934 // RenderWidgetHostViewBase, public: |
| 2933 | 2935 |
| 2934 // static | 2936 // static |
| 2935 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2937 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 2936 GetScreenInfoForWindow(results, NULL); | 2938 GetScreenInfoForWindow(results, NULL); |
| 2937 } | 2939 } |
| 2938 | 2940 |
| 2939 } // namespace content | 2941 } // namespace content |
| OLD | NEW |