aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@skia.org>2018-05-16 13:15:13 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-16 13:51:14 +0000
commit510e9e399b3de12e61c98577c32387b61f71accd (patch)
tree61f37136942b776939c5ff99c2a4cd76d2d8baff /include/core
parent5702d8cbca0b8c73a5eff959ed817723d4010bc3 (diff)
Reland "Reland "remove obsolete color defines""
This reverts commit d286aa73f13ee10d778381c20d4f0c7dd4bfa354. Reason for revert: fuchsia has rolled forward Original change's description: > Revert "Reland "remove obsolete color defines"" > > This reverts commit 05cfcff70ced3af834e0c9c5309f98bd6662f851. > > Reason for revert: breaks flutter > > Original change's description: > > Reland "remove obsolete color defines" > > > > This reverts commit 3155d9c912ec71c95d8f210d86a1c6deba0f78d9. > > > > Reason for revert: pdfium bots are no more > > > > Original change's description: > > > Revert "remove obsolete color defines" > > > > > > This reverts commit 8afbecbcc05412fadc66cc9d29955064145b8ba5. > > > > > > Reason for revert: broke pdfium > > > > > > Original change's description: > > > > remove obsolete color defines > > > > > > > > The uses in Skia, Chrome, and Google3 have already > > > > been removed. If I missed one or more, please let > > > > me know (and feel free to revert). > > > > > > > > TBR=reed@google.com,brianosman@google.com > > > > Bug: skia:6898 > > > > Change-Id: I9d15b1a06f5abfc3a0fc6f3f1b4d348916c3d362 > > > > Reviewed-on: https://skia-review.googlesource.com/124840 > > > > Reviewed-by: Cary Clark <caryclark@skia.org> > > > > Commit-Queue: Cary Clark <caryclark@skia.org> > > > > Auto-Submit: Cary Clark <caryclark@skia.org> > > > > > > TBR=brianosman@google.com,reed@google.com,caryclark@skia.org > > > > > > Change-Id: Ic7c1003261cda5dee80e222da123c6717b4ea707 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: skia:6898 > > > Reviewed-on: https://skia-review.googlesource.com/124880 > > > Reviewed-by: Cary Clark <caryclark@skia.org> > > > Commit-Queue: Cary Clark <caryclark@skia.org> > > > > TBR=brianosman@google.com,reed@google.com,caryclark@skia.org > > > > # Not skipping CQ checks because original CL landed > 1 day ago. > > > > Bug: skia:6898 > > Change-Id: I3605fa0ebb2bfecc26d198e9de008c82d31d747b > > Reviewed-on: https://skia-review.googlesource.com/126001 > > Reviewed-by: Cary Clark <caryclark@google.com> > > Commit-Queue: Cary Clark <caryclark@google.com> > > TBR=brianosman@google.com,caryclark@google.com,reed@google.com,caryclark@skia.org > > Change-Id: I469794b86487322c385e50275d548c1895c30cff > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:6898 > Reviewed-on: https://skia-review.googlesource.com/126040 > Reviewed-by: Cary Clark <caryclark@google.com> > Commit-Queue: Cary Clark <caryclark@google.com> TBR=brianosman@google.com,caryclark@google.com,reed@google.com,caryclark@skia.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: skia:6898 Change-Id: I03bd75d28dfad86455b48dea7930bebc95bf82d3 Reviewed-on: https://skia-review.googlesource.com/128500 Reviewed-by: Cary Clark <caryclark@skia.org> Commit-Queue: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkColor.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/core/SkColor.h b/include/core/SkColor.h
index c9420d66e7..4f7592baee 100644
--- a/include/core/SkColor.h
+++ b/include/core/SkColor.h
@@ -32,9 +32,6 @@ static constexpr inline SkColor SkColorSetARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU
return SkASSERT(a <= 255 && r <= 255 && g <= 255 && b <= 255),
(a << 24) | (r << 16) | (g << 8) | (b << 0);
}
-// Legacy aliases.
-#define SkColorSetARGBInline SkColorSetARGB
-#define SkColorSetARGBMacro SkColorSetARGB
/** Return a SkColor value from 8 bit component values, with an implied value
of 0xFF for alpha (fully opaque)