From f0517c0f09ef194a7813878cb7d81417d2af5e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E9=92=A6=E9=94=8B?= Date: Fri, 1 Aug 2025 16:45:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=BF=A1=E6=81=AF=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E7=BB=84=E4=BB=B6=E5=B9=B6=E8=A1=8C=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 徐钦锋 --- frameworks/core/components_ng/pattern/BUILD.gn | 4 ++++ .../core/components_ng/pattern/image/image_pattern.cpp | 10 ---------- .../core/components_ng/pattern/image/image_pattern.h | 2 -- .../pattern/image_animator/image_animator_pattern.cpp | 6 ------ .../pattern/image_animator/image_animator_pattern.h | 2 -- .../loading_progress/loading_progress_pattern.cpp | 10 ++-------- .../loading_progress/loading_progress_pattern.h | 2 -- .../pattern/text_clock/text_clock_pattern.cpp | 8 -------- .../pattern/text_clock/text_clock_pattern.h | 2 -- test/unittest/BUILD.gn | 4 ++++ test/unittest/core/pattern/web/ani/BUILD.gn | 4 ++++ 11 files changed, 14 insertions(+), 40 deletions(-) diff --git a/frameworks/core/components_ng/pattern/BUILD.gn b/frameworks/core/components_ng/pattern/BUILD.gn index 9e5f0532b4f..7a4718486e6 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 19a786512c8..a6f4462633a 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 439bdf01359..bb872c45e99 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 6d8aafd786b..4bc62b1e8c7 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 779d2fbea8e..0e74741d8bc 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 1525baf4c8b..2f71e475524 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 92802dcfbbc..72ff32e9b07 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 2cd9b5625c9..4076124c91e 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 8e6162cef1c..c853db88381 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 fb8b4d32539..2e41918ad08 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 4298da6fcd1..bd54662c6f1 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", -- Gitee