<!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>[178668] trunk/Source</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/178668">178668</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2015-01-19 12:49:31 -0800 (Mon, 19 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Replay: convert to is<T> and downcast<T> for decoding replay inputs
https://bugs.webkit.org/show_bug.cgi?id=140512
Reviewed by Chris Dumez.
Source/JavaScriptCore:
Generate a SPECIALIZE_TYPE_TRAITS_* chunk of code for each input. This cannot
be done using REPLAY_INPUT_NAMES_FOR_EACH macro since that doesn't fully qualify
input types, and the type traits macro is defined in namespace WTF.
* replay/NondeterministicInput.h: Make overridden methods public.
* replay/scripts/CodeGeneratorReplayInputs.py:
(Generator.generate_header):
(Generator.qualified_input_name): Allow forcing qualification. WTF is never a target framework.
(Generator.generate_input_type_trait_declaration): Added.
* replay/scripts/CodeGeneratorReplayInputsTemplates.py: Add a template.
* replay/scripts/tests/expected/generate-enum-encoding-helpers-with-guarded-values.json-TestReplayInputs.h:
* replay/scripts/tests/expected/generate-enum-encoding-helpers.json-TestReplayInputs.h:
* replay/scripts/tests/expected/generate-enum-with-guard.json-TestReplayInputs.h:
* replay/scripts/tests/expected/generate-enums-with-same-base-name.json-TestReplayInputs.h:
* replay/scripts/tests/expected/generate-input-with-guard.json-TestReplayInputs.h:
* replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.h:
* replay/scripts/tests/expected/generate-inputs-with-flags.json-TestReplayInputs.h:
* replay/scripts/tests/expected/generate-memoized-type-modes.json-TestReplayInputs.h:
Source/WebCore:
No new tests, no behavior changed.
* replay/EventLoopInput.h: Make overridden methods public.
* replay/MemoizedDOMResult.h: Add type trait specialization here. It is
special-cased because the input type parameter doesn't work with macros.
* replay/SerializationMethods.cpp:
(JSC::EncodingTraits<NondeterministicInputBase>::encodeValue):
Use is() and downcast() when dispatching to encoders based on type.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayNondeterministicInputh">trunk/Source/JavaScriptCore/replay/NondeterministicInput.h</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayscriptsCodeGeneratorReplayInputspy">trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayscriptsCodeGeneratorReplayInputsTemplatespy">trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputsTemplates.py</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateenumencodinghelperswithguardedvaluesjsonTestReplayInputsh">trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-encoding-helpers-with-guarded-values.json-TestReplayInputs.h</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateenumencodinghelpersjsonTestReplayInputsh">trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-encoding-helpers.json-TestReplayInputs.h</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateenumwithguardjsonTestReplayInputsh">trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-with-guard.json-TestReplayInputs.h</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateenumswithsamebasenamejsonTestReplayInputsh">trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enums-with-same-base-name.json-TestReplayInputs.h</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateinputwithguardjsonTestReplayInputsh">trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-guard.json-TestReplayInputs.h</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateinputwithvectormembersjsonTestReplayInputsh">trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.h</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateinputswithflagsjsonTestReplayInputsh">trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-inputs-with-flags.json-TestReplayInputs.h</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayscriptstestsexpectedgeneratememoizedtypemodesjsonTestReplayInputsh">trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-memoized-type-modes.json-TestReplayInputs.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorereplayEventLoopInputh">trunk/Source/WebCore/replay/EventLoopInput.h</a></li>
<li><a href="#trunkSourceWebCorereplayMemoizedDOMResulth">trunk/Source/WebCore/replay/MemoizedDOMResult.h</a></li>
<li><a href="#trunkSourceWebCorereplaySerializationMethodscpp">trunk/Source/WebCore/replay/SerializationMethods.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-01-19 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Replay: convert to is<T> and downcast<T> for decoding replay inputs
+ https://bugs.webkit.org/show_bug.cgi?id=140512
+
+ Reviewed by Chris Dumez.
+
+ Generate a SPECIALIZE_TYPE_TRAITS_* chunk of code for each input. This cannot
+ be done using REPLAY_INPUT_NAMES_FOR_EACH macro since that doesn't fully qualify
+ input types, and the type traits macro is defined in namespace WTF.
+
+ * replay/NondeterministicInput.h: Make overridden methods public.
+ * replay/scripts/CodeGeneratorReplayInputs.py:
+ (Generator.generate_header):
+ (Generator.qualified_input_name): Allow forcing qualification. WTF is never a target framework.
+ (Generator.generate_input_type_trait_declaration): Added.
+ * replay/scripts/CodeGeneratorReplayInputsTemplates.py: Add a template.
+ * replay/scripts/tests/expected/generate-enum-encoding-helpers-with-guarded-values.json-TestReplayInputs.h:
+ * replay/scripts/tests/expected/generate-enum-encoding-helpers.json-TestReplayInputs.h:
+ * replay/scripts/tests/expected/generate-enum-with-guard.json-TestReplayInputs.h:
+ * replay/scripts/tests/expected/generate-enums-with-same-base-name.json-TestReplayInputs.h:
+ * replay/scripts/tests/expected/generate-input-with-guard.json-TestReplayInputs.h:
+ * replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.h:
+ * replay/scripts/tests/expected/generate-inputs-with-flags.json-TestReplayInputs.h:
+ * replay/scripts/tests/expected/generate-memoized-type-modes.json-TestReplayInputs.h:
+
</ins><span class="cx"> 2015-01-19 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r178653.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayNondeterministicInputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/NondeterministicInput.h (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/NondeterministicInput.h 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/JavaScriptCore/replay/NondeterministicInput.h 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx">
</span><span class="cx"> template<typename InputType>
</span><span class="cx"> class NondeterministicInput : public NondeterministicInputBase {
</span><ins>+public:
</ins><span class="cx"> virtual const String& type() const override
</span><span class="cx"> {
</span><span class="cx"> return InputTraits<InputType>::type();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptsCodeGeneratorReplayInputspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -57,6 +57,9 @@
</span><span class="cx"> (["JavaScriptCore"],
</span><span class="cx"> ("JavaScriptCore", "replay/NondeterministicInput.h")
</span><span class="cx"> ),
</span><ins>+ (["JavaScriptCore", "WebCore"],
+ ("WTF", "wtf/TypeCasts.h")
+ ),
</ins><span class="cx"> (["WebCore"],
</span><span class="cx"> ("WTF", "wtf/text/WTFString.h")
</span><span class="cx"> ),
</span><span class="lines">@@ -596,6 +599,7 @@
</span><span class="cx"> 'inputForwardDeclarations': "\n".join([wrap_with_guard("class %s;", _input.guard) % _input.name for _input in self._model.inputs]),
</span><span class="cx"> 'inputClassDeclarations': "\n\n".join([self.generate_class_declaration(_input) for _input in self._model.inputs]),
</span><span class="cx"> 'inputTraitDeclarations': "\n\n".join([self.generate_input_trait_declaration(_input) for _input in self._model.inputs]),
</span><ins>+ 'inputTypeTraitDeclarations': "\n\n".join([self.generate_input_type_trait_declaration(_input) for _input in self._model.inputs]),
</ins><span class="cx"> 'enumTraitDeclarations': "\n\n".join([wrap_with_guard(self.generate_enum_trait_declaration(_type), _type.guard) for _type in self._model.enum_types()]),
</span><span class="cx"> 'forEachMacro': self.generate_for_each_macro(),
</span><span class="cx"> }
</span><span class="lines">@@ -747,11 +751,11 @@
</span><span class="cx"> def generate_input_member_tuples(self, _input):
</span><span class="cx"> return [(_member, self._model.get_type_for_member(_member)) for _member in _input.members]
</span><span class="cx">
</span><del>- def qualified_input_name(self, _input):
- if self.target_framework == self.traits_framework:
</del><ins>+ def qualified_input_name(self, _input, forceQualified=False):
+ if forceQualified or self.target_framework != self.traits_framework:
+ return "%s::%s" % (self.target_framework.setting('namespace'), _input.name)
+ else:
</ins><span class="cx"> return _input.name
</span><del>- else:
- return "%s::%s" % (self.target_framework.setting('namespace'), _input.name)
</del><span class="cx">
</span><span class="cx"> def generate_input_trait_declaration(self, _input):
</span><span class="cx"> decl_type = ['struct']
</span><span class="lines">@@ -766,6 +770,13 @@
</span><span class="cx">
</span><span class="cx"> return wrap_with_guard(Template(Templates.InputTraitsDeclaration).substitute(template_arguments), _input.guard)
</span><span class="cx">
</span><ins>+ def generate_input_type_trait_declaration(self, _input):
+ template_arguments = {
+ 'qualifiedInputName': self.qualified_input_name(_input, forceQualified=True),
+ }
+
+ return wrap_with_guard(Template(Templates.InputTypeTraitsDeclaration).substitute(template_arguments), _input.guard)
+
</ins><span class="cx"> def generate_enum_trait_declaration(self, _type):
</span><span class="cx"> should_qualify_type = _type.framework != self.traits_framework
</span><span class="cx"> template = Templates.EnumTraitDeclaration if _type.is_enum() else Templates.EnumClassTraitDeclaration
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptsCodeGeneratorReplayInputsTemplatespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputsTemplates.py (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputsTemplates.py 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputsTemplates.py 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -88,6 +88,8 @@
</span><span class="cx"> ${inputClassDeclarations}
</span><span class="cx"> } // namespace ${inputsNamespace}
</span><span class="cx">
</span><ins>+${inputTypeTraitDeclarations}
+
</ins><span class="cx"> ${forEachMacro}
</span><span class="cx">
</span><span class="cx"> #endif // ${guardCondition}
</span><span class="lines">@@ -104,6 +106,11 @@
</span><span class="cx"> static bool decode(JSC::EncodedValue&, std::unique_ptr<${qualifiedInputName}>&);
</span><span class="cx"> };""")
</span><span class="cx">
</span><ins>+ InputTypeTraitsDeclaration = (
+ """SPECIALIZE_TYPE_TRAITS_BEGIN(${qualifiedInputName})
+ static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<${qualifiedInputName}>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()""")
+
</ins><span class="cx"> EnumTraitDeclaration = (
</span><span class="cx"> """template<> struct EncodingTraits<${enumName}> {
</span><span class="cx"> typedef ${enumName} DecodedType;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateenumencodinghelperswithguardedvaluesjsonTestReplayInputsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-encoding-helpers-with-guarded-values.json-TestReplayInputs.h (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-encoding-helpers-with-guarded-values.json-TestReplayInputs.h 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-encoding-helpers-with-guarded-values.json-TestReplayInputs.h 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -71,6 +71,10 @@
</span><span class="cx"> };
</span><span class="cx"> } // namespace Test
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(Test::SavedMouseButton)
+ static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<Test::SavedMouseButton>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #define TEST_REPLAY_INPUT_NAMES_FOR_EACH(macro) \
</span><span class="cx"> macro(SavedMouseButton) \
</span><span class="cx"> \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateenumencodinghelpersjsonTestReplayInputsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-encoding-helpers.json-TestReplayInputs.h (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-encoding-helpers.json-TestReplayInputs.h 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-encoding-helpers.json-TestReplayInputs.h 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -90,6 +90,10 @@
</span><span class="cx"> };
</span><span class="cx"> } // namespace Test
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(Test::SavedMouseButton)
+ static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<Test::SavedMouseButton>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #define TEST_REPLAY_INPUT_NAMES_FOR_EACH(macro) \
</span><span class="cx"> macro(SavedMouseButton) \
</span><span class="cx"> \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateenumwithguardjsonTestReplayInputsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-with-guard.json-TestReplayInputs.h (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-with-guard.json-TestReplayInputs.h 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-with-guard.json-TestReplayInputs.h 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -76,6 +76,10 @@
</span><span class="cx"> };
</span><span class="cx"> } // namespace Test
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(Test::HandleWheelEvent)
+ static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<Test::HandleWheelEvent>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #define TEST_REPLAY_INPUT_NAMES_FOR_EACH(macro) \
</span><span class="cx"> macro(HandleWheelEvent) \
</span><span class="cx"> \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateenumswithsamebasenamejsonTestReplayInputsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enums-with-same-base-name.json-TestReplayInputs.h (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enums-with-same-base-name.json-TestReplayInputs.h 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enums-with-same-base-name.json-TestReplayInputs.h 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -98,6 +98,10 @@
</span><span class="cx"> };
</span><span class="cx"> } // namespace Test
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(Test::FormCombo)
+ static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<Test::FormCombo>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #define TEST_REPLAY_INPUT_NAMES_FOR_EACH(macro) \
</span><span class="cx"> macro(FormCombo) \
</span><span class="cx"> \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateinputwithguardjsonTestReplayInputsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-guard.json-TestReplayInputs.h (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-guard.json-TestReplayInputs.h 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-guard.json-TestReplayInputs.h 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -88,6 +88,16 @@
</span><span class="cx"> };
</span><span class="cx"> } // namespace Test
</span><span class="cx">
</span><ins>+#if ENABLE(DUMMY_FEATURE)
+SPECIALIZE_TYPE_TRAITS_BEGIN(Test::GetCurrentTime)
+ static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<Test::GetCurrentTime>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()
+#endif // ENABLE(DUMMY_FEATURE)
+
+SPECIALIZE_TYPE_TRAITS_BEGIN(Test::SetRandomSeed)
+ static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<Test::SetRandomSeed>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #define TEST_REPLAY_INPUT_NAMES_FOR_EACH(macro) \
</span><span class="cx"> macro(GetCurrentTime) \
</span><span class="cx"> macro(SetRandomSeed) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateinputwithvectormembersjsonTestReplayInputsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.h (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.h 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.h 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -90,6 +90,14 @@
</span><span class="cx"> };
</span><span class="cx"> } // namespace Test
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(Test::ArrayOfThings)
+ static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<Test::ArrayOfThings>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
+SPECIALIZE_TYPE_TRAITS_BEGIN(Test::SavedHistory)
+ static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<Test::SavedHistory>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #define TEST_REPLAY_INPUT_NAMES_FOR_EACH(macro) \
</span><span class="cx"> macro(ArrayOfThings) \
</span><span class="cx"> macro(SavedHistory) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateinputswithflagsjsonTestReplayInputsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-inputs-with-flags.json-TestReplayInputs.h (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-inputs-with-flags.json-TestReplayInputs.h 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-inputs-with-flags.json-TestReplayInputs.h 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -82,6 +82,14 @@
</span><span class="cx"> };
</span><span class="cx"> } // namespace Test
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(Test::ScalarInput1)
+ static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<Test::ScalarInput1>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
+SPECIALIZE_TYPE_TRAITS_BEGIN(Test::ScalarInput2)
+ static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<Test::ScalarInput2>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #define TEST_REPLAY_INPUT_NAMES_FOR_EACH(macro) \
</span><span class="cx"> macro(ScalarInput1) \
</span><span class="cx"> macro(ScalarInput2) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptstestsexpectedgeneratememoizedtypemodesjsonTestReplayInputsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-memoized-type-modes.json-TestReplayInputs.h (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-memoized-type-modes.json-TestReplayInputs.h 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-memoized-type-modes.json-TestReplayInputs.h 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -82,6 +82,14 @@
</span><span class="cx"> };
</span><span class="cx"> } // namespace Test
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(Test::ScalarInput)
+ static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<Test::ScalarInput>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
+SPECIALIZE_TYPE_TRAITS_BEGIN(Test::MapInput)
+ static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<Test::MapInput>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #define TEST_REPLAY_INPUT_NAMES_FOR_EACH(macro) \
</span><span class="cx"> macro(ScalarInput) \
</span><span class="cx"> macro(MapInput) \
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/WebCore/ChangeLog 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-19 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Replay: convert to is<T> and downcast<T> for decoding replay inputs
+ https://bugs.webkit.org/show_bug.cgi?id=140512
+
+ Reviewed by Chris Dumez.
+
+ No new tests, no behavior changed.
+
+ * replay/EventLoopInput.h: Make overridden methods public.
+ * replay/MemoizedDOMResult.h: Add type trait specialization here. It is
+ special-cased because the input type parameter doesn't work with macros.
+ * replay/SerializationMethods.cpp:
+ (JSC::EncodingTraits<NondeterministicInputBase>::encodeValue):
+ Use is() and downcast() when dispatching to encoders based on type.
+
</ins><span class="cx"> 2015-01-19 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Replace use of WTF::bind() in MemoryPressureHandlerLinux.cpp with a C++ lambda
</span></span></pre></div>
<a id="trunkSourceWebCorereplayEventLoopInputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/EventLoopInput.h (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/EventLoopInput.h 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/WebCore/replay/EventLoopInput.h 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx">
</span><span class="cx"> template <typename InputType>
</span><span class="cx"> class EventLoopInput : public EventLoopInputBase {
</span><ins>+public:
</ins><span class="cx"> virtual const String& type() const override final
</span><span class="cx"> {
</span><span class="cx"> return InputTraits<InputType>::type();
</span></span></pre></div>
<a id="trunkSourceWebCorereplayMemoizedDOMResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/MemoizedDOMResult.h (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/MemoizedDOMResult.h 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/WebCore/replay/MemoizedDOMResult.h 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #include <replay/EncodedValue.h>
</span><span class="cx"> #include <replay/NondeterministicInput.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -154,6 +155,10 @@
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::MemoizedDOMResultBase)
+static bool isType(const NondeterministicInputBase& input) { return input.type() == InputTraits<WebCore::MemoizedDOMResultBase>::type(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #endif // ENABLE(WEB_REPLAY)
</span><span class="cx">
</span><span class="cx"> #endif // MemoizedDOMResult_h
</span></span></pre></div>
<a id="trunkSourceWebCorereplaySerializationMethodscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/SerializationMethods.cpp (178667 => 178668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/SerializationMethods.cpp 2015-01-19 20:34:02 UTC (rev 178667)
+++ trunk/Source/WebCore/replay/SerializationMethods.cpp 2015-01-19 20:49:31 UTC (rev 178668)
</span><span class="lines">@@ -166,8 +166,8 @@
</span><span class="cx"> ENCODE_TYPE_WITH_KEY(encodedValue, String, type, input.type());
</span><span class="cx">
</span><span class="cx"> #define ENCODE_IF_TYPE_TAG_MATCHES(name) \
</span><del>- if (input.type() == InputTraits<name>::type()) { \
- InputTraits<name>::encode(encodedValue, static_cast<const name&>(input)); \
</del><ins>+ if (is<name>(input)) { \
+ InputTraits<name>::encode(encodedValue, downcast<name>(input)); \
</ins><span class="cx"> return encodedValue; \
</span><span class="cx"> } \
</span><span class="cx">
</span><span class="lines">@@ -176,8 +176,8 @@
</span><span class="cx"> #undef ENCODE_IF_TYPE_TAG_MATCHES
</span><span class="cx">
</span><span class="cx"> // The macro won't work here because of the class template argument.
</span><del>- if (input.type() == InputTraits<MemoizedDOMResultBase>::type()) {
- InputTraits<MemoizedDOMResultBase>::encode(encodedValue, static_cast<const MemoizedDOMResultBase&>(input));
</del><ins>+ if (is<MemoizedDOMResultBase>(input)) {
+ InputTraits<MemoizedDOMResultBase>::encode(encodedValue, downcast<MemoizedDOMResultBase>(input));
</ins><span class="cx"> return encodedValue;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>