Changeset 260112 in webkit

Timestamp:

Apr 14, 2020, 6:24:30 PM (5 years ago)

Author:

ddkilzer@apple.com

Message:

dictionaryValueOfType() in WebCoreArgumentCodersMac.mm can be replaced with dynamic_cf_cast<>()
<​https://webkit.org/b/210456>

Reviewed by Darin Adler.

• Shared/mac/WebCoreArgumentCodersMac.mm:

(IPC::dictionaryValueOfType): Delete.
(IPC::extractDictionaryValue): Add.

• Use dynamic_cf_cast<>() in place of manually checking the CFTypeID of each object.

(IPC::createArchiveList):

• Call new extractDictionaryValue() template function to verify values are the correct types in the dictionary and to set the output variables.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/mac/WebCoreArgumentCodersMac.mm (modified) (5 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-14  David Kilzer  <ddkilzer@apple.com>
+
+        dictionaryValueOfType() in WebCoreArgumentCodersMac.mm can be replaced with dynamic_cf_cast<>()
+        <https://webkit.org/b/210456>
+
+        Reviewed by Darin Adler.
+
+        * Shared/mac/WebCoreArgumentCodersMac.mm:
+        (IPC::dictionaryValueOfType): Delete.
+        (IPC::extractDictionaryValue): Add.
+        - Use dynamic_cf_cast<>() in place of manually checking the
+          CFTypeID of each object.
+        (IPC::createArchiveList):
+        - Call new extractDictionaryValue() template function to verify
+          values are the correct types in the dictionary and to set the
+          output variables.
+
 2020-04-14  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit/Shared/mac/WebCoreArgumentCodersMac.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2020 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Company 100 Inc. All rights reserved.
  *
@@ -41 +41 @@
 #import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/MachSendRight.h>
+#import <wtf/cf/TypeCastsCF.h>
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
@@ -92 +93 @@
 }
 
-static CFTypeRef dictionaryValueOfType(CFDictionaryRef dictionary, CFStringRef key, CFTypeID type)
-{
-    CFTypeRef value = CFDictionaryGetValue(dictionary, key);
-    if (value && CFGetTypeID(value) == type)
-        return value;
-    return nullptr;
+template<typename ValueType> bool extractDictionaryValue(CFDictionaryRef dictionary, CFStringRef key, ValueType* result)
+{
+    auto untypedValue = CFDictionaryGetValue(dictionary, key);
+    auto value = dynamic_cf_cast<ValueType>(untypedValue);
+    if (untypedValue && !value)
+        return false;
+    if (result)
+        *result = value;
+    return true;
 }
 
 static bool createArchiveList(CFDictionaryRef representation, CFTypeRef tokenNull, CFIndex* version, CFTypeRef** objects, CFIndex* objectCount, CFDictionaryRef* protocolProperties, CFNumberRef* expectedContentLength, CFStringRef* mimeType)
 {
-    CFNumberRef versionNumber = (CFNumberRef)dictionaryValueOfType(representation, CFSTR("version"), CFNumberGetTypeID());
+    auto versionNumber = dynamic_cf_cast<CFNumberRef>(CFDictionaryGetValue(representation, CFSTR("version")));
     if (!versionNumber)
         return false;
@@ -109 +113 @@
         return false;
 
-    CFArrayRef archiveListArray = (CFArrayRef)dictionaryValueOfType(representation, CFSTR("archiveList"), CFArrayGetTypeID());
+    auto archiveListArray = dynamic_cf_cast<CFArrayRef>(CFDictionaryGetValue(representation, CFSTR("archiveList")));
     if (!archiveListArray)
         return false;
@@ -130 +134 @@
     }
 
-    if (protocolProperties)
-        *protocolProperties = (CFDictionaryRef)dictionaryValueOfType(representation, CFSTR("protocolProperties"), CFDictionaryGetTypeID());
-
-    if (expectedContentLength)
-        *expectedContentLength = (CFNumberRef)dictionaryValueOfType(representation, CFSTR("expectedContentLength"), CFNumberGetTypeID());
-
-    if (mimeType)
-        *mimeType = (CFStringRef)dictionaryValueOfType(representation, CFSTR("mimeType"), CFStringGetTypeID());
+    if (!extractDictionaryValue(representation, CFSTR("protocolProperties"), protocolProperties))
+        return false;
+    if (!extractDictionaryValue(representation, CFSTR("expectedContentLength"), expectedContentLength))
+        return false;
+    if (!extractDictionaryValue(representation, CFSTR("mimeType"), mimeType))
+        return false;
 
     return true;