From 9669b8fa011b1567f68aa2d24a1d99aedfca78c3 Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Wed, 28 Aug 2019 12:31:07 -0700 Subject: [PATCH] [fidl][flutter_runner] Port Migrate to new fit::optional compatible APIs (flutter/engine#11636) * [fidl][flutter_runner] Port Migrate to new fit::optional compatible APIs Updated all call-sites. See: https://fuchsia-review.googlesource.com/c/fuchsia/+/304389 FIDL-564 #comment Change-Id: I831712ffd4a47b8fc9cf1fe237b709a1b983109f * fix observatory port and re-sync cmx files --- .../shell/platform/fuchsia/flutter/component.cc | 7 +++++-- .../flutter/meta/flutter_aot_product_runner.cmx | 11 +++++++---- .../fuchsia/flutter/meta/flutter_aot_runner.cmx | 11 +++++++---- .../flutter/meta/flutter_jit_product_runner.cmx | 7 +++++-- .../fuchsia/flutter/meta/flutter_jit_runner.cmx | 7 +++++-- .../fuchsia/flutter/meta/flutter_runner_tests.cmx | 3 +++ .../shell/platform/fuchsia/flutter/platform_view.cc | 2 +- 7 files changed, 33 insertions(+), 15 deletions(-) diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/component.cc b/engine/src/flutter/shell/platform/fuchsia/flutter/component.cc index bce50560648..ac6462cf747 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/component.cc +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/component.cc @@ -92,8 +92,8 @@ Application::Application( // LaunchInfo::arguments optional. if (auto& arguments = launch_info.arguments) { - settings_ = flutter::SettingsFromCommandLine( - fml::CommandLineFromIterators(arguments->begin(), arguments->end())); + settings_ = flutter::SettingsFromCommandLine(fml::CommandLineFromIterators( + arguments.value().begin(), arguments.value().end())); } // Determine /pkg/data directory from StartupInfo. @@ -257,6 +257,9 @@ Application::Application( settings_.enable_observatory = false; #else settings_.enable_observatory = true; + + // TODO(cbracken): pass this in as a param to allow 0.0.0.0, ::1, etc. + settings_.observatory_host = "127.0.0.1"; #endif settings_.icu_data_path = ""; diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cmx b/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cmx index fa18aa5c5d4..7d7442f858d 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cmx +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cmx @@ -5,14 +5,17 @@ "sandbox": { "features": [ "root-ssl-certificates", - "vulkan", - "deprecated-ambient-replace-as-executable" + "deprecated-ambient-replace-as-executable", + "vulkan" ], "services": [ - "fuchsia.crash.Analyzer", + "fuchsia.accessibility.SettingsManager", + "fuchsia.accessibility.semantics.SemanticsManager", + "fuchsia.device.NameProvider", + "fuchsia.feedback.CrashReporter", "fuchsia.fonts.Provider", - "fuchsia.net.NameLookup", "fuchsia.posix.socket.Provider", + "fuchsia.net.NameLookup", "fuchsia.sysmem.Allocator", "fuchsia.timezone.Timezone", "fuchsia.tracing.provider.Registry", diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx b/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx index fa18aa5c5d4..7d7442f858d 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx @@ -5,14 +5,17 @@ "sandbox": { "features": [ "root-ssl-certificates", - "vulkan", - "deprecated-ambient-replace-as-executable" + "deprecated-ambient-replace-as-executable", + "vulkan" ], "services": [ - "fuchsia.crash.Analyzer", + "fuchsia.accessibility.SettingsManager", + "fuchsia.accessibility.semantics.SemanticsManager", + "fuchsia.device.NameProvider", + "fuchsia.feedback.CrashReporter", "fuchsia.fonts.Provider", - "fuchsia.net.NameLookup", "fuchsia.posix.socket.Provider", + "fuchsia.net.NameLookup", "fuchsia.sysmem.Allocator", "fuchsia.timezone.Timezone", "fuchsia.tracing.provider.Registry", diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx b/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx index fa18aa5c5d4..dc4664e54e8 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx @@ -9,10 +9,13 @@ "deprecated-ambient-replace-as-executable" ], "services": [ - "fuchsia.crash.Analyzer", + "fuchsia.accessibility.SettingsManager", + "fuchsia.accessibility.semantics.SemanticsManager", + "fuchsia.device.NameProvider", + "fuchsia.feedback.CrashReporter", "fuchsia.fonts.Provider", - "fuchsia.net.NameLookup", "fuchsia.posix.socket.Provider", + "fuchsia.net.NameLookup", "fuchsia.sysmem.Allocator", "fuchsia.timezone.Timezone", "fuchsia.tracing.provider.Registry", diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx b/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx index fa18aa5c5d4..dc4664e54e8 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx @@ -9,10 +9,13 @@ "deprecated-ambient-replace-as-executable" ], "services": [ - "fuchsia.crash.Analyzer", + "fuchsia.accessibility.SettingsManager", + "fuchsia.accessibility.semantics.SemanticsManager", + "fuchsia.device.NameProvider", + "fuchsia.feedback.CrashReporter", "fuchsia.fonts.Provider", - "fuchsia.net.NameLookup", "fuchsia.posix.socket.Provider", + "fuchsia.net.NameLookup", "fuchsia.sysmem.Allocator", "fuchsia.timezone.Timezone", "fuchsia.tracing.provider.Registry", diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx b/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx index f606b8d8f76..291ff3b4e76 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx @@ -4,9 +4,12 @@ }, "sandbox": { "features": [ + "vulkan", "deprecated-ambient-replace-as-executable" ], "services": [ + "fuchsia.accessibility.SettingsManager", + "fuchsia.accessibility.semantics.SemanticsManager", "fuchsia.sys.Launcher" ] } diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/platform_view.cc b/engine/src/flutter/shell/platform/fuchsia/flutter/platform_view.cc index ddfedd30dc1..e753fa4437b 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/platform_view.cc +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/platform_view.cc @@ -627,7 +627,7 @@ void PlatformView::HandleFlutterPlatformChannelPlatformMessage( writer.StartArray(); writer.StartObject(); writer.Key("text"); - writer.String(text.get()); + writer.String(text.value_or("")); writer.EndObject(); writer.EndArray(); std::string result = json_buffer.GetString();