Merge pull request rust-skia#1113 from pragmatrix/m135

Milestone 135

Author: pragmatrix

README.md

@@ -2,10 +2,10 @@
 
 [![crates.io](https://img.shields.io/crates/v/skia-safe)](https://crates.io/crates/skia-safe) [![license](https://img.shields.io/crates/l/skia-safe)](LICENSE) [![Windows QA](https://github.com/rust-skia/rust-skia/actions/workflows/windows-qa.yaml/badge.svg?branch=master)](https://github.com/rust-skia/rust-skia/actions/workflows/windows-qa.yaml) [![Linux QA](https://github.com/rust-skia/rust-skia/actions/workflows/linux-qa.yaml/badge.svg?branch=master)](https://github.com/rust-skia/rust-skia/actions/workflows/linux-qa.yaml) [![macOS QA](https://github.com/rust-skia/rust-skia/actions/workflows/macos-qa.yaml/badge.svg?branch=master)](https://github.com/rust-skia/rust-skia/actions/workflows/macos-qa.yaml)
 
-Skia Submodule Status: chrome/m134 ([upstream changes][skia-upstream], [our changes][skia-ours]).
+Skia Submodule Status: chrome/m135 ([upstream changes][skia-upstream], [our changes][skia-ours]).
 
-[skia-upstream]: https://github.com/rust-skia/skia/compare/m134-0.82.0...google:chrome/m134
-[skia-ours]: https://github.com/google/skia/compare/chrome/m134...rust-skia:m134-0.82.0
+[skia-upstream]: https://github.com/rust-skia/skia/compare/m135-0.83.1...google:chrome/m135
+[skia-ours]: https://github.com/google/skia/compare/chrome/m135...rust-skia:m135-0.83.1
 
 ## About
 

skia-bindings/Cargo.toml

@@ -9,7 +9,7 @@ keywords = ["skia", "rust-bindings", "vulkan", "opengl", "pdf"]
 categories = ["external-ffi-bindings", "graphics", "multimedia::images", "rendering::graphics-api", "visualization"]
 license = "MIT"
 
-version = "0.83.0"
+version = "0.84.0"
 authors = ["LongYinan <[email protected]>", "Armin Sander <[email protected]>"]
 edition = "2021"
 rust-version.workspace = true
@@ -31,7 +31,7 @@ doctest = false
 # Metadata used from inside the packaged crate that defines where to download the Skia archive from.
 # Note: use short hashes here because of filesystem path size restrictions.
 [package.metadata]
-skia = "m134-0.82.0"
+skia = "m135-0.83.1"
 
 [features]
 default = ["binary-cache", "embed-icudtl"]

skia-bindings/build_support/skia_bindgen.rs

@@ -736,6 +736,8 @@ const ENUM_REWRITES: &[EnumEntry] = &[
     ("ImageDecodeStrategy", rewrite::k_xxx),
     // SkNamedPrimaries::CicpId, SkNamedTransferFn::CicpId
     ("CicpId", rewrite::k_xxx),
+    // `SkCodec::IsAnimated`s
+    ("IsAnimated", rewrite::k_xxx),
 ];
 
 pub(crate) mod rewrite {

skia-bindings/skia

@@ -78,6 +78,8 @@
 #include "include/core/SkVertices.h"
 // docs/
 #include "include/docs/SkPDFDocument.h"
+#include "include/docs/SkPDFJpegHelpers.h"
+
 // effects/
 #include "include/effects/Sk1DPathEffect.h"
 #include "include/effects/Sk2DPathEffect.h"
@@ -209,6 +211,10 @@ extern "C" int C_SkCodec_getRepetitionCount(SkCodec* self) {
     return self->getRepetitionCount();
 }
 
+extern "C" SkCodec::IsAnimated C_SkCodec_isAnimated(SkCodec* self) {
+    return self->isAnimated();
+}
+
 // SkCodecs
 
 extern "C" void C_SkCodecs_Decoder_CopyConstruct(SkCodecs::Decoder* uninitialized, const SkCodecs::Decoder* decoder) {
@@ -2593,6 +2599,12 @@ extern "C" SkColorFilter* C_SkOverdrawColorFilter_MakeWithSkColors(const SkColor
 
 extern "C" {
 
+void C_SkRuntimeEffect_Options_Construct(SkRuntimeEffect::Options* uninitialized, bool forceUnoptimized, const char* name, size_t length) {
+    new (uninitialized) SkRuntimeEffect::Options();
+    uninitialized->forceUnoptimized = forceUnoptimized;
+    uninitialized->fName = std::string_view(name, length);
+}
+
 SkRuntimeEffect *C_SkRuntimeEffect_MakeForColorFilter(
     const SkString *sksl,
     const SkRuntimeEffect::Options *options,
@@ -3132,7 +3144,11 @@ extern "C" void C_SkPDF_Metadata_destruct(SkPDF::Metadata* self) {
 }
 
 extern "C" SkDocument* C_SkPDF_MakeDocument(SkWStream* stream, const SkPDF::Metadata* metadata) {
-    return SkPDF::MakeDocument(stream, *metadata).release();
+    // We want to support JPeg encoding / decoding by default.
+    SkPDF::Metadata meta = *metadata;
+    meta.jpegDecoder = SkPDF::JPEG::Decode;
+    meta.jpegEncoder = SkPDF::JPEG::Encode;
+    return SkPDF::MakeDocument(stream, meta).release();
 }
 
 extern "C" void C_SkPDF_SetNodeId(SkCanvas* dst, int nodeID) {

skia-bindings/src/bindings.cpp

@@ -18,7 +18,7 @@ categories = [
 ]
 license = "MIT"
 
-version = "0.82.0"
+version = "0.84.0"
 authors = ["Armin Sander <[email protected]>"]
 edition = "2021"
 rust-version.workspace = true
@@ -62,7 +62,7 @@ vulkan-window = ["dep:ash", "dep:vulkano", "winit/rwh_05"]
 [dependencies]
 bitflags = "2.0"
 lazy_static = "1.4"
-skia-bindings = { version = "=0.83.0", path = "../skia-bindings", default-features = false }
+skia-bindings = { version = "=0.84.0", path = "../skia-bindings", default-features = false }
 
 # vulkan-window example
 ash = { version = "^0.38.0", optional = true }

skia-safe/Cargo.toml

@@ -65,6 +65,9 @@ impl Default for FrameInfo {
 pub use sb::SkCodec_SkScanlineOrder as ScanlineOrder;
 variant_name!(ScanlineOrder::BottomUp);
 
+pub use sb::SkCodec_IsAnimated as IsAnimated;
+variant_name!(IsAnimated::Yes);
+
 pub struct Codec<'a> {
     inner: RefHandle<SkCodec>,
     pd: PhantomData<&'a mut dyn io::Read>,
@@ -382,6 +385,10 @@ impl Codec<'_> {
         }
     }
 
+    pub fn is_animated(&mut self) -> IsAnimated {
+        unsafe { sb::C_SkCodec_isAnimated(self.native_mut()) }
+    }
+
     // TODO: Register
 
     fn native(&self) -> &SkCodec {

skia-safe/src/codec/_codec.rs

@@ -1 +1 @@
-pub const MILESTONE: usize = 134;
+pub const MILESTONE: usize = 135;

skia-safe/src/core/milestone.rs

@@ -191,8 +191,8 @@ impl Paint {
         self.native().fMiterLimit
     }
 
-    pub fn set_stroke_miter(&mut self, miter: scalar) -> &mut Self {
-        unsafe { self.native_mut().setStrokeMiter(miter) }
+    pub fn set_stroke_miter(&mut self, miter_limit: scalar) -> &mut Self {
+        unsafe { self.native_mut().setStrokeMiter(miter_limit) }
         self
     }
 

skia-safe/src/core/paint.rs

@@ -3,10 +3,10 @@ use crate::{
     prelude::*,
     Blender, ColorFilter, Data, Matrix, Shader,
 };
+use core::ffi;
 use sb::{SkFlattenable, SkRuntimeEffect_Child};
 use skia_bindings::{
-    self as sb, ShaderBuilderUniformResult, SkRefCntBase, SkRuntimeEffect, SkRuntimeEffect_Options,
-    SkRuntimeEffect_Uniform,
+    self as sb, ShaderBuilderUniformResult, SkRefCntBase, SkRuntimeEffect, SkRuntimeEffect_Uniform,
 };
 use std::{fmt, marker::PhantomData, ops::DerefMut, ptr};
 
@@ -126,25 +126,10 @@ impl NativeRefCountedBase for SkRuntimeEffect {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, Eq, Debug)]
-pub struct Options {
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Default)]
+pub struct Options<'a> {
     pub force_unoptimized: bool,
-    allow_private_access: bool,
-    stable_key: u32,
-    max_version_allowed: sb::SkSL_Version,
-}
-
-native_transmutable!(SkRuntimeEffect_Options, Options, options_layout);
-
-impl Default for Options {
-    fn default() -> Self {
-        Options {
-            force_unoptimized: false,
-            allow_private_access: false,
-            stable_key: 0,
-            max_version_allowed: sb::SkSL_Version::k100,
-        }
-    }
+    pub name: &'a str,
 }
 
 impl fmt::Debug for RuntimeEffect {
@@ -161,49 +146,59 @@ impl fmt::Debug for RuntimeEffect {
 }
 
 impl RuntimeEffect {
-    pub fn make_for_color_filer<'a>(
+    pub fn make_for_color_filter(
         sksl: impl AsRef<str>,
-        options: impl Into<Option<&'a Options>>,
+        options: impl for<'a, 'b> Into<Option<&'a Options<'b>>>,
     ) -> Result<RuntimeEffect, String> {
         let str = interop::String::from_str(sksl);
         let options = options.into().copied().unwrap_or_default();
+        let options = Self::construct_native_options(&options);
         let mut error = interop::String::default();
         RuntimeEffect::from_ptr(unsafe {
-            sb::C_SkRuntimeEffect_MakeForColorFilter(
-                str.native(),
-                options.native(),
-                error.native_mut(),
-            )
+            sb::C_SkRuntimeEffect_MakeForColorFilter(str.native(), &options, error.native_mut())
         })
         .ok_or_else(|| error.to_string())
     }
 
-    pub fn make_for_shader<'a>(
+    pub fn make_for_shader(
         sksl: impl AsRef<str>,
-        options: impl Into<Option<&'a Options>>,
+        options: impl for<'a, 'b> Into<Option<&'a Options<'b>>>,
     ) -> Result<RuntimeEffect, String> {
         let str = interop::String::from_str(sksl);
         let options = options.into().copied().unwrap_or_default();
+        let options = Self::construct_native_options(&options);
         let mut error = interop::String::default();
         RuntimeEffect::from_ptr(unsafe {
-            sb::C_SkRuntimeEffect_MakeForShader(str.native(), options.native(), error.native_mut())
+            sb::C_SkRuntimeEffect_MakeForShader(str.native(), &options, error.native_mut())
         })
         .ok_or_else(|| error.to_string())
     }
 
-    pub fn make_for_blender<'a>(
+    pub fn make_for_blender(
         sksl: impl AsRef<str>,
-        options: impl Into<Option<&'a Options>>,
+        options: impl for<'a, 'b> Into<Option<&'a Options<'b>>>,
     ) -> Result<RuntimeEffect, String> {
         let str = interop::String::from_str(sksl);
         let options = options.into().copied().unwrap_or_default();
+        let options = Self::construct_native_options(&options);
         let mut error = interop::String::default();
         RuntimeEffect::from_ptr(unsafe {
-            sb::C_SkRuntimeEffect_MakeForBlender(str.native(), options.native(), error.native_mut())
+            sb::C_SkRuntimeEffect_MakeForBlender(str.native(), &options, error.native_mut())
         })
         .ok_or_else(|| error.to_string())
     }
 
+    fn construct_native_options(options: &Options<'_>) -> sb::SkRuntimeEffect_Options {
+        construct(|opt| unsafe {
+            sb::C_SkRuntimeEffect_Options_Construct(
+                opt,
+                options.force_unoptimized,
+                options.name.as_ptr() as *const ffi::c_char,
+                options.name.len(),
+            )
+        })
+    }
+
     pub fn make_shader<'a>(
         &self,
         uniforms: impl Into<Data>,