From d26e60d0193ae97e244bae7ebf52b6a20ff348de Mon Sep 17 00:00:00 2001 From: y00576111 Date: Thu, 9 Sep 2021 14:59:15 +0800 Subject: [PATCH] modify run_buffer_script to support ark Signed-off-by: y00576111 Change-Id: Iaa4584cda429467bb2ac5b54844301e987c6e0c4 --- jsapi/worker/worker.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/jsapi/worker/worker.cpp b/jsapi/worker/worker.cpp index 0d512fa..4a9b270 100644 --- a/jsapi/worker/worker.cpp +++ b/jsapi/worker/worker.cpp @@ -88,13 +88,9 @@ void Worker::PrepareForWorkerInstance(const Worker* worker) } std::vector scriptContent; OHOS::CCRuntime::Worker::WorkerCore::getAssertFunc(worker->GetScript(), scriptContent); - std::string stringContent(scriptContent.begin(), scriptContent.end()); - HILOG_INFO("worker:: stringContent = %{private}s", stringContent.c_str()); - napi_value scriptStringNapiValue = nullptr; - napi_create_string_utf8(env, stringContent.c_str(), stringContent.length(), &scriptStringNapiValue); napi_value execScriptResult = nullptr; - napi_run_script(env, scriptStringNapiValue, &execScriptResult); + napi_run_buffer_script(env, scriptContent, &execScriptResult); if (execScriptResult == nullptr) { // An exception occurred when running the script. HILOG_ERROR("worker:: run script exception occurs, will handle exception"); @@ -406,7 +402,7 @@ napi_value Worker::PostMessage(napi_env env, napi_callback_info cbinfo) { size_t argc = NapiValueHelp::GetCallbackInfoArgc(env, cbinfo); if (argc < 1) { - napi_throw_error(env, nullptr, "Worker param count must be more than 1 with new"); + napi_throw_error(env, nullptr, "Worker param count must be more than 1 with postMessage"); return nullptr; } napi_value* argv = new napi_value[argc]; -- Gitee