<!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>[198022] 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/198022">198022</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-03-11 08:57:20 -0800 (Fri, 11 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: generated initWithPayload: protocol object initializers should recursively decode array and object members
https://bugs.webkit.org/show_bug.cgi?id=155337
<rdar://problem/25098357>
Reviewed by Timothy Hatcher.
In cases where an object member is itself an object or array, we were
not calling initWithPayload: on the object member itself. So, this caused
a runtime error when constructing the outer object because the generated
code casted the NSDictionary/NSArray into the member's protocol object type.
* inspector/scripts/codegen/objc_generator.py:
(ObjCGenerator.payload_to_objc_expression_for_member):
Do a straightforward call to initWithPayload: for objects. For arrays,
call a templated helper function which does the same thing. The helper
is used to make this array decoding fit into a single generated expression.
Rebaseline relevant test results.
* 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="#trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generatorpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py</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 (198021 => 198022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-11 16:20:25 UTC (rev 198021)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-11 16:57:20 UTC (rev 198022)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-03-10 Brian Burg <bburg@apple.com>
+
+ Web Inspector: generated initWithPayload: protocol object initializers should recursively decode array and object members
+ https://bugs.webkit.org/show_bug.cgi?id=155337
+ <rdar://problem/25098357>
+
+ Reviewed by Timothy Hatcher.
+
+ In cases where an object member is itself an object or array, we were
+ not calling initWithPayload: on the object member itself. So, this caused
+ a runtime error when constructing the outer object because the generated
+ code casted the NSDictionary/NSArray into the member's protocol object type.
+
+ * inspector/scripts/codegen/objc_generator.py:
+ (ObjCGenerator.payload_to_objc_expression_for_member):
+ Do a straightforward call to initWithPayload: for objects. For arrays,
+ call a templated helper function which does the same thing. The helper
+ is used to make this array decoding fit into a single generated expression.
+
+ Rebaseline relevant test results.
+
+ * 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-10 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix Changelog. git merged poorly.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py (198021 => 198022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-03-11 16:20:25 UTC (rev 198021)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-03-11 16:57:20 UTC (rev 198022)
</span><span class="lines">@@ -479,8 +479,12 @@
</span><span class="cx"> return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), sub_expression)
</span><span class="cx"> else:
</span><span class="cx"> return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_non_anonymous_enum(member.type), sub_expression)
</span><del>- if isinstance(_type, (ObjectType, ArrayType)):
- return 'payload[@"%s"]' % member.member_name
</del><ins>+ if isinstance(_type, ObjectType):
+ objc_class = self.objc_class_for_type(member.type)
+ return '[[%s alloc] initWithPayload:payload[@"%s"]]' % (objc_class, member.member_name)
+ if isinstance(_type, ArrayType):
+ objc_class = self.objc_class_for_type(member.type.element_type)
+ return 'objcArrayFromPayload<%s>(payload[@"%s"])' % (objc_class, member.member_name)
</ins><span class="cx">
</span><span class="cx"> # JSON object setter/getter selectors for types.
</span><span class="cx">
</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 (198021 => 198022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-03-11 16:20:25 UTC (rev 198021)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-03-11 16:57:20 UTC (rev 198022)
</span><span class="lines">@@ -1009,7 +1009,7 @@
</span><span class="cx">
</span><span class="cx"> self.string = payload[@"string"];
</span><span class="cx">
</span><del>- self.array = payload[@"array"];
</del><ins>+ self.array = objcArrayFromPayload<NSString>(payload[@"array"]);
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</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 (198021 => 198022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-03-11 16:20:25 UTC (rev 198021)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-03-11 16:57:20 UTC (rev 198022)
</span><span class="lines">@@ -1522,7 +1522,7 @@
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- self.columnNames = payload[@"columnNames"];
</del><ins>+ self.columnNames = objcArrayFromPayload<NSString>(payload[@"columnNames"]);
</ins><span class="cx">
</span><span class="cx"> self.notes = payload[@"notes"];
</span><span class="cx">
</span><span class="lines">@@ -1532,9 +1532,9 @@
</span><span class="cx">
</span><span class="cx"> self.payload = payload[@"payload"];
</span><span class="cx">
</span><del>- self.error = payload[@"error"];
</del><ins>+ self.error = [[TestProtocolDatabaseError alloc] initWithPayload:payload[@"error"]];
</ins><span class="cx">
</span><del>- self.errorList = payload[@"errorList"];
</del><ins>+ self.errorList = objcArrayFromPayload<TestProtocolDatabaseError>(payload[@"errorList"]);
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -1620,7 +1620,7 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"columnNames"], @"columnNames");
</span><del>- self.columnNames = payload[@"columnNames"];
</del><ins>+ self.columnNames = objcArrayFromPayload<NSString>(payload[@"columnNames"]);
</ins><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"notes"], @"notes");
</span><span class="cx"> self.notes = payload[@"notes"];
</span><span class="lines">@@ -1635,10 +1635,10 @@
</span><span class="cx"> self.payload = payload[@"payload"];
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"error"], @"error");
</span><del>- self.error = payload[@"error"];
</del><ins>+ self.error = [[TestProtocolDatabaseError alloc] initWithPayload:payload[@"error"]];
</ins><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"errorList"], @"errorList");
</span><del>- self.errorList = payload[@"errorList"];
</del><ins>+ self.errorList = objcArrayFromPayload<TestProtocolDatabaseError>(payload[@"errorList"]);
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -1860,7 +1860,7 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"columnNames"], @"columnNames");
</span><del>- self.columnNames = payload[@"columnNames"];
</del><ins>+ self.columnNames = objcArrayFromPayload<NSString>(payload[@"columnNames"]);
</ins><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"notes"], @"notes");
</span><span class="cx"> self.notes = payload[@"notes"];
</span><span class="lines">@@ -1875,7 +1875,7 @@
</span><span class="cx"> self.payload = payload[@"payload"];
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"error"], @"error");
</span><del>- self.error = payload[@"error"];
</del><ins>+ self.error = [[TestProtocolDatabaseError alloc] initWithPayload:payload[@"error"]];
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</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 (198021 => 198022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-03-11 16:20:25 UTC (rev 198021)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-03-11 16:57:20 UTC (rev 198022)
</span><span class="lines">@@ -1394,7 +1394,7 @@
</span><span class="cx"> self.identifier = [payload[@"id"] integerValue];
</span><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"tree"], @"tree");
</span><del>- self.tree = payload[@"tree"];
</del><ins>+ self.tree = [[TestProtocolTestRecursiveObject1 alloc] initWithPayload:payload[@"tree"]];
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -1476,7 +1476,7 @@
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- self.obj = payload[@"obj"];
</del><ins>+ self.obj = [[TestProtocolTestRecursiveObject2 alloc] initWithPayload:payload[@"obj"]];
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -1500,7 +1500,7 @@
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- self.obj = payload[@"obj"];
</del><ins>+ self.obj = [[TestProtocolTestRecursiveObject1 alloc] initWithPayload:payload[@"obj"]];
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>