update to SampleView

git-svn-id: http://skia.googlecode.com/svn/trunk@1460 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 3 insertions, 60 deletions

diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp
index a126cbff80..81391717e2 100644
--- a/samplecode/SamplePathClip.cpp
+++ b/samplecode/SamplePathClip.cpp
@@ -14,58 +14,7 @@
 #include "SkTime.h"
 #include "SkTypeface.h"
 
-#if 0
-static void CFString2SkString(CFStringRef ref, SkString* str) {
-    str->reset();
-    int count = CFStringGetLength(ref);
-    for (int i = 0; i < count; i++) {
-        SkString tmp;
-        UniChar c = CFStringGetCharacterAtIndex(ref, i);
-        tmp.setUTF16(&c, 1);
-        str->append(tmp);
-    }
-}
-
-static size_t get_table_size(ATSFontRef font, uint32_t tableTag) {
-    ByteCount size;
-    OSStatus status = ATSFontGetTable(font, tableTag, 0, 0, NULL, &size);
-    if (status) {
-        SkDebugf("*** ATSFontGetTable returned %d\n", status);
-        size = -1;
-    }
-    return size;
-}
-
-static void test_ats() {
-    OSStatus status;
-    ATSFontIterator iter;
-    status = ATSFontIteratorCreate(kATSFontContextLocal, NULL, NULL,
-                                   kATSOptionFlagsUnRestrictedScope, &iter);
-
-    for (int index = 0;; index++) {
-        ATSFontRef fontRef;
-        status = ATSFontIteratorNext(iter, &fontRef);
-        if (status) {
-            break;
-        }
-        
-        CFStringRef name;
-        SkString str;
-        ATSFontGetName(fontRef, kATSOptionFlagsDefault, &name);
-        CFString2SkString(name, &str);
-        if (str.size() > 0 && str.c_str()[0] != '.') {
-            SkDebugf("[%3d] font %x cmap %d 'name' %d <%s>\n", index, fontRef,
-                     get_table_size(fontRef, 'cmap'),
-                     get_table_size(fontRef, 'name'),
-                     str.c_str());
-        }
-        CFRelease(name);
-    }
-    ATSFontIteratorRelease(&iter);
-}
-#endif
-
-class PathClipView : public SkView {
+class PathClipView : public SampleView {
 public:
     SkRect fOval;
     SkPoint fCenter;
@@ -89,13 +38,7 @@ protected:
         return this->INHERITED::onQuery(evt);
     }
     
-    void drawBG(SkCanvas* canvas) {
-        canvas->drawColor(SK_ColorWHITE);
-    }
-    
-    virtual void onDraw(SkCanvas* canvas) {
-        this->drawBG(canvas);
-        
+    virtual void onDrawContent(SkCanvas* canvas) {
         SkRect oval = fOval;
         oval.offset(fCenter.fX - oval.centerX(), fCenter.fY - oval.centerY());
         
@@ -131,7 +74,7 @@ protected:
     }
     
 private:
-    typedef SkView INHERITED;
+    typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////