Merge changes

Author: gspencergoog

lib/ui/platform_dispatcher.dart

@@ -255,7 +255,7 @@ class PlatformDispatcher {
   ///
   /// The framework invokes [callback] in the same zone in which this method
   /// was called.
-  void sendPlatformMessage(String name, ByteData data, PlatformMessageResponseCallback callback) {
+  void sendPlatformMessage(String/*!*/ name, ByteData/*?*/ data, PlatformMessageResponseCallback/*?*/ callback) {
     final String error =
         _sendPlatformMessage(name, _zonedPlatformMessageResponseCallback(callback), data);
     if (error != null) {
@@ -288,13 +288,13 @@ class PlatformDispatcher {
   }
 
   /// Called by [_dispatchPlatformMessage].
-  void _respondToPlatformMessage(int responseId, ByteData data)
+  void _respondToPlatformMessage(int/*!*/ responseId, ByteData/*?*/ data)
       native 'PlatformConfiguration_respondToPlatformMessage';
 
   /// Wraps the given [callback] in another callback that ensures that the
   /// original callback is called in the zone it was registered in.
-  static PlatformMessageResponseCallback _zonedPlatformMessageResponseCallback(
-      PlatformMessageResponseCallback callback) {
+  static PlatformMessageResponseCallback/*?*/ _zonedPlatformMessageResponseCallback(
+      PlatformMessageResponseCallback/*?*/ callback) {
     if (callback == null) {
       return null;
     }
@@ -316,7 +316,7 @@ class PlatformDispatcher {
   /// This can be combined with flutter tools `--isolate-filter` flag to debug
   /// specific root isolates. For example: `flutter attach --isolate-filter=[name]`.
   /// Note that this does not rename any child isolates of the root.
-  void setIsolateDebugName(String name) native 'PlatformConfiguration_setIsolateDebugName';
+  void setIsolateDebugName(String/*!*/ name) native 'PlatformConfiguration_setIsolateDebugName';
 
   /// The embedder can specify data that the isolate can request synchronously
   /// on launch. This accessor fetches that data.
@@ -327,7 +327,7 @@ class PlatformDispatcher {
   ///
   /// For asynchronous communication between the embedder and isolate, a
   /// platform channel may be used.
-  ByteData getPersistentIsolateData() native 'PlatformConfiguration_getPersistentIsolateData';
+  ByteData/*?*/ getPersistentIsolateData() native 'PlatformConfiguration_getPersistentIsolateData';
 
   /// Requests that, at the next appropriate opportunity, the [onBeginFrame]
   /// and [onDrawFrame] callbacks be invoked.

lib/ui/window.dart

@@ -745,7 +745,7 @@ class FlutterView {
   ///    scheduling of frames.
   ///  * [RendererBinding], the Flutter framework class which manages layout and
   ///    painting.
-  void render(Scene scene) => _platformDispatcher.render(scene, this);
+  void render(Scene/*!*/ scene) => _platformDispatcher.render(scene, this);
 }
 
 /// The most basic interface to the host operating system's user interface.

lib/web_ui/lib/src/engine/dom_renderer.dart

@@ -472,7 +472,7 @@ flt-glass-pane * {
     }
     _localeSubscription = languageChangeEvent.forTarget(html.window)
       .listen(_languageDidChange);
-    window._updateLocales();
+    EnginePlatformDispatcher.instance._updateLocales();
   }
 
   /// Called immediately after browser window metrics change.
@@ -498,7 +498,7 @@ flt-glass-pane * {
 
   /// Called immediately after browser window language change.
   void _languageDidChange(html.Event event) {
-    window._updateLocales();
+    EnginePlatformDispatcher.instance._updateLocales();
     if (ui.window.onLocaleChanged != null) {
       ui.window.onLocaleChanged();
     }

lib/web_ui/lib/src/engine/platform_dispatcher.dart

@@ -23,7 +23,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   /// The current platform configuration.
   @override
   ui.PlatformConfiguration get configuration => _configuration;
-  ui.PlatformConfiguration _configuration = const ui.PlatformConfiguration();
+  ui.PlatformConfiguration _configuration = ui.PlatformConfiguration(locales: parseBrowserLanguages());
 
   /// Receives all events related to platform configuration changes.
   @override
@@ -310,9 +310,9 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
 
   @override
   void sendPlatformMessage(
-    String name,
-    ByteData data,
-    ui.PlatformMessageResponseCallback callback,
+    String/*!*/ name,
+    ByteData/*?*/ data,
+    ui.PlatformMessageResponseCallback/*?*/ callback,
   ) {
     _sendPlatformMessage(name, data, _zonedPlatformMessageResponseCallback(callback));
   }
@@ -354,9 +354,9 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   }
 
   void _sendPlatformMessage(
-    String name,
-    ByteData data,
-    ui.PlatformMessageResponseCallback callback,
+    String/*?*/ name,
+    ByteData/*?*/ data,
+    ui.PlatformMessageResponseCallback/*?*/ callback,
   ) {
     // In widget tests we want to bypass processing of platform messages.
     if (assertionsEnabled && ui.debugEmulateFlutterTesterEnvironment) {
@@ -546,7 +546,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   ///  * [RendererBinding], the Flutter framework class which manages layout and
   ///    painting.
   @override
-  void render(ui.Scene scene, [ui.FlutterView view]) {
+  void render(ui.Scene/*!*/ scene, [ui.FlutterView view]) {
     if (experimentalUseSkia) {
       final LayerScene layerScene = scene;
       rasterizer.draw(layerScene.layerTree);
@@ -588,22 +588,15 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
     EngineSemanticsOwner.instance.updateSemantics(update);
   }
 
-  /// The system-reported default locale of the device.
+  /// We use the first locale in the [locales] list instead of the browser's
+  /// built-in `navigator.language` because browsers do not agree on the
+  /// implementation.
   ///
-  /// This establishes the language and formatting conventions that application
-  /// should, if possible, use to render their user interface.
-  ///
-  /// This is the first locale selected by the user and is the user's
-  /// primary locale (the locale the device UI is displayed in)
+  /// See also:
   ///
-  /// This is equivalent to `locales.first` and will provide an empty non-null locale
-  /// if the [locales] list has not been set or is empty.
-  ui.Locale get locale {
-    if (configuration?.locales != null && configuration.locales.isNotEmpty) {
-      return locales.first;
-    }
-    return null;
-  }
+  /// * https://developer.mozilla.org/en-US/docs/Web/API/NavigatorLanguage/languages,
+  ///   which explains browser quirks in the implementation notes.
+  ui.Locale get locale => locales.first;
 
   /// The full system-reported supported locales of the device.
   ///
@@ -650,6 +643,45 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
     _onLocaleChangedZone = Zone.current;
   }
 
+  /// The locale used when we fail to get the list from the browser.
+  static const _defaultLocale = const ui.Locale('en', 'US');
+
+  /// Sets locales to an empty list.
+  ///
+  /// The empty list is not a valid value for locales. This is only used for
+  /// testing locale update logic.
+  void debugResetLocales() {
+    _configuration = _configuration.copyWith(locales: const <ui.Locale>[]);
+  }
+
+  // Called by DomRenderer when browser languages change.
+  void _updateLocales() {
+    _configuration = _configuration.copyWith(locales: parseBrowserLanguages());
+  }
+
+  static List<ui.Locale> parseBrowserLanguages() {
+    // TODO(yjbanov): find a solution for IE
+    final bool languagesFeatureMissing = !js_util.hasProperty(html.window.navigator, 'languages');
+    if (languagesFeatureMissing || html.window.navigator.languages.isEmpty) {
+      // To make it easier for the app code, let's not leave the locales list
+      // empty. This way there's fewer corner cases for apps to handle.
+      return const [_defaultLocale];
+    }
+
+    final List<ui.Locale> locales = <ui.Locale>[];
+    for (final String language in html.window.navigator.languages) {
+      final List<String> parts = language.split('-');
+      if (parts.length > 1) {
+        locales.add(ui.Locale(parts.first, parts.last));
+      } else {
+        locales.add(ui.Locale(language));
+      }
+    }
+
+    assert(locales.isNotEmpty);
+    return locales;
+  }
+
   /// Engine code should use this method instead of the callback directly.
   /// Otherwise zones won't work properly.
   void invokeOnLocaleChanged() {