Simplify -[_WKRemoteObjectRegistry _invokeMethod:]
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Nov 2015 19:25:52 +0000 (19:25 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Nov 2015 19:25:52 +0000 (19:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=150844

Reviewed by Tim Horton.

* Shared/API/Cocoa/_WKRemoteObjectRegistry.mm:
(-[_WKRemoteObjectRegistry _invokeMethod:]):
(-[_WKRemoteObjectRegistry _invokeMessageWithInterfaceIdentifier:encodedInvocation:]): Deleted.
* Shared/API/Cocoa/_WKRemoteObjectRegistryInternal.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191962 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm
Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistryInternal.h

index bc92886..c9463f1 100644 (file)
@@ -1,3 +1,15 @@
+2015-11-03  Anders Carlsson  <andersca@apple.com>
+
+        Simplify -[_WKRemoteObjectRegistry _invokeMethod:]
+        https://bugs.webkit.org/show_bug.cgi?id=150844
+
+        Reviewed by Tim Horton.
+
+        * Shared/API/Cocoa/_WKRemoteObjectRegistry.mm:
+        (-[_WKRemoteObjectRegistry _invokeMethod:]):
+        (-[_WKRemoteObjectRegistry _invokeMessageWithInterfaceIdentifier:encodedInvocation:]): Deleted.
+        * Shared/API/Cocoa/_WKRemoteObjectRegistryInternal.h:
+
 2015-11-02  Anders Carlsson  <andersca@apple.com>
 
         CTTE the responsiveness timer getter
index 1f974df..eb3788c 100644 (file)
@@ -148,15 +148,11 @@ static uint64_t generateReplyIdentifier()
     return *_remoteObjectRegistry;
 }
 
-- (BOOL)_invokeMethod:(const RemoteObjectInvocation&)invocation
+- (void)_invokeMethod:(const RemoteObjectInvocation&)remoteObjectInvocation
 {
-    [self _invokeMessageWithInterfaceIdentifier:invocation.interfaceIdentifier() encodedInvocation:invocation.encodedInvocation()];
+    auto& interfaceIdentifier = remoteObjectInvocation.interfaceIdentifier();
+    auto* encodedInvocation = remoteObjectInvocation.encodedInvocation();
 
-    return YES;
-}
-
-- (void)_invokeMessageWithInterfaceIdentifier:(const String&)interfaceIdentifier encodedInvocation:(const API::Dictionary*)encodedInvocation
-{
     auto interfaceAndObject = _exportedObjects.get(interfaceIdentifier);
     if (!interfaceAndObject.second) {
         NSLog(@"Did not find a registered object for the interface \"%@\"", (NSString *)interfaceIdentifier);
index 3921d4a..e0ee619 100644 (file)
@@ -44,7 +44,7 @@ class RemoteObjectRegistry;
 - (void)_invalidate;
 
 - (void)_sendInvocation:(NSInvocation *)invocation interface:(_WKRemoteObjectInterface *)interface;
-- (BOOL)_invokeMethod:(const WebKit::RemoteObjectInvocation&)invocation;
+- (void)_invokeMethod:(const WebKit::RemoteObjectInvocation&)invocation;
 
 @end