[webkit-changes] [236469] trunk/Source/JavaScriptCore

Tue, 25 Sep 2018 12:34:20 -0700

Title: [236469] trunk/Source/_javascript_Core
Revision
236469
Author
[email protected]
Date
2018-09-25 12:32:44 -0700 (Tue, 25 Sep 2018)

Log 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 <[email protected]> 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.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (236468 => 236469)


--- trunk/Source/_javascript_Core/ChangeLog	2018-09-25 18:59:38 UTC (rev 236468)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-09-25 19:32:44 UTC (rev 236469)
@@ -1,3 +1,23 @@
+2018-09-25  Joseph Pecoraro  <[email protected]>
+
+        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  <[email protected]>
 
         Remove AUTHORS and THANKS files which are stale

Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_header.py (236468 => 236469)


--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_header.py	2018-09-25 18:59:38 UTC (rev 236468)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_header.py	2018-09-25 19:32:44 UTC (rev 236469)
@@ -226,7 +226,10 @@
         pairs = []
         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):
         lines = []

Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result (236468 => 236469)


--- trunk/Source/_javascript_Core/inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result	2018-09-25 18:59:38 UTC (rev 236468)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result	2018-09-25 19:32:44 UTC (rev 236469)
@@ -915,7 +915,7 @@
 
 @protocol TestProtocolNetworkDomainHandler <NSObject>
 @required
-- (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
+- (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
 @end
 
 __attribute__((visibility ("default")))

Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/domain-availability.json-result (236468 => 236469)


--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/domain-availability.json-result	2018-09-25 18:59:38 UTC (rev 236468)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/domain-availability.json-result	2018-09-25 19:32:44 UTC (rev 236469)
@@ -905,12 +905,12 @@
 
 @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

Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result (236468 => 236469)


--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result	2018-09-25 18:59:38 UTC (rev 236468)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result	2018-09-25 19:32:44 UTC (rev 236469)
@@ -1162,18 +1162,18 @@
 
 @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

Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result (236468 => 236469)


--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result	2018-09-25 18:59:38 UTC (rev 236468)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result	2018-09-25 19:32:44 UTC (rev 236469)
@@ -942,7 +942,7 @@
 
 @protocol TestProtocolNetwork1DomainHandler <NSObject>
 @required
-- (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
+- (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
 @end
 
 __attribute__((visibility ("default")))

Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/worker-supported-domains.json-result (236468 => 236469)


--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/worker-supported-domains.json-result	2018-09-25 18:59:38 UTC (rev 236468)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/worker-supported-domains.json-result	2018-09-25 19:32:44 UTC (rev 236469)
@@ -906,12 +906,12 @@
 
 @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

Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result (236468 => 236469)


--- trunk/Source/_javascript_Core/inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result	2018-09-25 18:59:38 UTC (rev 236468)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result	2018-09-25 19:32:44 UTC (rev 236469)
@@ -915,7 +915,7 @@
 
 @protocol TestProtocolNetworkDomainHandler <NSObject>
 @required
-- (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)())successCallback;
+- (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback;
 @end
 
 __attribute__((visibility ("default")))

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to