Index: src/core/SkXfermode.cpp |
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp |
index 3ebd24c9816a252f5eaf17ba6237a381baedaffb..e0124b9b2ffb0ead4f9d0430e9c98417dfb42a4b 100644 |
--- a/src/core/SkXfermode.cpp |
+++ b/src/core/SkXfermode.cpp |
@@ -658,7 +658,7 @@ bool SkXfermode::asMode(Mode* mode) const { |
return false; |
} |
-bool SkXfermode::asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*, |
+bool SkXfermode::asFragmentProcessor(GrFragmentProcessor**, GrProcessorDataManager*, |
GrTexture*) const { |
return false; |
} |
@@ -929,12 +929,12 @@ void SkProcCoeffXfermode::xferA8(SkAlpha* SK_RESTRICT dst, |
#include "effects/GrCustomXfermode.h" |
bool SkProcCoeffXfermode::asFragmentProcessor(GrFragmentProcessor** fp, |
- GrShaderDataManager* shaderDataManager, |
+ GrProcessorDataManager* procDataManager, |
GrTexture* background) const { |
if (GrCustomXfermode::IsSupportedMode(fMode)) { |
if (fp) { |
- SkASSERT(shaderDataManager); |
- *fp = GrCustomXfermode::CreateFP(shaderDataManager, fMode, background); |
+ SkASSERT(procDataManager); |
+ *fp = GrCustomXfermode::CreateFP(procDataManager, fMode, background); |
SkASSERT(*fp); |
} |
return true; |