add image-from-codec to c api

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/822203002

3 files changed, 45 insertions, 1 deletions

diff --git a/include/c/sk_data.h b/include/c/sk_data.h
new file mode 100644
index 0000000000..90863ee889
--- /dev/null
+++ b/include/c/sk_data.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL
+// DO NOT USE -- FOR INTERNAL TESTING ONLY
+
+#ifndef sk_data_DEFINED
+#define sk_data_DEFINED
+
+#include "sk_types.h"
+
+SK_C_PLUS_PLUS_BEGIN_GUARD
+
+sk_data_t* sk_data_new_empty();
+sk_data_t* sk_data_new_with_copy(const void* src, size_t length);
+sk_data_t* sk_data_new_from_malloc(const void* memory, size_t length);
+sk_data_t* sk_data_new_subset(const sk_data_t* src, size_t offset, size_t length);
+
+void sk_data_ref(const sk_data_t*);
+void sk_data_unref(const sk_data_t*);
+
+size_t sk_data_get_size(const sk_data_t*);
+const void* sk_data_get_data(const sk_data_t*);
+
+SK_C_PLUS_PLUS_END_GUARD
+
+#endif
diff --git a/include/c/sk_image.h b/include/c/sk_image.h
index 244956399c..34682c72d3 100644
--- a/include/c/sk_image.h
+++ b/include/c/sk_image.h
@@ -20,6 +20,18 @@ SK_C_PLUS_PLUS_BEGIN_GUARD
  *  Balance with a call to sk_image_unref().
  */
 sk_image_t* sk_image_new_raster_copy(const sk_imageinfo_t*, const void* pixels, size_t rowBytes);
+
+/**
+ *  If the specified data can be interpreted as a compressed image (e.g. PNG or JPEG) then this
+ *  returns an image. If the encoded data is not supported, returns NULL.
+ *
+ *  On success, the encoded data may be processed immediately, or it may be ref()'d for later
+ *  use.
+ */
+sk_image_t* sk_image_new_from_data(const sk_data_t* encoded);
+
+sk_data_t* sk_image_encode(const sk_image_t*);
+
 void sk_image_ref(const sk_image_t*);
 void sk_image_unref(const sk_image_t*);
 int sk_image_get_width(const sk_image_t*);
diff --git a/include/c/sk_types.h b/include/c/sk_types.h
index 67a29dcb5e..dc530f374b 100644
--- a/include/c/sk_types.h
+++ b/include/c/sk_types.h
@@ -79,12 +79,13 @@ typedef struct {
 } sk_matrix_t;
 
 typedef struct sk_canvas_t sk_canvas_t;
+typedef struct sk_data_t sk_data_t;
 typedef struct sk_image_t sk_image_t;
 typedef struct sk_maskfilter_t sk_maskfilter_t;
 typedef struct sk_paint_t sk_paint_t;
+typedef struct sk_path_t sk_path_t;
 typedef struct sk_picture_t sk_picture_t;
 typedef struct sk_picture_recorder_t sk_picture_recorder_t;
-typedef struct sk_path_t sk_path_t;
 typedef struct sk_shader_t sk_shader_t;
 typedef struct sk_surface_t sk_surface_t;