Merge Changes

Author: gspencergoog

lib/ui/platform_dispatcher.dart

@@ -593,19 +593,34 @@ class PlatformDispatcher {
     _invoke(onLocaleChanged, _onLocaleChangedZone);
   }
 
-
-  /// The locale that the platform's native locale resolution system resolves
-  /// to.
+  /// Performs the platform-native locale resolution.
   ///
-  /// This value may differ between platforms and is meant to allow Flutter's
-  /// locale resolution algorithms access to a locale that is consistent with
-  /// other apps on the device. Using this property is optional.
+  /// Each platform may return different results.
   ///
-  /// This value may be used in a custom [localeListResolutionCallback] or used
-  /// directly in order to arrive at the most appropriate locale for the app.
+  /// If the platform fails to resolve a locale, then this will return null.
   ///
-  /// See [locales], which is the list of locales the user/device prefers.
-  Locale? get platformResolvedLocale => configuration.platformResolvedLocale;
+  /// This method returns synchronously and is a direct call to
+  /// platform specific APIs without invoking method channels.
+  Locale? computePlatformResolvedLocale(List<Locale> supportedLocales) {
+    final List<String?> supportedLocalesData = <String?>[];
+    for (Locale locale in supportedLocales) {
+      supportedLocalesData.add(locale.languageCode);
+      supportedLocalesData.add(locale.countryCode);
+      supportedLocalesData.add(locale.scriptCode);
+    }
+
+    final List<String> result = _computePlatformResolvedLocale(supportedLocalesData);
+
+    if (result.isNotEmpty) {
+      return Locale.fromSubtags(
+        languageCode: result[0],
+        countryCode: result[1] == '' ? null : result[1],
+        scriptCode: result[2] == '' ? null : result[2]);
+    }
+    return null;
+  }
+  List<String> _computePlatformResolvedLocale(List<String?> supportedLocalesData) native 'Window_computePlatformResolvedLocale';
+
 
   /// A callback that is invoked whenever [locale] changes value.
   ///

lib/ui/window.dart

@@ -74,8 +74,8 @@ enum FramePhase {
 /// [SchedulerBinding.addTimingsCallback] to get this. It's preferred over using
 /// [PlatformDispatcher.onReportTimings] directly because
 /// [SchedulerBinding.addTimingsCallback] allows multiple callbacks. If
-/// [SchedulerBinding] is unavailable, then see [PlatformDispatcher.onReportTimings]
-/// for how to get this.
+/// [SchedulerBinding] is unavailable, then see
+/// [PlatformDispatcher.onReportTimings] for how to get this.
 ///
 /// The metrics in debug mode (`flutter run` without any flags) may be very
 /// different from those in profile and release modes due to the debug overhead.
@@ -88,7 +88,8 @@ class FrameTiming {
   /// [FramePhase.values].
   ///
   /// This constructor is usually only called by the Flutter engine, or a test.
-  /// To get the [FrameTiming] of your app, see [PlatformDispatcher.onReportTimings].
+  /// To get the [FrameTiming] of your app, see
+  /// [PlatformDispatcher.onReportTimings].
   FrameTiming(List<int> timestamps)
       : assert(timestamps.length == FramePhase.values.length),
         _timestamps = timestamps;
@@ -101,9 +102,10 @@ class FrameTiming {
 
   /// The duration to build the frame on the UI thread.
   ///
-  /// The build starts approximately when [PlatformDispatcher.onBeginFrame] is called. The
-  /// [Duration] in the [PlatformDispatcher.onBeginFrame] callback is exactly the
-  /// `Duration(microseconds: timestampInMicroseconds(FramePhase.buildStart))`.
+  /// The build starts approximately when [PlatformDispatcher.onBeginFrame] is
+  /// called. The [Duration] in the [PlatformDispatcher.onBeginFrame] callback
+  /// is exactly the `Duration(microseconds:
+  /// timestampInMicroseconds(FramePhase.buildStart))`.
   ///
   /// The build finishes when [FlutterView.render] is called.
   ///
@@ -674,9 +676,8 @@ abstract class FlutterView {
   ///
   /// When this property changes, [onMetricsChanged] is called.
   ///
-  /// The relationship between this [viewInsets],
-  /// [viewPadding], and [padding] are described in
-  /// more detail in the documentation for [FlutterView].
+  /// The relationship between this [viewInsets], [viewPadding], and [padding]
+  /// are described in more detail in the documentation for [FlutterView].
   ///
   /// See also:
   ///
@@ -693,16 +694,14 @@ abstract class FlutterView {
   /// the display (e.g. overscan regions on television screens or phone sensor
   /// housings).
   ///
-  /// Unlike [padding], this value does not change relative to
-  /// [viewInsets]. For example, on an iPhone X, it will not
-  /// change in response to the soft keyboard being visible or hidden, whereas
-  /// [padding] will.
+  /// Unlike [padding], this value does not change relative to [viewInsets]. For
+  /// example, on an iPhone X, it will not change in response to the soft
+  /// keyboard being visible or hidden, whereas [padding] will.
   ///
   /// When this property changes, [onMetricsChanged] is called.
   ///
-  /// The relationship between this [viewInsets],
-  /// [viewPadding], and [padding] are described in
-  /// more detail in the documentation for [FlutterView].
+  /// The relationship between this [viewInsets], [viewPadding], and [padding]
+  /// are described in more detail in the documentation for [FlutterView].
   ///
   /// See also:
   ///
@@ -756,35 +755,6 @@ abstract class FlutterView {
   ///  * [Scaffold], which automatically applies the padding in material design
   ///    applications.
   WindowPadding get padding => viewConfiguration.padding;
-
-  /// Updates the view's rendering on the GPU with the newly provided
-  /// [Scene].
-  ///
-  /// This function must be called within the scope of the
-  /// [PlatformDispatcher.onBeginFrame] or [PlatformDispatcher.onDrawFrame]
-  /// callbacks being invoked. If this function is called a second time during a
-  /// single [PlatformDispatcher.onBeginFrame]/[PlatformDispatcher.onDrawFrame]
-  /// callback sequence or called outside the scope of those callbacks, the call
-  /// will be ignored.
-  ///
-  /// To record graphical operations, first create a [PictureRecorder], then
-  /// construct a [Canvas], passing that [PictureRecorder] to its constructor.
-  /// After issuing all the graphical operations, call the
-  /// [PictureRecorder.endRecording] function on the [PictureRecorder] to obtain
-  /// the final [Picture] that represents the issued graphical operations.
-  ///
-  /// Next, create a [SceneBuilder], and add the [Picture] to it using
-  /// [SceneBuilder.addPicture]. With the [SceneBuilder.build] method you can
-  /// then obtain a [Scene] object, which you can display to the user via this
-  /// [render] function.
-  ///
-  /// See also:
-  ///
-  ///  * [SchedulerBinding], the Flutter framework class which manages the
-  ///    scheduling of frames.
-  ///  * [RendererBinding], the Flutter framework class which manages layout and
-  ///    painting.
-  void render(Scene scene) => platformDispatcher.render(scene, this);
 }
 
 /// A top-level platform window displaying a Flutter layer tree drawn from a
@@ -896,24 +866,8 @@ class SingletonFlutterWindow extends FlutterWindow {
   /// This method returns synchronously and is a direct call to
   /// platform specific APIs without invoking method channels.
   Locale? computePlatformResolvedLocale(List<Locale> supportedLocales) {
-    final List<String?> supportedLocalesData = <String?>[];
-    for (Locale locale in supportedLocales) {
-      supportedLocalesData.add(locale.languageCode);
-      supportedLocalesData.add(locale.countryCode);
-      supportedLocalesData.add(locale.scriptCode);
-    }
-
-    final List<String> result = _computePlatformResolvedLocale(supportedLocalesData);
-
-    if (result.isNotEmpty) {
-      return Locale.fromSubtags(
-          languageCode: result[0],
-          countryCode: result[1] == '' ? null : result[1],
-          scriptCode: result[2] == '' ? null : result[2]);
-    }
-    return null;
+    platformDispatcher.computePlatformResolvedLocale(supportedLocales);
   }
-  List<String> _computePlatformResolvedLocale(List<String?> supportedLocalesData) native 'Window_computePlatformResolvedLocale';
 
   /// A callback that is invoked whenever [locale] changes value.
   ///
@@ -1149,6 +1103,34 @@ class SingletonFlutterWindow extends FlutterWindow {
   ///    scheduling of frames.
   void scheduleFrame() => platformDispatcher.scheduleFrame();
 
+  /// Updates the view's rendering on the GPU with the newly provided [Scene].
+  ///
+  /// This function must be called within the scope of the
+  /// [PlatformDispatcher.onBeginFrame] or [PlatformDispatcher.onDrawFrame]
+  /// callbacks being invoked. If this function is called a second time during a
+  /// single [PlatformDispatcher.onBeginFrame]/[PlatformDispatcher.onDrawFrame]
+  /// callback sequence or called outside the scope of those callbacks, the call
+  /// will be ignored.
+  ///
+  /// To record graphical operations, first create a [PictureRecorder], then
+  /// construct a [Canvas], passing that [PictureRecorder] to its constructor.
+  /// After issuing all the graphical operations, call the
+  /// [PictureRecorder.endRecording] function on the [PictureRecorder] to obtain
+  /// the final [Picture] that represents the issued graphical operations.
+  ///
+  /// Next, create a [SceneBuilder], and add the [Picture] to it using
+  /// [SceneBuilder.addPicture]. With the [SceneBuilder.build] method you can
+  /// then obtain a [Scene] object, which you can display to the user via this
+  /// [render] function.
+  ///
+  /// See also:
+  ///
+  ///  * [SchedulerBinding], the Flutter framework class which manages the
+  ///    scheduling of frames.
+  ///  * [RendererBinding], the Flutter framework class which manages layout and
+  ///    painting.
+  void render(Scene scene) => platformDispatcher.render(scene, this);
+
   /// Whether the user has requested that [updateSemantics] be called when
   /// the semantic contents of window changes.
   ///

lib/ui/window/platform_configuration.cc

@@ -12,11 +12,11 @@
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_args.h"
 #include "third_party/tonic/dart_library_natives.h"
+#include "third_party/tonic/dart_microtask_queue.h"
 #include "third_party/tonic/logging/dart_invoke.h"
 #include "third_party/tonic/typed_data/dart_byte_data.h"
 
 namespace flutter {
-
 namespace {
 
 void InitialRouteName(Dart_NativeArguments args) {
@@ -38,7 +38,6 @@ void Render(Dart_NativeArguments args) {
   Dart_Handle exception = nullptr;
   Scene* scene =
       tonic::DartConverter<Scene*>::FromArguments(args, 1, exception);
-  // The view argument is currently ignored.
   if (exception) {
     Dart_ThrowException(exception);
     return;
@@ -180,25 +179,12 @@ void GetPersistentIsolateData(Dart_NativeArguments args) {
                                         persistent_isolate_data->GetSize()));
 }
 
-}  // namespace
-
 Dart_Handle ToByteData(const std::vector<uint8_t>& buffer) {
-  Dart_Handle data_handle =
-      Dart_NewTypedData(Dart_TypedData_kByteData, buffer.size());
-  if (Dart_IsError(data_handle))
-    return data_handle;
-
-  Dart_TypedData_Type type;
-  void* data = nullptr;
-  intptr_t num_bytes = 0;
-  FML_CHECK(!Dart_IsError(
-      Dart_TypedDataAcquireData(data_handle, &type, &data, &num_bytes)));
-
-  memcpy(data, buffer.data(), num_bytes);
-  Dart_TypedDataReleaseData(data_handle);
-  return data_handle;
+  return tonic::DartByteData::Create(buffer.data(), buffer.size());
 }
 
+}  // namespace
+
 WindowClient::~WindowClient() {}
 
 PlatformConfiguration::PlatformConfiguration(WindowClient* client)
@@ -234,19 +220,6 @@ void PlatformConfiguration::UpdateLocales(
       }));
 }
 
-void PlatformConfiguration::UpdatePlatformResolvedLocale(
-    const std::vector<std::string>& locale) {
-  std::shared_ptr<tonic::DartState> dart_state = library_.dart_state().lock();
-  if (!dart_state)
-    return;
-  tonic::DartState::Scope scope(dart_state);
-  tonic::LogIfError(tonic::DartInvokeField(
-      library_.value(), "_updatePlatformResolvedLocale",
-      {
-          tonic::ToDart<std::vector<std::string>>(locale),
-      }));
-}
-
 void PlatformConfiguration::UpdateUserSettingsData(const std::string& data) {
   std::shared_ptr<tonic::DartState> dart_state = library_.dart_state().lock();
   if (!dart_state)
@@ -426,6 +399,27 @@ void PlatformConfiguration::CompletePlatformMessageResponse(
   response->Complete(std::make_unique<fml::DataMapping>(std::move(data)));
 }
 
+Dart_Handle ComputePlatformResolvedLocale(Dart_Handle supportedLocalesHandle) {
+  std::vector<std::string> supportedLocales =
+      tonic::DartConverter<std::vector<std::string>>::FromDart(
+          supportedLocalesHandle);
+
+  std::vector<std::string> results =
+      *UIDartState::Current()
+           ->window()
+           ->client()
+           ->ComputePlatformResolvedLocale(supportedLocales);
+
+  return tonic::DartConverter<std::vector<std::string>>::ToDart(results);
+}
+
+static void _ComputePlatformResolvedLocale(Dart_NativeArguments args) {
+  UIDartState::ThrowIfUIOperationsProhibited();
+  Dart_Handle result =
+      ComputePlatformResolvedLocale(Dart_GetNativeArgument(args, 1));
+  Dart_SetReturnValue(args, result);
+}
+
 void PlatformConfiguration::RegisterNatives(
     tonic::DartLibraryNatives* natives) {
   natives->Register({
@@ -445,6 +439,8 @@ void PlatformConfiguration::RegisterNatives(
        true},
       {"PlatformConfiguration_getPersistentIsolateData",
        GetPersistentIsolateData, 1, true},
+      {"PlatformConfiguration_computePlatformResolvedLocale", _ComputePlatformResolvedLocale,
+       2, true},
   });
 }
 

lib/ui/window/platform_configuration.h

@@ -12,6 +12,7 @@
 
 #include "flutter/fml/time/time_point.h"
 #include "flutter/lib/ui/semantics/semantics_update.h"
+#include "flutter/lib/ui/window/platform_message.h"
 #include "flutter/lib/ui/window/pointer_data_packet.h"
 #include "flutter/lib/ui/window/screen.h"
 #include "flutter/lib/ui/window/viewport_metrics.h"
@@ -37,8 +38,6 @@ class FontCollection;
 class PlatformMessage;
 class Scene;
 
-Dart_Handle ToByteData(const std::vector<uint8_t>& buffer);
-
 // Must match the AccessibilityFeatureFlag enum in framework.
 enum class AccessibilityFeatureFlag : int32_t {
   kAccessibleNavigation = 1 << 0,
@@ -63,6 +62,9 @@ class WindowClient {
                                         int64_t isolate_port) = 0;
   virtual void SetNeedsReportTimings(bool value) = 0;
   virtual std::shared_ptr<const fml::Mapping> GetPersistentIsolateData() = 0;
+  virtual std::unique_ptr<std::vector<std::string>>
+  ComputePlatformResolvedLocale(
+      const std::vector<std::string>& supported_locale_data) = 0;
 
  protected:
   virtual ~WindowClient();
@@ -78,7 +80,6 @@ class PlatformConfiguration final {
 
   void DidCreateIsolate();
   void UpdateLocales(const std::vector<std::string>& locales);
-  void UpdatePlatformResolvedLocale(const std::vector<std::string>& locale);
   void UpdateUserSettingsData(const std::string& data);
   void UpdateLifecycleState(const std::string& data);
   void UpdateSemanticsEnabled(bool enabled);
@@ -101,9 +102,10 @@ class PlatformConfiguration final {
   Screen* get_screen(int screen_id) { return screens_[screen_id].get(); }
 
  private:
+  WindowClient* client_;
   tonic::DartPersistentValue library_;
   ViewportMetrics viewport_metrics_;
-  WindowClient* client_;
+
   std::unordered_map<int, std::unique_ptr<Window>> windows_;
   std::unordered_map<int, std::unique_ptr<Screen>> screens_;