From 5fdee978a985a21a82bb6f90bfe6208ed0810936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E6=B8=85=E4=BA=91?= Date: Mon, 23 Jun 2025 11:45:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80visibility=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0dump=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 胡清云 --- .../core/components_ng/base/frame_node.cpp | 26 ++----------------- .../core/components_ng/base/frame_node.h | 5 ---- .../components_ng/layout/layout_property.cpp | 6 ----- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/frameworks/core/components_ng/base/frame_node.cpp b/frameworks/core/components_ng/base/frame_node.cpp index 7d358f527c6..ca910c01de8 100644 --- a/frameworks/core/components_ng/base/frame_node.cpp +++ b/frameworks/core/components_ng/base/frame_node.cpp @@ -802,7 +802,8 @@ void FrameNode::DumpCommonInfo() } if (static_cast(layoutProperty_->GetVisibility().value_or(VisibleType::VISIBLE)) != 0) { DumpLog::GetInstance().AddDesc(std::string("Visible: ") - .append(PrintVisibilityDumpInfo().c_str())); + .append(std::to_string(static_cast( + layoutProperty_->GetVisibility().value_or(VisibleType::VISIBLE))))); } if (layoutProperty_->GetPaddingProperty()) { DumpLog::GetInstance().AddDesc( @@ -6706,27 +6707,4 @@ bool FrameNode::IsDrawFocusOnTop() const CHECK_NULL_RETURN(accessibilityProperty, false); return static_cast(accessibilityProperty->GetFocusDrawLevel()) == FocusDrawLevel::TOP; } - -void FrameNode::AddVisibilityDumpInfo(const std::pair>& dumpInfo) -{ - if (visibilityDumpInfos_.size() == SIZE_CHANGE_DUMP_SIZE) { - visibilityDumpInfos_.pop_front(); - } - visibilityDumpInfos_.push_back(dumpInfo); -} - -std::string FrameNode::PrintVisibilityDumpInfo() const -{ - if (visibilityDumpInfos_.empty()) { - return "" ; - } - std::string res = "[ "; - for (auto it = visibilityDumpInfos_.rbegin(); it != visibilityDumpInfos_.rend(); ++it) { - res += ("{" + std::to_string(it->first) + ", " + - std::to_string(static_cast(it->second.first)) + ", " + - std::to_string(static_cast(it->second.second)) + "}, "); - } - res += "]"; - return res; -} } // namespace OHOS::Ace::NG diff --git a/frameworks/core/components_ng/base/frame_node.h b/frameworks/core/components_ng/base/frame_node.h index 36a30488904..43a49c37fcd 100644 --- a/frameworks/core/components_ng/base/frame_node.h +++ b/frameworks/core/components_ng/base/frame_node.h @@ -1357,10 +1357,6 @@ public: layoutProperty_->SetNeedLazyLayout(value); } - void AddVisibilityDumpInfo(const std::pair>& dumpInfo); - - std::string PrintVisibilityDumpInfo() const; - bool HasMultipleChild(); protected: @@ -1659,7 +1655,6 @@ private: friend class Pattern; mutable std::shared_mutex fontSizeCallbackMutex_; mutable std::shared_mutex colorModeCallbackMutex_; - std::deque>> visibilityDumpInfos_; RefPtr kitNode_; ACE_DISALLOW_COPY_AND_MOVE(FrameNode); diff --git a/frameworks/core/components_ng/layout/layout_property.cpp b/frameworks/core/components_ng/layout/layout_property.cpp index 590e55ac7ad..8d0dc7d8e94 100644 --- a/frameworks/core/components_ng/layout/layout_property.cpp +++ b/frameworks/core/components_ng/layout/layout_property.cpp @@ -910,12 +910,6 @@ void LayoutProperty::OnVisibilityUpdate(VisibleType visible, bool allowTransitio // update visibility value. propVisibility_ = visible; - auto pipeline = host->GetContext(); - uint64_t vsyncTime = 0; - if (pipeline) { - vsyncTime = pipeline->GetVsyncTime(); - } - host->AddVisibilityDumpInfo({ vsyncTime, { visible, isUserSet } }); host->NotifyVisibleChange(preVisibility.value_or(VisibleType::VISIBLE), visible); if (allowTransition && preVisibility) { -- Gitee