Commit ee90e706 authored by Trent Apted's avatar Trent Apted Committed by Commit Bot

Touchable Chrome: Swap hover/selected background alpha blends

They're currently backwards.

Bug: 829974
Change-Id: I67440b14df2ad143e22741e4adf2b9055d4dd683
Reviewed-on: https://chromium-review.googlesource.com/1010057Reviewed-by: default avatarPatti <patricialor@chromium.org>
Commit-Queue: Patti <patricialor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550519}
parent 787bde4b
......@@ -231,13 +231,12 @@ SkColor GetOmniboxColor(OmniboxPart part,
case OmniboxPart::LOCATION_BAR_SELECTED_KEYWORD:
return dark ? gfx::kGoogleGrey100 : gfx::kGoogleBlue600;
case OmniboxPart::RESULTS_BACKGROUND:
// The spec calls for transparent black (or white) overlays for hover (6%)
// and select (8%), which can overlap (for 14%). Pre-blend these with the
// The spec calls for transparent black (or white) overlays for hover (8%)
// and select (6%), which can overlap (for 14%). Pre-blend these with the
// background for the best text AA result.
return color_utils::BlendTowardOppositeLuma(
dark ? gfx::kGoogleGrey800 : SK_ColorWHITE,
NormalHoveredSelectedOrBoth<SkAlpha>(state, 0x00, 0x0F, 0x14, 0x24));
case OmniboxPart::LOCATION_BAR_TEXT_DEFAULT:
case OmniboxPart::RESULTS_TEXT_DEFAULT:
return dark ? gfx::kGoogleGrey100 : gfx::kGoogleGrey800;
......
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