summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorpkasting <pkasting@chromium.org>2016-03-07 13:13:24 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-07 21:14:37 +0000
commit6a3e439037809fd5dccf11c4cd0a91fb6a637702 (patch)
tree8e8add87b74c582317d10aca060826ff2376a0b2 /apps
parent8ab4acafc5a378ea754be3caec9da13473059e82 (diff)
downloadchromium_src-6a3e439037809fd5dccf11c4cd0a91fb6a637702.zip
chromium_src-6a3e439037809fd5dccf11c4cd0a91fb6a637702.tar.gz
chromium_src-6a3e439037809fd5dccf11c4cd0a91fb6a637702.tar.bz2
color_utils cleanup:
* Attempt to define and standardize usage of "luma" vs. "(relative) luminance" vs. "lightness", at least as far as color_utils functions, comments, and direct callers are concerned. Especially the first two terms are often both called "luminance" (universally, not just in Chrome code), so the distinction is confusing. * Misc. cleanups to make caller code shorter or clearer. * Naming consistency: remove "Get" from function names where we're not doing some simple "getter" operation, but rather computing a value. * Modify some caller behaviors to be hopefully-more-correct * Note that GetReadableColor() can accept values with alpha, it will just ignore the alpha. * Add a PickContrastingColor() function, which is basically a subset of GetReadableColor(). This will be useful for an upcoming change where we want to choose between two fixed colors instead of luma-inverting a single input. * Use more precise multipliers in Luma(). BUG=none TEST=none Review URL: https://codereview.chromium.org/1761183002 Cr-Commit-Position: refs/heads/master@{#379643}
Diffstat (limited to 'apps')
-rw-r--r--apps/ui/views/app_window_frame_view.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/ui/views/app_window_frame_view.cc b/apps/ui/views/app_window_frame_view.cc
index 4b6246b..728e038 100644
--- a/apps/ui/views/app_window_frame_view.cc
+++ b/apps/ui/views/app_window_frame_view.cc
@@ -374,10 +374,8 @@ void AppWindowFrameView::SetButtonImagesForFrame() {
// If the frame is dark, we should use the light images so they have
// some contrast.
- unsigned char frame_luma =
- color_utils::GetLuminanceForColor(CurrentFrameColor());
- const unsigned char kLuminanceThreshold = 100;
- bool use_light = frame_luma < kLuminanceThreshold;
+ const uint8_t kLumaThreshold = 100;
+ bool use_light = color_utils::GetLuma(CurrentFrameColor()) < kLumaThreshold;
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
if (use_light) {