From 928404abef7e0d8fc89382575e617241b785f7cf Mon Sep 17 00:00:00 2001 From: tusi_fly Date: Tue, 18 Jan 2022 22:31:23 +0800 Subject: [PATCH] contentStorage Signed-off-by: tusi_fly Change-Id: I7366a09c0af0e0ef9c9965c94f685a618844835b --- .../ability/native/src/ability_runtime/js_window_stage.cpp | 7 +++++-- frameworks/kits/runtime/native/js_runtime.cpp | 2 ++ interfaces/innerkits/runtime/BUILD.gn | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frameworks/kits/ability/native/src/ability_runtime/js_window_stage.cpp b/frameworks/kits/ability/native/src/ability_runtime/js_window_stage.cpp index eb189da6dcc..0ec589f73ed 100644 --- a/frameworks/kits/ability/native/src/ability_runtime/js_window_stage.cpp +++ b/frameworks/kits/ability/native/src/ability_runtime/js_window_stage.cpp @@ -23,6 +23,10 @@ namespace OHOS { namespace AbilityRuntime { +namespace { +const int CONTENT_STORAGE_ARG = 2; +} // namespace + void JsWindowStage::Finalizer(NativeEngine* engine, void* data, void* hint) { HILOG_INFO("JsWindowStage::Finalizer is called"); @@ -129,8 +133,7 @@ NativeValue* JsWindowStage::OnSetUIContent(NativeEngine& engine, NativeCallbackI } HILOG_INFO("JsWindowStage::OnSetUIContent Get url: %{public}s", contextUrl.c_str()); - windowScene_->GetMainWindow()->SetUIContent(contextUrl, &engine, - static_cast(abilityContext->GetContentStorage())); + windowScene_->GetMainWindow()->SetUIContent(contextUrl, &engine, info.argv[CONTENT_STORAGE_ARG]); return engine.CreateUndefined(); } diff --git a/frameworks/kits/runtime/native/js_runtime.cpp b/frameworks/kits/runtime/native/js_runtime.cpp index 85c64e55541..4d36368bbfe 100644 --- a/frameworks/kits/runtime/native/js_runtime.cpp +++ b/frameworks/kits/runtime/native/js_runtime.cpp @@ -21,6 +21,7 @@ #include #include "native_engine/impl/ark/ark_native_engine.h" +#include "declarative_module_preloader.h" #include "event_handler.h" #include "hilog_wrapper.h" @@ -269,6 +270,7 @@ bool JsRuntime::Initialize(const Options& options) return false; } + OHOS::Ace::DeclarativeModulePreloader::Preload(*nativeEngine_); codePath_ = options.codePath; return true; } diff --git a/interfaces/innerkits/runtime/BUILD.gn b/interfaces/innerkits/runtime/BUILD.gn index 19aa60c882d..3c090a96075 100644 --- a/interfaces/innerkits/runtime/BUILD.gn +++ b/interfaces/innerkits/runtime/BUILD.gn @@ -57,6 +57,7 @@ ohos_shared_library("runtime") { deps = [ "//ark/js_runtime:libark_jsruntime", + "//foundation/ace/ace_engine/interfaces/innerkits/ace:ace_uicontent", "//foundation/ace/napi:ace_napi", "//foundation/ace/napi:ace_napi_ark", "//utils/native/base:utils", -- Gitee