From eaaa9667779c55251800c04bcecf4174a2f7240b Mon Sep 17 00:00:00 2001
From: Caoruihong <crh.cao@huawei.com>
Date: Fri, 5 Apr 2024 17:46:01 +0800
Subject: [PATCH] adapt the new RSUIDirector::SetUITaskRunner with instanceId

Signed-off-by: Caoruihong <crh.cao@huawei.com>
---
 adapter/ohos/entrance/ace_ability.cpp                           | 2 +-
 adapter/ohos/entrance/ui_content_impl.cpp                       | 2 +-
 adapter/preview/entrance/ace_ability.cpp                        | 2 +-
 adapter/preview/entrance/ui_content_impl.cpp                    | 2 +-
 .../core/components_ng/render/adapter/form_render_window.cpp    | 2 +-
 .../core/components_ng/render/adapter/rosen_render_context.cpp  | 1 +
 frameworks/core/components_ng/render/adapter/rosen_window.cpp   | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/adapter/ohos/entrance/ace_ability.cpp b/adapter/ohos/entrance/ace_ability.cpp
index 6ce5b8d0b6f..c9a2f020930 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<AAFwk::SessionInfo> sessionInfo)
                         const std::function<void()>& 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 1585a58c5b2..bbca7205955 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<void()>& task) {
                         ContainerScope scope(id);
                         taskExecutor->PostTask(task, TaskExecutor::TaskType::UI);
-                    });
+                    }, id);
                 auto context = AceType::DynamicCast<PipelineContext>(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 c79bf84b116..ee6a1ea98d4 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 ba18303826d..33234a01b66 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 43cfa2d011c..45d63a4e384 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> 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 ef64dfde4e3..5e28ea26c93 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 85a2e303a72..5fb7cea732b 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<OHOS::Rosen::Window>& window, RefPtr<T
         ContainerScope scope(id);
         CHECK_NULL_VOID(taskExecutor);
         taskExecutor->PostTask(task, TaskExecutor::TaskType::UI);
-    });
+    }, id);
     rsUIDirector_->SetRequestVsyncCallback([weak = weak_from_this()]() {
         auto self = weak.lock();
         CHECK_NULL_VOID(self);
-- 
Gitee