add debugging test for building SkDescriptor
update some samples
git-svn-id: http://skia.googlecode.com/svn/trunk@1237 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleTinyBitmap.cpp b/samplecode/SampleTinyBitmap.cpp
index ffbff25..0841474 100644
--- a/samplecode/SampleTinyBitmap.cpp
+++ b/samplecode/SampleTinyBitmap.cpp
@@ -30,11 +30,12 @@
return bm;
}
-class TinyBitmapView : public SkView {
+class TinyBitmapView : public SampleView {
SkBitmap fBM;
public:
TinyBitmapView() {
fBM = make_bitmap();
+ this->setBGColor(0xFFDDDDDD);
}
protected:
@@ -47,14 +48,6 @@
return this->INHERITED::onQuery(evt);
}
- void drawBG(SkCanvas* canvas) {
- SkIPoint size;
- if (canvas->getViewport(&size)) {
- SkDebugf("");
- }
- canvas->drawColor(0xFFDDDDDD);
- }
-
static void setBitmapOpaque(SkBitmap* bm, bool isOpaque) {
SkAutoLockPixels alp(*bm); // needed for ctable
bm->setIsOpaque(isOpaque);
@@ -64,9 +57,7 @@
}
}
- virtual void onDraw(SkCanvas* canvas) {
- drawBG(canvas);
-
+ virtual void onDrawContent(SkCanvas* canvas) {
SkShader* s = SkShader::CreateBitmapShader(fBM, SkShader::kRepeat_TileMode,
SkShader::kMirror_TileMode);
SkPaint paint;