Commit 55d7eb84 authored by pkasting's avatar pkasting Committed by Commit bot

Round color values in AlphaBlend() as we already do in HSLShift().

BUG=none
TEST=none

Review URL: https://codereview.chromium.org/1683913003

Cr-Commit-Position: refs/heads/master@{#374808}
parent ac78d7d8
...@@ -150,10 +150,9 @@ SkColor HSLToSkColor(const HSL& hsl, SkAlpha alpha) { ...@@ -150,10 +150,9 @@ SkColor HSLToSkColor(const HSL& hsl, SkAlpha alpha) {
(lightness * (1.0 + saturation)) : (lightness * (1.0 + saturation)) :
(lightness + saturation - (lightness * saturation)); (lightness + saturation - (lightness * saturation));
double temp1 = 2.0 * lightness - temp2; double temp1 = 2.0 * lightness - temp2;
return SkColorSetARGB(alpha, return SkColorSetARGB(alpha, calcHue(temp1, temp2, hue + 1.0 / 3.0),
calcHue(temp1, temp2, hue + 1.0 / 3.0), calcHue(temp1, temp2, hue),
calcHue(temp1, temp2, hue), calcHue(temp1, temp2, hue - 1.0 / 3.0));
calcHue(temp1, temp2, hue - 1.0 / 3.0));
} }
bool IsWithinHSLRange(const HSL& hsl, bool IsWithinHSLRange(const HSL& hsl,
...@@ -287,10 +286,10 @@ SkColor AlphaBlend(SkColor foreground, SkColor background, SkAlpha alpha) { ...@@ -287,10 +286,10 @@ SkColor AlphaBlend(SkColor foreground, SkColor background, SkAlpha alpha) {
double b = (SkColorGetB(foreground) * f_weight + double b = (SkColorGetB(foreground) * f_weight +
SkColorGetB(background) * b_weight) / 255.0; SkColorGetB(background) * b_weight) / 255.0;
return SkColorSetARGB(static_cast<int>(normalizer), return SkColorSetARGB(static_cast<int>(std::round(normalizer)),
static_cast<int>(r), static_cast<int>(std::round(r)),
static_cast<int>(g), static_cast<int>(std::round(g)),
static_cast<int>(b)); static_cast<int>(std::round(b)));
} }
bool IsDark(SkColor color) { bool IsDark(SkColor color) {
...@@ -311,11 +310,8 @@ SkColor GetReadableColor(SkColor foreground, SkColor background) { ...@@ -311,11 +310,8 @@ SkColor GetReadableColor(SkColor foreground, SkColor background) {
} }
SkColor InvertColor(SkColor color) { SkColor InvertColor(SkColor color) {
return SkColorSetARGB( return SkColorSetARGB(SkColorGetA(color), 255 - SkColorGetR(color),
SkColorGetA(color), 255 - SkColorGetG(color), 255 - SkColorGetB(color));
255 - SkColorGetR(color),
255 - SkColorGetG(color),
255 - SkColorGetB(color));
} }
SkColor GetSysSkColor(int which) { SkColor GetSysSkColor(int which) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment