<!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>[210722] branches/safari-603-branch</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/210722">210722</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-12 23:05:11 -0800 (Thu, 12 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210586">r210586</a>. rdar://problem/29861147</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2SharedWebEventh">branches/safari-603-branch/Source/WebKit2/Shared/WebEvent.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2SharedWebKeyboardEventcpp">branches/safari-603-branch/Source/WebKit2/Shared/WebKeyboardEvent.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2SharediosWebIOSEventFactorymm">branches/safari-603-branch/Source/WebKit2/Shared/ios/WebIOSEventFactory.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfasteventsioskeyboardeventkeyattributeexpectedtxt">branches/safari-603-branch/LayoutTests/fast/events/ios/keyboard-event-key-attribute-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfasteventsioskeyboardeventkeyattributehtml">branches/safari-603-branch/LayoutTests/fast/events/ios/keyboard-event-key-attribute.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (210721 => 210722)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-13 07:05:07 UTC (rev 210721)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-13 07:05:11 UTC (rev 210722)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210586. rdar://problem/29861147
+
+ 2017-01-11 Chris Dumez <cdumez@apple.com>
+
+ [iOS][WK2] KeyboardEvent.key always returns an empty string
+ https://bugs.webkit.org/show_bug.cgi?id=166918
+ <rdar://problem/29861147>
+
+ Reviewed by Wenson Hsieh.
+
+ Add layout test coverage.
+
+ * fast/events/ios/keyboard-event-key-attribute-expected.txt: Added.
+ * fast/events/ios/keyboard-event-key-attribute.html: Added.
+
+2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210536. rdar://problem/29939970
</span><span class="cx">
</span><span class="cx"> 2017-01-09 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfasteventsioskeyboardeventkeyattributeexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/events/ios/keyboard-event-key-attribute-expected.txt (0 => 210722)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/events/ios/keyboard-event-key-attribute-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/events/ios/keyboard-event-key-attribute-expected.txt 2017-01-13 07:05:11 UTC (rev 210722)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Tests that KeyboardEvent.key is properly initialized on iOS.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS event.key is "a"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfasteventsioskeyboardeventkeyattributehtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/events/ios/keyboard-event-key-attribute.html (0 => 210722)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/events/ios/keyboard-event-key-attribute.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/events/ios/keyboard-event-key-attribute.html 2017-01-13 07:05:11 UTC (rev 210722)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta name="viewport" content="width=device-width">
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<input id="testInput" type="text">
+<script>
+description("Tests that KeyboardEvent.key is properly initialized on iOS.");
+jsTestIsAsync = true;
+
+function getTypingUIScript(x, y)
+{
+ return `
+ (function() {
+ uiController.didShowKeyboardCallback = function() {
+ uiController.typeCharacterUsingHardwareKeyboard('a', function() {
+ uiController.uiScriptComplete();
+ });
+ };
+ uiController.singleTapAtPoint(${x}, ${y}, function() { });
+ })();`
+}
+
+var testInput = document.getElementById("testInput");
+testInput.onkeydown = function(e) {
+ event = e;
+ shouldBeEqualToString("event.key", "a");
+ finishJSTest();
+};
+
+const x = testInput.offsetLeft + 5;
+const y = testInput.offsetTop + 5;
+testRunner.runUIScript(getTypingUIScript(x, y), function() { });
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210721 => 210722)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-13 07:05:07 UTC (rev 210721)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-13 07:05:11 UTC (rev 210722)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210586. rdar://problem/29861147
+
+ 2017-01-11 Chris Dumez <cdumez@apple.com>
+
+ [iOS][WK2] KeyboardEvent.key always returns an empty string
+ https://bugs.webkit.org/show_bug.cgi?id=166918
+ <rdar://problem/29861147>
+
+ Reviewed by Wenson Hsieh.
+
+ Make sure that KeyboardEvent.key gets properly initialized on iOS / WK2.
+
+ * Shared/WebEvent.h:
+ * Shared/WebKeyboardEvent.cpp:
+ (WebKit::WebKeyboardEvent::WebKeyboardEvent):
+ * Shared/ios/WebIOSEventFactory.mm:
+ (WebIOSEventFactory::createWebKeyboardEvent):
+
+2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210689. rdar://problem/29985957
</span><span class="cx">
</span><span class="cx"> 2017-01-12 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2SharedWebEventh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Shared/WebEvent.h (210721 => 210722)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Shared/WebEvent.h 2017-01-13 07:05:07 UTC (rev 210721)
+++ branches/safari-603-branch/Source/WebKit2/Shared/WebEvent.h 2017-01-13 07:05:11 UTC (rev 210722)
</span><span class="lines">@@ -247,6 +247,8 @@
</span><span class="cx"> WebKeyboardEvent(Type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, int macCharCode, bool handledByInputMethod, const Vector<WebCore::KeypressCommand>&, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers, double timestamp);
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> WebKeyboardEvent(Type, const String& text, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool handledByInputMethod, Vector<String>&& commands, bool isKeypad, Modifiers, double timestamp);
</span><ins>+#elif PLATFORM(IOS)
+ WebKeyboardEvent(Type, const String& text, const String& unmodifiedText, const String& key, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, int macCharCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers, double timestamp);
</ins><span class="cx"> #else
</span><span class="cx"> WebKeyboardEvent(Type, const String& text, const String& unmodifiedText, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, int macCharCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers, double timestamp);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2SharedWebKeyboardEventcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Shared/WebKeyboardEvent.cpp (210721 => 210722)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Shared/WebKeyboardEvent.cpp 2017-01-13 07:05:07 UTC (rev 210721)
+++ branches/safari-603-branch/Source/WebKit2/Shared/WebKeyboardEvent.cpp 2017-01-13 07:05:11 UTC (rev 210722)
</span><span class="lines">@@ -75,6 +75,24 @@
</span><span class="cx"> ASSERT(isKeyboardEventType(type));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#elif PLATFORM(IOS)
+
+WebKeyboardEvent::WebKeyboardEvent(Type type, const String& text, const String& unmodifiedText, const String& key, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, int macCharCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers modifiers, double timestamp)
+ : WebEvent(type, modifiers, timestamp)
+ , m_text(text)
+ , m_unmodifiedText(unmodifiedText)
+ , m_key(key)
+ , m_keyIdentifier(keyIdentifier)
+ , m_windowsVirtualKeyCode(windowsVirtualKeyCode)
+ , m_nativeVirtualKeyCode(nativeVirtualKeyCode)
+ , m_macCharCode(macCharCode)
+ , m_isAutoRepeat(isAutoRepeat)
+ , m_isKeypad(isKeypad)
+ , m_isSystemKey(isSystemKey)
+{
+ ASSERT(isKeyboardEventType(type));
+}
+
</ins><span class="cx"> #else
</span><span class="cx">
</span><span class="cx"> WebKeyboardEvent::WebKeyboardEvent(Type type, const String& text, const String& unmodifiedText, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, int macCharCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers modifiers, double timestamp)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2SharediosWebIOSEventFactorymm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Shared/ios/WebIOSEventFactory.mm (210721 => 210722)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Shared/ios/WebIOSEventFactory.mm 2017-01-13 07:05:07 UTC (rev 210721)
+++ branches/safari-603-branch/Source/WebKit2/Shared/ios/WebIOSEventFactory.mm 2017-01-13 07:05:11 UTC (rev 210722)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> WebKit::WebEvent::Type type = (event.type == WebEventKeyUp) ? WebKit::WebEvent::KeyUp : WebKit::WebEvent::KeyDown;
</span><span class="cx"> String text = event.characters;
</span><span class="cx"> String unmodifiedText = event.charactersIgnoringModifiers;
</span><ins>+ String key = WebCore::keyForKeyEvent(event);
</ins><span class="cx"> String keyIdentifier = WebCore::keyIdentifierForKeyEvent(event);
</span><span class="cx"> int windowsVirtualKeyCode = event.keyCode;
</span><span class="cx"> int nativeVirtualKeyCode = event.keyCode;
</span><span class="lines">@@ -83,7 +84,7 @@
</span><span class="cx"> unmodifiedText = text;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WebKit::WebKeyboardEvent(type, text, unmodifiedText, keyIdentifier, windowsVirtualKeyCode, nativeVirtualKeyCode, macCharCode, autoRepeat, isKeypad, isSystemKey, modifiers, timestamp);
</del><ins>+ return WebKit::WebKeyboardEvent(type, text, unmodifiedText, key, keyIdentifier, windowsVirtualKeyCode, nativeVirtualKeyCode, macCharCode, autoRepeat, isKeypad, isSystemKey, modifiers, timestamp);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>