Do proper HSL > HSB conversion....

chrome/browser/browser_theme_provider_mac.mm

 // Copyright (c) 2009 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/browser_theme_provider.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
+#include "skia/ext/skia_utils.h"
 #include "skia/ext/skia_utils_mac.h"
 
+namespace {
+
+void HSLToHSB(const skia::HSL& hsl, CGFloat* h, CGFloat* s, CGFloat* b) {

[Erik does not do reviews, 2009/08/03 22:09:42]

One nit perhaps worth mentioning in a comment is that this is really Cocoa HSB,
since HSB in general is supposed to use the same 0-360 range for Hue as HSL.

[Avi (use Gerrit), 2009/08/04 13:58:21]

But Skia::HSL also uses [0.0, 1.0). I think that a reasonable reader would grok
it from context.

+  SkColor color = skia::HSLToSkColor(1.0, hsl);  // alpha value doesn't matter
+  SkScalar hsv[3];
+  SkColorToHSV(color, hsv);
+
+  *h = SkScalarToDouble(hsv[0]) / 360.0;
+  *s = SkScalarToDouble(hsv[1]);
+  *b = SkScalarToDouble(hsv[2]);
+}
+
+}
+
 NSImage* BrowserThemeProvider::GetNSImageNamed(int id) {
   DCHECK(CalledOnValidThread());
 
   if (!HasCustomImage(id))
     return nil;
 
   // Check to see if we already have the image in the cache.
   NSImageMap::const_iterator found = nsimage_cache_.find(id);
   if (found != nsimage_cache_.end())
     return found->second;
@@ skipping 34 matching lines @@
   DCHECK(CalledOnValidThread());
 
   // Check to see if we already have the color in the cache.
   NSColorMap::const_iterator found = nscolor_cache_.find(id);
   if (found != nscolor_cache_.end())
     return found->second;
 
   TintMap::iterator tint_iter = tints_.find(GetTintKey(id));
   if (tint_iter != tints_.end()) {
     skia::HSL tint = tint_iter->second;
+    CGFloat hue, saturation, brightness;
+    HSLToHSB(tint, &hue, &saturation, &brightness);
 
-    // The tint is HSL, not HSB, but we're cheating for now. TODO(avi,alcor):
-    // determine how much this matters and fix it if necessary.
-    // http://crbug.com/15760
-    NSColor* tint_color = [NSColor colorWithCalibratedHue:tint.h
-                                               saturation:tint.s
-                                               brightness:tint.l
+    NSColor* tint_color = [NSColor colorWithCalibratedHue:hue
+                                               saturation:saturation
+                                               brightness:brightness
                                                     alpha:1.0];
 
     // We loaded successfully.  Cache the color.
     if (tint_color) {
       nscolor_cache_[id] = [tint_color retain];
       return tint_color;
     }
   }
 
   return nil;
 }
 
 void BrowserThemeProvider::FreePlatformCaches() {
   DCHECK(CalledOnValidThread());
 
   // Free images.
   for (NSImageMap::iterator i = nsimage_cache_.begin();
        i != nsimage_cache_.end(); i++) {
     [i->second release];
   }
   nsimage_cache_.clear();
 
   // Free colors.
   for (NSColorMap::iterator i = nscolor_cache_.begin();
        i != nscolor_cache_.end(); i++) {
     [i->second release];
   }
   nscolor_cache_.clear();
 }