Reland "fuchsia: Implement CreateViewWithViewProvider" (#18615)
The last commit was a bad push -- this one compiles.
Tested: Manual test via workstation product
BUG: 50875
diff --git a/shell/platform/fuchsia/flutter/component.cc b/shell/platform/fuchsia/flutter/component.cc
index f10f5b6..2cf27a6 100644
--- a/shell/platform/fuchsia/flutter/component.cc
+++ b/shell/platform/fuchsia/flutter/component.cc
@@ -11,6 +11,7 @@
#include <lib/async/default.h>
#include <lib/fdio/directory.h>
#include <lib/fdio/namespace.h>
+#include <lib/ui/scenic/cpp/view_ref_pair.h>
#include <lib/ui/scenic/cpp/view_token_pair.h>
#include <lib/vfs/cpp/composed_service_dir.h>
#include <lib/vfs/cpp/remote_dir.h>
@@ -553,7 +554,6 @@
FML_CHECK(vm) << "Mut be able to initialize the VM.";
}
-// |fuchsia::sys::ComponentController|
void Application::Kill() {
application_controller_.events().OnTerminated(
last_return_code_.second, fuchsia::sys::TerminationReason::EXITED);
@@ -563,12 +563,10 @@
// collected.
}
-// |fuchsia::sys::ComponentController|
void Application::Detach() {
application_controller_.set_error_handler(nullptr);
}
-// |flutter::Engine::Delegate|
void Application::OnEngineTerminate(const Engine* shell_holder) {
auto found = std::find_if(shell_holders_.begin(), shell_holders_.end(),
[shell_holder](const auto& holder) {
@@ -596,11 +594,20 @@
}
}
-// |fuchsia::ui::app::ViewProvider|
void Application::CreateView(
+ zx::eventpair token,
+ fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> /*incoming_services*/,
+ fidl::InterfaceHandle<
+ fuchsia::sys::ServiceProvider> /*outgoing_services*/) {
+ auto view_ref_pair = scenic::ViewRefPair::New();
+ CreateViewWithViewRef(std::move(token), std::move(view_ref_pair.control_ref),
+ std::move(view_ref_pair.view_ref));
+}
+
+void Application::CreateViewWithViewRef(
zx::eventpair view_token,
- fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> incoming_services,
- fidl::InterfaceHandle<fuchsia::sys::ServiceProvider> outgoing_services) {
+ fuchsia::ui::views::ViewRefControl control_ref,
+ fuchsia::ui::views::ViewRef view_ref) {
if (!svc_) {
FML_DLOG(ERROR)
<< "Component incoming services was invalid when attempting to "
@@ -616,9 +623,13 @@
settings_, // settings
std::move(isolate_snapshot_), // isolate snapshot
scenic::ToViewToken(std::move(view_token)), // view token
- std::move(fdio_ns_), // FDIO namespace
- std::move(directory_request_), // outgoing request
- product_config_ // product configuration
+ scenic::ViewRefPair{
+ .control_ref = std::move(control_ref),
+ .view_ref = std::move(view_ref),
+ },
+ std::move(fdio_ns_), // FDIO namespace
+ std::move(directory_request_), // outgoing request
+ product_config_ // product configuration
));
}
diff --git a/shell/platform/fuchsia/flutter/component.h b/shell/platform/fuchsia/flutter/component.h
index af657fe..aa0dd1d 100644
--- a/shell/platform/fuchsia/flutter/component.h
+++ b/shell/platform/fuchsia/flutter/component.h
@@ -114,11 +114,16 @@
// |fuchsia::ui::app::ViewProvider|
void CreateView(
- zx::eventpair view_token,
+ zx::eventpair token,
fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> incoming_services,
fidl::InterfaceHandle<fuchsia::sys::ServiceProvider> outgoing_services)
override;
+ // |fuchsia::ui::app::ViewProvider|
+ void CreateViewWithViewRef(zx::eventpair view_token,
+ fuchsia::ui::views::ViewRefControl control_ref,
+ fuchsia::ui::views::ViewRef view_ref) override;
+
// |flutter::Engine::Delegate|
void OnEngineTerminate(const Engine* holder) override;
diff --git a/shell/platform/fuchsia/flutter/engine.cc b/shell/platform/fuchsia/flutter/engine.cc
index f51823f..0f6fa1e 100644
--- a/shell/platform/fuchsia/flutter/engine.cc
+++ b/shell/platform/fuchsia/flutter/engine.cc
@@ -5,7 +5,6 @@
#include "engine.h"
#include <lib/async/cpp/task.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
#include <zircon/status.h>
#include <sstream>
@@ -57,6 +56,7 @@
flutter::Settings settings,
fml::RefPtr<const flutter::DartSnapshot> isolate_snapshot,
fuchsia::ui::views::ViewToken view_token,
+ scenic::ViewRefPair view_ref_pair,
UniqueFDIONS fdio_ns,
fidl::InterfaceRequest<fuchsia::io::Directory> directory_request,
FlutterRunnerProductConfiguration product_config)
@@ -115,18 +115,14 @@
});
};
- auto view_ref_pair = scenic::ViewRefPair::New();
- fuchsia::ui::views::ViewRef view_ref;
- view_ref_pair.view_ref.Clone(&view_ref);
-
- fuchsia::ui::views::ViewRef dart_view_ref;
- view_ref_pair.view_ref.Clone(&dart_view_ref);
- zx::eventpair dart_view_ref_event_pair(std::move(dart_view_ref.reference));
+ fuchsia::ui::views::ViewRef platform_view_ref, isolate_view_ref;
+ view_ref_pair.view_ref.Clone(&platform_view_ref);
+ view_ref_pair.view_ref.Clone(&isolate_view_ref);
// Setup the callback that will instantiate the platform view.
flutter::Shell::CreateCallback<flutter::PlatformView>
on_create_platform_view = fml::MakeCopyable(
- [debug_label = thread_label_, view_ref = std::move(view_ref),
+ [debug_label = thread_label_, view_ref = std::move(platform_view_ref),
runner_services,
parent_environment_service_provider =
std::move(parent_environment_service_provider),
@@ -263,10 +259,10 @@
svc->Connect(environment.NewRequest());
isolate_configurator_ = std::make_unique<IsolateConfigurator>(
- std::move(fdio_ns), //
- std::move(environment), //
- directory_request.TakeChannel(), //
- std::move(dart_view_ref_event_pair) //
+ std::move(fdio_ns), //
+ std::move(environment), //
+ directory_request.TakeChannel(), //
+ std::move(isolate_view_ref.reference) //
);
}
diff --git a/shell/platform/fuchsia/flutter/engine.h b/shell/platform/fuchsia/flutter/engine.h
index 7d211d5..bda6c39 100644
--- a/shell/platform/fuchsia/flutter/engine.h
+++ b/shell/platform/fuchsia/flutter/engine.h
@@ -11,6 +11,7 @@
#include <fuchsia/ui/views/cpp/fidl.h>
#include <lib/async-loop/cpp/loop.h>
#include <lib/sys/cpp/service_directory.h>
+#include <lib/ui/scenic/cpp/view_ref_pair.h>
#include <lib/zx/event.h>
#include "flutter/fml/macros.h"
@@ -37,6 +38,7 @@
flutter::Settings settings,
fml::RefPtr<const flutter::DartSnapshot> isolate_snapshot,
fuchsia::ui::views::ViewToken view_token,
+ scenic::ViewRefPair view_ref_pair,
UniqueFDIONS fdio_ns,
fidl::InterfaceRequest<fuchsia::io::Directory> directory_request,
FlutterRunnerProductConfiguration product_config);
