diff --git a/DEPS b/DEPS index b7e418a38f4..c67163d9318 100644 --- a/DEPS +++ b/DEPS @@ -19,7 +19,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'mojo_sdk_revision': '9a5f81a3d2a6d027677366edb5de3ae85f6dbf16', + 'mojo_sdk_revision': '76ff57433b48527dc491dac4c52c9d71a7c3a0e3', 'skia_revision': '29ccdf86ab0a1649fd775c9431891bacb1391e99', 'dart_revision': '95c951ad190f156eb61b99203c2e4948211c44a7', 'dart_observatory_packages_revision': 'cdc4b3d4c15b9c0c8e7702dff127b440afbb7485', diff --git a/engine/src/flutter/.gitignore b/engine/src/flutter/.gitignore index ed086d94eb6..87190951c16 100644 --- a/engine/src/flutter/.gitignore +++ b/engine/src/flutter/.gitignore @@ -67,6 +67,8 @@ Thumbs.db /examples/**/pubspec.lock /mojo/common/dart/packages /mojo/dart/apptest/packages +/mojo/dart/http_load_test/bin/packages +/mojo/dart/http_load_test/packages/ /mojo/dart/mojo_services/packages /mojo/dart/mojo_services/pubspec.lock /mojo/dart/mojom/bin/packages 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..8434aca7362 --- /dev/null +++ b/engine/src/flutter/sky/tools/roll/patches/mojo/mojo_converters_input_events.patch @@ -0,0 +1,20 @@ +diff --git b/mojo/converters/input_events/input_events_type_converters.cc a/mojo/converters/input_events/input_events_type_converters.cc +index a4f6e73..a7d6a97 100644 +--- b/mojo/converters/input_events/input_events_type_converters.cc ++++ a/mojo/converters/input_events/input_events_type_converters.cc +@@ -11,7 +11,6 @@ + #include + #endif + +-#include "base/time/time.h" + #include "mojo/converters/geometry/geometry_type_converters.h" + #include "mojo/converters/input_events/mojo_extended_key_event_data.h" + #include "mojo/services/input_events/public/interfaces/input_events.mojom.h" +@@ -278,7 +277,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 diff --git a/engine/src/flutter/sky/tools/roll/patches/mojo/services_keyboard.patch b/engine/src/flutter/sky/tools/roll/patches/mojo/services_keyboard.patch new file mode 100644 index 00000000000..d1180aab391 --- /dev/null +++ b/engine/src/flutter/sky/tools/roll/patches/mojo/services_keyboard.patch @@ -0,0 +1,30 @@ +diff --git a/services/keyboard/src/org/chromium/mojo/keyboard/InputConnectionAdaptor.java b/services/keyboard/src/org/chromium/mojo/keyboard/InputConnectionAdaptor.java +index 42bdd57..a3cdc61 100644 +--- a/services/keyboard/src/org/chromium/mojo/keyboard/InputConnectionAdaptor.java ++++ b/services/keyboard/src/org/chromium/mojo/keyboard/InputConnectionAdaptor.java +@@ -4,7 +4,10 @@ + + package org.chromium.mojo.keyboard; + ++import java.lang.StringBuilder; ++ + import android.view.View; ++import android.view.KeyEvent; + import android.view.inputmethod.BaseInputConnection; + import android.view.inputmethod.CompletionInfo; + import android.view.inputmethod.CorrectionInfo; +@@ -71,4 +74,14 @@ public class InputConnectionAdaptor extends BaseInputConnection { + mClient.setSelection(start, end); + return super.setSelection(start, end); + } ++ ++ // Number keys come through as key events instead of commitText!? ++ @Override ++ public boolean sendKeyEvent(KeyEvent event) { ++ if (event.getAction() == KeyEvent.ACTION_UP) { ++ // 1 appears to always be the value for newCursorPosition? ++ mClient.commitText(String.valueOf(event.getNumber()), 1); ++ } ++ return super.sendKeyEvent(event); ++ } + } diff --git a/engine/src/flutter/sky/tools/roll/roll.py b/engine/src/flutter/sky/tools/roll/roll.py index a066a7f7bb8..c66fb7b8684 100755 --- a/engine/src/flutter/sky/tools/roll/roll.py +++ b/engine/src/flutter/sky/tools/roll/roll.py @@ -72,7 +72,21 @@ dirs_from_chromium = _base_deps + _build_deps + _chromium_libs + _third_party_de dirs_from_mojo = [ 'gpu', - 'mojo', + 'mojo/android', + 'mojo/application', + 'mojo/common', + 'mojo/converters', + 'mojo/dart', + 'mojo/data_pipe_utils', + 'mojo/edk', + 'mojo/environment', + 'mojo/gles2', + 'mojo/gpu', + 'mojo/icu', + 'mojo/java', + 'mojo/message_pump', + 'mojo/services', + 'mojo/skia', 'services/asset_bundle', 'services/keyboard', 'services/sensors',