diff options
author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-02 22:35:42 +0000 |
---|---|---|
committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-02 22:35:42 +0000 |
commit | 004a96a015b5dfcadaad4ea1b192c97c415b75de (patch) | |
tree | cb32d3809e4366c07e837416a106a3083d2690a5 /base/gfx/skia_utils_mac.cc | |
parent | f8ed412acb7bcab9855d0ebd9d29f7e38a3a8f92 (diff) | |
download | chromium_src-004a96a015b5dfcadaad4ea1b192c97c415b75de.zip chromium_src-004a96a015b5dfcadaad4ea1b192c97c415b75de.tar.gz chromium_src-004a96a015b5dfcadaad4ea1b192c97c415b75de.tar.bz2 |
Move convolver, image_operations, and skia_utils from base/gfx to skia/ext.
This changes the namespace in those files from "gfx" to "skia".
I split skia_utils into two parts, the Windows specific part is now in a separate file called skia_utils_win.
There were several obsolete includes of these headers which I removed. I also removed img_resize_perftest which isn't used and has bitrotted.
Review URL: http://codereview.chromium.org/12842
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/gfx/skia_utils_mac.cc')
-rw-r--r-- | base/gfx/skia_utils_mac.cc | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/base/gfx/skia_utils_mac.cc b/base/gfx/skia_utils_mac.cc deleted file mode 100644 index b5962c3..0000000 --- a/base/gfx/skia_utils_mac.cc +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright (c) 2006-2008 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 "base/gfx/skia_utils_mac.h" - -#include "base/logging.h" -#include "SkMatrix.h" -#include "SkRect.h" - -namespace gfx { - -CGAffineTransform SkMatrixToCGAffineTransform(const SkMatrix& matrix) { - // CGAffineTransforms don't support perspective transforms, so make sure - // we don't get those. - DCHECK(matrix[SkMatrix::kMPersp0] == 0.0f); - DCHECK(matrix[SkMatrix::kMPersp1] == 0.0f); - DCHECK(matrix[SkMatrix::kMPersp2] == 1.0f); - - return CGAffineTransformMake(matrix[SkMatrix::kMScaleX], - matrix[SkMatrix::kMSkewY], - matrix[SkMatrix::kMSkewX], - matrix[SkMatrix::kMScaleY], - matrix[SkMatrix::kMTransX], - matrix[SkMatrix::kMTransY]); -} - -SkIRect CGRectToSkIRect(const CGRect& rect) { - SkIRect sk_rect = { - SkScalarRound(rect.origin.x), - SkScalarRound(rect.origin.y), - SkScalarRound(rect.origin.x + rect.size.width), - SkScalarRound(rect.origin.y + rect.size.height) - }; - return sk_rect; -} - -SkRect CGRectToSkRect(const CGRect& rect) { - SkRect sk_rect = { - rect.origin.x, - rect.origin.y, - rect.origin.x + rect.size.width, - rect.origin.y + rect.size.height, - }; - return sk_rect; -} - -CGRect SkIRectToCGRect(const SkIRect& rect) { - CGRect cg_rect = { - { rect.fLeft, rect.fTop }, - { rect.fRight - rect.fLeft, rect.fBottom - rect.fTop } - }; - return cg_rect; -} - -CGRect SkRectToCGRect(const SkRect& rect) { - CGRect cg_rect = { - { rect.fLeft, rect.fTop }, - { rect.fRight - rect.fLeft, rect.fBottom - rect.fTop } - }; - return cg_rect; -} - -// Converts CGColorRef to the ARGB layout Skia expects. -SkColor CGColorRefToSkColor(CGColorRef color) { - DCHECK(CGColorGetNumberOfComponents(color) == 4); - const CGFloat *components = CGColorGetComponents(color); - return SkColorSetARGB(SkScalarRound(255.0 * components[3]), // alpha - SkScalarRound(255.0 * components[0]), // red - SkScalarRound(255.0 * components[1]), // green - SkScalarRound(255.0 * components[2])); // blue -} - -// Converts ARGB to CGColorRef. -CGColorRef SkColorToCGColorRef(SkColor color) { - return CGColorCreateGenericRGB(SkColorGetR(color) / 255.0, - SkColorGetG(color) / 255.0, - SkColorGetB(color) / 255.0, - SkColorGetA(color) / 255.0); -} - -} // namespace gfx - |