35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
|
|
index 15fc15ba307e..7ca4e0ec5ca8 100644
|
|
--- a/base/mac/foundation_util.mm
|
|
+++ b/base/mac/foundation_util.mm
|
|
@@ -26,7 +26,6 @@ CFTypeID SecKeyGetTypeID();
|
|
#if !defined(OS_IOS)
|
|
CFTypeID SecACLGetTypeID();
|
|
CFTypeID SecTrustedApplicationGetTypeID();
|
|
-Boolean _CFIsObjC(CFTypeID typeID, CFTypeRef obj);
|
|
#endif
|
|
} // extern "C"
|
|
|
|
@@ -325,8 +324,7 @@ NSFont* CFToNSCast(CTFontRef cf_val) {
|
|
const_cast<NSFont*>(reinterpret_cast<const NSFont*>(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;
|
|
}
|
|
|
|
@@ -394,9 +392,6 @@ CFCast<CTFontRef>(const CFTypeRef& cf_val) {
|
|
return (CTFontRef)(cf_val);
|
|
}
|
|
|
|
- if (!_CFIsObjC(CTFontGetTypeID(), cf_val))
|
|
- return NULL;
|
|
-
|
|
id<NSObject> ns_val = reinterpret_cast<id>(const_cast<void*>(cf_val));
|
|
if ([ns_val isKindOfClass:[NSFont class]]) {
|
|
return (CTFontRef)(cf_val);
|
|
--
|
|
2.17.0
|
|
|