Changeset 232513 in webkit for trunk/Source/JavaScriptCore/API/JSContext.mm

Timestamp:

Jun 5, 2018, 10:25:00 AM (7 years ago)

Author:

Darin Adler

Message:

[Cocoa] Update some JavaScriptCore code to be more ready for ARC
​https://bugs.webkit.org/show_bug.cgi?id=186301

Reviewed by Anders Carlsson.

• API/JSContext.mm:

(-[JSContext evaluateScript:withSourceURL:]): Use bridge for typecast.
(-[JSContext setName:]): Removed unnecessary call to copy, since the
JSStringCreateWithCFString function already reads the characters out
of the string and does not retain the string, so there is no need to
make an immutable copy. And used bridge for typecast.

• inspector/remote/cocoa/RemoteInspectorCocoa.mm:

(Inspector::RemoteInspector::receivedProxyApplicationSetupMessage):
Ditto.

• inspector/remote/cocoa/RemoteInspectorXPCConnection.mm:

(Inspector::RemoteInspectorXPCConnection::deserializeMessage):
Use CFBridgingRelease instead of autorelease for a CF dictionary that
we return as an NSDictionary.

File:

• trunk/Source/JavaScriptCore/API/JSContext.mm (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/JSContext.mm

@@ -101 +101 @@
 {
     JSValueRef exceptionValue = nullptr;
-    JSStringRef scriptJS = JSStringCreateWithCFString((CFStringRef)script);
-    JSStringRef sourceURLJS = sourceURL ? JSStringCreateWithCFString((CFStringRef)[sourceURL absoluteString]) : nullptr;
+    JSStringRef scriptJS = JSStringCreateWithCFString((__bridge CFStringRef)script);
+    JSStringRef sourceURLJS = sourceURL ? JSStringCreateWithCFString((__bridge CFStringRef)[sourceURL absoluteString]) : nullptr;
     JSValueRef result = JSEvaluateScript(m_context, scriptJS, nullptr, sourceURLJS, 0, &exceptionValue);
     if (sourceURLJS)
@@ -203 +203 @@
 - (void)setName:(NSString *)name
 {
-    JSStringRef nameJS = name ? JSStringCreateWithCFString((CFStringRef)[[name copy] autorelease]) : nullptr;
+    JSStringRef nameJS = name ? JSStringCreateWithCFString((__bridge CFStringRef)name) : nullptr;
     JSGlobalContextSetName(m_context, nameJS);
     if (nameJS)