| Index: src/core/SkXfermode.cpp
|
| diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
|
| index 3fb44b4d3bec31e98b082f174056668c369c26f3..9083814d1a66b97a00e05436f0dd8e7c61ab44ee 100644
|
| --- a/src/core/SkXfermode.cpp
|
| +++ b/src/core/SkXfermode.cpp
|
| @@ -651,7 +651,7 @@ bool SkXfermode::asMode(Mode* mode) const {
|
| return false;
|
| }
|
|
|
| -bool SkXfermode::asFragmentProcessor(const GrFragmentProcessor**, GrProcessorDataManager*,
|
| +bool SkXfermode::asFragmentProcessor(const GrFragmentProcessor**,
|
| const GrFragmentProcessor*) const {
|
| return false;
|
| }
|
| @@ -923,11 +923,9 @@ void SkProcCoeffXfermode::xferA8(SkAlpha* SK_RESTRICT dst,
|
| #include "effects/GrXfermodeFragmentProcessor.h"
|
|
|
| bool SkProcCoeffXfermode::asFragmentProcessor(const GrFragmentProcessor** fp,
|
| - GrProcessorDataManager* procDataManager,
|
| const GrFragmentProcessor* dst) const {
|
| if (fp) {
|
| SkASSERT(dst);
|
| - SkASSERT(procDataManager);
|
| *fp = GrXfermodeFragmentProcessor::CreateFromDstProcessor(dst, fMode);
|
| SkASSERT(*fp || kSrc_Mode == fMode);
|
| }
|
|
|