<!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>[197717] 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/197717">197717</a></dd>

<dt>Author</dt> <dd>bburg@apple.com</dd>

<dt>Date</dt> <dd>2016-03-07 16:49:26 -0800 (Mon, 07 Mar 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Web Inspector: the protocol generator should generate factory method stubs for protocol types

https://bugs.webkit.org/show_bug.cgi?id=155103

&lt;rdar://problem/25002772&gt;

Reviewed by Timothy Hatcher.

Generate stubs with unique names so that parsing methods can be used

reflectively at runtime, based on the protocol version that's loaded.

* JavaScriptCore.xcodeproj/project.pbxproj:

* inspector/scripts/codegen/__init__.py:

* inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py:

Added. For each type in a domain, add a method of the form

-[ProtocolTypeConversions _parseXXX:fromPayload]. This is in a category

method, and the selector is only ever looked up at runtime.

(ObjCProtocolTypeConversionsHeaderGenerator.generate_output):

* inspector/scripts/generate-inspector-protocol-bindings.py:

(generate_from_specification):

Rebaseline test results with new generator output.

* inspector/scripts/tests/expected/commands-with-async-attribute.json-result:

* inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:

* inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:

* inspector/scripts/tests/expected/enum-values.json-result:

* inspector/scripts/tests/expected/events-with-optional-parameters.json-result:

* inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:

* inspector/scripts/tests/expected/same-type-id-different-domain.json-result:

* inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:

* inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:

* inspector/scripts/tests/expected/type-declaration-array-type.json-result:

* inspector/scripts/tests/expected/type-declaration-enum-type.json-result:

* inspector/scripts/tests/expected/type-declaration-object-type.json-result:

* inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegen__init__py">trunk/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_type_conversions_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptsgenerateinspectorprotocolbindingspy">trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.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="#trunkSourceJavaScriptCoreinspectorscriptstestsexpecteddomainswithvaryingcommandsizesjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedenumvaluesjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.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="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedsametypeiddifferentdomainjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.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="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationaliasedprimitivetypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationarraytypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationenumtypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.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>

<h3>Added Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_type_conversions_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197716 => 197717)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-03-08 00:45:25 UTC (rev 197716)

+++ trunk/Source/JavaScriptCore/ChangeLog        2016-03-08 00:49:26 UTC (rev 197717)

</span><span class="lines">@@ -1,3 +1,41 @@

</span><ins>+2016-03-07  Brian Burg  &lt;bburg@apple.com&gt;

+

+        Web Inspector: the protocol generator should generate factory method stubs for protocol types

+        https://bugs.webkit.org/show_bug.cgi?id=155103

+        &lt;rdar://problem/25002772&gt;

+

+        Reviewed by Timothy Hatcher.

+

+        Generate stubs with unique names so that parsing methods can be used

+        reflectively at runtime, based on the protocol version that's loaded.

+

+        * JavaScriptCore.xcodeproj/project.pbxproj:

+        * inspector/scripts/codegen/__init__.py:

+        * inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py:

+        Added. For each type in a domain, add a method of the form

+        -[ProtocolTypeConversions _parseXXX:fromPayload]. This is in a category

+        method, and the selector is only ever looked up at runtime.

+

+        (ObjCProtocolTypeConversionsHeaderGenerator.generate_output):

+        * inspector/scripts/generate-inspector-protocol-bindings.py:

+        (generate_from_specification):

+

+        Rebaseline test results with new generator output.

+

+        * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:

+        * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:

+        * inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:

+        * inspector/scripts/tests/expected/enum-values.json-result:

+        * inspector/scripts/tests/expected/events-with-optional-parameters.json-result:

+        * inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:

+        * inspector/scripts/tests/expected/same-type-id-different-domain.json-result:

+        * inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:

+        * inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:

+        * inspector/scripts/tests/expected/type-declaration-array-type.json-result:

+        * inspector/scripts/tests/expected/type-declaration-enum-type.json-result:

+        * inspector/scripts/tests/expected/type-declaration-object-type.json-result:

+        * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:

+

</ins><span class="cx"> 2016-03-07  Filip Pizlo  &lt;fpizlo@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         RegExp.prototype.exec() should call into Yarr at most once

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (197716 => 197717)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj        2016-03-08 00:45:25 UTC (rev 197716)

+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj        2016-03-08 00:49:26 UTC (rev 197717)

