Changeset 167114 in webkit

Timestamp:

Apr 10, 2014, 11:16:32 PM (11 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/16582465> [Cocoa] Avoid casts from CF types to unrelated Objective-C types
​https://bugs.webkit.org/show_bug.cgi?id=131529

Reviewed by Mark Rowe.

• Shared/API/c/cf/WKStringCF.mm:

(WKStringCreateWithCFString): Cast the CFStringRef into its toll-free-bridged counterpart,
NSString, then cast the NSString into a WKNSString.

• Shared/API/c/cf/WKURLCF.mm:

(WKURLCreateWithCFURL): Cast the CFURLRef into its toll-free-bridged counterpart, NSURL,
then cast the NSURL into a WKNSURL.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/c/cf/WKStringCF.mm (modified) (1 diff)
• Shared/API/c/cf/WKURLCF.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-10  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/16582465> [Cocoa] Avoid casts from CF types to unrelated Objective-C types
+        https://bugs.webkit.org/show_bug.cgi?id=131529
+
+        Reviewed by Mark Rowe.
+
+        * Shared/API/c/cf/WKStringCF.mm:
+        (WKStringCreateWithCFString): Cast the CFStringRef into its toll-free-bridged counterpart,
+        NSString, then cast the NSString into a WKNSString.
+        * Shared/API/c/cf/WKURLCF.mm:
+        (WKURLCreateWithCFURL): Cast the CFURLRef into its toll-free-bridged counterpart, NSURL,
+        then cast the NSURL into a WKNSURL.
+
 2014-04-10  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.mm

@@ -51 +51 @@
 #if WK_API_ENABLED
     // Since WKNSString is an internal class with no subclasses, we can do a simple equality check.
-    if (object_getClass((NSString *)cfString) == wkNSStringClass()) {
-        return toAPI(static_cast<API::String*>(&[(WKNSString *)cfString retain]._apiObject));
-    }
+    if (object_getClass((NSString *)cfString) == wkNSStringClass())
+        return toAPI(static_cast<API::String*>(&[(WKNSString *)[(NSString *)cfString retain] _apiObject]));
 #endif
     String string(cfString);

trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.mm

@@ -55 +55 @@
 #if WK_API_ENABLED
     // Since WKNSURL is an internal class with no subclasses, we can do a simple equality check.
-    if (object_getClass((NSURL *)cfURL) == wkNSURLClass()) {
-        return toAPI(static_cast<API::URL*>(&[(WKNSURL *)cfURL retain]._apiObject));
-    }
+    if (object_getClass((NSURL *)cfURL) == wkNSURLClass())
+        return toAPI(static_cast<API::URL*>(&[(WKNSURL *)[(NSURL *)cfURL retain] _apiObject]));
 #endif