<!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>[167173] trunk/Source/WebCore</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/167173">167173</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-04-11 17:19:24 -0700 (Fri, 11 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Replay: consolidate decoding macros used in SerializationMethods
https://bugs.webkit.org/show_bug.cgi?id=131564
Reviewed by Timothy Hatcher.
We can use EncodingTraits<T>::DecodedType to create a local variable
with the appropriate decoded type, rather than special casing.
* replay/SerializationMethods.cpp:
(JSC::EncodingTraits<NondeterministicInputBase>::decodeValue):
(JSC::EncodingTraits<KeypressCommand>::decodeValue):
(JSC::EncodingTraits<PlatformKeyboardEvent>::decodeValue):
(JSC::EncodingTraits<PlatformMouseEvent>::decodeValue):
(JSC::EncodingTraits<PlatformWheelEvent>::decodeValue):
(JSC::EncodingTraits<PluginData>::decodeValue):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorereplaySerializationMethodscpp">trunk/Source/WebCore/replay/SerializationMethods.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167172 => 167173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-11 23:51:36 UTC (rev 167172)
+++ trunk/Source/WebCore/ChangeLog 2014-04-12 00:19:24 UTC (rev 167173)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-11 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Replay: consolidate decoding macros used in SerializationMethods
+ https://bugs.webkit.org/show_bug.cgi?id=131564
+
+ Reviewed by Timothy Hatcher.
+
+ We can use EncodingTraits<T>::DecodedType to create a local variable
+ with the appropriate decoded type, rather than special casing.
+
+ * replay/SerializationMethods.cpp:
+ (JSC::EncodingTraits<NondeterministicInputBase>::decodeValue):
+ (JSC::EncodingTraits<KeypressCommand>::decodeValue):
+ (JSC::EncodingTraits<PlatformKeyboardEvent>::decodeValue):
+ (JSC::EncodingTraits<PlatformMouseEvent>::decodeValue):
+ (JSC::EncodingTraits<PlatformWheelEvent>::decodeValue):
+ (JSC::EncodingTraits<PluginData>::decodeValue):
+
</ins><span class="cx"> 2014-04-11 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Need WK2 API to disable rubber-banding
</span></span></pre></div>
<a id="trunkSourceWebCorereplaySerializationMethodscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/SerializationMethods.cpp (167172 => 167173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/SerializationMethods.cpp 2014-04-11 23:51:36 UTC (rev 167172)
+++ trunk/Source/WebCore/replay/SerializationMethods.cpp 2014-04-12 00:19:24 UTC (rev 167173)
</span><span class="lines">@@ -126,29 +126,17 @@
</span><span class="cx"> if (!_encodedValue.get<_type>(ASCIILiteral(#_key), _lvalue)) \
</span><span class="cx"> return false
</span><span class="cx">
</span><ins>+#define DECODE_TYPE_WITH_KEY(_encodedValue, _type, _key) \
+ EncodingTraits<_type>::DecodedType _key; \
+ DECODE_TYPE_WITH_KEY_TO_LVALUE(_encodedValue, _type, _key, _key)
+
</ins><span class="cx"> #define DECODE_OPTIONAL_TYPE_WITH_KEY_TO_LVALUE(_encodedValue, _type, _key, _lvalue) \
</span><span class="cx"> bool _key ## WasDecoded = _encodedValue.get<_type>(ASCIILiteral(#_key), _lvalue)
</span><span class="cx">
</span><del>-#define DECODE_REFCOUNTED_TYPE_WITH_KEY(_encodedValue, _type, _key) \
- RefPtr<_type> _key; \
- DECODE_TYPE_WITH_KEY_TO_LVALUE(_encodedValue, _type, _key, _key)
-
-#define DECODE_UNIQUE_TYPE_WITH_KEY(_encodedValue, _type, _key) \
- std::unique_ptr<_type> _key; \
- DECODE_TYPE_WITH_KEY_TO_LVALUE(_encodedValue, _type, _key, _key)
-
-#define DECODE_SCALAR_TYPE_WITH_KEY(_encodedValue, _type, _key) \
- _type _key; \
- DECODE_TYPE_WITH_KEY_TO_LVALUE(_encodedValue, _type, _key, _key)
-
-#define DECODE_OPTIONAL_SCALAR_TYPE_WITH_KEY(_encodedValue, _type, _key) \
- _type _key; \
</del><ins>+#define DECODE_OPTIONAL_TYPE_WITH_KEY(_encodedValue, _type, _key) \
+ EncodingTraits<_type>::DecodedType _key; \
</ins><span class="cx"> DECODE_OPTIONAL_TYPE_WITH_KEY_TO_LVALUE(_encodedValue, _type, _key, _key)
</span><span class="cx">
</span><del>-#define DECODE_OPTIONAL_REFCOUNTED_TYPE_WITH_KEY(_encodedValue, _type, _key) \
- RefPtr<_type> _key; \
- DECODE_OPTIONAL_TYPE_WITH_KEY_TO_LVALUE(_encodedValue, _type, _key, _key)
-
</del><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> template<>
</span><span class="lines">@@ -205,7 +193,7 @@
</span><span class="cx">
</span><span class="cx"> bool EncodingTraits<NondeterministicInputBase>::decodeValue(EncodedValue& encodedValue, std::unique_ptr<NondeterministicInputBase>& input)
</span><span class="cx"> {
</span><del>- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, String, type);
</del><ins>+ DECODE_TYPE_WITH_KEY(encodedValue, String, type);
</ins><span class="cx">
</span><span class="cx"> #define DECODE_IF_TYPE_TAG_MATCHES(name) \
</span><span class="cx"> if (type == inputTypes().name) { \
</span><span class="lines">@@ -246,8 +234,8 @@
</span><span class="cx">
</span><span class="cx"> bool EncodingTraits<KeypressCommand>::decodeValue(EncodedValue& encodedValue, KeypressCommand& decodedValue)
</span><span class="cx"> {
</span><del>- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, String, commandName);
- DECODE_OPTIONAL_SCALAR_TYPE_WITH_KEY(encodedValue, String, text);
</del><ins>+ DECODE_TYPE_WITH_KEY(encodedValue, String, commandName);
+ DECODE_OPTIONAL_TYPE_WITH_KEY(encodedValue, String, text);
</ins><span class="cx">
</span><span class="cx"> decodedValue = textWasDecoded ? KeypressCommand(commandName, text) : KeypressCommand(commandName);
</span><span class="cx"> return true;
</span><span class="lines">@@ -289,21 +277,21 @@
</span><span class="cx">
</span><span class="cx"> bool EncodingTraits<PlatformKeyboardEvent>::decodeValue(EncodedValue& encodedValue, std::unique_ptr<PlatformKeyboardEvent>& input)
</span><span class="cx"> {
</span><del>- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, double, timestamp);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, PlatformEvent::Type, type);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, PlatformEvent::Modifiers, modifiers);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, String, text);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, String, unmodifiedText);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, String, keyIdentifier);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, int, windowsVirtualKeyCode);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, int, nativeVirtualKeyCode);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, int, macCharCode);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, bool, autoRepeat);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, bool, keypad);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, bool, systemKey);
</del><ins>+ DECODE_TYPE_WITH_KEY(encodedValue, double, timestamp);
+ DECODE_TYPE_WITH_KEY(encodedValue, PlatformEvent::Type, type);
+ DECODE_TYPE_WITH_KEY(encodedValue, PlatformEvent::Modifiers, modifiers);
+ DECODE_TYPE_WITH_KEY(encodedValue, String, text);
+ DECODE_TYPE_WITH_KEY(encodedValue, String, unmodifiedText);
+ DECODE_TYPE_WITH_KEY(encodedValue, String, keyIdentifier);
+ DECODE_TYPE_WITH_KEY(encodedValue, int, windowsVirtualKeyCode);
+ DECODE_TYPE_WITH_KEY(encodedValue, int, nativeVirtualKeyCode);
+ DECODE_TYPE_WITH_KEY(encodedValue, int, macCharCode);
+ DECODE_TYPE_WITH_KEY(encodedValue, bool, autoRepeat);
+ DECODE_TYPE_WITH_KEY(encodedValue, bool, keypad);
+ DECODE_TYPE_WITH_KEY(encodedValue, bool, systemKey);
</ins><span class="cx"> #if USE(APPKIT)
</span><del>- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, bool, handledByInputMethod);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, Vector<KeypressCommand>, commands);
</del><ins>+ DECODE_TYPE_WITH_KEY(encodedValue, bool, handledByInputMethod);
+ DECODE_TYPE_WITH_KEY(encodedValue, Vector<KeypressCommand>, commands);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> PlatformKeyboardEvent platformEvent = PlatformKeyboardEvent(type, text, unmodifiedText, keyIdentifier, windowsVirtualKeyCode, nativeVirtualKeyCode, macCharCode, autoRepeat, keypad, systemKey, modifiers, timestamp);
</span><span class="lines">@@ -337,18 +325,18 @@
</span><span class="cx">
</span><span class="cx"> bool EncodingTraits<PlatformMouseEvent>::decodeValue(EncodedValue& encodedValue, std::unique_ptr<PlatformMouseEvent>& input)
</span><span class="cx"> {
</span><del>- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, int, positionX);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, int, positionY);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, int, globalPositionX);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, int, globalPositionY);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, MouseButton, button);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, PlatformEvent::Type, type);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, int, clickCount);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, bool, shiftKey);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, bool, ctrlKey);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, bool, altKey);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, bool, metaKey);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, int, timestamp);
</del><ins>+ DECODE_TYPE_WITH_KEY(encodedValue, int, positionX);
+ DECODE_TYPE_WITH_KEY(encodedValue, int, positionY);
+ DECODE_TYPE_WITH_KEY(encodedValue, int, globalPositionX);
+ DECODE_TYPE_WITH_KEY(encodedValue, int, globalPositionY);
+ DECODE_TYPE_WITH_KEY(encodedValue, MouseButton, button);
+ DECODE_TYPE_WITH_KEY(encodedValue, PlatformEvent::Type, type);
+ DECODE_TYPE_WITH_KEY(encodedValue, int, clickCount);
+ DECODE_TYPE_WITH_KEY(encodedValue, bool, shiftKey);
+ DECODE_TYPE_WITH_KEY(encodedValue, bool, ctrlKey);
+ DECODE_TYPE_WITH_KEY(encodedValue, bool, altKey);
+ DECODE_TYPE_WITH_KEY(encodedValue, bool, metaKey);
+ DECODE_TYPE_WITH_KEY(encodedValue, int, timestamp);
</ins><span class="cx">
</span><span class="cx"> input = std::make_unique<PlatformMouseEvent>(IntPoint(positionX, positionY),
</span><span class="cx"> IntPoint(globalPositionX, globalPositionY),
</span><span class="lines">@@ -417,19 +405,19 @@
</span><span class="cx">
</span><span class="cx"> bool EncodingTraits<PlatformWheelEvent>::decodeValue(EncodedValue& encodedData, std::unique_ptr<PlatformWheelEvent>& input)
</span><span class="cx"> {
</span><del>- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, int, positionX);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, int, positionY);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, int, globalPositionX);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, int, globalPositionY);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, bool, shiftKey);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, bool, ctrlKey);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, bool, altKey);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, bool, metaKey);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, float, deltaX);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, float, deltaY);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, float, wheelTicksX);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, float, wheelTicksY);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, PlatformWheelEventGranularity, granularity);
</del><ins>+ DECODE_TYPE_WITH_KEY(encodedData, int, positionX);
+ DECODE_TYPE_WITH_KEY(encodedData, int, positionY);
+ DECODE_TYPE_WITH_KEY(encodedData, int, globalPositionX);
+ DECODE_TYPE_WITH_KEY(encodedData, int, globalPositionY);
+ DECODE_TYPE_WITH_KEY(encodedData, bool, shiftKey);
+ DECODE_TYPE_WITH_KEY(encodedData, bool, ctrlKey);
+ DECODE_TYPE_WITH_KEY(encodedData, bool, altKey);
+ DECODE_TYPE_WITH_KEY(encodedData, bool, metaKey);
+ DECODE_TYPE_WITH_KEY(encodedData, float, deltaX);
+ DECODE_TYPE_WITH_KEY(encodedData, float, deltaY);
+ DECODE_TYPE_WITH_KEY(encodedData, float, wheelTicksX);
+ DECODE_TYPE_WITH_KEY(encodedData, float, wheelTicksY);
+ DECODE_TYPE_WITH_KEY(encodedData, PlatformWheelEventGranularity, granularity);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> PlatformWheelEventCocoaArguments arguments;
</span><span class="lines">@@ -474,9 +462,9 @@
</span><span class="cx">
</span><span class="cx"> bool EncodingTraits<PluginData>::decodeValue(EncodedValue& encodedData, RefPtr<PluginData>& input)
</span><span class="cx"> {
</span><del>- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, Vector<PluginInfo>, plugins);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, Vector<MimeClassInfo>, mimes);
- DECODE_SCALAR_TYPE_WITH_KEY(encodedData, Vector<size_t>, mimePluginIndices);
</del><ins>+ DECODE_TYPE_WITH_KEY(encodedData, Vector<PluginInfo>, plugins);
+ DECODE_TYPE_WITH_KEY(encodedData, Vector<MimeClassInfo>, mimes);
+ DECODE_TYPE_WITH_KEY(encodedData, Vector<size_t>, mimePluginIndices);
</ins><span class="cx">
</span><span class="cx"> input = adoptRef(new DeserializedPluginData(plugins, mimes, mimePluginIndices));
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>