Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (197012 => 197013)
--- trunk/Source/_javascript_Core/ChangeLog 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-02-24 06:43:07 UTC (rev 197013)
@@ -1,3 +1,78 @@
+2016-02-23 Brian Burg <[email protected]>
+
+ Web Inspector: teach the Objective-C protocol generators about --frontend and --backend directives
+ https://bugs.webkit.org/show_bug.cgi?id=154615
+ <rdar://problem/24804330>
+
+ Reviewed by Timothy Hatcher.
+
+ Some of the generated Objective-C bindings are only relevant to code acting as the
+ protocol backend. Add a per-generator setting mechanism and propagate --frontend and
+ --backend to all generators. Use the setting in a few generators to omit code that's
+ not needed.
+
+ Also fix a few places where the code emits the wrong Objective-C class prefix.
+ There is some common non-generated code that must always have the RWIProtocol prefix.
+
+ Lastly, change includes to use RWIProtocolJSONObjectPrivate.h instead of *Internal.h. The
+ macros defined in the internal header now need to be used outside of the framework.
+
+ * inspector/scripts/codegen/generate_objc_conversion_helpers.py:
+ Use OBJC_STATIC_PREFIX along with the file name and use different include syntax
+ depending on the target framework.
+
+ * inspector/scripts/codegen/generate_objc_header.py:
+ (ObjCHeaderGenerator.generate_output):
+ For now, omit generating command protocol and event dispatchers when generating for --frontend.
+
+ (ObjCHeaderGenerator._generate_type_interface):
+ Use OBJC_STATIC_PREFIX along with the unprefixed file name.
+
+ * inspector/scripts/codegen/generate_objc_internal_header.py:
+ Use RWIProtocolJSONObjectPrivate.h instead.
+
+ * inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:
+ (ObjCProtocolTypesImplementationGenerator.generate_output):
+ Include the Internal header if it's being generated (only for --backend).
+
+ * inspector/scripts/codegen/generator.py:
+ (Generator.__init__):
+ (Generator.set_generator_setting):
+ (Generator):
+ (Generator.get_generator_setting):
+ Crib a simple setting system from the Framework class. Make the names more obnoxious.
+
+ (Generator.string_for_file_include):
+ Inspired by the replay input generator, this is a function that uses the proper syntax
+ for a file include depending on the file's framework and target framework.
+
+ * inspector/scripts/codegen/objc_generator.py:
+ (ObjCGenerator.and):
+ (ObjCGenerator.and.objc_prefix):
+ (ObjCGenerator):
+ (ObjCGenerator.objc_type_for_raw_name):
+ (ObjCGenerator.objc_class_for_raw_name):
+ Whitelist the 'Automation' domain for the ObjC generators. Revise use of OBJC_STATIC_PREFIX.
+
+ * inspector/scripts/generate-inspector-protocol-bindings.py:
+ (generate_from_specification):
+ Change the generators to use for the frontend. Propagate --frontend and --backend.
+
+ * 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 tests. They now correctly include RWIProtocolJSONObject.h and the like.
+
2016-02-23 Saam barati <[email protected]>
arrayProtoFuncConcat doesn't check for an exception after allocating an array
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_conversion_helpers.py (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_conversion_helpers.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_conversion_helpers.py 2016-02-24 06:43:07 UTC (rev 197013)
@@ -55,7 +55,7 @@
def generate_output(self):
headers = [
- '"%sArrayConversionHelpers.h"' % self.objc_prefix(),
+ '"%sArrayConversionHelpers.h"' % ObjCGenerator.OBJC_STATIC_PREFIX
]
header_args = {
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_header.py (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_header.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_header.py 2016-02-24 06:43:07 UTC (rev 197013)
@@ -52,7 +52,7 @@
def generate_output(self):
headers = set([
- '<WebInspector/%sJSONObject.h>' % self.objc_prefix(),
+ '<WebInspector/%sJSONObject.h>' % ObjCGenerator.OBJC_STATIC_PREFIX,
])
header_args = {
@@ -75,8 +75,11 @@
sections.append('\n'.join(filter(None, map(self._generate_forward_declarations, type_domains))))
sections.append('\n'.join(filter(None, map(self._generate_enums, type_domains))))
sections.append('\n'.join(filter(None, map(self._generate_types, type_domains))))
- sections.append('\n\n'.join(filter(None, map(self._generate_command_protocols, command_domains))))
- sections.append('\n\n'.join(filter(None, map(self._generate_event_interfaces, event_domains))))
+
+ if self.get_generator_setting('generate_backend', False):
+ sections.append('\n\n'.join(filter(None, map(self._generate_command_protocols, command_domains))))
+ sections.append('\n\n'.join(filter(None, map(self._generate_event_interfaces, event_domains))))
+
sections.append(Template(ObjCTemplates.HeaderPostlude).substitute(None))
return '\n\n'.join(sections)
@@ -155,7 +158,7 @@
lines = []
objc_name = self.objc_name_for_type(declaration.type)
lines.append('__attribute__((visibility ("default")))')
- lines.append('@interface %s : %s' % (objc_name, ObjCGenerator.OBJC_JSON_OBJECT_BASE))
+ lines.append('@interface %s : %sJSONObject' % (objc_name, ObjCGenerator.OBJC_STATIC_PREFIX))
required_members = filter(lambda member: not member.is_optional, declaration.type_members)
optional_members = filter(lambda member: member.is_optional, declaration.type_members)
if required_members:
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_internal_header.py (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_internal_header.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_internal_header.py 2016-02-24 06:43:07 UTC (rev 197013)
@@ -46,7 +46,7 @@
def generate_output(self):
headers = set([
'"%s.h"' % self.objc_prefix(),
- '"%sJSONObjectInternal.h"' % self.objc_prefix(),
+ '"%sJSONObjectPrivate.h"' % self.objc_prefix(),
'<_javascript_Core/InspectorValues.h>',
'<_javascript_Core/AugmentableInspectorController.h>',
])
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2016-02-24 06:43:07 UTC (rev 197013)
@@ -30,7 +30,7 @@
from string import Template
from generator import Generator, ucfirst
-from models import ObjectType
+from models import ObjectType, Frameworks
from objc_generator import ObjCGenerator
from objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
@@ -56,12 +56,18 @@
def generate_output(self):
secondary_headers = [
'"%sEnumConversionHelpers.h"' % self.objc_prefix(),
+ Generator.string_for_file_include('%sJSONObjectPrivate.h' % ObjCGenerator.OBJC_STATIC_PREFIX, Frameworks.WebInspector, self.model().framework),
'<_javascript_Core/InspectorValues.h>',
'<wtf/Assertions.h>',
]
+ # The FooProtocolInternal.h header is only needed to declare the backend-side event dispatcher bindings.
+ primaryIncludeName = self.objc_prefix()
+ if self.get_generator_setting('generate_backend', False):
+ primaryIncludeName += 'Internal'
+
header_args = {
- 'primaryInclude': '"%sInternal.h"' % self.objc_prefix(),
+ 'primaryInclude': '"%s.h"' % primaryIncludeName,
'secondaryIncludes': '\n'.join(['#import %s' % header for header in secondary_headers]),
}
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generator.py (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generator.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generator.py 2016-02-24 06:43:07 UTC (rev 197013)
@@ -78,10 +78,18 @@
def __init__(self, model, input_filepath):
self._model = model
self._input_filepath = input_filepath
+ self._settings = {}
def model(self):
return self._model
+ def set_generator_setting(self, key, value):
+ self._settings[key] = value
+
+ # The goofy name is to disambiguate generator settings from framework settings.
+ def get_generator_setting(self, key, default=None):
+ return self._settings.get(key, default)
+
def generate_license(self):
return Template(Templates.CopyrightBlock).substitute(None, inputFilename=os.path.basename(self._input_filepath))
@@ -239,3 +247,10 @@
return 'number'
else:
return _type.qualified_name()
+
+ @staticmethod
+ def string_for_file_include(filename, file_framework, target_framework):
+ if file_framework is target_framework:
+ return '"%s"' % filename
+ else:
+ return '<%s/%s>' % (file_framework.name, filename)
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py 2016-02-24 06:43:07 UTC (rev 197013)
@@ -86,15 +86,15 @@
# Do not use a dynamic prefix for RWIProtocolJSONObject since it's used as a common
# base class and needs a consistent Objective-C prefix to be in a reusable framework.
OBJC_HELPER_PREFIX = 'RWI'
- OBJC_COMMON_PREFIX = 'Protocol'
- OBJC_JSON_OBJECT_BASE = '%s%sJSONObject' % (OBJC_HELPER_PREFIX, OBJC_COMMON_PREFIX)
+ OBJC_SHARED_PREFIX = 'Protocol'
+ OBJC_STATIC_PREFIX = '%s%s' % (OBJC_HELPER_PREFIX, OBJC_SHARED_PREFIX)
def __init__(self, model, input_filepath):
Generator.__init__(self, model, input_filepath)
def objc_prefix(self):
framework_prefix = self.model().framework.setting('objc_prefix', '')
- return '%s%s' % (framework_prefix, ObjCGenerator.OBJC_COMMON_PREFIX)
+ return '%s%s' % (framework_prefix, ObjCGenerator.OBJC_SHARED_PREFIX)
# Adjust identifier names that collide with ObjC keywords.
@@ -108,7 +108,7 @@
# Generate ObjC types, command handlers, and event dispatchers for a subset of domains.
- DOMAINS_TO_GENERATE = ['CSS', 'DOM', 'DOMStorage', 'Network', 'Page', 'GenericTypes']
+ DOMAINS_TO_GENERATE = ['CSS', 'DOM', 'DOMStorage', 'Network', 'Page', 'Automation', 'GenericTypes']
@staticmethod
def should_generate_domain_types_filter(model):
@@ -206,7 +206,7 @@
if raw_name is 'boolean':
return 'BOOL'
if raw_name in ['any', 'object']:
- return '%s *' % ObjCGenerator.OBJC_JSON_OBJECT_BASE
+ return '%sJSONObject *' % ObjCGenerator.OBJC_STATIC_PREFIX
return None
@staticmethod
@@ -218,7 +218,7 @@
if raw_name in ['integer', 'number', 'boolean']:
return 'NSNumber'
if raw_name in ['any', 'object']:
- return ObjCGenerator.OBJC_JSON_OBJECT_BASE
+ return '%sJSONObject' % ObjCGenerator.OBJC_STATIC_PREFIX
return None
# FIXME: Can these protocol_type functions be removed in favor of C++ generators functions?
Modified: trunk/Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py 2016-02-24 06:43:07 UTC (rev 197013)
@@ -170,7 +170,7 @@
elif protocol.framework is Frameworks.WebKit and generate_frontend:
# FIXME <rdar://problem/23466925>: This list of generators for the frontend is a placeholder.
generators.append(ObjCConversionHelpersGenerator(protocol, primary_specification_filepath))
- generators.append(ObjCFrontendDispatcherImplementationGenerator(protocol, primary_specification_filepath))
+ generators.append(ObjCHeaderGenerator(protocol, primary_specification_filepath))
generators.append(ObjCProtocolTypesImplementationGenerator(protocol, primary_specification_filepath))
elif protocol.framework is Frameworks.WebInspector:
@@ -187,6 +187,13 @@
single_output_file_contents = []
for generator in generators:
+ # Only some generators care whether frontend or backend was specified, but it is
+ # set on all of them to avoid adding more constructor arguments or thinking too hard.
+ if generate_backend:
+ generator.set_generator_setting('generate_backend', True)
+ if generate_frontend:
+ generator.set_generator_setting('generate_frontend', True)
+
output = generator.generate_output()
if concatenate_output:
single_output_file_contents.append('### Begin File: %s' % generator.output_filename())
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-02-24 06:43:07 UTC (rev 197013)
@@ -1031,7 +1031,7 @@
backendDispatcher()->sendPendingErrors();
};
- id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, ProtocolJSONObject **values, ProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor) {
+ id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor) {
Ref<InspectorObject> resultObject = InspectorObject::create();
THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
@@ -1075,7 +1075,7 @@
backendDispatcher()->sendPendingErrors();
};
- id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, ProtocolJSONObject **values, ProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor) {
+ id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor) {
Ref<InspectorObject> resultObject = InspectorObject::create();
THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
@@ -1119,7 +1119,7 @@
backendDispatcher()->sendPendingErrors();
};
- id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, ProtocolJSONObject *values, ProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabasePrimaryColors screenColor, TestProtocolDatabaseExecuteSQLSyncPrintColor printColor) {
+ id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabasePrimaryColors screenColor, TestProtocolDatabaseExecuteSQLSyncPrintColor printColor) {
Ref<InspectorObject> resultObject = InspectorObject::create();
THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
@@ -1153,7 +1153,7 @@
backendDispatcher()->sendPendingErrors();
};
- id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, ProtocolJSONObject *values, ProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteSQLAsyncPrintColor printColor) {
+ id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteSQLAsyncPrintColor printColor) {
Ref<InspectorObject> resultObject = InspectorObject::create();
THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
@@ -1216,7 +1216,7 @@
// DO NOT EDIT THIS FILE. It is automatically generated from commands-with-async-attribute.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "TestProtocolArrayConversionHelpers.h"
+#import "RWIProtocolArrayConversionHelpers.h"
namespace Inspector {
@@ -1446,7 +1446,7 @@
#import <Foundation/Foundation.h>
-#import <WebInspector/TestProtocolJSONObject.h>
+#import <WebInspector/RWIProtocolJSONObject.h>
@class TestProtocolDatabaseError;
@@ -1488,7 +1488,7 @@
__attribute__((visibility ("default")))
-@interface TestProtocolDatabaseError : ProtocolJSONObject
+@interface TestProtocolDatabaseError : RWIProtocolJSONObject
- (instancetype)initWithMessage:(NSString *)message code:(int)code;
/* required */ @property (nonatomic, copy) NSString *message;
/* required */ @property (nonatomic, assign) int code;
@@ -1496,10 +1496,10 @@
@protocol TestProtocolDatabaseDomainHandler <NSObject>
@required
-- (void)executeSQLSyncOptionalReturnValuesWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, ProtocolJSONObject **values, ProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
-- (void)executeSQLAsyncOptionalReturnValuesWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, ProtocolJSONObject **values, ProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
-- (void)executeSQLSyncWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, ProtocolJSONObject *values, ProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabasePrimaryColors screenColor, TestProtocolDatabaseExecuteSQLSyncPrintColor printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
-- (void)executeSQLAsyncWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, ProtocolJSONObject *values, ProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteSQLAsyncPrintColor printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
+- (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;
+- (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;
+- (void)executeSQLSyncWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabasePrimaryColors screenColor, TestProtocolDatabaseExecuteSQLSyncPrintColor printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
+- (void)executeSQLAsyncWithErrorCallback:(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, TestProtocolDatabaseExecuteSQLAsyncPrintColor printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
@end
@@ -1539,7 +1539,7 @@
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
#import "TestProtocol.h"
-#import "TestProtocolJSONObjectInternal.h"
+#import "TestProtocolJSONObjectPrivate.h"
#import <_javascript_Core/AugmentableInspectorController.h>
#import <_javascript_Core/InspectorValues.h>
@@ -1583,6 +1583,7 @@
#import "TestProtocolInternal.h"
#import "TestProtocolEnumConversionHelpers.h"
+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
#import <_javascript_Core/InspectorValues.h>
#import <wtf/Assertions.h>
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-02-24 06:43:07 UTC (rev 197013)
@@ -930,7 +930,7 @@
backendDispatcher()->sendPendingErrors();
};
- id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, ProtocolJSONObject **values, ProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor) {
+ id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor) {
Ref<InspectorObject> resultObject = InspectorObject::create();
THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
@@ -970,12 +970,12 @@
double o_in_timestamp;
if (in_timestamp)
o_in_timestamp = *in_timestamp;
- ProtocolJSONObject *o_in_values;
+ RWIProtocolJSONObject *o_in_values;
if (in_values)
- o_in_values = [[[ProtocolJSONObject alloc] initWithInspectorObject:in_values] autorelease];
- ProtocolJSONObject *o_in_payload;
+ o_in_values = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:in_values] autorelease];
+ RWIProtocolJSONObject *o_in_payload;
if (in_payload)
- o_in_payload = [[[ProtocolJSONObject alloc] initWithInspectorObject:in_payload] autorelease];
+ o_in_payload = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:in_payload] autorelease];
int o_in_databaseId;
if (in_databaseId)
o_in_databaseId = *in_databaseId;
@@ -1002,7 +1002,7 @@
backendDispatcher()->sendPendingErrors();
};
- id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, ProtocolJSONObject *values, ProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor) {
+ id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor) {
Ref<InspectorObject> resultObject = InspectorObject::create();
THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
@@ -1026,8 +1026,8 @@
NSArray/*<NSString>*/ *o_in_columnNames = objcStringArray(&in_columnNames);
NSString *o_in_notes = in_notes;
double o_in_timestamp = in_timestamp;
- ProtocolJSONObject *o_in_values = [[[ProtocolJSONObject alloc] initWithInspectorObject:&in_values] autorelease];
- ProtocolJSONObject *o_in_payload = [[[ProtocolJSONObject alloc] initWithInspectorObject:&in_payload] autorelease];
+ RWIProtocolJSONObject *o_in_values = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:&in_values] autorelease];
+ RWIProtocolJSONObject *o_in_payload = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:&in_payload] autorelease];
int o_in_databaseId = in_databaseId;
TestProtocolDatabaseError *o_in_sqlError = [[[TestProtocolDatabaseError alloc] initWithInspectorObject:&in_sqlError] autorelease];
TestProtocolDatabasePrimaryColors o_in_screenColor = fromProtocolString<TestProtocolDatabasePrimaryColors>(in_screenColor);
@@ -1073,7 +1073,7 @@
// DO NOT EDIT THIS FILE. It is automatically generated from commands-with-optional-call-return-parameters.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "TestProtocolArrayConversionHelpers.h"
+#import "RWIProtocolArrayConversionHelpers.h"
namespace Inspector {
@@ -1303,7 +1303,7 @@
#import <Foundation/Foundation.h>
-#import <WebInspector/TestProtocolJSONObject.h>
+#import <WebInspector/RWIProtocolJSONObject.h>
@class TestProtocolDatabaseError;
@@ -1345,7 +1345,7 @@
__attribute__((visibility ("default")))
-@interface TestProtocolDatabaseError : ProtocolJSONObject
+@interface TestProtocolDatabaseError : RWIProtocolJSONObject
- (instancetype)initWithMessage:(NSString *)message code:(int)code;
/* required */ @property (nonatomic, copy) NSString *message;
/* required */ @property (nonatomic, assign) int code;
@@ -1353,8 +1353,8 @@
@protocol TestProtocolDatabaseDomainHandler <NSObject>
@required
-- (void)executeAllOptionalParametersWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, ProtocolJSONObject **values, ProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor))successCallback columnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(ProtocolJSONObject **)values payload:(ProtocolJSONObject **)payload databaseId:(int *)databaseId sqlError:(TestProtocolDatabaseError **)sqlError screenColor:(TestProtocolDatabasePrimaryColors *)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(TestProtocolDatabaseExecuteAllOptionalParametersPrintColor *)printColor;
-- (void)executeNoOptionalParametersWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, ProtocolJSONObject *values, ProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor))successCallback columnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload databaseId:(int)databaseId sqlError:(TestProtocolDatabaseError *)sqlError screenColor:(TestProtocolDatabasePrimaryColors)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(TestProtocolDatabaseExecuteNoOptionalParametersPrintColor)printColor;
+- (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 *)printCol
or;
+- (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;
@end
@@ -1394,7 +1394,7 @@
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
#import "TestProtocol.h"
-#import "TestProtocolJSONObjectInternal.h"
+#import "TestProtocolJSONObjectPrivate.h"
#import <_javascript_Core/AugmentableInspectorController.h>
#import <_javascript_Core/InspectorValues.h>
@@ -1438,6 +1438,7 @@
#import "TestProtocolInternal.h"
#import "TestProtocolEnumConversionHelpers.h"
+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
#import <_javascript_Core/InspectorValues.h>
#import <wtf/Assertions.h>
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-02-24 06:43:07 UTC (rev 197013)
@@ -1131,7 +1131,7 @@
// DO NOT EDIT THIS FILE. It is automatically generated from domains-with-varying-command-sizes.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "TestProtocolArrayConversionHelpers.h"
+#import "RWIProtocolArrayConversionHelpers.h"
namespace Inspector {
@@ -1229,7 +1229,7 @@
#import <Foundation/Foundation.h>
-#import <WebInspector/TestProtocolJSONObject.h>
+#import <WebInspector/RWIProtocolJSONObject.h>
@@ -1291,7 +1291,7 @@
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
#import "TestProtocol.h"
-#import "TestProtocolJSONObjectInternal.h"
+#import "TestProtocolJSONObjectPrivate.h"
#import <_javascript_Core/AugmentableInspectorController.h>
#import <_javascript_Core/InspectorValues.h>
@@ -1335,6 +1335,7 @@
#import "TestProtocolInternal.h"
#import "TestProtocolEnumConversionHelpers.h"
+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
#import <_javascript_Core/InspectorValues.h>
#import <wtf/Assertions.h>
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result 2016-02-24 06:43:07 UTC (rev 197013)
@@ -835,7 +835,7 @@
// DO NOT EDIT THIS FILE. It is automatically generated from enum-values.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "TestProtocolArrayConversionHelpers.h"
+#import "RWIProtocolArrayConversionHelpers.h"
namespace Inspector {
@@ -1040,7 +1040,7 @@
#import <Foundation/Foundation.h>
-#import <WebInspector/TestProtocolJSONObject.h>
+#import <WebInspector/RWIProtocolJSONObject.h>
@@ -1113,7 +1113,7 @@
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
#import "TestProtocol.h"
-#import "TestProtocolJSONObjectInternal.h"
+#import "TestProtocolJSONObjectPrivate.h"
#import <_javascript_Core/AugmentableInspectorController.h>
#import <_javascript_Core/InspectorValues.h>
@@ -1159,6 +1159,7 @@
#import "TestProtocolInternal.h"
#import "TestProtocolEnumConversionHelpers.h"
+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
#import <_javascript_Core/InspectorValues.h>
#import <wtf/Assertions.h>
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-02-24 06:43:07 UTC (rev 197013)
@@ -780,7 +780,7 @@
// DO NOT EDIT THIS FILE. It is automatically generated from events-with-optional-parameters.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "TestProtocolArrayConversionHelpers.h"
+#import "RWIProtocolArrayConversionHelpers.h"
namespace Inspector {
@@ -847,7 +847,7 @@
return self;
}
-- (void)didExecuteOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(ProtocolJSONObject **)values payload:(ProtocolJSONObject **)payload sqlError:(TestProtocolDatabaseError **)sqlError screenColor:(NSString **)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(NSString **)printColor
+- (void)didExecuteOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(RWIProtocolJSONObject **)values payload:(RWIProtocolJSONObject **)payload sqlError:(TestProtocolDatabaseError **)sqlError screenColor:(NSString **)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(NSString **)printColor
{
const FrontendRouter& router = _controller->frontendRouter();
@@ -885,7 +885,7 @@
router.sendEvent(jsonMessage->toJSONString());
}
-- (void)didExecuteNoOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload sqlError:(TestProtocolDatabaseError *)sqlError screenColor:(NSString *)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(NSString *)printColor
+- (void)didExecuteNoOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload sqlError:(TestProtocolDatabaseError *)sqlError screenColor:(NSString *)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(NSString *)printColor
{
const FrontendRouter& router = _controller->frontendRouter();
@@ -952,7 +952,7 @@
#import <Foundation/Foundation.h>
-#import <WebInspector/TestProtocolJSONObject.h>
+#import <WebInspector/RWIProtocolJSONObject.h>
@class TestProtocolDatabaseError;
@@ -961,7 +961,7 @@
__attribute__((visibility ("default")))
-@interface TestProtocolDatabaseError : ProtocolJSONObject
+@interface TestProtocolDatabaseError : RWIProtocolJSONObject
- (instancetype)initWithMessage:(NSString *)message code:(int)code;
/* required */ @property (nonatomic, copy) NSString *message;
/* required */ @property (nonatomic, assign) int code;
@@ -971,8 +971,8 @@
__attribute__((visibility ("default")))
@interface TestProtocolDatabaseDomainEventDispatcher : NSObject
-- (void)didExecuteOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(ProtocolJSONObject **)values payload:(ProtocolJSONObject **)payload sqlError:(TestProtocolDatabaseError **)sqlError screenColor:(NSString **)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(NSString **)printColor;
-- (void)didExecuteNoOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload sqlError:(TestProtocolDatabaseError *)sqlError screenColor:(NSString *)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(NSString *)printColor;
+- (void)didExecuteOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(RWIProtocolJSONObject **)values payload:(RWIProtocolJSONObject **)payload sqlError:(TestProtocolDatabaseError **)sqlError screenColor:(NSString **)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(NSString **)printColor;
+- (void)didExecuteNoOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload sqlError:(TestProtocolDatabaseError *)sqlError screenColor:(NSString *)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(NSString *)printColor;
@end
@@ -1010,7 +1010,7 @@
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
#import "TestProtocol.h"
-#import "TestProtocolJSONObjectInternal.h"
+#import "TestProtocolJSONObjectPrivate.h"
#import <_javascript_Core/AugmentableInspectorController.h>
#import <_javascript_Core/InspectorValues.h>
@@ -1056,6 +1056,7 @@
#import "TestProtocolInternal.h"
#import "TestProtocolEnumConversionHelpers.h"
+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
#import <_javascript_Core/InspectorValues.h>
#import <wtf/Assertions.h>
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-02-24 06:43:07 UTC (rev 197013)
@@ -881,7 +881,7 @@
// DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "TestProtocolArrayConversionHelpers.h"
+#import "RWIProtocolArrayConversionHelpers.h"
namespace Inspector {
@@ -1003,7 +1003,7 @@
#import <Foundation/Foundation.h>
-#import <WebInspector/TestProtocolJSONObject.h>
+#import <WebInspector/RWIProtocolJSONObject.h>
@class TestProtocolNetwork2NetworkError;
@@ -1012,7 +1012,7 @@
__attribute__((visibility ("default")))
-@interface TestProtocolNetwork2NetworkError : ProtocolJSONObject
+@interface TestProtocolNetwork2NetworkError : RWIProtocolJSONObject
- (instancetype)initWithMessage:(NSString *)message code:(int)code;
/* required */ @property (nonatomic, copy) NSString *message;
/* required */ @property (nonatomic, assign) int code;
@@ -1063,7 +1063,7 @@
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
#import "TestProtocol.h"
-#import "TestProtocolJSONObjectInternal.h"
+#import "TestProtocolJSONObjectPrivate.h"
#import <_javascript_Core/AugmentableInspectorController.h>
#import <_javascript_Core/InspectorValues.h>
@@ -1109,6 +1109,7 @@
#import "TestProtocolInternal.h"
#import "TestProtocolEnumConversionHelpers.h"
+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
#import <_javascript_Core/InspectorValues.h>
#import <wtf/Assertions.h>
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/same-type-id-different-domain.json-result (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2016-02-24 06:43:07 UTC (rev 197013)
@@ -642,7 +642,7 @@
// DO NOT EDIT THIS FILE. It is automatically generated from same-type-id-different-domain.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "TestProtocolArrayConversionHelpers.h"
+#import "RWIProtocolArrayConversionHelpers.h"
namespace Inspector {
@@ -736,7 +736,7 @@
#import <Foundation/Foundation.h>
-#import <WebInspector/TestProtocolJSONObject.h>
+#import <WebInspector/RWIProtocolJSONObject.h>
@@ -784,7 +784,7 @@
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
#import "TestProtocol.h"
-#import "TestProtocolJSONObjectInternal.h"
+#import "TestProtocolJSONObjectPrivate.h"
#import <_javascript_Core/AugmentableInspectorController.h>
#import <_javascript_Core/InspectorValues.h>
@@ -828,6 +828,7 @@
#import "TestProtocolInternal.h"
#import "TestProtocolEnumConversionHelpers.h"
+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
#import <_javascript_Core/InspectorValues.h>
#import <wtf/Assertions.h>
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-02-24 06:43:07 UTC (rev 197013)
@@ -711,7 +711,7 @@
// DO NOT EDIT THIS FILE. It is automatically generated from shadowed-optional-type-setters.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "TestProtocolArrayConversionHelpers.h"
+#import "RWIProtocolArrayConversionHelpers.h"
namespace Inspector {
@@ -825,7 +825,7 @@
#import <Foundation/Foundation.h>
-#import <WebInspector/TestProtocolJSONObject.h>
+#import <WebInspector/RWIProtocolJSONObject.h>
@class TestProtocolRuntimeKeyPath;
@@ -839,7 +839,7 @@
__attribute__((visibility ("default")))
-@interface TestProtocolRuntimeKeyPath : ProtocolJSONObject
+@interface TestProtocolRuntimeKeyPath : RWIProtocolJSONObject
- (instancetype)initWithType:(TestProtocolRuntimeKeyPathType)type;
/* required */ @property (nonatomic, assign) TestProtocolRuntimeKeyPathType type;
/* optional */ @property (nonatomic, copy) NSString *string;
@@ -885,7 +885,7 @@
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
#import "TestProtocol.h"
-#import "TestProtocolJSONObjectInternal.h"
+#import "TestProtocolJSONObjectPrivate.h"
#import <_javascript_Core/AugmentableInspectorController.h>
#import <_javascript_Core/InspectorValues.h>
@@ -929,6 +929,7 @@
#import "TestProtocolInternal.h"
#import "TestProtocolEnumConversionHelpers.h"
+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
#import <_javascript_Core/InspectorValues.h>
#import <wtf/Assertions.h>
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2016-02-24 06:43:07 UTC (rev 197013)
@@ -633,7 +633,7 @@
// DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-aliased-primitive-type.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "TestProtocolArrayConversionHelpers.h"
+#import "RWIProtocolArrayConversionHelpers.h"
namespace Inspector {
@@ -723,7 +723,7 @@
#import <Foundation/Foundation.h>
-#import <WebInspector/TestProtocolJSONObject.h>
+#import <WebInspector/RWIProtocolJSONObject.h>
@@ -771,7 +771,7 @@
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
#import "TestProtocol.h"
-#import "TestProtocolJSONObjectInternal.h"
+#import "TestProtocolJSONObjectPrivate.h"
#import <_javascript_Core/AugmentableInspectorController.h>
#import <_javascript_Core/InspectorValues.h>
@@ -815,6 +815,7 @@
#import "TestProtocolInternal.h"
#import "TestProtocolEnumConversionHelpers.h"
+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
#import <_javascript_Core/InspectorValues.h>
#import <wtf/Assertions.h>
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-02-24 06:43:07 UTC (rev 197013)
@@ -665,7 +665,7 @@
// DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-array-type.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "TestProtocolArrayConversionHelpers.h"
+#import "RWIProtocolArrayConversionHelpers.h"
namespace Inspector {
@@ -783,7 +783,7 @@
#import <Foundation/Foundation.h>
-#import <WebInspector/TestProtocolJSONObject.h>
+#import <WebInspector/RWIProtocolJSONObject.h>
@@ -836,7 +836,7 @@
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
#import "TestProtocol.h"
-#import "TestProtocolJSONObjectInternal.h"
+#import "TestProtocolJSONObjectPrivate.h"
#import <_javascript_Core/AugmentableInspectorController.h>
#import <_javascript_Core/InspectorValues.h>
@@ -880,6 +880,7 @@
#import "TestProtocolInternal.h"
#import "TestProtocolEnumConversionHelpers.h"
+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
#import <_javascript_Core/InspectorValues.h>
#import <wtf/Assertions.h>
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-02-24 06:43:07 UTC (rev 197013)
@@ -662,7 +662,7 @@
// DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-enum-type.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "TestProtocolArrayConversionHelpers.h"
+#import "RWIProtocolArrayConversionHelpers.h"
namespace Inspector {
@@ -809,7 +809,7 @@
#import <Foundation/Foundation.h>
-#import <WebInspector/TestProtocolJSONObject.h>
+#import <WebInspector/RWIProtocolJSONObject.h>
@@ -870,7 +870,7 @@
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
#import "TestProtocol.h"
-#import "TestProtocolJSONObjectInternal.h"
+#import "TestProtocolJSONObjectPrivate.h"
#import <_javascript_Core/AugmentableInspectorController.h>
#import <_javascript_Core/InspectorValues.h>
@@ -914,6 +914,7 @@
#import "TestProtocolInternal.h"
#import "TestProtocolEnumConversionHelpers.h"
+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
#import <_javascript_Core/InspectorValues.h>
#import <wtf/Assertions.h>
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-02-24 06:43:07 UTC (rev 197013)
@@ -1102,7 +1102,7 @@
// DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-object-type.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "TestProtocolArrayConversionHelpers.h"
+#import "RWIProtocolArrayConversionHelpers.h"
namespace Inspector {
@@ -1196,7 +1196,7 @@
#import <Foundation/Foundation.h>
-#import <WebInspector/TestProtocolJSONObject.h>
+#import <WebInspector/RWIProtocolJSONObject.h>
@class TestProtocolDatabaseError;
@@ -1210,37 +1210,37 @@
__attribute__((visibility ("default")))
-@interface TestProtocolDatabaseError : ProtocolJSONObject
+@interface TestProtocolDatabaseError : RWIProtocolJSONObject
- (instancetype)initWithMessage:(NSString *)message code:(int)code;
/* required */ @property (nonatomic, copy) NSString *message;
/* required */ @property (nonatomic, assign) int code;
@end
__attribute__((visibility ("default")))
-@interface TestProtocolDatabaseOptionalParameterBundle : ProtocolJSONObject
+@interface TestProtocolDatabaseOptionalParameterBundle : RWIProtocolJSONObject
/* optional */ @property (nonatomic, copy) NSArray/*<NSString>*/ *columnNames;
/* optional */ @property (nonatomic, copy) NSString *notes;
/* optional */ @property (nonatomic, assign) double timestamp;
-/* optional */ @property (nonatomic, retain) ProtocolJSONObject *values;
-/* optional */ @property (nonatomic, retain) ProtocolJSONObject *payload;
+/* optional */ @property (nonatomic, retain) RWIProtocolJSONObject *values;
+/* optional */ @property (nonatomic, retain) RWIProtocolJSONObject *payload;
/* optional */ @property (nonatomic, retain) TestProtocolDatabaseError *error;
/* optional */ @property (nonatomic, copy) NSArray/*<TestProtocolDatabaseError>*/ *errorList;
@end
__attribute__((visibility ("default")))
-@interface TestProtocolDatabaseParameterBundle : ProtocolJSONObject
-- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error errorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList;
+@interface TestProtocolDatabaseParameterBundle : RWIProtocolJSONObject
+- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error errorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList;
/* required */ @property (nonatomic, copy) NSArray/*<NSString>*/ *columnNames;
/* required */ @property (nonatomic, copy) NSString *notes;
/* required */ @property (nonatomic, assign) double timestamp;
-/* required */ @property (nonatomic, retain) ProtocolJSONObject *values;
-/* required */ @property (nonatomic, retain) ProtocolJSONObject *payload;
+/* required */ @property (nonatomic, retain) RWIProtocolJSONObject *values;
+/* required */ @property (nonatomic, retain) RWIProtocolJSONObject *payload;
/* required */ @property (nonatomic, retain) TestProtocolDatabaseError *error;
/* required */ @property (nonatomic, copy) NSArray/*<TestProtocolDatabaseError>*/ *errorList;
@end
__attribute__((visibility ("default")))
-@interface TestProtocolDatabaseObjectWithPropertyNameConflicts : ProtocolJSONObject
+@interface TestProtocolDatabaseObjectWithPropertyNameConflicts : RWIProtocolJSONObject
- (instancetype)initWithInteger:(NSString *)integer array:(NSString *)array string:(NSString *)string value:(NSString *)value object:(NSString *)object;
/* required */ @property (nonatomic, copy) NSString *integer;
/* required */ @property (nonatomic, copy) NSString *array;
@@ -1250,17 +1250,17 @@
@end
__attribute__((visibility ("default")))
-@interface TestProtocolDatabaseDummyObject : ProtocolJSONObject
+@interface TestProtocolDatabaseDummyObject : RWIProtocolJSONObject
@end
__attribute__((visibility ("default")))
-@interface TestProtocolTestParameterBundle : ProtocolJSONObject
-- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error;
+@interface TestProtocolTestParameterBundle : RWIProtocolJSONObject
+- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error;
/* required */ @property (nonatomic, copy) NSArray/*<NSString>*/ *columnNames;
/* required */ @property (nonatomic, copy) NSString *notes;
/* required */ @property (nonatomic, assign) double timestamp;
-/* required */ @property (nonatomic, retain) ProtocolJSONObject *values;
-/* required */ @property (nonatomic, retain) ProtocolJSONObject *payload;
+/* required */ @property (nonatomic, retain) RWIProtocolJSONObject *values;
+/* required */ @property (nonatomic, retain) RWIProtocolJSONObject *payload;
/* required */ @property (nonatomic, retain) TestProtocolDatabaseError *error;
@end
@@ -1303,7 +1303,7 @@
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
#import "TestProtocol.h"
-#import "TestProtocolJSONObjectInternal.h"
+#import "TestProtocolJSONObjectPrivate.h"
#import <_javascript_Core/AugmentableInspectorController.h>
#import <_javascript_Core/InspectorValues.h>
@@ -1347,6 +1347,7 @@
#import "TestProtocolInternal.h"
#import "TestProtocolEnumConversionHelpers.h"
+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
#import <_javascript_Core/InspectorValues.h>
#import <wtf/Assertions.h>
@@ -1423,24 +1424,24 @@
return [super doubleForKey:@"timestamp"];
}
-- (void)setValues:(ProtocolJSONObject *)values
+- (void)setValues:(RWIProtocolJSONObject *)values
{
[super setObject:values forKey:@"values"];
}
-- (ProtocolJSONObject *)values
+- (RWIProtocolJSONObject *)values
{
- return (ProtocolJSONObject *)[super objectForKey:@"values"];
+ return (RWIProtocolJSONObject *)[super objectForKey:@"values"];
}
-- (void)setPayload:(ProtocolJSONObject *)payload
+- (void)setPayload:(RWIProtocolJSONObject *)payload
{
[super setObject:payload forKey:@"payload"];
}
-- (ProtocolJSONObject *)payload
+- (RWIProtocolJSONObject *)payload
{
- return (ProtocolJSONObject *)[super objectForKey:@"payload"];
+ return (RWIProtocolJSONObject *)[super objectForKey:@"payload"];
}
- (void)setError:(TestProtocolDatabaseError *)error
@@ -1468,7 +1469,7 @@
@implementation TestProtocolDatabaseParameterBundle
-- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error errorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList;
+- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error errorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList;
{
self = [super init];
if (!self)
@@ -1523,24 +1524,24 @@
return [super doubleForKey:@"timestamp"];
}
-- (void)setValues:(ProtocolJSONObject *)values
+- (void)setValues:(RWIProtocolJSONObject *)values
{
[super setObject:values forKey:@"values"];
}
-- (ProtocolJSONObject *)values
+- (RWIProtocolJSONObject *)values
{
- return (ProtocolJSONObject *)[super objectForKey:@"values"];
+ return (RWIProtocolJSONObject *)[super objectForKey:@"values"];
}
-- (void)setPayload:(ProtocolJSONObject *)payload
+- (void)setPayload:(RWIProtocolJSONObject *)payload
{
[super setObject:payload forKey:@"payload"];
}
-- (ProtocolJSONObject *)payload
+- (RWIProtocolJSONObject *)payload
{
- return (ProtocolJSONObject *)[super objectForKey:@"payload"];
+ return (RWIProtocolJSONObject *)[super objectForKey:@"payload"];
}
- (void)setError:(TestProtocolDatabaseError *)error
@@ -1648,7 +1649,7 @@
@implementation TestProtocolTestParameterBundle
-- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error;
+- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error;
{
self = [super init];
if (!self)
@@ -1700,24 +1701,24 @@
return [super doubleForKey:@"timestamp"];
}
-- (void)setValues:(ProtocolJSONObject *)values
+- (void)setValues:(RWIProtocolJSONObject *)values
{
[super setObject:values forKey:@"values"];
}
-- (ProtocolJSONObject *)values
+- (RWIProtocolJSONObject *)values
{
- return (ProtocolJSONObject *)[super objectForKey:@"values"];
+ return (RWIProtocolJSONObject *)[super objectForKey:@"values"];
}
-- (void)setPayload:(ProtocolJSONObject *)payload
+- (void)setPayload:(RWIProtocolJSONObject *)payload
{
[super setObject:payload forKey:@"payload"];
}
-- (ProtocolJSONObject *)payload
+- (RWIProtocolJSONObject *)payload
{
- return (ProtocolJSONObject *)[super objectForKey:@"payload"];
+ return (RWIProtocolJSONObject *)[super objectForKey:@"payload"];
}
- (void)setError:(TestProtocolDatabaseError *)error
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (197012 => 197013)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-02-24 06:43:07 UTC (rev 197013)
@@ -989,7 +989,7 @@
// DO NOT EDIT THIS FILE. It is automatically generated from type-requiring-runtime-casts.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "TestProtocolArrayConversionHelpers.h"
+#import "RWIProtocolArrayConversionHelpers.h"
namespace Inspector {
@@ -1136,7 +1136,7 @@
#import <Foundation/Foundation.h>
-#import <WebInspector/TestProtocolJSONObject.h>
+#import <WebInspector/RWIProtocolJSONObject.h>
@class TestProtocolTestTypeNeedingCast;
@@ -1160,7 +1160,7 @@
__attribute__((visibility ("default")))
-@interface TestProtocolTestTypeNeedingCast : ProtocolJSONObject
+@interface TestProtocolTestTypeNeedingCast : RWIProtocolJSONObject
- (instancetype)initWithString:(NSString *)string number:(int)number animals:(TestProtocolTestCastedAnimals)animals identifier:(int)identifier tree:(TestProtocolTestRecursiveObject1 *)tree;
/* required */ @property (nonatomic, copy) NSString *string;
/* required */ @property (nonatomic, assign) int number;
@@ -1170,12 +1170,12 @@
@end
__attribute__((visibility ("default")))
-@interface TestProtocolTestRecursiveObject1 : ProtocolJSONObject
+@interface TestProtocolTestRecursiveObject1 : RWIProtocolJSONObject
/* optional */ @property (nonatomic, retain) TestProtocolTestRecursiveObject2 *obj;
@end
__attribute__((visibility ("default")))
-@interface TestProtocolTestRecursiveObject2 : ProtocolJSONObject
+@interface TestProtocolTestRecursiveObject2 : RWIProtocolJSONObject
/* optional */ @property (nonatomic, retain) TestProtocolTestRecursiveObject1 *obj;
@end
@@ -1218,7 +1218,7 @@
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
#import "TestProtocol.h"
-#import "TestProtocolJSONObjectInternal.h"
+#import "TestProtocolJSONObjectPrivate.h"
#import <_javascript_Core/AugmentableInspectorController.h>
#import <_javascript_Core/InspectorValues.h>
@@ -1262,6 +1262,7 @@
#import "TestProtocolInternal.h"
#import "TestProtocolEnumConversionHelpers.h"
+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
#import <_javascript_Core/InspectorValues.h>
#import <wtf/Assertions.h>
