From 25c2f8362ae16555a99c34cf4a83fb9c18ea3e05 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Tue, 13 Oct 2015 11:00:54 -0700 Subject: [PATCH] Update to mojo 1292152bf533de1bfebf5966d6246e149f87add3 --- DEPS | 2 +- .../patches/mojo/mojo_converters_input_events.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 engine/src/flutter/sky/tools/roll/patches/mojo/mojo_converters_input_events.patch diff --git a/DEPS b/DEPS index 5cd8f3c382b..9cf22d9ac4e 100644 --- a/DEPS +++ b/DEPS @@ -19,7 +19,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'mojo_sdk_revision': '56e62e2ecf2052becf04a321fdc80e90600a75bd', + 'mojo_sdk_revision': '487fee0efc6b6792f26a62b39ac010696bbb18bb', 'mojo_devtools_revision': '49879d78ce4486e10c2214a101d9b2e82794b2f4', 'skia_revision': '0d39d37ddcfb3847795639eaef513f1112eba627', diff --git a/engine/src/flutter/sky/tools/roll/patches/mojo/mojo_converters_input_events.patch b/engine/src/flutter/sky/tools/roll/patches/mojo/mojo_converters_input_events.patch new file mode 100644 index 00000000000..5d161b9ca9b --- /dev/null +++ b/engine/src/flutter/sky/tools/roll/patches/mojo/mojo_converters_input_events.patch @@ -0,0 +1,12 @@ +diff --git a/mojo/converters/input_events/input_events_type_converters.cc b/mojo/converters/input_events/input_events_type_converters.cc +index 6f2495f..e7b0f15 100644 +--- a/mojo/converters/input_events/input_events_type_converters.cc ++++ b/mojo/converters/input_events/input_events_type_converters.cc +@@ -283,7 +283,6 @@ scoped_ptr TypeConverter, EventPtr>::Convert( + // TODO: last flags isn't right. Need to send changed_flags. + scoped_ptr event(new ui::MouseEvent( + MojoMouseEventTypeToUIEvent(input), location, screen_location, +- base::TimeDelta::FromMilliseconds(input->time_stamp), + ui::EventFlags(input->flags), ui::EventFlags(input->flags))); + if (event->IsMouseWheelEvent()) { + // This conversion assumes we're using the mojo meaning of these