<!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>[204255] 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/204255">204255</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-08-08 09:43:39 -0700 (Mon, 08 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: clean up prefixing of Automation protocol generated files
https://bugs.webkit.org/show_bug.cgi?id=160635
<rdar://problem/27735327>
Reviewed by Timothy Hatcher.
Introduce different settings for the 'protocol group' name for C++ vs. Objective-C.
Use 'WD' as the prefix for generated Objective-C frontend dispatchers and helpers.
Continue using 'Automation' as the prefix for generated C++ backend dispatchers.
* inspector/scripts/codegen/cpp_generator.py:
(CppGenerator.protocol_name):
* inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py:
(ObjCProtocolTypeConversionsImplementationGenerator.generate_output):
(ObjCProtocolTypeConversionsImplementationGenerator._generate_type_factory_category_interface):
(ObjCProtocolTypeConversionsImplementationGenerator._generate_type_factory_category_implementation):
Adjust the class name. Generate one category per protocol domain to keep it easy to read.
* inspector/scripts/codegen/models.py:
* inspector/scripts/codegen/objc_generator.py:
(ObjCGenerator.protocol_name):
* 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 test results.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegencpp_generatorpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_type_conversions_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generatorpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.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 (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2016-08-08 Brian Burg <bburg@apple.com>
+
+ Web Inspector: clean up prefixing of Automation protocol generated files
+ https://bugs.webkit.org/show_bug.cgi?id=160635
+ <rdar://problem/27735327>
+
+ Reviewed by Timothy Hatcher.
+
+ Introduce different settings for the 'protocol group' name for C++ vs. Objective-C.
+
+ Use 'WD' as the prefix for generated Objective-C frontend dispatchers and helpers.
+ Continue using 'Automation' as the prefix for generated C++ backend dispatchers.
+
+ * inspector/scripts/codegen/cpp_generator.py:
+ (CppGenerator.protocol_name):
+ * inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py:
+ (ObjCProtocolTypeConversionsImplementationGenerator.generate_output):
+ (ObjCProtocolTypeConversionsImplementationGenerator._generate_type_factory_category_interface):
+ (ObjCProtocolTypeConversionsImplementationGenerator._generate_type_factory_category_implementation):
+ Adjust the class name. Generate one category per protocol domain to keep it easy to read.
+
+ * inspector/scripts/codegen/models.py:
+ * inspector/scripts/codegen/objc_generator.py:
+ (ObjCGenerator.protocol_name):
+
+ * 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 test results.
+
</ins><span class="cx"> 2016-08-07 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Module namespace object should not allow unset IC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegencpp_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> Generator.__init__(self, model, input_filepath)
</span><span class="cx">
</span><span class="cx"> def protocol_name(self):
</span><del>- return self.model().framework.setting('protocol_group', '')
</del><ins>+ return self.model().framework.setting('cpp_protocol_group', '')
</ins><span class="cx">
</span><span class="cx"> def helpers_namespace(self):
</span><span class="cx"> return '%sHelpers' % self.protocol_name()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_type_conversions_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> secondary_headers = [
</span><span class="cx"> '"%s.h"' % self.protocol_name(),
</span><del>- '"%sTypeConversions.h"' % ObjCGenerator.OBJC_SHARED_PREFIX,
</del><ins>+ '"%sTypeParser.h"' % self.protocol_name(),
</ins><span class="cx"> Generator.string_for_file_include('%sJSONObjectPrivate.h' % ObjCGenerator.OBJC_STATIC_PREFIX, Frameworks.WebInspector, self.model().framework),
</span><span class="cx"> ]
</span><span class="cx"> secondary_headers.sort()
</span><span class="lines">@@ -76,13 +76,16 @@
</span><span class="cx">
</span><span class="cx"> def _generate_type_factory_category_interface(self, domains):
</span><span class="cx"> lines = []
</span><del>- lines.append('@interface ProtocolTypeConversions (%s)' % self.protocol_name())
- lines.append('')
</del><span class="cx"> for domain in domains:
</span><ins>+ lines.append('@interface %sTypeConversions (%sDomain)' % (self.protocol_name(), domain.domain_name))
+ lines.append('')
+
</ins><span class="cx"> for declaration in domain.type_declarations:
</span><span class="cx"> lines.append(self._generate_type_factory_method_declaration(domain, declaration))
</span><ins>+
</ins><span class="cx"> add_newline(lines)
</span><del>- lines.append('@end')
</del><ins>+ lines.append('@end')
+
</ins><span class="cx"> return '\n'.join(lines)
</span><span class="cx">
</span><span class="cx"> def _generate_type_factory_method_declaration(self, domain, declaration):
</span><span class="lines">@@ -97,13 +100,14 @@
</span><span class="cx">
</span><span class="cx"> def _generate_type_factory_category_implementation(self, domains):
</span><span class="cx"> lines = []
</span><del>- lines.append('@implementation ProtocolTypeConversions (%s)' % self.protocol_name())
- lines.append('')
</del><span class="cx"> for domain in domains:
</span><ins>+ lines.append('@implementation %sTypeConversions (%sDomain)' % (self.protocol_name(), domain.domain_name))
+ lines.append('')
+
</ins><span class="cx"> for declaration in domain.type_declarations:
</span><span class="cx"> lines.append(self._generate_type_factory_method_implementation(domain, declaration))
</span><span class="cx"> add_newline(lines)
</span><del>- lines.append('@end')
</del><ins>+ lines.append('@end')
</ins><span class="cx"> return '\n'.join(lines)
</span><span class="cx">
</span><span class="cx"> def _generate_type_factory_method_implementation(self, domain, declaration):
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -42,21 +42,24 @@
</span><span class="cx"> "Global": {
</span><span class="cx"> },
</span><span class="cx"> "JavaScriptCore": {
</span><del>- "protocol_group": "Inspector",
</del><ins>+ "cpp_protocol_group": "Inspector",
</ins><span class="cx"> "export_macro": "JS_EXPORT_PRIVATE",
</span><span class="cx"> "alternate_dispatchers": True,
</span><span class="cx"> },
</span><span class="cx"> "WebKit": {
</span><del>- "protocol_group": "Automation",
</del><ins>+ "cpp_protocol_group": "Automation",
+ "objc_protocol_group": "WD",
+ "objc_prefix": "WD",
</ins><span class="cx"> },
</span><span class="cx"> "WebInspector": {
</span><del>- "protocol_group": "RWI",
</del><ins>+ "objc_protocol_group": "RWI",
</ins><span class="cx"> "objc_prefix": "RWI",
</span><span class="cx"> },
</span><span class="cx"> # Used for code generator tests.
</span><span class="cx"> "Test": {
</span><span class="cx"> "alternate_dispatchers": True,
</span><del>- "protocol_group": "Test",
</del><ins>+ "cpp_protocol_group": "Test",
+ "objc_protocol_group": "Test",
</ins><span class="cx"> "objc_prefix": "Test",
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">
</span><span class="cx"> # The 'protocol name' is used to prefix filenames for a protocol group (a set of domains generated together).
</span><span class="cx"> def protocol_name(self):
</span><del>- protocol_group = self.model().framework.setting('protocol_group', '')
</del><ins>+ protocol_group = self.model().framework.setting('objc_protocol_group', '')
</ins><span class="cx"> return '%s%s' % (protocol_group, ObjCGenerator.OBJC_SHARED_PREFIX)
</span><span class="cx">
</span><span class="cx"> # The 'ObjC prefix' is used to prefix Objective-C class names and enums with a
</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 (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -1604,13 +1604,13 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TestProtocolTypeConversions.h"
</span><span class="cx">
</span><del>-#import "ProtocolTypeConversions.h"
</del><span class="cx"> #import "TestProtocol.h"
</span><ins>+#import "TestProtocolTypeParser.h"
</ins><span class="cx"> #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-@interface ProtocolTypeConversions (TestProtocol)
</del><ins>+@interface TestProtocolTypeConversions (DatabaseDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload;
</span><span class="cx"> + (void)_parsePrimaryColors:(NSNumber **)outValue fromPayload:(id)payload;
</span><span class="lines">@@ -1619,7 +1619,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation ProtocolTypeConversions (TestProtocol)
</del><ins>+@implementation TestProtocolTypeConversions (DatabaseDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload
</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 (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -1459,13 +1459,13 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TestProtocolTypeConversions.h"
</span><span class="cx">
</span><del>-#import "ProtocolTypeConversions.h"
</del><span class="cx"> #import "TestProtocol.h"
</span><ins>+#import "TestProtocolTypeParser.h"
</ins><span class="cx"> #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-@interface ProtocolTypeConversions (TestProtocol)
</del><ins>+@interface TestProtocolTypeConversions (DatabaseDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload;
</span><span class="cx"> + (void)_parsePrimaryColors:(NSNumber **)outValue fromPayload:(id)payload;
</span><span class="lines">@@ -1474,7 +1474,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation ProtocolTypeConversions (TestProtocol)
</del><ins>+@implementation TestProtocolTypeConversions (DatabaseDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload
</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 (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -1310,20 +1310,29 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TestProtocolTypeConversions.h"
</span><span class="cx">
</span><del>-#import "ProtocolTypeConversions.h"
</del><span class="cx"> #import "TestProtocol.h"
</span><ins>+#import "TestProtocolTypeParser.h"
</ins><span class="cx"> #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-@interface ProtocolTypeConversions (TestProtocol)
</del><ins>+@interface TestProtocolTypeConversions (Network1Domain)
</ins><span class="cx">
</span><ins>+@end
+@interface TestProtocolTypeConversions (Network2Domain)
+
</ins><span class="cx"> + (void)_parseLoaderId:(NSString **)outValue fromPayload:(id)payload;
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+@interface TestProtocolTypeConversions (Network3Domain)
</ins><span class="cx">
</span><del>-@implementation ProtocolTypeConversions (TestProtocol)
</del><ins>+@end
</ins><span class="cx">
</span><ins>+@implementation TestProtocolTypeConversions (Network1Domain)
+
+@end
+@implementation TestProtocolTypeConversions (Network2Domain)
+
</ins><span class="cx"> + (void)_parseLoaderId:(NSString **)outValue fromPayload:(id)payload
</span><span class="cx"> {
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
</span><span class="lines">@@ -1331,8 +1340,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+@implementation TestProtocolTypeConversions (Network3Domain)
</ins><span class="cx">
</span><ins>+@end
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> ### End File: TestProtocolTypeConversions.mm
</span><span class="cx">
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedenumvaluesjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -1185,20 +1185,26 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TestProtocolTypeConversions.h"
</span><span class="cx">
</span><del>-#import "ProtocolTypeConversions.h"
</del><span class="cx"> #import "TestProtocol.h"
</span><ins>+#import "TestProtocolTypeParser.h"
</ins><span class="cx"> #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-@interface ProtocolTypeConversions (TestProtocol)
</del><ins>+@interface TestProtocolTypeConversions (TypeDomainDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseTypeDomainEnum:(NSNumber **)outValue fromPayload:(id)payload;
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+@interface TestProtocolTypeConversions (CommandDomainDomain)
</ins><span class="cx">
</span><del>-@implementation ProtocolTypeConversions (TestProtocol)
</del><ins>+@end
+@interface TestProtocolTypeConversions (EventDomainDomain)
</ins><span class="cx">
</span><ins>+@end
+
+@implementation TestProtocolTypeConversions (TypeDomainDomain)
+
</ins><span class="cx"> + (void)_parseTypeDomainEnum:(NSNumber **)outValue fromPayload:(id)payload
</span><span class="cx"> {
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
</span><span class="lines">@@ -1206,8 +1212,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+@implementation TestProtocolTypeConversions (CommandDomainDomain)
</ins><span class="cx">
</span><ins>+@end
+@implementation TestProtocolTypeConversions (EventDomainDomain)
</ins><span class="cx">
</span><ins>+@end
+
+
</ins><span class="cx"> ### End File: TestProtocolTypeConversions.mm
</span><span class="cx">
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</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 (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -1033,13 +1033,13 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TestProtocolTypeConversions.h"
</span><span class="cx">
</span><del>-#import "ProtocolTypeConversions.h"
</del><span class="cx"> #import "TestProtocol.h"
</span><ins>+#import "TestProtocolTypeParser.h"
</ins><span class="cx"> #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-@interface ProtocolTypeConversions (TestProtocol)
</del><ins>+@interface TestProtocolTypeConversions (DatabaseDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseDatabaseId:(NSString **)outValue fromPayload:(id)payload;
</span><span class="cx"> + (void)_parsePrimaryColors:(NSString **)outValue fromPayload:(id)payload;
</span><span class="lines">@@ -1048,7 +1048,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation ProtocolTypeConversions (TestProtocol)
</del><ins>+@implementation TestProtocolTypeConversions (DatabaseDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseDatabaseId:(NSString **)outValue fromPayload:(id)payload
</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 (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -1086,20 +1086,29 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TestProtocolTypeConversions.h"
</span><span class="cx">
</span><del>-#import "ProtocolTypeConversions.h"
</del><span class="cx"> #import "TestProtocol.h"
</span><ins>+#import "TestProtocolTypeParser.h"
</ins><span class="cx"> #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-@interface ProtocolTypeConversions (TestProtocol)
</del><ins>+@interface TestProtocolTypeConversions (Network1Domain)
</ins><span class="cx">
</span><ins>+@end
+@interface TestProtocolTypeConversions (Network2Domain)
+
</ins><span class="cx"> + (void)_parseNetworkError:(TestProtocolNetwork2NetworkError **)outValue fromPayload:(id)payload;
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+@interface TestProtocolTypeConversions (Network3Domain)
</ins><span class="cx">
</span><del>-@implementation ProtocolTypeConversions (TestProtocol)
</del><ins>+@end
</ins><span class="cx">
</span><ins>+@implementation TestProtocolTypeConversions (Network1Domain)
+
+@end
+@implementation TestProtocolTypeConversions (Network2Domain)
+
</ins><span class="cx"> + (void)_parseNetworkError:(TestProtocolNetwork2NetworkError **)outValue fromPayload:(id)payload
</span><span class="cx"> {
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSDictionary class]);
</span><span class="lines">@@ -1107,8 +1116,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+@implementation TestProtocolTypeConversions (Network3Domain)
</ins><span class="cx">
</span><ins>+@end
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> ### End File: TestProtocolTypeConversions.mm
</span><span class="cx">
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</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 (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -803,21 +803,24 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TestProtocolTypeConversions.h"
</span><span class="cx">
</span><del>-#import "ProtocolTypeConversions.h"
</del><span class="cx"> #import "TestProtocol.h"
</span><ins>+#import "TestProtocolTypeParser.h"
</ins><span class="cx"> #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-@interface ProtocolTypeConversions (TestProtocol)
</del><ins>+@interface TestProtocolTypeConversions (RuntimeDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseRemoteObjectId:(NSString **)outValue fromPayload:(id)payload;
</span><span class="cx">
</span><ins>+@end
+@interface TestProtocolTypeConversions (Runtime2Domain)
+
</ins><span class="cx"> + (void)_parseRemoteObjectId:(NSString **)outValue fromPayload:(id)payload;
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation ProtocolTypeConversions (TestProtocol)
</del><ins>+@implementation TestProtocolTypeConversions (RuntimeDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseRemoteObjectId:(NSString **)outValue fromPayload:(id)payload
</span><span class="cx"> {
</span><span class="lines">@@ -825,6 +828,9 @@
</span><span class="cx"> *outValue = (NSString *)payload;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@end
+@implementation TestProtocolTypeConversions (Runtime2Domain)
+
</ins><span class="cx"> + (void)_parseRemoteObjectId:(NSString **)outValue fromPayload:(id)payload
</span><span class="cx"> {
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
</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 (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -956,19 +956,19 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TestProtocolTypeConversions.h"
</span><span class="cx">
</span><del>-#import "ProtocolTypeConversions.h"
</del><span class="cx"> #import "TestProtocol.h"
</span><ins>+#import "TestProtocolTypeParser.h"
</ins><span class="cx"> #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-@interface ProtocolTypeConversions (TestProtocol)
</del><ins>+@interface TestProtocolTypeConversions (RuntimeDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseKeyPath:(TestProtocolRuntimeKeyPath **)outValue fromPayload:(id)payload;
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation ProtocolTypeConversions (TestProtocol)
</del><ins>+@implementation TestProtocolTypeConversions (RuntimeDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseKeyPath:(TestProtocolRuntimeKeyPath **)outValue fromPayload:(id)payload
</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 (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -790,19 +790,19 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TestProtocolTypeConversions.h"
</span><span class="cx">
</span><del>-#import "ProtocolTypeConversions.h"
</del><span class="cx"> #import "TestProtocol.h"
</span><ins>+#import "TestProtocolTypeParser.h"
</ins><span class="cx"> #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-@interface ProtocolTypeConversions (TestProtocol)
</del><ins>+@interface TestProtocolTypeConversions (RuntimeDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseRemoteObjectId:(NSNumber **)outValue fromPayload:(id)payload;
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation ProtocolTypeConversions (TestProtocol)
</del><ins>+@implementation TestProtocolTypeConversions (RuntimeDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseRemoteObjectId:(NSNumber **)outValue fromPayload:(id)payload
</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 (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -905,17 +905,20 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TestProtocolTypeConversions.h"
</span><span class="cx">
</span><del>-#import "ProtocolTypeConversions.h"
</del><span class="cx"> #import "TestProtocol.h"
</span><ins>+#import "TestProtocolTypeParser.h"
</ins><span class="cx"> #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-@interface ProtocolTypeConversions (TestProtocol)
</del><ins>+@interface TestProtocolTypeConversions (DebuggerDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseBreakpointId:(NSNumber **)outValue fromPayload:(id)payload;
</span><span class="cx"> + (void)_parseReason:(NSNumber **)outValue fromPayload:(id)payload;
</span><span class="cx">
</span><ins>+@end
+@interface TestProtocolTypeConversions (RuntimeDomain)
+
</ins><span class="cx"> + (void)_parseObjectId:(NSNumber **)outValue fromPayload:(id)payload;
</span><span class="cx"> + (void)_parseLuckyNumbers:(NSArray/*<NSNumber>*/ **)outValue fromPayload:(id)payload;
</span><span class="cx"> + (void)_parseBabyNames:(NSArray/*<NSString>*/ **)outValue fromPayload:(id)payload;
</span><span class="lines">@@ -925,7 +928,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation ProtocolTypeConversions (TestProtocol)
</del><ins>+@implementation TestProtocolTypeConversions (DebuggerDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseBreakpointId:(NSNumber **)outValue fromPayload:(id)payload
</span><span class="cx"> {
</span><span class="lines">@@ -939,6 +942,9 @@
</span><span class="cx"> *outValue = @(Inspector::fromProtocolString<TestProtocolDebuggerReason>(payload));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@end
+@implementation TestProtocolTypeConversions (RuntimeDomain)
+
</ins><span class="cx"> + (void)_parseObjectId:(NSNumber **)outValue fromPayload:(id)payload
</span><span class="cx"> {
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSNumber class]);
</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 (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -958,13 +958,13 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TestProtocolTypeConversions.h"
</span><span class="cx">
</span><del>-#import "ProtocolTypeConversions.h"
</del><span class="cx"> #import "TestProtocol.h"
</span><ins>+#import "TestProtocolTypeParser.h"
</ins><span class="cx"> #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-@interface ProtocolTypeConversions (TestProtocol)
</del><ins>+@interface TestProtocolTypeConversions (RuntimeDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseFarmAnimals:(NSNumber **)outValue fromPayload:(id)payload;
</span><span class="cx"> + (void)_parseTwoLeggedAnimals:(NSNumber **)outValue fromPayload:(id)payload;
</span><span class="lines">@@ -971,7 +971,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation ProtocolTypeConversions (TestProtocol)
</del><ins>+@implementation TestProtocolTypeConversions (RuntimeDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseFarmAnimals:(NSNumber **)outValue fromPayload:(id)payload
</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 (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -1334,13 +1334,13 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TestProtocolTypeConversions.h"
</span><span class="cx">
</span><del>-#import "ProtocolTypeConversions.h"
</del><span class="cx"> #import "TestProtocol.h"
</span><ins>+#import "TestProtocolTypeParser.h"
</ins><span class="cx"> #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-@interface ProtocolTypeConversions (TestProtocol)
</del><ins>+@interface TestProtocolTypeConversions (DatabaseDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseError:(TestProtocolDatabaseError **)outValue fromPayload:(id)payload;
</span><span class="cx"> + (void)_parseErrorList:(NSArray/*<TestProtocolDatabaseError>*/ **)outValue fromPayload:(id)payload;
</span><span class="lines">@@ -1349,11 +1349,14 @@
</span><span class="cx"> + (void)_parseObjectWithPropertyNameConflicts:(TestProtocolDatabaseObjectWithPropertyNameConflicts **)outValue fromPayload:(id)payload;
</span><span class="cx"> + (void)_parseDummyObject:(TestProtocolDatabaseDummyObject **)outValue fromPayload:(id)payload;
</span><span class="cx">
</span><ins>+@end
+@interface TestProtocolTypeConversions (TestDomain)
+
</ins><span class="cx"> + (void)_parseParameterBundle:(TestProtocolTestParameterBundle **)outValue fromPayload:(id)payload;
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation ProtocolTypeConversions (TestProtocol)
</del><ins>+@implementation TestProtocolTypeConversions (DatabaseDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseError:(TestProtocolDatabaseError **)outValue fromPayload:(id)payload
</span><span class="cx"> {
</span><span class="lines">@@ -1391,6 +1394,9 @@
</span><span class="cx"> *outValue = [[TestProtocolDatabaseDummyObject alloc] initWithPayload:payload];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@end
+@implementation TestProtocolTypeConversions (TestDomain)
+
</ins><span class="cx"> + (void)_parseParameterBundle:(TestProtocolTestParameterBundle **)outValue fromPayload:(id)payload
</span><span class="cx"> {
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSDictionary class]);
</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 (204254 => 204255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-08-08 16:35:30 UTC (rev 204254)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-08-08 16:43:39 UTC (rev 204255)
</span><span class="lines">@@ -1312,13 +1312,13 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TestProtocolTypeConversions.h"
</span><span class="cx">
</span><del>-#import "ProtocolTypeConversions.h"
</del><span class="cx"> #import "TestProtocol.h"
</span><ins>+#import "TestProtocolTypeParser.h"
</ins><span class="cx"> #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-@interface ProtocolTypeConversions (TestProtocol)
</del><ins>+@interface TestProtocolTypeConversions (TestDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseTypeNeedingCast:(TestProtocolTestTypeNeedingCast **)outValue fromPayload:(id)payload;
</span><span class="cx"> + (void)_parseCastedObjectId:(NSNumber **)outValue fromPayload:(id)payload;
</span><span class="lines">@@ -1330,7 +1330,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation ProtocolTypeConversions (TestProtocol)
</del><ins>+@implementation TestProtocolTypeConversions (TestDomain)
</ins><span class="cx">
</span><span class="cx"> + (void)_parseTypeNeedingCast:(TestProtocolTestTypeNeedingCast **)outValue fromPayload:(id)payload
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>