AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add printing of SkColorFilter-derived classes to debugger

Browse Source 
https://codereview.chromium.org/15697012/



git-svn-id: http://skia.googlecode.com/svn/trunk@9255 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2013-05-23 14:00:17 +00:00
parent 37add6b3f6
commit 1202c2ac56
6 changed files with 88 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/SkColorFilter.h
View File

@ -120,6 +120,8 @@ public:
*/
virtual GrEffectRef* asNewEffect(GrContext*) const;
SkDEVCODE(virtual void toString(SkString* str) const = 0;)
SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
protected:
SkColorFilter() {}

2
include/effects/SkColorMatrixFilter.h
View File

@ -30,6 +30,8 @@ public:
int fShift;
};
SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;)
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorMatrixFilter)
protected:

9
src/core/SkPaint.cpp
View File

@ -2308,27 +2308,28 @@ void SkPaint::toString(SkString* str) const {
SkShader* shader = this->getShader();
if (NULL != shader) {
str->append("<dt>Shader:</dt><dd>");
SkDEVCODE(shader->toString(str);)
shader->toString(str);
str->append("</dd>");
}
SkXfermode* xfer = this->getXfermode();
if (NULL != xfer) {
str->append("<dt>Xfermode:</dt><dd>");
SkDEVCODE(xfer->toString(str);)
xfer->toString(str);
str->append("</dd>");
}
SkMaskFilter* maskFilter = this->getMaskFilter();
if (NULL != maskFilter) {
str->append("<dt>MaskFilter:</dt><dd>");
SkDEVCODE(maskFilter->toString(str);)
maskFilter->toString(str);
str->append("</dd>");
}
SkColorFilter* colorFilter = this->getColorFilter();
if (NULL != colorFilter) {
str->append("<dt>ColorFilter:</dt><dd>");
colorFilter->toString(str);
str->append("</dd>");
}
@ -2341,7 +2342,7 @@ void SkPaint::toString(SkString* str) const {
SkDrawLooper* looper = this->getLooper();
if (NULL != looper) {
str->append("<dt>DrawLooper:</dt><dd>");
SkDEVCODE(looper->toString(str);)
looper->toString(str);
str->append("</dd>");
}

55
src/effects/SkColorFilters.cpp
View File

@ -12,6 +12,7 @@
#include "SkColorPriv.h"
#include "SkFlattenableBuffers.h"
#include "SkUtils.h"
#include "SkString.h"
#define ILLEGAL_XFERMODE_MODE ((SkXfermode::Mode)-1)
@ -75,6 +76,15 @@ public:
}
}
#ifdef SK_DEVELOPER
virtual void toString(SkString* str) const SK_OVERRIDE {
str->append("SkModeColorFilter: color: 0x");
str->appendHex(fColor);
str->append(" mode: ");
str->append(SkXfermode::ModeName(fMode));
}
#endif
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkModeColorFilter)
protected:
@ -260,6 +270,15 @@ public:
}
}
#ifdef SK_DEVELOPER
virtual void toString(SkString* str) const SK_OVERRIDE {
str->append("SkLightingColorFilter: mul: 0x");
str->appendHex(fMul);
str->append(" add: 0x");
str->appendHex(fAdd);
}
#endif
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLightingColorFilter)
protected:
@ -305,6 +324,13 @@ public:
}
}
#ifdef SK_DEVELOPER
virtual void toString(SkString* str) const SK_OVERRIDE {
str->append("SkLightingColorFilter_JustAdd: add: 0x");
str->appendHex(fAdd);
}
#endif
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLightingColorFilter_JustAdd)
protected:
@ -339,6 +365,13 @@ public:
}
}
#ifdef SK_DEVELOPER
virtual void toString(SkString* str) const SK_OVERRIDE {
str->append("SkLightingColorFilter_JustMul: mul: 0x");
str->appendHex(fMul);
}
#endif
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLightingColorFilter_JustMul)
protected:
@ -376,6 +409,13 @@ public:
}
}
#ifdef SK_DEVELOPER
virtual void toString(SkString* str) const SK_OVERRIDE {
str->append("SkLightingColorFilter_SingleMul: mul: 0x");
str->appendHex(fMul);
}
#endif
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLightingColorFilter_SingleMul)
protected:
@ -415,6 +455,15 @@ public:
}
}
#ifdef SK_DEVELOPER
virtual void toString(SkString* str) const SK_OVERRIDE {
str->append("SkLightingColorFilter_NoPin: mul: 0x");
str->appendHex(fMul);
str->append(" add: 0x");
str->appendHex(fAdd);
}
#endif
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLightingColorFilter_NoPin)
protected:
@ -433,6 +482,12 @@ public:
return SkNEW(SkSimpleColorFilter);
}
#ifdef SK_DEVELOPER
virtual void toString(SkString* str) const SK_OVERRIDE {
str->append("SkSimpleColorFilter");
}
#endif
protected:
void filterSpan(const SkPMColor src[], int count, SkPMColor
result[]) const SK_OVERRIDE {

15
src/effects/SkColorMatrixFilter.cpp
View File

@ -477,3 +477,18 @@ GrEffectRef* SkColorMatrixFilter::asNewEffect(GrContext*) const {
}
#endif
#ifdef SK_DEVELOPER
void SkColorMatrixFilter::toString(SkString* str) const {
str->append("SkColorMatrixFilter: ");
str->append("matrix: (");
for (int i = 0; i < 20; ++i) {
str->appendScalar(fMatrix.fMat[i]);
if (i < 19) {
str->append(", ");
}
}
str->append(")");
}
#endif

9
src/effects/SkTableColorFilter.cpp
View File

@ -4,6 +4,7 @@
#include "SkColorPriv.h"
#include "SkFlattenableBuffers.h"
#include "SkUnPreMultiply.h"
#include "SkString.h"
class SkTable_ColorFilter : public SkColorFilter {
public:
@ -47,6 +48,8 @@ public:
virtual void filterSpan(const SkPMColor src[], int count,
SkPMColor dst[]) const SK_OVERRIDE;
SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;)
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTable_ColorFilter)
enum {
@ -148,6 +151,12 @@ void SkTable_ColorFilter::filterSpan(const SkPMColor src[], int count,
}
}
#ifdef SK_DEVELOPER
void SkTable_ColorFilter::toString(SkString* str) const {
str->append("SkTable_ColorFilter");
}
#endif
static const uint8_t gCountNibBits[] = {
0, 1, 1, 2,
1, 2, 2, 3,