<!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>[198752] 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/198752">198752</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-03-28 11:21:08 -0700 (Mon, 28 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: protocol generator should generate C++ string-to-enum helper functions
https://bugs.webkit.org/show_bug.cgi?id=155691
<rdar://problem/25258078>
Reviewed by Timothy Hatcher.
There's a lot of code throughout the Inspector agents and automation code
that needs to convert a raw string into a typed protocol enum. Generate
some helpers that do this conversion so clients can move over to using it.
These helpers are necessary for when we eventually switch to calling backend
dispatcher handlers with typed arguments instead of untyped JSON objects.
To correctly generate a conversion function for an anonymous enum, the
generator needs to be able to get the containing object type's declaration.
Since the model's Type object each have only one instance, there is a
one-to-one association between type and its declaration.
* inspector/scripts/codegen/generate_cpp_protocol_types_header.py:
(CppProtocolTypesHeaderGenerator.generate_output):
(CppProtocolTypesHeaderGenerator._generate_forward_declarations):
Clean up this method to use methodcaller to sort types by raw name.
(_generate_declarations_for_enum_conversion_methods):
(_generate_declarations_for_enum_conversion_methods.return_type_with_export_macro):
(_generate_declarations_for_enum_conversion_methods.type_member_is_anonymous_enum_type):
Added. Generates a new section with an unfilled template and specializations of
the template for every named and anonymous enum in every domain. Guards for
domains wrap the forward declarations. This is added to the end of the header
file so that specializations for both types of enums are in the same place.
* inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py:
(CppProtocolTypesImplementationGenerator.generate_output):
(CppProtocolTypesImplementationGenerator._generate_enum_conversion_methods_for_domain):
(CppProtocolTypesImplementationGenerator._generate_enum_conversion_methods_for_domain.type_member_is_anonymous_enum_type):
(CppProtocolTypesImplementationGenerator._generate_enum_conversion_methods_for_domain.generate_conversion_method_body):
Added. Generate a static array of offsets into the enum constant value array.
Then, loop over this array of offsets and do string comparisons against the
provided string and enum constant values at the relevant offsets for this enum.
* inspector/scripts/codegen/generator_templates.py:
(GeneratorTemplates): Update copyright year in generated files.
* inspector/scripts/codegen/models.py:
(AliasedType.__init__):
(EnumType.__init__):
(EnumType.enum_values):
(EnumType.declaration):
(ArrayType.__init__):
(ArrayType.declaration):
(ObjectType.__init__):
(ObjectType.declaration):
(Protocol.resolve_types):
(Protocol.lookup_type_reference):
Pass the type declaration to Type constructors if available. If not,
fill in a placeholder name for the type in the constructor instead of caller.
Rebaseline all the things, mostly for copyright block changes.
* inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
* inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
* inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:
* inspector/scripts/tests/expected/enum-values.json-result:
* inspector/scripts/tests/expected/events-with-optional-parameters.json-result:
* inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
* inspector/scripts/tests/expected/same-type-id-different-domain.json-result:
* inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
* inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:
* inspector/scripts/tests/expected/type-declaration-array-type.json-result:
* inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
* inspector/scripts/tests/expected/type-declaration-object-type.json-result:
* inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerator_templatespy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.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 (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,3 +1,78 @@
</span><ins>+2016-03-28 Brian Burg <bburg@apple.com>
+
+ Web Inspector: protocol generator should generate C++ string-to-enum helper functions
+ https://bugs.webkit.org/show_bug.cgi?id=155691
+ <rdar://problem/25258078>
+
+ Reviewed by Timothy Hatcher.
+
+ There's a lot of code throughout the Inspector agents and automation code
+ that needs to convert a raw string into a typed protocol enum. Generate
+ some helpers that do this conversion so clients can move over to using it.
+
+ These helpers are necessary for when we eventually switch to calling backend
+ dispatcher handlers with typed arguments instead of untyped JSON objects.
+
+ To correctly generate a conversion function for an anonymous enum, the
+ generator needs to be able to get the containing object type's declaration.
+ Since the model's Type object each have only one instance, there is a
+ one-to-one association between type and its declaration.
+
+ * inspector/scripts/codegen/generate_cpp_protocol_types_header.py:
+ (CppProtocolTypesHeaderGenerator.generate_output):
+ (CppProtocolTypesHeaderGenerator._generate_forward_declarations):
+ Clean up this method to use methodcaller to sort types by raw name.
+
+ (_generate_declarations_for_enum_conversion_methods):
+ (_generate_declarations_for_enum_conversion_methods.return_type_with_export_macro):
+ (_generate_declarations_for_enum_conversion_methods.type_member_is_anonymous_enum_type):
+ Added. Generates a new section with an unfilled template and specializations of
+ the template for every named and anonymous enum in every domain. Guards for
+ domains wrap the forward declarations. This is added to the end of the header
+ file so that specializations for both types of enums are in the same place.
+
+ * inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py:
+ (CppProtocolTypesImplementationGenerator.generate_output):
+ (CppProtocolTypesImplementationGenerator._generate_enum_conversion_methods_for_domain):
+ (CppProtocolTypesImplementationGenerator._generate_enum_conversion_methods_for_domain.type_member_is_anonymous_enum_type):
+ (CppProtocolTypesImplementationGenerator._generate_enum_conversion_methods_for_domain.generate_conversion_method_body):
+ Added. Generate a static array of offsets into the enum constant value array.
+ Then, loop over this array of offsets and do string comparisons against the
+ provided string and enum constant values at the relevant offsets for this enum.
+
+ * inspector/scripts/codegen/generator_templates.py:
+ (GeneratorTemplates): Update copyright year in generated files.
+
+ * inspector/scripts/codegen/models.py:
+ (AliasedType.__init__):
+ (EnumType.__init__):
+ (EnumType.enum_values):
+ (EnumType.declaration):
+ (ArrayType.__init__):
+ (ArrayType.declaration):
+ (ObjectType.__init__):
+ (ObjectType.declaration):
+ (Protocol.resolve_types):
+ (Protocol.lookup_type_reference):
+ Pass the type declaration to Type constructors if available. If not,
+ fill in a placeholder name for the type in the constructor instead of caller.
+
+ Rebaseline all the things, mostly for copyright block changes.
+
+ * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
+ * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
+ * inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:
+ * inspector/scripts/tests/expected/enum-values.json-result:
+ * inspector/scripts/tests/expected/events-with-optional-parameters.json-result:
+ * inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
+ * inspector/scripts/tests/expected/same-type-id-different-domain.json-result:
+ * inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
+ * inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-array-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-object-type.json-result:
+ * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
+
</ins><span class="cx"> 2016-03-25 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Misc. JavaScriptCore built-ins cleanups
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> import logging
</span><span class="cx"> import re
</span><span class="cx"> import string
</span><ins>+from operator import methodcaller
</ins><span class="cx"> from string import Template
</span><span class="cx">
</span><span class="cx"> from cpp_generator import CppGenerator
</span><span class="lines">@@ -82,6 +83,7 @@
</span><span class="cx"> builder_sections = map(self._generate_builders_for_domain, domains)
</span><span class="cx"> sections.extend(filter(lambda section: len(section) > 0, builder_sections))
</span><span class="cx"> sections.append(self._generate_forward_declarations_for_binding_traits())
</span><ins>+ sections.append(self._generate_declarations_for_enum_conversion_methods())
</ins><span class="cx"> sections.append('} // namespace Protocol')
</span><span class="cx"> sections.append(Template(CppTemplates.HeaderPostlude).substitute(None, **header_args))
</span><span class="cx"> return "\n\n".join(sections)
</span><span class="lines">@@ -97,18 +99,18 @@
</span><span class="cx"> declaration_types = [decl.type for decl in domain.type_declarations]
</span><span class="cx"> object_types = filter(lambda _type: isinstance(_type, ObjectType), declaration_types)
</span><span class="cx"> enum_types = filter(lambda _type: isinstance(_type, EnumType), declaration_types)
</span><ins>+ sorted(object_types, key=methodcaller('raw_name'))
+ sorted(enum_types, key=methodcaller('raw_name'))
+
</ins><span class="cx"> if len(object_types) + len(enum_types) == 0:
</span><span class="cx"> continue
</span><span class="cx">
</span><span class="cx"> domain_lines = []
</span><span class="cx"> domain_lines.append('namespace %s {' % domain.domain_name)
</span><span class="cx">
</span><del>- object_type_names = [_type.raw_name() for _type in object_types]
- enum_type_names = [_type.raw_name() for _type in enum_types]
-
</del><span class="cx"> # Forward-declare all classes so the type builders won't break if rearranged.
</span><del>- domain_lines.extend('class %s;' % name for name in sorted(object_type_names))
- domain_lines.extend('enum class %s;' % name for name in sorted(enum_type_names))
</del><ins>+ domain_lines.extend('class %s;' % object_type.raw_name() for object_type in object_types)
+ domain_lines.extend('enum class %s;' % enum_type.raw_name() for enum_type in enum_types)
</ins><span class="cx"> domain_lines.append('} // %s' % domain.domain_name)
</span><span class="cx"> sections.append(self.wrap_with_guard_for_domain(domain, '\n'.join(domain_lines)))
</span><span class="cx">
</span><span class="lines">@@ -349,3 +351,51 @@
</span><span class="cx"> lines.append('#endif // !ASSERT_DISABLED')
</span><span class="cx"> lines.append('};')
</span><span class="cx"> return '\n'.join(lines)
</span><ins>+
+ def _generate_declarations_for_enum_conversion_methods(self):
+ sections = []
+ sections.append('\n'.join([
+ 'template<typename ProtocolEnumType>',
+ 'Optional<ProtocolEnumType> parseEnumValueFromString(const String&);',
+ ]))
+
+ def return_type_with_export_macro(cpp_protocol_type):
+ enum_return_type = 'Optional<%s>' % cpp_protocol_type
+ result_terms = [enum_return_type]
+ if export_macro is not None:
+ result_terms[:0] = [export_macro]
+ return ' '.join(result_terms)
+
+ def type_member_is_anonymous_enum_type(type_member):
+ return isinstance(type_member.type, EnumType) and type_member.type.is_anonymous
+
+ for domain in self.domains_to_generate():
+ declaration_types = [decl.type for decl in domain.type_declarations]
+ object_types = filter(lambda _type: isinstance(_type, ObjectType), declaration_types)
+ enum_types = filter(lambda _type: isinstance(_type, EnumType), declaration_types)
+ if len(object_types) + len(enum_types) == 0:
+ continue
+
+ sorted(object_types, key=methodcaller('raw_name'))
+ sorted(enum_types, key=methodcaller('raw_name'))
+
+ domain_lines = []
+ domain_lines.append("// Enums in the '%s' Domain" % domain.domain_name)
+ export_macro = self.model().framework.setting('export_macro', None)
+ for enum_type in enum_types:
+ cpp_protocol_type = CppGenerator.cpp_protocol_type_for_type(enum_type)
+ domain_lines.append('template<>')
+ domain_lines.append('%s parseEnumValueFromString<%s>(const String&);' % (return_type_with_export_macro(cpp_protocol_type), cpp_protocol_type))
+
+ for object_type in object_types:
+ for enum_member in filter(type_member_is_anonymous_enum_type, object_type.members):
+ cpp_protocol_type = CppGenerator.cpp_protocol_type_for_type_member(enum_member, object_type.declaration())
+ domain_lines.append('template<>')
+ domain_lines.append('%s parseEnumValueFromString<%s>(const String&);' % (return_type_with_export_macro(cpp_protocol_type), cpp_protocol_type))
+
+ if len(domain_lines) == 1:
+ continue # No real declarations to emit, just the domain comment. Skip.
+
+ sections.append(self.wrap_with_guard_for_domain(domain, '\n'.join(domain_lines)))
+
+ return '\n\n'.join(sections)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> import logging
</span><span class="cx"> import string
</span><span class="cx"> from string import Template
</span><ins>+from operator import methodcaller
</ins><span class="cx">
</span><span class="cx"> from cpp_generator import CppGenerator
</span><span class="cx"> from cpp_generator_templates import CppGeneratorTemplates as CppTemplates
</span><span class="lines">@@ -48,7 +49,10 @@
</span><span class="cx"> domains = self.domains_to_generate()
</span><span class="cx"> self.calculate_types_requiring_shape_assertions(domains)
</span><span class="cx">
</span><del>- secondary_headers = ['<wtf/text/CString.h>']
</del><ins>+ secondary_headers = [
+ '<wtf/Optional.h>',
+ '<wtf/text/CString.h>',
+ ]
</ins><span class="cx">
</span><span class="cx"> header_args = {
</span><span class="cx"> 'primaryInclude': '"%sProtocolObjects.h"' % self.protocol_name(),
</span><span class="lines">@@ -60,6 +64,8 @@
</span><span class="cx"> sections.append(Template(CppTemplates.ImplementationPrelude).substitute(None, **header_args))
</span><span class="cx"> sections.append('namespace Protocol {')
</span><span class="cx"> sections.append(self._generate_enum_mapping())
</span><ins>+ enum_parser_sections = map(self._generate_enum_conversion_methods_for_domain, domains)
+ sections.extend(filter(lambda section: len(section) > 0, enum_parser_sections))
</ins><span class="cx"> sections.append(self._generate_open_field_names())
</span><span class="cx"> builder_sections = map(self._generate_builders_for_domain, domains)
</span><span class="cx"> sections.extend(filter(lambda section: len(section) > 0, builder_sections))
</span><span class="lines">@@ -81,6 +87,61 @@
</span><span class="cx"> lines.append('}')
</span><span class="cx"> return '\n'.join(lines)
</span><span class="cx">
</span><ins>+ def _generate_enum_conversion_methods_for_domain(self, domain):
+
+ def type_member_is_anonymous_enum_type(type_member):
+ return isinstance(type_member.type, EnumType) and type_member.type.is_anonymous
+
+ def generate_conversion_method_body(enum_type, cpp_protocol_type):
+ body_lines = []
+ body_lines.extend([
+ 'template<>',
+ 'Optional<%s> parseEnumValueFromString<%s>(const String& protocolString)' % (cpp_protocol_type, cpp_protocol_type),
+ '{',
+ ' static const size_t constantValues[] = {',
+ ])
+
+ enum_values = enum_type.enum_values()
+ for enum_value in enum_values:
+ body_lines.append(' (size_t)%s::%s,' % (cpp_protocol_type, Generator.stylized_name_for_enum_value(enum_value)))
+
+ body_lines.extend([
+ ' };',
+ ' for (size_t i = 0; i < %d; ++i)' % len(enum_values),
+ ' if (protocolString == enum_constant_values[constantValues[i]])',
+ ' return (%s)constantValues[i];' % cpp_protocol_type,
+ '',
+ ' return Nullopt;',
+ '}',
+ '',
+ ])
+ return body_lines
+
+ declaration_types = [decl.type for decl in domain.type_declarations]
+ object_types = filter(lambda _type: isinstance(_type, ObjectType), declaration_types)
+ enum_types = filter(lambda _type: isinstance(_type, EnumType), declaration_types)
+ if len(object_types) + len(enum_types) == 0:
+ return ''
+
+ sorted(object_types, key=methodcaller('raw_name'))
+ sorted(enum_types, key=methodcaller('raw_name'))
+
+ lines = []
+ lines.append("// Enums in the '%s' Domain" % domain.domain_name)
+ for enum_type in enum_types:
+ cpp_protocol_type = CppGenerator.cpp_protocol_type_for_type(enum_type)
+ lines.extend(generate_conversion_method_body(enum_type, cpp_protocol_type))
+
+ for object_type in object_types:
+ for enum_member in filter(type_member_is_anonymous_enum_type, object_type.members):
+ cpp_protocol_type = CppGenerator.cpp_protocol_type_for_type_member(enum_member, object_type.declaration())
+ lines.extend(generate_conversion_method_body(enum_member.type, cpp_protocol_type))
+
+ if len(lines) == 1:
+ return '' # No real declarations to emit, just the domain comment.
+
+ return self.wrap_with_guard_for_domain(domain, '\n'.join(lines))
+
</ins><span class="cx"> def _generate_open_field_names(self):
</span><span class="cx"> lines = []
</span><span class="cx"> for domain in self.domains_to_generate():
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerator_templatespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> #!/usr/bin/env python
</span><span class="cx"> #
</span><del>-# Copyright (c) 2014 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (c) 2014 University of Washington. All rights reserved.
</span><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> CopyrightBlock = (
</span><span class="cx"> """/*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -175,8 +175,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class AliasedType(Type):
</span><del>- def __init__(self, name, domain, aliased_type_ref):
- self._name = name
</del><ins>+ def __init__(self, declaration, domain, aliased_type_ref):
+ self._name = declaration.type_name
+ self._declaration = declaration
</ins><span class="cx"> self._domain = domain
</span><span class="cx"> self._aliased_type_ref = aliased_type_ref
</span><span class="cx"> self.aliased_type = None
</span><span class="lines">@@ -205,8 +206,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class EnumType(Type):
</span><del>- def __init__(self, name, domain, values, primitive_type_ref, is_anonymous=False):
- self._name = name
</del><ins>+ def __init__(self, declaration, domain, values, primitive_type_ref, is_anonymous=False):
+ self._name = "(anonymous)" if declaration is None else declaration.type_name
+ self._declaration = declaration
</ins><span class="cx"> self._domain = domain
</span><span class="cx"> self._values = values
</span><span class="cx"> self._primitive_type_ref = primitive_type_ref
</span><span class="lines">@@ -219,11 +221,14 @@
</span><span class="cx"> def is_enum(self):
</span><span class="cx"> return True
</span><span class="cx">
</span><ins>+ def enum_values(self):
+ return self._values
+
</ins><span class="cx"> def type_domain(self):
</span><span class="cx"> return self._domain
</span><span class="cx">
</span><del>- def enum_values(self):
- return self._values
</del><ins>+ def declaration(self):
+ return self._declaration
</ins><span class="cx">
</span><span class="cx"> def qualified_name(self):
</span><span class="cx"> return ".".join([self.type_domain().domain_name, self.raw_name()])
</span><span class="lines">@@ -238,8 +243,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class ArrayType(Type):
</span><del>- def __init__(self, name, element_type_ref, domain):
- self._name = name
</del><ins>+ def __init__(self, declaration, element_type_ref, domain):
+ self._name = None if declaration is None else declaration.type_name
+ self._declaration = declaration
</ins><span class="cx"> self._domain = domain
</span><span class="cx"> self._element_type_ref = element_type_ref
</span><span class="cx"> self.element_type = None
</span><span class="lines">@@ -250,6 +256,9 @@
</span><span class="cx"> else:
</span><span class="cx"> return 'ArrayType[element_type=(unresolved)]'
</span><span class="cx">
</span><ins>+ def declaration(self):
+ return self._declaration
+
</ins><span class="cx"> def type_domain(self):
</span><span class="cx"> return self._domain
</span><span class="cx">
</span><span class="lines">@@ -265,14 +274,18 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class ObjectType(Type):
</span><del>- def __init__(self, name, domain, members):
- self._name = name
</del><ins>+ def __init__(self, declaration, domain):
+ self._name = declaration.type_name
+ self._declaration = declaration
</ins><span class="cx"> self._domain = domain
</span><del>- self.members = members
</del><ins>+ self.members = declaration.type_members
</ins><span class="cx">
</span><span class="cx"> def __repr__(self):
</span><span class="cx"> return 'ObjectType[%s]' % self.qualified_name()
</span><span class="cx">
</span><ins>+ def declaration(self):
+ return self._declaration
+
</ins><span class="cx"> def type_domain(self):
</span><span class="cx"> return self._domain
</span><span class="cx">
</span><span class="lines">@@ -439,13 +452,13 @@
</span><span class="cx"> kind = declaration.type_ref.type_kind
</span><span class="cx"> if declaration.type_ref.enum_values is not None:
</span><span class="cx"> primitive_type_ref = TypeReference(declaration.type_ref.type_kind, None, None, None)
</span><del>- type_instance = EnumType(declaration.type_name, domain, declaration.type_ref.enum_values, primitive_type_ref)
</del><ins>+ type_instance = EnumType(declaration, domain, declaration.type_ref.enum_values, primitive_type_ref)
</ins><span class="cx"> elif kind == "array":
</span><del>- type_instance = ArrayType(declaration.type_name, declaration.type_ref.array_type_ref, domain)
</del><ins>+ type_instance = ArrayType(declaration, declaration.type_ref.array_type_ref, domain)
</ins><span class="cx"> elif kind == "object":
</span><del>- type_instance = ObjectType(declaration.type_name, domain, declaration.type_members)
</del><ins>+ type_instance = ObjectType(declaration, domain)
</ins><span class="cx"> else:
</span><del>- type_instance = AliasedType(declaration.type_name, domain, declaration.type_ref)
</del><ins>+ type_instance = AliasedType(declaration, domain, declaration.type_ref)
</ins><span class="cx">
</span><span class="cx"> log.debug("< Created fresh type %r for declaration %s" % (type_instance, qualified_type_name))
</span><span class="cx"> self.types_by_name[qualified_type_name] = type_instance
</span><span class="lines">@@ -476,7 +489,7 @@
</span><span class="cx"> if type_ref.enum_values is not None:
</span><span class="cx"> # We need to create a type reference without enum values as the enum's nested type.
</span><span class="cx"> primitive_type_ref = TypeReference(type_ref.type_kind, None, None, None)
</span><del>- type_instance = EnumType("(anonymous)", domain, type_ref.enum_values, primitive_type_ref, True)
</del><ins>+ type_instance = EnumType(None, domain, type_ref.enum_values, primitive_type_ref, True)
</ins><span class="cx"> type_instance.resolve_type_references(self)
</span><span class="cx"> log.debug("< Created fresh type instance for anonymous enum type: %s" % type_instance.qualified_name())
</span><span class="cx"> return type_instance
</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 (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ### Begin File: InspectorBackendCommands.js
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> ### Begin File: TestAlternateBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -716,6 +716,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+template<typename ProtocolEnumType>
+Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
+
+// Enums in the 'Database' Domain
+template<>
+Optional<Inspector::Protocol::Database::PrimaryColors> parseEnumValueFromString<Inspector::Protocol::Database::PrimaryColors>(const String&);
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -724,7 +731,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -755,6 +762,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestProtocolObjects.h"
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -775,8 +783,25 @@
</span><span class="cx"> return enum_constant_values[code];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Enums in the 'Database' Domain
+template<>
+Optional<Inspector::Protocol::Database::PrimaryColors> parseEnumValueFromString<Inspector::Protocol::Database::PrimaryColors>(const String& protocolString)
+{
+ static const size_t constantValues[] = {
+ (size_t)Inspector::Protocol::Database::PrimaryColors::Red,
+ (size_t)Inspector::Protocol::Database::PrimaryColors::Green,
+ (size_t)Inspector::Protocol::Database::PrimaryColors::Blue,
+ };
+ for (size_t i = 0; i < 3; ++i)
+ if (protocolString == enum_constant_values[constantValues[i]])
+ return (Inspector::Protocol::Database::PrimaryColors)constantValues[i];
</ins><span class="cx">
</span><ins>+ return Nullopt;
+}
</ins><span class="cx">
</span><ins>+
+
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -786,7 +811,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -840,7 +865,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -928,7 +953,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -969,7 +994,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1170,7 +1195,7 @@
</span><span class="cx"> ### Begin File: TestProtocolEventDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1214,7 +1239,7 @@
</span><span class="cx"> ### Begin File: TestProtocol.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1310,7 +1335,7 @@
</span><span class="cx"> ### Begin File: TestProtocolInternal.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1351,7 +1376,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1536,7 +1561,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1616,7 +1641,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</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 (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ### Begin File: InspectorBackendCommands.js
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> ### Begin File: TestAlternateBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -617,6 +617,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+template<typename ProtocolEnumType>
+Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
+
+// Enums in the 'Database' Domain
+template<>
+Optional<Inspector::Protocol::Database::PrimaryColors> parseEnumValueFromString<Inspector::Protocol::Database::PrimaryColors>(const String&);
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -625,7 +632,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -656,6 +663,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestProtocolObjects.h"
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -676,8 +684,25 @@
</span><span class="cx"> return enum_constant_values[code];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Enums in the 'Database' Domain
+template<>
+Optional<Inspector::Protocol::Database::PrimaryColors> parseEnumValueFromString<Inspector::Protocol::Database::PrimaryColors>(const String& protocolString)
+{
+ static const size_t constantValues[] = {
+ (size_t)Inspector::Protocol::Database::PrimaryColors::Red,
+ (size_t)Inspector::Protocol::Database::PrimaryColors::Green,
+ (size_t)Inspector::Protocol::Database::PrimaryColors::Blue,
+ };
+ for (size_t i = 0; i < 3; ++i)
+ if (protocolString == enum_constant_values[constantValues[i]])
+ return (Inspector::Protocol::Database::PrimaryColors)constantValues[i];
</ins><span class="cx">
</span><ins>+ return Nullopt;
+}
</ins><span class="cx">
</span><ins>+
+
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -687,7 +712,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -739,7 +764,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -827,7 +852,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -868,7 +893,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1027,7 +1052,7 @@
</span><span class="cx"> ### Begin File: TestProtocolEventDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1071,7 +1096,7 @@
</span><span class="cx"> ### Begin File: TestProtocol.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1165,7 +1190,7 @@
</span><span class="cx"> ### Begin File: TestProtocolInternal.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1206,7 +1231,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1391,7 +1416,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1471,7 +1496,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</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 (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ### Begin File: InspectorBackendCommands.js
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> ### Begin File: TestAlternateBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -506,7 +506,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -550,7 +550,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -593,7 +593,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -650,6 +650,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+template<typename ProtocolEnumType>
+Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -658,7 +661,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -689,6 +692,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestProtocolObjects.h"
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -713,7 +717,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -781,7 +785,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -889,7 +893,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -931,7 +935,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1091,7 +1095,7 @@
</span><span class="cx"> ### Begin File: TestProtocolEventDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1139,7 +1143,7 @@
</span><span class="cx"> ### Begin File: TestProtocol.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1202,7 +1206,7 @@
</span><span class="cx"> ### Begin File: TestProtocolInternal.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1243,7 +1247,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1292,7 +1296,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1351,7 +1355,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedenumvaluesjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ### Begin File: InspectorBackendCommands.js
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> ### Begin File: TestAlternateBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -397,7 +397,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -464,6 +464,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+template<typename ProtocolEnumType>
+Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
+
+// Enums in the 'TypeDomain' Domain
+template<>
+Optional<Inspector::Protocol::TypeDomain::TypeDomainEnum> parseEnumValueFromString<Inspector::Protocol::TypeDomain::TypeDomainEnum>(const String&);
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -472,7 +479,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -503,6 +510,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestProtocolObjects.h"
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -525,8 +533,26 @@
</span><span class="cx"> return enum_constant_values[code];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Enums in the 'TypeDomain' Domain
+template<>
+Optional<Inspector::Protocol::TypeDomain::TypeDomainEnum> parseEnumValueFromString<Inspector::Protocol::TypeDomain::TypeDomainEnum>(const String& protocolString)
+{
+ static const size_t constantValues[] = {
+ (size_t)Inspector::Protocol::TypeDomain::TypeDomainEnum::Shared,
+ (size_t)Inspector::Protocol::TypeDomain::TypeDomainEnum::Red,
+ (size_t)Inspector::Protocol::TypeDomain::TypeDomainEnum::Green,
+ (size_t)Inspector::Protocol::TypeDomain::TypeDomainEnum::Blue,
+ };
+ for (size_t i = 0; i < 4; ++i)
+ if (protocolString == enum_constant_values[constantValues[i]])
+ return (Inspector::Protocol::TypeDomain::TypeDomainEnum)constantValues[i];
</ins><span class="cx">
</span><ins>+ return Nullopt;
+}
</ins><span class="cx">
</span><ins>+
+
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -536,7 +562,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -591,7 +617,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -688,7 +714,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -730,7 +756,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -795,7 +821,7 @@
</span><span class="cx"> ### Begin File: TestProtocolEventDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -870,7 +896,7 @@
</span><span class="cx"> ### Begin File: TestProtocol.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -944,7 +970,7 @@
</span><span class="cx"> ### Begin File: TestProtocolInternal.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -987,7 +1013,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1116,7 +1142,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1175,7 +1201,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</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 (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ### Begin File: InspectorBackendCommands.js
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> ### Begin File: TestAlternateBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -468,6 +468,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+template<typename ProtocolEnumType>
+Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -476,7 +479,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -507,6 +510,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestProtocolObjects.h"
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -531,7 +535,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -576,7 +580,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -653,7 +657,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -694,7 +698,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -740,7 +744,7 @@
</span><span class="cx"> ### Begin File: TestProtocolEventDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -866,7 +870,7 @@
</span><span class="cx"> ### Begin File: TestProtocol.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -927,7 +931,7 @@
</span><span class="cx"> ### Begin File: TestProtocolInternal.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -970,7 +974,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1015,7 +1019,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1095,7 +1099,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</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 (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ### Begin File: InspectorBackendCommands.js
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> ### Begin File: TestAlternateBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -517,6 +517,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+template<typename ProtocolEnumType>
+Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -525,7 +528,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -556,6 +559,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestProtocolObjects.h"
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -580,7 +584,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -637,7 +641,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -734,7 +738,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -776,7 +780,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -841,7 +845,7 @@
</span><span class="cx"> ### Begin File: TestProtocolEventDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -913,7 +917,7 @@
</span><span class="cx"> ### Begin File: TestProtocol.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -976,7 +980,7 @@
</span><span class="cx"> ### Begin File: TestProtocolInternal.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1019,7 +1023,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1068,7 +1072,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1127,7 +1131,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</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 (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ### Begin File: InspectorBackendCommands.js
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> ### Begin File: TestAlternateBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -336,6 +336,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+template<typename ProtocolEnumType>
+Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -344,7 +347,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -375,6 +378,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestProtocolObjects.h"
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -399,7 +403,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -446,7 +450,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -514,7 +518,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -554,7 +558,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -602,7 +606,7 @@
</span><span class="cx"> ### Begin File: TestProtocolEventDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -648,7 +652,7 @@
</span><span class="cx"> ### Begin File: TestProtocol.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -697,7 +701,7 @@
</span><span class="cx"> ### Begin File: TestProtocolInternal.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -738,7 +742,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -785,7 +789,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -852,7 +856,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</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 (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ### Begin File: InspectorBackendCommands.js
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> ### Begin File: TestAlternateBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -406,6 +406,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+template<typename ProtocolEnumType>
+Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
+
+// Enums in the 'Runtime' Domain
+template<>
+Optional<Inspector::Protocol::Runtime::KeyPath::Type> parseEnumValueFromString<Inspector::Protocol::Runtime::KeyPath::Type>(const String&);
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -414,7 +421,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -445,6 +452,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestProtocolObjects.h"
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -461,8 +469,25 @@
</span><span class="cx"> return enum_constant_values[code];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Enums in the 'Runtime' Domain
+template<>
+Optional<Inspector::Protocol::Runtime::KeyPath::Type> parseEnumValueFromString<Inspector::Protocol::Runtime::KeyPath::Type>(const String& protocolString)
+{
+ static const size_t constantValues[] = {
+ (size_t)Inspector::Protocol::Runtime::KeyPath::Type::Null,
+ (size_t)Inspector::Protocol::Runtime::KeyPath::Type::String,
+ (size_t)Inspector::Protocol::Runtime::KeyPath::Type::Array,
+ };
+ for (size_t i = 0; i < 3; ++i)
+ if (protocolString == enum_constant_values[constantValues[i]])
+ return (Inspector::Protocol::Runtime::KeyPath::Type)constantValues[i];
</ins><span class="cx">
</span><ins>+ return Nullopt;
+}
</ins><span class="cx">
</span><ins>+
+
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -472,7 +497,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -517,7 +542,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -585,7 +610,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -625,7 +650,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -671,7 +696,7 @@
</span><span class="cx"> ### Begin File: TestProtocolEventDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -715,7 +740,7 @@
</span><span class="cx"> ### Begin File: TestProtocol.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -778,7 +803,7 @@
</span><span class="cx"> ### Begin File: TestProtocolInternal.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -819,7 +844,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -888,7 +913,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -947,7 +972,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</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 (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ### Begin File: InspectorBackendCommands.js
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> ### Begin File: TestAlternateBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -331,6 +331,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+template<typename ProtocolEnumType>
+Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -339,7 +342,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -370,6 +373,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestProtocolObjects.h"
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -394,7 +398,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -439,7 +443,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -507,7 +511,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -547,7 +551,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -593,7 +597,7 @@
</span><span class="cx"> ### Begin File: TestProtocolEventDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -637,7 +641,7 @@
</span><span class="cx"> ### Begin File: TestProtocol.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -686,7 +690,7 @@
</span><span class="cx"> ### Begin File: TestProtocolInternal.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -727,7 +731,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -772,7 +776,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -831,7 +835,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</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 (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ### Begin File: InspectorBackendCommands.js
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> ### Begin File: TestAlternateBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -356,6 +356,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+template<typename ProtocolEnumType>
+Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
+
+// Enums in the 'Debugger' Domain
+template<>
+Optional<Inspector::Protocol::Debugger::Reason> parseEnumValueFromString<Inspector::Protocol::Debugger::Reason>(const String&);
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -364,7 +371,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -395,6 +402,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestProtocolObjects.h"
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -411,8 +419,25 @@
</span><span class="cx"> return enum_constant_values[code];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Enums in the 'Debugger' Domain
+template<>
+Optional<Inspector::Protocol::Debugger::Reason> parseEnumValueFromString<Inspector::Protocol::Debugger::Reason>(const String& protocolString)
+{
+ static const size_t constantValues[] = {
+ (size_t)Inspector::Protocol::Debugger::Reason::Died,
+ (size_t)Inspector::Protocol::Debugger::Reason::Fainted,
+ (size_t)Inspector::Protocol::Debugger::Reason::Hungry,
+ };
+ for (size_t i = 0; i < 3; ++i)
+ if (protocolString == enum_constant_values[constantValues[i]])
+ return (Inspector::Protocol::Debugger::Reason)constantValues[i];
</ins><span class="cx">
</span><ins>+ return Nullopt;
+}
</ins><span class="cx">
</span><ins>+
+
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -422,7 +447,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -469,7 +494,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -537,7 +562,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -577,7 +602,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -625,7 +650,7 @@
</span><span class="cx"> ### Begin File: TestProtocolEventDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -671,7 +696,7 @@
</span><span class="cx"> ### Begin File: TestProtocol.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -725,7 +750,7 @@
</span><span class="cx"> ### Begin File: TestProtocolInternal.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -766,7 +791,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -837,7 +862,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -946,7 +971,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</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 (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ### Begin File: InspectorBackendCommands.js
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> ### Begin File: TestAlternateBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -353,6 +353,15 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+template<typename ProtocolEnumType>
+Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
+
+// Enums in the 'Runtime' Domain
+template<>
+Optional<Inspector::Protocol::Runtime::FarmAnimals> parseEnumValueFromString<Inspector::Protocol::Runtime::FarmAnimals>(const String&);
+template<>
+Optional<Inspector::Protocol::Runtime::TwoLeggedAnimals> parseEnumValueFromString<Inspector::Protocol::Runtime::TwoLeggedAnimals>(const String&);
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -361,7 +370,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -392,6 +401,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestProtocolObjects.h"
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -412,8 +422,42 @@
</span><span class="cx"> return enum_constant_values[code];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Enums in the 'Runtime' Domain
+template<>
+Optional<Inspector::Protocol::Runtime::FarmAnimals> parseEnumValueFromString<Inspector::Protocol::Runtime::FarmAnimals>(const String& protocolString)
+{
+ static const size_t constantValues[] = {
+ (size_t)Inspector::Protocol::Runtime::FarmAnimals::Pigs,
+ (size_t)Inspector::Protocol::Runtime::FarmAnimals::Cows,
+ (size_t)Inspector::Protocol::Runtime::FarmAnimals::Cats,
+ (size_t)Inspector::Protocol::Runtime::FarmAnimals::Hens,
+ };
+ for (size_t i = 0; i < 4; ++i)
+ if (protocolString == enum_constant_values[constantValues[i]])
+ return (Inspector::Protocol::Runtime::FarmAnimals)constantValues[i];
</ins><span class="cx">
</span><ins>+ return Nullopt;
+}
</ins><span class="cx">
</span><ins>+template<>
+Optional<Inspector::Protocol::Runtime::TwoLeggedAnimals> parseEnumValueFromString<Inspector::Protocol::Runtime::TwoLeggedAnimals>(const String& protocolString)
+{
+ static const size_t constantValues[] = {
+ (size_t)Inspector::Protocol::Runtime::TwoLeggedAnimals::Ducks,
+ (size_t)Inspector::Protocol::Runtime::TwoLeggedAnimals::Hens,
+ (size_t)Inspector::Protocol::Runtime::TwoLeggedAnimals::Crows,
+ (size_t)Inspector::Protocol::Runtime::TwoLeggedAnimals::Flamingos,
+ };
+ for (size_t i = 0; i < 4; ++i)
+ if (protocolString == enum_constant_values[constantValues[i]])
+ return (Inspector::Protocol::Runtime::TwoLeggedAnimals)constantValues[i];
+
+ return Nullopt;
+}
+
+
+
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -423,7 +467,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -468,7 +512,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -536,7 +580,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -576,7 +620,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -622,7 +666,7 @@
</span><span class="cx"> ### Begin File: TestProtocolEventDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -666,7 +710,7 @@
</span><span class="cx"> ### Begin File: TestProtocol.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -728,7 +772,7 @@
</span><span class="cx"> ### Begin File: TestProtocolInternal.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -769,7 +813,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -871,7 +915,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -937,7 +981,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</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 (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ### Begin File: InspectorBackendCommands.js
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> ### Begin File: TestAlternateBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -315,11 +315,11 @@
</span><span class="cx">
</span><span class="cx"> // Forward declarations.
</span><span class="cx"> namespace Database {
</span><del>-class DummyObject;
</del><span class="cx"> class Error;
</span><del>-class ObjectWithPropertyNameConflicts;
</del><span class="cx"> class OptionalParameterBundle;
</span><span class="cx"> class ParameterBundle;
</span><ins>+class ObjectWithPropertyNameConflicts;
+class DummyObject;
</ins><span class="cx"> } // Database
</span><span class="cx">
</span><span class="cx"> namespace Test {
</span><span class="lines">@@ -796,6 +796,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+template<typename ProtocolEnumType>
+Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -804,7 +807,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -835,6 +838,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestProtocolObjects.h"
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -859,7 +863,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -906,7 +910,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -974,7 +978,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1014,7 +1018,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1062,7 +1066,7 @@
</span><span class="cx"> ### Begin File: TestProtocolEventDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1108,7 +1112,7 @@
</span><span class="cx"> ### Begin File: TestProtocol.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1228,7 +1232,7 @@
</span><span class="cx"> ### Begin File: TestProtocolInternal.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1269,7 +1273,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1316,7 +1320,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1418,7 +1422,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</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 (198751 => 198752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-03-28 18:01:41 UTC (rev 198751)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-03-28 18:21:08 UTC (rev 198752)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ### Begin File: InspectorBackendCommands.js
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> ### Begin File: TestAlternateBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> ### Begin File: TestBackendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> ### Begin File: TestFrontendDispatchers.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -319,11 +319,11 @@
</span><span class="cx">
</span><span class="cx"> // Forward declarations.
</span><span class="cx"> namespace Test {
</span><ins>+class TypeNeedingCast;
</ins><span class="cx"> class RecursiveObject1;
</span><span class="cx"> class RecursiveObject2;
</span><del>-class TypeNeedingCast;
</del><ins>+enum class UncastedAnimals;
</ins><span class="cx"> enum class CastedAnimals;
</span><del>-enum class UncastedAnimals;
</del><span class="cx"> } // Test
</span><span class="cx"> // End of forward declarations.
</span><span class="cx">
</span><span class="lines">@@ -575,6 +575,15 @@
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<typename ProtocolEnumType>
+Optional<ProtocolEnumType> parseEnumValueFromString(const String&);
+
+// Enums in the 'Test' Domain
+template<>
+Optional<Inspector::Protocol::Test::UncastedAnimals> parseEnumValueFromString<Inspector::Protocol::Test::UncastedAnimals>(const String&);
+template<>
+Optional<Inspector::Protocol::Test::CastedAnimals> parseEnumValueFromString<Inspector::Protocol::Test::CastedAnimals>(const String&);
+
</ins><span class="cx"> } // namespace Protocol
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -583,7 +592,7 @@
</span><span class="cx"> ### Begin File: TestProtocolObjects.cpp
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -614,6 +623,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestProtocolObjects.h"
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -634,8 +644,42 @@
</span><span class="cx"> return enum_constant_values[code];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Enums in the 'Test' Domain
+template<>
+Optional<Inspector::Protocol::Test::UncastedAnimals> parseEnumValueFromString<Inspector::Protocol::Test::UncastedAnimals>(const String& protocolString)
+{
+ static const size_t constantValues[] = {
+ (size_t)Inspector::Protocol::Test::UncastedAnimals::Pigs,
+ (size_t)Inspector::Protocol::Test::UncastedAnimals::Cows,
+ (size_t)Inspector::Protocol::Test::UncastedAnimals::Cats,
+ (size_t)Inspector::Protocol::Test::UncastedAnimals::Hens,
+ };
+ for (size_t i = 0; i < 4; ++i)
+ if (protocolString == enum_constant_values[constantValues[i]])
+ return (Inspector::Protocol::Test::UncastedAnimals)constantValues[i];
</ins><span class="cx">
</span><ins>+ return Nullopt;
+}
</ins><span class="cx">
</span><ins>+template<>
+Optional<Inspector::Protocol::Test::CastedAnimals> parseEnumValueFromString<Inspector::Protocol::Test::CastedAnimals>(const String& protocolString)
+{
+ static const size_t constantValues[] = {
+ (size_t)Inspector::Protocol::Test::CastedAnimals::Ducks,
+ (size_t)Inspector::Protocol::Test::CastedAnimals::Hens,
+ (size_t)Inspector::Protocol::Test::CastedAnimals::Crows,
+ (size_t)Inspector::Protocol::Test::CastedAnimals::Flamingos,
+ };
+ for (size_t i = 0; i < 4; ++i)
+ if (protocolString == enum_constant_values[constantValues[i]])
+ return (Inspector::Protocol::Test::CastedAnimals)constantValues[i];
+
+ return Nullopt;
+}
+
+
+
+
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> void BindingTraits<Inspector::Protocol::Test::CastedAnimals>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</span><span class="cx"> {
</span><span class="lines">@@ -750,7 +794,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -795,7 +839,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -863,7 +907,7 @@
</span><span class="cx"> ### Begin File: TestProtocolConfiguration.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -903,7 +947,7 @@
</span><span class="cx"> ### Begin File: TestProtocolBackendDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -949,7 +993,7 @@
</span><span class="cx"> ### Begin File: TestProtocolEventDispatchers.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -993,7 +1037,7 @@
</span><span class="cx"> ### Begin File: TestProtocol.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1082,7 +1126,7 @@
</span><span class="cx"> ### Begin File: TestProtocolInternal.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1123,7 +1167,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.h
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1225,7 +1269,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypeConversions.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1326,7 +1370,7 @@
</span><span class="cx"> ### Begin File: TestProtocolTypes.mm
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 University of Washington. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span></span></pre>
</div>
</div>
</body>
</html>