Changeset 236469 in webkit

Timestamp:

Sep 25, 2018, 12:32:44 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Stricter block syntax in generated ObjC protocol interfaces
​https://bugs.webkit.org/show_bug.cgi?id=189962
<rdar://problem/44648287>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2018-09-25
Reviewed by Brian Burg.

• inspector/scripts/codegen/generate_objc_header.py:

(ObjCHeaderGenerator._callback_block_for_command):
If there are no return parameters include "void" in the block signature.

• inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result:
• inspector/scripts/tests/generic/expected/domain-availability.json-result:
• inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result:
• inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result:
• inspector/scripts/tests/generic/expected/worker-supported-domains.json-result:
• inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result:

Rebaseline test results.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/scripts/codegen/generate_objc_header.py (modified) (1 diff)
• inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result (modified) (1 diff)
• inspector/scripts/tests/generic/expected/domain-availability.json-result (modified) (1 diff)
• inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result (modified) (1 diff)
• inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result (modified) (1 diff)
• inspector/scripts/tests/generic/expected/worker-supported-domains.json-result (modified) (1 diff)
• inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-09-25  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Stricter block syntax in generated ObjC protocol interfaces
+        https://bugs.webkit.org/show_bug.cgi?id=189962
+        <rdar://problem/44648287>
+
+        Reviewed by Brian Burg.
+
+        * inspector/scripts/codegen/generate_objc_header.py:
+        (ObjCHeaderGenerator._callback_block_for_command):
+        If there are no return parameters include "void" in the block signature.
+
+        * inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result:
+        * inspector/scripts/tests/generic/expected/domain-availability.json-result:
+        * inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result:
+        * inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result:
+        * inspector/scripts/tests/generic/expected/worker-supported-domains.json-result:
+        * inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result:
+        Rebaseline test results.
+
 2018-09-24  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py

@@ -227 +227 @@
         for parameter in command.return_parameters:
             pairs.append(join_type_and_name(self.objc_type_for_param(domain, command.command_name, parameter), parameter.parameter_name))
-        return 'void(^)(%s)' % ', '.join(pairs)
+        params = 'void'
+        if pairs:
+            params = ', '.join(pairs)
+        return 'void(^)(%s)' % params
 
     def _generate_event_interfaces(self, domain):

trunk/Source/JavaScriptCore/inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result

@@ -916 +916 @@
 @protocol TestProtocolNetworkDomainHandler <NSObject>
 @required
-- (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
+- (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
 @end
 

trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/domain-availability.json-result

@@ -906 +906 @@
 @protocol TestProtocolDomainADomainHandler <NSObject>
 @required
-- (void)enableWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
+- (void)enableWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
 @end
 
 @protocol TestProtocolDomainBDomainHandler <NSObject>
 @required
-- (void)enableWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
+- (void)enableWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
 @end
 

trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result

@@ -1163 +1163 @@
 @protocol TestProtocolNetwork1DomainHandler <NSObject>
 @required
-- (void)loadResource1WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
+- (void)loadResource1WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
 @end
 
 @protocol TestProtocolNetwork3DomainHandler <NSObject>
 @required
-- (void)loadResource1WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
-- (void)loadResource2WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
-- (void)loadResource3WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
-- (void)loadResource4WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
-- (void)loadResource5WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
-- (void)loadResource6WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
-- (void)loadResource7WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
+- (void)loadResource1WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
+- (void)loadResource2WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
+- (void)loadResource3WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
+- (void)loadResource4WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
+- (void)loadResource5WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
+- (void)loadResource6WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
+- (void)loadResource7WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
 @end
 

trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result

@@ -943 +943 @@
 @protocol TestProtocolNetwork1DomainHandler <NSObject>
 @required
-- (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
+- (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
 @end
 

trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/worker-supported-domains.json-result

@@ -907 +907 @@
 @protocol TestProtocolDomainADomainHandler <NSObject>
 @required
-- (void)enableWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
+- (void)enableWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
 @end
 
 @protocol TestProtocolDomainBDomainHandler <NSObject>
 @required
-- (void)enableWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
+- (void)enableWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
 @end
 

trunk/Source/JavaScriptCore/inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result

@@ -916 +916 @@
 @protocol TestProtocolNetworkDomainHandler <NSObject>
 @required
-- (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
+- (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
 @end