diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 00:47:59 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 00:47:59 +0000 |
commit | ad02174ccfde818097757bef93c9ae6ea62c68bd (patch) | |
tree | 3d7190ae70d55bec354bab112ee6bcbcad7e29ad /app/gfx | |
parent | 05af3561d9685d9b54e4d2e4fe35b2c69bd6bec0 (diff) | |
download | chromium_src-ad02174ccfde818097757bef93c9ae6ea62c68bd.zip chromium_src-ad02174ccfde818097757bef93c9ae6ea62c68bd.tar.gz chromium_src-ad02174ccfde818097757bef93c9ae6ea62c68bd.tar.bz2 |
Move skia_utils_gtk.cc/.h to app/gfx/. Original patch by Thiago Farina (see http://codereview.chromium.org/660063 ), r=me.
BUG=22853
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/gfx')
-rw-r--r-- | app/gfx/skia_utils_gtk.cc | 32 | ||||
-rw-r--r-- | app/gfx/skia_utils_gtk.h | 22 |
2 files changed, 54 insertions, 0 deletions
diff --git a/app/gfx/skia_utils_gtk.cc b/app/gfx/skia_utils_gtk.cc new file mode 100644 index 0000000..3937d46 --- /dev/null +++ b/app/gfx/skia_utils_gtk.cc @@ -0,0 +1,32 @@ +// Copyright (c) 2010 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 "app/gfx/skia_utils_gtk.h" + +#include <gdk/gdkcolor.h> + +namespace gfx { + +const int kSkiaToGDKMultiplier = 257; + +// GDK_COLOR_RGB multiplies by 257 (= 0x10001) to distribute the bits evenly +// See: http://www.mindcontrol.org/~hplus/graphics/expand-bits.html +// To get back, we can just right shift by eight +// (or, formulated differently, i == (i*257)/256 for all i < 256). + +SkColor GdkColorToSkColor(GdkColor color) { + return SkColorSetRGB(color.red >> 8, color.green >> 8, color.blue >> 8); +} + +GdkColor SkColorToGdkColor(SkColor color) { + GdkColor gdk_color = { + 0, + SkColorGetR(color) * kSkiaToGDKMultiplier, + SkColorGetG(color) * kSkiaToGDKMultiplier, + SkColorGetB(color) * kSkiaToGDKMultiplier + }; + return gdk_color; +} + +} // namespace gfx diff --git a/app/gfx/skia_utils_gtk.h b/app/gfx/skia_utils_gtk.h new file mode 100644 index 0000000..df68581 --- /dev/null +++ b/app/gfx/skia_utils_gtk.h @@ -0,0 +1,22 @@ +// Copyright (c) 2010 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. + +#ifndef APP_GFX_SKIA_UTILS_GTK_H_ +#define APP_GFX_SKIA_UTILS_GTK_H_ + +#include "third_party/skia/include/core/SkColor.h" + +typedef struct _GdkColor GdkColor; + +namespace gfx { + +// Converts GdkColors to the ARGB layout Skia expects. +SkColor GdkColorToSkColor(GdkColor color); + +// Converts ARGB to GdkColor. +GdkColor SkColorToGdkColor(SkColor color); + +} // namespace gfx + +#endif // APP_GFX_SKIA_UTILS_GTK_H_ |