Mac: Introduce "StaticCast" variants of base::mac::FooCastStrict, which do not typecheck in Release

base/mac/foundation_util.mm

 // Copyright (c) 2012 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/mac/foundation_util.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_logging.h"
 #include "base/macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/sys_string_conversions.h"
 #include "build/build_config.h"
 
 #if !defined(OS_IOS)
+#import <AppKit/AppKit.h>
+#endif
+
+#if !defined(OS_IOS)
 extern "C" {
 CFTypeID SecACLGetTypeID();
 CFTypeID SecTrustedApplicationGetTypeID();
 Boolean _CFIsObjC(CFTypeID typeID, CFTypeRef obj);
 }  // extern "C"
 #endif
 
 namespace base {
 namespace mac {
 
@@ skipping 278 matching lines @@
 #else
 // The NSFont/CTFont toll-free bridging is broken when it comes to type
 // checking, so do some special-casing.
 // http://www.openradar.me/15341349 rdar://15341349
 NSFont* CFToNSCast(CTFontRef cf_val) {
   NSFont* ns_val =
       const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
   DCHECK(!cf_val ||
          CTFontGetTypeID() == CFGetTypeID(cf_val) ||
          (_CFIsObjC(CTFontGetTypeID(), cf_val) &&
-          [ns_val isKindOfClass:NSClassFromString(@"NSFont")]));
+          [ns_val isKindOfClass:[NSFont class]]));

[Nico, 2016/04/29 02:50:57]

Splitting these NSClassFromString("foo") -> [foo class]  changes out makes sense
to me (you can tbr that against me, this looks good)

[tapted, 2016/04/29 03:17:45]

Done.

   return ns_val;
 }
 
 CTFontRef NSToCFCast(NSFont* ns_val) {
   CTFontRef cf_val = reinterpret_cast<CTFontRef>(ns_val);
   DCHECK(!cf_val ||
          CTFontGetTypeID() == CFGetTypeID(cf_val) ||
-         [ns_val isKindOfClass:NSClassFromString(@"NSFont")]);
+         [ns_val isKindOfClass:[NSFont class]]);
   return cf_val;
 }
 #endif
 
 #undef CF_TO_NS_CAST_DEFN
 #undef CF_TO_NS_MUTABLE_CAST_DEFN
 
 #define CF_CAST_DEFN(TypeCF) \
 template<> TypeCF##Ref \
 CFCast<TypeCF##Ref>(const CFTypeRef& cf_val) { \
   if (cf_val == NULL) { \
     return NULL; \
   } \
   if (CFGetTypeID(cf_val) == TypeCF##GetTypeID()) { \
     return (TypeCF##Ref)(cf_val); \
   } \
   return NULL; \
-} \
-\
-template<> TypeCF##Ref \
-CFCastStrict<TypeCF##Ref>(const CFTypeRef& cf_val) { \
-  TypeCF##Ref rv = CFCast<TypeCF##Ref>(cf_val); \
-  DCHECK(cf_val == NULL || rv); \
-  return rv; \
 }
 
 CF_CAST_DEFN(CFArray);
 CF_CAST_DEFN(CFBag);
 CF_CAST_DEFN(CFBoolean);
 CF_CAST_DEFN(CFData);
 CF_CAST_DEFN(CFDate);
 CF_CAST_DEFN(CFDictionary);
 CF_CAST_DEFN(CFNull);
 CF_CAST_DEFN(CFNumber);
@@ skipping 19 matching lines @@
     return NULL;
   }
   if (CFGetTypeID(cf_val) == CTFontGetTypeID()) {
     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:NSClassFromString(@"NSFont")]) {
+  if ([ns_val isKindOfClass:[NSFont class]]) {
     return (CTFontRef)(cf_val);
   }
   return NULL;
 }
-
-template<> CTFontRef
-CFCastStrict<CTFontRef>(const CFTypeRef& cf_val) {
-  CTFontRef rv = CFCast<CTFontRef>(cf_val);
-  DCHECK(cf_val == NULL || rv);
-  return rv;
-}
 #endif
 
 #if !defined(OS_IOS)
 CF_CAST_DEFN(SecACL);
 CF_CAST_DEFN(SecTrustedApplication);
 #endif
 
 #undef CF_CAST_DEFN
 
 std::string GetValueFromDictionaryErrorMessage(
@@ skipping 50 matching lines @@
         CFDictionaryGetValue(user_info.get(), kCFErrorDescriptionKey));
   }
   o << "Code: " << CFErrorGetCode(err)
     << " Domain: " << CFErrorGetDomain(err)
     << " Desc: " << desc.get();
   if(errorDesc) {
     o << "(" << errorDesc << ")";
   }
   return o;
 }