</span><span class="lines">@@ -1434,6 +1434,7 @@

</span><span class="cx">                 969A079B0ED1D3AE00F1F681 /* Opcode.h in Headers */ = {isa = PBXBuildFile; fileRef = 969A07950ED1D3AE00F1F681 /* Opcode.h */; settings = {ATTRIBUTES = (Private, ); }; };

</span><span class="cx">                 978801401471AD920041B016 /* JSDateMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9788FC221471AD0C0068CE2D /* JSDateMath.cpp */; };

</span><span class="cx">                 978801411471AD920041B016 /* JSDateMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 9788FC231471AD0C0068CE2D /* JSDateMath.h */; settings = {ATTRIBUTES = (Private, ); }; };

</span><ins>+                990DA67F1C8E316A00295159 /* generate_objc_protocol_type_conversions_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = 990DA67E1C8E311D00295159 /* generate_objc_protocol_type_conversions_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };

</ins><span class="cx">                 9928FF3B18AC4AEC00B8CF12 /* JSReplayInputs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9928FF3918AC4AEC00B8CF12 /* JSReplayInputs.cpp */; };

</span><span class="cx">                 9928FF3C18AC4AEC00B8CF12 /* JSReplayInputs.h in Headers */ = {isa = PBXBuildFile; fileRef = 9928FF3A18AC4AEC00B8CF12 /* JSReplayInputs.h */; settings = {ATTRIBUTES = (Private, ); }; };

</span><span class="cx">                 992ABCF91BEA9BD2006403A0 /* RemoteAutomationTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 992ABCF51BEA94CA006403A0 /* RemoteAutomationTarget.cpp */; };

</span><span class="lines">@@ -3633,6 +3634,7 @@

</span><span class="cx">                 969A09220ED1E09C00F1F681 /* Completion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Completion.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="cx">                 9788FC221471AD0C0068CE2D /* JSDateMath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDateMath.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="cx">                 9788FC231471AD0C0068CE2D /* JSDateMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDateMath.h; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><ins>+                990DA67E1C8E311D00295159 /* generate_objc_protocol_type_conversions_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_objc_protocol_type_conversions_implementation.py; sourceTree = &quot;&lt;group&gt;&quot;; };

</ins><span class="cx">                 9928FF3918AC4AEC00B8CF12 /* JSReplayInputs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReplayInputs.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="cx">                 9928FF3A18AC4AEC00B8CF12 /* JSReplayInputs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSReplayInputs.h; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="cx">                 9928FF3D18AC4B1C00B8CF12 /* JSInputs.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = JSInputs.json; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="lines">@@ -6853,6 +6855,7 @@

</span><span class="cx">                                 A5EA70F519F6DE5A0098F5EC /* generate_objc_header.py */,

</span><span class="cx">                                 A5EA70F619F6DE5A0098F5EC /* generate_objc_internal_header.py */,

</span><span class="cx">                                 A5EA70F319F6DE5A0098F5EC /* generate_objc_protocol_type_conversions_header.py */,

</span><ins>+                                990DA67E1C8E311D00295159 /* generate_objc_protocol_type_conversions_implementation.py */,

</ins><span class="cx">                                 C4F4B6D71A05C76F005CAB76 /* generate_objc_protocol_types_implementation.py */,

</span><span class="cx">                                 C4703CCB192844CC0013FBEA /* generator.py */,

</span><span class="cx">                                 C4703CCA192844CC0013FBEA /* generator_templates.py */,

</span><span class="lines">@@ -6896,6 +6899,7 @@

</span><span class="cx">                                 0F3730931C0D67EE00052BFA /* AirUseCounts.h in Headers */,

</span><span class="cx">                                 0F4570391BE44C910062A629 /* AirEliminateDeadCode.h in Headers */,

</span><span class="cx">                                 79B00CBD1C6AB07E0088C65D /* ProxyConstructor.h in Headers */,

</span><ins>+                                990DA67F1C8E316A00295159 /* generate_objc_protocol_type_conversions_implementation.py in Headers */,

</ins><span class="cx">                                 799EF7C41C56ED96002B0534 /* B3PCToOriginMap.h in Headers */,

</span><span class="cx">                                 79B00CBF1C6AB07E0088C65D /* ProxyObject.h in Headers */,

