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

Unified Diff: src/core/SkXfermode.cpp

Issue 2183453003: Google3 <functional> has a global "using std::plus"... (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkXfermode.cpp
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index 64db9dfb566211c508baf0f31e5c96b8163204ea..3e7b8bc7c23cf05a03270d0a009a7b444a92ef22 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -1461,7 +1461,7 @@ KERNEL(dstatop) { return srcatop(d,da,s,sa); }
KERNEL(modulate) { return s*d; }
KERNEL(multiply) { return s*inv(da) + d*inv(sa) + s*d; }
-KERNEL(plus) { return s + d; }
+KERNEL(plus_) { return s + d; }
KERNEL(screen) { return s + d - s*d; }
KERNEL(xor_) { return s*inv(da) + d*inv(sa); }
@@ -1531,7 +1531,7 @@ bool SkProcCoeffXfermode::onAppendStages(SkRasterPipeline* p) const {
case kClear_Mode: p->append(rgba<clear>); return true;
case kModulate_Mode: p->append(rgba<modulate>); return true;
case kMultiply_Mode: p->append(rgba<multiply>); return true;
- case kPlus_Mode: p->append(rgba<plus>); return true;
+ case kPlus_Mode: p->append(rgba<plus_>); return true;
case kScreen_Mode: p->append(rgba<screen>); return true;
case kXor_Mode: p->append(rgba<xor_>); return true;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698