Fix formatting

Author: ds84182

shell/platform/embedder/embedder.cc

@@ -928,10 +928,11 @@ FlutterEngineResult FlutterEngineInitialize(size_t version,
                               "The Flutter project arguments were missing.");
   }
 
-  if (SAFE_ACCESS(args, assets_path, nullptr) == nullptr && SAFE_ACCESS(args, asset_resolver, nullptr) == nullptr) {
-    return LOG_EMBEDDER_ERROR(
-        kInvalidArguments,
-        "The assets path or asset resolver in the Flutter project arguments was missing.");
+  if (SAFE_ACCESS(args, assets_path, nullptr) == nullptr &&
+      SAFE_ACCESS(args, asset_resolver, nullptr) == nullptr) {
+    return LOG_EMBEDDER_ERROR(kInvalidArguments,
+                              "The assets path or asset resolver in the "
+                              "Flutter project arguments was missing.");
   }
 
   if (SAFE_ACCESS(args, main_path__unused__, nullptr) != nullptr) {
@@ -989,7 +990,8 @@ FlutterEngineResult FlutterEngineInitialize(size_t version,
   PopulateSnapshotMappingCallbacks(args, settings);
 
   settings.icu_data_path = icu_data_path;
-  if (args->assets_path) settings.assets_path = args->assets_path;
+  if (args->assets_path)
+    settings.assets_path = args->assets_path;
   settings.leak_vm = !SAFE_ACCESS(args, shutdown_dart_vm_when_done, false);
   settings.old_gen_heap_size = SAFE_ACCESS(args, dart_old_gen_heap_size, -1);
 
@@ -1304,7 +1306,8 @@ FlutterEngineResult FlutterEngineInitialize(size_t version,
   auto asset_manager = std::make_shared<flutter::AssetManager>();
 
   if (SAFE_ACCESS(args, asset_resolver, nullptr) != nullptr) {
-    asset_manager->PushBack(flutter::CreateEmbedderAssetResolver(args->asset_resolver));
+    asset_manager->PushBack(
+        flutter::CreateEmbedderAssetResolver(args->asset_resolver));
   }
 
   if (args->assets_path) {
@@ -1314,12 +1317,10 @@ FlutterEngineResult FlutterEngineInitialize(size_t version,
         true));
   }
 
-  auto run_configuration =
-      flutter::RunConfiguration(
-        flutter::IsolateConfiguration::InferFromSettings(settings, asset_manager,
-                                                  nullptr),
-        asset_manager
-      );
+  auto run_configuration = flutter::RunConfiguration(
+      flutter::IsolateConfiguration::InferFromSettings(settings, asset_manager,
+                                                       nullptr),
+      asset_manager);
 
   if (SAFE_ACCESS(args, custom_dart_entrypoint, nullptr) != nullptr) {
     auto dart_entrypoint = std::string{args->custom_dart_entrypoint};
@@ -2385,7 +2386,8 @@ FlutterEngineResult FlutterEngineNotifyDisplayUpdate(
 FlutterEngineResult FlutterEngineCreateMapping(
     const FlutterEngineMappingCreateInfo* create_info,
     FlutterEngineMapping* out_mapping) {
-  if (SAFE_ACCESS(create_info, data, nullptr) == nullptr && SAFE_ACCESS(create_info, data_size, 0) > 0) {
+  if (SAFE_ACCESS(create_info, data, nullptr) == nullptr &&
+      SAFE_ACCESS(create_info, data_size, 0) > 0) {
     return LOG_EMBEDDER_ERROR(kInvalidArguments, "Invalid mapping specified.");
   }
 

shell/platform/embedder/embedder.h

@@ -1345,26 +1345,27 @@ typedef void (*FlutterLogMessageCallback)(const char* /* tag */,
 /// FlutterEngine instance in AOT mode.
 typedef struct _FlutterEngineAOTData* FlutterEngineAOTData;
 
-/// An immutable buffer of potentially shared data. 
+/// An immutable buffer of potentially shared data.
 typedef struct {
   /// The size of the struct. Must be sizeof(FlutterEngineMapping).
   size_t struct_size;
 
   /// A pointer to the data accessed by the Flutter Engine. The data will not be
-  /// mutated by the Flutter Engine, and must not be mutated by the Embedder until
-  /// the mapping is destroyed.
+  /// mutated by the Flutter Engine, and must not be mutated by the Embedder
+  /// until the mapping is destroyed.
   const uint8_t* data;
   /// The size of the data backed by this mapping. The data must be valid for
-  /// reading until this point. Bytes past the end are undefined and not accessed
-  /// by the Engine. 
+  /// reading until this point. Bytes past the end are undefined and not
+  /// accessed by the Engine.
   size_t data_size;
 
-  /// An opaque baton passed back to the embedder when the destruction_callback is
-  /// invoked. The engine does not interpret this field in any way.
+  /// An opaque baton passed back to the embedder when the destruction_callback
+  /// is invoked. The engine does not interpret this field in any way.
   void* user_data;
-  /// Called once by the engine to destroy this mapping. The `user_data` specified
-  /// above is passed in as the only argument. This call may mutate/free/unmap the
-  /// data, as it will no longer be accessed by the Flutter Engine.
+  /// Called once by the engine to destroy this mapping. The `user_data`
+  /// specified above is passed in as the only argument. This call may
+  /// mutate/free/unmap the data, as it will no longer be accessed by the
+  /// Flutter Engine.
   VoidCallback destruction_callback;
 } FlutterEngineMappingCreateInfo;
 
@@ -1375,22 +1376,23 @@ typedef struct FlutterEngineMappingPrivate* FlutterEngineMapping;
 /// This may be called by multiple threads.
 ///
 /// The `asset_name` parameter contains the path to the asset to load.
-/// `user_data` is the user data from `FlutterEngineAssetResolver`, registered via
-/// `FlutterProjectArgs`.
+/// `user_data` is the user data from `FlutterEngineAssetResolver`, registered
+/// via `FlutterProjectArgs`.
 ///
 /// If the asset was found and successfully loaded, return a valid
-/// `FlutterEngineMapping`. Otherwise return NULL to indicate an error occurred 
+/// `FlutterEngineMapping`. Otherwise return NULL to indicate an error occurred
 /// while loading the asset.
 ///
-/// Note that the returned `FlutterEngineMapping` is owned by the Engine and should
-/// be cached or reused. Each callback invocation must return a new 
-/// FlutterEngineMapping. Multiple mappings may refer to the same area in memory,
-/// proper book-keeping is up to the embedder.
-typedef FlutterEngineMapping (*FlutterAssetResolverGetAssetCallback)(const char* /* asset_name */,
-                                                                      void* /* user_data */);
+/// Note that the returned `FlutterEngineMapping` is owned by the Engine and
+/// should be cached or reused. Each callback invocation must return a new
+/// FlutterEngineMapping. Multiple mappings may refer to the same area in
+/// memory, proper book-keeping is up to the embedder.
+typedef FlutterEngineMapping (*FlutterAssetResolverGetAssetCallback)(
+    const char* /* asset_name */,
+    void* /* user_data */);
 
-/// Resolves assets on the behalf of the Flutter Engine, instead of accessing the
-/// filesystem directly.
+/// Resolves assets on the behalf of the Flutter Engine, instead of accessing
+/// the filesystem directly.
 typedef struct {
   /// The size of the struct. Must be sizeof(FlutterEngineAssetResolver).
   size_t struct_size;
@@ -1413,9 +1415,10 @@ typedef struct {
   ///
   /// If `asset_resolver` is provided, may be NULL.
   ///
-  /// If both `asset_resolver` and `assets_path` are provided, the `asset_resolver`
-  /// comes first in the asset search order, then `assets_path`. This effectively
-  /// makes `asset_resolver` an overlay over `assets_path`.
+  /// If both `asset_resolver` and `assets_path` are provided, the
+  /// `asset_resolver` comes first in the asset search order, then
+  /// `assets_path`. This effectively makes `asset_resolver` an overlay over
+  /// `assets_path`.
   const char* assets_path;
   /// The path to the Dart file containing the `main` entry point.
   /// The string can be collected after the call to `FlutterEngineRun` returns.
@@ -1659,9 +1662,10 @@ typedef struct {
   ///
   /// If `assets_path` is provided, may be NULL.
   ///
-  /// If both `asset_resolver` and `assets_path` are provided, the `asset_resolver`
-  /// comes first in the asset search order, then `assets_path`. This effectively
-  /// makes `asset_resolver` an overlay over `assets_path`.
+  /// If both `asset_resolver` and `assets_path` are provided, the
+  /// `asset_resolver` comes first in the asset search order, then
+  /// `assets_path`. This effectively makes `asset_resolver` an overlay over
+  /// `assets_path`.
   const FlutterEngineAssetResolver* asset_resolver;
 } FlutterProjectArgs;
 

shell/platform/embedder/embedder_asset_resolver.cc

@@ -8,51 +8,48 @@
 namespace flutter {
 
 class EmbedderAssetResolver final : public flutter::AssetResolver {
-  public:
+ public:
   explicit EmbedderAssetResolver(void* user_data,
                                  FlutterAssetResolverGetAssetCallback get_asset)
-      : user_data_(user_data),
-        get_asset_(get_asset) {}
-  
+      : user_data_(user_data), get_asset_(get_asset) {}
+
   ~EmbedderAssetResolver() override {}
 
   // |AssetResolver|
-  bool IsValid() const override {
-    return true;
-  }
+  bool IsValid() const override { return true; }
 
   // |AssetResolver|
-  bool IsValidAfterAssetManagerChange() const override {
-    return true;
-  }
+  bool IsValidAfterAssetManagerChange() const override { return true; }
 
   // |AssetResolver|
   AssetResolverType GetType() const override {
     return AssetResolverType::kEmbedderAssetResolver;
   }
 
   // |AssetResolver|
-  std::unique_ptr<fml::Mapping> GetAsMapping(const std::string& asset_name) const override {
+  std::unique_ptr<fml::Mapping> GetAsMapping(
+      const std::string& asset_name) const override {
     if (!get_asset_) {
       return std::unique_ptr<fml::Mapping>();
     }
 
     FlutterEngineMapping mapping = get_asset_(asset_name.c_str(), user_data_);
-    return std::unique_ptr<fml::Mapping>(reinterpret_cast<fml::Mapping*>(mapping));
+    return std::unique_ptr<fml::Mapping>(
+        reinterpret_cast<fml::Mapping*>(mapping));
   }
 
-private:
+ private:
   void* user_data_;
   FlutterAssetResolverGetAssetCallback get_asset_;
-  
+
   FML_DISALLOW_COPY_AND_ASSIGN(EmbedderAssetResolver);
 };
 
-std::unique_ptr<flutter::AssetResolver> CreateEmbedderAssetResolver(const FlutterEngineAssetResolver* resolver) {
+std::unique_ptr<flutter::AssetResolver> CreateEmbedderAssetResolver(
+    const FlutterEngineAssetResolver* resolver) {
   return std::make_unique<EmbedderAssetResolver>(
-    SAFE_ACCESS(resolver, user_data, nullptr),
-    SAFE_ACCESS(resolver, get_asset, nullptr)
-  );
+      SAFE_ACCESS(resolver, user_data, nullptr),
+      SAFE_ACCESS(resolver, get_asset, nullptr));
 }
 
 }  // namespace flutter

shell/platform/embedder/embedder_asset_resolver.h

@@ -10,7 +10,8 @@
 
 namespace flutter {
 
-std::unique_ptr<flutter::AssetResolver> CreateEmbedderAssetResolver(const FlutterEngineAssetResolver* resolver);
+std::unique_ptr<flutter::AssetResolver> CreateEmbedderAssetResolver(
+    const FlutterEngineAssetResolver* resolver);
 
 }  // namespace flutter
 

shell/platform/embedder/embedder_mapping.cc

@@ -8,7 +8,7 @@
 namespace flutter {
 
 class EmbedderMapping final : public fml::Mapping {
-  public:
+ public:
   EmbedderMapping(const uint8_t* data,
                   size_t size,
                   void* user_data,
@@ -17,27 +17,22 @@ class EmbedderMapping final : public fml::Mapping {
         size_(size),
         user_data_(user_data),
         destruction_callback_(destruction_callback) {}
-  
+
   ~EmbedderMapping() override {
-    if (destruction_callback_) destruction_callback_(user_data_);
+    if (destruction_callback_)
+      destruction_callback_(user_data_);
   }
 
   // |Mapping|
-  size_t GetSize() const override {
-    return size_;
-  }
+  size_t GetSize() const override { return size_; }
 
   // |Mapping|
-  const uint8_t* GetMapping() const override {
-    return data_;
-  }
+  const uint8_t* GetMapping() const override { return data_; }
 
   // |Mapping|
-  bool IsDontNeedSafe() const override {
-    return false;
-  }
+  bool IsDontNeedSafe() const override { return false; }
 
-private:
+ private:
   const uint8_t* data_;
   size_t size_;
   void* user_data_;
@@ -46,13 +41,12 @@ class EmbedderMapping final : public fml::Mapping {
   FML_DISALLOW_COPY_AND_ASSIGN(EmbedderMapping);
 };
 
-std::unique_ptr<fml::Mapping> CreateEmbedderMapping(const FlutterEngineMappingCreateInfo* mapping) {
+std::unique_ptr<fml::Mapping> CreateEmbedderMapping(
+    const FlutterEngineMappingCreateInfo* mapping) {
   return std::make_unique<EmbedderMapping>(
-    SAFE_ACCESS(mapping, data, nullptr),
-    SAFE_ACCESS(mapping, data_size, 0),
-    SAFE_ACCESS(mapping, user_data, nullptr),
-    SAFE_ACCESS(mapping, destruction_callback, nullptr)
-  );
+      SAFE_ACCESS(mapping, data, nullptr), SAFE_ACCESS(mapping, data_size, 0),
+      SAFE_ACCESS(mapping, user_data, nullptr),
+      SAFE_ACCESS(mapping, destruction_callback, nullptr));
 }
 
 }  // namespace flutter

shell/platform/embedder/embedder_mapping.h

@@ -10,7 +10,8 @@
 
 namespace flutter {
 
-std::unique_ptr<fml::Mapping> CreateEmbedderMapping(const FlutterEngineMappingCreateInfo* mapping);
+std::unique_ptr<fml::Mapping> CreateEmbedderMapping(
+    const FlutterEngineMappingCreateInfo* mapping);
 
 }  // namespace flutter
 

shell/platform/embedder/tests/embedder_config_builder.cc

@@ -174,7 +174,8 @@ void EmbedderConfigBuilder::SetAssetsPath() {
   project_args_.assets_path = context_.GetAssetsPath().c_str();
 }
 
-void EmbedderConfigBuilder::SetAssetResolver(const FlutterEngineAssetResolver* resolver) {
+void EmbedderConfigBuilder::SetAssetResolver(
+    const FlutterEngineAssetResolver* resolver) {
   asset_resolver_ = *resolver;
   project_args_.asset_resolver = &asset_resolver_;
 }

shell/platform/embedder/tests/embedder_unittests.cc

@@ -488,7 +488,8 @@ TEST_F(EmbedderTest, CustomAssetResolverReturnsValidAsset) {
   FlutterEngineAssetResolver resolver = {};
   resolver.struct_size = sizeof(FlutterEngineAssetResolver);
   resolver.user_data = reinterpret_cast<void*>(&destroy);
-  resolver.get_asset = [](const char* asset, void* user_data) -> FlutterEngineMapping {
+  resolver.get_asset = [](const char* asset,
+                          void* user_data) -> FlutterEngineMapping {
     if (strcmp(asset, "existing_asset") == 0) {
       // Return an asset with the string "hello" as its contents.
       // When the mapping is destroyed (on GC or Engine shutdown) the
@@ -513,8 +514,7 @@ TEST_F(EmbedderTest, CustomAssetResolverReturnsValidAsset) {
 
   fml::AutoResetWaitableEvent message;
   context.AddNativeCallback(
-      "SignalNativeCount",
-      CREATE_NATIVE_ENTRY([](Dart_NativeArguments args) {
+      "SignalNativeCount", CREATE_NATIVE_ENTRY([](Dart_NativeArguments args) {
         auto count = tonic::DartConverter<int64_t>::FromDart(
             Dart_GetNativeArgument(args, 0));
         // Dart should receive a 5 byte message reply.
@@ -525,7 +525,8 @@ TEST_F(EmbedderTest, CustomAssetResolverReturnsValidAsset) {
       CREATE_NATIVE_ENTRY(([&message](Dart_NativeArguments args) {
         auto received_message = tonic::DartConverter<std::string>::FromDart(
             Dart_GetNativeArgument(args, 0));
-        // The message received from the asset channel should be the string "hello".
+        // The message received from the asset channel should be the string
+        // "hello".
         EXPECT_EQ("hello", received_message);
         message.Signal();
       })));
@@ -550,7 +551,8 @@ TEST_F(EmbedderTest, CustomAssetResolverReturnsInvalidAsset) {
 
   FlutterEngineAssetResolver resolver = {};
   resolver.struct_size = sizeof(FlutterEngineAssetResolver);
-  resolver.get_asset = [](const char* asset, void* user_data) -> FlutterEngineMapping {
+  resolver.get_asset = [](const char* asset,
+                          void* user_data) -> FlutterEngineMapping {
     return nullptr;
   };