<!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>[197013] 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/197013">197013</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-02-23 22:43:07 -0800 (Tue, 23 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: teach the Objective-C protocol generators about --frontend and --backend directives
https://bugs.webkit.org/show_bug.cgi?id=154615
<rdar://problem/24804330>
Reviewed by Timothy Hatcher.
Some of the generated Objective-C bindings are only relevant to code acting as the
protocol backend. Add a per-generator setting mechanism and propagate --frontend and
--backend to all generators. Use the setting in a few generators to omit code that's
not needed.
Also fix a few places where the code emits the wrong Objective-C class prefix.
There is some common non-generated code that must always have the RWIProtocol prefix.
Lastly, change includes to use RWIProtocolJSONObjectPrivate.h instead of *Internal.h. The
macros defined in the internal header now need to be used outside of the framework.
* inspector/scripts/codegen/generate_objc_conversion_helpers.py:
Use OBJC_STATIC_PREFIX along with the file name and use different include syntax
depending on the target framework.
* inspector/scripts/codegen/generate_objc_header.py:
(ObjCHeaderGenerator.generate_output):
For now, omit generating command protocol and event dispatchers when generating for --frontend.
(ObjCHeaderGenerator._generate_type_interface):
Use OBJC_STATIC_PREFIX along with the unprefixed file name.
* inspector/scripts/codegen/generate_objc_internal_header.py:
Use RWIProtocolJSONObjectPrivate.h instead.
* inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:
(ObjCProtocolTypesImplementationGenerator.generate_output):
Include the Internal header if it's being generated (only for --backend).
* inspector/scripts/codegen/generator.py:
(Generator.__init__):
(Generator.set_generator_setting):
(Generator):
(Generator.get_generator_setting):
Crib a simple setting system from the Framework class. Make the names more obnoxious.
(Generator.string_for_file_include):
Inspired by the replay input generator, this is a function that uses the proper syntax
for a file include depending on the file's framework and target framework.
* inspector/scripts/codegen/objc_generator.py:
(ObjCGenerator.and):
(ObjCGenerator.and.objc_prefix):
(ObjCGenerator):
(ObjCGenerator.objc_type_for_raw_name):
(ObjCGenerator.objc_class_for_raw_name):
Whitelist the 'Automation' domain for the ObjC generators. Revise use of OBJC_STATIC_PREFIX.
* inspector/scripts/generate-inspector-protocol-bindings.py:
(generate_from_specification):
Change the generators to use for the frontend. Propagate --frontend and --backend.
* 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:
Rebaseline tests. They now correctly include RWIProtocolJSONObject.h and the like.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_conversion_helperspy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_internal_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_types_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengeneratorpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generatorpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -1,3 +1,78 @@
</span><ins>+2016-02-23 Brian Burg <bburg@apple.com>
+
+ Web Inspector: teach the Objective-C protocol generators about --frontend and --backend directives
+ https://bugs.webkit.org/show_bug.cgi?id=154615
+ <rdar://problem/24804330>
+
+ Reviewed by Timothy Hatcher.
+
+ Some of the generated Objective-C bindings are only relevant to code acting as the
+ protocol backend. Add a per-generator setting mechanism and propagate --frontend and
+ --backend to all generators. Use the setting in a few generators to omit code that's
+ not needed.
+
+ Also fix a few places where the code emits the wrong Objective-C class prefix.
+ There is some common non-generated code that must always have the RWIProtocol prefix.
+
+ Lastly, change includes to use RWIProtocolJSONObjectPrivate.h instead of *Internal.h. The
+ macros defined in the internal header now need to be used outside of the framework.
+
+ * inspector/scripts/codegen/generate_objc_conversion_helpers.py:
+ Use OBJC_STATIC_PREFIX along with the file name and use different include syntax
+ depending on the target framework.
+
+ * inspector/scripts/codegen/generate_objc_header.py:
+ (ObjCHeaderGenerator.generate_output):
+ For now, omit generating command protocol and event dispatchers when generating for --frontend.
+
+ (ObjCHeaderGenerator._generate_type_interface):
+ Use OBJC_STATIC_PREFIX along with the unprefixed file name.
+
+ * inspector/scripts/codegen/generate_objc_internal_header.py:
+ Use RWIProtocolJSONObjectPrivate.h instead.
+
+ * inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:
+ (ObjCProtocolTypesImplementationGenerator.generate_output):
+ Include the Internal header if it's being generated (only for --backend).
+
+ * inspector/scripts/codegen/generator.py:
+ (Generator.__init__):
+ (Generator.set_generator_setting):
+ (Generator):
+ (Generator.get_generator_setting):
+ Crib a simple setting system from the Framework class. Make the names more obnoxious.
+
+ (Generator.string_for_file_include):
+ Inspired by the replay input generator, this is a function that uses the proper syntax
+ for a file include depending on the file's framework and target framework.
+
+ * inspector/scripts/codegen/objc_generator.py:
+ (ObjCGenerator.and):
+ (ObjCGenerator.and.objc_prefix):
+ (ObjCGenerator):
+ (ObjCGenerator.objc_type_for_raw_name):
+ (ObjCGenerator.objc_class_for_raw_name):
+ Whitelist the 'Automation' domain for the ObjC generators. Revise use of OBJC_STATIC_PREFIX.
+
+ * inspector/scripts/generate-inspector-protocol-bindings.py:
+ (generate_from_specification):
+ Change the generators to use for the frontend. Propagate --frontend and --backend.
+
+ * 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:
+ Rebaseline tests. They now correctly include RWIProtocolJSONObject.h and the like.
+
</ins><span class="cx"> 2016-02-23 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> arrayProtoFuncConcat doesn't check for an exception after allocating an array
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_conversion_helperspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> headers = [
</span><del>- '"%sArrayConversionHelpers.h"' % self.objc_prefix(),
</del><ins>+ '"%sArrayConversionHelpers.h"' % ObjCGenerator.OBJC_STATIC_PREFIX
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> header_args = {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> headers = set([
</span><del>- '<WebInspector/%sJSONObject.h>' % self.objc_prefix(),
</del><ins>+ '<WebInspector/%sJSONObject.h>' % ObjCGenerator.OBJC_STATIC_PREFIX,
</ins><span class="cx"> ])
</span><span class="cx">
</span><span class="cx"> header_args = {
</span><span class="lines">@@ -75,8 +75,11 @@
</span><span class="cx"> sections.append('\n'.join(filter(None, map(self._generate_forward_declarations, type_domains))))
</span><span class="cx"> sections.append('\n'.join(filter(None, map(self._generate_enums, type_domains))))
</span><span class="cx"> sections.append('\n'.join(filter(None, map(self._generate_types, type_domains))))
</span><del>- sections.append('\n\n'.join(filter(None, map(self._generate_command_protocols, command_domains))))
- sections.append('\n\n'.join(filter(None, map(self._generate_event_interfaces, event_domains))))
</del><ins>+
+ if self.get_generator_setting('generate_backend', False):
+ sections.append('\n\n'.join(filter(None, map(self._generate_command_protocols, command_domains))))
+ sections.append('\n\n'.join(filter(None, map(self._generate_event_interfaces, event_domains))))
+
</ins><span class="cx"> sections.append(Template(ObjCTemplates.HeaderPostlude).substitute(None))
</span><span class="cx"> return '\n\n'.join(sections)
</span><span class="cx">
</span><span class="lines">@@ -155,7 +158,7 @@
</span><span class="cx"> lines = []
</span><span class="cx"> objc_name = self.objc_name_for_type(declaration.type)
</span><span class="cx"> lines.append('__attribute__((visibility ("default")))')
</span><del>- lines.append('@interface %s : %s' % (objc_name, ObjCGenerator.OBJC_JSON_OBJECT_BASE))
</del><ins>+ lines.append('@interface %s : %sJSONObject' % (objc_name, ObjCGenerator.OBJC_STATIC_PREFIX))
</ins><span class="cx"> required_members = filter(lambda member: not member.is_optional, declaration.type_members)
</span><span class="cx"> optional_members = filter(lambda member: member.is_optional, declaration.type_members)
</span><span class="cx"> if required_members:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_internal_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> headers = set([
</span><span class="cx"> '"%s.h"' % self.objc_prefix(),
</span><del>- '"%sJSONObjectInternal.h"' % self.objc_prefix(),
</del><ins>+ '"%sJSONObjectPrivate.h"' % self.objc_prefix(),
</ins><span class="cx"> '<JavaScriptCore/InspectorValues.h>',
</span><span class="cx"> '<JavaScriptCore/AugmentableInspectorController.h>',
</span><span class="cx"> ])
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_types_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> from string import Template
</span><span class="cx">
</span><span class="cx"> from generator import Generator, ucfirst
</span><del>-from models import ObjectType
</del><ins>+from models import ObjectType, Frameworks
</ins><span class="cx"> from objc_generator import ObjCGenerator
</span><span class="cx"> from objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
</span><span class="cx">
</span><span class="lines">@@ -56,12 +56,18 @@
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> secondary_headers = [
</span><span class="cx"> '"%sEnumConversionHelpers.h"' % self.objc_prefix(),
</span><ins>+ Generator.string_for_file_include('%sJSONObjectPrivate.h' % ObjCGenerator.OBJC_STATIC_PREFIX, Frameworks.WebInspector, self.model().framework),
</ins><span class="cx"> '<JavaScriptCore/InspectorValues.h>',
</span><span class="cx"> '<wtf/Assertions.h>',
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+ # The FooProtocolInternal.h header is only needed to declare the backend-side event dispatcher bindings.
+ primaryIncludeName = self.objc_prefix()
+ if self.get_generator_setting('generate_backend', False):
+ primaryIncludeName += 'Internal'
+
</ins><span class="cx"> header_args = {
</span><del>- 'primaryInclude': '"%sInternal.h"' % self.objc_prefix(),
</del><ins>+ 'primaryInclude': '"%s.h"' % primaryIncludeName,
</ins><span class="cx"> 'secondaryIncludes': '\n'.join(['#import %s' % header for header in secondary_headers]),
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengeneratorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -78,10 +78,18 @@
</span><span class="cx"> def __init__(self, model, input_filepath):
</span><span class="cx"> self._model = model
</span><span class="cx"> self._input_filepath = input_filepath
</span><ins>+ self._settings = {}
</ins><span class="cx">
</span><span class="cx"> def model(self):
</span><span class="cx"> return self._model
</span><span class="cx">
</span><ins>+ def set_generator_setting(self, key, value):
+ self._settings[key] = value
+
+ # The goofy name is to disambiguate generator settings from framework settings.
+ def get_generator_setting(self, key, default=None):
+ return self._settings.get(key, default)
+
</ins><span class="cx"> def generate_license(self):
</span><span class="cx"> return Template(Templates.CopyrightBlock).substitute(None, inputFilename=os.path.basename(self._input_filepath))
</span><span class="cx">
</span><span class="lines">@@ -239,3 +247,10 @@
</span><span class="cx"> return 'number'
</span><span class="cx"> else:
</span><span class="cx"> return _type.qualified_name()
</span><ins>+
+ @staticmethod
+ def string_for_file_include(filename, file_framework, target_framework):
+ if file_framework is target_framework:
+ return '"%s"' % filename
+ else:
+ return '<%s/%s>' % (file_framework.name, filename)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -86,15 +86,15 @@
</span><span class="cx"> # Do not use a dynamic prefix for RWIProtocolJSONObject since it's used as a common
</span><span class="cx"> # base class and needs a consistent Objective-C prefix to be in a reusable framework.
</span><span class="cx"> OBJC_HELPER_PREFIX = 'RWI'
</span><del>- OBJC_COMMON_PREFIX = 'Protocol'
- OBJC_JSON_OBJECT_BASE = '%s%sJSONObject' % (OBJC_HELPER_PREFIX, OBJC_COMMON_PREFIX)
</del><ins>+ OBJC_SHARED_PREFIX = 'Protocol'
+ OBJC_STATIC_PREFIX = '%s%s' % (OBJC_HELPER_PREFIX, OBJC_SHARED_PREFIX)
</ins><span class="cx">
</span><span class="cx"> def __init__(self, model, input_filepath):
</span><span class="cx"> Generator.__init__(self, model, input_filepath)
</span><span class="cx">
</span><span class="cx"> def objc_prefix(self):
</span><span class="cx"> framework_prefix = self.model().framework.setting('objc_prefix', '')
</span><del>- return '%s%s' % (framework_prefix, ObjCGenerator.OBJC_COMMON_PREFIX)
</del><ins>+ return '%s%s' % (framework_prefix, ObjCGenerator.OBJC_SHARED_PREFIX)
</ins><span class="cx">
</span><span class="cx"> # Adjust identifier names that collide with ObjC keywords.
</span><span class="cx">
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> # Generate ObjC types, command handlers, and event dispatchers for a subset of domains.
</span><span class="cx">
</span><del>- DOMAINS_TO_GENERATE = ['CSS', 'DOM', 'DOMStorage', 'Network', 'Page', 'GenericTypes']
</del><ins>+ DOMAINS_TO_GENERATE = ['CSS', 'DOM', 'DOMStorage', 'Network', 'Page', 'Automation', 'GenericTypes']
</ins><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def should_generate_domain_types_filter(model):
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> if raw_name is 'boolean':
</span><span class="cx"> return 'BOOL'
</span><span class="cx"> if raw_name in ['any', 'object']:
</span><del>- return '%s *' % ObjCGenerator.OBJC_JSON_OBJECT_BASE
</del><ins>+ return '%sJSONObject *' % ObjCGenerator.OBJC_STATIC_PREFIX
</ins><span class="cx"> return None
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> if raw_name in ['integer', 'number', 'boolean']:
</span><span class="cx"> return 'NSNumber'
</span><span class="cx"> if raw_name in ['any', 'object']:
</span><del>- return ObjCGenerator.OBJC_JSON_OBJECT_BASE
</del><ins>+ return '%sJSONObject' % ObjCGenerator.OBJC_STATIC_PREFIX
</ins><span class="cx"> return None
</span><span class="cx">
</span><span class="cx"> # FIXME: Can these protocol_type functions be removed in favor of C++ generators functions?
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptsgenerateinspectorprotocolbindingspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> elif protocol.framework is Frameworks.WebKit and generate_frontend:
</span><span class="cx"> # FIXME <rdar://problem/23466925>: This list of generators for the frontend is a placeholder.
</span><span class="cx"> generators.append(ObjCConversionHelpersGenerator(protocol, primary_specification_filepath))
</span><del>- generators.append(ObjCFrontendDispatcherImplementationGenerator(protocol, primary_specification_filepath))
</del><ins>+ generators.append(ObjCHeaderGenerator(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">@@ -187,6 +187,13 @@
</span><span class="cx"> single_output_file_contents = []
</span><span class="cx">
</span><span class="cx"> for generator in generators:
</span><ins>+ # Only some generators care whether frontend or backend was specified, but it is
+ # set on all of them to avoid adding more constructor arguments or thinking too hard.
+ if generate_backend:
+ generator.set_generator_setting('generate_backend', True)
+ if generate_frontend:
+ generator.set_generator_setting('generate_frontend', True)
+
</ins><span class="cx"> output = generator.generate_output()
</span><span class="cx"> if concatenate_output:
</span><span class="cx"> single_output_file_contents.append('### Begin File: %s' % generator.output_filename())
</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 (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -1031,7 +1031,7 @@
</span><span class="cx"> backendDispatcher()->sendPendingErrors();
</span><span class="cx"> };
</span><span class="cx">
</span><del>- id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, ProtocolJSONObject **values, ProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor) {
</del><ins>+ id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor) {
</ins><span class="cx"> Ref<InspectorObject> resultObject = InspectorObject::create();
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -1075,7 +1075,7 @@
</span><span class="cx"> backendDispatcher()->sendPendingErrors();
</span><span class="cx"> };
</span><span class="cx">
</span><del>- id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, ProtocolJSONObject **values, ProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor) {
</del><ins>+ id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor) {
</ins><span class="cx"> Ref<InspectorObject> resultObject = InspectorObject::create();
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -1119,7 +1119,7 @@
</span><span class="cx"> backendDispatcher()->sendPendingErrors();
</span><span class="cx"> };
</span><span class="cx">
</span><del>- id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, ProtocolJSONObject *values, ProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabasePrimaryColors screenColor, TestProtocolDatabaseExecuteSQLSyncPrintColor printColor) {
</del><ins>+ id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabasePrimaryColors screenColor, TestProtocolDatabaseExecuteSQLSyncPrintColor printColor) {
</ins><span class="cx"> Ref<InspectorObject> resultObject = InspectorObject::create();
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -1153,7 +1153,7 @@
</span><span class="cx"> backendDispatcher()->sendPendingErrors();
</span><span class="cx"> };
</span><span class="cx">
</span><del>- id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, ProtocolJSONObject *values, ProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteSQLAsyncPrintColor printColor) {
</del><ins>+ id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteSQLAsyncPrintColor printColor) {
</ins><span class="cx"> Ref<InspectorObject> resultObject = InspectorObject::create();
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -1216,7 +1216,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-async-attribute.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "TestProtocolArrayConversionHelpers.h"
</del><ins>+#import "RWIProtocolArrayConversionHelpers.h"
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -1446,7 +1446,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebInspector/TestProtocolJSONObject.h>
</del><ins>+#import <WebInspector/RWIProtocolJSONObject.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @class TestProtocolDatabaseError;
</span><span class="lines">@@ -1488,7 +1488,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolDatabaseError : ProtocolJSONObject
</del><ins>+@interface TestProtocolDatabaseError : RWIProtocolJSONObject
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><span class="cx"> /* required */ @property (nonatomic, assign) int code;
</span><span class="lines">@@ -1496,10 +1496,10 @@
</span><span class="cx">
</span><span class="cx"> @protocol TestProtocolDatabaseDomainHandler <NSObject>
</span><span class="cx"> @required
</span><del>-- (void)executeSQLSyncOptionalReturnValuesWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, ProtocolJSONObject **values, ProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
-- (void)executeSQLAsyncOptionalReturnValuesWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, ProtocolJSONObject **values, ProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
-- (void)executeSQLSyncWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, ProtocolJSONObject *values, ProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabasePrimaryColors screenColor, TestProtocolDatabaseExecuteSQLSyncPrintColor printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
-- (void)executeSQLAsyncWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, ProtocolJSONObject *values, ProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteSQLAsyncPrintColor printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
</del><ins>+- (void)executeSQLSyncOptionalReturnValuesWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
+- (void)executeSQLAsyncOptionalReturnValuesWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
+- (void)executeSQLSyncWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabasePrimaryColors screenColor, TestProtocolDatabaseExecuteSQLSyncPrintColor printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
+- (void)executeSQLAsyncWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteSQLAsyncPrintColor printColor))successCallback databaseId:(int)databaseId query:(NSString *)query;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1539,7 +1539,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 "TestProtocol.h"
</span><del>-#import "TestProtocolJSONObjectInternal.h"
</del><ins>+#import "TestProtocolJSONObjectPrivate.h"
</ins><span class="cx"> #import <JavaScriptCore/AugmentableInspectorController.h>
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="lines">@@ -1583,6 +1583,7 @@
</span><span class="cx"> #import "TestProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "TestProtocolEnumConversionHelpers.h"
</span><ins>+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -930,7 +930,7 @@
</span><span class="cx"> backendDispatcher()->sendPendingErrors();
</span><span class="cx"> };
</span><span class="cx">
</span><del>- id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, ProtocolJSONObject **values, ProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor) {
</del><ins>+ id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor) {
</ins><span class="cx"> Ref<InspectorObject> resultObject = InspectorObject::create();
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -970,12 +970,12 @@
</span><span class="cx"> double o_in_timestamp;
</span><span class="cx"> if (in_timestamp)
</span><span class="cx"> o_in_timestamp = *in_timestamp;
</span><del>- ProtocolJSONObject *o_in_values;
</del><ins>+ RWIProtocolJSONObject *o_in_values;
</ins><span class="cx"> if (in_values)
</span><del>- o_in_values = [[[ProtocolJSONObject alloc] initWithInspectorObject:in_values] autorelease];
- ProtocolJSONObject *o_in_payload;
</del><ins>+ o_in_values = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:in_values] autorelease];
+ RWIProtocolJSONObject *o_in_payload;
</ins><span class="cx"> if (in_payload)
</span><del>- o_in_payload = [[[ProtocolJSONObject alloc] initWithInspectorObject:in_payload] autorelease];
</del><ins>+ o_in_payload = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:in_payload] autorelease];
</ins><span class="cx"> int o_in_databaseId;
</span><span class="cx"> if (in_databaseId)
</span><span class="cx"> o_in_databaseId = *in_databaseId;
</span><span class="lines">@@ -1002,7 +1002,7 @@
</span><span class="cx"> backendDispatcher()->sendPendingErrors();
</span><span class="cx"> };
</span><span class="cx">
</span><del>- id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, ProtocolJSONObject *values, ProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor) {
</del><ins>+ id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor) {
</ins><span class="cx"> Ref<InspectorObject> resultObject = InspectorObject::create();
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -1026,8 +1026,8 @@
</span><span class="cx"> NSArray/*<NSString>*/ *o_in_columnNames = objcStringArray(&in_columnNames);
</span><span class="cx"> NSString *o_in_notes = in_notes;
</span><span class="cx"> double o_in_timestamp = in_timestamp;
</span><del>- ProtocolJSONObject *o_in_values = [[[ProtocolJSONObject alloc] initWithInspectorObject:&in_values] autorelease];
- ProtocolJSONObject *o_in_payload = [[[ProtocolJSONObject alloc] initWithInspectorObject:&in_payload] autorelease];
</del><ins>+ RWIProtocolJSONObject *o_in_values = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:&in_values] autorelease];
+ RWIProtocolJSONObject *o_in_payload = [[[RWIProtocolJSONObject alloc] initWithInspectorObject:&in_payload] autorelease];
</ins><span class="cx"> int o_in_databaseId = in_databaseId;
</span><span class="cx"> TestProtocolDatabaseError *o_in_sqlError = [[[TestProtocolDatabaseError alloc] initWithInspectorObject:&in_sqlError] autorelease];
</span><span class="cx"> TestProtocolDatabasePrimaryColors o_in_screenColor = fromProtocolString<TestProtocolDatabasePrimaryColors>(in_screenColor);
</span><span class="lines">@@ -1073,7 +1073,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-optional-call-return-parameters.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "TestProtocolArrayConversionHelpers.h"
</del><ins>+#import "RWIProtocolArrayConversionHelpers.h"
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -1303,7 +1303,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebInspector/TestProtocolJSONObject.h>
</del><ins>+#import <WebInspector/RWIProtocolJSONObject.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @class TestProtocolDatabaseError;
</span><span class="lines">@@ -1345,7 +1345,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolDatabaseError : ProtocolJSONObject
</del><ins>+@interface TestProtocolDatabaseError : RWIProtocolJSONObject
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><span class="cx"> /* required */ @property (nonatomic, assign) int code;
</span><span class="lines">@@ -1353,8 +1353,8 @@
</span><span class="cx">
</span><span class="cx"> @protocol TestProtocolDatabaseDomainHandler <NSObject>
</span><span class="cx"> @required
</span><del>-- (void)executeAllOptionalParametersWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, ProtocolJSONObject **values, ProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor))successCallback columnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(ProtocolJSONObject **)values payload:(ProtocolJSONObject **)payload databaseId:(int *)databaseId sqlError:(TestProtocolDatabaseError **)sqlError screenColor:(TestProtocolDatabasePrimaryColors *)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(TestProtocolDatabaseExecuteAllOptionalParametersPrintColor *)printColor;
-- (void)executeNoOptionalParametersWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, ProtocolJSONObject *values, ProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor))successCallback columnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload databaseId:(int)databaseId sqlError:(TestProtocolDatabaseError *)sqlError screenColor:(TestProtocolDatabasePrimaryColors)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(TestProtocolDatabaseExecuteNoOptionalParametersPrintColor)printColor;
</del><ins>+- (void)executeAllOptionalParametersWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, TestProtocolDatabaseError **sqlError, TestProtocolDatabasePrimaryColors *screenColor, NSArray/*<NSString>*/ **alternateColors, TestProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor))successCallback columnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(RWIProtocolJSONObject **)values payload:(RWIProtocolJSONObject **)payload databaseId:(int *)databaseId sqlError:(TestProtocolDatabaseError **)sqlError screenColor:(TestProtocolDatabasePrimaryColors *)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(TestProtocolDatabaseExecuteAllOptionalParametersPrintColor *)printCol
or;
+- (void)executeNoOptionalParametersWithErrorCallback:(void(^)(NSString *error))errorCallback successCallback:(void(^)(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, TestProtocolDatabaseError *sqlError, TestProtocolDatabasePrimaryColors screenColor, NSArray/*<NSString>*/ *alternateColors, TestProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor))successCallback columnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload databaseId:(int)databaseId sqlError:(TestProtocolDatabaseError *)sqlError screenColor:(TestProtocolDatabasePrimaryColors)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(TestProtocolDatabaseExecuteNoOptionalParametersPrintColor)printColor;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1394,7 +1394,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 "TestProtocol.h"
</span><del>-#import "TestProtocolJSONObjectInternal.h"
</del><ins>+#import "TestProtocolJSONObjectPrivate.h"
</ins><span class="cx"> #import <JavaScriptCore/AugmentableInspectorController.h>
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="lines">@@ -1438,6 +1438,7 @@
</span><span class="cx"> #import "TestProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "TestProtocolEnumConversionHelpers.h"
</span><ins>+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpecteddomainswithvaryingcommandsizesjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -1131,7 +1131,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from domains-with-varying-command-sizes.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "TestProtocolArrayConversionHelpers.h"
</del><ins>+#import "RWIProtocolArrayConversionHelpers.h"
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -1229,7 +1229,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebInspector/TestProtocolJSONObject.h>
</del><ins>+#import <WebInspector/RWIProtocolJSONObject.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1291,7 +1291,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 "TestProtocol.h"
</span><del>-#import "TestProtocolJSONObjectInternal.h"
</del><ins>+#import "TestProtocolJSONObjectPrivate.h"
</ins><span class="cx"> #import <JavaScriptCore/AugmentableInspectorController.h>
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="lines">@@ -1335,6 +1335,7 @@
</span><span class="cx"> #import "TestProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "TestProtocolEnumConversionHelpers.h"
</span><ins>+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedenumvaluesjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -835,7 +835,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from enum-values.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "TestProtocolArrayConversionHelpers.h"
</del><ins>+#import "RWIProtocolArrayConversionHelpers.h"
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -1040,7 +1040,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebInspector/TestProtocolJSONObject.h>
</del><ins>+#import <WebInspector/RWIProtocolJSONObject.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1113,7 +1113,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 "TestProtocol.h"
</span><del>-#import "TestProtocolJSONObjectInternal.h"
</del><ins>+#import "TestProtocolJSONObjectPrivate.h"
</ins><span class="cx"> #import <JavaScriptCore/AugmentableInspectorController.h>
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="lines">@@ -1159,6 +1159,7 @@
</span><span class="cx"> #import "TestProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "TestProtocolEnumConversionHelpers.h"
</span><ins>+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -780,7 +780,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from events-with-optional-parameters.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "TestProtocolArrayConversionHelpers.h"
</del><ins>+#import "RWIProtocolArrayConversionHelpers.h"
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -847,7 +847,7 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)didExecuteOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(ProtocolJSONObject **)values payload:(ProtocolJSONObject **)payload sqlError:(TestProtocolDatabaseError **)sqlError screenColor:(NSString **)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(NSString **)printColor
</del><ins>+- (void)didExecuteOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(RWIProtocolJSONObject **)values payload:(RWIProtocolJSONObject **)payload sqlError:(TestProtocolDatabaseError **)sqlError screenColor:(NSString **)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(NSString **)printColor
</ins><span class="cx"> {
</span><span class="cx"> const FrontendRouter& router = _controller->frontendRouter();
</span><span class="cx">
</span><span class="lines">@@ -885,7 +885,7 @@
</span><span class="cx"> router.sendEvent(jsonMessage->toJSONString());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)didExecuteNoOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload sqlError:(TestProtocolDatabaseError *)sqlError screenColor:(NSString *)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(NSString *)printColor
</del><ins>+- (void)didExecuteNoOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload sqlError:(TestProtocolDatabaseError *)sqlError screenColor:(NSString *)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(NSString *)printColor
</ins><span class="cx"> {
</span><span class="cx"> const FrontendRouter& router = _controller->frontendRouter();
</span><span class="cx">
</span><span class="lines">@@ -952,7 +952,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebInspector/TestProtocolJSONObject.h>
</del><ins>+#import <WebInspector/RWIProtocolJSONObject.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @class TestProtocolDatabaseError;
</span><span class="lines">@@ -961,7 +961,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolDatabaseError : ProtocolJSONObject
</del><ins>+@interface TestProtocolDatabaseError : RWIProtocolJSONObject
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><span class="cx"> /* required */ @property (nonatomic, assign) int code;
</span><span class="lines">@@ -971,8 +971,8 @@
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface TestProtocolDatabaseDomainEventDispatcher : NSObject
</span><del>-- (void)didExecuteOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(ProtocolJSONObject **)values payload:(ProtocolJSONObject **)payload sqlError:(TestProtocolDatabaseError **)sqlError screenColor:(NSString **)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(NSString **)printColor;
-- (void)didExecuteNoOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload sqlError:(TestProtocolDatabaseError *)sqlError screenColor:(NSString *)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(NSString *)printColor;
</del><ins>+- (void)didExecuteOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(RWIProtocolJSONObject **)values payload:(RWIProtocolJSONObject **)payload sqlError:(TestProtocolDatabaseError **)sqlError screenColor:(NSString **)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(NSString **)printColor;
+- (void)didExecuteNoOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload sqlError:(TestProtocolDatabaseError *)sqlError screenColor:(NSString *)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(NSString *)printColor;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1010,7 +1010,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 "TestProtocol.h"
</span><del>-#import "TestProtocolJSONObjectInternal.h"
</del><ins>+#import "TestProtocolJSONObjectPrivate.h"
</ins><span class="cx"> #import <JavaScriptCore/AugmentableInspectorController.h>
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="lines">@@ -1056,6 +1056,7 @@
</span><span class="cx"> #import "TestProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "TestProtocolEnumConversionHelpers.h"
</span><ins>+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -881,7 +881,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "TestProtocolArrayConversionHelpers.h"
</del><ins>+#import "RWIProtocolArrayConversionHelpers.h"
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -1003,7 +1003,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebInspector/TestProtocolJSONObject.h>
</del><ins>+#import <WebInspector/RWIProtocolJSONObject.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @class TestProtocolNetwork2NetworkError;
</span><span class="lines">@@ -1012,7 +1012,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolNetwork2NetworkError : ProtocolJSONObject
</del><ins>+@interface TestProtocolNetwork2NetworkError : RWIProtocolJSONObject
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><span class="cx"> /* required */ @property (nonatomic, assign) int code;
</span><span class="lines">@@ -1063,7 +1063,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 "TestProtocol.h"
</span><del>-#import "TestProtocolJSONObjectInternal.h"
</del><ins>+#import "TestProtocolJSONObjectPrivate.h"
</ins><span class="cx"> #import <JavaScriptCore/AugmentableInspectorController.h>
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="lines">@@ -1109,6 +1109,7 @@
</span><span class="cx"> #import "TestProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "TestProtocolEnumConversionHelpers.h"
</span><ins>+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedsametypeiddifferentdomainjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -642,7 +642,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from same-type-id-different-domain.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "TestProtocolArrayConversionHelpers.h"
</del><ins>+#import "RWIProtocolArrayConversionHelpers.h"
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -736,7 +736,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebInspector/TestProtocolJSONObject.h>
</del><ins>+#import <WebInspector/RWIProtocolJSONObject.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -784,7 +784,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 "TestProtocol.h"
</span><del>-#import "TestProtocolJSONObjectInternal.h"
</del><ins>+#import "TestProtocolJSONObjectPrivate.h"
</ins><span class="cx"> #import <JavaScriptCore/AugmentableInspectorController.h>
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="lines">@@ -828,6 +828,7 @@
</span><span class="cx"> #import "TestProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "TestProtocolEnumConversionHelpers.h"
</span><ins>+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedshadowedoptionaltypesettersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from shadowed-optional-type-setters.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "TestProtocolArrayConversionHelpers.h"
</del><ins>+#import "RWIProtocolArrayConversionHelpers.h"
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -825,7 +825,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebInspector/TestProtocolJSONObject.h>
</del><ins>+#import <WebInspector/RWIProtocolJSONObject.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @class TestProtocolRuntimeKeyPath;
</span><span class="lines">@@ -839,7 +839,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolRuntimeKeyPath : ProtocolJSONObject
</del><ins>+@interface TestProtocolRuntimeKeyPath : RWIProtocolJSONObject
</ins><span class="cx"> - (instancetype)initWithType:(TestProtocolRuntimeKeyPathType)type;
</span><span class="cx"> /* required */ @property (nonatomic, assign) TestProtocolRuntimeKeyPathType type;
</span><span class="cx"> /* optional */ @property (nonatomic, copy) NSString *string;
</span><span class="lines">@@ -885,7 +885,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 "TestProtocol.h"
</span><del>-#import "TestProtocolJSONObjectInternal.h"
</del><ins>+#import "TestProtocolJSONObjectPrivate.h"
</ins><span class="cx"> #import <JavaScriptCore/AugmentableInspectorController.h>
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="lines">@@ -929,6 +929,7 @@
</span><span class="cx"> #import "TestProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "TestProtocolEnumConversionHelpers.h"
</span><ins>+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationaliasedprimitivetypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -633,7 +633,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-aliased-primitive-type.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "TestProtocolArrayConversionHelpers.h"
</del><ins>+#import "RWIProtocolArrayConversionHelpers.h"
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -723,7 +723,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebInspector/TestProtocolJSONObject.h>
</del><ins>+#import <WebInspector/RWIProtocolJSONObject.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -771,7 +771,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 "TestProtocol.h"
</span><del>-#import "TestProtocolJSONObjectInternal.h"
</del><ins>+#import "TestProtocolJSONObjectPrivate.h"
</ins><span class="cx"> #import <JavaScriptCore/AugmentableInspectorController.h>
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="lines">@@ -815,6 +815,7 @@
</span><span class="cx"> #import "TestProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "TestProtocolEnumConversionHelpers.h"
</span><ins>+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationarraytypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -665,7 +665,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-array-type.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "TestProtocolArrayConversionHelpers.h"
</del><ins>+#import "RWIProtocolArrayConversionHelpers.h"
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -783,7 +783,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebInspector/TestProtocolJSONObject.h>
</del><ins>+#import <WebInspector/RWIProtocolJSONObject.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -836,7 +836,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 "TestProtocol.h"
</span><del>-#import "TestProtocolJSONObjectInternal.h"
</del><ins>+#import "TestProtocolJSONObjectPrivate.h"
</ins><span class="cx"> #import <JavaScriptCore/AugmentableInspectorController.h>
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="lines">@@ -880,6 +880,7 @@
</span><span class="cx"> #import "TestProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "TestProtocolEnumConversionHelpers.h"
</span><ins>+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationenumtypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -662,7 +662,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-enum-type.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "TestProtocolArrayConversionHelpers.h"
</del><ins>+#import "RWIProtocolArrayConversionHelpers.h"
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -809,7 +809,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebInspector/TestProtocolJSONObject.h>
</del><ins>+#import <WebInspector/RWIProtocolJSONObject.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -870,7 +870,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 "TestProtocol.h"
</span><del>-#import "TestProtocolJSONObjectInternal.h"
</del><ins>+#import "TestProtocolJSONObjectPrivate.h"
</ins><span class="cx"> #import <JavaScriptCore/AugmentableInspectorController.h>
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="lines">@@ -914,6 +914,7 @@
</span><span class="cx"> #import "TestProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "TestProtocolEnumConversionHelpers.h"
</span><ins>+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -1102,7 +1102,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-object-type.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "TestProtocolArrayConversionHelpers.h"
</del><ins>+#import "RWIProtocolArrayConversionHelpers.h"
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -1196,7 +1196,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebInspector/TestProtocolJSONObject.h>
</del><ins>+#import <WebInspector/RWIProtocolJSONObject.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @class TestProtocolDatabaseError;
</span><span class="lines">@@ -1210,37 +1210,37 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolDatabaseError : ProtocolJSONObject
</del><ins>+@interface TestProtocolDatabaseError : RWIProtocolJSONObject
</ins><span class="cx"> - (instancetype)initWithMessage:(NSString *)message code:(int)code;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *message;
</span><span class="cx"> /* required */ @property (nonatomic, assign) int code;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolDatabaseOptionalParameterBundle : ProtocolJSONObject
</del><ins>+@interface TestProtocolDatabaseOptionalParameterBundle : RWIProtocolJSONObject
</ins><span class="cx"> /* optional */ @property (nonatomic, copy) NSArray/*<NSString>*/ *columnNames;
</span><span class="cx"> /* optional */ @property (nonatomic, copy) NSString *notes;
</span><span class="cx"> /* optional */ @property (nonatomic, assign) double timestamp;
</span><del>-/* optional */ @property (nonatomic, retain) ProtocolJSONObject *values;
-/* optional */ @property (nonatomic, retain) ProtocolJSONObject *payload;
</del><ins>+/* optional */ @property (nonatomic, retain) RWIProtocolJSONObject *values;
+/* optional */ @property (nonatomic, retain) RWIProtocolJSONObject *payload;
</ins><span class="cx"> /* optional */ @property (nonatomic, retain) TestProtocolDatabaseError *error;
</span><span class="cx"> /* optional */ @property (nonatomic, copy) NSArray/*<TestProtocolDatabaseError>*/ *errorList;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolDatabaseParameterBundle : ProtocolJSONObject
-- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error errorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList;
</del><ins>+@interface TestProtocolDatabaseParameterBundle : RWIProtocolJSONObject
+- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error errorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList;
</ins><span class="cx"> /* required */ @property (nonatomic, copy) NSArray/*<NSString>*/ *columnNames;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *notes;
</span><span class="cx"> /* required */ @property (nonatomic, assign) double timestamp;
</span><del>-/* required */ @property (nonatomic, retain) ProtocolJSONObject *values;
-/* required */ @property (nonatomic, retain) ProtocolJSONObject *payload;
</del><ins>+/* required */ @property (nonatomic, retain) RWIProtocolJSONObject *values;
+/* required */ @property (nonatomic, retain) RWIProtocolJSONObject *payload;
</ins><span class="cx"> /* required */ @property (nonatomic, retain) TestProtocolDatabaseError *error;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSArray/*<TestProtocolDatabaseError>*/ *errorList;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolDatabaseObjectWithPropertyNameConflicts : ProtocolJSONObject
</del><ins>+@interface TestProtocolDatabaseObjectWithPropertyNameConflicts : RWIProtocolJSONObject
</ins><span class="cx"> - (instancetype)initWithInteger:(NSString *)integer array:(NSString *)array string:(NSString *)string value:(NSString *)value object:(NSString *)object;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *integer;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *array;
</span><span class="lines">@@ -1250,17 +1250,17 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolDatabaseDummyObject : ProtocolJSONObject
</del><ins>+@interface TestProtocolDatabaseDummyObject : RWIProtocolJSONObject
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolTestParameterBundle : ProtocolJSONObject
-- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error;
</del><ins>+@interface TestProtocolTestParameterBundle : RWIProtocolJSONObject
+- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error;
</ins><span class="cx"> /* required */ @property (nonatomic, copy) NSArray/*<NSString>*/ *columnNames;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *notes;
</span><span class="cx"> /* required */ @property (nonatomic, assign) double timestamp;
</span><del>-/* required */ @property (nonatomic, retain) ProtocolJSONObject *values;
-/* required */ @property (nonatomic, retain) ProtocolJSONObject *payload;
</del><ins>+/* required */ @property (nonatomic, retain) RWIProtocolJSONObject *values;
+/* required */ @property (nonatomic, retain) RWIProtocolJSONObject *payload;
</ins><span class="cx"> /* required */ @property (nonatomic, retain) TestProtocolDatabaseError *error;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -1303,7 +1303,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 "TestProtocol.h"
</span><del>-#import "TestProtocolJSONObjectInternal.h"
</del><ins>+#import "TestProtocolJSONObjectPrivate.h"
</ins><span class="cx"> #import <JavaScriptCore/AugmentableInspectorController.h>
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="lines">@@ -1347,6 +1347,7 @@
</span><span class="cx"> #import "TestProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "TestProtocolEnumConversionHelpers.h"
</span><ins>+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span><span class="lines">@@ -1423,24 +1424,24 @@
</span><span class="cx"> return [super doubleForKey:@"timestamp"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setValues:(ProtocolJSONObject *)values
</del><ins>+- (void)setValues:(RWIProtocolJSONObject *)values
</ins><span class="cx"> {
</span><span class="cx"> [super setObject:values forKey:@"values"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (ProtocolJSONObject *)values
</del><ins>+- (RWIProtocolJSONObject *)values
</ins><span class="cx"> {
</span><del>- return (ProtocolJSONObject *)[super objectForKey:@"values"];
</del><ins>+ return (RWIProtocolJSONObject *)[super objectForKey:@"values"];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setPayload:(ProtocolJSONObject *)payload
</del><ins>+- (void)setPayload:(RWIProtocolJSONObject *)payload
</ins><span class="cx"> {
</span><span class="cx"> [super setObject:payload forKey:@"payload"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (ProtocolJSONObject *)payload
</del><ins>+- (RWIProtocolJSONObject *)payload
</ins><span class="cx"> {
</span><del>- return (ProtocolJSONObject *)[super objectForKey:@"payload"];
</del><ins>+ return (RWIProtocolJSONObject *)[super objectForKey:@"payload"];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setError:(TestProtocolDatabaseError *)error
</span><span class="lines">@@ -1468,7 +1469,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolDatabaseParameterBundle
</span><span class="cx">
</span><del>-- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error errorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList;
</del><ins>+- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error errorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList;
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -1523,24 +1524,24 @@
</span><span class="cx"> return [super doubleForKey:@"timestamp"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setValues:(ProtocolJSONObject *)values
</del><ins>+- (void)setValues:(RWIProtocolJSONObject *)values
</ins><span class="cx"> {
</span><span class="cx"> [super setObject:values forKey:@"values"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (ProtocolJSONObject *)values
</del><ins>+- (RWIProtocolJSONObject *)values
</ins><span class="cx"> {
</span><del>- return (ProtocolJSONObject *)[super objectForKey:@"values"];
</del><ins>+ return (RWIProtocolJSONObject *)[super objectForKey:@"values"];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setPayload:(ProtocolJSONObject *)payload
</del><ins>+- (void)setPayload:(RWIProtocolJSONObject *)payload
</ins><span class="cx"> {
</span><span class="cx"> [super setObject:payload forKey:@"payload"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (ProtocolJSONObject *)payload
</del><ins>+- (RWIProtocolJSONObject *)payload
</ins><span class="cx"> {
</span><del>- return (ProtocolJSONObject *)[super objectForKey:@"payload"];
</del><ins>+ return (RWIProtocolJSONObject *)[super objectForKey:@"payload"];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setError:(TestProtocolDatabaseError *)error
</span><span class="lines">@@ -1648,7 +1649,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation TestProtocolTestParameterBundle
</span><span class="cx">
</span><del>-- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(ProtocolJSONObject *)values payload:(ProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error;
</del><ins>+- (instancetype)initWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload error:(TestProtocolDatabaseError *)error;
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -1700,24 +1701,24 @@
</span><span class="cx"> return [super doubleForKey:@"timestamp"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setValues:(ProtocolJSONObject *)values
</del><ins>+- (void)setValues:(RWIProtocolJSONObject *)values
</ins><span class="cx"> {
</span><span class="cx"> [super setObject:values forKey:@"values"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (ProtocolJSONObject *)values
</del><ins>+- (RWIProtocolJSONObject *)values
</ins><span class="cx"> {
</span><del>- return (ProtocolJSONObject *)[super objectForKey:@"values"];
</del><ins>+ return (RWIProtocolJSONObject *)[super objectForKey:@"values"];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setPayload:(ProtocolJSONObject *)payload
</del><ins>+- (void)setPayload:(RWIProtocolJSONObject *)payload
</ins><span class="cx"> {
</span><span class="cx"> [super setObject:payload forKey:@"payload"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (ProtocolJSONObject *)payload
</del><ins>+- (RWIProtocolJSONObject *)payload
</ins><span class="cx"> {
</span><del>- return (ProtocolJSONObject *)[super objectForKey:@"payload"];
</del><ins>+ return (RWIProtocolJSONObject *)[super objectForKey:@"payload"];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setError:(TestProtocolDatabaseError *)error
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (197012 => 197013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-02-24 05:15:44 UTC (rev 197012)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-02-24 06:43:07 UTC (rev 197013)
</span><span class="lines">@@ -989,7 +989,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-requiring-runtime-casts.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "TestProtocolArrayConversionHelpers.h"
</del><ins>+#import "RWIProtocolArrayConversionHelpers.h"
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -1136,7 +1136,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebInspector/TestProtocolJSONObject.h>
</del><ins>+#import <WebInspector/RWIProtocolJSONObject.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @class TestProtocolTestTypeNeedingCast;
</span><span class="lines">@@ -1160,7 +1160,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolTestTypeNeedingCast : ProtocolJSONObject
</del><ins>+@interface TestProtocolTestTypeNeedingCast : RWIProtocolJSONObject
</ins><span class="cx"> - (instancetype)initWithString:(NSString *)string number:(int)number animals:(TestProtocolTestCastedAnimals)animals identifier:(int)identifier tree:(TestProtocolTestRecursiveObject1 *)tree;
</span><span class="cx"> /* required */ @property (nonatomic, copy) NSString *string;
</span><span class="cx"> /* required */ @property (nonatomic, assign) int number;
</span><span class="lines">@@ -1170,12 +1170,12 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolTestRecursiveObject1 : ProtocolJSONObject
</del><ins>+@interface TestProtocolTestRecursiveObject1 : RWIProtocolJSONObject
</ins><span class="cx"> /* optional */ @property (nonatomic, retain) TestProtocolTestRecursiveObject2 *obj;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><del>-@interface TestProtocolTestRecursiveObject2 : ProtocolJSONObject
</del><ins>+@interface TestProtocolTestRecursiveObject2 : RWIProtocolJSONObject
</ins><span class="cx"> /* optional */ @property (nonatomic, retain) TestProtocolTestRecursiveObject1 *obj;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -1218,7 +1218,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 "TestProtocol.h"
</span><del>-#import "TestProtocolJSONObjectInternal.h"
</del><ins>+#import "TestProtocolJSONObjectPrivate.h"
</ins><span class="cx"> #import <JavaScriptCore/AugmentableInspectorController.h>
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="lines">@@ -1262,6 +1262,7 @@
</span><span class="cx"> #import "TestProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "TestProtocolEnumConversionHelpers.h"
</span><ins>+#import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>