diff --git a/adapter/ohos/entrance/ace_ability.cpp b/adapter/ohos/entrance/ace_ability.cpp index 6ce5b8d0b6f48e3e4f0ccb961a69c24294fd18cb..c9a2f020930864c7311bd3fbeaf7e3f06001c4aa 100644 --- a/adapter/ohos/entrance/ace_ability.cpp +++ b/adapter/ohos/entrance/ace_ability.cpp @@ -421,7 +421,7 @@ void AceAbility::OnStart(const Want& want, sptr sessionInfo) const std::function& task) { ContainerScope scope(id); taskExecutor->PostTask(task, TaskExecutor::TaskType::UI); - }); + }, id); if (context != nullptr) { context->SetRSUIDirector(rsUiDirector); } diff --git a/adapter/ohos/entrance/ui_content_impl.cpp b/adapter/ohos/entrance/ui_content_impl.cpp index 1585a58c5b2ec78e835b76bb4c9864674908b914..bbca720595570b11f823cd20e664dacbaa0e3386 100644 --- a/adapter/ohos/entrance/ui_content_impl.cpp +++ b/adapter/ohos/entrance/ui_content_impl.cpp @@ -1525,7 +1525,7 @@ UIContentErrorCode UIContentImpl::CommonInitialize( [taskExecutor = container->GetTaskExecutor(), id](const std::function& task) { ContainerScope scope(id); taskExecutor->PostTask(task, TaskExecutor::TaskType::UI); - }); + }, id); auto context = AceType::DynamicCast(container->GetPipelineContext()); if (context != nullptr) { context->SetRSUIDirector(rsUiDirector); diff --git a/adapter/preview/entrance/ace_ability.cpp b/adapter/preview/entrance/ace_ability.cpp index c79bf84b11686cb917c25f359b9141902bac6f2a..ee6a1ea98d4c11edc8964dd8a5bba6f1d63ef22c 100644 --- a/adapter/preview/entrance/ace_ability.cpp +++ b/adapter/preview/entrance/ace_ability.cpp @@ -232,7 +232,7 @@ void AceAbility::InitEnv() ContainerScope scope(id); taskExecutor->PostTask(task, TaskExecutor::TaskType::UI); }; - director->SetUITaskRunner(func); + director->SetUITaskRunner(func, id); director->Init(); context->SetRSUIDirector(director); }; diff --git a/adapter/preview/entrance/ui_content_impl.cpp b/adapter/preview/entrance/ui_content_impl.cpp index ba18303826d7a7763169ab289c7818a6e4fb13a7..33234a01b66e5cd0c58915cb787dbf2b1a0cb041 100644 --- a/adapter/preview/entrance/ui_content_impl.cpp +++ b/adapter/preview/entrance/ui_content_impl.cpp @@ -316,7 +316,7 @@ UIContentErrorCode UIContentImpl::CommonInitialize(OHOS::Rosen::Window* window, ContainerScope scope(id); taskExecutor->PostTask(task, TaskExecutor::TaskType::UI); }; - director->SetUITaskRunner(func); + director->SetUITaskRunner(func, id); director->Init(); context->SetRSUIDirector(director); }; diff --git a/frameworks/core/components_ng/render/adapter/form_render_window.cpp b/frameworks/core/components_ng/render/adapter/form_render_window.cpp index 43cfa2d011c21aa44b6155671d38c8382efa8ba7..45d63a4e38499dc7a9e3dcc6fcd5db502cf023da 100644 --- a/frameworks/core/components_ng/render/adapter/form_render_window.cpp +++ b/frameworks/core/components_ng/render/adapter/form_render_window.cpp @@ -102,7 +102,7 @@ FormRenderWindow::FormRenderWindow(RefPtr taskExecutor, int32_t id ContainerScope scope(id); CHECK_NULL_VOID(taskExecutor); taskExecutor->PostTask(task, TaskExecutor::TaskType::UI); - }); + }, id); #else taskExecutor_ = nullptr; id_ = 0; diff --git a/frameworks/core/components_ng/render/adapter/rosen_render_context.cpp b/frameworks/core/components_ng/render/adapter/rosen_render_context.cpp index ef64dfde4e3a6d9dec82e57dbe6ba245761341d1..5e28ea26c93217e4e9dc33f830ae5df501d48cc5 100644 --- a/frameworks/core/components_ng/render/adapter/rosen_render_context.cpp +++ b/frameworks/core/components_ng/render/adapter/rosen_render_context.cpp @@ -349,6 +349,7 @@ void RosenRenderContext::RemoveSurfaceChangedCallBack() void RosenRenderContext::AddFrameNodeInfoToRsNode() { if (rsNode_) { + rsNode_->SetInstanceId(Container::CurrentId()); auto frameNodePtr = GetHost(); CHECK_NULL_VOID(frameNodePtr); rsNode_->SetFrameNodeInfo(frameNodePtr->GetId(), frameNodePtr->GetTag()); diff --git a/frameworks/core/components_ng/render/adapter/rosen_window.cpp b/frameworks/core/components_ng/render/adapter/rosen_window.cpp index 85a2e303a725e7c9cba3b7f3796635712ec1ef53..5fb7cea732bbb0399204a30f97e8d262c1374f6c 100644 --- a/frameworks/core/components_ng/render/adapter/rosen_window.cpp +++ b/frameworks/core/components_ng/render/adapter/rosen_window.cpp @@ -90,7 +90,7 @@ RosenWindow::RosenWindow(const OHOS::sptr& window, RefPtrPostTask(task, TaskExecutor::TaskType::UI); - }); + }, id); rsUIDirector_->SetRequestVsyncCallback([weak = weak_from_this()]() { auto self = weak.lock(); CHECK_NULL_VOID(self);