Changeset 251395 in webkit
- Timestamp:
- Oct 21, 2019 4:30:13 PM (4 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r251394 r251395 1 2019-10-21 Devin Rousso <drousso@apple.com> 2 3 Web Inspector: make ObjC protocol dispatcher commands optional and add `respondsToSelector` checks to allow other inspector clients to choose what they implement 4 https://bugs.webkit.org/show_bug.cgi?id=203197 5 6 Reviewed by Joseph Pecoraro. 7 8 This will help eliminate internal build failures, and will also allow other clients to 9 remove all of their commands that previously just responded with an "unsupported" error. 10 11 * inspector/scripts/codegen/objc_generator_templates.py: 12 * inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py: 13 (ObjCBackendDispatcherImplementationGenerator._generate_handler_implementation_for_command): 14 (ObjCBackendDispatcherImplementationGenerator._generate_responds_to_selector_for_command): Added. 15 Add a `respondsToSelector` check before attempting to call the delegate function. 16 17 * inspector/scripts/codegen/generate_objc_header.py: 18 (ObjCHeaderGenerator._generate_command_protocols): 19 Mark all commands as `@optional`. 20 21 * inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result: 22 * inspector/scripts/tests/generic/expected/command-targetType-matching-domain-debuggableType.json-result: 23 * inspector/scripts/tests/generic/expected/commands-with-async-attribute.json-result: 24 * inspector/scripts/tests/generic/expected/commands-with-optional-call-return-parameters.json-result: 25 * inspector/scripts/tests/generic/expected/domain-debuggableTypes.json-result: 26 * inspector/scripts/tests/generic/expected/domain-targetType-matching-domain-debuggableType.json-result: 27 * inspector/scripts/tests/generic/expected/domain-targetTypes.json-result: 28 * inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result: 29 * inspector/scripts/tests/generic/expected/enum-values.json-result: 30 * inspector/scripts/tests/generic/expected/event-targetType-matching-domain-debuggableType.json-result: 31 * inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result: 32 * inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result: 33 1 34 2019-10-21 Saam Barati <sbarati@apple.com> 2 35 -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py
r249504 r251395 99 99 'commandName': command.command_name, 100 100 'parameters': ', '.join(parameters), 101 'respondsToSelector': self._generate_responds_to_selector_for_command(domain, command), 101 102 'successCallback': self._generate_success_block_for_command(domain, command), 102 103 'conversions': self._generate_conversions_for_command(domain, command), … … 105 106 106 107 return self.wrap_with_guard_for_domain(domain, Template(ObjCTemplates.BackendDispatcherHeaderDomainHandlerImplementation).substitute(None, **command_args)) 108 109 def _generate_responds_to_selector_for_command(self, domain, command): 110 return '[m_delegate respondsToSelector:@selector(%sWithErrorCallback:successCallback:%s)]' % (command.command_name, ''.join(map(lambda parameter: '%s:' % parameter.parameter_name, command.call_parameters))) 107 111 108 112 def _generate_success_block_for_command(self, domain, command): -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py
r248602 r251395 216 216 objc_name = '%s%sDomainHandler' % (self.objc_prefix(), domain.domain_name) 217 217 lines.append('@protocol %s <NSObject>' % objc_name) 218 lines.append('@ required')218 lines.append('@optional') 219 219 for command in self.commands_for_domain(domain): 220 220 lines.append(self._generate_single_command_protocol(domain, command)) -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator_templates.py
r248846 r251395 114 114 """void ObjCInspector${domainName}BackendDispatcher::${commandName}(${parameters}) 115 115 { 116 if (!${respondsToSelector}) { 117 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'${domainName}.${commandName}' was not found"_s); 118 backendDispatcher()->sendPendingErrors(); 119 return; 120 } 121 116 122 id errorCallback = ^(NSString *error) { 117 123 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); -
trunk/Source/JavaScriptCore/inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result
r251227 r251395 641 641 void ObjCInspectorNetworkBackendDispatcher::loadResource(long requestId) 642 642 { 643 if (![m_delegate respondsToSelector:@selector(loadResourceWithErrorCallback:successCallback:)]) { 644 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Network.loadResource' was not found"_s); 645 backendDispatcher()->sendPendingErrors(); 646 return; 647 } 648 643 649 id errorCallback = ^(NSString *error) { 644 650 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 921 927 922 928 @protocol TestProtocolNetworkDomainHandler <NSObject> 923 @ required929 @optional 924 930 - (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback; 925 931 @end -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/command-targetType-matching-domain-debuggableType.json-result
r251227 r251395 568 568 void ObjCInspectorDomainBackendDispatcher::Command(long requestId) 569 569 { 570 if (![m_delegate respondsToSelector:@selector(CommandWithErrorCallback:successCallback:)]) { 571 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Domain.Command' was not found"_s); 572 backendDispatcher()->sendPendingErrors(); 573 return; 574 } 575 570 576 id errorCallback = ^(NSString *error) { 571 577 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 840 846 841 847 @protocol TestProtocolDomainDomainHandler <NSObject> 842 @ required848 @optional 843 849 - (void)CommandWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback; 844 850 @end -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/commands-with-async-attribute.json-result
r251227 r251395 920 920 void ObjCInspectorDatabaseBackendDispatcher::executeSQLSyncOptionalReturnValues(long requestId, int in_databaseId, const String& in_query) 921 921 { 922 if (![m_delegate respondsToSelector:@selector(executeSQLSyncOptionalReturnValuesWithErrorCallback:successCallback:databaseId:query:)]) { 923 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Database.executeSQLSyncOptionalReturnValues' was not found"_s); 924 backendDispatcher()->sendPendingErrors(); 925 return; 926 } 927 922 928 id errorCallback = ^(NSString *error) { 923 929 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 964 970 void ObjCInspectorDatabaseBackendDispatcher::executeSQLAsyncOptionalReturnValues(long requestId, int in_databaseId, const String& in_query) 965 971 { 972 if (![m_delegate respondsToSelector:@selector(executeSQLAsyncOptionalReturnValuesWithErrorCallback:successCallback:databaseId:query:)]) { 973 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Database.executeSQLAsyncOptionalReturnValues' was not found"_s); 974 backendDispatcher()->sendPendingErrors(); 975 return; 976 } 977 966 978 id errorCallback = ^(NSString *error) { 967 979 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 1008 1020 void ObjCInspectorDatabaseBackendDispatcher::executeSQLSync(long requestId, int in_databaseId, const String& in_query) 1009 1021 { 1022 if (![m_delegate respondsToSelector:@selector(executeSQLSyncWithErrorCallback:successCallback:databaseId:query:)]) { 1023 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Database.executeSQLSync' was not found"_s); 1024 backendDispatcher()->sendPendingErrors(); 1025 return; 1026 } 1027 1010 1028 id errorCallback = ^(NSString *error) { 1011 1029 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 1042 1060 void ObjCInspectorDatabaseBackendDispatcher::executeSQLAsync(long requestId, int in_databaseId, const String& in_query) 1043 1061 { 1062 if (![m_delegate respondsToSelector:@selector(executeSQLAsyncWithErrorCallback:successCallback:databaseId:query:)]) { 1063 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Database.executeSQLAsync' was not found"_s); 1064 backendDispatcher()->sendPendingErrors(); 1065 return; 1066 } 1067 1044 1068 id errorCallback = ^(NSString *error) { 1045 1069 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 1339 1363 1340 1364 @protocol TestProtocolDatabaseDomainHandler <NSObject> 1341 @ required1365 @optional 1342 1366 - (void)executeSQLSyncOptionalReturnValuesWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor))successCallback databaseId:(int)databaseId query:(NSString *)query; 1343 1367 - (void)executeSQLAsyncOptionalReturnValuesWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor))successCallback databaseId:(int)databaseId query:(NSString *)query; -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/commands-with-optional-call-return-parameters.json-result
r251227 r251395 833 833 void ObjCInspectorDatabaseBackendDispatcher::executeAllOptionalParameters(long requestId, const JSON::Array* in_columnNames, const String* in_notes, const double* in_timestamp, const JSON::Object* in_values, const JSON::Value* in_payload, const int* in_databaseId, const JSON::Object* in_sqlError, const String* in_screenColor, const JSON::Array* in_alternateColors, const String* in_printColor) 834 834 { 835 if (![m_delegate respondsToSelector:@selector(executeAllOptionalParametersWithErrorCallback:successCallback:columnNames:notes:timestamp:values:payload:databaseId:sqlError:screenColor:alternateColors:printColor:)]) { 836 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Database.executeAllOptionalParameters' was not found"_s); 837 backendDispatcher()->sendPendingErrors(); 838 return; 839 } 840 835 841 id errorCallback = ^(NSString *error) { 836 842 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 905 911 void ObjCInspectorDatabaseBackendDispatcher::executeNoOptionalParameters(long requestId, const JSON::Array& in_columnNames, const String& in_notes, double in_timestamp, const JSON::Object& in_values, JSON::Value in_payload, int in_databaseId, const JSON::Object& in_sqlError, const String& in_screenColor, const JSON::Array& in_alternateColors, const String& in_printColor) 906 912 { 913 if (![m_delegate respondsToSelector:@selector(executeNoOptionalParametersWithErrorCallback:successCallback:columnNames:notes:timestamp:values:payload:databaseId:sqlError:screenColor:alternateColors:printColor:)]) { 914 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Database.executeNoOptionalParameters' was not found"_s); 915 backendDispatcher()->sendPendingErrors(); 916 return; 917 } 918 907 919 id errorCallback = ^(NSString *error) { 908 920 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 1218 1230 1219 1231 @protocol TestProtocolDatabaseDomainHandler <NSObject> 1220 @ required1232 @optional 1221 1233 - (void)executeAllOptionalParametersWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor))successCallback columnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(RWIProtocolJSONObject **)values payload:(RWIProtocolJSONObject **)payload databaseId:(int *)databaseId sqlError:(TestProtocolDatabaseError **)sqlError screenColor:(TestProtocolDatabasePrimaryColors *)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(TestProtocolDatabaseExecuteAllOptionalParametersPrintColor *)printColor; 1222 1234 - (void)executeNoOptionalParametersWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor))successCallback columnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload databaseId:(int)databaseId sqlError:(TestProtocolDatabaseError *)sqlError screenColor:(TestProtocolDatabasePrimaryColors)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(TestProtocolDatabaseExecuteNoOptionalParametersPrintColor)printColor; -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/domain-debuggableTypes.json-result
r251227 r251395 568 568 void ObjCInspectorDomainBackendDispatcher::Command(long requestId) 569 569 { 570 if (![m_delegate respondsToSelector:@selector(CommandWithErrorCallback:successCallback:)]) { 571 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Domain.Command' was not found"_s); 572 backendDispatcher()->sendPendingErrors(); 573 return; 574 } 575 570 576 id errorCallback = ^(NSString *error) { 571 577 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 840 846 841 847 @protocol TestProtocolDomainDomainHandler <NSObject> 842 @ required848 @optional 843 849 - (void)CommandWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback; 844 850 @end -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/domain-targetType-matching-domain-debuggableType.json-result
r251227 r251395 568 568 void ObjCInspectorDomainBackendDispatcher::Command(long requestId) 569 569 { 570 if (![m_delegate respondsToSelector:@selector(CommandWithErrorCallback:successCallback:)]) { 571 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Domain.Command' was not found"_s); 572 backendDispatcher()->sendPendingErrors(); 573 return; 574 } 575 570 576 id errorCallback = ^(NSString *error) { 571 577 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 840 846 841 847 @protocol TestProtocolDomainDomainHandler <NSObject> 842 @ required848 @optional 843 849 - (void)CommandWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback; 844 850 @end -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/domain-targetTypes.json-result
r251227 r251395 568 568 void ObjCInspectorDomainBackendDispatcher::Command(long requestId) 569 569 { 570 if (![m_delegate respondsToSelector:@selector(CommandWithErrorCallback:successCallback:)]) { 571 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Domain.Command' was not found"_s); 572 backendDispatcher()->sendPendingErrors(); 573 return; 574 } 575 570 576 id errorCallback = ^(NSString *error) { 571 577 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 840 846 841 847 @protocol TestProtocolDomainDomainHandler <NSObject> 842 @ required848 @optional 843 849 - (void)CommandWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback; 844 850 @end -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result
r251227 r251395 812 812 void ObjCInspectorNetwork1BackendDispatcher::loadResource1(long requestId) 813 813 { 814 if (![m_delegate respondsToSelector:@selector(loadResource1WithErrorCallback:successCallback:)]) { 815 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Network1.loadResource1' was not found"_s); 816 backendDispatcher()->sendPendingErrors(); 817 return; 818 } 819 814 820 id errorCallback = ^(NSString *error) { 815 821 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 827 833 void ObjCInspectorNetwork3BackendDispatcher::loadResource1(long requestId) 828 834 { 835 if (![m_delegate respondsToSelector:@selector(loadResource1WithErrorCallback:successCallback:)]) { 836 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Network3.loadResource1' was not found"_s); 837 backendDispatcher()->sendPendingErrors(); 838 return; 839 } 840 829 841 id errorCallback = ^(NSString *error) { 830 842 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 841 853 void ObjCInspectorNetwork3BackendDispatcher::loadResource2(long requestId) 842 854 { 855 if (![m_delegate respondsToSelector:@selector(loadResource2WithErrorCallback:successCallback:)]) { 856 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Network3.loadResource2' was not found"_s); 857 backendDispatcher()->sendPendingErrors(); 858 return; 859 } 860 843 861 id errorCallback = ^(NSString *error) { 844 862 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 855 873 void ObjCInspectorNetwork3BackendDispatcher::loadResource3(long requestId) 856 874 { 875 if (![m_delegate respondsToSelector:@selector(loadResource3WithErrorCallback:successCallback:)]) { 876 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Network3.loadResource3' was not found"_s); 877 backendDispatcher()->sendPendingErrors(); 878 return; 879 } 880 857 881 id errorCallback = ^(NSString *error) { 858 882 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 869 893 void ObjCInspectorNetwork3BackendDispatcher::loadResource4(long requestId) 870 894 { 895 if (![m_delegate respondsToSelector:@selector(loadResource4WithErrorCallback:successCallback:)]) { 896 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Network3.loadResource4' was not found"_s); 897 backendDispatcher()->sendPendingErrors(); 898 return; 899 } 900 871 901 id errorCallback = ^(NSString *error) { 872 902 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 883 913 void ObjCInspectorNetwork3BackendDispatcher::loadResource5(long requestId) 884 914 { 915 if (![m_delegate respondsToSelector:@selector(loadResource5WithErrorCallback:successCallback:)]) { 916 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Network3.loadResource5' was not found"_s); 917 backendDispatcher()->sendPendingErrors(); 918 return; 919 } 920 885 921 id errorCallback = ^(NSString *error) { 886 922 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 897 933 void ObjCInspectorNetwork3BackendDispatcher::loadResource6(long requestId) 898 934 { 935 if (![m_delegate respondsToSelector:@selector(loadResource6WithErrorCallback:successCallback:)]) { 936 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Network3.loadResource6' was not found"_s); 937 backendDispatcher()->sendPendingErrors(); 938 return; 939 } 940 899 941 id errorCallback = ^(NSString *error) { 900 942 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 911 953 void ObjCInspectorNetwork3BackendDispatcher::loadResource7(long requestId) 912 954 { 955 if (![m_delegate respondsToSelector:@selector(loadResource7WithErrorCallback:successCallback:)]) { 956 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Network3.loadResource7' was not found"_s); 957 backendDispatcher()->sendPendingErrors(); 958 return; 959 } 960 913 961 id errorCallback = ^(NSString *error) { 914 962 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 1168 1216 1169 1217 @protocol TestProtocolNetwork1DomainHandler <NSObject> 1170 @ required1218 @optional 1171 1219 - (void)loadResource1WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback; 1172 1220 @end 1173 1221 1174 1222 @protocol TestProtocolNetwork3DomainHandler <NSObject> 1175 @ required1223 @optional 1176 1224 - (void)loadResource1WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback; 1177 1225 - (void)loadResource2WithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback; -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/enum-values.json-result
r251227 r251395 685 685 void ObjCInspectorCommandDomainBackendDispatcher::commandWithEnumReturnValue(long requestId) 686 686 { 687 if (![m_delegate respondsToSelector:@selector(commandWithEnumReturnValueWithErrorCallback:successCallback:)]) { 688 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'CommandDomain.commandWithEnumReturnValue' was not found"_s); 689 backendDispatcher()->sendPendingErrors(); 690 return; 691 } 692 687 693 id errorCallback = ^(NSString *error) { 688 694 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 968 974 969 975 @protocol TestProtocolCommandDomainDomainHandler <NSObject> 970 @ required976 @optional 971 977 - (void)commandWithEnumReturnValueWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(TestProtocolCommandDomainCommandWithEnumReturnValueReturnValue returnValue))successCallback; 972 978 @end -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/event-targetType-matching-domain-debuggableType.json-result
r251227 r251395 568 568 void ObjCInspectorDomainBackendDispatcher::Command(long requestId) 569 569 { 570 if (![m_delegate respondsToSelector:@selector(CommandWithErrorCallback:successCallback:)]) { 571 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Domain.Command' was not found"_s); 572 backendDispatcher()->sendPendingErrors(); 573 return; 574 } 575 570 576 id errorCallback = ^(NSString *error) { 571 577 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 840 846 841 847 @protocol TestProtocolDomainDomainHandler <NSObject> 842 @ required848 @optional 843 849 - (void)CommandWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback; 844 850 @end -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result
r251227 r251395 668 668 void ObjCInspectorNetwork1BackendDispatcher::loadResource(long requestId) 669 669 { 670 if (![m_delegate respondsToSelector:@selector(loadResourceWithErrorCallback:successCallback:)]) { 671 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Network1.loadResource' was not found"_s); 672 backendDispatcher()->sendPendingErrors(); 673 return; 674 } 675 670 676 id errorCallback = ^(NSString *error) { 671 677 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 949 955 950 956 @protocol TestProtocolNetwork1DomainHandler <NSObject> 951 @ required957 @optional 952 958 - (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback; 953 959 @end -
trunk/Source/JavaScriptCore/inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result
r251227 r251395 641 641 void ObjCInspectorNetworkBackendDispatcher::loadResource(long requestId) 642 642 { 643 if (![m_delegate respondsToSelector:@selector(loadResourceWithErrorCallback:successCallback:)]) { 644 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::MethodNotFound, "'Network.loadResource' was not found"_s); 645 backendDispatcher()->sendPendingErrors(); 646 return; 647 } 648 643 649 id errorCallback = ^(NSString *error) { 644 650 backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error); … … 921 927 922 928 @protocol TestProtocolNetworkDomainHandler <NSObject> 923 @ required929 @optional 924 930 - (void)loadResourceWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(void))successCallback; 925 931 @end
Note: See TracChangeset
for help on using the changeset viewer.