From cab34d6a13d3044c59cd5dccdf4b04725a395aac Mon Sep 17 00:00:00 2001 From: "pkasting@chromium.org" Date: Thu, 24 Sep 2009 01:14:52 +0000 Subject: 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 --- chrome/browser/browser_theme_provider_mac.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/browser/browser_theme_provider_mac.mm') 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 +#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); -- cgit v1.1