| 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_android.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_android.h" |
| 6 | 6 |
| 7 #include <android/bitmap.h> | 7 #include <android/bitmap.h> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1059 bool is_pinned_to_left, bool is_pinned_to_right) { | 1059 bool is_pinned_to_left, bool is_pinned_to_right) { |
| 1060 // intentionally empty, like RenderWidgetHostViewViews | 1060 // intentionally empty, like RenderWidgetHostViewViews |
| 1061 } | 1061 } |
| 1062 | 1062 |
| 1063 void RenderWidgetHostViewAndroid::UnhandledWheelEvent( | 1063 void RenderWidgetHostViewAndroid::UnhandledWheelEvent( |
| 1064 const blink::WebMouseWheelEvent& event) { | 1064 const blink::WebMouseWheelEvent& event) { |
| 1065 // intentionally empty, like RenderWidgetHostViewViews | 1065 // intentionally empty, like RenderWidgetHostViewViews |
| 1066 } | 1066 } |
| 1067 | 1067 |
| 1068 void RenderWidgetHostViewAndroid::GestureEventAck( | 1068 void RenderWidgetHostViewAndroid::GestureEventAck( |
| 1069 int gesture_event_type, | 1069 const blink::WebGestureEvent& event, |
| 1070 InputEventAckState ack_result) { | 1070 InputEventAckState ack_result) { |
| 1071 if (gesture_event_type == blink::WebInputEvent::GestureScrollUpdate && | 1071 if (event.type == blink::WebInputEvent::GestureScrollUpdate && |
| 1072 ack_result == INPUT_EVENT_ACK_STATE_CONSUMED) { | 1072 ack_result == INPUT_EVENT_ACK_STATE_CONSUMED) { |
| 1073 content_view_core_->OnScrollUpdateGestureConsumed(); | 1073 content_view_core_->OnScrollUpdateGestureConsumed(); |
| 1074 } | 1074 } |
| 1075 if (gesture_event_type == blink::WebInputEvent::GestureFlingStart && | 1075 if (event.type == blink::WebInputEvent::GestureFlingStart && |
| 1076 ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS) { | 1076 ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS) { |
| 1077 content_view_core_->UnhandledFlingStartEvent(); | 1077 content_view_core_->UnhandledFlingStartEvent( |
| 1078 event.data.flingStart.velocityX, |
| 1079 event.data.flingStart.velocityY); |
| 1078 } | 1080 } |
| 1079 } | 1081 } |
| 1080 | 1082 |
| 1081 InputEventAckState RenderWidgetHostViewAndroid::FilterInputEvent( | 1083 InputEventAckState RenderWidgetHostViewAndroid::FilterInputEvent( |
| 1082 const blink::WebInputEvent& input_event) { | 1084 const blink::WebInputEvent& input_event) { |
| 1083 if (!host_) | 1085 if (!host_) |
| 1084 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 1086 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
| 1085 | 1087 |
| 1086 if (input_event.type == blink::WebInputEvent::GestureTapDown || | 1088 if (input_event.type == blink::WebInputEvent::GestureTapDown || |
| 1087 input_event.type == blink::WebInputEvent::TouchStart) { | 1089 input_event.type == blink::WebInputEvent::TouchStart) { |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1191 if (host_) | 1193 if (host_) |
| 1192 host_->ForwardKeyboardEvent(event); | 1194 host_->ForwardKeyboardEvent(event); |
| 1193 } | 1195 } |
| 1194 | 1196 |
| 1195 void RenderWidgetHostViewAndroid::SendTouchEvent( | 1197 void RenderWidgetHostViewAndroid::SendTouchEvent( |
| 1196 const blink::WebTouchEvent& event) { | 1198 const blink::WebTouchEvent& event) { |
| 1197 if (host_) | 1199 if (host_) |
| 1198 host_->ForwardTouchEventWithLatencyInfo(event, CreateLatencyInfo(event)); | 1200 host_->ForwardTouchEventWithLatencyInfo(event, CreateLatencyInfo(event)); |
| 1199 } | 1201 } |
| 1200 | 1202 |
| 1201 | |
| 1202 void RenderWidgetHostViewAndroid::SendMouseEvent( | 1203 void RenderWidgetHostViewAndroid::SendMouseEvent( |
| 1203 const blink::WebMouseEvent& event) { | 1204 const blink::WebMouseEvent& event) { |
| 1204 if (host_) | 1205 if (host_) |
| 1205 host_->ForwardMouseEvent(event); | 1206 host_->ForwardMouseEvent(event); |
| 1206 } | 1207 } |
| 1207 | 1208 |
| 1208 void RenderWidgetHostViewAndroid::SendMouseWheelEvent( | 1209 void RenderWidgetHostViewAndroid::SendMouseWheelEvent( |
| 1209 const blink::WebMouseWheelEvent& event) { | 1210 const blink::WebMouseWheelEvent& event) { |
| 1210 if (host_) | 1211 if (host_) |
| 1211 host_->ForwardWheelEvent(event); | 1212 host_->ForwardWheelEvent(event); |
| 1212 } | 1213 } |
| 1213 | 1214 |
| 1214 void RenderWidgetHostViewAndroid::SendGestureEvent( | 1215 void RenderWidgetHostViewAndroid::SendGestureEvent( |
| 1215 const blink::WebGestureEvent& event) { | 1216 const blink::WebGestureEvent& event) { |
| 1216 // Sending a gesture that may trigger overscroll should resume the effect. | 1217 // Sending a gesture that may trigger overscroll should resume the effect. |
| 1217 if (overscroll_effect_enabled_) | 1218 if (overscroll_effect_enabled_) |
| 1218 overscroll_effect_->Enable(); | 1219 overscroll_effect_->Enable(); |
| 1219 | 1220 |
| 1220 if (host_) | 1221 if (host_) |
| 1221 host_->ForwardGestureEventWithLatencyInfo(event, CreateLatencyInfo(event)); | 1222 host_->ForwardGestureEvent(event); |
| 1222 } | 1223 } |
| 1223 | 1224 |
| 1224 void RenderWidgetHostViewAndroid::SelectRange(const gfx::Point& start, | 1225 void RenderWidgetHostViewAndroid::SelectRange(const gfx::Point& start, |
| 1225 const gfx::Point& end) { | 1226 const gfx::Point& end) { |
| 1226 if (host_) | 1227 if (host_) |
| 1227 host_->SelectRange(start, end); | 1228 host_->SelectRange(start, end); |
| 1228 } | 1229 } |
| 1229 | 1230 |
| 1230 void RenderWidgetHostViewAndroid::MoveCaret(const gfx::Point& point) { | 1231 void RenderWidgetHostViewAndroid::MoveCaret(const gfx::Point& point) { |
| 1231 if (host_) | 1232 if (host_) |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1323 | 1324 |
| 1324 void RenderWidgetHostViewAndroid::RunAckCallbacks() { | 1325 void RenderWidgetHostViewAndroid::RunAckCallbacks() { |
| 1325 while (!ack_callbacks_.empty()) { | 1326 while (!ack_callbacks_.empty()) { |
| 1326 ack_callbacks_.front().Run(); | 1327 ack_callbacks_.front().Run(); |
| 1327 ack_callbacks_.pop(); | 1328 ack_callbacks_.pop(); |
| 1328 } | 1329 } |
| 1329 } | 1330 } |
| 1330 | 1331 |
| 1331 void RenderWidgetHostViewAndroid::HasTouchEventHandlers( | 1332 void RenderWidgetHostViewAndroid::HasTouchEventHandlers( |
| 1332 bool need_touch_events) { | 1333 bool need_touch_events) { |
| 1333 if (content_view_core_) | |
| 1334 content_view_core_->HasTouchEventHandlers(need_touch_events); | |
| 1335 } | 1334 } |
| 1336 | 1335 |
| 1337 void RenderWidgetHostViewAndroid::OnCompositingDidCommit() { | 1336 void RenderWidgetHostViewAndroid::OnCompositingDidCommit() { |
| 1338 RunAckCallbacks(); | 1337 RunAckCallbacks(); |
| 1339 } | 1338 } |
| 1340 | 1339 |
| 1341 void RenderWidgetHostViewAndroid::OnDetachCompositor() { | 1340 void RenderWidgetHostViewAndroid::OnDetachCompositor() { |
| 1342 DCHECK(content_view_core_); | 1341 DCHECK(content_view_core_); |
| 1343 DCHECK(!using_synchronous_compositor_); | 1342 DCHECK(!using_synchronous_compositor_); |
| 1344 RunAckCallbacks(); | 1343 RunAckCallbacks(); |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1448 // RenderWidgetHostView, public: | 1447 // RenderWidgetHostView, public: |
| 1449 | 1448 |
| 1450 // static | 1449 // static |
| 1451 RenderWidgetHostView* | 1450 RenderWidgetHostView* |
| 1452 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { | 1451 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { |
| 1453 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); | 1452 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); |
| 1454 return new RenderWidgetHostViewAndroid(rwhi, NULL); | 1453 return new RenderWidgetHostViewAndroid(rwhi, NULL); |
| 1455 } | 1454 } |
| 1456 | 1455 |
| 1457 } // namespace content | 1456 } // namespace content |
| OLD | NEW |