anyrender_skia skia-safe v0.90.0 → v0.91.0

vsn4ik · nicoburns · commit 0cdcedfeaa5a · 2025-12-27T19:16:38.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/anyrender_skia/Cargo.toml b/crates/anyrender_skia/Cargo.toml
@@ -22,7 +22,7 @@ peniko = { workspace = true }
 raw-window-handle = { workspace = true }
 softbuffer_window_renderer = { workspace = true, optional = true }
 pixels_window_renderer = { workspace = true, optional = true }
-skia-safe = { version = "0.90.0", features = ["gl", "pdf", "textlayout"]}
+skia-safe = { version = "0.91.0", features = ["gl", "pdf", "textlayout"]}
 oaty = "0.1"
 gl = "0.14.0"
 ash = "^0.38.0"
@@ -36,4 +36,4 @@ objc2-core-foundation = { version = "0.3.2", default-features = false }
 objc2-metal = { version = "0.3.2", default-features = false, features = ["MTLCommandBuffer", "MTLCommandQueue", "MTLDrawable", "MTLPixelFormat"] }
 objc2-app-kit = { version = "0.3.2", default-features = false, features = ["objc2-quartz-core", "NSView"] }
 objc2-quartz-core = { version = "0.3.2", default-features = false, features = ["objc2-core-foundation", "objc2-metal", "CAMetalLayer"] }
-skia-safe = { version = "0.90.0", features = ["metal"] }
+skia-safe = { version = "0.91.0", features = ["metal"] }
diff --git a/crates/anyrender_skia/src/opengl.rs b/crates/anyrender_skia/src/opengl.rs
@@ -112,7 +112,7 @@ impl OpenGLBackend {
                 gl::GetIntegerv(gl::FRAMEBUFFER_BINDING, &mut fboid);
             }
 
-            skia_safe::gpu::gl::FramebufferInfo {
+            FramebufferInfo {
                 fboid: fboid.try_into().unwrap(),
                 format: skia_safe::gpu::gl::Format::RGBA8.into(),
                 ..Default::default()
diff --git a/crates/anyrender_skia/src/scene.rs b/crates/anyrender_skia/src/scene.rs
@@ -835,6 +835,7 @@ mod sk_kurbo {
     use skia_safe::M44 as SkM44;
     use skia_safe::Matrix as SkMatrix;
     use skia_safe::Path as SkPath;
+    use skia_safe::PathBuilder as SkPathBuilder;
     use skia_safe::Point as SkPoint;
     use skia_safe::RRect as SkRRect;
     use skia_safe::Rect as SkRect;
@@ -915,7 +916,7 @@ mod sk_kurbo {
     }
 
     pub(super) fn path_from_shape(shape: &impl Shape) -> SkPath {
-        let mut sk_path = SkPath::new();
+        let mut sk_path = SkPathBuilder::new();
 
         if let Some(path_els) = shape.as_path_slice() {
             for path_el in path_els {
@@ -927,10 +928,10 @@ mod sk_kurbo {
             }
         }
 
-        sk_path
+        sk_path.detach()
     }
 
-    fn append_path_el_to_sk_path(path_el: &PathEl, sk_path: &mut SkPath) {
+    fn append_path_el_to_sk_path(path_el: &PathEl, sk_path: &mut SkPathBuilder) {
         match path_el {
             PathEl::MoveTo(p) => _ = sk_path.move_to(pt_from(*p)),
             PathEl::LineTo(p) => _ = sk_path.line_to(pt_from(*p)),

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ impl OpenGLBackend {`
`112`	`112`	`gl::GetIntegerv(gl::FRAMEBUFFER_BINDING, &mut fboid);`
`113`	`113`	`}`
`114`	`114`
`115`		`- skia_safe::gpu::gl::FramebufferInfo {`
	`115`	`+ FramebufferInfo {`
`116`	`116`	`fboid: fboid.try_into().unwrap(),`
`117`	`117`	`format: skia_safe::gpu::gl::Format::RGBA8.into(),`
`118`	`118`	`..Default::default()`
Original file line number	Diff line number	Diff line change
`@@ -835,6 +835,7 @@ mod sk_kurbo {`
`835`	`835`	`use skia_safe::M44 as SkM44;`
`836`	`836`	`use skia_safe::Matrix as SkMatrix;`
`837`	`837`	`use skia_safe::Path as SkPath;`
	`838`	`+ use skia_safe::PathBuilder as SkPathBuilder;`
`838`	`839`	`use skia_safe::Point as SkPoint;`
`839`	`840`	`use skia_safe::RRect as SkRRect;`
`840`	`841`	`use skia_safe::Rect as SkRect;`
`@@ -915,7 +916,7 @@ mod sk_kurbo {`
`915`	`916`	`}`
`916`	`917`
`917`	`918`	`pub(super) fn path_from_shape(shape: &impl Shape) -> SkPath {`
`918`		`- let mut sk_path = SkPath::new();`
	`919`	`+ let mut sk_path = SkPathBuilder::new();`
`919`	`920`
`920`	`921`	`if let Some(path_els) = shape.as_path_slice() {`
`921`	`922`	`for path_el in path_els {`
`@@ -927,10 +928,10 @@ mod sk_kurbo {`
`927`	`928`	`}`
`928`	`929`	`}`
`929`	`930`
`930`		`- sk_path`
	`931`	`+ sk_path.detach()`
`931`	`932`	`}`
`932`	`933`
`933`		`- fn append_path_el_to_sk_path(path_el: &PathEl, sk_path: &mut SkPath) {`
	`934`	`+ fn append_path_el_to_sk_path(path_el: &PathEl, sk_path: &mut SkPathBuilder) {`
`934`	`935`	`match path_el {`
`935`	`936`	`PathEl::MoveTo(p) => _ = sk_path.move_to(pt_from(*p)),`
`936`	`937`	`PathEl::LineTo(p) => _ = sk_path.line_to(pt_from(*p)),`