| Index: src/pipe/SkGPipeRead.cpp
|
| diff --git a/src/pipe/SkGPipeRead.cpp b/src/pipe/SkGPipeRead.cpp
|
| index 619e3fd670d4f5815fb023f63d7e27328dfa3d64..789c3eded82899e23a654c3b81dcd5043d375683 100644
|
| --- a/src/pipe/SkGPipeRead.cpp
|
| +++ b/src/pipe/SkGPipeRead.cpp
|
| @@ -28,20 +28,20 @@
|
| #include "SkTypeface.h"
|
| #include "SkXfermode.h"
|
|
|
| -static SkEffectType paintflat_to_effecttype(PaintFlats pf) {
|
| +static SkFlattenable::Type paintflat_to_flattype(PaintFlats pf) {
|
| static const uint8_t gEffectTypesInPaintFlatsOrder[] = {
|
| - kColorFilter_SkEffectType,
|
| - kDrawLooper_SkEffectType,
|
| - kImageFilter_SkEffectType,
|
| - kMaskFilter_SkEffectType,
|
| - kPathEffect_SkEffectType,
|
| - kRasterizer_SkEffectType,
|
| - kShader_SkEffectType,
|
| - kXfermode_SkEffectType,
|
| + SkFlattenable::kSkColorFilter_Type,
|
| + SkFlattenable::kSkDrawLooper_Type,
|
| + SkFlattenable::kSkImageFilter_Type,
|
| + SkFlattenable::kSkMaskFilter_Type,
|
| + SkFlattenable::kSkPathEffect_Type,
|
| + SkFlattenable::kSkRasterizer_Type,
|
| + SkFlattenable::kSkShader_Type,
|
| + SkFlattenable::kSkXfermode_Type,
|
| };
|
|
|
| SkASSERT((size_t)pf < SK_ARRAY_COUNT(gEffectTypesInPaintFlatsOrder));
|
| - return (SkEffectType)gEffectTypesInPaintFlatsOrder[pf];
|
| + return (SkFlattenable::Type)gEffectTypesInPaintFlatsOrder[pf];
|
| }
|
|
|
| static void set_paintflat(SkPaint* paint, SkFlattenable* obj, unsigned paintFlat) {
|
| @@ -122,7 +122,7 @@ public:
|
|
|
| void defFlattenable(PaintFlats pf, int index) {
|
| index--;
|
| - SkFlattenable* obj = fReader->readFlattenable(paintflat_to_effecttype(pf));
|
| + SkFlattenable* obj = fReader->readFlattenable(paintflat_to_flattype(pf));
|
| if (fFlatArray.count() == index) {
|
| *fFlatArray.append() = obj;
|
| } else {
|
|
|