diff --git a/content_handler/app.cc b/content_handler/app.cc index a83b7e843ccf6..ca6ef350d5556 100644 --- a/content_handler/app.cc +++ b/content_handler/app.cc @@ -79,7 +79,7 @@ App::App() { } context_->outgoing_services()->AddService( - [this](fidl::InterfaceRequest request) { + [this](f1dl::InterfaceRequest request) { runner_bindings_.AddBinding(this, std::move(request)); }); } @@ -131,7 +131,7 @@ void App::WaitForPlatformViewsIdsUIThread( void App::StartApplication( app::ApplicationPackagePtr application, app::ApplicationStartupInfoPtr startup_info, - fidl::InterfaceRequest controller) { + f1dl::InterfaceRequest controller) { if (controllers_.empty()) { // Name this process after the url of the first application being launched. base_label_ = "flutter:" + GetLabelFromURL(startup_info->launch_info->url); diff --git a/content_handler/app.h b/content_handler/app.h index cd2af2adffa57..02e3aa34947d2 100644 --- a/content_handler/app.h +++ b/content_handler/app.h @@ -29,7 +29,7 @@ class App : public app::ApplicationRunner { void StartApplication( app::ApplicationPackagePtr application, app::ApplicationStartupInfoPtr startup_info, - fidl::InterfaceRequest controller) override; + f1dl::InterfaceRequest controller) override; void Destroy(ApplicationControllerImpl* controller); @@ -50,7 +50,7 @@ class App : public app::ApplicationRunner { std::unique_ptr context_; std::unique_ptr gpu_thread_; std::unique_ptr io_thread_; - fidl::BindingSet runner_bindings_; + f1dl::BindingSet runner_bindings_; std::unordered_map> controllers_; diff --git a/content_handler/application_controller_impl.cc b/content_handler/application_controller_impl.cc index 6477035adff63..3f08422fd4442 100644 --- a/content_handler/application_controller_impl.cc +++ b/content_handler/application_controller_impl.cc @@ -21,7 +21,7 @@ ApplicationControllerImpl::ApplicationControllerImpl( App* app, app::ApplicationPackagePtr application, app::ApplicationStartupInfoPtr startup_info, - fidl::InterfaceRequest controller) + f1dl::InterfaceRequest controller) : app_(app), binding_(this) { if (controller.is_valid()) { binding_.Bind(std::move(controller)); @@ -48,7 +48,7 @@ ApplicationControllerImpl::ApplicationControllerImpl( } service_provider_bridge_.AddService( - [this](fidl::InterfaceRequest request) { + [this](f1dl::InterfaceRequest request) { view_provider_bindings_.AddBinding(this, std::move(request)); }); @@ -124,8 +124,8 @@ void ApplicationControllerImpl::SendReturnCode(int32_t return_code) { } void ApplicationControllerImpl::CreateView( - fidl::InterfaceRequest view_owner_request, - fidl::InterfaceRequest services) { + f1dl::InterfaceRequest view_owner_request, + f1dl::InterfaceRequest services) { runtime_holder_->CreateView(url_, std::move(view_owner_request), std::move(services)); } diff --git a/content_handler/application_controller_impl.h b/content_handler/application_controller_impl.h index d694003d20b98..b2008196f8a3d 100644 --- a/content_handler/application_controller_impl.h +++ b/content_handler/application_controller_impl.h @@ -31,7 +31,7 @@ class ApplicationControllerImpl : public app::ApplicationController, App* app, app::ApplicationPackagePtr application, app::ApplicationStartupInfoPtr startup_info, - fidl::InterfaceRequest controller); + f1dl::InterfaceRequest controller); ~ApplicationControllerImpl() override; @@ -44,8 +44,8 @@ class ApplicationControllerImpl : public app::ApplicationController, // |mozart::ViewProvider| implementation void CreateView( - fidl::InterfaceRequest view_owner_request, - fidl::InterfaceRequest services) override; + f1dl::InterfaceRequest view_owner_request, + f1dl::InterfaceRequest services) override; Dart_Port GetUIIsolateMainPort(); std::string GetUIIsolateName(); @@ -57,11 +57,11 @@ class ApplicationControllerImpl : public app::ApplicationController, fdio_ns_t* SetupNamespace(const app::FlatNamespacePtr& flat); App* app_; - fidl::Binding binding_; + f1dl::Binding binding_; app::ServiceProviderBridge service_provider_bridge_; - fidl::BindingSet view_provider_bindings_; + f1dl::BindingSet view_provider_bindings_; std::string url_; std::unique_ptr runtime_holder_; diff --git a/content_handler/rasterizer.h b/content_handler/rasterizer.h index 061ff70ebce5f..7e3b866618d8d 100644 --- a/content_handler/rasterizer.h +++ b/content_handler/rasterizer.h @@ -22,7 +22,7 @@ class Rasterizer { static std::unique_ptr Create(); virtual void SetScene( - fidl::InterfaceHandle scene_manager, + f1dl::InterfaceHandle scene_manager, zx::eventpair import_token, fxl::Closure metrics_changed_callback) = 0; diff --git a/content_handler/runtime_holder.cc b/content_handler/runtime_holder.cc index 0c39fa4ba1652..522849126fca5 100644 --- a/content_handler/runtime_holder.cc +++ b/content_handler/runtime_holder.cc @@ -111,7 +111,7 @@ RuntimeHolder::~RuntimeHolder() { void RuntimeHolder::Init( fdio_ns_t* namespc, std::unique_ptr context, - fidl::InterfaceRequest outgoing_services, + f1dl::InterfaceRequest outgoing_services, std::vector bundle) { FXL_DCHECK(!rasterizer_); rasterizer_ = Rasterizer::Create(); @@ -193,8 +193,8 @@ void RuntimeHolder::Init( void RuntimeHolder::CreateView( const std::string& script_uri, - fidl::InterfaceRequest view_owner_request, - fidl::InterfaceRequest services) { + f1dl::InterfaceRequest view_owner_request, + f1dl::InterfaceRequest services) { if (view_listener_binding_.is_bound()) { // TODO(jeffbrown): Refactor this to support multiple view instances // sharing the same underlying root bundle (but with different runtimes). @@ -238,7 +238,7 @@ void RuntimeHolder::CreateView( input_connection_->SetEventListener(std::move(input_listener)); // Setup the session. - fidl::InterfaceHandle scene_manager; + f1dl::InterfaceHandle scene_manager; view_manager_->GetSceneManager(scene_manager.NewRequest()); blink::Threads::Gpu()->PostTask(fxl::MakeCopyable([ @@ -444,7 +444,7 @@ void RuntimeHolder::InitDartIoInternal() { } void RuntimeHolder::InitFuchsia() { - fidl::InterfaceHandle environment; + f1dl::InterfaceHandle environment; context_->ConnectToEnvironmentService(environment.NewRequest()); fuchsia::dart::Initialize(std::move(environment), std::move(outgoing_services_)); @@ -467,7 +467,7 @@ void RuntimeHolder::InitZircon() { } void RuntimeHolder::InitMozartInternal() { - fidl::InterfaceHandle view_container; + f1dl::InterfaceHandle view_container; view_->GetContainer(view_container.NewRequest()); Dart_Handle mozart_internal = @@ -558,7 +558,7 @@ bool RuntimeHolder::HandleFlutterPlatformMessage( clipboard_->Push(text); response->CompleteEmpty(); } else if (method->value == "Clipboard.getData") { - clipboard_->Peek([response](const ::fidl::String& text) { + clipboard_->Peek([response](const ::f1dl::String& text) { rapidjson::StringBuffer json_buffer; rapidjson::Writer writer(json_buffer); writer.StartArray(); diff --git a/content_handler/runtime_holder.h b/content_handler/runtime_holder.h index d13999920ec17..23a9a25911831 100644 --- a/content_handler/runtime_holder.h +++ b/content_handler/runtime_holder.h @@ -47,11 +47,11 @@ class RuntimeHolder : public blink::RuntimeDelegate, void Init(fdio_ns_t* namespc, std::unique_ptr context, - fidl::InterfaceRequest outgoing_services, + f1dl::InterfaceRequest outgoing_services, std::vector bundle); void CreateView(const std::string& script_uri, - fidl::InterfaceRequest view_owner_request, - fidl::InterfaceRequest services); + f1dl::InterfaceRequest view_owner_request, + f1dl::InterfaceRequest services); Dart_Port GetUIIsolateMainPort(); std::string GetUIIsolateName(); @@ -111,7 +111,7 @@ class RuntimeHolder : public blink::RuntimeDelegate, fdio_ns_t* namespc_; int dirfd_; std::unique_ptr context_; - fidl::InterfaceRequest outgoing_services_; + f1dl::InterfaceRequest outgoing_services_; std::vector root_bundle_data_; // TODO(zarah): Remove asset_store_ when flx is completely removed fxl::RefPtr asset_store_; @@ -121,13 +121,13 @@ class RuntimeHolder : public blink::RuntimeDelegate, std::unique_ptr runtime_; blink::ViewportMetrics viewport_metrics_; mozart::ViewManagerPtr view_manager_; - fidl::Binding view_listener_binding_; - fidl::Binding input_listener_binding_; + f1dl::Binding view_listener_binding_; + f1dl::Binding input_listener_binding_; mozart::InputConnectionPtr input_connection_; mozart::ViewPtr view_; std::unordered_set down_pointers_; mozart::InputMethodEditorPtr input_method_editor_; - fidl::Binding text_input_binding_; + f1dl::Binding text_input_binding_; int current_text_input_client_ = 0; fxl::TimePoint last_begin_frame_time_; bool frame_outstanding_ = false; diff --git a/content_handler/session_connection.cc b/content_handler/session_connection.cc index 4d2508068b9ac..1429642618df5 100644 --- a/content_handler/session_connection.cc +++ b/content_handler/session_connection.cc @@ -38,7 +38,7 @@ void SessionConnection::OnSessionError() { FXL_CHECK(false) << "Session connection was terminated."; } -void SessionConnection::OnSessionEvents(fidl::Array events) { +void SessionConnection::OnSessionEvents(f1dl::Array events) { scenic::MetricsPtr new_metrics; for (const auto& event : events) { if (event->is_metrics() && diff --git a/content_handler/session_connection.h b/content_handler/session_connection.h index 16d5f76de55bb..6ac29e561c5ec 100644 --- a/content_handler/session_connection.h +++ b/content_handler/session_connection.h @@ -57,7 +57,7 @@ class SessionConnection { fxl::Closure metrics_changed_callback_; void OnSessionError(); - void OnSessionEvents(fidl::Array events); + void OnSessionEvents(f1dl::Array events); void EnqueueClearOps(); diff --git a/content_handler/vulkan_rasterizer.cc b/content_handler/vulkan_rasterizer.cc index 1c2ea57f92905..c39c02ed12af0 100644 --- a/content_handler/vulkan_rasterizer.cc +++ b/content_handler/vulkan_rasterizer.cc @@ -54,7 +54,7 @@ bool VulkanRasterizer::IsValid() const { } void VulkanRasterizer::SetScene( - fidl::InterfaceHandle scene_manager, + f1dl::InterfaceHandle scene_manager, zx::eventpair import_token, fxl::Closure metrics_changed_callback) { ASSERT_IS_GPU_THREAD; diff --git a/content_handler/vulkan_rasterizer.h b/content_handler/vulkan_rasterizer.h index 0fa1b985bba2e..a353c1915fb20 100644 --- a/content_handler/vulkan_rasterizer.h +++ b/content_handler/vulkan_rasterizer.h @@ -22,7 +22,7 @@ class VulkanRasterizer : public Rasterizer { bool IsValid() const; - void SetScene(fidl::InterfaceHandle scene_manager, + void SetScene(f1dl::InterfaceHandle scene_manager, zx::eventpair import_token, fxl::Closure metrics_changed_callback) override;