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

Unified Diff: content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

Issue 2869273010: aura: Introduce EventInjector. (Closed)
Patch Set: . Created 3 years, 7 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/aura/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/input/synthetic_gesture_target_aura.cc
diff --git a/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc b/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc
index 95382879e80814d9abf298874db380485e8eb9b0..08f560fa8f5dc22ae217ccaba4cbdb899fd5f036 100644
--- a/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc
+++ b/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc
@@ -12,6 +12,7 @@
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_aura.h"
#include "content/browser/renderer_host/ui_events_helper.h"
+#include "ui/aura/event_injector.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
#include "ui/events/event_sink.h"
@@ -46,9 +47,10 @@ void SyntheticGestureTargetAura::DispatchWebTouchEventToPlatform(
aura::Window* window = GetWindow();
aura::WindowTreeHost* host = window->GetHost();
+ aura::EventInjector injector;
+
for (const auto& event : events) {
event->ConvertLocationToTarget(window, host->window());
-
// Apply the screen scale factor to the event location after it has been
// transformed to the target.
gfx::PointF device_location =
@@ -57,8 +59,7 @@ void SyntheticGestureTargetAura::DispatchWebTouchEventToPlatform(
gfx::ScalePoint(event->root_location_f(), device_scale_factor_);
event->set_location_f(device_location);
event->set_root_location_f(device_root_location);
- ui::EventDispatchDetails details =
- host->event_sink()->OnEventFromSource(event.get());
+ ui::EventDispatchDetails details = injector.Inject(host, event.get());
if (details.dispatcher_destroyed)
break;
}
@@ -77,8 +78,9 @@ void SyntheticGestureTargetAura::DispatchWebMouseWheelEventToPlatform(
aura::Window* window = GetWindow();
wheel_event.ConvertLocationToTarget(window, window->GetRootWindow());
+ aura::EventInjector injector;
ui::EventDispatchDetails details =
- window->GetHost()->event_sink()->OnEventFromSource(&wheel_event);
+ injector.Inject(window->GetHost(), &wheel_event);
if (details.dispatcher_destroyed)
return;
}
@@ -162,8 +164,9 @@ void SyntheticGestureTargetAura::DispatchWebMouseEventToPlatform(
aura::Window* window = GetWindow();
mouse_event.ConvertLocationToTarget(window, window->GetRootWindow());
+ aura::EventInjector injector;
ui::EventDispatchDetails details =
- window->GetHost()->event_sink()->OnEventFromSource(&mouse_event);
+ injector.Inject(window->GetHost(), &mouse_event);
if (details.dispatcher_destroyed)
return;
}
« no previous file with comments | « no previous file | ui/aura/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698