fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-10-03 15:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use Cow to avoid cloning graphic list for fill

Browse Source
This commit is contained in:
YohYamasaki
2026-05-18 09:03:49 +09:00
parent 7ee4117c37
commit 28592352f2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node-graph/libraries/rendering/src/renderer.rs
+7 -6
View File
@@ -27,6 +27,7 @@ use graphic_types::vector_types::vector::style::{Fill, PaintOrder, RenderMode, S
use graphic_types::{Artboard, Graphic, Vector}; use graphic_types::{Artboard, Graphic, Vector};
use kurbo::{Affine, Cap, Join, Shape}; use kurbo::{Affine, Cap, Join, Shape};
use num_traits::Zero; use num_traits::Zero;
use std::borrow::Cow;
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::fmt::Write; use std::fmt::Write;
use std::ops::Deref; use std::ops::Deref;
@@ -1071,8 +1072,8 @@ impl Render for List<Vector> {
let fill_graphic_list = self let fill_graphic_list = self
.attribute::<List<Graphic>>(ATTR_FILL_GRAPHIC, index) .attribute::<List<Graphic>>(ATTR_FILL_GRAPHIC, index)
.filter(|list| !list.is_empty()) .filter(|list| !list.is_empty())
.cloned() .map(Cow::Borrowed)
.or_else(|| fill_to_graphic_list(vector.style.fill())); .or_else(|| fill_to_graphic_list(vector.style.fill()).map(Cow::Owned));
let fill_graphic = fill_graphic_list.as_ref().and_then(|l| l.element(0)); let fill_graphic = fill_graphic_list.as_ref().and_then(|l| l.element(0));
let need_clipping = matches!(fill_graphic, Some(Graphic::Vector(_) | Graphic::RasterCPU(_) | Graphic::RasterGPU(_) | Graphic::Graphic(_))); let need_clipping = matches!(fill_graphic, Some(Graphic::Vector(_) | Graphic::RasterCPU(_) | Graphic::RasterGPU(_) | Graphic::Graphic(_)));
@@ -1101,7 +1102,7 @@ impl Render for List<Vector> {
path.clone(), path.clone(),
element_transform, element_transform,
item_transform, item_transform,
fill_graphic_list.as_ref(), fill_graphic_list.as_deref(),
clip_id.as_deref(), clip_id.as_deref(),
applied_stroke_transform, applied_stroke_transform,
bounds_matrix, bounds_matrix,
@@ -1259,7 +1260,7 @@ impl Render for List<Vector> {
path, path,
element_transform, element_transform,
item_transform, item_transform,
fill_graphic_list.as_ref(), fill_graphic_list.as_deref(),
clip_id.as_deref(), clip_id.as_deref(),
applied_stroke_transform, applied_stroke_transform,
bounds_matrix, bounds_matrix,
@@ -1347,8 +1348,8 @@ impl Render for List<Vector> {
let Some(fill_graphic) = self let Some(fill_graphic) = self
.attribute::<List<Graphic>>(ATTR_FILL_GRAPHIC, index) .attribute::<List<Graphic>>(ATTR_FILL_GRAPHIC, index)
.filter(|t| !t.is_empty()) .filter(|t| !t.is_empty())
.cloned() .map(Cow::Borrowed)
.or_else(|| fill_to_graphic_list(element.style.fill())) .or_else(|| fill_to_graphic_list(element.style.fill()).map(Cow::Owned))
else { else {
return; return;
}; };