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

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

<dt>Date</dt> <dd>2016-03-07 13:22:47 -0800 (Mon, 07 Mar 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Web Inspector: rename generated *EnumConversionHelpers.h to *TypeConversions.h

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

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

Reviewed by Timothy Hatcher.

Split out this renaming from the work to generate factory method stubs for types.

* JavaScriptCore.xcodeproj/project.pbxproj:

* inspector/scripts/codegen/__init__.py:

* inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py:

(ObjCConfigurationImplementationGenerator.generate_output):

* inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py:

(ObjCFrontendDispatcherImplementationGenerator.generate_output):

* inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py: Renamed from Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py.

* inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:

(ObjCProtocolTypesImplementationGenerator.generate_output):

* inspector/scripts/codegen/objc_generator_templates.py:

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

(generate_from_specification):

Rebaseline tests after changing generator order.

* 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_backend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_frontend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.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_generator_templatespy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator_templates.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_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py</a></li>

</ul>

<h3>Removed Paths</h3>

<ul>

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

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

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

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

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-03-07 21:08:13 UTC (rev 197700)

+++ trunk/Source/JavaScriptCore/ChangeLog        2016-03-07 21:22:47 UTC (rev 197701)

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

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

+

+        Web Inspector: rename generated *EnumConversionHelpers.h to *TypeConversions.h

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

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

+

+        Reviewed by Timothy Hatcher.

+

+        Split out this renaming from the work to generate factory method stubs for types.

+

+        * JavaScriptCore.xcodeproj/project.pbxproj:

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

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

+        (ObjCConfigurationImplementationGenerator.generate_output):

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

+        (ObjCFrontendDispatcherImplementationGenerator.generate_output):

+        * inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py: Renamed from Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py.

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

+        (ObjCProtocolTypesImplementationGenerator.generate_output):

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

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

+        (generate_from_specification):

+

+        Rebaseline tests after changing generator order.

+

+        * 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  Benjamin Poulain  &lt;benjamin@webkit.org&gt;

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

</span><span class="cx">         [JSC] Improve and64() and or64() with immediate on x86

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

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

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

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj        2016-03-07 21:08:13 UTC (rev 197700)

+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj        2016-03-07 21:22:47 UTC (rev 197701)

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

</span><span class="cx">                 A5EA710419F6DE720098F5EC /* generate_objc_backend_dispatcher_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = A5EA70F019F6DE5A0098F5EC /* generate_objc_backend_dispatcher_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };

</span><span class="cx">                 A5EA710519F6DE740098F5EC /* generate_objc_configuration_header.py in Headers */ = {isa = PBXBuildFile; fileRef = A5EA70F119F6DE5A0098F5EC /* generate_objc_configuration_header.py */; settings = {ATTRIBUTES = (Private, ); }; };

</span><span class="cx">                 A5EA710619F6DE760098F5EC /* generate_objc_configuration_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = A5EA70F219F6DE5A0098F5EC /* generate_objc_configuration_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };

</span><del>-                A5EA710719F6DE780098F5EC /* generate_objc_conversion_helpers.py in Headers */ = {isa = PBXBuildFile; fileRef = A5EA70F319F6DE5A0098F5EC /* generate_objc_conversion_helpers.py */; settings = {ATTRIBUTES = (Private, ); }; };

</del><ins>+                A5EA710719F6DE780098F5EC /* generate_objc_protocol_type_conversions_header.py in Headers */ = {isa = PBXBuildFile; fileRef = A5EA70F319F6DE5A0098F5EC /* generate_objc_protocol_type_conversions_header.py */; settings = {ATTRIBUTES = (Private, ); }; };

</ins><span class="cx">                 A5EA710819F6DE7A0098F5EC /* generate_objc_frontend_dispatcher_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = A5EA70F419F6DE5A0098F5EC /* generate_objc_frontend_dispatcher_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };

</span><span class="cx">                 A5EA710919F6DE7C0098F5EC /* generate_objc_header.py in Headers */ = {isa = PBXBuildFile; fileRef = A5EA70F519F6DE5A0098F5EC /* generate_objc_header.py */; settings = {ATTRIBUTES = (Private, ); }; };

</span><span class="cx">                 A5EA710A19F6DE7E0098F5EC /* generate_objc_internal_header.py in Headers */ = {isa = PBXBuildFile; fileRef = A5EA70F619F6DE5A0098F5EC /* generate_objc_internal_header.py */; settings = {ATTRIBUTES = (Private, ); }; };

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

</span><span class="cx">                 A5EA70F019F6DE5A0098F5EC /* generate_objc_backend_dispatcher_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_objc_backend_dispatcher_implementation.py; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="cx">                 A5EA70F119F6DE5A0098F5EC /* generate_objc_configuration_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_objc_configuration_header.py; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="cx">                 A5EA70F219F6DE5A0098F5EC /* generate_objc_configuration_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_objc_configuration_implementation.py; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><del>-                A5EA70F319F6DE5A0098F5EC /* generate_objc_conversion_helpers.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_objc_conversion_helpers.py; sourceTree = &quot;&lt;group&gt;&quot;; };

</del><ins>+                A5EA70F319F6DE5A0098F5EC /* generate_objc_protocol_type_conversions_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_objc_protocol_type_conversions_header.py; sourceTree = &quot;&lt;group&gt;&quot;; };

</ins><span class="cx">                 A5EA70F419F6DE5A0098F5EC /* generate_objc_frontend_dispatcher_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_objc_frontend_dispatcher_implementation.py; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="cx">                 A5EA70F519F6DE5A0098F5EC /* generate_objc_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_objc_header.py; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="cx">                 A5EA70F619F6DE5A0098F5EC /* generate_objc_internal_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_objc_internal_header.py; sourceTree = &quot;&lt;group&gt;&quot;; };

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

</span><span class="cx">                                 A5EA70F019F6DE5A0098F5EC /* generate_objc_backend_dispatcher_implementation.py */,

</span><span class="cx">                                 A5EA70F119F6DE5A0098F5EC /* generate_objc_configuration_header.py */,

</span><span class="cx">                                 A5EA70F219F6DE5A0098F5EC /* generate_objc_configuration_implementation.py */,

</span><del>-                                A5EA70F319F6DE5A0098F5EC /* generate_objc_conversion_helpers.py */,

</del><span class="cx">                                 A5EA70F419F6DE5A0098F5EC /* generate_objc_frontend_dispatcher_implementation.py */,

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

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

</span><ins>+                                A5EA70F319F6DE5A0098F5EC /* generate_objc_protocol_type_conversions_header.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">@@ -7427,7 +7427,7 @@

</span><span class="cx">                                 0F64EAF31C4ECD0600621E9B /* AirArgInlines.h in Headers */,

</span><span class="cx">                                 A5EA710519F6DE740098F5EC /* generate_objc_configuration_header.py in Headers */,

</span><span class="cx">                                 A5EA710619F6DE760098F5EC /* generate_objc_configuration_implementation.py in Headers */,

</span><del>-                                A5EA710719F6DE780098F5EC /* generate_objc_conversion_helpers.py in Headers */,

</del><ins>+                                A5EA710719F6DE780098F5EC /* generate_objc_protocol_type_conversions_header.py in Headers */,

</ins><span class="cx">                                 0F338DF61BE93D550013C88F /* B3ConstrainedValue.h in Headers */,

</span><span class="cx">                                 A5EA710819F6DE7A0098F5EC /* generate_objc_frontend_dispatcher_implementation.py in Headers */,

</span><span class="cx">                                 A5EA710919F6DE7C0098F5EC /* generate_objc_header.py 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 (197700 => 197701)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py        2016-03-07 21:08:13 UTC (rev 197700)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py        2016-03-07 21:22:47 UTC (rev 197701)

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

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

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

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

</span><del>-from generate_objc_conversion_helpers import *

</del><span class="cx"> from generate_objc_frontend_dispatcher_implementation import *

</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_types_implementation import *

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

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_backend_dispatcher_implementationpy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py (197700 => 197701)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py        2016-03-07 21:08:13 UTC (rev 197700)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py        2016-03-07 21:22:47 UTC (rev 197701)

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

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

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

</span><span class="cx">             '&quot;%sInternal.h&quot;' % self.protocol_name(),

</span><del>-            '&quot;%sEnumConversionHelpers.h&quot;' % self.protocol_name(),

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

</ins><span class="cx">             '&lt;JavaScriptCore/InspectorValues.h&gt;',

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

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

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_conversion_helperspy"></a>

<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py (197700 => 197701)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py        2016-03-07 21:08:13 UTC (rev 197700)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py        2016-03-07 21:22:47 UTC (rev 197701)

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

</span><del>-#!/usr/bin/env python

-#

-# Copyright (c) 2014, 2016 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.

-

-

-import logging

-import string

-from string import Template

-

-from generator import Generator

-from models import EnumType

-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 ObjCConversionHelpersGenerator(ObjCGenerator):

-    def __init__(self, model, input_filepath):

-        ObjCGenerator.__init__(self, model, input_filepath)

-

-    def output_filename(self):

-        return '%sEnumConversionHelpers.h' % 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):

-        headers = [

-            '&quot;%sArrayConversionHelpers.h&quot;' % ObjCGenerator.OBJC_STATIC_PREFIX

-        ]

-

-        header_args = {

-            'includes': '\n'.join(['#import ' + header for header in headers]),

-        }

-

-        domains = self.domains_to_generate()

-        sections = []

-        sections.append(self.generate_license())

-        sections.append(Template(ObjCTemplates.ConversionHelpersPrelude).substitute(None, **header_args))

-        sections.append(Template(ObjCTemplates.ConversionHelpersStandard).substitute(None))

-        sections.extend(map(self._generate_enum_conversion_functions, domains))

-        sections.append(Template(ObjCTemplates.ConversionHelpersPostlude).substitute(None, **header_args))

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

-

-    def _generate_enum_conversion_functions(self, domain):

-        lines = []

-

-        # Type enums and member enums.

-        for declaration in domain.type_declarations:

-            if isinstance(declaration.type, EnumType):

-                add_newline(lines)

-                lines.append(self._generate_anonymous_enum_conversion_for_declaration(domain, declaration))

-            else:

-                for member in declaration.type_members:

-                    if (isinstance(member.type, EnumType) and member.type.is_anonymous):

-                        add_newline(lines)

-                        lines.append(self._generate_anonymous_enum_conversion_for_member(domain, declaration, member))

-

-        # Anonymous command enums.

-        for command in domain.commands:

-            for parameter in command.call_parameters:

-                if (isinstance(parameter.type, EnumType) and parameter.type.is_anonymous):

-                    add_newline(lines)

-                    lines.append(self._generate_anonymous_enum_conversion_for_parameter(domain, command.command_name, parameter))

-            for parameter in command.return_parameters:

-                if (isinstance(parameter.type, EnumType) and parameter.type.is_anonymous):

-                    add_newline(lines)

-                    lines.append(self._generate_anonymous_enum_conversion_for_parameter(domain, command.command_name, parameter))

-

-        # Anonymous event enums.

-        for event in domain.events:

-            for parameter in event.event_parameters:

-                if (isinstance(parameter.type, EnumType) and parameter.type.is_anonymous):

-                    add_newline(lines)

-                    lines.append(self._generate_anonymous_enum_conversion_for_parameter(domain, event.event_name, parameter))

-

-        return '\n'.join(lines)

-

-    def _generate_anonymous_enum_conversion_for_declaration(self, domain, declaration):

-        objc_enum_name = self.objc_enum_name_for_anonymous_enum_declaration(declaration)

-        enum_values = declaration.type.enum_values()

-        lines = []

-        lines.append(self._generate_enum_objc_to_protocol_string(objc_enum_name, enum_values))

-        lines.append(self._generate_enum_from_protocol_string(objc_enum_name, enum_values))

-        return '\n\n'.join(lines)

-

-    def _generate_anonymous_enum_conversion_for_member(self, domain, declaration, member):

-        objc_enum_name = self.objc_enum_name_for_anonymous_enum_member(declaration, member)

-        enum_values = member.type.enum_values()

-        lines = []

-        lines.append(self._generate_enum_objc_to_protocol_string(objc_enum_name, enum_values))

-        lines.append(self._generate_enum_from_protocol_string(objc_enum_name, enum_values))

-        return '\n\n'.join(lines)

-

-    def _generate_anonymous_enum_conversion_for_parameter(self, domain, event_or_command_name, parameter):

-        objc_enum_name = self.objc_enum_name_for_anonymous_enum_parameter(domain, event_or_command_name, parameter)

-        enum_values = parameter.type.enum_values()

-        lines = []

-        lines.append(self._generate_enum_objc_to_protocol_string(objc_enum_name, enum_values))

-        lines.append(self._generate_enum_from_protocol_string(objc_enum_name, enum_values))

-        return '\n\n'.join(lines)

-

-    def _generate_enum_objc_to_protocol_string(self, objc_enum_name, enum_values):

-        lines = []

-        lines.append('inline String toProtocolString(%s value)' % objc_enum_name)

-        lines.append('{')

-        lines.append('    switch(value) {')

-        for enum_value in enum_values:

-            lines.append('    case %s%s:' % (objc_enum_name, Generator.stylized_name_for_enum_value(enum_value)))

-            lines.append('        return ASCIILiteral(&quot;%s&quot;);' % enum_value)

-        lines.append('    }')

-        lines.append('}')

-        return '\n'.join(lines)

-

-    def _generate_enum_from_protocol_string(self, objc_enum_name, enum_values):

-        lines = []

-        lines.append('template&lt;&gt;')

-        lines.append('inline %s fromProtocolString(const String&amp; value)' % objc_enum_name)

-        lines.append('{')

-        for enum_value in enum_values:

-            lines.append('    if (value == &quot;%s&quot;)' % enum_value)

-            lines.append('        return %s%s;' % (objc_enum_name, Generator.stylized_name_for_enum_value(enum_value)))

-        lines.append('    ASSERT_NOT_REACHED();')

-        lines.append('    return %s%s;' % (objc_enum_name, Generator.stylized_name_for_enum_value(enum_values[0])))

-        lines.append('}')

-        return '\n'.join(lines)

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_frontend_dispatcher_implementationpy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py (197700 => 197701)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py        2016-03-07 21:08:13 UTC (rev 197700)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py        2016-03-07 21:22:47 UTC (rev 197701)

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

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

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

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

</span><del>-            '&quot;%sEnumConversionHelpers.h&quot;' % self.protocol_name(),

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

</ins><span class="cx">             '&lt;JavaScriptCore/InspectorValues.h&gt;',

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

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

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_type_conversions_headerpyfromrev197700trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_conversion_helperspy"></a>

<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py (from rev 197700, trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py) (0 => 197701)</h4>

<pre class="diff"><span>

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

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py        2016-03-07 21:22:47 UTC (rev 197701)

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

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

+#

+# Copyright (c) 2014, 2016 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.

+

+

+import logging

+import string

+from string import Template

+

+from generator import Generator

+from models import EnumType

+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 ObjCProtocolTypeConversionsHeaderGenerator(ObjCGenerator):

+    def __init__(self, model, input_filepath):

+        ObjCGenerator.__init__(self, model, input_filepath)

+

+    def output_filename(self):

+        return '%sTypeConversions.h' % 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):

+        headers = [

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

+        ]

+

+        header_args = {

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

+        }

+

+        domains = self.domains_to_generate()

+        sections = []

+        sections.append(self.generate_license())

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

+        sections.append(Template(ObjCTemplates.TypeConversionsHeaderStandard).substitute(None))

+        sections.extend(map(self._generate_enum_conversion_functions, domains))

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

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

+

+    def _generate_enum_conversion_functions(self, domain):

+        lines = []

+

+        # Type enums and member enums.

+        for declaration in domain.type_declarations:

+            if isinstance(declaration.type, EnumType):

+                add_newline(lines)

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

+            else:

+                for member in declaration.type_members:

+                    if (isinstance(member.type, EnumType) and member.type.is_anonymous):

+                        add_newline(lines)

+                        lines.append(self._generate_anonymous_enum_conversion_for_member(domain, declaration, member))

+

+        # Anonymous command enums.

+        for command in domain.commands:

+            for parameter in command.call_parameters:

+                if (isinstance(parameter.type, EnumType) and parameter.type.is_anonymous):

+                    add_newline(lines)

+                    lines.append(self._generate_anonymous_enum_conversion_for_parameter(domain, command.command_name, parameter))

+            for parameter in command.return_parameters:

+                if (isinstance(parameter.type, EnumType) and parameter.type.is_anonymous):

+                    add_newline(lines)

+                    lines.append(self._generate_anonymous_enum_conversion_for_parameter(domain, command.command_name, parameter))

+

+        # Anonymous event enums.

+        for event in domain.events:

+            for parameter in event.event_parameters:

+                if (isinstance(parameter.type, EnumType) and parameter.type.is_anonymous):

+                    add_newline(lines)

+                    lines.append(self._generate_anonymous_enum_conversion_for_parameter(domain, event.event_name, parameter))

+

+        return '\n'.join(lines)

+

+    def _generate_anonymous_enum_conversion_for_declaration(self, domain, declaration):

+        objc_enum_name = self.objc_enum_name_for_anonymous_enum_declaration(declaration)

+        enum_values = declaration.type.enum_values()

+        lines = []

+        lines.append(self._generate_enum_objc_to_protocol_string(objc_enum_name, enum_values))

+        lines.append(self._generate_enum_from_protocol_string(objc_enum_name, enum_values))

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

+

+    def _generate_anonymous_enum_conversion_for_member(self, domain, declaration, member):

+        objc_enum_name = self.objc_enum_name_for_anonymous_enum_member(declaration, member)

+        enum_values = member.type.enum_values()

+        lines = []

+        lines.append(self._generate_enum_objc_to_protocol_string(objc_enum_name, enum_values))

+        lines.append(self._generate_enum_from_protocol_string(objc_enum_name, enum_values))

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

+

+    def _generate_anonymous_enum_conversion_for_parameter(self, domain, event_or_command_name, parameter):

+        objc_enum_name = self.objc_enum_name_for_anonymous_enum_parameter(domain, event_or_command_name, parameter)

+        enum_values = parameter.type.enum_values()

+        lines = []

+        lines.append(self._generate_enum_objc_to_protocol_string(objc_enum_name, enum_values))

+        lines.append(self._generate_enum_from_protocol_string(objc_enum_name, enum_values))

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

+

+    def _generate_enum_objc_to_protocol_string(self, objc_enum_name, enum_values):

+        lines = []

+        lines.append('inline String toProtocolString(%s value)' % objc_enum_name)

+        lines.append('{')

+        lines.append('    switch(value) {')

+        for enum_value in enum_values:

+            lines.append('    case %s%s:' % (objc_enum_name, Generator.stylized_name_for_enum_value(enum_value)))

+            lines.append('        return ASCIILiteral(&quot;%s&quot;);' % enum_value)

+        lines.append('    }')

+        lines.append('}')

+        return '\n'.join(lines)

+

+    def _generate_enum_from_protocol_string(self, objc_enum_name, enum_values):

+        lines = []

+        lines.append('template&lt;&gt;')

+        lines.append('inline %s fromProtocolString(const String&amp; value)' % objc_enum_name)

+        lines.append('{')

+        for enum_value in enum_values:

+            lines.append('    if (value == &quot;%s&quot;)' % enum_value)

+            lines.append('        return %s%s;' % (objc_enum_name, Generator.stylized_name_for_enum_value(enum_value)))

+        lines.append('    ASSERT_NOT_REACHED();')

+        lines.append('    return %s%s;' % (objc_enum_name, Generator.stylized_name_for_enum_value(enum_values[0])))

+        lines.append('}')

+        return '\n'.join(lines)

</ins></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 (197700 => 197701)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py        2016-03-07 21:08:13 UTC (rev 197700)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py        2016-03-07 21:22:47 UTC (rev 197701)

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

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

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

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

</span><del>-            '&quot;%sEnumConversionHelpers.h&quot;' % self.protocol_name(),

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

</ins><span class="cx">             Generator.string_for_file_include('%sJSONObjectPrivate.h' % ObjCGenerator.OBJC_STATIC_PREFIX, Frameworks.WebInspector, self.model().framework),

</span><span class="cx">             '&lt;JavaScriptCore/InspectorValues.h&gt;',

</span><span class="cx">             '&lt;wtf/Assertions.h&gt;',

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generator_templatespy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator_templates.py (197700 => 197701)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator_templates.py        2016-03-07 21:08:13 UTC (rev 197700)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator_templates.py        2016-03-07 21:22:47 UTC (rev 197701)

</span><span class="lines">@@ -38,12 +38,12 @@

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

</span><span class="cx">     &quot;&quot;&quot;&quot;&quot;&quot;)

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

</span><del>-    ConversionHelpersPrelude = (

</del><ins>+    TypeConversionsHeaderPrelude = (

</ins><span class="cx">     &quot;&quot;&quot;${includes}

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

</span><span class="cx"> namespace Inspector {&quot;&quot;&quot;)

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

</span><del>-    ConversionHelpersPostlude = (

</del><ins>+    TypeConversionsHeaderPostlude = (

</ins><span class="cx">     &quot;&quot;&quot;} // namespace Inspector

</span><span class="cx"> &quot;&quot;&quot;)

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

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

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

</span><span class="cx">     &quot;&quot;&quot;&quot;&quot;&quot;)

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

</span><del>-    ConversionHelpersStandard = (

</del><ins>+    TypeConversionsHeaderStandard = (

</ins><span class="cx">     &quot;&quot;&quot;template&lt;typename ObjCEnumType&gt;

</span><span class="cx"> ObjCEnumType fromProtocolString(const String&amp; value);&quot;&quot;&quot;)

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

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

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

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

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py        2016-03-07 21:08:13 UTC (rev 197700)

+++ trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py        2016-03-07 21:22:47 UTC (rev 197701)

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

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

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

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

</span><del>-    from generate_objc_conversion_helpers import *

</del><span class="cx">     from generate_objc_frontend_dispatcher_implementation import *

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

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

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

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

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

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

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

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

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

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

</span><del>-        generators.append(ObjCConversionHelpersGenerator(protocol, primary_specification_filepath))

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

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

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

</span><ins>+        generators.append(ObjCProtocolTypeConversionsHeaderGenerator(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">@@ -168,9 +168,8 @@

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

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

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

<del>-        # FIXME &lt;rdar://problem/23466925&gt;: This list of generators for the frontend is a placeholder.

-        generators.append(ObjCConversionHelpersGenerator(protocol, primary_specification_filepath))

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

</span><ins>+        generators.append(ObjCProtocolTypeConversionsHeaderGenerator(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 class="lines">@@ -178,10 +177,10 @@

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

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

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

</span><del>-        generators.append(ObjCConversionHelpersGenerator(protocol, primary_specification_filepath))

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

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

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

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

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

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

</span><span class="cx">     single_output_file_contents = []

</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 (197700 => 197701)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result        2016-03-07 21:08:13 UTC (rev 197700)

+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result        2016-03-07 21:22:47 UTC (rev 197701)

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

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

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

</span><span class="cx"> #include &quot;TestProtocolInternal.h&quot;

</span><del>-#include &quot;TestProtocolEnumConversionHelpers.h&quot;

</del><ins>+#include &quot;TestProtocolTypeConversions.h&quot;

</ins><span class="cx"> #include &lt;JavaScriptCore/InspectorValues.h&gt;

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

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

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

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

</span><span class="cx"> ### End File: TestProtocolBackendDispatchers.mm

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

</span><del>-### Begin File: TestProtocolEnumConversionHelpers.h

</del><ins>+### Begin File: TestProtocolEventDispatchers.mm

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