Merge pull request #44266 from akien-mga/js-export-code-cleanup

HTML5: Code style cleanup for export code

platform/javascript/detect.py

@@ -23,12 +23,12 @@ def get_opts():
 
     return [
         ("initial_memory", "Initial WASM memory (in MiB)", 16),
-        BoolVariable("use_assertions", "Use emscripten runtime assertions", False),
+        BoolVariable("use_assertions", "Use Emscripten runtime assertions", False),
         BoolVariable("use_thinlto", "Use ThinLTO", False),
-        BoolVariable("use_ubsan", "Use LLVM/GCC compiler undefined behavior sanitizer (UBSAN)", False),
-        BoolVariable("use_asan", "Use LLVM/GCC compiler address sanitizer (ASAN)", False),
-        BoolVariable("use_lsan", "Use LLVM/GCC compiler leak sanitizer (LSAN)", False),
-        BoolVariable("use_safe_heap", "Use emscripten SAFE_HEAP sanitizer", False),
+        BoolVariable("use_ubsan", "Use Emscripten undefined behavior sanitizer (UBSAN)", False),
+        BoolVariable("use_asan", "Use Emscripten address sanitizer (ASAN)", False),
+        BoolVariable("use_lsan", "Use Emscripten leak sanitizer (LSAN)", False),
+        BoolVariable("use_safe_heap", "Use Emscripten SAFE_HEAP sanitizer", False),
         # eval() can be a security concern, so it can be disabled.
         BoolVariable("javascript_eval", "Enable JavaScript eval interface", True),
         BoolVariable("threads_enabled", "Enable WebAssembly Threads support (limited browser support)", False),

platform/javascript/export/export.cpp

@@ -37,16 +37,13 @@
 #include "platform/javascript/logo.gen.h"
 #include "platform/javascript/run_icon.gen.h"
 
-#define EXPORT_TEMPLATE_WEBASSEMBLY_RELEASE "webassembly_release.zip"
-#define EXPORT_TEMPLATE_WEBASSEMBLY_DEBUG "webassembly_debug.zip"
-
 class EditorHTTPServer : public Reference {
 private:
 	Ref<TCP_Server> server;
 	Ref<StreamPeerTCP> connection;
-	uint64_t time;
+	uint64_t time = 0;
 	uint8_t req_buf[4096];
-	int req_pos;
+	int req_pos = 0;
 
 	void _clear_client() {
 		connection = Ref<StreamPeerTCP>();
@@ -211,7 +208,12 @@ class EditorExportPlatformJavaScript : public EditorExportPlatform {
 	Ref<ImageTexture> logo;
 	Ref<ImageTexture> run_icon;
 	Ref<ImageTexture> stop_icon;
-	int menu_options;
+	int menu_options = 0;
+
+	Ref<EditorHTTPServer> server;
+	bool server_quit = false;
+	Mutex server_lock;
+	Thread *server_thread = nullptr;
 
 	enum ExportMode {
 		EXPORT_MODE_NORMAL = 0,
@@ -241,12 +243,6 @@ class EditorExportPlatformJavaScript : public EditorExportPlatform {
 
 	void _fix_html(Vector<uint8_t> &p_html, const Ref<EditorExportPreset> &p_preset, const String &p_name, bool p_debug, int p_flags, const Vector<SharedObject> p_shared_objects);
 
-private:
-	Ref<EditorHTTPServer> server;
-	bool server_quit;
-	Mutex server_lock;
-	Thread *server_thread;
-
 	static void _server_thread_poll(void *data);
 
 public:
@@ -685,7 +681,6 @@ void EditorExportPlatformJavaScript::_server_thread_poll(void *data) {
 
 EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() {
 	server.instance();
-	server_quit = false;
 	server_thread = Thread::create(_server_thread_poll, this);
 
 	Ref<Image> img = memnew(Image(_javascript_logo));
@@ -702,8 +697,6 @@ EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() {
 	} else {
 		stop_icon.instance();
 	}
-
-	menu_options = 0;
 }
 
 EditorExportPlatformJavaScript::~EditorExportPlatformJavaScript() {