From ac3dfe1a2969ba2d05a3dfb6ca13595276e85eff Mon Sep 17 00:00:00 2001
From: dingpanyun <dingpanyun1@huawei.com>
Date: Sat, 21 Jun 2025 09:08:33 +0000
Subject: [PATCH] set isFormRender

Signed-off-by: dingpanyun <dingpanyun1@huawei.com>
Change-Id: I5168d6f89c7029d7adb6ade00d8e224d5cb1b81e
---
 adapter/ohos/entrance/ace_container.cpp                   | 8 ++++++++
 adapter/ohos/entrance/ace_container.h                     | 6 +-----
 test/mock/adapter/mock_ace_container.cpp                  | 2 ++
 test/unittest/core/accessibility/mock_ace_container.cpp   | 2 ++
 .../core/pattern/ui_extension/mock/mock_ace_container.cpp | 2 ++
 .../pattern/ui_extension/mock/mock_ace_container_two.cpp  | 2 ++
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/adapter/ohos/entrance/ace_container.cpp b/adapter/ohos/entrance/ace_container.cpp
index 50be4a14e75..d637c896817 100644
--- a/adapter/ohos/entrance/ace_container.cpp
+++ b/adapter/ohos/entrance/ace_container.cpp
@@ -1532,6 +1532,8 @@ void AceContainer::SetUIWindow(int32_t instanceId, sptr<OHOS::Rosen::Window> uiW
     container->SetUIWindowInner(uiWindow);
     if (!container->IsSceneBoardWindow()) {
         ResourceManager::GetInstance().SetResourceCacheSize(RESOURCE_CACHE_DEFAULT_SIZE);
+    } else {
+        OHOS::Rosen::RSUIDirector::SetTypicalResidentProcess(true);
     }
 }
 
@@ -2503,6 +2505,12 @@ void AceContainer::AddLibPath(int32_t instanceId, const std::vector<std::string>
     assetManagerImpl->SetLibPath("default", libPath);
 }
 
+void AceContainer::SetIsFormRender(bool isFormRender)
+{
+    OHOS::Rosen::RSUIDirector::SetTypicalResidentProcess(isFormRender);
+    isFormRender_ = isFormRender;
+}
+
 void AceContainer::AttachView(std::shared_ptr<Window> window, const RefPtr<AceView>& view, double density, float width,
     float height, uint32_t windowId, UIEnvCallback callback)
 {
diff --git a/adapter/ohos/entrance/ace_container.h b/adapter/ohos/entrance/ace_container.h
index 5e5136ee38f..e3de3f55e15 100644
--- a/adapter/ohos/entrance/ace_container.h
+++ b/adapter/ohos/entrance/ace_container.h
@@ -598,11 +598,6 @@ public:
         isSubContainer_ = isSubContainer;
     }
 
-    void SetIsFormRender(bool isFormRender) override
-    {
-        isFormRender_ = isFormRender;
-    }
-
     void InitializeSubContainer(int32_t parentContainerId);
     static void SetDialogCallback(int32_t instanceId, FrontendDialogCallback callback);
 
@@ -901,6 +896,7 @@ public:
         const std::function<void()>&& loadPageCallback);
 
     UIContentErrorCode RunIntentPage();
+    void SetIsFormRender(bool isFormRender) override;
 
 private:
     virtual bool MaybeRelease() override;
diff --git a/test/mock/adapter/mock_ace_container.cpp b/test/mock/adapter/mock_ace_container.cpp
index 13720c7ff70..70eff3a3038 100644
--- a/test/mock/adapter/mock_ace_container.cpp
+++ b/test/mock/adapter/mock_ace_container.cpp
@@ -91,4 +91,6 @@ void AceContainer::DispatchExtensionDataToHostWindow(
 void AceContainer::UpdateColorMode(uint32_t colorMode) {}
 
 void AceContainer::TriggerModuleSerializer() {}
+
+void AceContainer::SetIsFormRender(bool isFormRender) {}
 } // namespace OHOS::Ace::Platform
diff --git a/test/unittest/core/accessibility/mock_ace_container.cpp b/test/unittest/core/accessibility/mock_ace_container.cpp
index ddbaf211d4c..c3561d4960e 100644
--- a/test/unittest/core/accessibility/mock_ace_container.cpp
+++ b/test/unittest/core/accessibility/mock_ace_container.cpp
@@ -305,4 +305,6 @@ bool AceContainer::IsCrossAxisWindow()
 void AceContainer::UpdateColorMode(uint32_t colorMode) {}
 
 void AceContainer::TriggerModuleSerializer() {}
+
+void AceContainer::SetIsFormRender(bool isFormRender) {}
 } // namespace OHOS::Ace::Platform
diff --git a/test/unittest/core/pattern/ui_extension/mock/mock_ace_container.cpp b/test/unittest/core/pattern/ui_extension/mock/mock_ace_container.cpp
index 1591e157dad..595fdca0120 100644
--- a/test/unittest/core/pattern/ui_extension/mock/mock_ace_container.cpp
+++ b/test/unittest/core/pattern/ui_extension/mock/mock_ace_container.cpp
@@ -300,4 +300,6 @@ void AceContainer::DispatchExtensionDataToHostWindow(
 void AceContainer::UpdateColorMode(uint32_t colorMode) {}
 
 void AceContainer::TriggerModuleSerializer() {}
+
+void AceContainer::SetIsFormRender(bool isFormRender) {}
 } // namespace OHOS::Ace::NG
diff --git a/test/unittest/core/pattern/ui_extension/mock/mock_ace_container_two.cpp b/test/unittest/core/pattern/ui_extension/mock/mock_ace_container_two.cpp
index a40c4debd86..cb50ee26505 100644
--- a/test/unittest/core/pattern/ui_extension/mock/mock_ace_container_two.cpp
+++ b/test/unittest/core/pattern/ui_extension/mock/mock_ace_container_two.cpp
@@ -302,4 +302,6 @@ void AceContainer::DispatchExtensionDataToHostWindow(
 void AceContainer::UpdateColorMode(uint32_t colorMode) {}
 
 void AceContainer::TriggerModuleSerializer() {}
+
+void AceContainer::SetIsFormRender(bool isFormRender) {}
 } // namespace OHOS::Ace::NG
-- 
Gitee