Allow toString capability to be toggled independent of developer mode

samplecode/SampleText.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 31 matching lines @@
                     if (max < v)
                         max = v;
                     if  (min > v)
                         min = v;
                 }
         if (c > max) c = max;
     //    if (c < min) c = min;
         return c;
     }
 
-#ifdef SK_DEVELOPER
+#ifndef SK_IGNORE_TO_STRING
     virtual void toString(SkString* str) const SK_OVERRIDE {
         str->append("ReduceNoise: (");
         this->INHERITED::toString(str);
         str->append(")");
     }
 #endif
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(ReduceNoise)
 
 private:
@@ skipping 11 matching lines @@
 
         if (c >= 0) {
             f = sqrtf(f);
         } else {
             f *= f;
         }
         SkASSERT(f >= 0 && f <= 1);
         return (int)(f * 255);
     }
 
-#ifdef SK_DEVELOPER
+#ifndef SK_IGNORE_TO_STRING
     virtual void toString(SkString* str) const SK_OVERRIDE {
         str->append("Darken: (");
         this->INHERITED::toString(str);
         str->append(")");
     }
 #endif
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Darken)
 
 private:
@@ skipping 44 matching lines @@
 
 class SkPowerMode : public SkXfermode {
 public:
     SkPowerMode(SkScalar exponent) { this->init(exponent); }
 
     virtual void xfer16(uint16_t dst[], const SkPMColor src[], int count,
                         const SkAlpha aa[]) const SK_OVERRIDE;
 
     typedef SkFlattenable* (*Factory)(SkReadBuffer&);
 
-    SK_DEVELOPER_TO_STRING()
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPowerMode)
 
 private:
     SkScalar fExp;          // user's value
     uint8_t fTable[256];    // cache
 
     void init(SkScalar exponent);
     SkPowerMode(SkReadBuffer& b) : INHERITED(b) {
         // read the exponent
         this->init(SkFixedToScalar(b.readFixed()));
@@ skipping 29 matching lines @@
         int r = SkGetPackedR32(c);
         int g = SkGetPackedG32(c);
         int b = SkGetPackedB32(c);
         r = fTable[r];
         g = fTable[g];
         b = fTable[b];
         dst[i] = SkPack888ToRGB16(r, g, b);
     }
 }
 
-#ifdef SK_DEVELOPER
+#ifndef SK_IGNORE_TO_STRING
 void SkPowerMode::toString(SkString* str) const {
     str->append("SkPowerMode: exponent ");
     str->appendScalar(fExp);
 }
 #endif
 
 static const struct {
     const char* fName;
     uint32_t    fFlags;
     bool        fFlushCache;
@@ skipping 141 matching lines @@
     SkScalar fClickX;
     SkMaskFilter* fMF;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new TextSpeedView; }
 static SkViewRegister reg(MyFactory);