</span><span class="cx">                                 792CB34A1C4EED5C00D13AF3 /* PCToCodeOriginMap.h in Headers */,

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegen__init__py"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py (197716 => 197717)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py        2016-03-08 00:45:25 UTC (rev 197716)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py        2016-03-08 00:49:26 UTC (rev 197717)

</span><span class="lines">@@ -22,3 +22,4 @@

</span><span class="cx"> from generate_objc_internal_header import *

</span><span class="cx"> from generate_objc_protocol_types_implementation import *

</span><span class="cx"> from generate_objc_protocol_type_conversions_header import *

</span><ins>+from generate_objc_protocol_type_conversions_implementation import *

</ins></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_type_conversions_headerpy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py (197716 => 197717)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py        2016-03-08 00:45:25 UTC (rev 197716)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py        2016-03-08 00:49:26 UTC (rev 197717)

</span><span class="lines">@@ -55,8 +55,10 @@

</span><span class="cx"> 

</span><span class="cx">     def generate_output(self):

</span><span class="cx">         headers = [

</span><del>-            '&quot;%sArrayConversions.h&quot;' % ObjCGenerator.OBJC_STATIC_PREFIX

</del><ins>+            '&quot;%s.h&quot;' % self.protocol_name(),

+            '&quot;%sArrayConversions.h&quot;' % ObjCGenerator.OBJC_STATIC_PREFIX,

</ins><span class="cx">         ]

</span><ins>+        headers.sort()

</ins><span class="cx"> 

