Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (204254 => 204255)
--- trunk/Source/_javascript_Core/ChangeLog 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-08-08 16:43:39 UTC (rev 204255)
@@ -1,3 +1,43 @@
+2016-08-08 Brian Burg <bb...@apple.com>
+
+ Web Inspector: clean up prefixing of Automation protocol generated files
+ https://bugs.webkit.org/show_bug.cgi?id=160635
+ <rdar://problem/27735327>
+
+ Reviewed by Timothy Hatcher.
+
+ Introduce different settings for the 'protocol group' name for C++ vs. Objective-C.
+
+ Use 'WD' as the prefix for generated Objective-C frontend dispatchers and helpers.
+ Continue using 'Automation' as the prefix for generated C++ backend dispatchers.
+
+ * inspector/scripts/codegen/cpp_generator.py:
+ (CppGenerator.protocol_name):
+ * inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py:
+ (ObjCProtocolTypeConversionsImplementationGenerator.generate_output):
+ (ObjCProtocolTypeConversionsImplementationGenerator._generate_type_factory_category_interface):
+ (ObjCProtocolTypeConversionsImplementationGenerator._generate_type_factory_category_implementation):
+ Adjust the class name. Generate one category per protocol domain to keep it easy to read.
+
+ * inspector/scripts/codegen/models.py:
+ * inspector/scripts/codegen/objc_generator.py:
+ (ObjCGenerator.protocol_name):
+
+ * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
+ * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
+ * inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:
+ * inspector/scripts/tests/expected/enum-values.json-result:
+ * inspector/scripts/tests/expected/events-with-optional-parameters.json-result:
+ * inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
+ * inspector/scripts/tests/expected/same-type-id-different-domain.json-result:
+ * inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
+ * inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-array-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-object-type.json-result:
+ * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
+ Rebaseline test results.
+
2016-08-07 Yusuke Suzuki <utatane....@gmail.com>
[ES6] Module namespace object should not allow unset IC
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator.py (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator.py 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator.py 2016-08-08 16:43:39 UTC (rev 204255)
@@ -48,7 +48,7 @@
Generator.__init__(self, model, input_filepath)
def protocol_name(self):
- return self.model().framework.setting('protocol_group', '')
+ return self.model().framework.setting('cpp_protocol_group', '')
def helpers_namespace(self):
return '%sHelpers' % self.protocol_name()
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py 2016-08-08 16:43:39 UTC (rev 204255)
@@ -55,7 +55,7 @@
def generate_output(self):
secondary_headers = [
'"%s.h"' % self.protocol_name(),
- '"%sTypeConversions.h"' % ObjCGenerator.OBJC_SHARED_PREFIX,
+ '"%sTypeParser.h"' % self.protocol_name(),
Generator.string_for_file_include('%sJSONObjectPrivate.h' % ObjCGenerator.OBJC_STATIC_PREFIX, Frameworks.WebInspector, self.model().framework),
]
secondary_headers.sort()
@@ -76,13 +76,16 @@
def _generate_type_factory_category_interface(self, domains):
lines = []
- lines.append('@interface ProtocolTypeConversions (%s)' % self.protocol_name())
- lines.append('')
for domain in domains:
+ lines.append('@interface %sTypeConversions (%sDomain)' % (self.protocol_name(), domain.domain_name))
+ lines.append('')
+
for declaration in domain.type_declarations:
lines.append(self._generate_type_factory_method_declaration(domain, declaration))
+
add_newline(lines)
- lines.append('@end')
+ lines.append('@end')
+
return '\n'.join(lines)
def _generate_type_factory_method_declaration(self, domain, declaration):
@@ -97,13 +100,14 @@
def _generate_type_factory_category_implementation(self, domains):
lines = []
- lines.append('@implementation ProtocolTypeConversions (%s)' % self.protocol_name())
- lines.append('')
for domain in domains:
+ lines.append('@implementation %sTypeConversions (%sDomain)' % (self.protocol_name(), domain.domain_name))
+ lines.append('')
+
for declaration in domain.type_declarations:
lines.append(self._generate_type_factory_method_implementation(domain, declaration))
add_newline(lines)
- lines.append('@end')
+ lines.append('@end')
return '\n'.join(lines)
def _generate_type_factory_method_implementation(self, domain, declaration):
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/models.py (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/models.py 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/models.py 2016-08-08 16:43:39 UTC (rev 204255)
@@ -42,21 +42,24 @@
"Global": {
},
"_javascript_Core": {
- "protocol_group": "Inspector",
+ "cpp_protocol_group": "Inspector",
"export_macro": "JS_EXPORT_PRIVATE",
"alternate_dispatchers": True,
},
"WebKit": {
- "protocol_group": "Automation",
+ "cpp_protocol_group": "Automation",
+ "objc_protocol_group": "WD",
+ "objc_prefix": "WD",
},
"WebInspector": {
- "protocol_group": "RWI",
+ "objc_protocol_group": "RWI",
"objc_prefix": "RWI",
},
# Used for code generator tests.
"Test": {
"alternate_dispatchers": True,
- "protocol_group": "Test",
+ "cpp_protocol_group": "Test",
+ "objc_protocol_group": "Test",
"objc_prefix": "Test",
}
}
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py 2016-08-08 16:43:39 UTC (rev 204255)
@@ -94,7 +94,7 @@
# The 'protocol name' is used to prefix filenames for a protocol group (a set of domains generated together).
def protocol_name(self):
- protocol_group = self.model().framework.setting('protocol_group', '')
+ protocol_group = self.model().framework.setting('objc_protocol_group', '')
return '%s%s' % (protocol_group, ObjCGenerator.OBJC_SHARED_PREFIX)
# The 'ObjC prefix' is used to prefix Objective-C class names and enums with a
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-08-08 16:43:39 UTC (rev 204255)
@@ -1604,13 +1604,13 @@
#import "config.h"
#import "TestProtocolTypeConversions.h"
-#import "ProtocolTypeConversions.h"
#import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
using namespace Inspector;
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (DatabaseDomain)
+ (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload;
+ (void)_parsePrimaryColors:(NSNumber **)outValue fromPayload:(id)payload;
@@ -1619,7 +1619,7 @@
@end
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (DatabaseDomain)
+ (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload
{
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-08-08 16:43:39 UTC (rev 204255)
@@ -1459,13 +1459,13 @@
#import "config.h"
#import "TestProtocolTypeConversions.h"
-#import "ProtocolTypeConversions.h"
#import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
using namespace Inspector;
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (DatabaseDomain)
+ (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload;
+ (void)_parsePrimaryColors:(NSNumber **)outValue fromPayload:(id)payload;
@@ -1474,7 +1474,7 @@
@end
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (DatabaseDomain)
+ (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload
{
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-08-08 16:43:39 UTC (rev 204255)
@@ -1310,20 +1310,29 @@
#import "config.h"
#import "TestProtocolTypeConversions.h"
-#import "ProtocolTypeConversions.h"
#import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
using namespace Inspector;
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (Network1Domain)
+@end
+@interface TestProtocolTypeConversions (Network2Domain)
+
+ (void)_parseLoaderId:(NSString **)outValue fromPayload:(id)payload;
@end
+@interface TestProtocolTypeConversions (Network3Domain)
-@implementation ProtocolTypeConversions (TestProtocol)
+@end
+@implementation TestProtocolTypeConversions (Network1Domain)
+
+@end
+@implementation TestProtocolTypeConversions (Network2Domain)
+
+ (void)_parseLoaderId:(NSString **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
@@ -1331,8 +1340,11 @@
}
@end
+@implementation TestProtocolTypeConversions (Network3Domain)
+@end
+
### End File: TestProtocolTypeConversions.mm
### Begin File: TestProtocolTypes.mm
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result 2016-08-08 16:43:39 UTC (rev 204255)
@@ -1185,20 +1185,26 @@
#import "config.h"
#import "TestProtocolTypeConversions.h"
-#import "ProtocolTypeConversions.h"
#import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
using namespace Inspector;
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (TypeDomainDomain)
+ (void)_parseTypeDomainEnum:(NSNumber **)outValue fromPayload:(id)payload;
@end
+@interface TestProtocolTypeConversions (CommandDomainDomain)
-@implementation ProtocolTypeConversions (TestProtocol)
+@end
+@interface TestProtocolTypeConversions (EventDomainDomain)
+@end
+
+@implementation TestProtocolTypeConversions (TypeDomainDomain)
+
+ (void)_parseTypeDomainEnum:(NSNumber **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
@@ -1206,8 +1212,14 @@
}
@end
+@implementation TestProtocolTypeConversions (CommandDomainDomain)
+@end
+@implementation TestProtocolTypeConversions (EventDomainDomain)
+@end
+
+
### End File: TestProtocolTypeConversions.mm
### Begin File: TestProtocolTypes.mm
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-08-08 16:43:39 UTC (rev 204255)
@@ -1033,13 +1033,13 @@
#import "config.h"
#import "TestProtocolTypeConversions.h"
-#import "ProtocolTypeConversions.h"
#import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
using namespace Inspector;
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (DatabaseDomain)
+ (void)_parseDatabaseId:(NSString **)outValue fromPayload:(id)payload;
+ (void)_parsePrimaryColors:(NSString **)outValue fromPayload:(id)payload;
@@ -1048,7 +1048,7 @@
@end
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (DatabaseDomain)
+ (void)_parseDatabaseId:(NSString **)outValue fromPayload:(id)payload
{
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-08-08 16:43:39 UTC (rev 204255)
@@ -1086,20 +1086,29 @@
#import "config.h"
#import "TestProtocolTypeConversions.h"
-#import "ProtocolTypeConversions.h"
#import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
using namespace Inspector;
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (Network1Domain)
+@end
+@interface TestProtocolTypeConversions (Network2Domain)
+
+ (void)_parseNetworkError:(TestProtocolNetwork2NetworkError **)outValue fromPayload:(id)payload;
@end
+@interface TestProtocolTypeConversions (Network3Domain)
-@implementation ProtocolTypeConversions (TestProtocol)
+@end
+@implementation TestProtocolTypeConversions (Network1Domain)
+
+@end
+@implementation TestProtocolTypeConversions (Network2Domain)
+
+ (void)_parseNetworkError:(TestProtocolNetwork2NetworkError **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSDictionary class]);
@@ -1107,8 +1116,11 @@
}
@end
+@implementation TestProtocolTypeConversions (Network3Domain)
+@end
+
### End File: TestProtocolTypeConversions.mm
### Begin File: TestProtocolTypes.mm
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/same-type-id-different-domain.json-result (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2016-08-08 16:43:39 UTC (rev 204255)
@@ -803,21 +803,24 @@
#import "config.h"
#import "TestProtocolTypeConversions.h"
-#import "ProtocolTypeConversions.h"
#import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
using namespace Inspector;
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (RuntimeDomain)
+ (void)_parseRemoteObjectId:(NSString **)outValue fromPayload:(id)payload;
+@end
+@interface TestProtocolTypeConversions (Runtime2Domain)
+
+ (void)_parseRemoteObjectId:(NSString **)outValue fromPayload:(id)payload;
@end
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (RuntimeDomain)
+ (void)_parseRemoteObjectId:(NSString **)outValue fromPayload:(id)payload
{
@@ -825,6 +828,9 @@
*outValue = (NSString *)payload;
}
+@end
+@implementation TestProtocolTypeConversions (Runtime2Domain)
+
+ (void)_parseRemoteObjectId:(NSString **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-08-08 16:43:39 UTC (rev 204255)
@@ -956,19 +956,19 @@
#import "config.h"
#import "TestProtocolTypeConversions.h"
-#import "ProtocolTypeConversions.h"
#import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
using namespace Inspector;
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (RuntimeDomain)
+ (void)_parseKeyPath:(TestProtocolRuntimeKeyPath **)outValue fromPayload:(id)payload;
@end
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (RuntimeDomain)
+ (void)_parseKeyPath:(TestProtocolRuntimeKeyPath **)outValue fromPayload:(id)payload
{
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2016-08-08 16:43:39 UTC (rev 204255)
@@ -790,19 +790,19 @@
#import "config.h"
#import "TestProtocolTypeConversions.h"
-#import "ProtocolTypeConversions.h"
#import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
using namespace Inspector;
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (RuntimeDomain)
+ (void)_parseRemoteObjectId:(NSNumber **)outValue fromPayload:(id)payload;
@end
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (RuntimeDomain)
+ (void)_parseRemoteObjectId:(NSNumber **)outValue fromPayload:(id)payload
{
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-08-08 16:43:39 UTC (rev 204255)
@@ -905,17 +905,20 @@
#import "config.h"
#import "TestProtocolTypeConversions.h"
-#import "ProtocolTypeConversions.h"
#import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
using namespace Inspector;
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (DebuggerDomain)
+ (void)_parseBreakpointId:(NSNumber **)outValue fromPayload:(id)payload;
+ (void)_parseReason:(NSNumber **)outValue fromPayload:(id)payload;
+@end
+@interface TestProtocolTypeConversions (RuntimeDomain)
+
+ (void)_parseObjectId:(NSNumber **)outValue fromPayload:(id)payload;
+ (void)_parseLuckyNumbers:(NSArray/*<NSNumber>*/ **)outValue fromPayload:(id)payload;
+ (void)_parseBabyNames:(NSArray/*<NSString>*/ **)outValue fromPayload:(id)payload;
@@ -925,7 +928,7 @@
@end
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (DebuggerDomain)
+ (void)_parseBreakpointId:(NSNumber **)outValue fromPayload:(id)payload
{
@@ -939,6 +942,9 @@
*outValue = @(Inspector::fromProtocolString<TestProtocolDebuggerReason>(payload));
}
+@end
+@implementation TestProtocolTypeConversions (RuntimeDomain)
+
+ (void)_parseObjectId:(NSNumber **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSNumber class]);
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-08-08 16:43:39 UTC (rev 204255)
@@ -958,13 +958,13 @@
#import "config.h"
#import "TestProtocolTypeConversions.h"
-#import "ProtocolTypeConversions.h"
#import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
using namespace Inspector;
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (RuntimeDomain)
+ (void)_parseFarmAnimals:(NSNumber **)outValue fromPayload:(id)payload;
+ (void)_parseTwoLeggedAnimals:(NSNumber **)outValue fromPayload:(id)payload;
@@ -971,7 +971,7 @@
@end
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (RuntimeDomain)
+ (void)_parseFarmAnimals:(NSNumber **)outValue fromPayload:(id)payload
{
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-08-08 16:43:39 UTC (rev 204255)
@@ -1334,13 +1334,13 @@
#import "config.h"
#import "TestProtocolTypeConversions.h"
-#import "ProtocolTypeConversions.h"
#import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
using namespace Inspector;
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (DatabaseDomain)
+ (void)_parseError:(TestProtocolDatabaseError **)outValue fromPayload:(id)payload;
+ (void)_parseErrorList:(NSArray/*<TestProtocolDatabaseError>*/ **)outValue fromPayload:(id)payload;
@@ -1349,11 +1349,14 @@
+ (void)_parseObjectWithPropertyNameConflicts:(TestProtocolDatabaseObjectWithPropertyNameConflicts **)outValue fromPayload:(id)payload;
+ (void)_parseDummyObject:(TestProtocolDatabaseDummyObject **)outValue fromPayload:(id)payload;
+@end
+@interface TestProtocolTypeConversions (TestDomain)
+
+ (void)_parseParameterBundle:(TestProtocolTestParameterBundle **)outValue fromPayload:(id)payload;
@end
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (DatabaseDomain)
+ (void)_parseError:(TestProtocolDatabaseError **)outValue fromPayload:(id)payload
{
@@ -1391,6 +1394,9 @@
*outValue = [[TestProtocolDatabaseDummyObject alloc] initWithPayload:payload];
}
+@end
+@implementation TestProtocolTypeConversions (TestDomain)
+
+ (void)_parseParameterBundle:(TestProtocolTestParameterBundle **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSDictionary class]);
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (204254 => 204255)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-08-08 16:43:39 UTC (rev 204255)
@@ -1312,13 +1312,13 @@
#import "config.h"
#import "TestProtocolTypeConversions.h"
-#import "ProtocolTypeConversions.h"
#import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
using namespace Inspector;
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (TestDomain)
+ (void)_parseTypeNeedingCast:(TestProtocolTestTypeNeedingCast **)outValue fromPayload:(id)payload;
+ (void)_parseCastedObjectId:(NSNumber **)outValue fromPayload:(id)payload;
@@ -1330,7 +1330,7 @@
@end
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (TestDomain)
+ (void)_parseTypeNeedingCast:(TestProtocolTestTypeNeedingCast **)outValue fromPayload:(id)payload
{
