Commit 6f66c597 authored by Maksim Sisov's avatar Maksim Sisov Committed by Commit Bot

Convert DispatchEventFromNativeUiEvent and its callers to use OnceCallback

This cl doesn't bring any functionality change, but changes
DispatchEventFromNativeUiEvent and its callers to use OnceCallback
and BindOnce.

Bug: 714018
Change-Id: Ibfbda691fab9ae2e4e597d7b18917312d795fb02
Reviewed-on: https://chromium-review.googlesource.com/808285Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#521757}
parent d46607cc
...@@ -27,7 +27,7 @@ class EventObserver { ...@@ -27,7 +27,7 @@ class EventObserver {
public: public:
void EventDispatchCallback(Event* event) { void EventDispatchCallback(Event* event) {
DispatchEventFromNativeUiEvent( DispatchEventFromNativeUiEvent(
event, base::Bind(&EventObserver::OnEvent, base::Unretained(this))); event, base::BindOnce(&EventObserver::OnEvent, base::Unretained(this)));
} }
void OnEvent(Event* event) { void OnEvent(Event* event) {
......
...@@ -8,26 +8,27 @@ ...@@ -8,26 +8,27 @@
namespace ui { namespace ui {
void DispatchEventFromNativeUiEvent(const base::NativeEvent& native_event, void DispatchEventFromNativeUiEvent(
base::Callback<void(ui::Event*)> callback) { const base::NativeEvent& native_event,
base::OnceCallback<void(ui::Event*)> callback) {
ui::Event* native_ui_event = static_cast<ui::Event*>(native_event); ui::Event* native_ui_event = static_cast<ui::Event*>(native_event);
if (native_ui_event->IsKeyEvent()) { if (native_ui_event->IsKeyEvent()) {
ui::KeyEvent key_event(native_event); ui::KeyEvent key_event(native_event);
callback.Run(&key_event); std::move(callback).Run(&key_event);
} else if (native_ui_event->IsMouseWheelEvent()) { } else if (native_ui_event->IsMouseWheelEvent()) {
ui::MouseWheelEvent wheel_event(native_event); ui::MouseWheelEvent wheel_event(native_event);
callback.Run(&wheel_event); std::move(callback).Run(&wheel_event);
} else if (native_ui_event->IsMouseEvent()) { } else if (native_ui_event->IsMouseEvent()) {
ui::MouseEvent mouse_event(native_event); ui::MouseEvent mouse_event(native_event);
callback.Run(&mouse_event); std::move(callback).Run(&mouse_event);
} else if (native_ui_event->IsTouchEvent()) { } else if (native_ui_event->IsTouchEvent()) {
ui::TouchEvent touch_event(native_event); ui::TouchEvent touch_event(native_event);
callback.Run(&touch_event); std::move(callback).Run(&touch_event);
} else if (native_ui_event->IsScrollEvent()) { } else if (native_ui_event->IsScrollEvent()) {
ui::ScrollEvent scroll_event(native_event); ui::ScrollEvent scroll_event(native_event);
callback.Run(&scroll_event); std::move(callback).Run(&scroll_event);
} else if (native_ui_event->IsGestureEvent()) { } else if (native_ui_event->IsGestureEvent()) {
callback.Run(native_ui_event); std::move(callback).Run(native_ui_event);
// TODO(mohsen): Use the same pattern for scroll/touch/wheel events. // TODO(mohsen): Use the same pattern for scroll/touch/wheel events.
// Apparently, there is no need for them to wrap the |native_event|. // Apparently, there is no need for them to wrap the |native_event|.
} else { } else {
......
...@@ -32,7 +32,7 @@ class Event; ...@@ -32,7 +32,7 @@ class Event;
// //
EVENTS_EXPORT void DispatchEventFromNativeUiEvent( EVENTS_EXPORT void DispatchEventFromNativeUiEvent(
const base::NativeEvent& native_event, const base::NativeEvent& native_event,
base::Callback<void(ui::Event*)> callback); base::OnceCallback<void(ui::Event*)> callback);
} // namespace ui } // namespace ui
......
...@@ -52,7 +52,7 @@ bool PlatformWindowCast::CanDispatchEvent(const ui::PlatformEvent& ne) { ...@@ -52,7 +52,7 @@ bool PlatformWindowCast::CanDispatchEvent(const ui::PlatformEvent& ne) {
uint32_t PlatformWindowCast::DispatchEvent( uint32_t PlatformWindowCast::DispatchEvent(
const ui::PlatformEvent& native_event) { const ui::PlatformEvent& native_event) {
DispatchEventFromNativeUiEvent( DispatchEventFromNativeUiEvent(
native_event, base::Bind(&PlatformWindowDelegate::DispatchEvent, native_event, base::BindOnce(&PlatformWindowDelegate::DispatchEvent,
base::Unretained(delegate_))); base::Unretained(delegate_)));
return ui::POST_DISPATCH_STOP_PROPAGATION; return ui::POST_DISPATCH_STOP_PROPAGATION;
......
...@@ -183,7 +183,7 @@ uint32_t DrmWindowHost::DispatchEvent(const PlatformEvent& native_event) { ...@@ -183,7 +183,7 @@ uint32_t DrmWindowHost::DispatchEvent(const PlatformEvent& native_event) {
located_event->set_root_location_f(location); located_event->set_root_location_f(location);
} }
DispatchEventFromNativeUiEvent( DispatchEventFromNativeUiEvent(
native_event, base::Bind(&PlatformWindowDelegate::DispatchEvent, native_event, base::BindOnce(&PlatformWindowDelegate::DispatchEvent,
base::Unretained(delegate_))); base::Unretained(delegate_)));
return POST_DISPATCH_STOP_PROPAGATION; return POST_DISPATCH_STOP_PROPAGATION;
} }
......
...@@ -202,7 +202,7 @@ bool WaylandWindow::CanDispatchEvent(const PlatformEvent& native_event) { ...@@ -202,7 +202,7 @@ bool WaylandWindow::CanDispatchEvent(const PlatformEvent& native_event) {
uint32_t WaylandWindow::DispatchEvent(const PlatformEvent& native_event) { uint32_t WaylandWindow::DispatchEvent(const PlatformEvent& native_event) {
DispatchEventFromNativeUiEvent( DispatchEventFromNativeUiEvent(
native_event, base::Bind(&PlatformWindowDelegate::DispatchEvent, native_event, base::BindOnce(&PlatformWindowDelegate::DispatchEvent,
base::Unretained(delegate_))); base::Unretained(delegate_)));
return POST_DISPATCH_STOP_PROPAGATION; return POST_DISPATCH_STOP_PROPAGATION;
} }
......
...@@ -77,7 +77,7 @@ uint32_t X11WindowOzone::DispatchEvent(const PlatformEvent& platform_event) { ...@@ -77,7 +77,7 @@ uint32_t X11WindowOzone::DispatchEvent(const PlatformEvent& platform_event) {
// This is unfortunately needed otherwise events that depend on global state // This is unfortunately needed otherwise events that depend on global state
// (eg. double click) are broken. // (eg. double click) are broken.
DispatchEventFromNativeUiEvent( DispatchEventFromNativeUiEvent(
platform_event, base::Bind(&PlatformWindowDelegate::DispatchEvent, platform_event, base::BindOnce(&PlatformWindowDelegate::DispatchEvent,
base::Unretained(delegate()))); base::Unretained(delegate())));
return POST_DISPATCH_STOP_PROPAGATION; return POST_DISPATCH_STOP_PROPAGATION;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment