Merge pull request #130 from ahmed605/skiasharp

Export sk_canvas_save_layer_rec to expose SkCanvas::SaveLayerRec functionality

Author: mattleibow

include/c/sk_canvas.h

@@ -38,6 +38,7 @@ SK_C_API bool sk_canvas_get_local_clip_bounds(sk_canvas_t* ccanvas, sk_rect_t* c
 SK_C_API bool sk_canvas_get_device_clip_bounds(sk_canvas_t* ccanvas, sk_irect_t* cbounds);
 SK_C_API int sk_canvas_save(sk_canvas_t* ccanvas);
 SK_C_API int sk_canvas_save_layer(sk_canvas_t* ccanvas, const sk_rect_t* crect, const sk_paint_t* cpaint);
+SK_C_API int sk_canvas_save_layer_rec(sk_canvas_t* ccanvas, const sk_canvas_savelayerrec_t* crec);
 SK_C_API void sk_canvas_restore(sk_canvas_t* ccanvas);
 SK_C_API void sk_canvas_translate(sk_canvas_t* ccanvas, float dx, float dy);
 SK_C_API void sk_canvas_scale(sk_canvas_t* ccanvas, float sx, float sy);

include/c/sk_types.h

@@ -1078,6 +1078,20 @@ typedef struct {
     sk_mipmap_mode_t fMipmap;
 } sk_sampling_options_t;
 
+typedef enum {
+    NONE_SK_CANVAS_SAVELAYERREC_FLAGS                     = 0,
+    PRESERVE_LCD_TEXT_SK_CANVAS_SAVELAYERREC_FLAGS        = 1 << 1,
+    INITIALIZE_WITH_PREVIOUS_SK_CANVAS_SAVELAYERREC_FLAGS = 1 << 2,
+    F16_COLOR_TYPE_SK_CANVAS_SAVELAYERREC_FLAGS           = 1 << 4,
+} sk_canvas_savelayerrec_flags_t;
+
+typedef struct {
+    sk_rect_t* fBounds;
+    sk_paint_t* fPaint;
+    sk_imagefilter_t* fBackdrop;
+    sk_canvas_savelayerrec_flags_t fFlags;
+} sk_canvas_savelayerrec_t;
+
 /*
  * Skottie Animation
  */

src/c/sk_canvas.cpp

@@ -113,6 +113,10 @@ int sk_canvas_save_layer(sk_canvas_t* ccanvas, const sk_rect_t* crect, const sk_
     return AsCanvas(ccanvas)->saveLayer(AsRect(crect), AsPaint(cpaint));
 }
 
+int sk_canvas_save_layer_rec(sk_canvas_t* ccanvas, const sk_canvas_savelayerrec_t* crec) {
+    return AsCanvas(ccanvas)->saveLayer(AsCanvasSaveLayerRec(crec));
+}
+
 void sk_canvas_restore(sk_canvas_t* ccanvas) {
     AsCanvas(ccanvas)->restore();
 }

src/c/sk_enums.cpp

@@ -395,6 +395,12 @@ static_assert ((int)SkRuntimeEffect::Uniform::Flags::kVertex_Flag          == (i
 static_assert ((int)SkRuntimeEffect::Uniform::Flags::kFragment_Flag        == (int)FRAGMENT_SK_RUNTIMEEFFECT_UNIFORM_FLAGS,         ASSERT_MSG(SkRuntimeEffect::Uniform::Flags, sk_runtimeeffect_uniform_flags_t));
 static_assert ((int)SkRuntimeEffect::Uniform::Flags::kHalfPrecision_Flag   == (int)HALF_PRECISION_SK_RUNTIMEEFFECT_UNIFORM_FLAGS,   ASSERT_MSG(SkRuntimeEffect::Uniform::Flags, sk_runtimeeffect_uniform_flags_t));
 
+// sk_canvas_savelayerrec_flags_t
+static_assert ((int)0                                                              == (int)NONE_SK_CANVAS_SAVELAYERREC_FLAGS,                       ASSERT_MSG(SkCanvas::SaveLayerFlagsSet, sk_canvas_savelayerrec_flags_t));
+static_assert ((int)SkCanvas::SaveLayerFlagsSet::kPreserveLCDText_SaveLayerFlag    == (int)PRESERVE_LCD_TEXT_SK_CANVAS_SAVELAYERREC_FLAGS,          ASSERT_MSG(SkCanvas::SaveLayerFlagsSet, sk_canvas_savelayerrec_flags_t));
+static_assert ((int)SkCanvas::SaveLayerFlagsSet::kInitWithPrevious_SaveLayerFlag   == (int)INITIALIZE_WITH_PREVIOUS_SK_CANVAS_SAVELAYERREC_FLAGS,   ASSERT_MSG(SkCanvas::SaveLayerFlagsSet, sk_canvas_savelayerrec_flags_t));
+static_assert ((int)SkCanvas::SaveLayerFlagsSet::kF16ColorType                     == (int)F16_COLOR_TYPE_SK_CANVAS_SAVELAYERREC_FLAGS,             ASSERT_MSG(SkCanvas::SaveLayerFlagsSet, sk_canvas_savelayerrec_flags_t));
+
 #if defined(SK_GANESH)
 
 // gr_surfaceorigin_t

src/c/sk_types_priv.h

@@ -184,6 +184,14 @@ DEF_MAP(SkRuntimeEffect::Child, sk_runtimeeffect_child_t, RuntimeEffectChild)
 #include "include/core/SkCanvas.h"
 DEF_MAP(SkCanvas::Lattice, sk_lattice_t, Lattice)
 
+static inline SkCanvas::SaveLayerRec AsCanvasSaveLayerRec(const sk_canvas_savelayerrec_t* rec) {
+    return SkCanvas::SaveLayerRec(
+        AsRect(rec->fBounds),
+        AsPaint(rec->fPaint),
+        AsImageFilter(rec->fBackdrop),
+        (SkCanvas::SaveLayerFlags)rec->fFlags);
+}
+
 #include "include/codec/SkCodec.h"
 DEF_MAP(SkCodec::FrameInfo, sk_codec_frameinfo_t, FrameInfo)
 DEF_MAP(SkCodec::Options, sk_codec_options_t, CodecOptions)