AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

implement some so we can test it

Browse Source 
NOTRY=True
TBR=

Review URL: https://codereview.chromium.org/629903004
This commit is contained in:
reed 2014-10-06 11:00:51 -07:00 committed by Commit bot
parent 2e5a986bc7
commit 8e47478333
2 changed files with 174 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
experimental/sk_surface.cpp
View File

@ -1,3 +1,10 @@
/*
* 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_surface.h"
#include "SkCanvas.h"
@ -7,27 +14,91 @@
#include "SkPath.h"
#include "SkSurface.h"
void sk_matrix_set_identity(sk_matrix_t* cmatrix) {
sk_bzero(cmatrix->mat, sizeof(9 * sizeof(float)));
cmatrix->mat[0] = cmatrix->mat[4] = cmatrix->mat[8] = 1;
}
static SkImageInfo make(const sk_image_info& cinfo) {
static SkImageInfo make(const sk_imageinfo_t& cinfo) {
return SkImageInfo::Make(cinfo.width, cinfo.height,
(SkColorType)cinfo.colorType, (SkAlphaType)cinfo.alphaType);
}
static const SkRect& AsRect(const sk_rect_t& crect) { return static_cast<const SkRect&>(crect); }
static const SkRect& AsRect(const sk_rect_t& crect) {
return reinterpret_cast<const SkRect&>(crect);
}
static const SkPath& AsPath(const sk_path_t& cpath) {
return reinterpret_cast<const SkPath&>(cpath);
}
static const SkImage* AsImage(const sk_image_t* cimage) {
return reinterpret_cast<const SkImage*>(cimage);
}
static const SkPaint& AsPaint(const sk_paint_t& cpaint) {
return static_cast<const SkPaint&>(cpaint);
return reinterpret_cast<const SkPaint&>(cpaint);
}
static const SkPaint* AsPaint(const sk_paint_t* cpaint) {
return static_cast<const SkPaint*>(cpaint);
return reinterpret_cast<const SkPaint*>(cpaint);
}
static SkCanvas* AsCanvas(sk_canvas_t* ccanvas) { return static_cast<SkCanvas*>(ccanvas); }
static SkPaint* AsPaint(sk_paint_t* cpaint) {
return reinterpret_cast<SkPaint*>(cpaint);
}
static SkCanvas* AsCanvas(sk_canvas_t* ccanvas) {
return reinterpret_cast<SkCanvas*>(ccanvas);
}
///////////////////////////////////////////////////////////////////////////////////////////
sk_image_t* sk_image_new_raster_copy(const sk_imageinfo_t* cinfo, const void* pixels,
size_t rowBytes) {
return (sk_image_t*)SkImage::NewRasterCopy(make(*cinfo), pixels, rowBytes);
}
void sk_image_ref(const sk_image_t* cimage) {
AsImage(cimage)->ref();
}
void sk_image_unref(const sk_image_t* cimage) {
AsImage(cimage)->unref();
}
int sk_image_get_width(const sk_image_t* cimage) {
return AsImage(cimage)->width();
}
int sk_image_get_height(const sk_image_t* cimage) {
return AsImage(cimage)->height();
}
uint32_t sk_image_get_unique_id(const sk_image_t* cimage) {
return AsImage(cimage)->uniqueID();
}
///////////////////////////////////////////////////////////////////////////////////////////
sk_paint_t* sk_paint_new() {
return (sk_paint_t*)SkNEW(SkPaint);
}
void sk_paint_delete(sk_paint_t* cpaint) {
SkDELETE(AsPaint(cpaint));
}
bool sk_paint_is_antialias(const sk_paint_t* cpaint) {
return AsPaint(*cpaint).isAntiAlias();
}
void sk_paint_set_antialias(sk_paint_t* cpaint, bool aa) {
AsPaint(cpaint)->setAntiAlias(aa);
}
sk_color_t sk_paint_get_color(const sk_paint_t* cpaint) {
return AsPaint(*cpaint).getColor();
}
void sk_paint_set_color(sk_paint_t* cpaint, sk_color_t c) {
AsPaint(cpaint)->setColor(c);
}
///////////////////////////////////////////////////////////////////////////////////////////
@ -48,11 +119,7 @@ void sk_canvas_translate(sk_canvas_t* ccanvas, float dx, float dy) {
}
void sk_canvas_scale(sk_canvas_t* ccanvas, float sx, float sy) {
AsCanvas(ccanvas)->scale(dx, dy);
}
void sk_canvas_concat(sk_canvas_t* ccanvas, const sk_matrix_t* cmatrix) {
AsCanvas(ccanvas)->concat(AsMatrix(*cmatrix));
AsCanvas(ccanvas)->scale(sx, sy);
}
void sk_canvas_draw_paint(sk_canvas_t* ccanvas, const sk_paint_t* cpaint) {
@ -78,30 +145,11 @@ void sk_canvas_draw_image(sk_canvas_t* ccanvas, const sk_image_t* cimage, float
///////////////////////////////////////////////////////////////////////////////////////////
sk_image_t* sk_image_new_raster_copy(const sk_image_info_t* cinfo, const void* pixels,
size_t rowBytes) {
return (sk_image_t*)SkImage::NewRasterCopy(make(*cinfo), pixels, rowBytes);
}
int sk_image_get_width(const sk_image_t* cimage) {
return ((const SkImage*)cimage)->width();
}
int sk_image_get_height(const sk_image_t* cimage) {
return ((const SkImage*)cimage)->height();
}
uint32_t sk_image_get_unique_id(const sk_image_t* cimage) {
return ((const SkImage*)cimage)->uniqueID();
}
///////////////////////////////////////////////////////////////////////////////////////////
sk_surface_t* sk_surface_new_raster(const sk_image_info_t* cinfo) {
sk_surface_t* sk_surface_new_raster(const sk_imageinfo_t* cinfo) {
return (sk_surface_t*)SkSurface::NewRaster(make(*cinfo));
}
sk_surface_t* sk_surface_new_raster_direct(const sk_image_info_t* cinfo, void* pixels,
sk_surface_t* sk_surface_new_raster_direct(const sk_imageinfo_t* cinfo, void* pixels,
size_t rowBytes) {
return (sk_surface_t*)SkSurface::NewRasterDirect(make(*cinfo), pixels, rowBytes);
}
@ -113,12 +161,47 @@ void sk_surface_delete(sk_surface_t* csurf) {
sk_canvas_t* sk_surface_get_canvas(sk_surface_t* csurf) {
SkSurface* surf = (SkSurface*)csurf;
return surf->getCanvas();
return (sk_canvas_t*)surf->getCanvas();
}
sk_image_t* sk_surface_new_image_snapshot(sk_surface_t* csurf) {
SkSurface* surf = (SkSurface*)csurf;
return surf->newImageSnapshot();
return (sk_image_t*)surf->newImageSnapshot();
}
///////////////////
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_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;
cr.top += 25;
cr.right -= 25;
cr.bottom -= 25;
sk_paint_set_color(cpaint, 0xFF00FF00);
sk_canvas_draw_rect(ccanvas, &cr, cpaint);
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_paint_delete(cpaint);
sk_image_unref(cimage);
sk_surface_delete(csurface);
}

83
experimental/sk_surface.h
View File

@ -1,9 +1,27 @@
/*
* Copyright 2014 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef sk_types_DEFINED
#define sk_types_DEFINED
#include <stdint.h>
#include <stddef.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef uint32_t sk_color_t;
sk_color_t sk_color_set_argb(uint8_t a, uint8_t r, uint8_t g, uint8_t b);
uint8_t sk_color_get_a(sk_color_t);
#define sk_color_set_argb(a, r, g, b) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
#define sk_color_get_a(c) (((c) >> 24) & 0xFF)
#define sk_color_get_r(c) (((c) >> 16) & 0xFF)
#define sk_color_get_g(c) (((c) >> 8) & 0xFF)
#define sk_color_get_b(c) (((c) >> 0) & 0xFF)
typedef enum {
UNKNOWN_SK_COLORTYPE,
@ -12,51 +30,51 @@ typedef enum {
ALPHA_8_SK_COLORTYPE,
} sk_colortype_t;
typedef struct sk_imageinfo_t {
typedef enum {
PREMUL_SK_ALPHATYPE,
UNPREMUL_SK_ALPHATYPE,
} sk_alphatype_t;
typedef struct {
int32_t width;
int32_t height;
sk_colortype_t colorType;
sk_alphatype_t colorType;
};
sk_alphatype_t alphaType;
} sk_imageinfo_t;
typedef struct sk_rect_t {
typedef struct {
float left;
float top;
float right;
float bottom;
};
} sk_rect_t;
typedef struct sk_matrix_t {
float mat[9];
};
void sk_matrix_set_identity(sk_matrix_t*);
typedef struct sk_path_t;
typedef struct sk_path_t sk_path_t;
sk_path_t* sk_path_new();
void sk_path_move_to(sk_path*, float x, float y);
void sk_path_line_to(sk_path*, float x, float y);
void sk_path_quad_to(sk_path*, float x0, float y1, float x1, float y1);
void sk_path_move_to(sk_path_t*, float x, float y);
void sk_path_line_to(sk_path_t*, float x, float y);
void sk_path_quad_to(sk_path_t*, float x0, float y0, float x1, float y1);
void sk_path_get_bounds(const sk_path_t*, sk_rect_t*);
typedef struct sk_paint_t;
typedef struct sk_paint_t sk_paint_t;
sk_paint_t* sk_paint_new();
void sk_paint_delete(sk_paint_t*);
bool sk_paint_is_antialias(sk_paint_t*);
void sk_paint_set_antialias(sk_paint_t*, bool);
sk_color_t sk_paint_get_color(const sk_paint_t*);
void sk_paint_set_color(sk_paint_t*, sk_color_t);
typedef struct sk_canvas_t;
typedef struct sk_canvas_t sk_canvas_t;
typedef struct sk_image_t sk_image_t;
void sk_canvas_save(sk_canvas_t*);
void sk_canvas_save_layer(sk_canvas_t*, const sk_rect_t*, const sk_paint_t*);
void sk_canvas_restore(sk_canvas_t*);
void sk_canvas_translate(sk_canvas_t*, sk_scalar_t dx, sk_scalar_t dy);
void sk_canvas_scale(sk_canvas_t*, sk_scalar_t sx, sk_scalar_t sy);
void sk_canvas_concat(sk_canvas_t*, const sk_matrix_t*);
void sk_canvas_translate(sk_canvas_t*, float dx, float dy);
void sk_canvas_scale(sk_canvas_t*, float sx, float sy);
void sk_canvas_draw_paint(sk_canvas_t*, const sk_paint_t*);
void sk_canvas_draw_rect(sk_canvas_t*, const sk_rect_t*, const sk_paint_t*);
@ -64,20 +82,25 @@ void sk_canvas_draw_oval(sk_canvas_t*, const sk_rect_t*, const sk_paint_t*);
void sk_canvas_draw_path(sk_canvas_t*, const sk_path_t*, const sk_paint_t*);
void sk_canvas_draw_image(sk_canvas_t*, const sk_image_t*, float x, float y, const sk_paint_t*);
typedef struct sk_image_t;
sk_image_t* sk_image_new_raster_copy(const sk_image_info_t*, const void* pixels, size_t rowBytes);
sk_image_t* sk_image_new_raster_copy(const sk_imageinfo_t*, const void* pixels, size_t rowBytes);
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*);
int sk_image_get_height(const sk_image_t*);
uint32_t sk_image_get_unique_id(const sk_image_t*);
typedef struct sk_surface_t;
typedef struct sk_surface_t sk_surface_t;
sk_surface_t* sk_surface_new_raster(const sk_image_info_t*)
sk_surface_t* sk_surface_new_raster_direct(const sk_image_info_t*, void* pixels, size_t rowBytes);
sk_surface_t* sk_surface_new_raster(const sk_imageinfo_t*);
sk_surface_t* sk_surface_new_raster_direct(const sk_imageinfo_t*, void* pixels, size_t rowBytes);
void sk_surface_delete(sk_surface_t*);
sk_canvas_t* sk_surface_get_canvas(sk_surface_t*);
sk_image_t* sk_surface_new_image_snapshot(sk_surface_t*);
#ifdef __cplusplus
class SkCanvas;
void sk_test_capi(SkCanvas*);
}
#endif
#endif