From 24a14e8415f49c0aa2d7f1d0debc6faf2e3d7d20 Mon Sep 17 00:00:00 2001 From: "brettw@google.com" Date: Wed, 3 Dec 2008 20:26:51 +0000 Subject: Move skia_utils_mac from base/gfx to skia/ext. Review URL: http://codereview.chromium.org/12911 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6302 0039d316-1c4b-4281-b951-d872f2087c98 --- base/base.xcodeproj/project.pbxproj | 6 --- base/gfx/skia_utils_mac.cc | 83 ------------------------------------- base/gfx/skia_utils_mac.h | 51 ----------------------- 3 files changed, 140 deletions(-) delete mode 100644 base/gfx/skia_utils_mac.cc delete mode 100644 base/gfx/skia_utils_mac.h (limited to 'base') diff --git a/base/base.xcodeproj/project.pbxproj b/base/base.xcodeproj/project.pbxproj index c23cb39..85bd3df 100644 --- a/base/base.xcodeproj/project.pbxproj +++ b/base/base.xcodeproj/project.pbxproj @@ -40,7 +40,6 @@ 4D11B59C0E91730500EF7617 /* rand_util_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D11B5970E9172F800EF7617 /* rand_util_unittest.cc */; }; 4D11B89E0E929F0400EF7617 /* file_path.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D11B89B0E929EFF00EF7617 /* file_path.cc */; }; 4D11B89F0E929F0700EF7617 /* file_path_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D11B89D0E929EFF00EF7617 /* file_path_unittest.cc */; }; - 4D64ABDA0EE6FA110021761F /* skia_utils_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A7436A470EE6F591003562CC /* skia_utils_mac.cc */; }; 536092FA0ECE474500D1B91E /* dtoa.cc in Sources */ = {isa = PBXBuildFile; fileRef = 536092F80ECE474500D1B91E /* dtoa.cc */; settings = {COMPILER_FLAGS = "-Wno-write-strings -Wno-all"; }; }; 536092FB0ECE474500D1B91E /* g_fmt.cc in Sources */ = {isa = PBXBuildFile; fileRef = 536092F90ECE474500D1B91E /* g_fmt.cc */; settings = {COMPILER_FLAGS = "-Wno-write-strings -Wno-all"; }; }; 7B26302F0E82F218001CE27F /* message_pump_libevent.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B26302D0E82F218001CE27F /* message_pump_libevent.cc */; }; @@ -596,8 +595,6 @@ A5A0270A0E4A630D00498DA9 /* file_util_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = file_util_mac.mm; sourceTree = ""; }; A5A0276B0E4BA33700498DA9 /* build_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = build_config.h; path = ../build/build_config.h; sourceTree = SOURCE_ROOT; }; A5A0282D0E4CFA8500498DA9 /* file_util_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_util_unittest.cc; sourceTree = ""; }; - A7436A470EE6F591003562CC /* skia_utils_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skia_utils_mac.cc; sourceTree = ""; }; - A7436A480EE6F591003562CC /* skia_utils_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = skia_utils_mac.h; sourceTree = ""; }; AB14B6060EBFA74C00FB3807 /* time_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = time_posix.cc; sourceTree = ""; }; ABE1BA290E7574D1009041DA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; ABF4B98E0DC2BA6900A6E319 /* base_paths_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = base_paths_mac.mm; sourceTree = ""; }; @@ -1076,8 +1073,6 @@ E45629E40E27C058005E4685 /* rect_unittest.cc */, 7B8505A40E5B3FBE00730B43 /* size.cc */, 825403D70D92D31D0006B936 /* size.h */, - A7436A470EE6F591003562CC /* skia_utils_mac.cc */, - A7436A480EE6F591003562CC /* skia_utils_mac.h */, ); path = gfx; sourceTree = ""; @@ -1416,7 +1411,6 @@ 825403F20D92D31D0006B936 /* point.cc in Sources */, 825403F50D92D31D0006B936 /* rect.cc in Sources */, 7B8505B30E5B432200730B43 /* size.cc in Sources */, - 4D64ABDA0EE6FA110021761F /* skia_utils_mac.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; 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 - diff --git a/base/gfx/skia_utils_mac.h b/base/gfx/skia_utils_mac.h deleted file mode 100644 index a99905f..0000000 --- a/base/gfx/skia_utils_mac.h +++ /dev/null @@ -1,51 +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. - - -#ifndef BASE_GFX_SKIA_UTILS_MAC_H__ -#define BASE_GFX_SKIA_UTILS_MAC_H__ - -#include "SkColor.h" -#include - -struct SkMatrix; -struct SkIRect; -struct SkPoint; -struct SkRect; - -namespace gfx { - -// Converts a Skia point to a CoreGraphics CGPoint. -// Both use same in-memory format. -inline const CGPoint& SkPointToCGPoint(const SkPoint& point) { - return reinterpret_cast(point); -} - -// Converts a CoreGraphics point to a Skia CGPoint. -// Both use same in-memory format. -inline const SkPoint& CGPointToSkPoint(const CGPoint& point) { - return reinterpret_cast(point); -} - -// Matrix converters. -CGAffineTransform SkMatrixToCGAffineTransform(const SkMatrix& matrix); - -// Rectangle converters. -SkRect CGRectToSkRect(const CGRect& rect); -SkIRect CGRectToSkIRect(const CGRect& rect); - -// Converts a Skia rect to a CoreGraphics CGRect. -CGRect SkIRectToCGRect(const SkIRect& rect); -CGRect SkRectToCGRect(const SkRect& rect); - -// Converts CGColorRef to the ARGB layout Skia expects. -SkColor CGColorRefToSkColor(CGColorRef color); - -// Converts ARGB to CGColorRef. -CGColorRef SkColorToCGColorRef(SkColor color); - -} // namespace gfx - -#endif - -- cgit v1.1