<!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>[198077] 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/198077">198077</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-03-12 19:48:56 -0800 (Sat, 12 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>When generating Objective-C protocol types, getters for objects need to synthesize a new object instance
https://bugs.webkit.org/show_bug.cgi?id=155389
<rdar://problem/25125821>
Reviewed by Timothy Hatcher.
Currently, in object property getters for Objective-C protocol types, we use
a C-style cast of the member's RWIProtocolJSONObject * to the type of the property.
However, at runtime the class of `self` is going to be RWIProtocolJSONObject *,
not MemberType *, so any subsequent calls to MemberType properties on the return value
will fail as the selectors will not be recognized.
Instead of doing a C-style pointer cast, we need to create a new MemberType object
that's backed by the InspectorObject retrieved from the parent object by key.
This requires a new initWithJSONObject initializer for each object protocol type.
* inspector/scripts/codegen/generate_objc_header.py:
(ObjCHeaderGenerator._generate_type_interface): Add new declaration.
* inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:
(ObjCProtocolTypesImplementationGenerator.generate_type_implementation):
(ObjCProtocolTypesImplementationGenerator._generate_init_method_for_json_object): Added.
Forward through to the super class initializer who assigns the underlying InspectorObject.
(ObjCProtocolTypesImplementationGenerator._generate_init_method_for_required_members):
Drive-by cleanup to use the more compact [super init] form.
* inspector/scripts/codegen/objc_generator.py:
(ObjCGenerator.protocol_to_objc_expression_for_member):
For property getters of objects, use initWithJSONObject: rather than a C-style cast.
Rebaseline relevant test results.
* 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 (198076 => 198077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-13 02:39:43 UTC (rev 198076)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-13 03:48:56 UTC (rev 198077)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2016-03-12 Brian Burg <bburg@apple.com>
+
+ When generating Objective-C protocol types, getters for objects need to synthesize a new object instance
+ https://bugs.webkit.org/show_bug.cgi?id=155389
+ <rdar://problem/25125821>
+
+ Reviewed by Timothy Hatcher.
+
+ Currently, in object property getters for Objective-C protocol types, we use
+ a C-style cast of the member's RWIProtocolJSONObject * to the type of the property.
+ However, at runtime the class of `self` is going to be RWIProtocolJSONObject *,
+ not MemberType *, so any subsequent calls to MemberType properties on the return value
+ will fail as the selectors will not be recognized.
+
+ Instead of doing a C-style pointer cast, we need to create a new MemberType object
+ that's backed by the InspectorObject retrieved from the parent object by key.
+ This requires a new initWithJSONObject initializer for each object protocol type.
+
+ * inspector/scripts/codegen/generate_objc_header.py:
+ (ObjCHeaderGenerator._generate_type_interface): Add new declaration.
+
+ * inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:
+ (ObjCProtocolTypesImplementationGenerator.generate_type_implementation):
+ (ObjCProtocolTypesImplementationGenerator._generate_init_method_for_json_object): Added.
+ Forward through to the super class initializer who assigns the underlying InspectorObject.
+
+ (ObjCProtocolTypesImplementationGenerator._generate_init_method_for_required_members):
+ Drive-by cleanup to use the more compact [super init] form.
+
+ * inspector/scripts/codegen/objc_generator.py:
+ (ObjCGenerator.protocol_to_objc_expression_for_member):
+ For property getters of objects, use initWithJSONObject: rather than a C-style cast.
+
+ Rebaseline relevant test results.
+
+ * 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-12 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Removed variable names from default constructor declarations.
</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 (198076 => 198077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2016-03-13 02:39:43 UTC (rev 198076)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2016-03-13 03:48:56 UTC (rev 198077)
</span><span class="lines">@@ -160,9 +160,10 @@
</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><span class="cx">
</span><del>- # The initializer that takes a payload is only needed by the frontend.
</del><ins>+ # The initializers that take a payload or inspector object are only needed by the frontend.
</ins><span class="cx"> if self.get_generator_setting('generate_frontend', False):
</span><span class="cx"> lines.append('- (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;')
</span><ins>+ lines.append('- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;')
</ins><span class="cx">
</span><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></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 (198076 => 198077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2016-03-13 02:39:43 UTC (rev 198076)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2016-03-13 03:48:56 UTC (rev 198077)
</span><span class="lines">@@ -94,6 +94,7 @@
</span><span class="cx"> if self.get_generator_setting('generate_frontend', False):
</span><span class="cx"> lines.append('')
</span><span class="cx"> lines.append(self._generate_init_method_for_payload(domain, declaration))
</span><ins>+ lines.append(self._generate_init_method_for_json_object(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">@@ -107,6 +108,17 @@
</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_json_object(self, domain, declaration):
+ lines = []
+ lines.append('- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject')
+ lines.append('{')
+ lines.append(' if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))')
+ lines.append(' return nil;')
+ lines.append('')
+ lines.append(' return self;')
+ lines.append('}')
+ return '\n'.join(lines)
+
</ins><span class="cx"> def _generate_init_method_for_payload(self, domain, declaration):
</span><span class="cx"> lines = []
</span><span class="cx"> lines.append('- (instancetype)initWithPayload:(nonnull NSDictionary<NSString *, id> *)payload')
</span><span class="lines">@@ -137,8 +149,7 @@
</span><span class="cx"> lines = []
</span><span class="cx"> lines.append('- (instancetype)initWith%s;' % ' '.join(pairs))
</span><span class="cx"> lines.append('{')
</span><del>- lines.append(' self = [super init];')
- lines.append(' if (!self)')
</del><ins>+ lines.append(' if (!(self = [super init]))')
</ins><span class="cx"> lines.append(' return nil;')
</span><span class="cx"> lines.append('')
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py (198076 => 198077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-03-13 02:39:43 UTC (rev 198076)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-03-13 03:48:56 UTC (rev 198077)
</span><span class="lines">@@ -443,8 +443,8 @@
</span><span class="cx"> return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_non_anonymous_enum(member.type), sub_expression)
</span><span class="cx"> return sub_expression
</span><span class="cx"> if category is ObjCTypeCategory.Object:
</span><del>- objc_type = self.objc_type_for_member(declaration, member)
- return '(%s)%s' % (objc_type, sub_expression)
</del><ins>+ objc_class = self.objc_class_for_type(member.type)
+ return '[[%s alloc] initWithInspectorObject:[%s toInspectorObject].get()]' % (objc_class, sub_expression)
</ins><span class="cx"> if category is ObjCTypeCategory.Array:
</span><span class="cx"> protocol_type = ObjCGenerator.protocol_type_for_type(member.type.element_type)
</span><span class="cx"> objc_class = self.objc_class_for_type(member.type.element_type)
</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 (198076 => 198077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-03-13 02:39:43 UTC (rev 198076)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-03-13 03:48:56 UTC (rev 198077)
</span><span class="lines">@@ -1306,6 +1306,7 @@
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseError : RWIProtocolJSONObject
</span><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</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">@@ -1687,11 +1688,17 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> {
</span><del>- self = [super init];
- if (!self)
</del><ins>+ if (!(self = [super init]))
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(message, @"message");
</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 (198076 => 198077)</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-13 02:39:43 UTC (rev 198076)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-03-13 03:48:56 UTC (rev 198077)
</span><span class="lines">@@ -1163,6 +1163,7 @@
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseError : RWIProtocolJSONObject
</span><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</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">@@ -1542,11 +1543,17 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> {
</span><del>- self = [super init];
- if (!self)
</del><ins>+ if (!(self = [super init]))
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(message, @"message");
</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 (198076 => 198077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-03-13 02:39:43 UTC (rev 198076)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-03-13 03:48:56 UTC (rev 198077)
</span><span class="lines">@@ -919,6 +919,7 @@
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseError : RWIProtocolJSONObject
</span><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</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">@@ -1160,11 +1161,17 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> {
</span><del>- self = [super init];
- if (!self)
</del><ins>+ if (!(self = [super init]))
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(message, @"message");
</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 (198076 => 198077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-03-13 02:39:43 UTC (rev 198076)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-03-13 03:48:56 UTC (rev 198077)
</span><span class="lines">@@ -966,6 +966,7 @@
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolNetwork2NetworkError : RWIProtocolJSONObject
</span><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</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">@@ -1194,11 +1195,17 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> {
</span><del>- self = [super init];
- if (!self)
</del><ins>+ if (!(self = [super init]))
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(message, @"message");
</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 (198076 => 198077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-03-13 02:39:43 UTC (rev 198076)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-03-13 03:48:56 UTC (rev 198077)
</span><span class="lines">@@ -773,6 +773,7 @@
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolRuntimeKeyPath : RWIProtocolJSONObject
</span><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</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">@@ -1013,11 +1014,17 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithType:(TestProtocolRuntimeKeyPathType)type;
</span><span class="cx"> {
</span><del>- self = [super init];
- if (!self)
</del><ins>+ if (!(self = [super init]))
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> self.type = type;
</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 (198076 => 198077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-03-13 02:39:43 UTC (rev 198076)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-03-13 03:48:56 UTC (rev 198077)
</span><span class="lines">@@ -1166,6 +1166,7 @@
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseError : RWIProtocolJSONObject
</span><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</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">@@ -1174,6 +1175,7 @@
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseOptionalParameterBundle : RWIProtocolJSONObject
</span><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</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">@@ -1186,6 +1188,7 @@
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseParameterBundle : RWIProtocolJSONObject
</span><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</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">@@ -1199,6 +1202,7 @@
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseObjectWithPropertyNameConflicts : RWIProtocolJSONObject
</span><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</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">@@ -1210,11 +1214,13 @@
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseDummyObject : RWIProtocolJSONObject
</span><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolTestParameterBundle : RWIProtocolJSONObject
</span><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</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">@@ -1478,11 +1484,17 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ return self;
+}
+
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> {
</span><del>- self = [super init];
- if (!self)
</del><ins>+ if (!(self = [super init]))
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(message, @"message");
</span><span class="lines">@@ -1538,7 +1550,14 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ 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">@@ -1576,7 +1595,7 @@
</span><span class="cx">
</span><span class="cx"> - (RWIProtocolJSONObject *)values
</span><span class="cx"> {
</span><del>- return (RWIProtocolJSONObject *)[super objectForKey:@"values"];
</del><ins>+ return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setPayload:(RWIProtocolJSONObject *)payload
</span><span class="lines">@@ -1586,7 +1605,7 @@
</span><span class="cx">
</span><span class="cx"> - (RWIProtocolJSONObject *)payload
</span><span class="cx"> {
</span><del>- return (RWIProtocolJSONObject *)[super objectForKey:@"payload"];
</del><ins>+ return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setError:(TestProtocolDatabaseError *)error
</span><span class="lines">@@ -1596,7 +1615,7 @@
</span><span class="cx">
</span><span class="cx"> - (TestProtocolDatabaseError *)error
</span><span class="cx"> {
</span><del>- return (TestProtocolDatabaseError *)[super objectForKey:@"error"];
</del><ins>+ return [[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setErrorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList
</span><span class="lines">@@ -1642,11 +1661,17 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ 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><del>- self = [super init];
- if (!self)
</del><ins>+ if (!(self = [super init]))
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(columnNames, @"columnNames");
</span><span class="lines">@@ -1705,7 +1730,7 @@
</span><span class="cx">
</span><span class="cx"> - (RWIProtocolJSONObject *)values
</span><span class="cx"> {
</span><del>- return (RWIProtocolJSONObject *)[super objectForKey:@"values"];
</del><ins>+ return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setPayload:(RWIProtocolJSONObject *)payload
</span><span class="lines">@@ -1715,7 +1740,7 @@
</span><span class="cx">
</span><span class="cx"> - (RWIProtocolJSONObject *)payload
</span><span class="cx"> {
</span><del>- return (RWIProtocolJSONObject *)[super objectForKey:@"payload"];
</del><ins>+ return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setError:(TestProtocolDatabaseError *)error
</span><span class="lines">@@ -1725,7 +1750,7 @@
</span><span class="cx">
</span><span class="cx"> - (TestProtocolDatabaseError *)error
</span><span class="cx"> {
</span><del>- return (TestProtocolDatabaseError *)[super objectForKey:@"error"];
</del><ins>+ return [[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setErrorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList
</span><span class="lines">@@ -1765,11 +1790,17 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ 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><del>- self = [super init];
- if (!self)
</del><ins>+ if (!(self = [super init]))
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(integer, @"integer");
</span><span class="lines">@@ -1848,7 +1879,14 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ return self;
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1879,11 +1917,17 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ 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><del>- self = [super init];
- if (!self)
</del><ins>+ if (!(self = [super init]))
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(columnNames, @"columnNames");
</span><span class="lines">@@ -1939,7 +1983,7 @@
</span><span class="cx">
</span><span class="cx"> - (RWIProtocolJSONObject *)values
</span><span class="cx"> {
</span><del>- return (RWIProtocolJSONObject *)[super objectForKey:@"values"];
</del><ins>+ return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setPayload:(RWIProtocolJSONObject *)payload
</span><span class="lines">@@ -1949,7 +1993,7 @@
</span><span class="cx">
</span><span class="cx"> - (RWIProtocolJSONObject *)payload
</span><span class="cx"> {
</span><del>- return (RWIProtocolJSONObject *)[super objectForKey:@"payload"];
</del><ins>+ return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setError:(TestProtocolDatabaseError *)error
</span><span class="lines">@@ -1959,7 +2003,7 @@
</span><span class="cx">
</span><span class="cx"> - (TestProtocolDatabaseError *)error
</span><span class="cx"> {
</span><del>- return (TestProtocolDatabaseError *)[super objectForKey:@"error"];
</del><ins>+ return [[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</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 (198076 => 198077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-03-13 02:39:43 UTC (rev 198076)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-03-13 03:48:56 UTC (rev 198077)
</span><span class="lines">@@ -1061,6 +1061,7 @@
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolTestTypeNeedingCast : RWIProtocolJSONObject
</span><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</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">@@ -1072,12 +1073,14 @@
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolTestRecursiveObject1 : RWIProtocolJSONObject
</span><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</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><span class="cx"> - (instancetype)initWithPayload:(NSDictionary<NSString *, id> *)payload;
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject;
</ins><span class="cx"> /* optional */ @property (nonatomic, retain) TestProtocolTestRecursiveObject1 *obj;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -1398,11 +1401,17 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ 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><del>- self = [super init];
- if (!self)
</del><ins>+ if (!(self = [super init]))
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(string, @"string");
</span><span class="lines">@@ -1464,7 +1473,7 @@
</span><span class="cx">
</span><span class="cx"> - (TestProtocolTestRecursiveObject1 *)tree
</span><span class="cx"> {
</span><del>- return (TestProtocolTestRecursiveObject1 *)[super objectForKey:@"tree"];
</del><ins>+ return [[TestProtocolTestRecursiveObject1 alloc] initWithInspectorObject:[[super objectForKey:@"tree"] toInspectorObject].get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -1480,7 +1489,14 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ 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">@@ -1488,7 +1504,7 @@
</span><span class="cx">
</span><span class="cx"> - (TestProtocolTestRecursiveObject2 *)obj
</span><span class="cx"> {
</span><del>- return (TestProtocolTestRecursiveObject2 *)[super objectForKey:@"obj"];
</del><ins>+ return [[TestProtocolTestRecursiveObject2 alloc] initWithInspectorObject:[[super objectForKey:@"obj"] toInspectorObject].get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -1504,7 +1520,14 @@
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><ins>+- (instancetype)initWithJSONObject:(RWIProtocolJSONObject *)jsonObject
+{
+ if (!(self = [super initWithInspectorObject:[jsonObject toInspectorObject].get()]))
+ return nil;
</ins><span class="cx">
</span><ins>+ 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 class="lines">@@ -1512,7 +1535,7 @@
</span><span class="cx">
</span><span class="cx"> - (TestProtocolTestRecursiveObject1 *)obj
</span><span class="cx"> {
</span><del>- return (TestProtocolTestRecursiveObject1 *)[super objectForKey:@"obj"];
</del><ins>+ return [[TestProtocolTestRecursiveObject1 alloc] initWithInspectorObject:[[super objectForKey:@"obj"] toInspectorObject].get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>