Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(932)

Unified Diff: content/renderer/render_widget.cc

Issue 76283003: touch: Fix touch-event hit-testing for multiple touch points. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/gpu/input_handler_proxy_unittest.cc ('k') | content/renderer/render_widget_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 9c8cf7d1ab64394d29f04b2fb05a86b2a3193b83..b757f2e9732ba3989047cc7ddf6bae8a8c50263e 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -97,6 +97,7 @@ using blink::WebScreenInfo;
using blink::WebSize;
using blink::WebTextDirection;
using blink::WebTouchEvent;
+using blink::WebTouchPoint;
using blink::WebVector;
using blink::WebWidget;
@@ -1115,9 +1116,17 @@ void RenderWidget::OnHandleInputEvent(const blink::WebInputEvent* input_event,
if (!processed && input_event->type == WebInputEvent::TouchStart) {
const WebTouchEvent& touch_event =
*static_cast<const WebTouchEvent*>(input_event);
- ack_result = HasTouchEventHandlersAt(touch_event.touches[0].position) ?
- INPUT_EVENT_ACK_STATE_NOT_CONSUMED :
- INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
+ // Hit-test for all the pressed touch points. If there is a touch-handler
+ // for any of the touch points, then the renderer should continue to receive
+ // touch events.
+ ack_result = INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
+ for (size_t i = 0; i < touch_event.touchesLength; ++i) {
+ if (touch_event.touches[i].state == WebTouchPoint::StatePressed &&
+ HasTouchEventHandlersAt(touch_event.touches[i].position)) {
+ ack_result = INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
+ break;
+ }
+ }
}
IPC::Message* response =
« no previous file with comments | « content/renderer/gpu/input_handler_proxy_unittest.cc ('k') | content/renderer/render_widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698