diff options
author | robertphillips <robertphillips@google.com> | 2014-12-19 13:49:15 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-19 13:49:15 -0800 |
commit | f3f5bad7ded35265c0b5d042cc4174386b197a33 (patch) | |
tree | b8197317dd26d7e5b65f1559446c8d39e8be1457 /src/effects | |
parent | 290c09b8bbd8d221d363150e2ce87158f4668df0 (diff) |
Add toString methods to SkImageFilter-derived classes
This isn't definitive but at least makes something show up in the debugger.
Review URL: https://codereview.chromium.org/789163006
Diffstat (limited to 'src/effects')
21 files changed, 285 insertions, 2 deletions
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index 890cb71b51..791d1fee1c 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -16,6 +16,7 @@ public: SkAlphaThresholdFilterImpl(const SkRegion& region, SkScalar innerThreshold, SkScalar outerThreshold, SkImageFilter* input); + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkAlphaThresholdFilterImpl) protected: @@ -374,3 +375,12 @@ bool SkAlphaThresholdFilterImpl::onFilterImage(Proxy*, const SkBitmap& src, return true; } + +#ifndef SK_IGNORE_TO_STRING +void SkAlphaThresholdFilterImpl::toString(SkString* str) const { + str->appendf("SkAlphaThresholdImageFilter: ("); + str->appendf("inner: %f outer: %f", fInnerThreshold, fOuterThreshold); + str->append(")"); +} +#endif + diff --git a/src/effects/SkBitmapSource.cpp b/src/effects/SkBitmapSource.cpp index ff76ab4bba..fc86f194b0 100644 --- a/src/effects/SkBitmapSource.cpp +++ b/src/effects/SkBitmapSource.cpp @@ -83,3 +83,15 @@ bool SkBitmapSource::onFilterImage(Proxy* proxy, const SkBitmap&, const Context& void SkBitmapSource::computeFastBounds(const SkRect&, SkRect* dst) const { *dst = fDstRect; } + +#ifndef SK_IGNORE_TO_STRING +void SkBitmapSource::toString(SkString* str) const { + str->appendf("SkBitmapSource: ("); + str->appendf("src: (%f,%f,%f,%f) dst: (%f,%f,%f,%f) ", + fSrcRect.fLeft, fSrcRect.fTop, fSrcRect.fRight, fSrcRect.fBottom, + fDstRect.fLeft, fDstRect.fTop, fDstRect.fRight, fDstRect.fBottom); + str->appendf("bitmap: (%d,%d)", + fBitmap.width(), fBitmap.height()); + str->append(")"); +} +#endif diff --git a/src/effects/SkBlurImageFilter.cpp b/src/effects/SkBlurImageFilter.cpp index e5bb8c1e74..e9d24822c6 100644 --- a/src/effects/SkBlurImageFilter.cpp +++ b/src/effects/SkBlurImageFilter.cpp @@ -287,3 +287,11 @@ bool SkBlurImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const return false; #endif } + +#ifndef SK_IGNORE_TO_STRING +void SkBlurImageFilter::toString(SkString* str) const { + str->appendf("SkBlurImageFilter: ("); + str->appendf("sigma: (%f, %f)", fSigma.fWidth, fSigma.fHeight); + str->append(")"); +} +#endif diff --git a/src/effects/SkColorFilterImageFilter.cpp b/src/effects/SkColorFilterImageFilter.cpp index 10976d77f0..571d69ce77 100755 --- a/src/effects/SkColorFilterImageFilter.cpp +++ b/src/effects/SkColorFilterImageFilter.cpp @@ -141,3 +141,14 @@ bool SkColorFilterImageFilter::asColorFilter(SkColorFilter** filter) const { } return false; } + +#ifndef SK_IGNORE_TO_STRING +void SkColorFilterImageFilter::toString(SkString* str) const { + str->appendf("SkColorFilterImageFilter: ("); + + str->appendf("color filter: "); + fColorFilter->toString(str); + + str->append(")"); +} +#endif diff --git a/src/effects/SkComposeImageFilter.cpp b/src/effects/SkComposeImageFilter.cpp index 9bec500976..4a17e152de 100644 --- a/src/effects/SkComposeImageFilter.cpp +++ b/src/effects/SkComposeImageFilter.cpp @@ -40,3 +40,20 @@ SkFlattenable* SkComposeImageFilter::CreateProc(SkReadBuffer& buffer) { SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2); return SkComposeImageFilter::Create(common.getInput(0), common.getInput(1)); } + +#ifndef SK_IGNORE_TO_STRING +void SkComposeImageFilter::toString(SkString* str) const { + SkImageFilter* outer = getInput(0); + SkImageFilter* inner = getInput(1); + + str->appendf("SkComposeImageFilter: ("); + + str->appendf("outer: "); + outer->toString(str); + + str->appendf("inner: "); + inner->toString(str); + + str->appendf(")"); +} +#endif diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index b1f6a97e71..2c7f5ee8ce 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -281,6 +281,22 @@ bool SkDisplacementMapEffect::onFilterBounds(const SkIRect& src, const SkMatrix& return true; } +#ifndef SK_IGNORE_TO_STRING +void SkDisplacementMapEffect::toString(SkString* str) const { + str->appendf("SkDisplacementMapEffect: ("); + str->appendf("scale: %f ", fScale); + str->appendf("displacement: ("); + if (this->getDisplacementInput()) { + this->getDisplacementInput()->toString(str); + } + str->appendf(") color: ("); + if (this->getColorInput()) { + this->getColorInput()->toString(str); + } + str->appendf("))"); +} +#endif + /////////////////////////////////////////////////////////////////////////////// #if SK_SUPPORT_GPU @@ -620,3 +636,4 @@ void GrGLDisplacementMapEffect::GenKey(const GrProcessor& proc, b->add32(xKey | yKey); } #endif + diff --git a/src/effects/SkDropShadowImageFilter.cpp b/src/effects/SkDropShadowImageFilter.cpp index 5bbb958e9c..22bee9dade 100644 --- a/src/effects/SkDropShadowImageFilter.cpp +++ b/src/effects/SkDropShadowImageFilter.cpp @@ -136,3 +136,27 @@ bool SkDropShadowImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& *dst = bounds; return true; } + +#ifndef SK_IGNORE_TO_STRING +void SkDropShadowImageFilter::toString(SkString* str) const { + str->appendf("SkDropShadowImageFilter: ("); + + str->appendf("dX: %f ", fDx); + str->appendf("dY: %f ", fDy); + str->appendf("sigmaX: %f ", fSigmaX); + str->appendf("sigmaY: %f ", fSigmaY); + + str->append("Color: "); + str->appendHex(fColor); + + static const char* gModeStrings[] = { + "kDrawShadowAndForeground", "kDrawShadowOnly" + }; + + SK_COMPILE_ASSERT(kShadowModeCount == SK_ARRAY_COUNT(gModeStrings), enum_mismatch); + + str->appendf(" mode: %s", gModeStrings[fShadowMode]); + + str->append(")"); +} +#endif diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 8acd7fd97d..b1271d8493 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -282,6 +282,7 @@ public: static SkImageFilter* Create(SkLight* light, SkScalar surfaceScale, SkScalar kd, SkImageFilter*, const CropRect*, uint32_t uniqueID = 0); + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiffuseLightingImageFilter) SkScalar kd() const { return fKD; } @@ -309,6 +310,7 @@ public: SkScalar ks, SkScalar shininess, SkImageFilter*, const CropRect*, uint32_t uniqueID = 0); + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSpecularLightingImageFilter) SkScalar ks() const { return fKS; } @@ -1035,6 +1037,14 @@ bool SkDiffuseLightingImageFilter::onFilterImage(Proxy* proxy, return true; } +#ifndef SK_IGNORE_TO_STRING +void SkDiffuseLightingImageFilter::toString(SkString* str) const { + str->appendf("SkDiffuseLightingImageFilter: ("); + str->appendf("kD: %f\n", fKD); + str->append(")"); +} +#endif + #if SK_SUPPORT_GPU bool SkDiffuseLightingImageFilter::asFragmentProcessor(GrFragmentProcessor** fp, GrTexture* texture, @@ -1142,6 +1152,14 @@ bool SkSpecularLightingImageFilter::onFilterImage(Proxy* proxy, return true; } +#ifndef SK_IGNORE_TO_STRING +void SkSpecularLightingImageFilter::toString(SkString* str) const { + str->appendf("SkSpecularLightingImageFilter: ("); + str->appendf("kS: %f shininess: %f", fKS, fShininess); + str->append(")"); +} +#endif + #if SK_SUPPORT_GPU bool SkSpecularLightingImageFilter::asFragmentProcessor(GrFragmentProcessor** fp, GrTexture* texture, diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index ae6637b282..e236da53ff 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -357,3 +357,13 @@ bool SkMagnifierImageFilter::onFilterImage(Proxy*, const SkBitmap& src, } return true; } + +#ifndef SK_IGNORE_TO_STRING +void SkMagnifierImageFilter::toString(SkString* str) const { + str->appendf("SkMagnifierImageFilter: ("); + str->appendf("src: (%f,%f,%f,%f) ", + fSrcRect.fLeft, fSrcRect.fTop, fSrcRect.fRight, fSrcRect.fBottom); + str->appendf("inset: %f", fInset); + str->append(")"); +} +#endif diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp index 045f6a96d5..e9dd87852f 100644 --- a/src/effects/SkMatrixConvolutionImageFilter.cpp +++ b/src/effects/SkMatrixConvolutionImageFilter.cpp @@ -369,3 +369,20 @@ bool SkMatrixConvolutionImageFilter::asFragmentProcessor(GrFragmentProcessor** f return true; } #endif + +#ifndef SK_IGNORE_TO_STRING +void SkMatrixConvolutionImageFilter::toString(SkString* str) const { + str->appendf("SkMatrixConvolutionImageFilter: ("); + str->appendf("size: (%d,%d) kernel: (", fKernelSize.width(), fKernelSize.height()); + for (int y = 0; y < fKernelSize.height(); y++) { + for (int x = 0; x < fKernelSize.width(); x++) { + str->appendf("%f ", fKernel[y * fKernelSize.width() + x]); + } + } + str->appendf(")"); + str->appendf("gain: %f bias: %f ", fGain, fBias); + str->appendf("offset: (%d, %d) ", fKernelOffset.fX, fKernelOffset.fY); + str->appendf("convolveAlpha: %s", fConvolveAlpha ? "true" : "false"); + str->append(")"); +} +#endif diff --git a/src/effects/SkMatrixImageFilter.cpp b/src/effects/SkMatrixImageFilter.cpp index f2c403f443..4d9b1fa335 100644 --- a/src/effects/SkMatrixImageFilter.cpp +++ b/src/effects/SkMatrixImageFilter.cpp @@ -124,3 +124,27 @@ bool SkMatrixImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm *dst = bounds; return true; } + +#ifndef SK_IGNORE_TO_STRING +void SkMatrixImageFilter::toString(SkString* str) const { + str->appendf("SkMatrixImageFilter: ("); + + str->appendf("transform: (%f %f %f %f %f %f %f %f %f)", + fTransform[SkMatrix::kMScaleX], + fTransform[SkMatrix::kMSkewX], + fTransform[SkMatrix::kMTransX], + fTransform[SkMatrix::kMSkewY], + fTransform[SkMatrix::kMScaleY], + fTransform[SkMatrix::kMTransY], + fTransform[SkMatrix::kMPersp0], + fTransform[SkMatrix::kMPersp1], + fTransform[SkMatrix::kMPersp2]); + + str->append("<dt>FilterLevel:</dt><dd>"); + static const char* gFilterLevelStrings[] = { "None", "Low", "Medium", "High" }; + str->append(gFilterLevelStrings[fFilterLevel]); + str->append("</dd>"); + + str->appendf(")"); +} +#endif diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp index d932d3ccce..7034e158e5 100755 --- a/src/effects/SkMergeImageFilter.cpp +++ b/src/effects/SkMergeImageFilter.cpp @@ -140,3 +140,18 @@ void SkMergeImageFilter::flatten(SkWriteBuffer& buffer) const { buffer.writeByteArray(fModes, countInputs() * sizeof(fModes[0])); } } + +#ifndef SK_IGNORE_TO_STRING +void SkMergeImageFilter::toString(SkString* str) const { + str->appendf("SkMergeImageFilter: ("); + + for (int i = 0; i < this->countInputs(); ++i) { + SkImageFilter* filter = this->getInput(i); + str->appendf("%d: (", i); + filter->toString(str); + str->appendf(")"); + } + + str->append(")"); +} +#endif diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index d533448fe0..d18dc394eb 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -264,6 +264,22 @@ SkFlattenable* SkDilateImageFilter::CreateProc(SkReadBuffer& buffer) { return Create(width, height, common.getInput(0), &common.cropRect(), common.uniqueID()); } +#ifndef SK_IGNORE_TO_STRING +void SkErodeImageFilter::toString(SkString* str) const { + str->appendf("SkErodeImageFilter: ("); + str->appendf("radius: (%d,%d)", this->radius().fWidth, this->radius().fHeight); + str->append(")"); +} +#endif + +#ifndef SK_IGNORE_TO_STRING +void SkDilateImageFilter::toString(SkString* str) const { + str->appendf("SkDilateImageFilter: ("); + str->appendf("radius: (%d,%d)", this->radius().fWidth, this->radius().fHeight); + str->append(")"); +} +#endif + #if SK_SUPPORT_GPU /////////////////////////////////////////////////////////////////////////////// diff --git a/src/effects/SkOffsetImageFilter.cpp b/src/effects/SkOffsetImageFilter.cpp index b7ded082d9..8a17ce34ec 100644 --- a/src/effects/SkOffsetImageFilter.cpp +++ b/src/effects/SkOffsetImageFilter.cpp @@ -108,3 +108,15 @@ SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter : INHERITED(1, &input, cropRect, uniqueID) { fOffset.set(dx, dy); } + +#ifndef SK_IGNORE_TO_STRING +void SkOffsetImageFilter::toString(SkString* str) const { + str->appendf("SkOffsetImageFilter: ("); + str->appendf("offset: (%f, %f) ", fOffset.fX, fOffset.fY); + str->append("input: ("); + if (this->getInput(0)) { + this->getInput(0)->toString(str); + } + str->append("))"); +} +#endif diff --git a/src/effects/SkPictureImageFilter.cpp b/src/effects/SkPictureImageFilter.cpp index 8075f365d0..37d86ce0d2 100644 --- a/src/effects/SkPictureImageFilter.cpp +++ b/src/effects/SkPictureImageFilter.cpp @@ -167,3 +167,17 @@ void SkPictureImageFilter::drawPictureAtLocalResolution(Proxy* proxy, SkBaseDevi SkIntToScalar(localIBounds.fTop), &paint); //canvas.drawPicture(fPicture); } + +#ifndef SK_IGNORE_TO_STRING +void SkPictureImageFilter::toString(SkString* str) const { + str->appendf("SkPictureImageFilter: ("); + str->appendf("crop: (%f,%f,%f,%f) ", + fCropRect.fLeft, fCropRect.fTop, fCropRect.fRight, fCropRect.fBottom); + if (fPicture) { + str->appendf("picture: (%f,%f,%f,%f)", + fPicture->cullRect().fLeft, fPicture->cullRect().fTop, + fPicture->cullRect().fRight, fPicture->cullRect().fBottom); + } + str->append(")"); +} +#endif diff --git a/src/effects/SkRectShaderImageFilter.cpp b/src/effects/SkRectShaderImageFilter.cpp index 91a127e0e3..a00994e75b 100644 --- a/src/effects/SkRectShaderImageFilter.cpp +++ b/src/effects/SkRectShaderImageFilter.cpp @@ -79,3 +79,10 @@ bool SkRectShaderImageFilter::onFilterImage(Proxy* proxy, offset->fY = bounds.fTop; return true; } + +#ifndef SK_IGNORE_TO_STRING +void SkRectShaderImageFilter::toString(SkString* str) const { + str->appendf("SkRectShaderImageFilter: ("); + str->append(")"); +} +#endif diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 942bae7d06..e12b3d78ec 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -155,7 +155,32 @@ void SkTable_ColorFilter::filterSpan(const SkPMColor src[], int count, #ifndef SK_IGNORE_TO_STRING void SkTable_ColorFilter::toString(SkString* str) const { - str->append("SkTable_ColorFilter"); + const uint8_t* table = fStorage; + const uint8_t* tableA = gIdentityTable; + const uint8_t* tableR = gIdentityTable; + const uint8_t* tableG = gIdentityTable; + const uint8_t* tableB = gIdentityTable; + if (fFlags & kA_Flag) { + tableA = table; table += 256; + } + if (fFlags & kR_Flag) { + tableR = table; table += 256; + } + if (fFlags & kG_Flag) { + tableG = table; table += 256; + } + if (fFlags & kB_Flag) { + tableB = table; + } + + str->append("SkTable_ColorFilter ("); + + for (int i = 0; i < 256; ++i) { + str->appendf("%d: %d,%d,%d,%d\n", + i, tableR[i], tableG[i], tableB[i], tableA[i]); + } + + str->append(")"); } #endif diff --git a/src/effects/SkTestImageFilters.cpp b/src/effects/SkTestImageFilters.cpp index be991f6f83..f0f8ae0390 100755 --- a/src/effects/SkTestImageFilters.cpp +++ b/src/effects/SkTestImageFilters.cpp @@ -80,3 +80,10 @@ void SkDownSampleImageFilter::flatten(SkWriteBuffer& buffer) const { this->INHERITED::flatten(buffer); buffer.writeScalar(fScale); } + +#ifndef SK_IGNORE_TO_STRING +void SkDownSampleImageFilter::toString(SkString* str) const { + str->appendf("SkDownSampleImageFilter: ("); + str->append(")"); +} +#endif diff --git a/src/effects/SkTileImageFilter.cpp b/src/effects/SkTileImageFilter.cpp index d640ac7adb..669c234d95 100644 --- a/src/effects/SkTileImageFilter.cpp +++ b/src/effects/SkTileImageFilter.cpp @@ -106,3 +106,10 @@ void SkTileImageFilter::flatten(SkWriteBuffer& buffer) const { buffer.writeRect(fSrcRect); buffer.writeRect(fDstRect); } + +#ifndef SK_IGNORE_TO_STRING +void SkTileImageFilter::toString(SkString* str) const { + str->appendf("SkTileImageFilter: ("); + str->append(")"); +} +#endif diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp index 00e9ed639b..617593eae6 100644 --- a/src/effects/SkXfermodeImageFilter.cpp +++ b/src/effects/SkXfermodeImageFilter.cpp @@ -98,6 +98,17 @@ bool SkXfermodeImageFilter::onFilterImage(Proxy* proxy, return true; } +#ifndef SK_IGNORE_TO_STRING +void SkXfermodeImageFilter::toString(SkString* str) const { + str->appendf("SkXfermodeImageFilter: ("); + str->appendf("xfermode: ("); + if (fMode) { + fMode->toString(str); + } + str->append("))"); +} +#endif + #if SK_SUPPORT_GPU bool SkXfermodeImageFilter::canFilterImageGPU() const { @@ -165,3 +176,4 @@ bool SkXfermodeImageFilter::filterImageGPU(Proxy* proxy, } #endif + diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index 3b73eae6aa..d50afb7638 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -704,7 +704,7 @@ void SkGradientShaderBase::toString(SkString* str) const { str->appendf("%d colors: ", fColorCount); for (int i = 0; i < fColorCount; ++i) { - str->appendHex(fOrigColors[i]); + str->appendHex(fOrigColors[i], 8); if (i < fColorCount-1) { str->append(", "); } |