diff options
72 files changed, 108 insertions, 98 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index d0f7a8ea60..b69234baa1 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -747,7 +747,7 @@ public: int fHeight; }; - SkDEVCODE(void toString(SkString* str) const;) + SK_TO_STRING_NONVIRT() private: struct MipMap; diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h index a5ffca818d..c26bc075c9 100644 --- a/include/core/SkColorFilter.h +++ b/include/core/SkColorFilter.h @@ -128,7 +128,7 @@ public: */ virtual GrEffectRef* asNewEffect(GrContext*) const; - SkDEVCODE(virtual void toString(SkString* str) const = 0;) + SK_TO_STRING_PUREVIRT() SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP() SK_DEFINE_FLATTENABLE_TYPE(SkColorFilter) diff --git a/include/core/SkColorShader.h b/include/core/SkColorShader.h index 5b8a86dfc1..975156c0eb 100644 --- a/include/core/SkColorShader.h +++ b/include/core/SkColorShader.h @@ -48,7 +48,7 @@ public: virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorShader) protected: diff --git a/include/core/SkComposeShader.h b/include/core/SkComposeShader.h index 1fefd1369a..e29578cabc 100644 --- a/include/core/SkComposeShader.h +++ b/include/core/SkComposeShader.h @@ -39,7 +39,7 @@ public: virtual void endContext() SK_OVERRIDE; virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeShader) protected: diff --git a/include/core/SkDrawLooper.h b/include/core/SkDrawLooper.h index 65650d88e8..3c45a6a5b6 100644 --- a/include/core/SkDrawLooper.h +++ b/include/core/SkDrawLooper.h @@ -88,7 +88,7 @@ public: virtual void computeFastBounds(const SkPaint& paint, const SkRect& src, SkRect* dst) const; - SkDEVCODE(virtual void toString(SkString* str) const = 0;) + SK_TO_STRING_PUREVIRT() SK_DEFINE_FLATTENABLE_TYPE(SkDrawLooper) protected: diff --git a/include/core/SkEmptyShader.h b/include/core/SkEmptyShader.h index 3f7dae41a9..d2ebb61221 100644 --- a/include/core/SkEmptyShader.h +++ b/include/core/SkEmptyShader.h @@ -30,7 +30,7 @@ public: virtual void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE; virtual void shadeSpanAlpha(int x, int y, uint8_t alpha[], int count) SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmptyShader) protected: diff --git a/include/core/SkMaskFilter.h b/include/core/SkMaskFilter.h index ac9b7189b2..3113c93442 100644 --- a/include/core/SkMaskFilter.h +++ b/include/core/SkMaskFilter.h @@ -138,7 +138,7 @@ public: */ virtual void computeFastBounds(const SkRect& src, SkRect* dest) const; - SkDEVCODE(virtual void toString(SkString* str) const = 0;) + SK_TO_STRING_PUREVIRT() SK_DEFINE_FLATTENABLE_TYPE(SkMaskFilter) protected: diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h index 9bbbc1745b..d7c163d439 100644 --- a/include/core/SkMatrix.h +++ b/include/core/SkMatrix.h @@ -560,7 +560,7 @@ public: size_t readFromMemory(const void* buffer, size_t length); SkDEVCODE(void dump() const;) - SkDEVCODE(void toString(SkString*) const;) + SK_TO_STRING_NONVIRT() /** * Calculates the minimum stretching factor of the matrix. If the matrix has diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index 2b30a7cda5..d1853c613c 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -1032,7 +1032,7 @@ public: return SetTextMatrix(matrix, fTextSize, fTextScaleX, fTextSkewX); } - SkDEVCODE(void toString(SkString*) const;) + SK_TO_STRING_NONVIRT() struct FlatteningTraits { static void Flatten(SkWriteBuffer& buffer, const SkPaint& paint); diff --git a/include/core/SkShader.h b/include/core/SkShader.h index d0fac49f7e..acff959949 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -345,8 +345,7 @@ public: static SkShader* CreateBitmapShader(const SkBitmap& src, TileMode tmx, TileMode tmy); - SkDEVCODE(virtual void toString(SkString* str) const;) - + SK_TO_STRING_VIRT() SK_DEFINE_FLATTENABLE_TYPE(SkShader) protected: diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index b0a4731fd4..31c81a1aa3 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -115,12 +115,22 @@ inline void operator delete(void* p) { #ifdef SK_DEVELOPER #define SkDEVCODE(code) code - // the 'toString' helper functions convert Sk* objects to human-readable - // form in developer mode - #define SK_DEVELOPER_TO_STRING() virtual void toString(SkString* str) const SK_OVERRIDE; #else #define SkDEVCODE(code) - #define SK_DEVELOPER_TO_STRING() +#endif + +#ifdef SK_IGNORE_TO_STRING + #define SK_TO_STRING_NONVIRT() + #define SK_TO_STRING_VIRT() + #define SK_TO_STRING_PUREVIRT() + #define SK_TO_STRING_OVERRIDE() +#else + // the 'toString' helper functions convert Sk* objects to human-readable + // form in developer mode + #define SK_TO_STRING_NONVIRT() void toString(SkString* str) const; + #define SK_TO_STRING_VIRT() virtual void toString(SkString* str) const; + #define SK_TO_STRING_PUREVIRT() virtual void toString(SkString* str) const = 0; + #define SK_TO_STRING_OVERRIDE() virtual void toString(SkString* str) const SK_OVERRIDE; #endif template <bool> diff --git a/include/core/SkXfermode.h b/include/core/SkXfermode.h index 86c08dd6b7..e2977255dd 100644 --- a/include/core/SkXfermode.h +++ b/include/core/SkXfermode.h @@ -211,7 +211,7 @@ public: Coeff* dst, GrTexture* background = NULL); - SkDEVCODE(virtual void toString(SkString* str) const = 0;) + SK_TO_STRING_PUREVIRT() SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP() SK_DEFINE_FLATTENABLE_TYPE(SkXfermode) @@ -265,7 +265,7 @@ public: virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count, const SkAlpha aa[]) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcXfermode) protected: diff --git a/include/effects/SkAvoidXfermode.h b/include/effects/SkAvoidXfermode.h index 2fa20b9834..3df8c8e9dd 100644 --- a/include/effects/SkAvoidXfermode.h +++ b/include/effects/SkAvoidXfermode.h @@ -49,7 +49,7 @@ public: virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count, const SkAlpha aa[]) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkAvoidXfermode) protected: diff --git a/include/effects/SkBlurDrawLooper.h b/include/effects/SkBlurDrawLooper.h index 9a230e59ff..5469e2cf02 100644 --- a/include/effects/SkBlurDrawLooper.h +++ b/include/effects/SkBlurDrawLooper.h @@ -47,7 +47,7 @@ public: virtual size_t contextSize() const SK_OVERRIDE { return sizeof(BlurDrawLooperContext); } - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurDrawLooper) protected: diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h index 785d682c99..eee9927157 100644 --- a/include/effects/SkColorMatrixFilter.h +++ b/include/effects/SkColorMatrixFilter.h @@ -34,7 +34,7 @@ public: int fShift; }; - SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;) + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorMatrixFilter) diff --git a/include/effects/SkEmbossMaskFilter.h b/include/effects/SkEmbossMaskFilter.h index 0843911181..eb8f8117a4 100644 --- a/include/effects/SkEmbossMaskFilter.h +++ b/include/effects/SkEmbossMaskFilter.h @@ -34,7 +34,7 @@ public: virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&, SkIPoint* margin) const SK_OVERRIDE; - SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;) + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmbossMaskFilter) protected: diff --git a/include/effects/SkKernel33MaskFilter.h b/include/effects/SkKernel33MaskFilter.h index 5530094cc5..3ec3cc9e50 100644 --- a/include/effects/SkKernel33MaskFilter.h +++ b/include/effects/SkKernel33MaskFilter.h @@ -18,7 +18,7 @@ public: virtual bool filterMask(SkMask*, const SkMask&, const SkMatrix&, SkIPoint*) const SK_OVERRIDE; - SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;) + SK_TO_STRING_OVERRIDE() protected: SkKernel33ProcMaskFilter(unsigned percent256 = 256) @@ -43,7 +43,7 @@ public: // override from SkKernel33ProcMaskFilter virtual uint8_t computeValue(uint8_t* const* srcRows) const SK_OVERRIDE; - SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;) + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkKernel33MaskFilter) protected: diff --git a/include/effects/SkLayerDrawLooper.h b/include/effects/SkLayerDrawLooper.h index 7a13b7a7b9..1e76ce21e5 100644 --- a/include/effects/SkLayerDrawLooper.h +++ b/include/effects/SkLayerDrawLooper.h @@ -98,7 +98,7 @@ public: virtual size_t contextSize() const SK_OVERRIDE { return sizeof(LayerDrawLooperContext); } - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() /// Implements Flattenable. virtual Factory getFactory() const SK_OVERRIDE { return CreateProc; } diff --git a/include/effects/SkLerpXfermode.h b/include/effects/SkLerpXfermode.h index b6cc93fe07..d9186d904c 100644 --- a/include/effects/SkLerpXfermode.h +++ b/include/effects/SkLerpXfermode.h @@ -28,7 +28,7 @@ public: virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count, const SkAlpha aa[]) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLerpXfermode) protected: diff --git a/include/effects/SkLumaColorFilter.h b/include/effects/SkLumaColorFilter.h index 6c57f7cc75..f2cee294c3 100644 --- a/include/effects/SkLumaColorFilter.h +++ b/include/effects/SkLumaColorFilter.h @@ -31,7 +31,7 @@ public: virtual GrEffectRef* asNewEffect(GrContext*) const SK_OVERRIDE; #endif - SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;) + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLumaColorFilter) protected: diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h index 497c0e0e8c..03ae3832ca 100644 --- a/include/effects/SkPerlinNoiseShader.h +++ b/include/effects/SkPerlinNoiseShader.h @@ -69,7 +69,7 @@ public: virtual GrEffectRef* asNewEffect(GrContext* context, const SkPaint&) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShader) protected: diff --git a/include/effects/SkPixelXorXfermode.h b/include/effects/SkPixelXorXfermode.h index cfd59ecce0..837257ec2c 100644 --- a/include/effects/SkPixelXorXfermode.h +++ b/include/effects/SkPixelXorXfermode.h @@ -21,7 +21,7 @@ public: return SkNEW_ARGS(SkPixelXorXfermode, (opColor)); } - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPixelXorXfermode) protected: diff --git a/include/effects/SkStippleMaskFilter.h b/include/effects/SkStippleMaskFilter.h index ad7f767e49..d6f8798862 100644 --- a/include/effects/SkStippleMaskFilter.h +++ b/include/effects/SkStippleMaskFilter.h @@ -28,7 +28,7 @@ public: return SkMask::kA8_Format; } - SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;) + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkStippleMaskFilter); protected: diff --git a/include/effects/SkTableMaskFilter.h b/include/effects/SkTableMaskFilter.h index 63b32b2bd3..d517db6994 100644 --- a/include/effects/SkTableMaskFilter.h +++ b/include/effects/SkTableMaskFilter.h @@ -49,7 +49,7 @@ public: virtual bool filterMask(SkMask*, const SkMask&, const SkMatrix&, SkIPoint*) const SK_OVERRIDE; - SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;) + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTableMaskFilter) protected: diff --git a/include/effects/SkTransparentShader.h b/include/effects/SkTransparentShader.h index 2b3f99814a..7428d442e3 100644 --- a/include/effects/SkTransparentShader.h +++ b/include/effects/SkTransparentShader.h @@ -21,7 +21,7 @@ public: virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; virtual void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTransparentShader) private: diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp index c1aca6398c..56fa022b22 100644 --- a/samplecode/SampleText.cpp +++ b/samplecode/SampleText.cpp @@ -49,7 +49,7 @@ public: 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); @@ -81,7 +81,7 @@ public: 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); @@ -146,7 +146,7 @@ public: typedef SkFlattenable* (*Factory)(SkReadBuffer&); - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPowerMode) private: @@ -196,7 +196,7 @@ void SkPowerMode::xfer16(uint16_t dst[], const SkPMColor src[], int count, } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkPowerMode::toString(SkString* str) const { str->append("SkPowerMode: exponent "); str->appendScalar(fExp); diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 10b57753f8..9ac621159c 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -1679,7 +1679,7 @@ void SkBitmap::validate() const { } #endif -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkBitmap::toString(SkString* str) const { static const char* gConfigNames[kConfigCount] = { diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp index 55a772ec10..9c2c77b950 100644 --- a/src/core/SkBitmapProcShader.cpp +++ b/src/core/SkBitmapProcShader.cpp @@ -333,7 +333,7 @@ SkShader* CreateBitmapShader(const SkBitmap& src, SkShader::TileMode tmx, /////////////////////////////////////////////////////////////////////////////// -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkBitmapProcShader::toString(SkString* str) const { static const char* gTileModeName[SkShader::kTileModeCount] = { "clamp", "repeat", "mirror" diff --git a/src/core/SkBitmapProcShader.h b/src/core/SkBitmapProcShader.h index 7a4ddb45ab..8e225a5e98 100644 --- a/src/core/SkBitmapProcShader.h +++ b/src/core/SkBitmapProcShader.h @@ -30,7 +30,7 @@ public: static bool CanDo(const SkBitmap&, TileMode tx, TileMode ty); - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapProcShader) #if SK_SUPPORT_GPU diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp index f925eaa7b2..4d70395e52 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -665,7 +665,7 @@ public: } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING virtual void toString(SkString* str) const SK_OVERRIDE { str->append("Sk3DShader: ("); diff --git a/src/core/SkComposeShader.cpp b/src/core/SkComposeShader.cpp index b5ea63c24c..f53eedf876 100644 --- a/src/core/SkComposeShader.cpp +++ b/src/core/SkComposeShader.cpp @@ -176,7 +176,7 @@ void SkComposeShader::shadeSpan(int x, int y, SkPMColor result[], int count) { } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkComposeShader::toString(SkString* str) const { str->append("SkComposeShader: ("); diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 05b06453db..024fa1bc6a 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -2363,7 +2363,7 @@ public: virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTriColorShader) protected: @@ -2436,7 +2436,7 @@ void SkTriColorShader::shadeSpan(int x, int y, SkPMColor dstC[], int count) { } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkTriColorShader::toString(SkString* str) const { str->append("SkTriColorShader: ("); diff --git a/src/core/SkFilterShader.cpp b/src/core/SkFilterShader.cpp index feea75b48b..58961913c8 100644 --- a/src/core/SkFilterShader.cpp +++ b/src/core/SkFilterShader.cpp @@ -87,7 +87,7 @@ void SkFilterShader::shadeSpan16(int x, int y, uint16_t result[], int count) { fFilter->filterSpan16(result, count, result); } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkFilterShader::toString(SkString* str) const { str->append("SkFilterShader: ("); diff --git a/src/core/SkFilterShader.h b/src/core/SkFilterShader.h index abb5165578..11add0cf17 100644 --- a/src/core/SkFilterShader.h +++ b/src/core/SkFilterShader.h @@ -24,7 +24,7 @@ public: virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; virtual void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkFilterShader) protected: diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp index 33af64a41f..a34866f003 100644 --- a/src/core/SkMatrix.cpp +++ b/src/core/SkMatrix.cpp @@ -1598,7 +1598,9 @@ void SkMatrix::dump() const { this->toString(&str); SkDebugf("%s\n", str.c_str()); } +#endif +#ifndef SK_IGNORE_TO_STRING void SkMatrix::toString(SkString* str) const { str->appendf("[%8.4f %8.4f %8.4f][%8.4f %8.4f %8.4f][%8.4f %8.4f %8.4f]", fMat[0], fMat[1], fMat[2], fMat[3], fMat[4], fMat[5], diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 6717397b37..47e9aa2571 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -2278,7 +2278,7 @@ const SkRect& SkPaint::doComputeFastBounds(const SkRect& origSrc, return *storage; } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkPaint::toString(SkString* str) const { str->append("<dl><dt>SkPaint:</dt><dd><dl>"); @@ -2448,7 +2448,6 @@ void SkPaint::toString(SkString* str) const { } #endif - /////////////////////////////////////////////////////////////////////////////// static bool has_thick_frame(const SkPaint& paint) { diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp index b06e0c26ff..31b208e2cc 100644 --- a/src/core/SkShader.cpp +++ b/src/core/SkShader.cpp @@ -179,7 +179,7 @@ SkShader* SkShader::CreateBitmapShader(const SkBitmap& src, return ::CreateBitmapShader(src, tmx, tmy, NULL); } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkShader::toString(SkString* str) const { if (this->hasLocalMatrix()) { str->append(" "); @@ -309,7 +309,7 @@ SkShader::GradientType SkColorShader::asAGradient(GradientInfo* info) const { return kColor_GradientType; } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkColorShader::toString(SkString* str) const { str->append("SkColorShader: ("); @@ -348,7 +348,7 @@ void SkEmptyShader::shadeSpanAlpha(int x, int y, uint8_t alpha[], int count) { SkDEBUGFAIL("should never get called, since setContext() returned false"); } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkEmptyShader::toString(SkString* str) const { str->append("SkEmptyShader: ("); diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index f5ac20b282..9b66a66f17 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -876,7 +876,7 @@ void SkProcXfermode::flatten(SkWriteBuffer& buffer) const { } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkProcXfermode::toString(SkString* str) const { str->appendf("SkProcXfermode: %p", fProc); } @@ -1413,7 +1413,7 @@ const char* SkXfermode::ModeName(Mode mode) { SK_COMPILE_ASSERT(SK_ARRAY_COUNT(gModeStrings) == kLastMode + 1, mode_count); } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkProcCoeffXfermode::toString(SkString* str) const { str->append("SkProcCoeffXfermode: "); @@ -1451,7 +1451,7 @@ public: virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; virtual void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkClearXfermode) private: @@ -1499,7 +1499,7 @@ void SkClearXfermode::xferA8(SkAlpha* SK_RESTRICT dst, } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkClearXfermode::toString(SkString* str) const { this->INHERITED::toString(str); } @@ -1516,7 +1516,7 @@ public: virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; virtual void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSrcXfermode) private: @@ -1569,7 +1569,7 @@ void SkSrcXfermode::xferA8(SkAlpha* SK_RESTRICT dst, } } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkSrcXfermode::toString(SkString* str) const { this->INHERITED::toString(str); } @@ -1585,7 +1585,7 @@ public: virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDstInXfermode) private: @@ -1615,7 +1615,7 @@ void SkDstInXfermode::xfer32(SkPMColor* SK_RESTRICT dst, } while (--count != 0); } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkDstInXfermode::toString(SkString* str) const { this->INHERITED::toString(str); } @@ -1631,7 +1631,7 @@ public: virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDstOutXfermode) private: @@ -1662,7 +1662,7 @@ void SkDstOutXfermode::xfer32(SkPMColor* SK_RESTRICT dst, } while (--count != 0); } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkDstOutXfermode::toString(SkString* str) const { this->INHERITED::toString(str); } diff --git a/src/core/SkXfermode_proccoeff.h b/src/core/SkXfermode_proccoeff.h index 11121115f1..b9e645c7cb 100644 --- a/src/core/SkXfermode_proccoeff.h +++ b/src/core/SkXfermode_proccoeff.h @@ -28,7 +28,7 @@ public: GrTexture* background) const SK_OVERRIDE; #endif - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcCoeffXfermode) protected: diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp index 9f43ed6c18..034ea37674 100644 --- a/src/effects/SkArithmeticMode.cpp +++ b/src/effects/SkArithmeticMode.cpp @@ -29,7 +29,7 @@ public: virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count, const SkAlpha aa[]) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkArithmeticMode_scalar) #if SK_SUPPORT_GPU @@ -173,7 +173,7 @@ void SkArithmeticMode_scalar::xfer32(SkPMColor dst[], const SkPMColor src[], } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkArithmeticMode_scalar::toString(SkString* str) const { str->append("SkArithmeticMode_scalar: "); for (int i = 0; i < 4; ++i) { diff --git a/src/effects/SkAvoidXfermode.cpp b/src/effects/SkAvoidXfermode.cpp index a3334926f5..ffe6a219ab 100644 --- a/src/effects/SkAvoidXfermode.cpp +++ b/src/effects/SkAvoidXfermode.cpp @@ -167,7 +167,7 @@ void SkAvoidXfermode::xferA8(SkAlpha dst[], const SkPMColor src[], int count, // override in subclass } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkAvoidXfermode::toString(SkString* str) const { str->append("SkAvoidXfermode: opColor: "); str->appendHex(fOpColor); diff --git a/src/effects/SkBlurDrawLooper.cpp b/src/effects/SkBlurDrawLooper.cpp index 0bbc184049..2caa62e5ad 100644 --- a/src/effects/SkBlurDrawLooper.cpp +++ b/src/effects/SkBlurDrawLooper.cpp @@ -138,7 +138,7 @@ bool SkBlurDrawLooper::BlurDrawLooperContext::next(SkCanvas* canvas, } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkBlurDrawLooper::toString(SkString* str) const { str->append("SkBlurDrawLooper: "); diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 63032dbc29..a5cdc4f703 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -59,7 +59,7 @@ public: virtual void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; - SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;) + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurMaskFilterImpl) protected: @@ -915,7 +915,7 @@ bool SkBlurMaskFilterImpl::filterMaskGPU(GrTexture* src, #endif // SK_SUPPORT_GPU -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkBlurMaskFilterImpl::toString(SkString* str) const { str->append("SkBlurMaskFilterImpl: ("); diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp index bd5ecacdce..a048abca6b 100644 --- a/src/effects/SkColorFilters.cpp +++ b/src/effects/SkColorFilters.cpp @@ -77,7 +77,7 @@ public: } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING virtual void toString(SkString* str) const SK_OVERRIDE { str->append("SkModeColorFilter: color: 0x"); str->appendHex(fColor); diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index 23be874b97..b60fa84b68 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -484,7 +484,7 @@ GrEffectRef* SkColorMatrixFilter::asNewEffect(GrContext*) const { #endif -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkColorMatrixFilter::toString(SkString* str) const { str->append("SkColorMatrixFilter: "); diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp index ab549ccac8..19725f1a2e 100644 --- a/src/effects/SkEmbossMaskFilter.cpp +++ b/src/effects/SkEmbossMaskFilter.cpp @@ -140,7 +140,7 @@ void SkEmbossMaskFilter::flatten(SkWriteBuffer& buffer) const { buffer.writeScalar(fBlurSigma); } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkEmbossMaskFilter::toString(SkString* str) const { str->append("SkEmbossMaskFilter: ("); diff --git a/src/effects/SkKernel33MaskFilter.cpp b/src/effects/SkKernel33MaskFilter.cpp index 353661de25..438e81b031 100644 --- a/src/effects/SkKernel33MaskFilter.cpp +++ b/src/effects/SkKernel33MaskFilter.cpp @@ -86,7 +86,7 @@ SkKernel33ProcMaskFilter::SkKernel33ProcMaskFilter(SkReadBuffer& rb) fPercent256 = rb.readInt(); } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkKernel33ProcMaskFilter::toString(SkString* str) const { str->appendf("percent256: %d, ", fPercent256); } @@ -126,7 +126,7 @@ SkKernel33MaskFilter::SkKernel33MaskFilter(SkReadBuffer& rb) fShift = rb.readInt(); } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkKernel33MaskFilter::toString(SkString* str) const { str->append("SkKernel33MaskFilter: ("); diff --git a/src/effects/SkLayerDrawLooper.cpp b/src/effects/SkLayerDrawLooper.cpp index 6d31c23a06..962ca293d8 100644 --- a/src/effects/SkLayerDrawLooper.cpp +++ b/src/effects/SkLayerDrawLooper.cpp @@ -257,7 +257,7 @@ SkFlattenable* SkLayerDrawLooper::CreateProc(SkReadBuffer& buffer) { return looper; } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkLayerDrawLooper::toString(SkString* str) const { str->appendf("SkLayerDrawLooper (%d): ", fCount); diff --git a/src/effects/SkLerpXfermode.cpp b/src/effects/SkLerpXfermode.cpp index 505ada0b9a..c8389fea79 100644 --- a/src/effects/SkLerpXfermode.cpp +++ b/src/effects/SkLerpXfermode.cpp @@ -104,7 +104,7 @@ void SkLerpXfermode::xferA8(SkAlpha dst[], const SkPMColor src[], int count, } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkLerpXfermode::toString(SkString* str) const { str->printf("SkLerpXfermode: scale: %g", fScale256 / 256.0); } diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp index 669af67026..ae8b905645 100644 --- a/src/effects/SkLumaColorFilter.cpp +++ b/src/effects/SkLumaColorFilter.cpp @@ -51,7 +51,7 @@ SkLumaColorFilter::SkLumaColorFilter(SkReadBuffer& buffer) void SkLumaColorFilter::flatten(SkWriteBuffer&) const { } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkLumaColorFilter::toString(SkString* str) const { str->append("SkLumaColorFilter "); } diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index e28227db09..8abbdbd16b 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -1322,7 +1322,7 @@ GrEffectRef* SkPerlinNoiseShader::asNewEffect(GrContext*, const SkPaint&) const #endif -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkPerlinNoiseShader::toString(SkString* str) const { str->append("SkPerlinNoiseShader: ("); diff --git a/src/effects/SkPixelXorXfermode.cpp b/src/effects/SkPixelXorXfermode.cpp index eaf7757453..129f1823d5 100644 --- a/src/effects/SkPixelXorXfermode.cpp +++ b/src/effects/SkPixelXorXfermode.cpp @@ -31,7 +31,7 @@ SkPixelXorXfermode::SkPixelXorXfermode(SkReadBuffer& rb) fOpColor = rb.readColor(); } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkPixelXorXfermode::toString(SkString* str) const { str->append("SkPixelXorXfermode: "); str->appendHex(fOpColor); diff --git a/src/effects/SkStippleMaskFilter.cpp b/src/effects/SkStippleMaskFilter.cpp index 14f30ec651..4aceb11066 100644 --- a/src/effects/SkStippleMaskFilter.cpp +++ b/src/effects/SkStippleMaskFilter.cpp @@ -45,7 +45,7 @@ bool SkStippleMaskFilter::filterMask(SkMask* dst, return true; } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkStippleMaskFilter::toString(SkString* str) const { str->append("SkStippleMaskFilter: ()"); } diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index eb3dbc3587..6a9ab10795 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -49,7 +49,7 @@ public: virtual void filterSpan(const SkPMColor src[], int count, SkPMColor dst[]) const SK_OVERRIDE; - SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;) + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTable_ColorFilter) @@ -152,7 +152,7 @@ void SkTable_ColorFilter::filterSpan(const SkPMColor src[], int count, } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkTable_ColorFilter::toString(SkString* str) const { str->append("SkTable_ColorFilter"); } diff --git a/src/effects/SkTableMaskFilter.cpp b/src/effects/SkTableMaskFilter.cpp index 27280d3364..602302e503 100644 --- a/src/effects/SkTableMaskFilter.cpp +++ b/src/effects/SkTableMaskFilter.cpp @@ -129,7 +129,7 @@ void SkTableMaskFilter::MakeClipTable(uint8_t table[256], uint8_t min, #endif } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkTableMaskFilter::toString(SkString* str) const { str->append("SkTableMaskFilter: ("); diff --git a/src/effects/SkTransparentShader.cpp b/src/effects/SkTransparentShader.cpp index 9de4a0cc23..b6a5e1edea 100644 --- a/src/effects/SkTransparentShader.cpp +++ b/src/effects/SkTransparentShader.cpp @@ -106,7 +106,7 @@ void SkTransparentShader::shadeSpan16(int x, int y, uint16_t span[], int count) } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkTransparentShader::toString(SkString* str) const { str->append("SkTransparentShader: ("); diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index 5b0b9c763d..cd448b9cb8 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -654,7 +654,7 @@ void SkGradientShaderBase::commonAsAGradient(GradientInfo* info) const { } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkGradientShaderBase::toString(SkString* str) const { str->appendf("%d colors: ", fColorCount); diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index 184ef8e883..83e0789853 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -132,7 +132,7 @@ public: protected: SkGradientShaderBase(SkReadBuffer& ); virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SkUnitMapper* fMapper; SkMatrix fPtsToUnit; // set by subclass diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index bd66f7ca84..b24a6349c7 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -556,7 +556,7 @@ GrEffectRef* SkLinearGradient::asNewEffect(GrContext*, const SkPaint&) const { #endif -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkLinearGradient::toString(SkString* str) const { str->append("SkLinearGradient ("); diff --git a/src/effects/gradients/SkLinearGradient.h b/src/effects/gradients/SkLinearGradient.h index ed0c70b755..013c4499b0 100644 --- a/src/effects/gradients/SkLinearGradient.h +++ b/src/effects/gradients/SkLinearGradient.h @@ -22,7 +22,7 @@ public: virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; virtual GrEffectRef* asNewEffect(GrContext* context, const SkPaint&) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLinearGradient) protected: diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index efa82f49bf..1b9e7258c4 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -563,7 +563,7 @@ GrEffectRef* SkRadialGradient::asNewEffect(GrContext*, const SkPaint&) const { #endif -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkRadialGradient::toString(SkString* str) const { str->append("SkRadialGradient: ("); diff --git a/src/effects/gradients/SkRadialGradient.h b/src/effects/gradients/SkRadialGradient.h index 4ff3951b90..4a725145b0 100644 --- a/src/effects/gradients/SkRadialGradient.h +++ b/src/effects/gradients/SkRadialGradient.h @@ -24,7 +24,7 @@ public: virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; virtual GrEffectRef* asNewEffect(GrContext* context, const SkPaint&) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRadialGradient) protected: diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index cb9d2763d5..7024945bf0 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -285,7 +285,7 @@ GrEffectRef* SkSweepGradient::asNewEffect(GrContext*, const SkPaint&) const { #endif -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkSweepGradient::toString(SkString* str) const { str->append("SkSweepGradient: ("); diff --git a/src/effects/gradients/SkSweepGradient.h b/src/effects/gradients/SkSweepGradient.h index 18d5ddc0ef..ca19da25ba 100644 --- a/src/effects/gradients/SkSweepGradient.h +++ b/src/effects/gradients/SkSweepGradient.h @@ -25,7 +25,7 @@ public: virtual GrEffectRef* asNewEffect(GrContext* context, const SkPaint&) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSweepGradient) protected: diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index 6a503d2fb7..434339cde7 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -710,7 +710,7 @@ GrEffectRef* SkTwoPointConicalGradient::asNewEffect(GrContext*, const SkPaint&) #endif -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkTwoPointConicalGradient::toString(SkString* str) const { str->append("SkTwoPointConicalGradient: ("); diff --git a/src/effects/gradients/SkTwoPointConicalGradient.h b/src/effects/gradients/SkTwoPointConicalGradient.h index 20a3da8b2e..dd77299c7d 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.h +++ b/src/effects/gradients/SkTwoPointConicalGradient.h @@ -66,7 +66,7 @@ public: SkScalar getStartRadius() const { return fRadius1; } SkScalar getDiffRadius() const { return fRadius2 - fRadius1; } - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTwoPointConicalGradient) protected: diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp index 103e7d41c9..e1359b12dd 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.cpp +++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp @@ -307,7 +307,7 @@ bool SkTwoPointRadialGradient::setContext( const SkBitmap& device, return true; } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkTwoPointRadialGradient::toString(SkString* str) const { str->append("SkTwoPointRadialGradient: ("); diff --git a/src/effects/gradients/SkTwoPointRadialGradient.h b/src/effects/gradients/SkTwoPointRadialGradient.h index e050804b46..ee1b49ee95 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.h +++ b/src/effects/gradients/SkTwoPointRadialGradient.h @@ -33,7 +33,7 @@ public: SkScalar getStartRadius() const { return fStartRadius; } SkScalar getDiffRadius() const { return fDiffRadius; } - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTwoPointRadialGradient) protected: diff --git a/src/opts/SkXfermode_opts_arm_neon.cpp b/src/opts/SkXfermode_opts_arm_neon.cpp index da14e6631d..17a82f554b 100644 --- a/src/opts/SkXfermode_opts_arm_neon.cpp +++ b/src/opts/SkXfermode_opts_arm_neon.cpp @@ -835,7 +835,7 @@ void SkNEONProcCoeffXfermode::xfer16(uint16_t* SK_RESTRICT dst, } } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING void SkNEONProcCoeffXfermode::toString(SkString* str) const { this->INHERITED::toString(str); } diff --git a/src/opts/SkXfermode_opts_arm_neon.h b/src/opts/SkXfermode_opts_arm_neon.h index d87748464d..8f3aaaea9d 100644 --- a/src/opts/SkXfermode_opts_arm_neon.h +++ b/src/opts/SkXfermode_opts_arm_neon.h @@ -14,7 +14,7 @@ public: virtual void xfer16(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src, int count, const SkAlpha* SK_RESTRICT aa) const SK_OVERRIDE; - SK_DEVELOPER_TO_STRING() + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkNEONProcCoeffXfermode) private: diff --git a/src/utils/debugger/SkObjectParser.cpp b/src/utils/debugger/SkObjectParser.cpp index ebbd40018e..028300c5a5 100644 --- a/src/utils/debugger/SkObjectParser.cpp +++ b/src/utils/debugger/SkObjectParser.cpp @@ -94,7 +94,7 @@ SkString* SkObjectParser::IRectToString(const SkIRect& rect) { SkString* SkObjectParser::MatrixToString(const SkMatrix& matrix) { SkString* str = new SkString("SkMatrix: "); -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING matrix.toString(str); #endif return str; @@ -102,7 +102,7 @@ SkString* SkObjectParser::MatrixToString(const SkMatrix& matrix) { SkString* SkObjectParser::PaintToString(const SkPaint& paint) { SkString* str = new SkString; -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING paint.toString(str); #endif return str; diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp index ef145525e9..8f4357e0b0 100644 --- a/tests/QuickRejectTest.cpp +++ b/tests/QuickRejectTest.cpp @@ -22,7 +22,7 @@ public: virtual size_t contextSize() const SK_OVERRIDE { return sizeof(TestDrawLooperContext); } -#ifdef SK_DEVELOPER +#ifndef SK_IGNORE_TO_STRING virtual void toString(SkString* str) const SK_OVERRIDE { str->append("TestLooper:"); } |