Changeset 171240 in webkit

Timestamp:

Jul 18, 2014 1:50:11 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[Cocoa] Use RetainPtr in _WKRemoteObjectInterface
​https://bugs.webkit.org/show_bug.cgi?id=135062

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2014-07-18
Reviewed by Anders Carlsson.

Switch to RetainPtr instead of manual memory management of ivars.

• Shared/API/Cocoa/_WKRemoteObjectInterface.h:
• Shared/API/Cocoa/_WKRemoteObjectInterface.mm:

(-[_WKRemoteObjectInterface initWithProtocol:identifier:]):
(-[_WKRemoteObjectInterface identifier]):
(-[_WKRemoteObjectInterface description]):
(-[_WKRemoteObjectInterface dealloc]): Deleted.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/_WKRemoteObjectInterface.h (modified) (1 diff)
• Shared/API/Cocoa/_WKRemoteObjectInterface.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-18  Joseph Pecoraro  <pecoraro@apple.com>
+
+        [Cocoa] Use RetainPtr in _WKRemoteObjectInterface
+        https://bugs.webkit.org/show_bug.cgi?id=135062
+
+        Reviewed by Anders Carlsson.
+
+        Switch to RetainPtr instead of manual memory management of ivars.
+
+        * Shared/API/Cocoa/_WKRemoteObjectInterface.h:
+        * Shared/API/Cocoa/_WKRemoteObjectInterface.mm:
+        (-[_WKRemoteObjectInterface initWithProtocol:identifier:]):
+        (-[_WKRemoteObjectInterface identifier]):
+        (-[_WKRemoteObjectInterface description]):
+        (-[_WKRemoteObjectInterface dealloc]): Deleted.
+
 2014-07-18  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.h

@@ -37 +37 @@
 - (id)initWithProtocol:(Protocol *)protocol identifier:(NSString *)identifier;
 
-@property (readonly) Protocol *protocol;
-@property (readonly) NSString *identifier;
+@property (readonly, nonatomic) Protocol *protocol;
+@property (readonly, nonatomic) NSString *identifier;
 
 - (NSSet *)classesForSelector:(SEL)selector argumentIndex:(NSUInteger)argumentIndex;

trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.mm

@@ -43 +43 @@
 @implementation _WKRemoteObjectInterface {
     HashMap<SEL, Vector<RetainPtr<NSSet>>> _allowedArgumentClasses;
+    RetainPtr<NSString> _identifier;
 }
 
@@ -130 +131 @@
 
     _protocol = protocol;
-    _identifier = [identifier copy];
+    _identifier = adoptNS([identifier copy]);
 
     initializeAllowedArgumentClasses(self);
@@ -142 +143 @@
 }
 
-- (void)dealloc
-{
-    [_identifier release];
-    [super dealloc];
+- (NSString *)identifier
+{
+    return _identifier.get();
 }
 
 - (NSString *)description
 {
-    return [NSString stringWithFormat:@"<%@: %p; protocol = \"%@\"; identifier = \"%@\">", NSStringFromClass(self.class), self, _identifier, NSStringFromProtocol(_protocol)];
+    return [NSString stringWithFormat:@"<%@: %p; protocol = \"%@\"; identifier = \"%@\">", NSStringFromClass(self.class), self, _identifier.get(), NSStringFromProtocol(_protocol)];
 }