Import Cobalt 21.master.0.253153
diff --git a/src/third_party/skia/experimental/c-api-example/c.md b/src/third_party/skia/experimental/c-api-example/c.md
index 19ae515..d173236 100644
--- a/src/third_party/skia/experimental/c-api-example/c.md
+++ b/src/third_party/skia/experimental/c-api-example/c.md
@@ -127,5 +127,4 @@
             experimental/c-api-example/skia-c-example.c \
             "$SKIA_LIB_DIR"/libskia.* -Wl,-rpath -Wl,"$SKIA_LIB_DIR"
         ./skia-c-example
-        [ $(uname) = Darwin ] && open     skia-c-example.png
-        [ $(uname) = Linux  ] && xdg-open skia-c-example.png
+        bin/sysopen skia-c-example.png
diff --git a/src/third_party/skia/experimental/c-api-example/skia-c-example.c b/src/third_party/skia/experimental/c-api-example/skia-c-example.c
index 66b17fc..7840806 100644
--- a/src/third_party/skia/experimental/c-api-example/skia-c-example.c
+++ b/src/third_party/skia/experimental/c-api-example/skia-c-example.c
@@ -6,20 +6,18 @@
  */
 #include <stdio.h>
 
-#include "sk_data.h"
-#include "sk_image.h"
-#include "sk_canvas.h"
-#include "sk_surface.h"
-#include "sk_paint.h"
-#include "sk_path.h"
+#include "include/c/sk_canvas.h"
+#include "include/c/sk_data.h"
+#include "include/c/sk_image.h"
+#include "include/c/sk_imageinfo.h"
+#include "include/c/sk_paint.h"
+#include "include/c/sk_path.h"
+#include "include/c/sk_surface.h"
 
 static sk_surface_t* make_surface(int32_t w, int32_t h) {
-    sk_imageinfo_t info;
-    info.width = w;
-    info.height = h;
-    info.colorType = sk_colortype_get_default_8888();
-    info.alphaType = PREMUL_SK_ALPHATYPE;
-    return sk_surface_new_raster(&info, NULL);
+    sk_imageinfo_t* info = sk_imageinfo_new(w, h, RGBA_8888_SK_COLORTYPE,
+                                            PREMUL_SK_ALPHATYPE, NULL);
+    return sk_surface_new_raster(info, NULL);
 }
 
 static void emit_png(const char* path, sk_surface_t* surface) {