[fiddle] Update named fiddles

//tools/fiddle/make_all_examples_cpp.py had not run in a while, so some of these fiddles were not being compiled regularly and bit-rotted. A follow-up CL will try running that script as a presubmit. Change-Id: Ib851cb5d70485e354de3388abf56666492335d46 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/423956 Commit-Queue: Kevin Lubick <[email protected]> Reviewed-by: Brian Osman <[email protected]>
rive-app · Jul 1, 2021 · 2d1b716 · 2d1b716
1 parent e55c587
commit 2d1b716
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 29 deletions.
diff --git a/docs/examples/50_percent_gray.cpp b/docs/examples/50_percent_gray.cpp
@@ -8,7 +8,7 @@ static sk_sp<SkShader> make_bw_dither() {
     surf->getCanvas()->drawRect({0, 0, 1, 1}, SkPaint());
     surf->getCanvas()->drawRect({1, 1, 2, 2}, SkPaint());
     return surf->makeImageSnapshot()->makeShader(SkTileMode::kRepeat,
-                                                 SkTileMode::kRepeat
+                                                 SkTileMode::kRepeat,
                                                  SkSamplingOptions(SkFilterMode::kLinear));
 }
 
@@ -38,7 +38,7 @@ void draw(SkCanvas* canvas) {
     p.setShader(nullptr);
     canvas->drawRect({0, 0, 100, 100}, p);
     p.setShader(nullptr);
-    drawString(canvas,"Blend", 0, 125, font, black);
+    canvas->drawString("Blend", 0, 125, font, black);
 
     // Opaque color (0xFFBCBCBC)
     canvas->translate(105, 0);

diff --git a/docs/examples/Path_getConvexityOrUnknown.cpp b/docs/examples/Path_getConvexityOrUnknown.cpp
diff --git a/docs/examples/f16.cpp b/docs/examples/f16.cpp
@@ -418,7 +418,7 @@ void draw(SkCanvas* canvas) {
         return;
     }
     canvas->scale(4, 4);
-    canvas->drawBitmap(bm, 0, 0);
+    canvas->drawImage(bm.asImage(), 0, 0);
 }
 
 }  // END FIDDLE
diff --git a/docs/examples/gpu4444diff.cpp b/docs/examples/gpu4444diff.cpp
@@ -9,9 +9,9 @@ void draw(SkCanvas* canvas) {
     bitmap.allocPixels(imageInfo);
     SkCanvas offscreen(bitmap);
     offscreen.clear(SK_ColorGREEN);
-    canvas->drawBitmap(bitmap, 0, 0);
+    canvas->drawImage(bitmap.asImage(), 0, 0);
     offscreen.clear(SK_ColorGRAY);
-    canvas->drawBitmap(bitmap, 2, 2);
+    canvas->drawImage(bitmap.asImage(), 2, 2);
     auto pack4444 = [](unsigned a, unsigned r, unsigned g, unsigned b) -> uint16_t {
         return (a << 0) | (b << 4) | (g << 8) | (r << 12);
     };
@@ -22,11 +22,11 @@ void draw(SkCanvas* canvas) {
     SkImageInfo pixInfo = SkImageInfo::Make(2, 2, kARGB_4444_SkColorType, kPremul_SkAlphaType);
     SkPixmap redPixmap(imageInfo, &red4444, 4);
     if (bitmap.writePixels(redPixmap, 0, 0)) {
-        canvas->drawBitmap(bitmap, 4, 4);
+        canvas->drawImage(bitmap.asImage(), 4, 4);
     }
     SkPixmap bluePixmap(imageInfo, &blue4444, 4);
     if (bitmap.writePixels(bluePixmap, 0, 0)) {
-        canvas->drawBitmap(bitmap, 6, 6);
+        canvas->drawImage(bitmap.asImage(), 6, 6);
     }
 }
 }  // END FIDDLE
diff --git a/tools/fiddle/all_examples.cpp b/tools/fiddle/all_examples.cpp
@@ -1,5 +1,7 @@
 // Copyright 2019 Google LLC.
 // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+#include "../../docs/examples/50_percent_gray.cpp"
+#include "../../docs/examples/50_percent_srgb.cpp"
 #include "../../docs/examples/Alpha_Constants_a.cpp"
 #include "../../docs/examples/Alpha_Constants_b.cpp"
 #include "../../docs/examples/Alpha_Type_Opaque.cpp"
@@ -605,6 +607,7 @@
 #include "../../docs/examples/Path_ArcSize.cpp"
 #include "../../docs/examples/Path_ConvertConicToQuads.cpp"
 #include "../../docs/examples/Path_ConvertToNonInverseFillType.cpp"
+#include "../../docs/examples/Path_Convexity.cpp"
 #include "../../docs/examples/Path_Direction.cpp"
 #include "../../docs/examples/Path_Effect_Methods.cpp"
 #include "../../docs/examples/Path_FillType_a.cpp"
@@ -1079,6 +1082,7 @@
 #include "../../docs/examples/bug583299.cpp"
 #include "../../docs/examples/bug6495.cpp"
 #include "../../docs/examples/bug7573.cpp"
+#include "../../docs/examples/bug7573_1.cpp"
 #include "../../docs/examples/bug767834.cpp"
 #include "../../docs/examples/bugoftheday.cpp"
 #include "../../docs/examples/checker_board.cpp"
@@ -1105,6 +1109,7 @@
 #include "../../docs/examples/draw_vertices.cpp"
 #include "../../docs/examples/drawarcs.cpp"
 #include "../../docs/examples/example3ps.cpp"
+#include "../../docs/examples/f16.cpp"
 #include "../../docs/examples/f16to8888busted.cpp"
 #include "../../docs/examples/f16to8888drawImageBug.cpp"
 #include "../../docs/examples/failing_example.cpp"
@@ -1115,6 +1120,7 @@
 #include "../../docs/examples/gamma_mask_filter.cpp"
 #include "../../docs/examples/getLocalBounds_broken.cpp"
 #include "../../docs/examples/getLocalBounds_working.cpp"
+#include "../../docs/examples/gpu4444diff.cpp"
 #include "../../docs/examples/gpu8888diff.cpp"
 #include "../../docs/examples/gpuconicbug.cpp"
 #include "../../docs/examples/homogeneous.cpp"
@@ -1145,6 +1151,7 @@
 #include "../../docs/examples/setimagefilter.cpp"
 #include "../../docs/examples/shader.cpp"
 #include "../../docs/examples/shader_alphaimage.cpp"
+#include "../../docs/examples/shapes.cpp"
 #include "../../docs/examples/shapes_with_motion.cpp"
 #include "../../docs/examples/skbug6031.cpp"
 #include "../../docs/examples/skbug_237_drawImageRect.cpp"
@@ -1188,6 +1195,7 @@
 #include "../../docs/examples/sum_path_effect.cpp"
 #include "../../docs/examples/sweep_gradient_talk_1.cpp"
 #include "../../docs/examples/sweep_gradient_talk_2.cpp"
+#include "../../docs/examples/sweep_gradient_talk_4.cpp"
 #include "../../docs/examples/sweep_gradient_talk_lots.cpp"
 #include "../../docs/examples/text_only.cpp"
 #include "../../docs/examples/text_rendering.cpp"