auto import from //depot/cupcake/@136594

4 files changed, 11 insertions, 135 deletions

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 SkMaskFilter* makemf() { return new Darken(0x30); }
 
 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 @@ public:
             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));
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 @@ protected:
         
         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);
diff --git a/samplecode/SampleTextOnPath.cpp b/samplecode/SampleTextOnPath.cpp
index 97b4e8e..aec8fd6 100644
--- a/samplecode/SampleTextOnPath.cpp
+++ b/samplecode/SampleTextOnPath.cpp
@@ -304,137 +304,9 @@ private:
     typedef SkView INHERITED;
 };
 
-static const uint16_t gTest0[] = { 0, 0, 1, 1 };
-static const uint16_t gTest1[] = { 1, 2, 3, 4, 5, 6 };
-static const uint16_t gTest2[] = { 0, 0, 0, 1, 2, 3, 3, 3 };
-static const uint16_t gTest3[] = { 0, 0, 0, 0, 0, 0, 1, 2, 3, 3, 3, 0, 0, 1 };
-
-#include "SkRandom.h"
-static SkRandom gRand;
-static void rand_fill(uint16_t buffer[], int count) {
-    for (int i = 0; i < count; i++)
-        buffer[i] = (uint16_t)gRand.nextU();
-}
-
-static void test_pack16() {
-    static const struct {
-        const uint16_t* fSrc;
-        int             fCount;
-    } gTests[] = {
-        { gTest0, SK_ARRAY_COUNT(gTest0) },
-        { gTest1, SK_ARRAY_COUNT(gTest1) },
-        { gTest2, SK_ARRAY_COUNT(gTest2) },
-        { gTest3, SK_ARRAY_COUNT(gTest3) }
-    };
-    
-    for (size_t i = 0; i < SK_ARRAY_COUNT(gTests); i++) {
-        uint8_t dst[100];
-        size_t dstSize = SkPackBits::Pack16(gTests[i].fSrc,
-                                            gTests[i].fCount, dst);
-        printf("Test[%d] orig size = %d, dst size = %d",
-               i, gTests[i].fCount, (int)dstSize);
-        uint16_t src[100];
-        int srcCount = SkPackBits::Unpack16(dst, dstSize, src);
-        printf(", src size = %d", srcCount);
-        bool match = gTests[i].fCount == srcCount && memcmp(gTests[i].fSrc, src,
-                                    gTests[i].fCount * sizeof(uint16_t)) == 0;
-        printf(", match = %d\n", match);
-    }
-    
-    for (int n = 1000; n; n--) {
-        size_t size = 50;
-        uint16_t src[100], src2[100];
-        uint8_t dst[200];
-        rand_fill(src, size);
-
-        size_t dstSize = SkPackBits::Pack16(src, size, dst);
-        size_t maxSize = SkPackBits::ComputeMaxSize16(size);
-        SkASSERT(maxSize >= dstSize);
-
-        int srcCount = SkPackBits::Unpack16(dst, dstSize, src2);
-        SkASSERT(size == srcCount);
-        bool match = memcmp(src, src2, size * sizeof(uint16_t)) == 0;
-        SkASSERT(match);
-    }
-}
-
-static const uint8_t gTest80[] = { 0, 0, 1, 1 };
-static const uint8_t gTest81[] = { 1, 2, 3, 4, 5, 6 };
-static const uint8_t gTest82[] = { 0, 0, 0, 1, 2, 3, 3, 3 };
-static const uint8_t gTest83[] = { 0, 0, 0, 0, 0, 0, 1, 2, 3, 3, 3, 0, 0, 1 };
-static const uint8_t gTest84[] = { 1, 0, 3, 0, 0, 0, 2, 1, 1, 2 };
-
-static void rand_fill(uint8_t buffer[], int count) {
-    for (int i = 0; i < count; i++)
-        buffer[i] = (uint8_t)((gRand.nextU() >> 8) & 0x3);
-}
-
-static void test_pack8() {
-    static const struct {
-        const uint8_t* fSrc;
-        int             fCount;
-    } gTests[] = {
-        { gTest80, SK_ARRAY_COUNT(gTest80) },
-        { gTest81, SK_ARRAY_COUNT(gTest81) },
-        { gTest82, SK_ARRAY_COUNT(gTest82) },
-        { gTest83, SK_ARRAY_COUNT(gTest83) },
-        { gTest84, SK_ARRAY_COUNT(gTest84) }
-    };
-    
-    for (size_t i = 4; i < SK_ARRAY_COUNT(gTests); i++) {
-        uint8_t dst[100];
-        size_t maxSize = SkPackBits::ComputeMaxSize8(gTests[i].fCount);
-        size_t dstSize = SkPackBits::Pack8(gTests[i].fSrc,
-                                           gTests[i].fCount, dst);
-        SkASSERT(dstSize <= maxSize);
-        printf("Test[%d] orig size = %d, dst size = %d", i,
-               gTests[i].fCount, (int)dstSize);
-        uint8_t src[100];
-        int srcCount = SkPackBits::Unpack8(dst, dstSize, src);
-        printf(", src size = %d", srcCount);
-        bool match = gTests[i].fCount == srcCount &&
-                    memcmp(gTests[i].fSrc, src,
-                           gTests[i].fCount * sizeof(uint8_t)) == 0;
-        printf(", match = %d\n", match);
-    }
-
-    for (size_t size = 1; size <= 512; size += 1) {
-        for (int n = 200; n; n--) {
-            uint8_t src[600], src2[600];
-            uint8_t dst[600];
-            rand_fill(src, size);
-
-            size_t dstSize = SkPackBits::Pack8(src, size, dst);
-            size_t maxSize = SkPackBits::ComputeMaxSize8(size);
-            SkASSERT(maxSize >= dstSize);
-
-            int srcCount = SkPackBits::Unpack8(dst, dstSize, src2);
-            SkASSERT(size == srcCount);
-            bool match = memcmp(src, src2, size * sizeof(uint8_t)) == 0;
-            SkASSERT(match);
-            
-            for (int j = 0; j < 200; j++) {
-                size_t skip = gRand.nextU() % size;
-                size_t write = gRand.nextU() % size;
-                if (skip + write > size) {
-                    write = size - skip;
-                }
-                SkPackBits::Unpack8(src, skip, write, dst);
-                bool match = memcmp(src, src2 + skip, write) == 0;
-                SkASSERT(match);
-            }
-        }
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() {
-    static bool gOnce;
-    if (!gOnce) {
-//        test_pack8();
-        gOnce = true;
-    }
     return new TextOnPathView;
 }
 
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 @@ class TypefaceView : public SkView {
 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);
         }
     }