commit 069b827f8e4f8ca212548719db64983a69b8dc25
author reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 04 15:31:48 2009 +0000
committer reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 04 15:31:48 2009 +0000
tree e989bf8ab7936e526b97d6893d62b14daaea00e9
parent 0650c6ca12e026201091f3e9ea9cbf0fed2b6da1

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

samplecode/SampleText.cpp

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));

samplecode/SampleTextEffects.cpp

diff --git a/samplecode/SampleTextEffects.cpp b/samplecode/SampleTextEffects.cpp
index 2293a04..f64e187 100644
--- a/samplecode/SampleTextEffects.cpp
+++ b/samplecode/SampleTextEffects.cpp
@@ -382,7 +382,8 @@
         
         paint.setAntiAlias(true);
         paint.setTextSize(SkIntToScalar(48));
-        paint.setTypeface(SkTypeface::Create("sans-serif", SkTypeface::kBold));
+        paint.setTypeface(SkTypeface::CreateFromName("sans-serif",
+                                                     SkTypeface::kBold));
 
         SkString str("GOOGLE ");
         str.appendUnichar(0x5700);

samplecode/SampleTypeface.cpp

diff --git a/samplecode/SampleTypeface.cpp b/samplecode/SampleTypeface.cpp
index 94023b7..b1289bd 100644
--- a/samplecode/SampleTypeface.cpp
+++ b/samplecode/SampleTypeface.cpp
@@ -35,7 +35,8 @@
 public:
 	TypefaceView() {
         for (int i = 0; i < gFaceCount; i++) {
-            fFaces[i] = SkTypeface::Create(gFaces[i].fName, gFaces[i].fStyle);
+            fFaces[i] = SkTypeface::CreateFromName(gFaces[i].fName,
+                                                   gFaces[i].fStyle);
         }
     }