diff options
Diffstat (limited to 'skia')
-rw-r--r-- | skia/ext/skia_utils_gtk.cc | 32 | ||||
-rw-r--r-- | skia/ext/skia_utils_gtk.h | 22 | ||||
-rw-r--r-- | skia/skia.gyp | 4 |
3 files changed, 1 insertions, 57 deletions
diff --git a/skia/ext/skia_utils_gtk.cc b/skia/ext/skia_utils_gtk.cc deleted file mode 100644 index da56374..0000000 --- a/skia/ext/skia_utils_gtk.cc +++ /dev/null @@ -1,32 +0,0 @@ -// 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 "skia/ext/skia_utils_gtk.h" - -#include <gdk/gdkcolor.h> - -namespace skia { - -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 diff --git a/skia/ext/skia_utils_gtk.h b/skia/ext/skia_utils_gtk.h deleted file mode 100644 index c9e993d..0000000 --- a/skia/ext/skia_utils_gtk.h +++ /dev/null @@ -1,22 +0,0 @@ -// 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. - -#ifndef SKIA_EXT_SKIA_UTILS_GTK_H_ -#define SKIA_EXT_SKIA_UTILS_GTK_H_ - -#include "third_party/skia/include/core/SkColor.h" - -typedef struct _GdkColor GdkColor; - -namespace skia { - -// Converts GdkColors to the ARGB layout Skia expects. -SkColor GdkColorToSkColor(GdkColor color); - -// Converts ARGB to GdkColor. -GdkColor SkColorToGdkColor(SkColor color); - -} // namespace skia - -#endif // SKIA_EXT_SKIA_UTILS_GTK_H_ diff --git a/skia/skia.gyp b/skia/skia.gyp index d85f2a1..78a71ac 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# 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. @@ -522,8 +522,6 @@ 'ext/platform_device_win.cc', 'ext/platform_device_win.h', 'ext/SkMemory_new_handler.cpp', - 'ext/skia_utils_gtk.cc', - 'ext/skia_utils_gtk.h', 'ext/skia_utils_mac.mm', 'ext/skia_utils_mac.h', 'ext/skia_utils_win.cc', |