From f234272cbdcbcd46be462317e75cd138999c9fe9 Mon Sep 17 00:00:00 2001 From: egdaniel Date: Fri, 20 Nov 2015 15:12:59 -0800 Subject: Revert of Make specialized SrcOver XPFactory (patchset #3 id:40001 of https://codereview.chromium.org/1455273006/ ) Reason for revert: breaking some builds Original issue's description: > Make specialized SrcOver XPFactory > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/a7006d45217d128a94fa53cb4b827cca79bc7049 TBR=bsalomon@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1464933003 --- src/core/SkXfermode.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/SkXfermode.cpp') diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index ddfa80e197..9083814d1a 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -656,7 +656,7 @@ bool SkXfermode::asFragmentProcessor(const GrFragmentProcessor**, return false; } -bool SkXfermode::asXPFactory(const GrXPFactory**) const { +bool SkXfermode::asXPFactory(GrXPFactory**) const { return false; } @@ -664,7 +664,7 @@ bool SkXfermode::asXPFactory(const GrXPFactory**) const { #if SK_SUPPORT_GPU #include "effects/GrPorterDuffXferProcessor.h" -bool SkXfermode::AsXPFactory(SkXfermode* xfermode, const GrXPFactory** xpf) { +bool SkXfermode::AsXPFactory(SkXfermode* xfermode, GrXPFactory** xpf) { if (nullptr == xfermode) { if (xpf) { *xpf = GrPorterDuffXPFactory::Create(kSrcOver_Mode); @@ -675,7 +675,7 @@ bool SkXfermode::AsXPFactory(SkXfermode* xfermode, const GrXPFactory** xpf) { } } #else -bool SkXfermode::AsXPFactory(SkXfermode* xfermode, const GrXPFactory** xpf) { +bool SkXfermode::AsXPFactory(SkXfermode* xfermode, GrXPFactory** xpf) { return false; } #endif @@ -932,7 +932,7 @@ bool SkProcCoeffXfermode::asFragmentProcessor(const GrFragmentProcessor** fp, return true; } -bool SkProcCoeffXfermode::asXPFactory(const GrXPFactory** xp) const { +bool SkProcCoeffXfermode::asXPFactory(GrXPFactory** xp) const { if (CANNOT_USE_COEFF != fSrcCoeff) { if (xp) { *xp = GrPorterDuffXPFactory::Create(fMode); -- cgit v1.2.3