aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkXfermode.cpp
diff options
context:
space:
mode:
authorGravatar egdaniel <egdaniel@google.com>2015-11-20 15:12:59 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-11-20 15:12:59 -0800
commitf234272cbdcbcd46be462317e75cd138999c9fe9 (patch)
treefa3de6c2762df48a7e05c1fdd1244df802ad953b /src/core/SkXfermode.cpp
parent1c9ce610501b7b864617356aeda12cd0caebe066 (diff)
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
Diffstat (limited to 'src/core/SkXfermode.cpp')
-rw-r--r--src/core/SkXfermode.cpp8
1 files changed, 4 insertions, 4 deletions
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);