From a93507231cb7f0ed2c6f45821ff8258895e2d27f Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Sat, 23 Sep 2023 22:48:24 -0600 Subject: [PATCH] Ladybird/Android: Move JavaEnvironment helper to Ladybird namespace --- Ladybird/Android/src/main/cpp/JNIHelpers.h | 3 ++- Ladybird/Android/src/main/cpp/LadybirdActivity.cpp | 2 +- Ladybird/Android/src/main/cpp/WebContentServiceJNI.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Ladybird/Android/src/main/cpp/JNIHelpers.h b/Ladybird/Android/src/main/cpp/JNIHelpers.h index 66887f68d6..0db5254fb8 100644 --- a/Ladybird/Android/src/main/cpp/JNIHelpers.h +++ b/Ladybird/Android/src/main/cpp/JNIHelpers.h @@ -9,6 +9,7 @@ #include #include +namespace Ladybird { class JavaEnvironment { public: JavaEnvironment(JavaVM* vm) @@ -41,5 +42,5 @@ private: JNIEnv* m_env = nullptr; bool m_did_attach_thread = false; }; - +} extern JavaVM* global_vm; diff --git a/Ladybird/Android/src/main/cpp/LadybirdActivity.cpp b/Ladybird/Android/src/main/cpp/LadybirdActivity.cpp index 17f5a879d9..ff2a27ef1d 100644 --- a/Ladybird/Android/src/main/cpp/LadybirdActivity.cpp +++ b/Ladybird/Android/src/main/cpp/LadybirdActivity.cpp @@ -64,7 +64,7 @@ Java_org_serenityos_ladybird_LadybirdActivity_initNativeCode(JNIEnv* env, jobjec auto* event_loop_manager = new Ladybird::ALooperEventLoopManager(timer_service_ref); event_loop_manager->on_did_post_event = [] { - JavaEnvironment env(global_vm); + Ladybird::JavaEnvironment env(global_vm); env.get()->CallVoidMethod(s_java_instance, s_schedule_event_loop_method); }; Core::EventLoopManager::install(*event_loop_manager); diff --git a/Ladybird/Android/src/main/cpp/WebContentServiceJNI.cpp b/Ladybird/Android/src/main/cpp/WebContentServiceJNI.cpp index ce84fba167..e4b4ae8dc3 100644 --- a/Ladybird/Android/src/main/cpp/WebContentServiceJNI.cpp +++ b/Ladybird/Android/src/main/cpp/WebContentServiceJNI.cpp @@ -37,12 +37,12 @@ Java_org_serenityos_ladybird_WebContentService_nativeInit(JNIEnv* env, jobject t void bind_request_server_java(int ipc_socket, int fd_passing_socket) { - JavaEnvironment env(global_vm); + Ladybird::JavaEnvironment env(global_vm); env.get()->CallVoidMethod(global_instance, bind_request_server_method, ipc_socket, fd_passing_socket); } void bind_web_socket_java(int ipc_socket, int fd_passing_socket) { - JavaEnvironment env(global_vm); + Ladybird::JavaEnvironment env(global_vm); env.get()->CallVoidMethod(global_instance, bind_web_socket_method, ipc_socket, fd_passing_socket); }