Changeset 163630 in webkit

Timestamp:

Feb 7, 2014 10:32:38 AM (10 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] WKRemoteObjectInterface doesn’t support aribtrary argument classes
​https://bugs.webkit.org/show_bug.cgi?id=128368

Reviewed by Anders Carlsson.

• Shared/API/Cocoa/WKRemoteObjectInterface.h: Declared new methods.
• Shared/API/Cocoa/WKRemoteObjectInterface.mm:

(propertyListClasses): Removed NSNull, which is not really a property list class.
(classesForSelectorArgument): Added helper function.
(-[WKRemoteObjectInterface classesForSelector:argumentIndex:]): Added.
(-[WKRemoteObjectInterface setClasses:forSelector:argumentIndex:]): Added.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/WKRemoteObjectInterface.h (modified) (1 diff)
• Shared/API/Cocoa/WKRemoteObjectInterface.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-07  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] WKRemoteObjectInterface doesn’t support aribtrary argument classes
+        https://bugs.webkit.org/show_bug.cgi?id=128368
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/API/Cocoa/WKRemoteObjectInterface.h: Declared new methods.
+        * Shared/API/Cocoa/WKRemoteObjectInterface.mm:
+        (propertyListClasses): Removed NSNull, which is not really a property list class.
+        (classesForSelectorArgument): Added helper function.
+        (-[WKRemoteObjectInterface classesForSelector:argumentIndex:]): Added.
+        (-[WKRemoteObjectInterface setClasses:forSelector:argumentIndex:]): Added.
+
 2014-02-07  Dan Bernstein  <mitz@apple.com>
 

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

@@ -33 +33 @@
 @interface WKRemoteObjectInterface : NSObject
 
++ (instancetype)remoteObjectInterfaceWithProtocol:(Protocol *)protocol;
+
+- (id)initWithProtocol:(Protocol *)protocol identifier:(NSString *)identifier;
+
 @property (readonly) Protocol *protocol;
 @property (readonly) NSString *identifier;
 
-- (id)initWithProtocol:(Protocol *)protocol identifier:(NSString *)identifier;
-
-+ (instancetype)remoteObjectInterfaceWithProtocol:(Protocol *)protocol;
+- (NSSet *)classesForSelector:(SEL)selector argumentIndex:(NSUInteger)argumentIndex;
+- (void)setClasses:(NSSet *)classes forSelector:(SEL)selector argumentIndex:(NSUInteger)argumentIndex;
 
 @end

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

@@ -56 +56 @@
 {
     // FIXME: Add more property list classes if needed.
-    static NSSet *propertyListClasses = [[NSSet alloc] initWithObjects:[NSArray class], [NSDictionary class], [NSNull class], [NSNumber class], [NSString class], nil];
+    static NSSet *propertyListClasses = [[NSSet alloc] initWithObjects:[NSArray class], [NSDictionary class], [NSNumber class], [NSString class], nil];
 
     return propertyListClasses;
@@ -142 +142 @@
 }
 
+static RetainPtr<NSSet>& classesForSelectorArgument(WKRemoteObjectInterface *interface, SEL selector, NSUInteger argumentIndex)
+{
+    auto it = interface->_allowedArgumentClasses.find(selector);
+    if (it == interface->_allowedArgumentClasses.end())
+        [NSException raise:NSInvalidArgumentException format:@"Interface does not contain selector \"%s\"", sel_getName(selector)];
+
+    if (argumentIndex >= it->value.size())
+        [NSException raise:NSInvalidArgumentException format:@"Argument index %ld is out of range for selector \"%s\"", (unsigned long)argumentIndex, sel_getName(selector)];
+
+    return it->value[argumentIndex];
+}
+
+- (NSSet *)classesForSelector:(SEL)selector argumentIndex:(NSUInteger)argumentIndex
+{
+    return [[classesForSelectorArgument(self, selector, argumentIndex).get() retain] autorelease];
+}
+
+- (void)setClasses:(NSSet *)classes forSelector:(SEL)selector argumentIndex:(NSUInteger)argumentIndex
+{
+    classesForSelectorArgument(self, selector, argumentIndex) = adoptNS([classes copy]);
+}
+
 static const char* methodArgumentTypeEncodingForSelector(Protocol *protocol, SEL selector)
 {