Commit from GitHub Actions (Run Code Linter)

openwebf · Feb 2, 2025 · f452a9d · f452a9d
1 parent df18d07
commit f452a9d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/bridge/core/api/executing_context.cc b/bridge/core/api/executing_context.cc
@@ -146,9 +146,9 @@ void ExecutingContextWebFMethods::AddRustFutureTask(ExecutingContext* context,
 }
 
 void ExecutingContextWebFMethods::RemoveRustFutureTask(ExecutingContext* context,
-                                                    WebFNativeFunctionContext* callback_context,
-                                                    NativeLibrartMetaData* meta_data,
-                                                    SharedExceptionState* shared_exception_state) {
+                                                       WebFNativeFunctionContext* callback_context,
+                                                       NativeLibrartMetaData* meta_data,
+                                                       SharedExceptionState* shared_exception_state) {
   auto callback_impl = WebFNativeFunction::Create(callback_context, shared_exception_state);
 
   context->RemoveRustFutureTask(callback_impl, meta_data);

diff --git a/bridge/core/dart_methods.h b/bridge/core/dart_methods.h
@@ -11,11 +11,11 @@
 
 #include <memory>
 #include <thread>
+#include "core/native/native_loader.h"
 #include "foundation/native_string.h"
 #include "foundation/native_value.h"
 #include "include/dart_api.h"
 #include "plugin_api/executing_context.h"
-#include "core/native/native_loader.h"
 
 #if defined(_WIN32)
 #define WEBF_EXPORT_C extern "C" __declspec(dllexport)

diff --git a/bridge/core/executing_context.cc b/bridge/core/executing_context.cc
@@ -393,11 +393,13 @@ void ExecutingContext::EnqueueMicrotask(MicrotaskCallback callback, void* data)
   JS_FreeValue(ctx(), proxy_data);
 }
 
-void ExecutingContext::AddRustFutureTask(const std::shared_ptr<WebFNativeFunction>& run_future_task, NativeLibrartMetaData* meta_data) {
+void ExecutingContext::AddRustFutureTask(const std::shared_ptr<WebFNativeFunction>& run_future_task,
+                                         NativeLibrartMetaData* meta_data) {
   meta_data->callbacks.push_back(run_future_task);
 }
 
-void ExecutingContext::RemoveRustFutureTask(const std::shared_ptr<WebFNativeFunction>& run_future_task, NativeLibrartMetaData* meta_data) {
+void ExecutingContext::RemoveRustFutureTask(const std::shared_ptr<WebFNativeFunction>& run_future_task,
+                                            NativeLibrartMetaData* meta_data) {
   // Add the callback to the removed_callbacks list to avoid removing the callback during the iteration.
   meta_data->removed_callbacks.push_back(run_future_task);
 }
@@ -410,9 +412,11 @@ void ExecutingContext::RunRustFutureTasks() {
       dart_isolate_context_->profiler()->FinishTrackAsyncEvaluation();
     }
     for (auto& removed_callback : meta_data->removed_callbacks) {
-      meta_data->callbacks.erase(std::remove_if(meta_data->callbacks.begin(), meta_data->callbacks.end(), [&](const std::shared_ptr<WebFNativeFunction>& callback) {
-        return callback->Matches(removed_callback);
-      }), meta_data->callbacks.end());
+      meta_data->callbacks.erase(std::remove_if(meta_data->callbacks.begin(), meta_data->callbacks.end(),
+                                                [&](const std::shared_ptr<WebFNativeFunction>& callback) {
+                                                  return callback->Matches(removed_callback);
+                                                }),
+                                 meta_data->callbacks.end());
     }
     meta_data->removed_callbacks.clear();
     if (meta_data->callbacks.empty() && meta_data->load_context != nullptr) {

diff --git a/bridge/core/executing_context.h b/bridge/core/executing_context.h
@@ -101,8 +101,10 @@ class ExecutingContext {
   void ReportError(JSValueConst error, char** rust_errmsg, uint32_t* rust_errmsg_length);
   void DrainMicrotasks();
   void EnqueueMicrotask(MicrotaskCallback callback, void* data = nullptr);
-  static void AddRustFutureTask(const std::shared_ptr<WebFNativeFunction>& run_rust_future_tasks, NativeLibrartMetaData* meta_data);
-  static void RemoveRustFutureTask(const std::shared_ptr<WebFNativeFunction>& run_rust_future_tasks, NativeLibrartMetaData* meta_data);
+  static void AddRustFutureTask(const std::shared_ptr<WebFNativeFunction>& run_rust_future_tasks,
+                                NativeLibrartMetaData* meta_data);
+  static void RemoveRustFutureTask(const std::shared_ptr<WebFNativeFunction>& run_rust_future_tasks,
+                                   NativeLibrartMetaData* meta_data);
   void RunRustFutureTasks();
   void RegisterNativeLibraryMetaData(NativeLibrartMetaData* meta_data);
   void DefineGlobalProperty(const char* prop, JSValueConst value);

diff --git a/bridge/core/native/native_function.h b/bridge/core/native/native_function.h
@@ -49,8 +49,7 @@ class WebFNativeFunction : public Function {
   }
 
   [[nodiscard]] bool Matches(const std::shared_ptr<WebFNativeFunction>& other) {
-    return other && other->callback_context_ &&
-           other->callback_context_->callback == callback_context_->callback;
+    return other && other->callback_context_ && other->callback_context_->callback == callback_context_->callback;
   }
 
  private:

diff --git a/bridge/core/native/native_loader.cc b/bridge/core/native/native_loader.cc
@@ -48,7 +48,8 @@ static void HandleNativeLibraryLoad(PluginLibraryEntryPoint entry_point,
     return;
 
   context->dartIsolateContext()->dispatcher()->PostToJs(context->isDedicated(), context_id, ExecuteNativeLibrary,
-                                                        entry_point, lib_name, p_native_library_load_context, imported_data);
+                                                        entry_point, lib_name, p_native_library_load_context,
+                                                        imported_data);
 }
 
 ScriptPromise NativeLoader::loadNativeLibrary(const AtomicString& lib_name,