Fix bug in SampleApp's Tiling View

samplecode/SampleTiling.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
@@ skipping 87 matching lines @@
         static const char*          gFilterNames[] = {     "point",                     "bilinear" };
 
         static const SkShader::TileMode gModes[] = { SkShader::kClamp_TileMode, SkShader::kRepeat_TileMode, SkShader::kMirror_TileMode };
         static const char*          gModeNames[] = {    "C",                    "R",                   "M" };
 
         SkScalar y = SkIntToScalar(24);
         SkScalar x = SkIntToScalar(10);
 
         SkPictureRecorder recorder;
         SkCanvas* textCanvas = NULL;
-        if (fTextPicture->width() == 0) {
+        if (NULL == fTextPicture) {
             textCanvas = recorder.beginRecording(1000, 1000);
         }
 
         if (NULL != textCanvas) {
             for (size_t kx = 0; kx < SK_ARRAY_COUNT(gModes); kx++) {
                 for (size_t ky = 0; ky < SK_ARRAY_COUNT(gModes); ky++) {
                     SkPaint p;
                     SkString str;
                     p.setAntiAlias(true);
                     p.setDither(true);
@@ skipping 20 matching lines @@
                         paint.setDither(true);
 
                         canvas->save();
                         canvas->translate(x, y);
                         canvas->drawRect(r, paint);
                         canvas->restore();
 
                         x += r.width() * 4 / 3;
                     }
                 }
-                if (textCanvas) {
+                if (NULL != textCanvas) {
                     SkPaint p;
                     SkString str;
                     p.setAntiAlias(true);
                     p.setLooper(fLooper);
                     str.printf("%s, %s", gConfigNames[i], gFilterNames[j]);
                     textCanvas->drawText(str.c_str(), str.size(), x, y + r.height() * 2 / 3, p);
                 }
 
                 y += r.height() * 4 / 3;
             }
         }
 
-        fTextPicture.reset(recorder.endRecording());
+        if (NULL != textCanvas) {
+            SkASSERT(NULL == fTextPicture);
+            fTextPicture.reset(recorder.endRecording());
+        }
 
+        SkASSERT(NULL != fTextPicture);
         canvas->drawPicture(*fTextPicture);
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new TilingView; }
 static SkViewRegister reg(MyFactory);