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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 11773007: Add initial support for handling touch events in desktop chrome AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 months 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 | « no previous file | ui/views/widget/desktop_aura/desktop_root_window_host_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_view_aura.cc (revision 175450)
+++ content/browser/renderer_host/render_widget_host_view_aura.cc (working copy)
@@ -1506,7 +1506,8 @@
}
// Forward event to renderer.
- if (CanRendererHandleEvent(event))
+ if (CanRendererHandleEvent(event) &&
+ !(event->flags() & ui::EF_FROM_TOUCH))
host_->ForwardMouseEvent(mouse_event);
}
return;
@@ -1533,7 +1534,8 @@
MakeWebMouseWheelEvent(static_cast<ui::MouseWheelEvent*>(event));
if (mouse_wheel_event.deltaX != 0 || mouse_wheel_event.deltaY != 0)
host_->ForwardWheelEvent(mouse_wheel_event);
- } else if (CanRendererHandleEvent(event)) {
+ } else if (CanRendererHandleEvent(event) &&
+ !(event->flags() & ui::EF_FROM_TOUCH)) {
WebKit::WebMouseEvent mouse_event = MakeWebMouseEvent(event);
ModifyEventMovementAndCoords(&mouse_event);
host_->ForwardMouseEvent(mouse_event);
@@ -1555,7 +1557,7 @@
// Needed to propagate mouse event to native_tab_contents_view_aura.
// TODO(pkotwicz): Find a better way of doing this.
- if (window_->parent()->delegate())
+ if (window_->parent()->delegate() && !(event->flags() & ui::EF_FROM_TOUCH))
window_->parent()->delegate()->OnMouseEvent(event);
event->SetHandled();
« no previous file with comments | « no previous file | ui/views/widget/desktop_aura/desktop_root_window_host_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698