<!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>[171684] 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/171684">171684</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-07-28 12:31:03 -0700 (Mon, 28 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Replay: auto-decoding of parameterized vector's elements is incorrect
https://bugs.webkit.org/show_bug.cgi?id=135343
Reviewed by Timothy Hatcher.
Fix an incorrect type argument in EncodingTraits<Vector<T>>::encodeValue
that was using the element's decoded type as the type parameter to
EncodedValue::append<T>. It should instead be the raw type T. This
causes problems when encoding Vector<RefPtr<T>>, as it later tries to
use encoding traits for RefPtr<T> rather than for T.
Fix incorrect generated encoding traits argument for vectors of
RefCounted objects. Updated test to cover this scenario.
* replay/scripts/CodeGeneratorReplayInputs.py:
(Type.encoding_type_argument):
(VectorType.type_name):
(VectorType):
(VectorType.encoding_type_argument):
(Generator.generate_input_encode_implementation):
(Generator.generate_input_decode_implementation):
* replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.cpp:
* replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.h:
* replay/scripts/tests/generate-input-with-vector-members.json: Updated.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayEncodedValueh">trunk/Source/JavaScriptCore/replay/EncodedValue.h</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayscriptsCodeGeneratorReplayInputspy">trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateinputwithvectormembersjsonTestReplayInputscpp">trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.cpp</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="#trunkSourceJavaScriptCorereplayscriptstestsgenerateinputwithvectormembersjson">trunk/Source/JavaScriptCore/replay/scripts/tests/generate-input-with-vector-members.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (171683 => 171684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-07-28 19:22:43 UTC (rev 171683)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-07-28 19:31:03 UTC (rev 171684)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2014-07-28 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><ins>+ Web Replay: auto-decoding of parameterized vector's elements is incorrect
+ https://bugs.webkit.org/show_bug.cgi?id=135343
+
+ Reviewed by Timothy Hatcher.
+
+ Fix an incorrect type argument in EncodingTraits<Vector<T>>::encodeValue
+ that was using the element's decoded type as the type parameter to
+ EncodedValue::append<T>. It should instead be the raw type T. This
+ causes problems when encoding Vector<RefPtr<T>>, as it later tries to
+ use encoding traits for RefPtr<T> rather than for T.
+
+ Fix incorrect generated encoding traits argument for vectors of
+ RefCounted objects. Updated test to cover this scenario.
+
+ * replay/scripts/CodeGeneratorReplayInputs.py:
+ (Type.encoding_type_argument):
+ (VectorType.type_name):
+ (VectorType):
+ (VectorType.encoding_type_argument):
+ (Generator.generate_input_encode_implementation):
+ (Generator.generate_input_decode_implementation):
+ * replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.cpp:
+ * replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.h:
+ * replay/scripts/tests/generate-input-with-vector-members.json: Updated.
+
+2014-07-28 Brian J. Burg <burg@cs.washington.edu>
+
</ins><span class="cx"> Web Replay: incorrect serialization code generated for enum classes inside class scope
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135342
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayEncodedValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/EncodedValue.h (171683 => 171684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/EncodedValue.h 2014-07-28 19:22:43 UTC (rev 171683)
+++ trunk/Source/JavaScriptCore/replay/EncodedValue.h 2014-07-28 19:31:03 UTC (rev 171684)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> {
</span><span class="cx"> EncodedValue encodedVector = EncodedValue::createArray();
</span><span class="cx"> for (const typename EncodingTraits<T>::DecodedType& value : vectorOfValues)
</span><del>- encodedVector.append<typename EncodingTraits<T>::DecodedType>(value);
</del><ins>+ encodedVector.append<T>(value);
</ins><span class="cx">
</span><span class="cx"> return WTF::move(encodedVector);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptsCodeGeneratorReplayInputspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py (171683 => 171684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py 2014-07-28 19:22:43 UTC (rev 171683)
+++ trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py 2014-07-28 19:31:03 UTC (rev 171684)
</span><span class="lines">@@ -360,7 +360,10 @@
</span><span class="cx"> else:
</span><span class="cx"> return self.storage_type()
</span><span class="cx">
</span><ins>+ def encoding_type_argument(self, qualified=False):
+ return self.type_name(qualified=qualified)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def check_for_required_properties(props, obj, what):
</span><span class="cx"> for prop in props:
</span><span class="cx"> if prop not in obj:
</span><span class="lines">@@ -390,6 +393,9 @@
</span><span class="cx"> return ""
</span><span class="cx">
</span><span class="cx"> def type_name(self, qualified=False):
</span><ins>+ return "Vector<%s>" % self._element_type.storage_type(qualified=qualified)
+
+ def encoding_type_argument(self, qualified=False):
</ins><span class="cx"> return "Vector<%s>" % self._element_type.type_name(qualified=qualified)
</span><span class="cx">
</span><span class="cx"> def argument_type(self, qualified=False):
</span><span class="lines">@@ -881,7 +887,7 @@
</span><span class="cx"> steps = []
</span><span class="cx"> for (_member, _type) in self.generate_input_member_tuples(_input):
</span><span class="cx"> should_qualify_type = _type.framework != self.traits_framework
</span><del>- put_method = "put<%s>" % _type.type_name(qualified=should_qualify_type)
</del><ins>+ put_method = "put<%s>" % _type.encoding_type_argument(qualified=should_qualify_type)
</ins><span class="cx">
</span><span class="cx"> steps.extend([
</span><span class="cx"> " encodedValue.%s(ASCIILiteral(\"%s\"), input.%s());" % (put_method, _member.memberName, _member.memberName)
</span><span class="lines">@@ -899,7 +905,7 @@
</span><span class="cx"> steps = []
</span><span class="cx"> for (_member, _type) in self.generate_input_member_tuples(_input):
</span><span class="cx"> should_qualify_type = _type.framework != self.traits_framework
</span><del>- get_method = "get<%s>" % _type.type_name(qualified=should_qualify_type)
</del><ins>+ get_method = "get<%s>" % _type.encoding_type_argument(qualified=should_qualify_type)
</ins><span class="cx">
</span><span class="cx"> lines = [
</span><span class="cx"> " %s %s;" % (_type.storage_type(qualified=should_qualify_type), _member.memberName),
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptstestsexpectedgenerateinputwithvectormembersjsonTestReplayInputscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.cpp (171683 => 171684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.cpp 2014-07-28 19:22:43 UTC (rev 171683)
+++ trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.cpp 2014-07-28 19:31:03 UTC (rev 171684)
</span><span class="lines">@@ -48,6 +48,16 @@
</span><span class="cx"> ArrayOfThings::~ArrayOfThings()
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+
+SavedHistory::SavedHistory(Vector<RefPtr<HistoryItem>>& entries)
+ : NondeterministicInput<SavedHistory>()
+ , m_entries(entries)
+{
+}
+
+SavedHistory::~SavedHistory()
+{
+}
</ins><span class="cx"> } // namespace Test
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -82,6 +92,27 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+const AtomicString& InputTraits<Test::SavedHistory>::type()
+{
+ static NeverDestroyed<const AtomicString> type("SavedHistory", AtomicString::ConstructFromLiteral);
+ return type;
+}
+
+void InputTraits<Test::SavedHistory>::encode(EncodedValue& encodedValue, const Test::SavedHistory& input)
+{
+ encodedValue.put<Vector<WebCore::HistoryItem>>(ASCIILiteral("entries"), input.entries());
+}
+
+bool InputTraits<Test::SavedHistory>::decode(EncodedValue& encodedValue, std::unique_ptr<Test::SavedHistory>& input)
+{
+ Vector<RefPtr<WebCore::HistoryItem>> entries;
+ if (!encodedValue.get<Vector<WebCore::HistoryItem>>(ASCIILiteral("entries"), entries))
+ return false;
+
+ input = std::make_unique<Test::SavedHistory>(entries);
+ return true;
+}
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_REPLAY)
</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 (171683 => 171684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.h 2014-07-28 19:22:43 UTC (rev 171683)
+++ trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-input-with-vector-members.json-TestReplayInputs.h 2014-07-28 19:31:03 UTC (rev 171684)
</span><span class="lines">@@ -32,12 +32,17 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx"> #include "InternalNamespaceHeaderIncludeDummy.h"
</span><ins>+#include <history/HistoryItem.h>
</ins><span class="cx"> #include <platform/ExternalNamespaceHeaderIncludeDummy.h>
</span><span class="cx">
</span><ins>+namespace WebCore {
+class HistoryItem;
+}
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> namespace Test {
</span><span class="cx"> class ArrayOfThings;
</span><ins>+class SavedHistory;
</ins><span class="cx"> } // namespace Test
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -49,6 +54,14 @@
</span><span class="cx"> static bool decode(JSC::EncodedValue&, std::unique_ptr<Test::ArrayOfThings>&);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<> struct InputTraits<Test::SavedHistory> {
+ static InputQueue queue() { return InputQueue::ScriptMemoizedData; }
+ static const AtomicString& type();
+
+ static void encode(JSC::EncodedValue&, const Test::SavedHistory&);
+ static bool decode(JSC::EncodedValue&, std::unique_ptr<Test::SavedHistory>&);
+};
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> namespace Test {
</span><span class="lines">@@ -65,10 +78,21 @@
</span><span class="cx"> Vector<JSThing> m_jsthings;
</span><span class="cx"> Vector<WebThing> m_webthings;
</span><span class="cx"> };
</span><ins>+
+class SavedHistory : public NondeterministicInput<SavedHistory> {
+public:
+ SavedHistory(Vector<RefPtr<HistoryItem>>& entries);
+ virtual ~SavedHistory();
+
+ const Vector<RefPtr<HistoryItem>>& entries() const { return m_entries; }
+private:
+ Vector<RefPtr<HistoryItem>> m_entries;
+};
</ins><span class="cx"> } // namespace Test
</span><span class="cx">
</span><span class="cx"> #define TEST_REPLAY_INPUT_NAMES_FOR_EACH(macro) \
</span><span class="cx"> macro(ArrayOfThings) \
</span><ins>+ macro(SavedHistory) \
</ins><span class="cx"> \
</span><span class="cx"> // end of TEST_REPLAY_INPUT_NAMES_FOR_EACH
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptstestsgenerateinputwithvectormembersjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/tests/generate-input-with-vector-members.json (171683 => 171684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/tests/generate-input-with-vector-members.json 2014-07-28 19:22:43 UTC (rev 171683)
+++ trunk/Source/JavaScriptCore/replay/scripts/tests/generate-input-with-vector-members.json 2014-07-28 19:31:03 UTC (rev 171684)
</span><span class="lines">@@ -9,7 +9,11 @@
</span><span class="cx"> ],
</span><span class="cx">
</span><span class="cx"> "WebCore": [
</span><del>- { "name": "WebThing", "mode": "SCALAR", "header": "things/WebThing.h" }
</del><ins>+ { "name": "WebThing", "mode": "SCALAR", "header": "things/WebThing.h" },
+ {
+ "name": "HistoryItem", "mode": "SHARED",
+ "header": "history/HistoryItem.h"
+ }
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -23,6 +27,14 @@
</span><span class="cx"> { "name": "jsthings", "type": "JSThing", "flags": ["VECTOR"] },
</span><span class="cx"> { "name": "webthings", "type": "WebThing", "flags": ["VECTOR"] }
</span><span class="cx"> ]
</span><ins>+ },
+ {
+ "name": "SavedHistory",
+ "description": "Save history items.",
+ "queue": "SCRIPT_MEMOIZED",
+ "members": [
+ { "name": "entries", "type": "HistoryItem", "flags": ["VECTOR"] }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>