call notifyPixelsChanged() when the pages are flipped in pageflippixelref

update samples



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

6 files changed, 17 insertions, 96 deletions

diff --git a/samplecode/SampleFontScalerTest.cpp b/samplecode/SampleFontScalerTest.cpp
index 44c207c718..d597a9adfb 100644
--- a/samplecode/SampleFontScalerTest.cpp
+++ b/samplecode/SampleFontScalerTest.cpp
@@ -29,14 +29,6 @@ static const struct {
 
 static const int gFaceCount = SK_ARRAY_COUNT(gFaces);
 
-static const char* gStrings[] = {
-    "HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH",
-    "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
-    "......................................",
-    "11111111111111111111111111111111111111",
-    "00000000000000000000000000000000000000"
-};
-
 class FontScalerTestView : public SkView {
     SkTypeface* fFaces[gFaceCount];
 
@@ -110,7 +102,6 @@ protected:
         
         int index = 0;
         for (int ps = 9; ps <= 24; ps++) {
-         //   text = gStrings[index % SK_ARRAY_COUNT(gStrings)];
             textLen = strlen(text);
             paint.setTextSize(SkIntToScalar(ps));
             canvas->drawText(text, textLen, x, y, paint);
diff --git a/samplecode/SampleImageDir.cpp b/samplecode/SampleImageDir.cpp
index 922910ce32..e221fe187a 100644
--- a/samplecode/SampleImageDir.cpp
+++ b/samplecode/SampleImageDir.cpp
@@ -234,21 +234,12 @@ protected:
             DrawRoundRect(*canvas);
             return;
         }
-        
-        SkScalar scale = SK_Scalar1 * 999/1000;
-//        scale = SK_Scalar1/2;
-        
+    
         canvas->translate(SkIntToScalar(10), SkIntToScalar(10));
-   //     canvas->scale(scale, scale);
         
         SkScalar x = SkIntToScalar(32), y = SkIntToScalar(32);
         SkPaint paint;
-        
-    //    x += fDX;
-    //    y += fDY;
-    
-//        paint.setLooper(new SkBlurDrawLooper(SkIntToScalar(12), 0, 0, 0xDD000000))->unref();
-        
+
 #if 0
         for (int i = 0; i < fBitmapCount; i++) {
             SkPaint p;
diff --git a/samplecode/SamplePageFlip.cpp b/samplecode/SamplePageFlip.cpp
index 6b1adfd903..ed4d340998 100644
--- a/samplecode/SamplePageFlip.cpp
+++ b/samplecode/SamplePageFlip.cpp
@@ -44,7 +44,7 @@ static void* draw_proc(void* context) {
     SkPaint paint;
     
     paint.setAntiAlias(true);
-    paint.setColor(reinterpret_cast<SkColor>(ref) | (0xFF << 24));
+    paint.setColor(SK_ColorRED);
     
     SkRect oval;
     oval.setEmpty();
diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp
index f5ddca9a76..19f4930389 100644
--- a/samplecode/SampleShaders.cpp
+++ b/samplecode/SampleShaders.cpp
@@ -48,7 +48,7 @@ public:
 
 	ShaderView()
     {
-        SkImageDecoder::DecodeFile("/cover.png", &fBitmap);
+        SkImageDecoder::DecodeFile("/skimages/logo.gif", &fBitmap);
 
         SkPoint pts[2];
         SkColor colors[2];
@@ -79,14 +79,12 @@ public:
     
 protected:
     // overrides from SkEventSink
-    virtual bool onQuery(SkEvent* evt)
-    {
-            if (SampleCode::TitleQ(*evt))
-            {
-                SampleCode::TitleR(evt, "Shaders");
-                return true;
-            }
-            return this->INHERITED::onQuery(evt);
+    virtual bool onQuery(SkEvent* evt) {
+        if (SampleCode::TitleQ(*evt)) {
+            SampleCode::TitleR(evt, "Shaders");
+            return true;
+        }
+        return this->INHERITED::onQuery(evt);
     }
     
     void drawBG(SkCanvas* canvas)
@@ -101,18 +99,7 @@ protected:
         
         canvas->drawBitmap(fBitmap, 0, 0);
         
-        {
-            SkIRect src;
-            SkRect  dst;
-            
-            src.set(20, 50, 120, 70);
-            dst.set(src);
-            dst.offset(SkIntToScalar(300), 0);
-
-            canvas->drawBitmapRect(fBitmap, &src, dst);
-        }
-
-        canvas->translate(SkIntToScalar(80), SkIntToScalar(80));
+        canvas->translate(SkIntToScalar(20), SkIntToScalar(120));
         
         SkPaint paint;
         SkRect  r;
@@ -124,7 +111,11 @@ protected:
 
         canvas->translate(SkIntToScalar(110), 0);
 
-        r.set(0, 0, SkIntToScalar(fBitmap.width()), SkIntToScalar(fBitmap.height()));
+        int w = fBitmap.width();
+        int h = fBitmap.height();
+        w = 120;
+        h = 80;
+        r.set(0, 0, SkIntToScalar(w), SkIntToScalar(h));
 
         paint.setShader(NULL);
         canvas->drawRect(r, paint);
diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp
index 83ff68d7ee..7b8bcf0314 100644
--- a/samplecode/SampleText.cpp
+++ b/samplecode/SampleText.cpp
@@ -90,13 +90,13 @@ static SkMaskFilter* makemf() { return new Darken(0x30); }
 
 static void test_typefaceCache()
 {
+#ifdef ANDROID
     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);
     
-#ifdef ANDROID
     SkASSERT(t0 == t1);
     SkASSERT(t0 == t2);
     SkASSERT(t0 == t3);
diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp
index fcd962867a..84f1e1254f 100644
--- a/samplecode/SampleVertices.cpp
+++ b/samplecode/SampleVertices.cpp
@@ -20,48 +20,6 @@
 #include "SkStream.h"
 #include "SkNinePatch.h"
 
-void setup_vertexbug(SkPoint verts[], SkPoint texs[], uint16_t index[]);
-
-static void drawbug(SkCanvas* canvas, SkScalar scale) {
-    SkBitmap    bm, bm2;
-    
-    SkImageDecoder::DecodeFile("/skimages/btn_default_normal.9.png", &bm);
-    SkPaint paint;
-    
-    SkIRect subset;
-    subset.set(1, 1, bm.width() - 1, bm.height() - 1);
-    bm.extractSubset(&bm2, subset);
-    
-#if 0
-    SkPoint verts[16], texs[16];
-    uint16_t    index[54];
-    
-    SkShader* s = SkShader::CreateBitmapShader(bm2, SkShader::kClamp_TileMode,
-                                        SkShader::kClamp_TileMode);
-    paint.setShader(s)->unref();
-    
-    setup_vertexbug(verts, texs, index);
-    int indexCount = 6;    // 54
-    canvas->drawVertices(SkCanvas::kTriangles_VertexMode, 16, verts, texs,
-                         NULL, NULL, &index[6], indexCount, paint);
-
-#if 0
-    paint.setShader(NULL);
-    canvas->drawVertices(SkCanvas::kTriangles_VertexMode, 16, verts, NULL,
-                         NULL, NULL, index, indexCount, paint);
-#endif
-#else
-    SkRect  dst;
-    SkIRect margin;
-    
-    dst.set(SkIntToScalar(10), SkIntToScalar(10),
-            SkIntToScalar(100) + scale,
-            SkIntToScalar(40) + scale);
-    margin.set(9, 9, 9, 9);
-    SkNinePatch::DrawNine(canvas, dst, bm2, margin, NULL);
-#endif
-}
-
 static SkShader* make_shader0(SkIPoint* size) {
     SkBitmap    bm;
     
@@ -122,16 +80,6 @@ protected:
     virtual void onDraw(SkCanvas* canvas) {
         this->drawBG(canvas);
         
-#if 1
-        canvas->drawColor(SK_ColorWHITE);
-        canvas->translate(SK_Scalar1/2, SkIntToScalar(15) + SK_Scalar1/2);
-        canvas->scale(SkIntToScalar(3)/2, SkIntToScalar(3)/2);
-        drawbug(canvas, fScale);
-        fScale += SK_Scalar1/93;
-        this->inval(NULL);
-        return;
-#endif
-        
         SkPaint paint;
         paint.setDither(true);
         paint.setFilterBitmap(true);