</span><span class="cx">         header_args = {

</span><span class="cx">             'includes': '\n'.join(['#import ' + header for header in headers]),

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_type_conversions_implementationpy"></a>

<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py (0 => 197717)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py                                (rev 0)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py        2016-03-08 00:49:26 UTC (rev 197717)

</span><span class="lines">@@ -0,0 +1,132 @@

</span><ins>+#!/usr/bin/env python

+#

+# Copyright (c) 2016 Apple Inc. All rights reserved.

+#

+# Redistribution and use in source and binary forms, with or without

+# modification, are permitted provided that the following conditions

+# are met:

+# 1. Redistributions of source code must retain the above copyright

+#    notice, this list of conditions and the following disclaimer.

+# 2. Redistributions in binary form must reproduce the above copyright

+#    notice, this list of conditions and the following disclaimer in the

+#    documentation and/or other materials provided with the distribution.

+#

+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''

+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS

+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF

+# THE POSSIBILITY OF SUCH DAMAGE.

+

+

+import logging

+import string

+from string import Template

+

+from generator import Generator

+from models import EnumType, ObjectType, ArrayType, AliasedType, PrimitiveType, Frameworks

+from objc_generator import ObjCGenerator

+from objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates

+

+log = logging.getLogger('global')

+

+

+def add_newline(lines):

+    if lines and lines[-1] == '':

+        return

+    lines.append('')

+

+

+class ObjCProtocolTypeConversionsImplementationGenerator(ObjCGenerator):

+    def __init__(self, model, input_filepath):

+        ObjCGenerator.__init__(self, model, input_filepath)

+

+    def output_filename(self):

+        return '%sTypeConversions.mm' % self.protocol_name()

+

+    def domains_to_generate(self):

+        return filter(ObjCGenerator.should_generate_domain_types_filter(self.model()), Generator.domains_to_generate(self))

+

+    def generate_output(self):

+        secondary_headers = [

+            '&quot;%s.h&quot;' % self.protocol_name(),

+            '&quot;%sTypeConversions.h&quot;' % ObjCGenerator.OBJC_SHARED_PREFIX,

+            Generator.string_for_file_include('%sJSONObjectPrivate.h' % ObjCGenerator.OBJC_STATIC_PREFIX, Frameworks.WebInspector, self.model().framework),

+        ]

+        secondary_headers.sort()

+

+        header_args = {

+            'primaryInclude': '&quot;%sTypeConversions.h&quot;' % self.protocol_name(),

+            'secondaryIncludes': '\n'.join(['#import ' + header for header in secondary_headers]),

+        }

+

+        domains = self.domains_to_generate()

+        sections = []

+        sections.append(self.generate_license())

+        sections.append(Template(ObjCTemplates.ImplementationPrelude).substitute(None, **header_args))

+        sections.append(self._generate_type_factory_category_interface(domains))

+        sections.append(self._generate_type_factory_category_implementation(domains))

+        sections.append(Template(ObjCTemplates.ImplementationPostlude).substitute(None, **header_args))

+        return '\n\n'.join(sections)

+

+    def _generate_type_factory_category_interface(self, domains):

+        lines = []

+        lines.append('@interface ProtocolTypeConversions (%s)' % self.protocol_name())

+        lines.append('')

+        for domain in domains:

+            for declaration in domain.type_declarations:

+                lines.append(self._generate_type_factory_method_declaration(domain, declaration))

+            add_newline(lines)

+        lines.append('@end')

+        return '\n'.join(lines)

+

+    def _generate_type_factory_method_declaration(self, domain, declaration):

+        resolved_type = declaration.type

+        if isinstance(resolved_type, AliasedType):

+            resolved_type = resolved_type.aliased_type

+        if isinstance(resolved_type, (ObjectType, ArrayType, PrimitiveType)):

+            objc_type = self.objc_class_for_type(resolved_type)

+            return '+ (void)_parse%s:(%s **)outValue fromPayload:(id)payload;' % (declaration.type.raw_name(), objc_type)

+        if isinstance(resolved_type, EnumType):

+            return '+ (void)_parse%s:(NSNumber **)outValue fromPayload:(id)payload;' % declaration.type.raw_name()

+

+    def _generate_type_factory_category_implementation(self, domains):

+        lines = []

+        lines.append('@implementation ProtocolTypeConversions (%s)' % self.protocol_name())

+        lines.append('')

+        for domain in domains:

+            for declaration in domain.type_declarations:

+                lines.append(self._generate_type_factory_method_implementation(domain, declaration))

+                add_newline(lines)

+        lines.append('@end')

+        return '\n'.join(lines)

+

+    def _generate_type_factory_method_implementation(self, domain, declaration):

+        lines = []

+        resolved_type = declaration.type

+        if isinstance(resolved_type, AliasedType):

+            resolved_type = resolved_type.aliased_type

+

+        objc_class = self.objc_class_for_type(resolved_type)

+        if isinstance(resolved_type, (ObjectType, ArrayType, PrimitiveType)):

+            lines.append('+ (void)_parse%s:(%s **)outValue fromPayload:(id)payload' % (declaration.type.raw_name(), objc_class))

+        if isinstance(resolved_type, EnumType):

+            lines.append('+ (void)_parse%s:(NSNumber **)outValue fromPayload:(id)payload' % declaration.type.raw_name())

+

+        lines.append('{')

+        if isinstance(resolved_type, EnumType):

+            lines.append('    THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);')

+            lines.append('    *outValue = @(Inspector::fromProtocolString&lt;%s&gt;(payload));' % self.objc_name_for_type(resolved_type))

+        elif isinstance(resolved_type, (ArrayType, PrimitiveType)):

+            lines.append('    THROW_EXCEPTION_FOR_BAD_TYPE(payload, [%s class]);' % objc_class)

+            lines.append('    *outValue = (%s *)payload;' % objc_class)

+        elif isinstance(resolved_type, ObjectType):

+            lines.append('    THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSDictionary class]);')

+            lines.append('    *outValue = [[%s alloc] initWithPayload:payload];' % (objc_class))

+        lines.append('}')

+        return '\n'.join(lines)

</ins></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptsgenerateinspectorprotocolbindingspy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py (197716 => 197717)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py        2016-03-08 00:45:25 UTC (rev 197716)

+++ trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py        2016-03-08 00:49:26 UTC (rev 197717)

</span><span class="lines">@@ -72,6 +72,7 @@

</span><span class="cx">     from generate_objc_header import *

</span><span class="cx">     from generate_objc_internal_header import *

</span><span class="cx">     from generate_objc_protocol_type_conversions_header import *

</span><ins>+    from generate_objc_protocol_type_conversions_implementation import *

</ins><span class="cx">     from generate_objc_protocol_types_implementation import *

</span><span class="cx"> 

</span><span class="cx"> 

</span><span class="lines">@@ -149,6 +150,7 @@

</span><span class="cx">         generators.append(ObjCHeaderGenerator(protocol, primary_specification_filepath))

</span><span class="cx">         generators.append(ObjCInternalHeaderGenerator(protocol, primary_specification_filepath))

</span><span class="cx">         generators.append(ObjCProtocolTypeConversionsHeaderGenerator(protocol, primary_specification_filepath))

</span><ins>+        generators.append(ObjCProtocolTypeConversionsImplementationGenerator(protocol, primary_specification_filepath))

</ins><span class="cx">         generators.append(ObjCProtocolTypesImplementationGenerator(protocol, primary_specification_filepath))

</span><span class="cx"> 

</span><span class="cx">     elif protocol.framework is Frameworks.JavaScriptCore:

</span><span class="lines">@@ -170,6 +172,7 @@

</span><span class="cx">     elif protocol.framework is Frameworks.WebKit and generate_frontend:

</span><span class="cx">         generators.append(ObjCHeaderGenerator(protocol, primary_specification_filepath))

</span><span class="cx">         generators.append(ObjCProtocolTypeConversionsHeaderGenerator(protocol, primary_specification_filepath))

</span><ins>+        generators.append(ObjCProtocolTypeConversionsImplementationGenerator(protocol, primary_specification_filepath))

</ins><span class="cx">         generators.append(ObjCProtocolTypesImplementationGenerator(protocol, primary_specification_filepath))

</span><span class="cx"> 

</span><span class="cx">     elif protocol.framework is Frameworks.WebInspector:

</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 (197716 => 197717)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result        2016-03-08 00:45:25 UTC (rev 197716)

+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result        2016-03-08 00:49:26 UTC (rev 197717)

</span><span class="lines">@@ -1397,6 +1397,7 @@

</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py

</span><span class="cx"> 

</span><span class="cx"> #import &quot;RWIProtocolArrayConversions.h&quot;

</span><ins>+#import &quot;TestProtocol.h&quot;

</ins><span class="cx"> 

</span><span class="cx"> namespace Inspector {

</span><span class="cx"> 

</span><span class="lines">@@ -1549,6 +1550,86 @@

</span><span class="cx"> 

</span><span class="cx"> ### End File: TestProtocolTypeConversions.h

</span><span class="cx"> 

</span><ins>+### Begin File: TestProtocolTypeConversions.mm

+/*

+ * Copyright (C) 2013 Google Inc. All rights reserved.

+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.

+ * Copyright (C) 2014 University of Washington. All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the

+ *    documentation and/or other materials provided with the distribution.

+ *

+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS

+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF

+ * THE POSSIBILITY OF SUCH DAMAGE.

+ */

+

+// DO NOT EDIT THIS FILE. It is automatically generated from commands-with-async-attribute.json

+// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py

+

+#import &quot;config.h&quot;

+#import &quot;TestProtocolTypeConversions.h&quot;

+

+#import &quot;ProtocolTypeConversions.h&quot;

+#import &quot;TestProtocol.h&quot;

+#import &lt;WebInspector/RWIProtocolJSONObjectPrivate.h&gt;

+

+using namespace Inspector;

+

+@interface ProtocolTypeConversions (TestProtocol)

+

++ (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload;

++ (void)_parsePrimaryColors:(NSNumber **)outValue fromPayload:(id)payload;

++ (void)_parseColorList:(NSArray/*&lt;NSString&gt;*/ **)outValue fromPayload:(id)payload;

++ (void)_parseError:(TestProtocolDatabaseError **)outValue fromPayload:(id)payload;

+

+@end

+

+@implementation ProtocolTypeConversions (TestProtocol)

+

++ (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload

+{

+    THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSNumber class]);

+    *outValue = (NSNumber *)payload;

+}

+

++ (void)_parsePrimaryColors:(NSNumber **)outValue fromPayload:(id)payload

+{

+    THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);

+    *outValue = @(Inspector::fromProtocolString&lt;TestProtocolDatabasePrimaryColors&gt;(payload));

+}

+

++ (void)_parseColorList:(NSArray/*&lt;NSString&gt;*/ **)outValue fromPayload:(id)payload

+{

+    THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSArray/*&lt;NSString&gt;*/ class]);

+    *outValue = (NSArray/*&lt;NSString&gt;*/ *)payload;

+}

+

++ (void)_parseError:(TestProtocolDatabaseError **)outValue fromPayload:(id)payload

+{

+    THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSDictionary class]);

+    *outValue = [[TestProtocolDatabaseError alloc] initWithPayload:payload];

+}

+

+@end

+

+

+### End File: TestProtocolTypeConversions.mm

+

</ins><span class="cx"> ### Begin File: TestProtocolTypes.mm

</span><span class="cx"> /*