<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[197689] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/197689">197689</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-03-07 10:41:30 -0800 (Mon, 07 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: It should be possible to initialize generated ObjC protocol types from an NSDictionary payload
https://bugs.webkit.org/show_bug.cgi?id=155102
<rdar://problem/25002015>
Reviewed by Timothy Hatcher.
In Objective-C code, we sometimes prefer to parse JSON using Cocoa rather
than the InspectorValue classes. Support initializing protocol objects
directly from an NSDictionary payload. This delegates validation of values to
the setter methods that already exist on the protocol object classes.
* inspector/scripts/codegen/generate_objc_header.py:
(ObjCHeaderGenerator._generate_type_interface):
* inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:
(ObjCProtocolTypesImplementationGenerator.generate_type_implementation):
(ObjCProtocolTypesImplementationGenerator._generate_init_method_for_payload):
* inspector/scripts/codegen/objc_generator.py:
(ObjCGenerator.payload_to_objc_expression_for_member):
Add a new helper method to generate an expression to unpack the value
from an NSDictionary. If it's not a primitive, the setter performs
validation of the value's kind using -[NSObject isKindOfClass:].
Rebaseline relevant tests.
* 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/events-with-optional-parameters.json-result:
* inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
* inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
* inspector/scripts/tests/expected/type-declaration-object-type.json-result:
* inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_types_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generatorpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedshadowedoptionaltypesettersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197688 => 197689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-07 18:30:31 UTC (rev 197688)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-07 18:41:30 UTC (rev 197689)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2016-03-07 Brian Burg <bburg@apple.com>
+
+ Web Inspector: It should be possible to initialize generated ObjC protocol types from an NSDictionary payload
+ https://bugs.webkit.org/show_bug.cgi?id=155102
+ <rdar://problem/25002015>
+
+ Reviewed by Timothy Hatcher.
+
+ In Objective-C code, we sometimes prefer to parse JSON using Cocoa rather
+ than the InspectorValue classes. Support initializing protocol objects
+ directly from an NSDictionary payload. This delegates validation of values to
+ the setter methods that already exist on the protocol object classes.
+
+ * inspector/scripts/codegen/generate_objc_header.py:
+ (ObjCHeaderGenerator._generate_type_interface):
+ * inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:
+ (ObjCProtocolTypesImplementationGenerator.generate_type_implementation):
+ (ObjCProtocolTypesImplementationGenerator._generate_init_method_for_payload):
+ * inspector/scripts/codegen/objc_generator.py:
+ (ObjCGenerator.payload_to_objc_expression_for_member):
+ Add a new helper method to generate an expression to unpack the value
+ from an NSDictionary. If it's not a primitive, the setter performs
+ validation of the value's kind using -[NSObject isKindOfClass:].
+
+ Rebaseline relevant tests.
+
+ * 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/events-with-optional-parameters.json-result:
+ * inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
+ * inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
+ * inspector/scripts/tests/expected/type-declaration-object-type.json-result:
+ * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
+
</ins><span class="cx"> 2016-03-07 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> [JSC] Simplify the overflow check of ArithAbs
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py (197688 => 197689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2016-03-07 18:30:31 UTC (rev 197688)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2016-03-07 18:41:30 UTC (rev 197689)
</span><span class="lines">@@ -159,6 +159,11 @@
</span><span class="cx"> objc_name = self.objc_name_for_type(declaration.type)
</span><span class="cx"> lines.append('__attribute__((visibility ("default")))')
</span><span class="cx"> lines.append('@interface %s : %sJSONObject' % (objc_name, ObjCGenerator.OBJC_STATIC_PREFIX))
</span><ins>+
+ # The initializer that takes a payload is only needed by the frontend.
+ if self.get_generator_setting('generate_frontend', False):
+ lines.append('- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;')
+
</ins><span class="cx"> required_members = filter(lambda member: not member.is_optional, declaration.type_members)
</span><span class="cx"> optional_members = filter(lambda member: member.is_optional, declaration.type_members)
</span><span class="cx"> if required_members:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_types_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py (197688 => 197689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2016-03-07 18:30:31 UTC (rev 197688)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2016-03-07 18:41:30 UTC (rev 197689)
</span><span class="lines">@@ -90,6 +90,10 @@
</span><span class="cx"> def generate_type_implementation(self, domain, declaration):
</span><span class="cx"> lines = []
</span><span class="cx"> lines.append('@implementation %s' % self.objc_name_for_type(declaration.type))
</span><ins>+ # The initializer that takes a payload is only needed by the frontend.
+ if self.get_generator_setting('generate_frontend', False):
+ lines.append('')
+ lines.append(self._generate_init_method_for_payload(domain, declaration))
</ins><span class="cx"> required_members = filter(lambda member: not member.is_optional, declaration.type_members)
</span><span class="cx"> if required_members:
</span><span class="cx"> lines.append('')
</span><span class="lines">@@ -103,6 +107,26 @@
</span><span class="cx"> lines.append('@end')
</span><span class="cx"> return '\n'.join(lines)
</span><span class="cx">
</span><ins>+ def _generate_init_method_for_payload(self, domain, declaration):
+ lines = []
+ lines.append('- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload')
+ lines.append('{')
+ lines.append(' if (!(self = [super init]))')
+ lines.append(' return nil;')
+ lines.append('')
+
+ for member in declaration.type_members:
+ var_name = ObjCGenerator.identifier_to_objc_identifier(member.member_name)
+ if not member.is_optional:
+ lines.append(' THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"%s"], @"%s");' % (var_name, var_name))
+ conversion_expression = self.payload_to_objc_expression_for_member(declaration, member)
+ lines.append(' self.%s = %s;' % (var_name, conversion_expression))
+ lines.append('')
+
+ lines.append(' return self;')
+ lines.append('}')
+ return '\n'.join(lines)
+
</ins><span class="cx"> def _generate_init_method_for_required_members(self, domain, declaration, required_members):
</span><span class="cx"> pairs = []
</span><span class="cx"> for member in required_members:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py (197688 => 197689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-03-07 18:30:31 UTC (rev 197688)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-03-07 18:41:30 UTC (rev 197689)
</span><span class="lines">@@ -457,6 +457,31 @@
</span><span class="cx"> return 'objcIntegerArray(%s)' % sub_expression
</span><span class="cx"> return 'objcArray<%s>(%s)' % (objc_class, sub_expression)
</span><span class="cx">
</span><ins>+ def payload_to_objc_expression_for_member(self, declaration, member):
+ _type = member.type
+ if isinstance(_type, AliasedType):
+ _type = _type.aliased_type
+ if isinstance(_type, PrimitiveType):
+ sub_expression = 'payload[@"%s"]' % member.member_name
+ raw_name = _type.raw_name()
+ if raw_name is 'boolean':
+ return '[%s boolValue]' % sub_expression
+ if raw_name is 'integer':
+ return '[%s integerValue]' % sub_expression
+ if raw_name is 'number':
+ return '[%s doubleValue]' % sub_expression
+ if raw_name in ['any', 'object', 'array', 'string']:
+ return sub_expression # The setter will check the incoming value.
+ return None
+ if isinstance(member.type, EnumType):
+ sub_expression = 'payload[@"%s"]' % member.member_name
+ if member.type.is_anonymous:
+ return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), sub_expression)
+ else:
+ return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_non_anonymous_enum(member.type), sub_expression)
+ if isinstance(_type, (ObjectType, ArrayType)):
+ return 'payload[@"%s"]' % member.member_name
+
</ins><span class="cx"> # JSON object setter/getter selectors for types.
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (197688 => 197689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-03-07 18:30:31 UTC (rev 197688)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-03-07 18:41:30 UTC (rev 197689)
</span><span class="lines">@@ -1489,6 +1489,7 @@
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseError : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><span class="cx"> /* required */ @property (nonatomic, assign) int code;
</span><span class="lines">@@ -1592,6 +1593,20 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolDatabaseError
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"message"], @"message");
+ self.message = payload[@"message"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"code"], @"code");
+ self.code = [payload[@"code"] integerValue];
+
+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> {
</span><span class="cx"> self = [super init];
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (197688 => 197689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-03-07 18:30:31 UTC (rev 197688)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-03-07 18:41:30 UTC (rev 197689)
</span><span class="lines">@@ -1346,6 +1346,7 @@
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseError : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><span class="cx"> /* required */ @property (nonatomic, assign) int code;
</span><span class="lines">@@ -1447,6 +1448,20 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolDatabaseError
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"message"], @"message");
+ self.message = payload[@"message"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"code"], @"code");
+ self.code = [payload[@"code"] integerValue];
+
+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> {
</span><span class="cx"> self = [super init];
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result (197688 => 197689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-03-07 18:30:31 UTC (rev 197688)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-03-07 18:41:30 UTC (rev 197689)
</span><span class="lines">@@ -962,6 +962,7 @@
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseError : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><span class="cx"> /* required */ @property (nonatomic, assign) int code;
</span><span class="lines">@@ -1065,6 +1066,20 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolDatabaseError
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"message"], @"message");
+ self.message = payload[@"message"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"code"], @"code");
+ self.code = [payload[@"code"] integerValue];
+
+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> {
</span><span class="cx"> self = [super init];
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result (197688 => 197689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-03-07 18:30:31 UTC (rev 197688)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-03-07 18:41:30 UTC (rev 197689)
</span><span class="lines">@@ -1013,6 +1013,7 @@
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolNetwork2NetworkError : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><span class="cx"> /* required */ @property (nonatomic, assign) int code;
</span><span class="lines">@@ -1120,6 +1121,20 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolNetwork2NetworkError
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"message"], @"message");
+ self.message = payload[@"message"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"code"], @"code");
+ self.code = [payload[@"code"] integerValue];
+
+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> {
</span><span class="cx"> self = [super init];
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedshadowedoptionaltypesettersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result (197688 => 197689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-03-07 18:30:31 UTC (rev 197688)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-03-07 18:41:30 UTC (rev 197689)
</span><span class="lines">@@ -840,6 +840,7 @@
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolRuntimeKeyPath : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> - (instancetype)initWithType:(TestProtocolRuntimeKeyPathType)type;
</span><span class="cx"> /* required */ @property (nonatomic, assign) TestProtocolRuntimeKeyPathType type;
</span><span class="cx"> /* optional */ @property (nonatomic, copy) NSString *string;
</span><span class="lines">@@ -938,6 +939,21 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolRuntimeKeyPath
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"type"], @"type");
+ self.type = fromProtocolString<TestProtocolRuntimeKeyPathType>(payload[@"type"]);
+
+ self.string = payload[@"string"];
+
+ self.array = payload[@"array"];
+
+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithType:(TestProtocolRuntimeKeyPathType)type;
</span><span class="cx"> {
</span><span class="cx"> self = [super init];
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result (197688 => 197689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-03-07 18:30:31 UTC (rev 197688)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-03-07 18:41:30 UTC (rev 197689)
</span><span class="lines">@@ -1211,6 +1211,7 @@
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseError : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><span class="cx"> /* required */ @property (nonatomic, assign) int code;
</span><span class="lines">@@ -1218,6 +1219,7 @@
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseOptionalParameterBundle : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> /* optional */ @property (nonatomic, copy) NSArray/*<NSString>*/ *columnNames;
</span><span class="cx"> /* optional */ @property (nonatomic, copy) NSString *notes;
</span><span class="cx"> /* optional */ @property (nonatomic, assign) double timestamp;
</span><span class="lines">@@ -1229,6 +1231,7 @@
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseParameterBundle : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> - (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error errorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSArray/*<NSString>*/ *columnNames;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *notes;
</span><span class="lines">@@ -1241,6 +1244,7 @@
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseObjectWithPropertyNameConflicts : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> - (instancetype)initWithInteger:(NSString *)integer array:(NSString *)array string:(NSString *)string value:(NSString *)value object:(NSString *)object;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *integer;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *array;
</span><span class="lines">@@ -1251,10 +1255,12 @@
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseDummyObject : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolTestParameterBundle : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> - (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSArray/*<NSString>*/ *columnNames;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *notes;
</span><span class="lines">@@ -1356,6 +1362,20 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolDatabaseError
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"message"], @"message");
+ self.message = payload[@"message"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"code"], @"code");
+ self.code = [payload[@"code"] integerValue];
+
+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="lines">@@ -1394,6 +1414,28 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolDatabaseOptionalParameterBundle
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ self.columnNames = payload[@"columnNames"];
+
+ self.notes = payload[@"notes"];
+
+ self.timestamp = [payload[@"timestamp"] doubleValue];
+
+ self.values = payload[@"values"];
+
+ self.payload = payload[@"payload"];
+
+ self.error = payload[@"error"];
+
+ self.errorList = payload[@"errorList"];
+
+ return self;
+}
+
</ins><span class="cx"> - (void)setColumnNames:(NSArray/*<NSString>*/ *)columnNames
</span><span class="cx"> {
</span><span class="cx"> [super setInspectorArray:inspectorStringArray(columnNames) forKey:@"columnNames"];
</span><span class="lines">@@ -1469,6 +1511,35 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolDatabaseParameterBundle
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"columnNames"], @"columnNames");
+ self.columnNames = payload[@"columnNames"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"notes"], @"notes");
+ self.notes = payload[@"notes"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"timestamp"], @"timestamp");
+ self.timestamp = [payload[@"timestamp"] doubleValue];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"values"], @"values");
+ self.values = payload[@"values"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"payload"], @"payload");
+ self.payload = payload[@"payload"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"error"], @"error");
+ self.error = payload[@"error"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"errorList"], @"errorList");
+ self.errorList = payload[@"errorList"];
+
+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error errorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList;
</span><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="lines">@@ -1569,6 +1640,29 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolDatabaseObjectWithPropertyNameConflicts
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"integer"], @"integer");
+ self.integer = payload[@"integer"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"array"], @"array");
+ self.array = payload[@"array"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"string"], @"string");
+ self.string = payload[@"string"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"value"], @"value");
+ self.value = payload[@"value"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"object"], @"object");
+ self.object = payload[@"object"];
+
+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithInteger:(NSString *)integer array:(NSString *)array string:(NSString *)string value:(NSString *)value object:(NSString *)object;
</span><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="lines">@@ -1644,11 +1738,45 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolDatabaseDummyObject
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ return self;
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolTestParameterBundle
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"columnNames"], @"columnNames");
+ self.columnNames = payload[@"columnNames"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"notes"], @"notes");
+ self.notes = payload[@"notes"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"timestamp"], @"timestamp");
+ self.timestamp = [payload[@"timestamp"] doubleValue];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"values"], @"values");
+ self.values = payload[@"values"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"payload"], @"payload");
+ self.payload = payload[@"payload"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"error"], @"error");
+ self.error = payload[@"error"];
+
+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error;
</span><span class="cx"> {
</span><span class="cx"> self = [super init];
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (197688 => 197689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-03-07 18:30:31 UTC (rev 197688)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-03-07 18:41:30 UTC (rev 197689)
</span><span class="lines">@@ -1161,6 +1161,7 @@
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolTestTypeNeedingCast : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> - (instancetype)initWithString:(NSString *)string number:(int)number animals:(TestProtocolTestCastedAnimals)animals identifier:(int)identifier tree:(TestProtocolTestRecursiveObject1 *)tree;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *string;
</span><span class="cx"> /* required */ @property (nonatomic, assign) int number;
</span><span class="lines">@@ -1171,11 +1172,13 @@
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolTestRecursiveObject1 : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> /* optional */ @property (nonatomic, retain) TestProtocolTestRecursiveObject2 *obj;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolTestRecursiveObject2 : RWIProtocolJSONObject
</span><ins>+- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</ins><span class="cx"> /* optional */ @property (nonatomic, retain) TestProtocolTestRecursiveObject1 *obj;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -1271,6 +1274,29 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolTestTypeNeedingCast
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"string"], @"string");
+ self.string = payload[@"string"];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"number"], @"number");
+ self.number = [payload[@"number"] integerValue];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"animals"], @"animals");
+ self.animals = fromProtocolString<TestProtocolTestCastedAnimals>(payload[@"animals"]);
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"identifier"], @"identifier");
+ self.identifier = [payload[@"id"] integerValue];
+
+ THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"tree"], @"tree");
+ self.tree = payload[@"tree"];
+
+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithString:(NSString *)string number:(int)number animals:(TestProtocolTestCastedAnimals)animals identifier:(int)identifier tree:(TestProtocolTestRecursiveObject1 *)tree;
</span><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="lines">@@ -1343,6 +1369,16 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolTestRecursiveObject1
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ self.obj = payload[@"obj"];
+
+ return self;
+}
+
</ins><span class="cx"> - (void)setObj:(TestProtocolTestRecursiveObject2 *)obj
</span><span class="cx"> {
</span><span class="cx"> [super setObject:obj forKey:@"obj"];
</span><span class="lines">@@ -1357,6 +1393,16 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolTestRecursiveObject2
</span><span class="cx">
</span><ins>+- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload
+{
+ if (!(self = [super init]))
+ return nil;
+
+ self.obj = payload[@"obj"];
+
+ return self;
+}
+
</ins><span class="cx"> - (void)setObj:(TestProtocolTestRecursiveObject1 *)obj
</span><span class="cx"> {
</span><span class="cx"> [super setObject:obj forKey:@"obj"];
</span></span></pre>
</div>
</div>
</body>
</html>