Revert "SkDrawable support"

This reverts commit d83a3a3.
QuestPDF · Dec 18, 2024 · 27bdca4 · 27bdca4
1 parent d83a3a3
commit 27bdca4
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 88 deletions.
diff --git a/managed/NativeSkia.Tests/PictureRecorderTests.cs b/managed/NativeSkia.Tests/PictureRecorderTests.cs
@@ -18,7 +18,7 @@ public void PictureWorkflow()
         recorderCanvas.DrawFilledRectangle(new SkRect(100, 100, 300, 200), 0xFF3F51B5);
         recorderCanvas.DrawFilledRectangle(new SkRect(150, 150, 350, 250), 0xFF2196F3);
 
-        using var picture = recorder.EndRecordingWithPicture();
+        using var picture = recorder.EndRecording();
 
         // serialization test
         using var serializedPictureData = picture.Serialize();
@@ -40,30 +40,4 @@ public void PictureWorkflow()
         TestFixture.SaveOutput("picture.png", pngData);
         pngData.ShouldHaveSize(1_269);
     }
-
-    [Test]
-    public void DrawableWorkflow()
-    {
-        // generate picture
-        using var recorder = new SkPictureRecorder();
-        using var recorderCanvas = recorder.BeginRecording(400, 300);
-
-        recorderCanvas.DrawFilledRectangle(new SkRect(0, 0, 400, 300), 0xFFFFFFFF);
-        recorderCanvas.DrawFilledRectangle(new SkRect(50, 50, 250, 150), 0xFF673AB7);
-        recorderCanvas.DrawFilledRectangle(new SkRect(100, 100, 300, 200), 0xFF3F51B5);
-        recorderCanvas.DrawFilledRectangle(new SkRect(150, 150, 350, 250), 0xFF2196F3);
-
-        using var drawable = recorder.EndRecordingWithDrawable();
-
-        // draw picture
-        using var bitmap = new SkBitmap(400, 300);
-        using var outputBitmapCanvas = SkCanvas.CreateFromBitmap(bitmap);
-
-        outputBitmapCanvas.DrawDrawable(drawable);
-
-        // save output
-        using var pngData = bitmap.EncodeAsPng();
-        TestFixture.SaveOutput("drawable.png", pngData);
-        pngData.ShouldHaveSize(1_269);
-    }
 }
diff --git a/managed/NativeSkia/SkCanvas.cs b/managed/NativeSkia/SkCanvas.cs
@@ -66,11 +66,6 @@ public void DrawPicture(SkPicture picture)
     {
         API.canvas_draw_picture(Instance, picture.Instance);
     }
-
-    public void DrawDrawable(SkDrawable drawable)
-    {
-        API.canvas_draw_drawable(Instance, drawable.Instance);
-    }
 
     public void DrawParagraph(SkParagraph paragraph)
     {
@@ -179,9 +174,6 @@ private static class API
         [DllImport(SkiaAPI.LibraryName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void canvas_draw_picture(IntPtr canvas, IntPtr picture);
 
-        [DllImport(SkiaAPI.LibraryName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void canvas_draw_drawable(IntPtr canvas, IntPtr drawable);
-
         [DllImport(SkiaAPI.LibraryName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void canvas_draw_filled_rectangle(IntPtr canvas, SkRect position, uint color);
 

diff --git a/managed/NativeSkia/SkDrawable.cs b/managed/NativeSkia/SkDrawable.cs
diff --git a/native/src/canvas.cpp b/native/src/canvas.cpp
@@ -97,10 +97,6 @@ QUEST_API void canvas_draw_picture(SkCanvas *canvas, SkPicture *picture) {
     canvas->drawPicture(sk_ref_sp(picture));
 }
 
-QUEST_API void canvas_draw_drawable(SkCanvas *canvas, SkDrawable *drawable) {
-    canvas->drawDrawable(drawable);
-}
-
 QUEST_API void canvas_draw_paragraph(SkCanvas *canvas, skia::textlayout::Paragraph *paragraph) {
     paragraph->paint(canvas, 0, 0);
 }

diff --git a/native/src/drawable.cpp b/native/src/drawable.cpp
diff --git a/native/src/pictureRecorder.cpp b/native/src/pictureRecorder.cpp
@@ -13,14 +13,10 @@ QUEST_API SkCanvas *picture_recorder_begin_recording(SkPictureRecorder *pictureR
     return pictureRecorder->beginRecording(width, height);
 }
 
-QUEST_API SkPicture *picture_recorder_end_recording_with_picture(SkPictureRecorder *pictureRecorder) {
+QUEST_API SkPicture *picture_recorder_end_recording(SkPictureRecorder *pictureRecorder) {
     return pictureRecorder->finishRecordingAsPicture().release();
 }
 
-QUEST_API SkDrawable *picture_recorder_end_recording_with_drawable(SkPictureRecorder *pictureRecorder) {
-    return pictureRecorder->finishRecordingAsDrawable().release();
-}
-
 QUEST_API void picture_recorder_delete(SkPictureRecorder *pictureRecorder) {
     delete pictureRecorder;
 }