[fuchsia] Rename fidl namespace to f1dl (flutter#4707)

This rename is to prepare for the migration to FIDL2.
xingnan · Feb 23, 2018 · 63b9dab · 63b9dab
1 parent 3697845
commit 63b9dab
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 32 deletions.
diff --git a/content_handler/app.cc b/content_handler/app.cc
@@ -79,7 +79,7 @@ App::App() {
   }
 
   context_->outgoing_services()->AddService<app::ApplicationRunner>(
-      [this](fidl::InterfaceRequest<app::ApplicationRunner> request) {
+      [this](f1dl::InterfaceRequest<app::ApplicationRunner> 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<app::ApplicationController> controller) {
+    f1dl::InterfaceRequest<app::ApplicationController> 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
@@ -29,7 +29,7 @@ class App : public app::ApplicationRunner {
   void StartApplication(
       app::ApplicationPackagePtr application,
       app::ApplicationStartupInfoPtr startup_info,
-      fidl::InterfaceRequest<app::ApplicationController> controller) override;
+      f1dl::InterfaceRequest<app::ApplicationController> controller) override;
 
   void Destroy(ApplicationControllerImpl* controller);
 
@@ -50,7 +50,7 @@ class App : public app::ApplicationRunner {
   std::unique_ptr<app::ApplicationContext> context_;
   std::unique_ptr<fsl::Thread> gpu_thread_;
   std::unique_ptr<fsl::Thread> io_thread_;
-  fidl::BindingSet<app::ApplicationRunner> runner_bindings_;
+  f1dl::BindingSet<app::ApplicationRunner> runner_bindings_;
   std::unordered_map<ApplicationControllerImpl*,
                      std::unique_ptr<ApplicationControllerImpl>>
       controllers_;

diff --git 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<app::ApplicationController> controller)
+    f1dl::InterfaceRequest<app::ApplicationController> controller)
     : app_(app), binding_(this) {
   if (controller.is_valid()) {
     binding_.Bind(std::move(controller));
@@ -48,7 +48,7 @@ ApplicationControllerImpl::ApplicationControllerImpl(
   }
 
   service_provider_bridge_.AddService<mozart::ViewProvider>(
-      [this](fidl::InterfaceRequest<mozart::ViewProvider> request) {
+      [this](f1dl::InterfaceRequest<mozart::ViewProvider> 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<mozart::ViewOwner> view_owner_request,
-    fidl::InterfaceRequest<app::ServiceProvider> services) {
+    f1dl::InterfaceRequest<mozart::ViewOwner> view_owner_request,
+    f1dl::InterfaceRequest<app::ServiceProvider> 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
@@ -31,7 +31,7 @@ class ApplicationControllerImpl : public app::ApplicationController,
       App* app,
       app::ApplicationPackagePtr application,
       app::ApplicationStartupInfoPtr startup_info,
-      fidl::InterfaceRequest<app::ApplicationController> controller);
+      f1dl::InterfaceRequest<app::ApplicationController> controller);
 
   ~ApplicationControllerImpl() override;
 
@@ -44,8 +44,8 @@ class ApplicationControllerImpl : public app::ApplicationController,
   // |mozart::ViewProvider| implementation
 
   void CreateView(
-      fidl::InterfaceRequest<mozart::ViewOwner> view_owner_request,
-      fidl::InterfaceRequest<app::ServiceProvider> services) override;
+      f1dl::InterfaceRequest<mozart::ViewOwner> view_owner_request,
+      f1dl::InterfaceRequest<app::ServiceProvider> 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<app::ApplicationController> binding_;
+  f1dl::Binding<app::ApplicationController> binding_;
 
   app::ServiceProviderBridge service_provider_bridge_;
 
-  fidl::BindingSet<mozart::ViewProvider> view_provider_bindings_;
+  f1dl::BindingSet<mozart::ViewProvider> view_provider_bindings_;
 
   std::string url_;
   std::unique_ptr<RuntimeHolder> runtime_holder_;

diff --git a/content_handler/rasterizer.h b/content_handler/rasterizer.h
@@ -22,7 +22,7 @@ class Rasterizer {
   static std::unique_ptr<Rasterizer> Create();
 
   virtual void SetScene(
-      fidl::InterfaceHandle<scenic::SceneManager> scene_manager,
+      f1dl::InterfaceHandle<scenic::SceneManager> 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
@@ -111,7 +111,7 @@ RuntimeHolder::~RuntimeHolder() {
 void RuntimeHolder::Init(
     fdio_ns_t* namespc,
     std::unique_ptr<app::ApplicationContext> context,
-    fidl::InterfaceRequest<app::ServiceProvider> outgoing_services,
+    f1dl::InterfaceRequest<app::ServiceProvider> outgoing_services,
     std::vector<char> bundle) {
   FXL_DCHECK(!rasterizer_);
   rasterizer_ = Rasterizer::Create();
@@ -193,8 +193,8 @@ void RuntimeHolder::Init(
 
 void RuntimeHolder::CreateView(
     const std::string& script_uri,
-    fidl::InterfaceRequest<mozart::ViewOwner> view_owner_request,
-    fidl::InterfaceRequest<app::ServiceProvider> services) {
+    f1dl::InterfaceRequest<mozart::ViewOwner> view_owner_request,
+    f1dl::InterfaceRequest<app::ServiceProvider> 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<scenic::SceneManager> scene_manager;
+  f1dl::InterfaceHandle<scenic::SceneManager> 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<app::ApplicationEnvironment> environment;
+  f1dl::InterfaceHandle<app::ApplicationEnvironment> 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<mozart::ViewContainer> view_container;
+  f1dl::InterfaceHandle<mozart::ViewContainer> 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<rapidjson::StringBuffer> writer(json_buffer);
       writer.StartArray();

diff --git 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<app::ApplicationContext> context,
-            fidl::InterfaceRequest<app::ServiceProvider> outgoing_services,
+            f1dl::InterfaceRequest<app::ServiceProvider> outgoing_services,
             std::vector<char> bundle);
   void CreateView(const std::string& script_uri,
-                  fidl::InterfaceRequest<mozart::ViewOwner> view_owner_request,
-                  fidl::InterfaceRequest<app::ServiceProvider> services);
+                  f1dl::InterfaceRequest<mozart::ViewOwner> view_owner_request,
+                  f1dl::InterfaceRequest<app::ServiceProvider> 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<app::ApplicationContext> context_;
-  fidl::InterfaceRequest<app::ServiceProvider> outgoing_services_;
+  f1dl::InterfaceRequest<app::ServiceProvider> outgoing_services_;
   std::vector<char> root_bundle_data_;
   // TODO(zarah): Remove asset_store_ when flx is completely removed
   fxl::RefPtr<blink::ZipAssetStore> asset_store_;
@@ -121,13 +121,13 @@ class RuntimeHolder : public blink::RuntimeDelegate,
   std::unique_ptr<blink::RuntimeController> runtime_;
   blink::ViewportMetrics viewport_metrics_;
   mozart::ViewManagerPtr view_manager_;
-  fidl::Binding<mozart::ViewListener> view_listener_binding_;
-  fidl::Binding<mozart::InputListener> input_listener_binding_;
+  f1dl::Binding<mozart::ViewListener> view_listener_binding_;
+  f1dl::Binding<mozart::InputListener> input_listener_binding_;
   mozart::InputConnectionPtr input_connection_;
   mozart::ViewPtr view_;
   std::unordered_set<int> down_pointers_;
   mozart::InputMethodEditorPtr input_method_editor_;
-  fidl::Binding<mozart::InputMethodEditorClient> text_input_binding_;
+  f1dl::Binding<mozart::InputMethodEditorClient> 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
@@ -38,7 +38,7 @@ void SessionConnection::OnSessionError() {
   FXL_CHECK(false) << "Session connection was terminated.";
 }
 
-void SessionConnection::OnSessionEvents(fidl::Array<scenic::EventPtr> events) {
+void SessionConnection::OnSessionEvents(f1dl::Array<scenic::EventPtr> 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
@@ -57,7 +57,7 @@ class SessionConnection {
   fxl::Closure metrics_changed_callback_;
 
   void OnSessionError();
-  void OnSessionEvents(fidl::Array<scenic::EventPtr> events);
+  void OnSessionEvents(f1dl::Array<scenic::EventPtr> events);
 
   void EnqueueClearOps();
 

diff --git 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<scenic::SceneManager> scene_manager,
+    f1dl::InterfaceHandle<scenic::SceneManager> 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
@@ -22,7 +22,7 @@ class VulkanRasterizer : public Rasterizer {
 
   bool IsValid() const;
 
-  void SetScene(fidl::InterfaceHandle<scenic::SceneManager> scene_manager,
+  void SetScene(f1dl::InterfaceHandle<scenic::SceneManager> scene_manager,
                 zx::eventpair import_token,
                 fxl::Closure metrics_changed_callback) override;