From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 20 Aug 2016 18:54:59 +0000 (+0200)
Subject: Merge branch 'xamarin-mobile-bindings' into gpu-support
X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~128^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18f95a7963dd1eac6ef8b4cdab94c92f8ca9b63b;p=platform%2Fupstream%2FlibSkiaSharp.git

Merge branch 'xamarin-mobile-bindings' into gpu-support

# Conflicts:
#	include/c/sk_canvas.h
#	src/c/sk_canvas.cpp
---

18f95a7963dd1eac6ef8b4cdab94c92f8ca9b63b
diff --cc include/c/sk_canvas.h
index 85e7aa5,bef4660..788418f
--- a/include/c/sk_canvas.h
+++ b/include/c/sk_canvas.h
@@@ -328,13 -328,8 +328,15 @@@ SK_API bool sk_canvas_get_clip_bounds(s
  */
  SK_API bool sk_canvas_get_clip_device_bounds(sk_canvas_t* t, sk_irect_t* cbounds);
  
 +/**
 +    Trigger the immediate execution of all pending draw operations. For the GPU
 +    backend this will resolve all rendering to the GPU surface backing the
 +    SkSurface that owns this canvas.
 +*/
 +SK_API void sk_canvas_flush(sk_canvas_t* ccanvas);
 +
+ SK_API sk_canvas_t* sk_canvas_new_from_bitmap(const sk_bitmap_t* bitmap);
+ 
  SK_C_PLUS_PLUS_END_GUARD
  
  #endif
diff --cc src/c/sk_canvas.cpp
index 2085d3f,5fc9a98..e6d363e
--- a/src/c/sk_canvas.cpp
+++ b/src/c/sk_canvas.cpp
@@@ -226,6 -226,6 +226,10 @@@ void sk_canvas_draw_picture(sk_canvas_t
      AsCanvas(ccanvas)->drawPicture(AsPicture(cpicture), matrixPtr, AsPaint(cpaint));
  }
  
 +void sk_canvas_flush(sk_canvas_t* ccanvas) {
 +    AsCanvas(ccanvas)->flush();
 +}
++
+ sk_canvas_t* sk_canvas_new_from_bitmap(const sk_bitmap_t* bitmap) {
+     return ToCanvas(new SkCanvas(AsBitmap(*bitmap)));
+ }