From 76316eab6079ee7905ac41575d0d0e6f99eae90e Mon Sep 17 00:00:00 2001 From: zhanglitao Date: Sun, 17 Aug 2025 14:29:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A7Modifier=E9=81=97=E7=95=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanglitao --- frameworks/core/components/box/rosen_render_box.cpp | 8 ++++---- .../core/components/tab_bar/rosen_render_tab_bar_item.cpp | 4 ++-- .../components_ng/render/adapter/rosen_render_context.cpp | 6 +++--- .../components_ng/render/adapter/rosen_render_surface.cpp | 4 ++-- frameworks/core/components_v2/list/rosen_render_list.cpp | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/frameworks/core/components/box/rosen_render_box.cpp b/frameworks/core/components/box/rosen_render_box.cpp index 2f55524d17b..21294004139 100644 --- a/frameworks/core/components/box/rosen_render_box.cpp +++ b/frameworks/core/components/box/rosen_render_box.cpp @@ -345,11 +345,11 @@ void RosenRenderBox::Paint(RenderContext& context, const Offset& offset) LOGE("rsNode is null."); return; } - rsNode->DrawOnNode( + rsNode->DrawOnNode(Rosen::ModifierNG::RSModifierType::OVERLAY_STYLE, #ifndef USE_ROSEN_DRAWING - Rosen::RSModifierType::OVERLAY_STYLE, [weak = WeakClaim(this), position](std::shared_ptr canvas) { + [weak = WeakClaim(this), position](std::shared_ptr canvas) { #else - Rosen::RSModifierType::OVERLAY_STYLE, [weak = WeakClaim(this), position](std::shared_ptr canvas) { + [weak = WeakClaim(this), position](std::shared_ptr canvas) { #endif auto renderBox = weak.Upgrade(); if (renderBox == nullptr) { @@ -385,7 +385,7 @@ void RosenRenderBox::Paint(RenderContext& context, const Offset& offset) LOGE("rsNode is null."); return; } - rsnode->DrawOnNode(Rosen::RSModifierType::OVERLAY_STYLE, + rsnode->DrawOnNode(Rosen::ModifierNG::RSModifierType::OVERLAY_STYLE, #ifndef USE_ROSEN_DRAWING [size = GetLayoutSize(), margin = GetMargin()](std::shared_ptr canvas) { SkAutoCanvasRestore acr(canvas.get(), true); diff --git a/frameworks/core/components/tab_bar/rosen_render_tab_bar_item.cpp b/frameworks/core/components/tab_bar/rosen_render_tab_bar_item.cpp index 0f50510a590..2a135a5df2c 100644 --- a/frameworks/core/components/tab_bar/rosen_render_tab_bar_item.cpp +++ b/frameworks/core/components/tab_bar/rosen_render_tab_bar_item.cpp @@ -59,13 +59,13 @@ void RosenRenderTabBarItem::RenderTabBarItemBoundary(RenderContext& context, con return; } #ifndef USE_ROSEN_DRAWING - rsNode->DrawOnNode(Rosen::RSModifierType::OVERLAY_STYLE, + rsNode->DrawOnNode(Rosen::ModifierNG::RSModifierType::OVERLAY_STYLE, [offset, layoutSize = Size(width, height)](std::shared_ptr canvas) { DebugBoundaryPainter::PaintDebugBoundary(canvas.get(), offset, layoutSize); DebugBoundaryPainter::PaintDebugCorner(canvas.get(), offset, layoutSize); }); #else - rsNode->DrawOnNode(Rosen::RSModifierType::OVERLAY_STYLE, + rsNode->DrawOnNode(Rosen::ModifierNG::RSModifierType::OVERLAY_STYLE, [offset, layoutSize = Size(width, height)](std::shared_ptr canvas) { DebugBoundaryPainter::PaintDebugBoundary(canvas.get(), offset, layoutSize); DebugBoundaryPainter::PaintDebugCorner(canvas.get(), offset, layoutSize); diff --git a/frameworks/core/components_ng/render/adapter/rosen_render_context.cpp b/frameworks/core/components_ng/render/adapter/rosen_render_context.cpp index 106112fe3bd..8e4af12c544 100755 --- a/frameworks/core/components_ng/render/adapter/rosen_render_context.cpp +++ b/frameworks/core/components_ng/render/adapter/rosen_render_context.cpp @@ -4240,7 +4240,7 @@ void RosenRenderContext::FlushContentDrawFunction(CanvasDrawFunction&& contentDr CHECK_NULL_VOID(rsNode_); CHECK_NULL_VOID(contentDraw); rsNode_->DrawOnNode( - Rosen::RSModifierType::CONTENT_STYLE, + Rosen::ModifierNG::RSModifierType::CONTENT_STYLE, [contentDraw = std::move(contentDraw)](std::shared_ptr canvas) { CHECK_NULL_VOID(canvas); contentDraw(*canvas); @@ -4279,7 +4279,7 @@ void RosenRenderContext::FlushForegroundDrawFunction(CanvasDrawFunction&& foregr { CHECK_NULL_VOID(rsNode_); CHECK_NULL_VOID(foregroundDraw); - rsNode_->DrawOnNode(Rosen::RSModifierType::FOREGROUND_STYLE, + rsNode_->DrawOnNode(Rosen::ModifierNG::RSModifierType::FOREGROUND_STYLE, [foregroundDraw = std::move(foregroundDraw)](std::shared_ptr canvas) { CHECK_NULL_VOID(canvas); foregroundDraw(*canvas); @@ -4291,7 +4291,7 @@ void RosenRenderContext::FlushOverlayDrawFunction(CanvasDrawFunction&& overlayDr CHECK_NULL_VOID(rsNode_); CHECK_NULL_VOID(overlayDraw); rsNode_->DrawOnNode( - Rosen::RSModifierType::OVERLAY_STYLE, + Rosen::ModifierNG::RSModifierType::OVERLAY_STYLE, [overlayDraw = std::move(overlayDraw)](std::shared_ptr canvas) { CHECK_NULL_VOID(canvas); overlayDraw(*canvas); diff --git a/frameworks/core/components_ng/render/adapter/rosen_render_surface.cpp b/frameworks/core/components_ng/render/adapter/rosen_render_surface.cpp index 177897d9b5b..908137cfa51 100644 --- a/frameworks/core/components_ng/render/adapter/rosen_render_surface.cpp +++ b/frameworks/core/components_ng/render/adapter/rosen_render_surface.cpp @@ -342,7 +342,7 @@ void RosenRenderSurface::DrawBuffer(int32_t width, int32_t height) CHECK_NULL_VOID(rsNode); rsNode->DrawOnNode( #ifndef USE_ROSEN_DRAWING - Rosen::RSModifierType::CONTENT_STYLE, [surfaceNode](const std::shared_ptr& canvas) { + Rosen::ModifierNG::RSModifierType::CONTENT_STYLE, [surfaceNode](const std::shared_ptr& canvas) { CHECK_NULL_VOID(canvas); Rosen::RSSurfaceBufferInfo info { surfaceNode->buffer_, surfaceNode->orgin_.GetX(), surfaceNode->orgin_.GetY(), surfaceNode->buffer_->GetSurfaceBufferWidth(), @@ -351,7 +351,7 @@ void RosenRenderSurface::DrawBuffer(int32_t width, int32_t height) CHECK_NULL_VOID(recordingCanvas); recordingCanvas->DrawSurfaceBuffer(info); #else - Rosen::RSModifierType::CONTENT_STYLE, + Rosen::ModifierNG::RSModifierType::CONTENT_STYLE, [surfaceNode](const std::shared_ptr& canvas) { CHECK_NULL_VOID(canvas); Rosen::DrawingSurfaceBufferInfo info { surfaceNode->buffer_, surfaceNode->orgin_.GetX(), diff --git a/frameworks/core/components_v2/list/rosen_render_list.cpp b/frameworks/core/components_v2/list/rosen_render_list.cpp index 75e8c058054..791d92f0b90 100644 --- a/frameworks/core/components_v2/list/rosen_render_list.cpp +++ b/frameworks/core/components_v2/list/rosen_render_list.cpp @@ -38,7 +38,7 @@ void RosenRenderList::Update(const RefPtr& component) void RosenRenderList::DrawDividerOnNode(const std::shared_ptr& rsNode, const SkPaint& paint, bool isVertical, double startCrossAxis, double mainAxis, double endCrossAxis) { - rsNode->DrawOnNode(Rosen::RSModifierType::CONTENT_STYLE, + rsNode->DrawOnNode(Rosen::ModifierNG::RSModifierType::CONTENT_STYLE, [isVertical = vertical_, startX = startCrossAxis, startY = mainAxis, endX = endCrossAxis, endY = mainAxis, paint](const std::shared_ptr& canvas) mutable { if (!canvas) { @@ -56,7 +56,7 @@ void RosenRenderList::DrawDividerOnNode(const std::shared_ptr& rsNode, c void RosenRenderList::DrawDividerOnNode(const std::shared_ptr& rsNode, const RSPen& pen, bool isVertical, double startCrossAxis, double mainAxis, double endCrossAxis) { - rsNode->DrawOnNode(Rosen::RSModifierType::CONTENT_STYLE, + rsNode->DrawOnNode(Rosen::ModifierNG::RSModifierType::CONTENT_STYLE, [isVertical = vertical_, startX = startCrossAxis, startY = mainAxis, endX = endCrossAxis, endY = mainAxis, pen](const std::shared_ptr& canvas) mutable { if (!canvas) { -- Gitee