diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 01:14:52 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 01:14:52 +0000 |
commit | cab34d6a13d3044c59cd5dccdf4b04725a395aac (patch) | |
tree | d9c05fd2e59a12cedf72f97d8cb4c420ff4793bb /chrome/browser/browser_theme_provider_mac.mm | |
parent | 37cc1a1eaaa0c425a1ba889cf619f464227f9906 (diff) | |
download | chromium_src-cab34d6a13d3044c59cd5dccdf4b04725a395aac.zip chromium_src-cab34d6a13d3044c59cd5dccdf4b04725a395aac.tar.gz chromium_src-cab34d6a13d3044c59cd5dccdf4b04725a395aac.tar.bz2 |
Move functions from skia/ext to app/gfx where possible: most of skia_utils.* and image_operations.* can be moved because they are not used by WebKit code.
This also fixes the spelling of "Convolusion" to "Convolution" and updates some copyrights.
This is a re-do of r26975, this time with WebKit update and some fixes to compile on Mac and Linux.
BUG=none
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_theme_provider_mac.mm')
-rw-r--r-- | chrome/browser/browser_theme_provider_mac.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_theme_provider_mac.mm b/chrome/browser/browser_theme_provider_mac.mm index 063ec25..6df0336 100644 --- a/chrome/browser/browser_theme_provider_mac.mm +++ b/chrome/browser/browser_theme_provider_mac.mm @@ -6,14 +6,14 @@ #import <Cocoa/Cocoa.h> +#include "app/gfx/color_utils.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) { - SkColor color = skia::HSLToSkColor(1.0, hsl); // alpha value doesn't matter +void HSLToHSB(const color_utils::HSL& hsl, CGFloat* h, CGFloat* s, CGFloat* b) { + SkColor color = color_utils::HSLToSkColor(hsl, 255); // alpha doesn't matter SkScalar hsv[3]; SkColorToHSV(color, hsv); @@ -106,7 +106,7 @@ NSColor* BrowserThemeProvider::GetNSColorTint(int id) { TintMap::iterator tint_iter = tints_.find(GetTintKey(id)); if (tint_iter != tints_.end()) { - skia::HSL tint = tint_iter->second; + color_utils::HSL tint = tint_iter->second; CGFloat hue, saturation, brightness; HSLToHSB(tint, &hue, &saturation, &brightness); |