diff --git a/frameworks/core/components_ng/pattern/BUILD.gn b/frameworks/core/components_ng/pattern/BUILD.gn index 9e5f0532b4f456beebc29c08eb9aa26d99df5c52..7a4718486e634a13b93856862e707525d7a540a1 100644 --- a/frameworks/core/components_ng/pattern/BUILD.gn +++ b/frameworks/core/components_ng/pattern/BUILD.gn @@ -193,10 +193,12 @@ build_component_ng("pattern_ng") { "image/image_overlay_modifier.cpp", "image/image_paint_method.cpp", "image/image_pattern.cpp", + "image/image_pattern_multi_thread.cpp", "image_animator/controlled_animator.cpp", "image_animator/image_animator_model_ng.cpp", "image_animator/image_animator_model_static.cpp", "image_animator/image_animator_pattern.cpp", + "image_animator/image_animator_pattern_multi_thread.cpp", "indexer/arc_indexer_content_modifier.cpp", "indexer/arc_indexer_layout_algorithm.cpp", "indexer/arc_indexer_layout_property.cpp", @@ -258,6 +260,7 @@ build_component_ng("pattern_ng") { "loading_progress/loading_progress_model_static.cpp", "loading_progress/loading_progress_modifier.cpp", "loading_progress/loading_progress_pattern.cpp", + "loading_progress/loading_progress_pattern_multi_thread.cpp", "marquee/marquee_accessibility_property.cpp", "marquee/marquee_layout_algorithm.cpp", "marquee/marquee_model_ng.cpp", @@ -626,6 +629,7 @@ build_component_ng("pattern_ng") { "text_clock/text_clock_model_ng.cpp", "text_clock/text_clock_model_static.cpp", "text_clock/text_clock_pattern.cpp", + "text_clock/text_clock_pattern_multi_thread.cpp", "text_drag/text_drag_overlay_modifier.cpp", "text_drag/text_drag_paint_method.cpp", "text_drag/text_drag_pattern.cpp", diff --git a/frameworks/core/components_ng/pattern/image/image_pattern.cpp b/frameworks/core/components_ng/pattern/image/image_pattern.cpp index 19a786512c84a7619c7d8db3a792c6403dff823b..a6f4462633a7e58e91d60936d575f62bb95277ef 100644 --- a/frameworks/core/components_ng/pattern/image/image_pattern.cpp +++ b/frameworks/core/components_ng/pattern/image/image_pattern.cpp @@ -17,9 +17,7 @@ #include "core/components_ng/pattern/image/image_pattern.h" -#if defined(ACE_STATIC) #include "base/utils/multi_thread.h" -#endif #include "base/image/image_perf.h" #include "base/log/dump_log.h" #include "base/network/download_manager.h" @@ -1448,9 +1446,7 @@ void ImagePattern::OnAttachToFrameNode() { auto host = GetHost(); CHECK_NULL_VOID(host); -#if defined(ACE_STATIC) THREAD_SAFE_NODE_CHECK(host, OnAttachToFrameNode); -#endif auto renderCtx = host->GetRenderContext(); CHECK_NULL_VOID(renderCtx); auto pipeline = host->GetContext(); @@ -1478,9 +1474,7 @@ void ImagePattern::OnAttachToFrameNode() void ImagePattern::OnDetachFromFrameNode(FrameNode* frameNode) { -#if defined(ACE_STATIC) THREAD_SAFE_NODE_CHECK(frameNode, OnDetachFromFrameNode, frameNode); -#endif CloseSelectOverlay(); auto id = frameNode->GetId(); @@ -1490,22 +1484,18 @@ void ImagePattern::OnDetachFromFrameNode(FrameNode* frameNode) pipeline->RemoveNodesToNotifyMemoryLevel(id); } -#if defined(ACE_STATIC) void ImagePattern::OnAttachToMainTree() { auto host = GetHost(); CHECK_NULL_VOID(host); THREAD_SAFE_NODE_CHECK(host, OnAttachToMainTree); } -#endif void ImagePattern::OnDetachFromMainTree() { -#if defined(ACE_STATIC) auto host = GetHost(); CHECK_NULL_VOID(host); THREAD_SAFE_NODE_CHECK(host, OnAttachToFrameNode); -#endif if (isNeedReset_) { ResetImageAndAlt(); isNeedReset_ = false; diff --git a/frameworks/core/components_ng/pattern/image/image_pattern.h b/frameworks/core/components_ng/pattern/image/image_pattern.h index 439bdf0135924a8c545f60945c09810d4b43f759..bb872c45e99bfe30f61a172391e495f60a98f5b8 100644 --- a/frameworks/core/components_ng/pattern/image/image_pattern.h +++ b/frameworks/core/components_ng/pattern/image/image_pattern.h @@ -430,13 +430,11 @@ private: void OnDetachFromFrameNode(FrameNode* frameNode) override; void OnDetachFromMainTree() override; -#if defined(ACE_STATIC) void OnAttachToMainTree() override; void OnAttachToFrameNodeMultiThread() {} void OnDetachFromFrameNodeMultiThread(FrameNode* frameNode) {} void OnAttachToMainTreeMultiThread(); void OnDetachFromMainTreeMultiThread(); -#endif void OnModifyDone() override; void OnPixelMapDrawableModifyDone(); ImagePaintConfig CreatePaintConfig(); diff --git a/frameworks/core/components_ng/pattern/image_animator/image_animator_pattern.cpp b/frameworks/core/components_ng/pattern/image_animator/image_animator_pattern.cpp index 6d8aafd786b354ac16a756483ef1674526abbef0..4bc62b1e8c7511ab0a8e4183673dae981eebfe00 100644 --- a/frameworks/core/components_ng/pattern/image_animator/image_animator_pattern.cpp +++ b/frameworks/core/components_ng/pattern/image_animator/image_animator_pattern.cpp @@ -15,9 +15,7 @@ #include "core/components_ng/pattern/image_animator/image_animator_pattern.h" -#if defined(ACE_STATIC) #include "base/utils/multi_thread.h" -#endif #include "core/components_ng/pattern/image/image_pattern.h" #include "core/components/image/image_theme.h" #include "core/components_ng/pattern/image_animator/controlled_animator.h" @@ -407,9 +405,7 @@ void ImageAnimatorPattern::OnAttachToFrameNode() { auto host = GetHost(); CHECK_NULL_VOID(host); -#if defined(ACE_STATIC) THREAD_SAFE_NODE_CHECK(host, OnAttachToFrameNode); -#endif auto renderContext = host->GetRenderContext(); CHECK_NULL_VOID(renderContext); renderContext->SetClipToFrame(true); @@ -418,14 +414,12 @@ void ImageAnimatorPattern::OnAttachToFrameNode() RegisterVisibleAreaChange(); } -#if defined(ACE_STATIC) void ImageAnimatorPattern::OnAttachToMainTree() { auto host = GetHost(); CHECK_NULL_VOID(host); THREAD_SAFE_NODE_CHECK(host, OnAttachToMainTree); } -#endif void ImageAnimatorPattern::UpdateEventCallback() { diff --git a/frameworks/core/components_ng/pattern/image_animator/image_animator_pattern.h b/frameworks/core/components_ng/pattern/image_animator/image_animator_pattern.h index 779d2fbea8eab238414347c6ea20f1496c04a2b5..0e74741d8bc7f561f03aeddf0d10d8e6d035c363 100644 --- a/frameworks/core/components_ng/pattern/image_animator/image_animator_pattern.h +++ b/frameworks/core/components_ng/pattern/image_animator/image_animator_pattern.h @@ -48,11 +48,9 @@ public: void OnAttachToFrameNode() override; -#if defined(ACE_STATIC) void OnAttachToMainTree() override; void OnAttachToFrameNodeMultiThread(); void OnAttachToMainTreeMultiThread(); -#endif bool IsAtomicNode() const override { diff --git a/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.cpp b/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.cpp index 1525baf4c8b1069900405e97bd2129b2ad10c8d1..2f71e47552470eeb992e383e60d3d2cb801ce3be 100644 --- a/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.cpp +++ b/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.cpp @@ -14,9 +14,9 @@ */ #include "base/log/dump_log.h" -#if defined(ACE_STATIC) + #include "base/utils/multi_thread.h" -#endif + #include "core/components/progress/progress_theme.h" #include "core/components_ng/pattern/loading_progress/loading_progress_pattern.h" @@ -41,9 +41,7 @@ void LoadingProgressPattern::OnAttachToFrameNode() { auto host = GetHost(); CHECK_NULL_VOID(host); -#if defined(ACE_STATIC) THREAD_SAFE_NODE_CHECK(host, OnAttachToFrameNode); -#endif host->GetRenderContext()->SetClipToFrame(true); host->GetRenderContext()->SetClipToBounds(true); RegisterVisibleAreaChange(); @@ -51,9 +49,7 @@ void LoadingProgressPattern::OnAttachToFrameNode() void LoadingProgressPattern::OnDetachFromFrameNode(FrameNode* frameNode) { -#if defined(ACE_STATIC) THREAD_SAFE_NODE_CHECK(frameNode, OnDetachFromFrameNode, frameNode); -#endif auto pipeline = PipelineContext::GetCurrentContextSafely(); CHECK_NULL_VOID(pipeline); pipeline->RemoveVisibleAreaChangeNode(frameNode->GetId()); @@ -61,7 +57,6 @@ void LoadingProgressPattern::OnDetachFromFrameNode(FrameNode* frameNode) hasVisibleChangeRegistered_ = false; } -#if defined(ACE_STATIC) void LoadingProgressPattern::OnAttachToMainTree() { auto host = GetHost(); @@ -75,7 +70,6 @@ void LoadingProgressPattern::OnDetachFromMainTree() CHECK_NULL_VOID(host); THREAD_SAFE_NODE_CHECK(host, OnDetachFromMainTree); } -#endif void LoadingProgressPattern::OnModifyDone() { diff --git a/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.h b/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.h index 92802dcfbbc9a20e2f1f3dc62034590f6cf3b4a4..72ff32e9b07a61486a982359cb71eeadc1bd97b9 100644 --- a/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.h +++ b/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.h @@ -121,7 +121,6 @@ private: bool OnDirtyLayoutWrapperSwap(const RefPtr& dirty, bool skipMeasure, bool skipLayout) override; void OnAttachToFrameNode() override; void OnDetachFromFrameNode(FrameNode* frameNode) override; -#if defined(ACE_STATIC) void OnAttachToMainTree() override; void OnDetachFromMainTree() override; @@ -129,7 +128,6 @@ private: void OnDetachFromFrameNodeMultiThread(FrameNode* frameNode) {} void OnAttachToMainTreeMultiThread(); void OnDetachFromMainTreeMultiThread(); -#endif void OnModifyDone() override; void OnWindowHide() override; void OnWindowShow() override; diff --git a/frameworks/core/components_ng/pattern/text_clock/text_clock_pattern.cpp b/frameworks/core/components_ng/pattern/text_clock/text_clock_pattern.cpp index 2cd9b5625c92ced8cee8edb54e2402a17b46bc3d..4076124c91e5f8394a90505e2e53495662efb3bb 100644 --- a/frameworks/core/components_ng/pattern/text_clock/text_clock_pattern.cpp +++ b/frameworks/core/components_ng/pattern/text_clock/text_clock_pattern.cpp @@ -22,9 +22,7 @@ #include "base/i18n/localization.h" #include "base/log/dump_log.h" -#if defined(ACE_STATIC) #include "base/utils/multi_thread.h" -#endif #include "base/utils/system_properties.h" #include "core/components_ng/pattern/text_clock/text_clock_layout_property.h" #include "core/components_ng/property/property.h" @@ -104,11 +102,9 @@ TextClockPattern::TextClockPattern() void TextClockPattern::OnAttachToFrameNode() { -#if defined(ACE_STATIC) auto host = GetHost(); CHECK_NULL_VOID(host); THREAD_SAFE_NODE_CHECK(host, OnAttachToFrameNode); -#endif InitTextClockController(); InitUpdateTimeTextCallBack(); auto* eventProxy = TimeEventProxy::GetInstance(); @@ -119,15 +115,12 @@ void TextClockPattern::OnAttachToFrameNode() void TextClockPattern::OnDetachFromFrameNode(FrameNode* frameNode) { -#if defined(ACE_STATIC) THREAD_SAFE_NODE_CHECK(frameNode, OnDetachFromFrameNode, frameNode); -#endif auto pipeline = PipelineContext::GetCurrentContext(); CHECK_NULL_VOID(pipeline); pipeline->RemoveVisibleAreaChangeNode(frameNode->GetId()); } -#if defined(ACE_STATIC) void TextClockPattern::OnAttachToMainTree() { auto host = GetHost(); @@ -141,7 +134,6 @@ void TextClockPattern::OnDetachFromMainTree() CHECK_NULL_VOID(host); THREAD_SAFE_NODE_CHECK(host, OnDetachFromMainTree); } -#endif void TextClockPattern::UpdateTextLayoutProperty(RefPtr& layoutProperty, RefPtr& textLayoutProperty, const TextStyle& textStyleTheme) diff --git a/frameworks/core/components_ng/pattern/text_clock/text_clock_pattern.h b/frameworks/core/components_ng/pattern/text_clock/text_clock_pattern.h index 8e6162cef1c64d54952cff049dc2168d7b37a956..c853db8838120ee3bdda8d99bb42f5a868fea6e6 100644 --- a/frameworks/core/components_ng/pattern/text_clock/text_clock_pattern.h +++ b/frameworks/core/components_ng/pattern/text_clock/text_clock_pattern.h @@ -144,14 +144,12 @@ private: void OnModifyDone() override; void OnAttachToFrameNode() override; void OnDetachFromFrameNode(FrameNode* frameNode) override; -#if defined(ACE_STATIC) void OnAttachToMainTree() override; void OnDetachFromMainTree() override; void OnAttachToFrameNodeMultiThread() {} void OnDetachFromFrameNodeMultiThread(FrameNode* frameNode) {} void OnAttachToMainTreeMultiThread(); void OnDetachFromMainTreeMultiThread(); -#endif void OnLanguageConfigurationUpdate() override; void DumpInfo() override; void DumpSimplifyInfo(std::shared_ptr& json) override {} diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index fb8b4d3253904ec13f0859bc03f5c219e4f3df65..2e41918ad085cd18aae1ea81d1060668f113ce0d 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -999,9 +999,11 @@ ohos_source_set("ace_components_pattern") { "$ace_root/frameworks/core/components_ng/pattern/image/image_overlay_modifier.cpp", "$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp", "$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp", + "$ace_root/frameworks/core/components_ng/pattern/image/image_pattern_multi_thread.cpp", "$ace_root/frameworks/core/components_ng/pattern/image_animator/controlled_animator.cpp", "$ace_root/frameworks/core/components_ng/pattern/image_animator/image_animator_model_ng.cpp", "$ace_root/frameworks/core/components_ng/pattern/image_animator/image_animator_pattern.cpp", + "$ace_root/frameworks/core/components_ng/pattern/image_animator/image_animator_pattern_multi_thread.cpp", "$ace_root/frameworks/core/components_ng/pattern/indexer/arc_indexer_content_modifier.cpp", "$ace_root/frameworks/core/components_ng/pattern/indexer/arc_indexer_layout_algorithm.cpp", "$ace_root/frameworks/core/components_ng/pattern/indexer/arc_indexer_layout_property.cpp", @@ -1056,6 +1058,7 @@ ohos_source_set("ace_components_pattern") { "$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_model_static.cpp", "$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_modifier.cpp", "$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.cpp", + "$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern_multi_thread.cpp", "$ace_root/frameworks/core/components_ng/pattern/marquee/marquee_accessibility_property.cpp", "$ace_root/frameworks/core/components_ng/pattern/marquee/marquee_layout_algorithm.cpp", "$ace_root/frameworks/core/components_ng/pattern/marquee/marquee_model_ng.cpp", @@ -1406,6 +1409,7 @@ ohos_source_set("ace_components_pattern") { "$ace_root/frameworks/core/components_ng/pattern/text_clock/text_clock_layout_property.cpp", "$ace_root/frameworks/core/components_ng/pattern/text_clock/text_clock_model_ng.cpp", "$ace_root/frameworks/core/components_ng/pattern/text_clock/text_clock_pattern.cpp", + "$ace_root/frameworks/core/components_ng/pattern/text_clock/text_clock_pattern_multi_thread.cpp", "$ace_root/frameworks/core/components_ng/pattern/text_drag/text_drag_overlay_modifier.cpp", "$ace_root/frameworks/core/components_ng/pattern/text_drag/text_drag_paint_method.cpp", "$ace_root/frameworks/core/components_ng/pattern/text_drag/text_drag_pattern.cpp", diff --git a/test/unittest/core/pattern/web/ani/BUILD.gn b/test/unittest/core/pattern/web/ani/BUILD.gn index 4298da6fcd113ae59cbab52bb5aa35cc8ccc8983..bd54662c6f1646a170c5ace7d2235632b7787b97 100755 --- a/test/unittest/core/pattern/web/ani/BUILD.gn +++ b/test/unittest/core/pattern/web/ani/BUILD.gn @@ -180,8 +180,10 @@ ohos_unittest("web_pattern_static_unit_test_ohos") { "$ace_root/frameworks/core/components_ng/pattern/image/image_overlay_modifier.cpp", "$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp", "$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp", + "$ace_root/frameworks/core/components_ng/pattern/image/image_pattern_multi_thread.cpp", "$ace_root/frameworks/core/components_ng/pattern/image_animator/image_animator_model_ng.cpp", "$ace_root/frameworks/core/components_ng/pattern/image_animator/image_animator_pattern.cpp", + "$ace_root/frameworks/core/components_ng/pattern/image_animator/image_animator_pattern_multi_thread.cpp", "$ace_root/frameworks/core/components_ng/pattern/indexer/indexer_accessibility_property.cpp", "$ace_root/frameworks/core/components_ng/pattern/indexer/indexer_layout_algorithm.cpp", "$ace_root/frameworks/core/components_ng/pattern/indexer/indexer_layout_property.cpp", @@ -220,6 +222,7 @@ ohos_unittest("web_pattern_static_unit_test_ohos") { "$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_model_ng.cpp", "$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_modifier.cpp", "$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.cpp", + "$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern_multi_thread.cpp", "$ace_root/frameworks/core/components_ng/pattern/marquee/marquee_accessibility_property.cpp", "$ace_root/frameworks/core/components_ng/pattern/marquee/marquee_layout_algorithm.cpp", "$ace_root/frameworks/core/components_ng/pattern/marquee/marquee_model_ng.cpp", @@ -539,6 +542,7 @@ ohos_unittest("web_pattern_static_unit_test_ohos") { "$ace_root/frameworks/core/components_ng/pattern/text_clock/text_clock_layout_property.cpp", "$ace_root/frameworks/core/components_ng/pattern/text_clock/text_clock_model_ng.cpp", "$ace_root/frameworks/core/components_ng/pattern/text_clock/text_clock_pattern.cpp", + "$ace_root/frameworks/core/components_ng/pattern/text_clock/text_clock_pattern_multi_thread.cpp", "$ace_root/frameworks/core/components_ng/pattern/text_drag/text_drag_overlay_modifier.cpp", "$ace_root/frameworks/core/components_ng/pattern/text_drag/text_drag_paint_method.cpp", "$ace_root/frameworks/core/components_ng/pattern/text_drag/text_drag_pattern.cpp",