Changeset 230713 in webkit

Timestamp:

Apr 17, 2018 9:28:33 AM (6 years ago)

Author:

ddkilzer@apple.com

Message:

Implement checked cast for DDResultRef once DDResultGetTypeID() is available
<​https://webkit.org/b/184554>
<rdar://problem/36241894>

Reviewed by Brent Fulgham.

• editing/cocoa/DataDetection.mm:

(WebCore::detectItemAtPositionWithRange): Implement checked cast
for DDResultRef.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/cocoa/DataDetection.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-04-17  David Kilzer  <ddkilzer@apple.com>
+
+        Implement checked cast for DDResultRef once DDResultGetTypeID() is available
+        <https://webkit.org/b/184554>
+        <rdar://problem/36241894>
+
+        Reviewed by Brent Fulgham.
+
+        * editing/cocoa/DataDetection.mm:
+        (WebCore::detectItemAtPositionWithRange): Implement checked cast
+        for DDResultRef.
+
 2018-04-17  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/editing/cocoa/DataDetection.mm

@@ -51 +51 @@
 #import <pal/spi/ios/DataDetectorsUISPI.h>
 #import <pal/spi/mac/DataDetectorsSPI.h>
+#import <wtf/cf/TypeCastsCF.h>
 #import <wtf/text/StringBuilder.h>
 
 #import "DataDetectorsCoreSoftLink.h"
+
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+WTF_DECLARE_CF_TYPE_TRAIT(DDResult);
+#endif
 
 namespace WebCore {
@@ -79 +84 @@
     CFIndex resultCount = CFArrayGetCount(results.get());
     for (CFIndex i = 0; i < resultCount; i++) {
-        // FIXME: <rdar://problem/36241894> Implement checked cast for DDResultRef once DDResultGetTypeID() is available
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+        DDResultRef result = checked_cf_cast<DDResultRef>(CFArrayGetValueAtIndex(results.get(), i));
+#else
         DDResultRef result = static_cast<DDResultRef>(const_cast<CF_BRIDGED_TYPE(id) void*>(CFArrayGetValueAtIndex(results.get(), i)));
+#endif
         CFRange resultRangeInContext = DDResultGetRange(result);
         if (hitLocation >= resultRangeInContext.location && (hitLocation - resultRangeInContext.location) < resultRangeInContext.length) {