[[ Skia Update ]] Tweak a couple of things

livecodeali · livecodeali · commit db257d5bbdbe · 2017-05-11T21:33:30.000+01:00
- Use more efficient SkSurface::draw function
- Use sk_ref_sp convenience function when reffing sk_sp&lt;SkTypeface&gt;
  variables
diff --git a/engine/src/mblandroidtypeface.cpp b/engine/src/mblandroidtypeface.cpp
@@ -91,8 +91,7 @@ void MCAndroidTypefaceRelease(MCAndroidTypefaceRef p_typeface)
 bool MCAndroidTypefaceGetMetrics(MCAndroidTypefaceRef p_typeface, uint32_t p_size, float &r_ascent, float &r_descent, float &r_leading, float &r_xheight)
 {
     // Skia APIs expect typefaces to be passed as shared pointers
-    sk_sp<SkTypeface> t_typeface((SkTypeface*)p_typeface);
-    t_typeface->ref();
+    sk_sp<SkTypeface> t_typeface = sk_ref_sp((SkTypeface *)p_typeface);
     
 	SkPaint t_paint;
 	t_paint.setTypeface(t_typeface);
@@ -114,8 +113,7 @@ bool MCAndroidTypefaceGetMetrics(MCAndroidTypefaceRef p_typeface, uint32_t p_siz
 bool MCAndroidTypefaceMeasureText(MCAndroidTypefaceRef p_typeface, uint32_t p_size, const char *p_text, uint32_t p_text_length, bool p_utf16, float &r_length)
 {
     // Skia APIs expect typefaces to be passed as shared pointers
-    sk_sp<SkTypeface> t_typeface((SkTypeface*)p_typeface);
-    t_typeface->ref();
+    sk_sp<SkTypeface> t_typeface = sk_ref_sp((SkTypeface *)p_typeface);
     
     SkPaint t_paint;
 	t_paint.setTypeface(t_typeface);
diff --git a/libgraphics/src/context.cpp b/libgraphics/src/context.cpp
@@ -1493,10 +1493,9 @@ void MCGContextEnd(MCGContextRef self)
 	else
 	{
 		// Hardware-backed layer - copy it into RAM
-		sk_sp<SkImage> t_image = t_child_layer->m_surface->makeImageSnapshot();
 		self->layer->canvas->save();
 		self->layer->canvas->resetMatrix();
-		self->layer->canvas->drawImage(t_image, t_child_layer->origin_x, t_child_layer->origin_y, &t_paint);
+		t_child_layer->m_surface->draw(self->layer->canvas, t_child_layer->origin_x, t_child_layer->origin_y, &t_paint);
 		self->layer->canvas->restore();
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -1493,10 +1493,9 @@ void MCGContextEnd(MCGContextRef self)`
`1493`	`1493`	`else`
`1494`	`1494`	`{`
`1495`	`1495`	`// Hardware-backed layer - copy it into RAM`
`1496`		`- sk_sp<SkImage> t_image = t_child_layer->m_surface->makeImageSnapshot();`
`1497`	`1496`	`self->layer->canvas->save();`
`1498`	`1497`	`self->layer->canvas->resetMatrix();`
`1499`		`- self->layer->canvas->drawImage(t_image, t_child_layer->origin_x, t_child_layer->origin_y, &t_paint);`
	`1498`	`+ t_child_layer->m_surface->draw(self->layer->canvas, t_child_layer->origin_x, t_child_layer->origin_y, &t_paint);`
`1500`	`1499`	`self->layer->canvas->restore();`
`1501`	`1500`	`}`
`1502`	`1501`