| Index: services/ui/ws/platform_display_default.cc
|
| diff --git a/services/ui/ws/platform_display_default.cc b/services/ui/ws/platform_display_default.cc
|
| index 6d32827f0b7947b72cf10d2ca98cb7f491b6a6b1..c19856089da3c376c2a7f24398ed4b92ab0cd211 100644
|
| --- a/services/ui/ws/platform_display_default.cc
|
| +++ b/services/ui/ws/platform_display_default.cc
|
| @@ -167,6 +167,10 @@ void PlatformDisplayDefault::UpdateEventRootLocation(ui::LocatedEvent* event) {
|
| event->set_root_location(location);
|
| }
|
|
|
| +ui::EventProcessor* PlatformDisplayDefault::GetEventProcessor() {
|
| + return delegate_->GetEventProcessor();
|
| +}
|
| +
|
| void PlatformDisplayDefault::OnBoundsChanged(const gfx::Rect& new_bounds) {
|
| // We only care if the window size has changed.
|
| if (new_bounds.size() == metrics_.pixel_size)
|
| @@ -189,14 +193,17 @@ void PlatformDisplayDefault::DispatchEvent(ui::Event* event) {
|
| if (event->IsScrollEvent()) {
|
| // TODO(moshayedi): crbug.com/602859. Dispatch scroll events as
|
| // they are once we have proper support for scroll events.
|
| - delegate_->OnEvent(
|
| - ui::PointerEvent(ui::MouseWheelEvent(*event->AsScrollEvent())));
|
| + ui::PointerEvent pointer_event(
|
| + ui::MouseWheelEvent(*event->AsScrollEvent()));
|
| + SendEventToProcessor(&pointer_event);
|
| } else if (event->IsMouseEvent()) {
|
| - delegate_->OnEvent(ui::PointerEvent(*event->AsMouseEvent()));
|
| + ui::PointerEvent pointer_event(*event->AsMouseEvent());
|
| + SendEventToProcessor(&pointer_event);
|
| } else if (event->IsTouchEvent()) {
|
| - delegate_->OnEvent(ui::PointerEvent(*event->AsTouchEvent()));
|
| + ui::PointerEvent pointer_event(*event->AsTouchEvent());
|
| + SendEventToProcessor(&pointer_event);
|
| } else {
|
| - delegate_->OnEvent(*event);
|
| + SendEventToProcessor(event);
|
| }
|
|
|
| #if defined(USE_X11) || defined(USE_OZONE)
|
| @@ -221,7 +228,7 @@ void PlatformDisplayDefault::DispatchEvent(ui::Event* event) {
|
| // example, from 'M' to '^M'.
|
| DCHECK_EQ(key_press_event->key_code(), char_event.key_code());
|
| DCHECK_EQ(key_press_event->flags(), char_event.flags());
|
| - delegate_->OnEvent(char_event);
|
| + SendEventToProcessor(&char_event);
|
| }
|
| #endif
|
| }
|
|
|