From bdb6d25cc3f4613867332b6700cdb05b409f7bad Mon Sep 17 00:00:00 2001
From: "sadrul@chromium.org"
<sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 3 Dec 2012 20:29:46 +0000
Subject: events: Start changing EventHandler interface to not return a value.
The EventHandler should explicitly stop the propagation of an event
(Event::StopPropagation()), or mark it has having been handled
(Event::PreventDefault()), by calling a function on the event
object, instead of returning a value from the event-handler functions.
This patch takes the first step by converting EventHandler::OnEvent. Subsequent
patches will conver the event-specific callbacks (OnKeyEvent etc.)
BUG=163618
Review URL: https://codereview.chromium.org/11308322
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170801 0039d316-1c4b-4281-b951-d872f2087c98
---
ui/aura/root_window.cc | 47 +++++++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 22 deletions(-)
(limited to 'ui/aura/root_window.cc')
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index dbcce02..33347cb 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -261,8 +261,8 @@ bool RootWindow::DispatchGestureEvent(ui::GestureEvent* event) {
if (target) {
event->ConvertLocationToTarget(static_cast<Window*>(this), target);
- ui::EventResult status = ProcessGestureEvent(target, event);
- return status != ui::ER_UNHANDLED;
+ ProcessGestureEvent(target, event);
+ return event->handled();
}
return false;
@@ -615,37 +615,35 @@ void RootWindow::HandleMouseMoved(const ui::MouseEvent& event, Window* target) {
}
}
-bool RootWindow::ProcessMouseEvent(Window* target, ui::MouseEvent* event) {
+void RootWindow::ProcessMouseEvent(Window* target, ui::MouseEvent* event) {
base::AutoReset<Window*> reset(&event_dispatch_target_, target);
- return ProcessEvent(target, event) != ui::ER_UNHANDLED;
+ ProcessEvent(target, event);
}
-bool RootWindow::ProcessKeyEvent(Window* target, ui::KeyEvent* event) {
+void RootWindow::ProcessKeyEvent(Window* target, ui::KeyEvent* event) {
if (!target)
target = this;
base::AutoReset<Window*> reset(&event_dispatch_target_, target);
- return ProcessEvent(target, event) != ui::ER_UNHANDLED;
+ ProcessEvent(target, event);
}
-bool RootWindow::ProcessScrollEvent(Window* target, ui::ScrollEvent* event) {
+void RootWindow::ProcessScrollEvent(Window* target, ui::ScrollEvent* event) {
base::AutoReset<Window*> reset(&event_dispatch_target_, target);
- return ProcessEvent(target, event) != ui::ER_UNHANDLED;
+ ProcessEvent(target, event);
}
-ui::EventResult RootWindow::ProcessTouchEvent(Window* target,
- ui::TouchEvent* event) {
+void RootWindow::ProcessTouchEvent(Window* target, ui::TouchEvent* event) {
if (!target)
target = this;
base::AutoReset<Window*> reset(&event_dispatch_target_, target);
- return static_cast<ui::EventResult>(ProcessEvent(target, event));
+ ProcessEvent(target, event);
}
-ui::EventResult RootWindow::ProcessGestureEvent(Window* target,
- ui::GestureEvent* event) {
+void RootWindow::ProcessGestureEvent(Window* target, ui::GestureEvent* event) {
if (!target)
target = this;
base::AutoReset<Window*> reset(&event_dispatch_target_, target);
- return static_cast<ui::EventResult>(ProcessEvent(target, event));
+ ProcessEvent(target, event);
}
bool RootWindow::ProcessGestures(ui::GestureRecognizer::Gestures* gestures) {
@@ -788,7 +786,8 @@ bool RootWindow::OnHostKeyEvent(ui::KeyEvent* event) {
client::GetFocusClient(this)->FocusWindow(NULL, NULL);
return false;
}
- return ProcessKeyEvent(focused_window, event);
+ ProcessKeyEvent(focused_window, event);
+ return event->handled();
}
bool RootWindow::OnHostMouseEvent(ui::MouseEvent* event) {
@@ -831,7 +830,8 @@ bool RootWindow::OnHostScrollEvent(ui::ScrollEvent* event) {
flags |= ui::EF_IS_NON_CLIENT;
event->set_flags(flags);
event->ConvertLocationToTarget(static_cast<Window*>(this), target);
- return ProcessScrollEvent(target, event);
+ ProcessScrollEvent(target, event);
+ return event->handled();
}
return false;
}
@@ -856,7 +856,6 @@ bool RootWindow::OnHostTouchEvent(ui::TouchEvent* event) {
}
TransformEventForDeviceScaleFactor(event);
bool handled = false;
- ui::EventResult result = ui::ER_UNHANDLED;
Window* target = client::GetCaptureWindow(this);
if (!target) {
target = ConsumerToWindow(
@@ -867,11 +866,13 @@ bool RootWindow::OnHostTouchEvent(ui::TouchEvent* event) {
}
}
+ ui::EventResult result = ui::ER_UNHANDLED;
if (!target && !bounds().Contains(event->location())) {
// If the initial touch is outside the root window, target the root.
target = this;
- result = ProcessTouchEvent(target, event);
- CHECK_EQ(ui::ER_UNHANDLED, result);
+ ProcessTouchEvent(target, event);
+ CHECK_EQ(ui::ER_UNHANDLED, event->result());
+ result = event->result();
} else {
// We only come here when the first contact was within the root window.
if (!target) {
@@ -882,8 +883,9 @@ bool RootWindow::OnHostTouchEvent(ui::TouchEvent* event) {
ui::TouchEvent translated_event(
*event, static_cast<Window*>(this), target);
- result = ProcessTouchEvent(target, &translated_event);
- handled = result != ui::ER_UNHANDLED;
+ ProcessTouchEvent(target, &translated_event);
+ handled = translated_event.handled();
+ result = translated_event.result();
}
// Get the list of GestureEvents from GestureRecognizer.
@@ -991,7 +993,8 @@ bool RootWindow::DispatchMouseEventToTarget(ui::MouseEvent* event,
event->ConvertLocationToTarget(static_cast<Window*>(this), target);
if (IsNonClientLocation(target, event->location()))
event->set_flags(event->flags() | ui::EF_IS_NON_CLIENT);
- return ProcessMouseEvent(target, event);
+ ProcessMouseEvent(target, event);
+ return event->handled();
}
return false;
}
--
cgit v1.1