From 9fb1ac04b1a3e7ec53e27cf1f413469d04360d1e Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Mon, 6 Aug 2018 17:11:14 -0700 Subject: fix: [mas] remove usage of _CFIsObjC --- base/mac/foundation_util.mm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm index aec8c0f6398c..6a6dfc272d45 100644 --- a/base/mac/foundation_util.mm +++ b/base/mac/foundation_util.mm @@ -25,7 +25,6 @@ extern "C" { CFTypeID SecACLGetTypeID(); CFTypeID SecTrustedApplicationGetTypeID(); -Boolean _CFIsObjC(CFTypeID typeID, CFTypeRef obj); } // extern "C" #endif @@ -323,8 +322,7 @@ NSFont* CFToNSCast(CTFontRef cf_val) { const_cast(reinterpret_cast(cf_val)); DCHECK(!cf_val || CTFontGetTypeID() == CFGetTypeID(cf_val) || - (_CFIsObjC(CTFontGetTypeID(), cf_val) && - [ns_val isKindOfClass:[NSFont class]])); + ([ns_val isKindOfClass:[NSFont class]])); return ns_val; } @@ -392,9 +390,6 @@ CFCast(const CFTypeRef& cf_val) { return (CTFontRef)(cf_val); } - if (!_CFIsObjC(CTFontGetTypeID(), cf_val)) - return NULL; - id ns_val = reinterpret_cast(const_cast(cf_val)); if ([ns_val isKindOfClass:[NSFont class]]) { return (CTFontRef)(cf_val); -- 2.17.0