From d8a6cc814f1a0a8faaddad05ae765ad2f6b11aac Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Wed, 12 Sep 2012 18:53:49 +0000 Subject: [PATCH] Make texteffects gm work through serialization and pipe. Move Line2DPathEffect (now Sk_) into a separate header file so it can be shared and initialized. Switch to the shared version in SampleAll and SampleSlides. Remove the skip pipe flag from texteffects, since it can now be serialized. I have a separate change to turn serialization on by default at https://codereview.appspot.com/6498121/ Review URL: https://codereview.appspot.com/6503106 git-svn-id: http://skia.googlecode.com/svn/trunk@5512 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/texteffects.cpp | 62 +------------------- include/effects/Sk2DPathEffect.h | 22 +++++++ samplecode/SampleAll.cpp | 49 +--------------- samplecode/SampleSlides.cpp | 50 +--------------- src/core/SkOrderedWriteBuffer.cpp | 2 +- src/effects/Sk2DPathEffect.cpp | 35 +++++++++++ src/ports/SkGlobalInitialization_default.cpp | 3 +- 7 files changed, 63 insertions(+), 160 deletions(-) diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp index 18cae70155..3436018963 100644 --- a/gm/texteffects.cpp +++ b/gm/texteffects.cpp @@ -124,58 +124,13 @@ static void r8(SkLayerRasterizer* rast, SkPaint& p) { rast->addLayer(p); } -class Line2DPathEffect : public Sk2DPathEffect { -public: - Line2DPathEffect(SkScalar width, const SkMatrix& matrix) - : Sk2DPathEffect(matrix), fWidth(width) {} - - virtual bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec* rec) SK_OVERRIDE { - if (this->INHERITED::filterPath(dst, src, rec)) { - rec->setStrokeStyle(fWidth); - return true; - } - return false; - } - - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Line2DPathEffect) - -protected: - virtual void nextSpan(int u, int v, int ucount, SkPath* dst) { - if (ucount > 1) { - SkPoint src[2], dstP[2]; - - src[0].set(SkIntToScalar(u) + SK_ScalarHalf, - SkIntToScalar(v) + SK_ScalarHalf); - src[1].set(SkIntToScalar(u+ucount) + SK_ScalarHalf, - SkIntToScalar(v) + SK_ScalarHalf); - this->getMatrix().mapPoints(dstP, src, 2); - - dst->moveTo(dstP[0]); - dst->lineTo(dstP[1]); - } - } - - Line2DPathEffect(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) { - fWidth = buffer.readScalar(); - } - virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE { - this->INHERITED::flatten(buffer); - buffer.writeScalar(fWidth); - } - -private: - SkScalar fWidth; - - typedef Sk2DPathEffect INHERITED; -}; - static void r9(SkLayerRasterizer* rast, SkPaint& p) { rast->addLayer(p); SkMatrix lattice; lattice.setScale(SK_Scalar1, SK_Scalar1*6, 0, 0); lattice.postRotate(SkIntToScalar(30), 0, 0); - p.setPathEffect(new Line2DPathEffect(SK_Scalar1*2, lattice))->unref(); + p.setPathEffect(new SkLine2DPathEffect(SK_Scalar1*2, lattice))->unref(); p.setXfermodeMode(SkXfermode::kClear_Mode); rast->addLayer(p); @@ -192,16 +147,6 @@ static const raster_proc gRastProcs[] = { r0, r1, r2, r3, r4, r5, r6, r7, r8, r9 }; -static const struct { - SkColor fMul, fAdd; -} gLightingColors[] = { - { 0x808080, 0x800000 }, // general case - { 0x707070, 0x707070 }, // no-pin case - { 0xFFFFFF, 0x800000 }, // just-add case - { 0x808080, 0x000000 }, // just-mul case - { 0xFFFFFF, 0x000000 } // identity case -}; - #include "SkXfermode.h" static void apply_shader(SkPaint* paint, int index) { @@ -262,11 +207,6 @@ protected: canvas->restore(); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { - // want to skip serialization due to custom effects only defined here - return kSkipPipe_Flag; - } - private: typedef skiagm::GM INHERITED; }; diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h index adc27e440f..70007556c1 100644 --- a/include/effects/Sk2DPathEffect.h +++ b/include/effects/Sk2DPathEffect.h @@ -58,6 +58,28 @@ private: typedef SkPathEffect INHERITED; }; +class SkLine2DPathEffect : public Sk2DPathEffect { +public: + SkLine2DPathEffect(SkScalar width, const SkMatrix& matrix) + : Sk2DPathEffect(matrix), fWidth(width) {} + + virtual bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec* rec) SK_OVERRIDE; + + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLine2DPathEffect) + +protected: + virtual void nextSpan(int u, int v, int ucount, SkPath* dst) SK_OVERRIDE; + + SkLine2DPathEffect(SkFlattenableReadBuffer&); + + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; + +private: + SkScalar fWidth; + + typedef Sk2DPathEffect INHERITED; +}; + class SkPath2DPathEffect : public Sk2DPathEffect { public: /** diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index b85064265a..acdb148abe 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -206,60 +206,13 @@ static void r8(SkLayerRasterizer* rast, SkPaint& p) { rast->addLayer(p); } -class Line2DPathEffect : public Sk2DPathEffect { -public: - Line2DPathEffect(SkScalar width, const SkMatrix& matrix) - : Sk2DPathEffect(matrix), fWidth(width) {} - - virtual bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec* rec) SK_OVERRIDE { - if (this->INHERITED::filterPath(dst, src, rec)) { - rec->setStrokeStyle(fWidth); - return true; - } - return false; - } - - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Line2DPathEffect) - -protected: - virtual void nextSpan(int u, int v, int ucount, SkPath* dst) { - if (ucount > 1) { - SkPoint src[2], dstP[2]; - - src[0].set(SkIntToScalar(u) + SK_ScalarHalf, - SkIntToScalar(v) + SK_ScalarHalf); - src[1].set(SkIntToScalar(u+ucount) + SK_ScalarHalf, - SkIntToScalar(v) + SK_ScalarHalf); - this->getMatrix().mapPoints(dstP, src, 2); - - dst->moveTo(dstP[0]); - dst->lineTo(dstP[1]); - } - } - - Line2DPathEffect(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) { - fWidth = buffer.readScalar(); - } - virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE { - this->INHERITED::flatten(buffer); - buffer.writeScalar(fWidth); - } - -private: - SkScalar fWidth; - - typedef Sk2DPathEffect INHERITED; -}; - -SK_DEFINE_FLATTENABLE_REGISTRAR(Line2DPathEffect) - static void r9(SkLayerRasterizer* rast, SkPaint& p) { rast->addLayer(p); SkMatrix lattice; lattice.setScale(SK_Scalar1, SK_Scalar1*6, 0, 0); lattice.postRotate(SkIntToScalar(30), 0, 0); - p.setPathEffect(new Line2DPathEffect(SK_Scalar1*2, lattice))->unref(); + p.setPathEffect(new SkLine2DPathEffect(SK_Scalar1*2, lattice))->unref(); p.setXfermodeMode(SkXfermode::kClear_Mode); rast->addLayer(p); diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp index 574564fe73..b200473708 100644 --- a/samplecode/SampleSlides.cpp +++ b/samplecode/SampleSlides.cpp @@ -598,54 +598,6 @@ static void r8(SkLayerRasterizer* rast, SkPaint& p) rast->addLayer(p); } -class Line2DPathEffect : public Sk2DPathEffect { -public: - Line2DPathEffect(SkScalar width, const SkMatrix& matrix) - : Sk2DPathEffect(matrix), fWidth(width) {} - - virtual bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec* rec) SK_OVERRIDE { - if (this->INHERITED::filterPath(dst, src, rec)) { - rec->setStrokeStyle(fWidth); - return true; - } - return false; - } - - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Line2DPathEffect) -protected: - virtual void nextSpan(int u, int v, int ucount, SkPath* dst) - { - if (ucount > 1) - { - SkPoint src[2], dstP[2]; - - src[0].set(SkIntToScalar(u) + SK_ScalarHalf, - SkIntToScalar(v) + SK_ScalarHalf); - src[1].set(SkIntToScalar(u+ucount) + SK_ScalarHalf, - SkIntToScalar(v) + SK_ScalarHalf); - this->getMatrix().mapPoints(dstP, src, 2); - - dst->moveTo(dstP[0]); - dst->lineTo(dstP[1]); - } - } - - Line2DPathEffect(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) - { - fWidth = buffer.readScalar(); - } - virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE - { - this->INHERITED::flatten(buffer); - buffer.writeScalar(fWidth); - } - -private: - SkScalar fWidth; - - typedef Sk2DPathEffect INHERITED; -}; - static void r9(SkLayerRasterizer* rast, SkPaint& p) { rast->addLayer(p); @@ -653,7 +605,7 @@ static void r9(SkLayerRasterizer* rast, SkPaint& p) SkMatrix lattice; lattice.setScale(SK_Scalar1, SK_Scalar1*6, 0, 0); lattice.postRotate(SkIntToScalar(30), 0, 0); - p.setPathEffect(new Line2DPathEffect(SK_Scalar1*2, lattice))->unref(); + p.setPathEffect(new SkLine2DPathEffect(SK_Scalar1*2, lattice))->unref(); p.setXfermodeMode(SkXfermode::kClear_Mode); rast->addLayer(p); diff --git a/src/core/SkOrderedWriteBuffer.cpp b/src/core/SkOrderedWriteBuffer.cpp index e278c06386..daba06a75c 100644 --- a/src/core/SkOrderedWriteBuffer.cpp +++ b/src/core/SkOrderedWriteBuffer.cpp @@ -221,7 +221,7 @@ void SkOrderedWriteBuffer::writeFlattenable(SkFlattenable* flattenable) { this->writeFunctionPtr((void*)factory); } - // make room for the size of the flatttened object + // make room for the size of the flattened object (void)fWriter.reserve(sizeof(uint32_t)); // record the current size, so we can subtract after the object writes. uint32_t offset = fWriter.size(); diff --git a/src/effects/Sk2DPathEffect.cpp b/src/effects/Sk2DPathEffect.cpp index a9a239f3c1..1f1dce4803 100644 --- a/src/effects/Sk2DPathEffect.cpp +++ b/src/effects/Sk2DPathEffect.cpp @@ -76,7 +76,42 @@ Sk2DPathEffect::Sk2DPathEffect(SkFlattenableReadBuffer& buffer) { fMatrixIsInvertible = fMatrix.invert(&fInverse); } +SK_DEFINE_FLATTENABLE_REGISTRAR(Sk2DPathEffect) + /////////////////////////////////////////////////////////////////////////////// + +bool SkLine2DPathEffect::filterPath(SkPath *dst, const SkPath &src, SkStrokeRec *rec) { + if (this->INHERITED::filterPath(dst, src, rec)) { + rec->setStrokeStyle(fWidth); + return true; + } + return false; +} + +void SkLine2DPathEffect::nextSpan(int u, int v, int ucount, SkPath *dst) { + if (ucount > 1) { + SkPoint src[2], dstP[2]; + + src[0].set(SkIntToScalar(u) + SK_ScalarHalf, SkIntToScalar(v) + SK_ScalarHalf); + src[1].set(SkIntToScalar(u+ucount) + SK_ScalarHalf, SkIntToScalar(v) + SK_ScalarHalf); + this->getMatrix().mapPoints(dstP, src, 2); + + dst->moveTo(dstP[0]); + dst->lineTo(dstP[1]); + } +} + +SkLine2DPathEffect::SkLine2DPathEffect(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) { + fWidth = buffer.readScalar(); +} + +void SkLine2DPathEffect::flatten(SkFlattenableWriteBuffer &buffer) const { + this->INHERITED::flatten(buffer); + buffer.writeScalar(fWidth); +} + +SK_DEFINE_FLATTENABLE_REGISTRAR(SkLine2DPathEffect) + /////////////////////////////////////////////////////////////////////////////// SkPath2DPathEffect::SkPath2DPathEffect(const SkMatrix& m, const SkPath& p) diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp index 28a64143ad..55784d3b32 100644 --- a/src/ports/SkGlobalInitialization_default.cpp +++ b/src/ports/SkGlobalInitialization_default.cpp @@ -44,7 +44,6 @@ #include "SkLightingImageFilter.h" #include "SkMagnifierImageFilter.h" #include "SkMorphologyImageFilter.h" -#include "SkPathEffect.h" #include "SkPixelXorXfermode.h" #include "SkStippleMaskFilter.h" #include "SkTableColorFilter.h" @@ -73,6 +72,8 @@ void SkFlattenable::InitializeFlattenables() { SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerDrawLooper) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerRasterizer) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath1DPathEffect) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(Sk2DPathEffect) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLine2DPathEffect) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath2DPathEffect) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPixelXorXfermode) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkStippleMaskFilter)