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

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

Issue 11592011: events: Update mouse-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 180c2438d6f53fe69e693db5477ce7dd2e146fe3..1a9cc87b4d9ec9beaad08e417d3260382f18cc44 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1502,7 +1502,7 @@ void RenderWidgetHostViewAura::OnKeyEvent(ui::KeyEvent* event) {
event->SetHandled();
}
-ui::EventResult RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
+void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
TRACE_EVENT0("browser", "RenderWidgetHostViewAura::OnMouseEvent");
if (mouse_locked_) {
@@ -1535,8 +1535,7 @@ ui::EventResult RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
if (CanRendererHandleEvent(event))
host_->ForwardMouseEvent(mouse_event);
}
-
- return ui::ER_UNHANDLED;
+ return;
}
// As the overscroll is handled during scroll events from the trackpad, the
@@ -1550,7 +1549,8 @@ ui::EventResult RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
event->flags() & ui::EF_IS_SYNTHESIZED &&
(event->type() == ui::ET_MOUSE_ENTERED ||
event->type() == ui::ET_MOUSE_MOVED)) {
- return ui::ER_CONSUMED;
+ event->StopPropagation();
+ return;
}
if (event->type() == ui::ET_MOUSEWHEEL) {
@@ -1583,8 +1583,7 @@ ui::EventResult RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
if (window_->parent()->delegate())
window_->parent()->delegate()->OnMouseEvent(event);
- // Return true so that we receive released/drag events.
- return ui::ER_HANDLED;
+ event->SetHandled();
}
void RenderWidgetHostViewAura::OnScrollEvent(ui::ScrollEvent* event) {
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.h ('k') | content/browser/web_contents/web_contents_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698