openharmony/graphic_graphic_2d
1
0
Fork 0
mirror of https://gitee.com/openharmony/graphic_graphic_2d synced 2024-11-27 09:10:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改缩进等门禁错误

Browse Source 
Signed-off-by: 张智超 <zhangzhichao38@huawei.com>
This commit is contained in:
张智超 2024-11-06 10:36:59 +08:00
parent 3c2096b6f4
commit 203b1a329f
2 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rosen/modules/render_service_base/src/pipeline/rs_render_node_map.cpp
View File

@ -229,10 +229,10 @@ void RSRenderNodeMap::FilterNodeByPid(pid_t pid)
}
if (useBatchRemoving) {
RSRenderNodeGC::Instance().AddToOffTreeNodeBucket(pair.second);
} else if (auto parent = pair.second->GetParent().lock()) {
parent->RemoveChildFromFulllist(pair.second->GetId());
pair.second->RemoveFromTree(false);
} else {
if (auto parent = pair.second->GetParent().lock()) {
parent->RemoveChildFromFulllist(pair.second->GetId());
}
pair.second->RemoveFromTree(false);
}
pair.second->GetAnimationManager().FilterAnimationByPid(pid);
@ -337,7 +337,7 @@ const std::shared_ptr<RSBaseRenderNode> RSRenderNodeMap::GetRenderNode(NodeId id
const std::shared_ptr<RSRenderNode> RSRenderNodeMap::GetAnimationFallbackNode() const
{
for (auto iter = renderNodeMap_.begin(); iter != renderNodeMap_.end; ++iter) {
for (auto iter = renderNodeMap_.begin(); iter != renderNodeMap_.end(); ++iter) {
auto subiter = (iter->second).find(0);
if (subiter != (iter->second).end()) {
return subiter->second;

44
rosen/modules/render_service_profiler/rs_profiler_base.cpp
View File

@ -23,14 +23,14 @@
#include <utility>
#include <vector>
#include "sys_binder.h"
#include "message_parcel.h"
#include "rs_profiler.h"
#include "rs_profiler_cache.h"
#include "rs_profiler_network.h"
#include "rs_profiler_utils.h"
#include "rs_profiler_file.h"
#include "rs_profiler_log.h"
#include "rs_profiler_network.h"
#include "rs_profiler_utils.h"
#include "sys_binder.h"
#include "animation/rs_animation_manager.h"
#include "command/rs_base_node_command.h"
@ -347,8 +347,8 @@ void RSProfiler::FilterForPlayback(RSContext& context, pid_t pid)
auto iter = map.renderNodeMap_.find(pid);
if (iter != map.renderNodeMap_.end()) {
auto& submap = iter->second;
EraseIf(submap, [pid, canBeRemoved](const auto& pair) -> bool {
if (Utils::ExtractNodeId(node) == 1) {
EraseIf(submap, [](const auto& pair) -> bool {
if (Utils::ExtractNodeId(pair.first) == 1) {
return false;
}
// remove node from tree
@ -437,10 +437,10 @@ void RSProfiler::GetSurfacesTrees(const RSContext& context, pid_t pid, std::map<
size_t RSProfiler::GetRenderNodeCount(const RSContext& context)
{
const auto& map = const_cast<RSContext&>(context).GetMutableNodeMap();
const auto& renderNodeMap = const_cast<RSContext&>(context).GetMutableNodeMap().renderNodeMap_;
size_t mapSize = 0;
for (const auto& [_, submap] : map.renderNodeMap_){
mapSize += map.renderNodeMap_.size();
for (const auto& [_, submap] : renderNodeMap) {
mapSize += submap.size();
}
return mapSize;
}
@ -456,34 +456,30 @@ NodeId RSProfiler::GetRandomSurfaceNode(const RSContext& context)
void RSProfiler::MarshalNodes(const RSContext& context, std::stringstream& data, uint32_t fileVersion)
{
const auto& map = const_cast<RSContext&>(context).GetMutableNodeMap();
size_t mapSize = 0;
for (const auto& [_, submap] : map.renderNodeMap_){
mapSize += map.renderNodeMap_.size();
}
const uint32_t count = static_cast<uint32_t>(mapSize);
data.write(reinterpret_cast<const char*>(&count), sizeof(count));
const auto& renderNodeMap = const_cast<RSContext&>(context).GetMutableNodeMap().renderNodeMap_;
const auto& rootRenderNode = context.GetGlobalRootRenderNode();
if (rootRenderNode == nullptr) {
RS_LOGE("RSProfiler::MarshalNodes rootRenderNode is nullptr");
return;
}
std::vector<std::shared_ptr<RSRenderNode>> nodes;
nodes.emplace_back(rootRenderNode);
for (const auto& [_, submap] : map.renderNodeMap_) {
size_t mapSize = 0;
for (const auto& [_, submap] : renderNodeMap) {
mapSize += submap.size();
for (const auto& [_, node] : submap) {
std::shared_ptr<RSRenderNode> parent;
if (node != nullptr) {
MarshalNode(*node, data, fileVersion);
std::shared_ptr<RSRenderNode> parent = node->GetParent().lock();
if (!parent && (node != rootRenderNode)) {
nodes.emplace_back(node);
}
}
if (node != nullptr && !(parent = node->GetParent().lock()) && (node != rootRenderNode)) {
nodes.emplace_back(node);
}
}
}
const uint32_t count = static_cast<uint32_t>(mapSize);
data.write(reinterpret_cast<const char*>(&count), sizeof(count));
const uint32_t nodeCount = nodes.size();
data.write(reinterpret_cast<const char*>(&nodeCount), sizeof(nodeCount));
for (const auto& node : nodes) { // no nullptr in nodes, omit check
@ -1134,7 +1130,7 @@ bool RSProfiler::SkipParcelData(Parcel& parcel, size_t size)
}
[[maybe_unused]] const uint64_t id = parcel.ReadUint64();
if (g_mode == Mode::READ) {
constexpr uint32_t skipBytes = 24u;
parcel.SkipBytes(skipBytes);
@ -1170,7 +1166,7 @@ void RSProfiler::SendMessageBase(const std::string& msg)
g_msgBaseList.push(msg);
}
std::unordered_map<AnimationId, std::vector<int64_t>> &RSProfiler::AnimeGetStartTimes()
std::unordered_map<AnimationId, std::vector<int64_t>>& RSProfiler::AnimeGetStartTimes()
{
return g_animeStartMap;
}