From 04a0754f1de4d1a7ed0132542c489c630d918cf3 Mon Sep 17 00:00:00 2001 From: "asvitkine@chromium.org" Date: Mon, 23 Jul 2012 16:51:25 +0000 Subject: Initial RenderTextMac implementation using CoreText. Has support for drawing and sizing the text, but not selection and cursor movement. BUG=125664 TEST=Existing RenderText unit tests and manual testing by enabling RenderText on Mac in print_web_view_helper.cc code. Review URL: https://chromiumcodereview.appspot.com/10543057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147862 0039d316-1c4b-4281-b951-d872f2087c98 --- base/mac/foundation_util.h | 11 +++++++++++ base/mac/foundation_util.mm | 10 ++++++++++ 2 files changed, 21 insertions(+) (limited to 'base/mac') diff --git a/base/mac/foundation_util.h b/base/mac/foundation_util.h index 64adb8b..6428fa6 100644 --- a/base/mac/foundation_util.h +++ b/base/mac/foundation_util.h @@ -5,6 +5,7 @@ #ifndef BASE_MAC_FOUNDATION_UTIL_H_ #define BASE_MAC_FOUNDATION_UTIL_H_ +#include #include #include @@ -103,6 +104,11 @@ TYPE_NAME_FOR_CF_TYPE_DECL(CFNumber); TYPE_NAME_FOR_CF_TYPE_DECL(CFSet); TYPE_NAME_FOR_CF_TYPE_DECL(CFString); +TYPE_NAME_FOR_CF_TYPE_DECL(CGColor); + +TYPE_NAME_FOR_CF_TYPE_DECL(CTFont); +TYPE_NAME_FOR_CF_TYPE_DECL(CTRun); + #undef TYPE_NAME_FOR_CF_TYPE_DECL // Retain/release calls for memory management in C++. @@ -248,6 +254,11 @@ CF_CAST_DECL(CFNumber); CF_CAST_DECL(CFSet); CF_CAST_DECL(CFString); +CF_CAST_DECL(CGColor); + +CF_CAST_DECL(CTFont); +CF_CAST_DECL(CTRun); + CF_CAST_DECL(SecACL); CF_CAST_DECL(SecTrustedApplication); diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm index 7290615..d9cbbfb 100644 --- a/base/mac/foundation_util.mm +++ b/base/mac/foundation_util.mm @@ -201,6 +201,11 @@ TYPE_NAME_FOR_CF_TYPE_DEFN(CFNumber); TYPE_NAME_FOR_CF_TYPE_DEFN(CFSet); TYPE_NAME_FOR_CF_TYPE_DEFN(CFString); +TYPE_NAME_FOR_CF_TYPE_DEFN(CGColor); + +TYPE_NAME_FOR_CF_TYPE_DEFN(CTFont); +TYPE_NAME_FOR_CF_TYPE_DEFN(CTRun); + #undef TYPE_NAME_FOR_CF_TYPE_DEFN void NSObjectRetain(void* obj) { @@ -329,6 +334,11 @@ CF_CAST_DEFN(CFNumber); CF_CAST_DEFN(CFSet); CF_CAST_DEFN(CFString); +CF_CAST_DEFN(CGColor); + +CF_CAST_DEFN(CTFont); +CF_CAST_DEFN(CTRun); + #if !defined(OS_IOS) CF_CAST_DEFN(SecACL); CF_CAST_DEFN(SecTrustedApplication); -- cgit v1.1