<!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>[189222] 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/189222">189222</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2015-09-01 11:44:57 -0700 (Tue, 01 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: protocol generator should not allow non-boolean values for "optional" key
https://bugs.webkit.org/show_bug.cgi?id=148679
Reviewed by Joseph Pecoraro.
In Python, the 'bool' type inherits from 'int'. In the runtime, True and False are
just numbers to Python. So, the existing check for boolean literals was not quite right.
* inspector/scripts/codegen/models.py: Use isinstance instead.
(TypeMember.__init__):
(Parameter.__init__):
* inspector/scripts/tests/expected/fail-on-number-typed-optional-parameter-flag.json-error: Added.
* inspector/scripts/tests/expected/fail-on-number-typed-optional-type-member.json-error: Added.
* inspector/scripts/tests/fail-on-number-typed-optional-parameter-flag.json: Added.
* inspector/scripts/tests/fail-on-number-typed-optional-type-member.json: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedfailonnumbertypedoptionalparameterflagjsonerror">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-number-typed-optional-parameter-flag.json-error</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedfailonnumbertypedoptionaltypememberjsonerror">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-number-typed-optional-type-member.json-error</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsfailonnumbertypedoptionalparameterflagjson">trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-number-typed-optional-parameter-flag.json</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsfailonnumbertypedoptionaltypememberjson">trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-number-typed-optional-type-member.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189221 => 189222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-01 18:41:09 UTC (rev 189221)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-01 18:44:57 UTC (rev 189222)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-09-01 Brian Burg <bburg@apple.com>
+
+ Web Inspector: protocol generator should not allow non-boolean values for "optional" key
+ https://bugs.webkit.org/show_bug.cgi?id=148679
+
+ Reviewed by Joseph Pecoraro.
+
+ In Python, the 'bool' type inherits from 'int'. In the runtime, True and False are
+ just numbers to Python. So, the existing check for boolean literals was not quite right.
+
+ * inspector/scripts/codegen/models.py: Use isinstance instead.
+ (TypeMember.__init__):
+ (Parameter.__init__):
+ * inspector/scripts/tests/expected/fail-on-number-typed-optional-parameter-flag.json-error: Added.
+ * inspector/scripts/tests/expected/fail-on-number-typed-optional-type-member.json-error: Added.
+ * inspector/scripts/tests/fail-on-number-typed-optional-parameter-flag.json: Added.
+ * inspector/scripts/tests/fail-on-number-typed-optional-type-member.json: Added.
+
</ins><span class="cx"> 2015-09-01 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG AI assertions about not having to do type checks at the point of a Known use kind are unsound
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py (189221 => 189222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2015-09-01 18:41:09 UTC (rev 189221)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2015-09-01 18:44:57 UTC (rev 189222)
</span><span class="lines">@@ -538,7 +538,7 @@
</span><span class="cx"> self.is_optional = is_optional
</span><span class="cx"> self.description = description
</span><span class="cx">
</span><del>- if self.is_optional not in [True, False]:
</del><ins>+ if not isinstance(self.is_optional, bool):
</ins><span class="cx"> raise ParseException("The 'optional' flag for a type member must be a boolean literal.")
</span><span class="cx">
</span><span class="cx"> def resolve_type_references(self, protocol, domain):
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> self.is_optional = is_optional
</span><span class="cx"> self.description = description
</span><span class="cx">
</span><del>- if self.is_optional not in [True, False]:
</del><ins>+ if not isinstance(self.is_optional, bool):
</ins><span class="cx"> raise ParseException("The 'optional' flag for a parameter must be a boolean literal.")
</span><span class="cx">
</span><span class="cx"> def resolve_type_references(self, protocol, domain):
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedfailonnumbertypedoptionalparameterflagjsonerror"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-number-typed-optional-parameter-flag.json-error (0 => 189222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-number-typed-optional-parameter-flag.json-error (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-number-typed-optional-parameter-flag.json-error 2015-09-01 18:44:57 UTC (rev 189222)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+ERROR: The 'optional' flag for a parameter must be a boolean literal.
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedfailonnumbertypedoptionaltypememberjsonerror"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-number-typed-optional-type-member.json-error (0 => 189222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-number-typed-optional-type-member.json-error (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-number-typed-optional-type-member.json-error 2015-09-01 18:44:57 UTC (rev 189222)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+ERROR: The 'optional' flag for a type member must be a boolean literal.
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsfailonnumbertypedoptionalparameterflagjson"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-number-typed-optional-parameter-flag.json (0 => 189222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-number-typed-optional-parameter-flag.json (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-number-typed-optional-parameter-flag.json 2015-09-01 18:44:57 UTC (rev 189222)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+{
+ "domain": "Database",
+ "types": [
+ {
+ "id": "DatabaseId",
+ "type": "string",
+ "description": "Unique identifier of Database object."
+ }
+ ],
+ "events": [
+ {
+ "name": "didExecuteOptionalParameters",
+ "parameters": [
+ { "name": "columnNames", "type": "string", "optional": 0 }
+ ]
+ }
+ ]
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsfailonnumbertypedoptionaltypememberjson"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-number-typed-optional-type-member.json (0 => 189222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-number-typed-optional-type-member.json (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-number-typed-optional-type-member.json 2015-09-01 18:44:57 UTC (rev 189222)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+[
+{
+ "domain": "Database",
+ "types": [
+ {
+ "id": "Error",
+ "type": "object",
+ "description": "Database error.",
+ "properties": [
+ { "name": "message", "type": "string", "description": "Error message." },
+ { "name": "code", "type": "integer", "description": "Error code.", "optional": 0 }
+ ]
+ }
+ ]
+}
+]
</ins></span></pre>
</div>
</div>
</body>
</html>