API cleanup: rename typeface Create to CreateFromName, and remove default arg
git-svn-id: http://skia.googlecode.com/svn/trunk@108 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp
index 60e015a..b8abac3 100644
--- a/samplecode/SampleText.cpp
+++ b/samplecode/SampleText.cpp
@@ -90,10 +90,11 @@
static void test_typefaceCache()
{
- SkTypeface* t0 = SkTypeface::Create("sans-serif", SkTypeface::kNormal);
- SkTypeface* t1 = SkTypeface::Create(NULL, SkTypeface::kNormal);
- SkTypeface* t2 = SkTypeface::Create("arial", SkTypeface::kNormal);
- SkTypeface* t3 = SkTypeface::Create("helvetica", SkTypeface::kItalic);
+ SkTypeface* t0 = SkTypeface::CreateFromName("sans-serif",
+ SkTypeface::kNormal);
+ SkTypeface* t1 = SkTypeface::CreateFromName(NULL, SkTypeface::kNormal);
+ SkTypeface* t2 = SkTypeface::CreateFromName("arial", SkTypeface::kNormal);
+ SkTypeface* t3 = SkTypeface::CreateFromName("helvetica", SkTypeface::kItalic);
#ifndef SK_BUILD_FOR_MAC
SkASSERT(t0 == t1);
@@ -413,7 +414,8 @@
static const char extra[] = { '.', ',', ':', ';', '!' };
SkPaint paint, paint2;
- paint2.setTypeface(SkTypeface::Create(NULL, SkTypeface::kItalic))->unref();
+ paint2.setTypeface(SkTypeface::CreateFromName(NULL,
+ SkTypeface::kItalic))->unref();
for (int i = 0; i < 26; i++)
::dump('a' + i, count_char_points(paint, 'a' + i), count_char_points(paint2, 'a' + i));