Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Unified Diff: src/effects/SkAvoidXfermode.cpp

Issue 1674673002: Alter SkXfermode's asFragmentProcessor & asXPFactory contracts (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix unit test bug Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/effects/SkArithmeticMode.cpp ('k') | src/effects/SkPixelXorXfermode.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkAvoidXfermode.cpp
diff --git a/src/effects/SkAvoidXfermode.cpp b/src/effects/SkAvoidXfermode.cpp
index 30da0ad7d3dc58de0be3d7abdfd7460e32ee7c3e..43d80c981038a095de050b3fe718f0c949816740 100644
--- a/src/effects/SkAvoidXfermode.cpp
+++ b/src/effects/SkAvoidXfermode.cpp
@@ -521,19 +521,13 @@ const GrXPFactory* GrAvoidXPFactory::TestCreate(GrProcessorTestData* d) {
///////////////////////////////////////////////////////////////////////////////
-bool SkAvoidXfermode::asFragmentProcessor(const GrFragmentProcessor** output,
- const GrFragmentProcessor* dst) const {
- if (output) {
- *output = AvoidFP::Create(fOpColor, fTolerance, fMode, dst);
- }
- return true;
+const GrFragmentProcessor* SkAvoidXfermode::getFragmentProcessorForImageFilter(
+ const GrFragmentProcessor* dst) const {
+ return AvoidFP::Create(fOpColor, fTolerance, fMode, dst);
}
-bool SkAvoidXfermode::asXPFactory(GrXPFactory** xpf) const {
- if (xpf) {
- *xpf = GrAvoidXPFactory::Create(fOpColor, fTolerance, fMode);
- }
- return true;
+GrXPFactory* SkAvoidXfermode::asXPFactory() const {
+ return GrAvoidXPFactory::Create(fOpColor, fTolerance, fMode);
}
#endif
« no previous file with comments | « src/effects/SkArithmeticMode.cpp ('k') | src/effects/SkPixelXorXfermode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698