From 28d45b70b1e95f9643c69f4fc6efd579d49a7646 Mon Sep 17 00:00:00 2001 From: sunman4 Date: Thu, 14 Apr 2022 17:09:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=86=97=E4=BD=99?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sunman4 --- jsapi/worker/worker.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jsapi/worker/worker.cpp b/jsapi/worker/worker.cpp index 31024a1..a34ba6d 100644 --- a/jsapi/worker/worker.cpp +++ b/jsapi/worker/worker.cpp @@ -437,9 +437,7 @@ napi_value Worker::PostMessage(napi_env env, napi_callback_info cbinfo) return nullptr; } - if (data != nullptr) { - worker->PostMessageInner(data); - } + worker->PostMessageInner(data); return NapiValueHelp::GetUndefinedValue(env); } -- Gitee From 57ce703ec7dd4a467d592661c1f94c1bed2eaa7b Mon Sep 17 00:00:00 2001 From: sunman4 Date: Thu, 14 Apr 2022 17:16:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sunman4 --- jsapi/worker/worker.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/jsapi/worker/worker.cpp b/jsapi/worker/worker.cpp index a34ba6d..4547beb 100644 --- a/jsapi/worker/worker.cpp +++ b/jsapi/worker/worker.cpp @@ -613,14 +613,7 @@ napi_value Worker::WorkerConstructor(napi_env env, napi_callback_info cbinfo) if (strcmp("classic", typeStr) == 0) { worker->SetScriptMode(CLASSIC); CloseHelp::DeletePointer(typeStr, true); - } else if (strcmp("module", typeStr) == 0) { - worker->SetScriptMode(MODULE); - napi_throw_error(env, nullptr, "unsupport module"); - CloseHelp::DeletePointer(typeStr, true); - CloseHelp::DeletePointer(worker, false); - return nullptr; } else { - worker->SetScriptMode(MODULE); napi_throw_error(env, nullptr, "unsupport module"); CloseHelp::DeletePointer(typeStr, true); CloseHelp::DeletePointer(worker, false); -- Gitee From ecf5ae7c547667dd6b69a7a5c90926601080d992 Mon Sep 17 00:00:00 2001 From: sunman4 Date: Thu, 14 Apr 2022 17:28:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=88=86=E6=94=AF=E4=BF=AE=E6=94=B9=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sunman4 --- jsapi/worker/worker.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jsapi/worker/worker.cpp b/jsapi/worker/worker.cpp index 4547beb..a34ba6d 100644 --- a/jsapi/worker/worker.cpp +++ b/jsapi/worker/worker.cpp @@ -613,7 +613,14 @@ napi_value Worker::WorkerConstructor(napi_env env, napi_callback_info cbinfo) if (strcmp("classic", typeStr) == 0) { worker->SetScriptMode(CLASSIC); CloseHelp::DeletePointer(typeStr, true); + } else if (strcmp("module", typeStr) == 0) { + worker->SetScriptMode(MODULE); + napi_throw_error(env, nullptr, "unsupport module"); + CloseHelp::DeletePointer(typeStr, true); + CloseHelp::DeletePointer(worker, false); + return nullptr; } else { + worker->SetScriptMode(MODULE); napi_throw_error(env, nullptr, "unsupport module"); CloseHelp::DeletePointer(typeStr, true); CloseHelp::DeletePointer(worker, false); -- Gitee