Propagate SkSurfaceProps to more call sites

src/c/sk_surface.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "sk_canvas.h"
 #include "sk_data.h"
 #include "sk_image.h"
@@ skipping 78 matching lines @@
     if (!from_c_alphatype(cinfo.alphaType, &at)) {
         // optionally report error to client?
         return false;
     }
     if (info) {
         *info = SkImageInfo::Make(cinfo.width, cinfo.height, ct, at);
     }
     return true;
 }
 
+const struct {
+    sk_pixelgeometry_t fC;
+    SkPixelGeometry    fSK;
+} gPixelGeometryMap[] = {
+    { UNKNOWN_SK_PIXELGEOMETRY, kUnknown_SkPixelGeometry },
+    { RGB_H_SK_PIXELGEOMETRY,   kRGB_H_SkPixelGeometry   },
+    { BGR_H_SK_PIXELGEOMETRY,   kBGR_H_SkPixelGeometry   },
+    { RGB_V_SK_PIXELGEOMETRY,   kRGB_V_SkPixelGeometry   },
+    { BGR_V_SK_PIXELGEOMETRY,   kBGR_V_SkPixelGeometry   },
+};
+
+
+static bool from_c_pixelgeometry(sk_pixelgeometry_t cGeom, SkPixelGeometry* skGeom) {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(gPixelGeometryMap); ++i) {
+        if (gPixelGeometryMap[i].fC == cGeom) {
+            if (skGeom) {
+                *skGeom = gPixelGeometryMap[i].fSK;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
 static void from_c_matrix(const sk_matrix_t* cmatrix, SkMatrix* matrix) {
     matrix->setAll(cmatrix->mat[0], cmatrix->mat[1], cmatrix->mat[2],
                    cmatrix->mat[3], cmatrix->mat[4], cmatrix->mat[5],
                    cmatrix->mat[6], cmatrix->mat[7], cmatrix->mat[8]);
 }
 
 const struct {
     sk_path_direction_t fC;
     SkPath::Direction   fSk;
 } gPathDirMap[] = {
@@ skipping 274 matching lines @@
     SkMatrix matrix;
     if (cmatrix) {
         from_c_matrix(cmatrix, &matrix);
         matrixPtr = &matrix;
     }
     AsCanvas(ccanvas)->drawPicture(AsPicture(cpicture), matrixPtr, AsPaint(cpaint));
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-sk_surface_t* sk_surface_new_raster(const sk_imageinfo_t* cinfo) {
+sk_surface_t* sk_surface_new_raster(const sk_imageinfo_t* cinfo,
+                                    const sk_surfaceprops_t* props) {
     SkImageInfo info;
     if (!from_c_info(*cinfo, &info)) {
         return NULL;
     }
-    return (sk_surface_t*)SkSurface::NewRaster(info);
+    SkPixelGeometry geo = kUnknown_SkPixelGeometry;
+    if (props && !from_c_pixelgeometry(props->pixelGeometry, &geo)) {
+        return NULL;
+    }
+
+    SkSurfaceProps surfProps(0, geo);
+    return (sk_surface_t*)SkSurface::NewRaster(info, &surfProps);
 }
 
 sk_surface_t* sk_surface_new_raster_direct(const sk_imageinfo_t* cinfo, void* pixels,
-                                           size_t rowBytes) {
+                                           size_t rowBytes,
+                                           const sk_surfaceprops_t* props) {
     SkImageInfo info;
     if (!from_c_info(*cinfo, &info)) {
         return NULL;
     }
-    return (sk_surface_t*)SkSurface::NewRasterDirect(info, pixels, rowBytes);
+    SkPixelGeometry geo = kUnknown_SkPixelGeometry;
+    if (props && !from_c_pixelgeometry(props->pixelGeometry, &geo)) {
+        return NULL;
+    }
+
+    SkSurfaceProps surfProps(0, geo);
+    return (sk_surface_t*)SkSurface::NewRasterDirect(info, pixels, rowBytes, &surfProps);
 }
 
 void sk_surface_unref(sk_surface_t* csurf) {
     SkSafeUnref((SkSurface*)csurf);
 }
 
 sk_canvas_t* sk_surface_get_canvas(sk_surface_t* csurf) {
     SkSurface* surf = (SkSurface*)csurf;
     return (sk_canvas_t*)surf->getCanvas();
 }
@@ skipping 170 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 void sk_test_capi(SkCanvas* canvas) {
     sk_imageinfo_t cinfo;
     cinfo.width = 100;
     cinfo.height = 100;
     cinfo.colorType = (sk_colortype_t)kN32_SkColorType;
     cinfo.alphaType = (sk_alphatype_t)kPremul_SkAlphaType;
     
-    sk_surface_t* csurface = sk_surface_new_raster(&cinfo);
+    sk_surfaceprops_t surfaceprops;
+    surfaceprops.pixelGeometry = UNKNOWN_SK_PIXELGEOMETRY;
+
+    sk_surface_t* csurface = sk_surface_new_raster(&cinfo, &surfaceprops);
     sk_canvas_t* ccanvas = sk_surface_get_canvas(csurface);
     
     sk_paint_t* cpaint = sk_paint_new();
     sk_paint_set_antialias(cpaint, true);
     sk_paint_set_color(cpaint, 0xFFFF0000);
     
     sk_rect_t cr = { 5, 5, 95, 95 };
     sk_canvas_draw_oval(ccanvas, &cr, cpaint);
     
     cr.left += 25;
@@ skipping 14 matching lines @@
     sk_image_t* cimage = sk_surface_new_image_snapshot(csurface);
     
     // HERE WE CROSS THE C..C++ boundary
     canvas->drawImage((const SkImage*)cimage, 20, 20, NULL);
     
     sk_path_delete(cpath);
     sk_paint_delete(cpaint);
     sk_image_unref(cimage);
     sk_surface_unref(csurface);
 }