| Index: src/effects/gradients/SkRadialGradient.cpp
|
| diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp
|
| index 99531d93d45dc180cd84c187ba334837c86e9b73..7c0e8f603174bd87f02746ebc3f28450bc067e59 100644
|
| --- a/src/effects/gradients/SkRadialGradient.cpp
|
| +++ b/src/effects/gradients/SkRadialGradient.cpp
|
| @@ -252,14 +252,6 @@ SkShader::GradientType SkRadialGradient::asAGradient(GradientInfo* info) const {
|
| return kRadial_GradientType;
|
| }
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
|
| -SkRadialGradient::SkRadialGradient(SkReadBuffer& buffer)
|
| - : INHERITED(buffer),
|
| - fCenter(buffer.readPoint()),
|
| - fRadius(buffer.readScalar()) {
|
| -}
|
| -#endif
|
| -
|
| SkFlattenable* SkRadialGradient::CreateProc(SkReadBuffer& buffer) {
|
| DescriptorScope desc;
|
| if (!desc.unflatten(buffer)) {
|
| @@ -578,7 +570,7 @@ bool SkRadialGradient::asFragmentProcessor(GrContext* context, const SkPaint& pa
|
| const SkMatrix* localMatrix, GrColor* paintColor,
|
| GrFragmentProcessor** fp) const {
|
| SkASSERT(context);
|
| -
|
| +
|
| SkMatrix matrix;
|
| if (!this->getLocalMatrix().invert(&matrix)) {
|
| return false;
|
| @@ -591,10 +583,10 @@ bool SkRadialGradient::asFragmentProcessor(GrContext* context, const SkPaint& pa
|
| matrix.postConcat(inv);
|
| }
|
| matrix.postConcat(fPtsToUnit);
|
| -
|
| +
|
| *paintColor = SkColor2GrColorJustAlpha(paint.getColor());
|
| *fp = GrRadialGradient::Create(context, *this, matrix, fTileMode);
|
| -
|
| +
|
| return true;
|
| }
|
|
|
|
|