summaryrefslogtreecommitdiffstatsci
diff options
context:
space:
mode:
authorBryce Harrington <b.harrington@samsung.com>2014-07-30 11:16:47 -0700
committerBryce Harrington <bryce@osg.samsung.com>2014-08-06 16:30:40 -0700
commit8c6f384feaa255c137b1133910ef4ed5719eb372 (patch)
treefa809a3296001d30b2262b5e6247ba497f4c9bcb
parenteb9e41b15b797e3e4f04c15e9170082c06c04490 (diff)
tests: Rename text test to test-glyphs
This is to make way for the more basic text test from FlashCanvas.
-rw-r--r--src/cairo-tests/text-glyphs.cpp (renamed from src/cairo-tests/text.cpp)8
-rw-r--r--src/skia-tests/text-glyphs.cpp (renamed from src/skia-tests/text.cpp)8
2 files changed, 10 insertions, 6 deletions
diff --git a/src/cairo-tests/text.cpp b/src/cairo-tests/text-glyphs.cpp
index 04cb8ff..e1a3170 100644
--- a/src/cairo-tests/text.cpp
+++ b/src/cairo-tests/text-glyphs.cpp
@@ -15,6 +15,8 @@
#include "caskbench_context.h"
#include "cairo-shapes.h"
+// This test converts a text string to glyphs and displays it at various font sizes
+
static int max_dim;
static char rand_text_array[19][100];
@@ -30,19 +32,19 @@ void gen_random(char *s, const int len) {
}
int
-ca_setup_text(caskbench_context_t *ctx)
+ca_setup_text_glyphs(caskbench_context_t *ctx)
{
max_dim = MIN (ctx->canvas_width, ctx->canvas_height)/2;
return 1;
}
void
-ca_teardown_text(void)
+ca_teardown_text_glyphs(void)
{
}
int
-ca_test_text(caskbench_context_t *ctx)
+ca_test_text_glyphs(caskbench_context_t *ctx)
{
cairo_t *cr = ctx->cairo_cr;
double font_size = 18;
diff --git a/src/skia-tests/text.cpp b/src/skia-tests/text-glyphs.cpp
index f92bf12..569f6ed 100644
--- a/src/skia-tests/text.cpp
+++ b/src/skia-tests/text-glyphs.cpp
@@ -24,6 +24,8 @@
#include "caskbench_context.h"
#include "skia-shapes.h"
+// This test converts a text string to glyphs and displays it at various font sizes
+
static int max_dim;
static char rand_text_array[19][100];
@@ -37,7 +39,7 @@ void gen_skia_random(char *s, const int len) {
}
int
-sk_setup_text(caskbench_context_t *ctx)
+sk_setup_text_glyphs(caskbench_context_t *ctx)
{
max_dim = MIN(ctx->canvas_width, ctx->canvas_height)/2;
ctx->skia_paint->setTextEncoding (SkPaint::kGlyphID_TextEncoding);
@@ -45,7 +47,7 @@ sk_setup_text(caskbench_context_t *ctx)
}
void
-sk_teardown_text(void)
+sk_teardown_text_glyphs(void)
{
}
@@ -64,7 +66,7 @@ static void getGlyphPositions(const SkPaint& paint, const uint16_t glyphs[],
}
int
-sk_test_text(caskbench_context_t *ctx)
+sk_test_text_glyphs(caskbench_context_t *ctx)
{
double font_size = 18;
int ypos = 15, xpos = 0;