<!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>[166212] trunk</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/166212">166212</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2014-03-24 17:52:46 -0700 (Mon, 24 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Replay: capture and replay keyboard events
https://bugs.webkit.org/show_bug.cgi?id=130314
Reviewed by Joseph Pecoraro.
.:
* ManualTests/inspector/replay-keyboard-events.html: Added.
Source/WebCore:
Upstream support for capturing and replaying non-IME keyboard input.
This works similarly to mouse events. It introduces optional fields and
macros to encode/decode them.
Test: ManualTests/inspector/replay-keyboard-events.html
* replay/ReplayInputDispatchMethods.cpp:
(WebCore::HandleKeyPress::dispatch):
* replay/SerializationMethods.cpp:
(JSC::EncodingTraits<NondeterministicInputBase>::encodeValue):
(JSC::EncodingTraits<NondeterministicInputBase>::decodeValue): Switch existing
encode/decode calls to use the shortening macros.
(JSC::EncodingTraits<KeypressCommand>::encodeValue): Added.
(JSC::EncodingTraits<KeypressCommand>::decodeValue): Added.
(JSC::PlatformKeyboardEventAppKit::PlatformKeyboardEventAppKit): Subclass
PlatformKeyboardEvent so that we can set AppKit-specific members not
initialized through the main constructors.
(JSC::EncodingTraits<PlatformKeyboardEvent>::encodeValue): Added.
(JSC::EncodingTraits<PlatformKeyboardEvent>::decodeValue): Added.
* replay/SerializationMethods.h:
* replay/UserInputBridge.cpp:
(WebCore::UserInputBridge::UserInputBridge): initialize m_state inside a guard.
(WebCore::UserInputBridge::handleKeyEvent): fill in the implementation.
* replay/WebInputs.json:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorereplayReplayInputDispatchMethodscpp">trunk/Source/WebCore/replay/ReplayInputDispatchMethods.cpp</a></li>
<li><a href="#trunkSourceWebCorereplaySerializationMethodscpp">trunk/Source/WebCore/replay/SerializationMethods.cpp</a></li>
<li><a href="#trunkSourceWebCorereplaySerializationMethodsh">trunk/Source/WebCore/replay/SerializationMethods.h</a></li>
<li><a href="#trunkSourceWebCorereplayUserInputBridgecpp">trunk/Source/WebCore/replay/UserInputBridge.cpp</a></li>
<li><a href="#trunkSourceWebCorereplayWebInputsjson">trunk/Source/WebCore/replay/WebInputs.json</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkManualTestsinspectorreplaykeyboardeventshtml">trunk/ManualTests/inspector/replay-keyboard-events.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (166211 => 166212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-03-25 00:17:45 UTC (rev 166211)
+++ trunk/ChangeLog 2014-03-25 00:52:46 UTC (rev 166212)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-24 Brian Burg <bburg@apple.com>
+
+ Web Replay: capture and replay keyboard events
+ https://bugs.webkit.org/show_bug.cgi?id=130314
+
+ Reviewed by Joseph Pecoraro.
+
+ * ManualTests/inspector/replay-keyboard-events.html: Added.
+
</ins><span class="cx"> 2014-03-24 Sangyong Park <sy302.park@gmail.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Inspector page is not loaded.
</span></span></pre></div>
<a id="trunkManualTestsinspectorreplaykeyboardeventshtml"></a>
<div class="addfile"><h4>Added: trunk/ManualTests/inspector/replay-keyboard-events.html (0 => 166212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ManualTests/inspector/replay-keyboard-events.html (rev 0)
+++ trunk/ManualTests/inspector/replay-keyboard-events.html 2014-03-25 00:52:46 UTC (rev 166212)
</span><span class="lines">@@ -0,0 +1,104 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<script src="./resources/crypto-md5.js"></script>
+<script type="text/javascript" language="javascript" charset="utf-8">
+ document.onkeypress = handleEvent;
+ document.onkeydown = handleEvent;
+ document.onkeyup = handleEvent;
+ window.dumpedEvents = [];
+
+ function handleEvent(event) {
+ var properties = ["type", "eventPhase", "bubbles", "cancelable", "keyIdentifier", "location", "shiftKey", "altKey", "metaKey", "altGraphKey", "keyCode", "charCode"];
+ obj = {};
+ for (var key of properties)
+ obj[key] = event[key];
+
+ dumpedEvents.push(obj);
+
+ var block = createBlock(hex_md5(JSON.stringify(obj)), event);
+ var blocksContainer = document.getElementById("blocks");
+ blocksContainer.appendChild(block);
+
+ var hashLabel = document.getElementById("hash");
+ hash.textContent = hex_md5(JSON.stringify(dumpedEvents));
+ }
+
+ function createBlock(hash, event) {
+
+ function glyphForType(type) {
+ switch (type) {
+ case "keydown": return "D";
+ case "keyup": return "U";
+ case "keypress": return "K";
+ }
+ }
+
+ var color = "#" + hash.substr(0,6);
+ var block = document.createElement("span");
+ var eventTypeLabel = document.createElement("span");
+ eventTypeLabel.className = "event-label";
+ eventTypeLabel.textContent = glyphForType(event.type);
+ block.appendChild(eventTypeLabel);
+
+ var keyLabel = document.createElement("span");
+ keyLabel.className = "key-label";
+ var codepointRegEx = /^U\+\d{4}$/;
+ keyLabel.textContent = event.keyIdentifier.match(codepointRegEx) ? String.fromCharCode(event.keyCode) : event.keyIdentifier;
+ block.appendChild(keyLabel);
+ block.style.backgroundColor = color;
+ return block;
+ }
+
+ function stateHash() {
+ return hex_md5(JSON.stringify(dumpedEvents));
+ }
+</script>
+
+<style type="text/css">
+body {
+ max-width: 800px;
+}
+#blocks {
+ display: -webkit-flex;
+ width: 600px;
+ -webkit-flex-flow: row wrap;
+}
+
+#blocks > span {
+ padding: 2px 2px;
+ border-radius: 4px;
+ margin: 2px;
+ font-size: 12px;
+ font-weight: bold;
+ font-family: sans-serif;
+ color: #fff;
+ text-align: center;
+}
+
+.event-label::before {
+ content: '(';
+}
+
+.event-label::after {
+ content: ') ';
+}
+
+.key-label {
+}
+</style>
+</head>
+<body>
+<p>This page is a manual test for capture and replay of keyboard-related events.</p>
+<p>Below, a block is created for each keyboard event, where the color is derived from a hash of the keyboard event. At the bottom is a cumulative hash of all keyboard event data.</p>
+<hr/>
+<p>
+To test the replay functionality, open the Web Inspector, start capturing, and then type text into the textarea. After some time, stop capturing and then replay. The replayed execution should produce the same sequence of blocks. More importantly, the cumulative hash value should be the same at the end of capturing and at the end of any subsequent replays.</p>
+</p>
+<hr/>
+<form><textarea cols="80" rows="20"></textarea></form>
+<div id="hash"></div>
+<div id="blocks"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166211 => 166212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-25 00:17:45 UTC (rev 166211)
+++ trunk/Source/WebCore/ChangeLog 2014-03-25 00:52:46 UTC (rev 166212)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-03-24 Brian Burg <bburg@apple.com>
+
+ Web Replay: capture and replay keyboard events
+ https://bugs.webkit.org/show_bug.cgi?id=130314
+
+ Reviewed by Joseph Pecoraro.
+
+ Upstream support for capturing and replaying non-IME keyboard input.
+ This works similarly to mouse events. It introduces optional fields and
+ macros to encode/decode them.
+
+ Test: ManualTests/inspector/replay-keyboard-events.html
+
+ * replay/ReplayInputDispatchMethods.cpp:
+ (WebCore::HandleKeyPress::dispatch):
+ * replay/SerializationMethods.cpp:
+ (JSC::EncodingTraits<NondeterministicInputBase>::encodeValue):
+ (JSC::EncodingTraits<NondeterministicInputBase>::decodeValue): Switch existing
+ encode/decode calls to use the shortening macros.
+ (JSC::EncodingTraits<KeypressCommand>::encodeValue): Added.
+ (JSC::EncodingTraits<KeypressCommand>::decodeValue): Added.
+ (JSC::PlatformKeyboardEventAppKit::PlatformKeyboardEventAppKit): Subclass
+ PlatformKeyboardEvent so that we can set AppKit-specific members not
+ initialized through the main constructors.
+ (JSC::EncodingTraits<PlatformKeyboardEvent>::encodeValue): Added.
+ (JSC::EncodingTraits<PlatformKeyboardEvent>::decodeValue): Added.
+ * replay/SerializationMethods.h:
+ * replay/UserInputBridge.cpp:
+ (WebCore::UserInputBridge::UserInputBridge): initialize m_state inside a guard.
+ (WebCore::UserInputBridge::handleKeyEvent): fill in the implementation.
+ * replay/WebInputs.json:
+
</ins><span class="cx"> 2014-03-24 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
</span><span class="cx">
</span><span class="cx"> Optimizing string construction for type error in JSNavigatorCustom.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorereplayReplayInputDispatchMethodscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/ReplayInputDispatchMethods.cpp (166211 => 166212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/ReplayInputDispatchMethods.cpp 2014-03-25 00:17:45 UTC (rev 166211)
+++ trunk/Source/WebCore/replay/ReplayInputDispatchMethods.cpp 2014-03-25 00:52:46 UTC (rev 166212)
</span><span class="lines">@@ -53,6 +53,11 @@
</span><span class="cx"> controller.page().mainFrame().navigationScheduler().scheduleLocationChange(m_securityOrigin.get(), m_url, m_referrer, true, true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void HandleKeyPress::dispatch(ReplayController& controller)
+{
+ controller.page().userInputBridge().handleKeyEvent(platformEvent(), InputSource::Synthetic);
+}
+
</ins><span class="cx"> // User interaction inputs.
</span><span class="cx"> void HandleMouseMove::dispatch(ReplayController& controller)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorereplaySerializationMethodscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/SerializationMethods.cpp (166211 => 166212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/SerializationMethods.cpp 2014-03-25 00:17:45 UTC (rev 166211)
+++ trunk/Source/WebCore/replay/SerializationMethods.cpp 2014-03-25 00:52:46 UTC (rev 166212)
</span><span class="lines">@@ -31,14 +31,18 @@
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx">
</span><span class="cx"> #include "AllReplayInputs.h"
</span><ins>+#include "PlatformKeyboardEvent.h"
</ins><span class="cx"> #include "PlatformMouseEvent.h"
</span><span class="cx"> #include "ReplayInputTypes.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "URL.h"
</span><ins>+#include <wtf/text/Base64.h>
</ins><span class="cx">
</span><ins>+using WebCore::KeypressCommand;
</ins><span class="cx"> using WebCore::IntPoint;
</span><span class="cx"> using WebCore::MouseButton;
</span><span class="cx"> using WebCore::PlatformEvent;
</span><ins>+using WebCore::PlatformKeyboardEvent;
</ins><span class="cx"> using WebCore::PlatformMouseEvent;
</span><span class="cx"> using WebCore::SecurityOrigin;
</span><span class="cx"> using WebCore::URL;
</span><span class="lines">@@ -58,14 +62,23 @@
</span><span class="cx"> if (!_encodedValue.get<_type>(ASCIILiteral(#_key), _key)) \
</span><span class="cx"> return false
</span><span class="cx">
</span><ins>+#define ENCODE_OPTIONAL_SCALAR_TYPE_WITH_KEY(_encodedValue, _type, _key, _value, condition) \
+ if (condition) \
+ _encodedValue.put<_type>(ASCIILiteral(#_key), _value)
+
+#define DECODE_OPTIONAL_SCALAR_TYPE_WITH_KEY(_encodedValue, _type, _key) \
+ _type _key; \
+ bool _key ## WasDecoded = _encodedValue.get<_type>(ASCIILiteral(#_key), _key)
+
</ins><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> EncodedValue EncodingTraits<NondeterministicInputBase>::encodeValue(const NondeterministicInputBase& input)
</span><span class="cx"> {
</span><span class="cx"> EncodedValue encodedValue = EncodedValue::createObject();
</span><span class="cx"> const AtomicString& type = input.type();
</span><del>- encodedValue.put<String>(ASCIILiteral("type"), type.string());
</del><span class="cx">
</span><ins>+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, String, type, type.string());
+
</ins><span class="cx"> #define ENCODE_IF_TYPE_TAG_MATCHES(name) \
</span><span class="cx"> if (type == inputTypes().name) { \
</span><span class="cx"> InputTraits<name>::encode(encodedValue, static_cast<const name&>(input)); \
</span><span class="lines">@@ -88,9 +101,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>- String type;
- if (!encodedValue.get<String>(ASCIILiteral("type"), type))
- return false;
</del><ins>+ DECODE_SCALAR_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">@@ -118,6 +129,88 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(APPKIT)
+EncodedValue EncodingTraits<KeypressCommand>::encodeValue(const KeypressCommand& command)
+{
+ EncodedValue encodedValue = EncodedValue::createObject();
+
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, String, commandName, command.commandName);
+ ENCODE_OPTIONAL_SCALAR_TYPE_WITH_KEY(encodedValue, String, text, command.text, !command.text.isEmpty());
+
+ return encodedValue;
+}
+
+bool EncodingTraits<KeypressCommand>::decodeValue(EncodedValue& encodedValue, KeypressCommand& decodedValue)
+{
+ DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, String, commandName);
+ DECODE_OPTIONAL_SCALAR_TYPE_WITH_KEY(encodedValue, String, text);
+
+ decodedValue = textWasDecoded ? KeypressCommand(commandName, text) : KeypressCommand(commandName);
+ return true;
+}
+
+class PlatformKeyboardEventAppKit : public WebCore::PlatformKeyboardEvent {
+public:
+ PlatformKeyboardEventAppKit(const PlatformKeyboardEvent& event, bool handledByInputMethod, Vector<KeypressCommand>& commands)
+ : PlatformKeyboardEvent(event)
+ {
+ m_handledByInputMethod = handledByInputMethod;
+ m_commands = commands;
+ }
+};
+#endif // USE(APPKIT)
+
+EncodedValue EncodingTraits<PlatformKeyboardEvent>::encodeValue(const PlatformKeyboardEvent& input)
+{
+ EncodedValue encodedValue = EncodedValue::createObject();
+
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, double, timestamp, input.timestamp());
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, PlatformEvent::Type, type, input.type());
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, PlatformEvent::Modifiers, modifiers, static_cast<PlatformEvent::Modifiers>(input.modifiers()));
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, String, text, input.text());
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, String, unmodifiedText, input.unmodifiedText());
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, String, keyIdentifier, input.keyIdentifier());
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, int, windowsVirtualKeyCode, input.windowsVirtualKeyCode());
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, int, nativeVirtualKeyCode, input.nativeVirtualKeyCode());
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, int, macCharCode, input.macCharCode());
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, bool, autoRepeat, input.isAutoRepeat());
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, bool, keypad, input.isKeypad());
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, bool, systemKey, input.isSystemKey());
+#if USE(APPKIT)
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, bool, handledByInputMethod, input.handledByInputMethod());
+ ENCODE_SCALAR_TYPE_WITH_KEY(encodedValue, Vector<KeypressCommand>, commands, input.commands());
+#endif
+ return encodedValue;
+}
+
+bool EncodingTraits<PlatformKeyboardEvent>::decodeValue(EncodedValue& encodedValue, std::unique_ptr<PlatformKeyboardEvent>& input)
+{
+ 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);
+#if USE(APPKIT)
+ DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, bool, handledByInputMethod);
+ DECODE_SCALAR_TYPE_WITH_KEY(encodedValue, Vector<KeypressCommand>, commands);
+#endif
+
+ PlatformKeyboardEvent platformEvent = PlatformKeyboardEvent(type, text, unmodifiedText, keyIdentifier, windowsVirtualKeyCode, nativeVirtualKeyCode, macCharCode, autoRepeat, keypad, systemKey, modifiers, timestamp);
+#if USE(APPKIT)
+ input = std::make_unique<PlatformKeyboardEventAppKit>(platformEvent, handledByInputMethod, commands);
+#else
+ input = std::make_unique<PlatformKeyboardEvent>(platformEvent);
+#endif
+ return true;
+}
+
</ins><span class="cx"> EncodedValue EncodingTraits<PlatformMouseEvent>::encodeValue(const PlatformMouseEvent& input)
</span><span class="cx"> {
</span><span class="cx"> EncodedValue encodedValue = EncodedValue::createObject();
</span></span></pre></div>
<a id="trunkSourceWebCorereplaySerializationMethodsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/SerializationMethods.h (166211 => 166212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/SerializationMethods.h 2014-03-25 00:17:45 UTC (rev 166211)
+++ trunk/Source/WebCore/replay/SerializationMethods.h 2014-03-25 00:52:46 UTC (rev 166212)
</span><span class="lines">@@ -32,19 +32,34 @@
</span><span class="cx">
</span><span class="cx"> #include <replay/EncodedValue.h>
</span><span class="cx"> #include <replay/NondeterministicInput.h>
</span><ins>+#include <wtf/Vector.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class Document;
</span><span class="cx"> class Frame;
</span><span class="cx"> class Page;
</span><ins>+class PlatformKeyboardEvent;
</ins><span class="cx"> class PlatformMouseEvent;
</span><span class="cx"> class SecurityOrigin;
</span><span class="cx"> class URL;
</span><ins>+
+#if USE(APPKIT)
+struct KeypressCommand;
+#endif
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> // Template specializations must be defined in the same namespace as the template declaration.
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><ins>+#if USE(APPKIT)
+template<> struct EncodingTraits<WebCore::KeypressCommand> {
+ typedef WebCore::KeypressCommand DecodedType;
+
+ static EncodedValue encodeValue(const WebCore::KeypressCommand& value);
+ static bool decodeValue(EncodedValue&, WebCore::KeypressCommand& value);
+};
+#endif // USE(APPKIT)
+
</ins><span class="cx"> template<> struct EncodingTraits<NondeterministicInputBase> {
</span><span class="cx"> typedef NondeterministicInputBase DecodedType;
</span><span class="cx">
</span><span class="lines">@@ -52,6 +67,13 @@
</span><span class="cx"> static bool decodeValue(EncodedValue&, std::unique_ptr<NondeterministicInputBase>& value);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<> struct EncodingTraits<WebCore::PlatformKeyboardEvent> {
+ typedef WebCore::PlatformKeyboardEvent DecodedType;
+
+ static EncodedValue encodeValue(const WebCore::PlatformKeyboardEvent& value);
+ static bool decodeValue(EncodedValue&, std::unique_ptr<WebCore::PlatformKeyboardEvent>& value);
+};
+
</ins><span class="cx"> template<> struct EncodingTraits<WebCore::PlatformMouseEvent> {
</span><span class="cx"> typedef WebCore::PlatformMouseEvent DecodedType;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorereplayUserInputBridgecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/UserInputBridge.cpp (166211 => 166212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/UserInputBridge.cpp 2014-03-25 00:17:45 UTC (rev 166211)
+++ trunk/Source/WebCore/replay/UserInputBridge.cpp 2014-03-25 00:52:46 UTC (rev 166212)
</span><span class="lines">@@ -55,6 +55,9 @@
</span><span class="cx">
</span><span class="cx"> UserInputBridge::UserInputBridge(Page& page)
</span><span class="cx"> : m_page(page)
</span><ins>+#if ENABLE(WEB_REPLAY)
+ , m_state(UserInputBridge::State::Open)
+#endif
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -136,8 +139,19 @@
</span><span class="cx"> return m_page.mainFrame().eventHandler().passMouseMovedEventToScrollbars(mouseEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool UserInputBridge::handleKeyEvent(const PlatformKeyboardEvent& keyEvent, InputSource)
</del><ins>+bool UserInputBridge::handleKeyEvent(const PlatformKeyboardEvent& keyEvent, InputSource inputSource)
</ins><span class="cx"> {
</span><ins>+#if ENABLE(WEB_REPLAY)
+ EARLY_RETURN_IF_SHOULD_IGNORE_INPUT;
+
+ if (activeCursor().isCapturing()) {
+ std::unique_ptr<PlatformKeyboardEvent> ownedEvent = std::make_unique<PlatformKeyboardEvent>(keyEvent);
+ activeCursor().appendInput<HandleKeyPress>(std::move(ownedEvent));
+ }
+#else
+ UNUSED_PARAM(inputSource);
+#endif
+
</ins><span class="cx"> return m_page.focusController().focusedOrMainFrame().eventHandler().keyEvent(keyEvent);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorereplayWebInputsjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/WebInputs.json (166211 => 166212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/WebInputs.json 2014-03-25 00:17:45 UTC (rev 166211)
+++ trunk/Source/WebCore/replay/WebInputs.json 2014-03-25 00:52:46 UTC (rev 166212)
</span><span class="lines">@@ -55,6 +55,10 @@
</span><span class="cx"> "header": "page/Page.h"
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ "name": "PlatformKeyboardEvent", "mode": "OWNED",
+ "header": "platform/PlatformKeyboardEvent.h"
+ },
+ {
</ins><span class="cx"> "name": "PlatformMouseEvent", "mode": "OWNED",
</span><span class="cx"> "header": "platform/PlatformMouseEvent.h"
</span><span class="cx"> },
</span><span class="lines">@@ -134,6 +138,14 @@
</span><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ "name": "HandleKeyPress",
+ "description": "The embedder signalled a key press event.",
+ "queue": "EVENT_LOOP",
+ "members": [
+ { "name": "platformEvent", "type": "PlatformKeyboardEvent" }
+ ]
+ },
+ {
</ins><span class="cx"> "name": "InitialNavigation",
</span><span class="cx"> "description": "Initiate the initial main frame navigation.",
</span><span class="cx"> "queue": "EVENT_LOOP",
</span></span></pre>
</div>
</div>
</body>
</html>