color_utils cleanup:

chrome/browser/ui/views/download/download_item_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/download/download_item_view.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 43 matching lines @@
 #include "ui/gfx/text_utils.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 using content::DownloadItem;
 using extensions::ExperienceSamplingEvent;
 
+namespace {
+
 // TODO(paulg): These may need to be adjusted when download progress
 //              animation is added, and also possibly to take into account
 //              different screen resolutions.
-static const int kTextWidth = 140;            // Pixels
-static const int kDangerousTextWidth = 200;   // Pixels
-static const int kVerticalPadding = 3;        // Pixels
-static const int kVerticalTextPadding = 2;    // Pixels
-static const int kTooltipMaxWidth = 800;      // Pixels
+const int kTextWidth = 140;            // Pixels
+const int kDangerousTextWidth = 200;   // Pixels
+const int kVerticalPadding = 3;        // Pixels
+const int kVerticalTextPadding = 2;    // Pixels
+const int kTooltipMaxWidth = 800;      // Pixels
 
 // Padding around progress indicator, on all sides.
-static const int kProgressPadding = 7;
+const int kProgressPadding = 7;
 
 // We add some padding before the left image so that the progress animation icon
 // hides the corners of the left image.
-static const int kLeftPadding = 0;  // Pixels.
+const int kLeftPadding = 0;  // Pixels.
 
 // The space between the Save and Discard buttons when prompting for a dangerous
 // download.
-static const int kButtonPadding = 5;  // Pixels.
+const int kButtonPadding = 5;  // Pixels.
 
 // The space on the left and right side of the dangerous download label.
-static const int kLabelPadding = 4;  // Pixels.
+const int kLabelPadding = 4;  // Pixels.
 
-static const SkColor kFileNameDisabledColor = SkColorSetRGB(171, 192, 212);
+const SkColor kFileNameDisabledColor = SkColorSetRGB(171, 192, 212);
 
 // How long the 'download complete' animation should last for.
-static const int kCompleteAnimationDurationMs = 2500;
+const int kCompleteAnimationDurationMs = 2500;
 
 // How long the 'download interrupted' animation should last for.
-static const int kInterruptedAnimationDurationMs = 2500;
+const int kInterruptedAnimationDurationMs = 2500;
 
 // How long we keep the item disabled after the user clicked it to open the
 // downloaded item.
-static const int kDisabledOnOpenDuration = 3000;
+const int kDisabledOnOpenDuration = 3000;
 
-// Darken light-on-dark download status text by 20% before drawing, thus
-// creating a "muted" version of title text for both dark-on-light and
-// light-on-dark themes.
-static const double kDownloadItemLuminanceMod = 0.8;
+}  // namespace
 
 DownloadItemView::DownloadItemView(DownloadItem* download_item,
     DownloadShelfView* parent)
   : warning_icon_(NULL),
     shelf_(parent),
     status_text_(l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING)),
     body_state_(NORMAL),
     drop_down_state_(NORMAL),
     mode_(NORMAL_MODE),
     drop_down_pressed_(false),
@@ skipping 579 matching lines @@
   if (!IsShowingWarningDialog()) {
     if (!status_text_.empty()) {
       int mirrored_x = GetMirroredXWithWidthInView(
           2 * kProgressPadding + DownloadShelf::kProgressIndicatorSize,
           kTextWidth);
       // Add font_list_.height() to compensate for title, which is drawn later.
       int y = box_y_ + kVerticalPadding + font_list_.GetHeight() +
               kVerticalTextPadding;
       SkColor file_name_color = GetThemeProvider()->GetColor(
           ThemeProperties::COLOR_BOOKMARK_TEXT);
-      // If text is light-on-dark, lightening it alone will do nothing.
-      // Therefore we mute luminance a wee bit before drawing in this case.
-      if (color_utils::RelativeLuminance(file_name_color) > 0.5)
-          file_name_color = SkColorSetRGB(
-              static_cast<int>(kDownloadItemLuminanceMod *
-                               SkColorGetR(file_name_color)),
-              static_cast<int>(kDownloadItemLuminanceMod *
-                               SkColorGetG(file_name_color)),
-              static_cast<int>(kDownloadItemLuminanceMod *
-                               SkColorGetB(file_name_color)));
+      // If text is light-on-dark, lightening it alone will do nothing.  In this
+      // case we multiply color components by 80% before drawing.
+      if (!color_utils::IsDark(file_name_color)) {
+        file_name_color =
+            color_utils::AlphaBlend(SK_ColorBLACK, file_name_color, 255 / 5);
+      }
       canvas->DrawStringRect(status_text_, font_list_, file_name_color,
                              gfx::Rect(mirrored_x, y, kTextWidth,
                                        font_list_.GetHeight()));
     }
   }
 
   // Paint the background images.
   int x = kLeftPadding;
   canvas->Save();
   if (base::i18n::IsRTL()) {
@@ skipping 646 matching lines @@
     animation->Reset((to == HOT) ? 1.0 : 0.0);
   }
 }
 
 void DownloadItemView::ProgressTimerFired() {
   // Only repaint for the indeterminate size case. Otherwise, we'll repaint only
   // when there's an update notified via OnDownloadUpdated().
   if (model_.PercentComplete() < 0)
     SchedulePaint();
 }