<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[19958] trunk</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/19958">19958</a></dd>
<dt>Author</dt> <dd>adele</dd>
<dt>Date</dt> <dd>2007-03-04 21:40:16 -0800 (Sun, 04 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>LayoutTests:
Reviewed by Darin.
* fast/events/keydown-keypress-preventDefault-expected.txt: Added.
* fast/events/keydown-keypress-preventDefault.html: Added.
WebCore:
Reviewed by Darin.
Change to dispatch the keypress event during the defaultEventHandler for keydown events. This matches IE behavior.
This is preparation for fixing event dispatch with input methods (http://bugs.webkit.org/show_bug.cgi?id=10871)
Test: fast/events/keydown-keypress-preventDefault.html
* dom/EventTargetNode.cpp: (WebCore::EventTargetNode::defaultEventHandler): Call the defaultKeyboardEventHandler for keydown events.
* page/EventHandler.cpp:
(WebCore::eventTargetNodeForDocument): Return 0 instead of false since the return type in EventTargetNode.
(WebCore::EventHandler::keyEvent): Removed dispatch of keypress event, since this is now done in the default event handler.
(WebCore::EventHandler::defaultKeyboardEventHandler): For keydown events, create and dispatch a keypress event.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoredomEventTargetNodecpp">trunk/WebCore/dom/EventTargetNode.cpp</a></li>
<li><a href="#trunkWebCorepageEventHandlercpp">trunk/WebCore/page/EventHandler.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventskeydownkeypresspreventDefaultexpectedtxt">trunk/LayoutTests/fast/events/keydown-keypress-preventDefault-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventskeydownkeypresspreventDefaulthtml">trunk/LayoutTests/fast/events/keydown-keypress-preventDefault.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (19957 => 19958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2007-03-05 05:34:10 UTC (rev 19957)
+++ trunk/LayoutTests/ChangeLog 2007-03-05 05:40:16 UTC (rev 19958)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2007-03-04 Adele Peterson <adele@apple.com>
+
+ Reviewed by Darin.
+
+ * fast/events/keydown-keypress-preventDefault-expected.txt: Added.
+ * fast/events/keydown-keypress-preventDefault.html: Added.
+
</ins><span class="cx"> 2007-03-02 Anders Carlsson <acarlsson@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Darin.
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventskeydownkeypresspreventDefaultexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/keydown-keypress-preventDefault-expected.txt (0 => 19958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/keydown-keypress-preventDefault-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/keydown-keypress-preventDefault-expected.txt 2007-03-05 05:40:16 UTC (rev 19958)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+This tests that preventing the default behavior for a keydown event will also prevent the keypress event from firing, and the text from being inserted.
+This matches IE behavior, but not Firefox.
+
+key down
+key down
+key down
+key down
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventskeydownkeypresspreventDefaulthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/keydown-keypress-preventDefault.html (0 => 19958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/keydown-keypress-preventDefault.html (rev 0)
+++ trunk/LayoutTests/fast/events/keydown-keypress-preventDefault.html 2007-03-05 05:40:16 UTC (rev 19958)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<html>
+<script>
+ function test() {
+ var tf = document.getElementById('tf');
+ tf.focus();
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ eventSender.keyDown('F');
+ eventSender.keyDown('A');
+ eventSender.keyDown('I');
+ eventSender.keyDown('L');
+ }
+ }
+
+ function log(msg) {
+ var res = document.getElementById('res');
+ res.innerHTML = res.innerHTML + msg + "<br>";
+ }
+</script>
+<body onload="test()">
+ This tests that preventing the default behavior for a keydown event will also prevent the keypress event from firing, and the text from being inserted.<br>
+ This matches IE behavior, but not Firefox.<br>
+ <input id="tf" onkeydown="log('key down'); event.preventDefault();" onkeypress="log('key press')">
+ <br>
+ <div id="res"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (19957 => 19958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-03-05 05:34:10 UTC (rev 19957)
+++ trunk/WebCore/ChangeLog 2007-03-05 05:40:16 UTC (rev 19958)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2007-03-04 Adele Peterson <adele@apple.com>
+
+ Reviewed by Darin.
+
+ Change to dispatch the keypress event during the defaultEventHandler for keydown events. This matches IE behavior.
+ This is preparation for fixing event dispatch with input methods (http://bugs.webkit.org/show_bug.cgi?id=10871)
+
+ Test: fast/events/keydown-keypress-preventDefault.html
+
+ * dom/EventTargetNode.cpp: (WebCore::EventTargetNode::defaultEventHandler): Call the defaultKeyboardEventHandler for keydown events.
+ * page/EventHandler.cpp:
+ (WebCore::eventTargetNodeForDocument): Return 0 instead of false since the return type in EventTargetNode.
+ (WebCore::EventHandler::keyEvent): Removed dispatch of keypress event, since this is now done in the default event handler.
+ (WebCore::EventHandler::defaultKeyboardEventHandler): For keydown events, create and dispatch a keypress event.
+
</ins><span class="cx"> 2007-03-04 Alexey Proskuryakov <ap@webkit.org>
</span><span class="cx">
</span><span class="cx"> Reviewed by Nikolas Zimmermann (yay!).
</span></span></pre></div>
<a id="trunkWebCoredomEventTargetNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/dom/EventTargetNode.cpp (19957 => 19958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/dom/EventTargetNode.cpp 2007-03-05 05:34:10 UTC (rev 19957)
+++ trunk/WebCore/dom/EventTargetNode.cpp 2007-03-05 05:40:16 UTC (rev 19958)
</span><span class="lines">@@ -577,7 +577,7 @@
</span><span class="cx"> if (event->target() != this)
</span><span class="cx"> return;
</span><span class="cx"> const AtomicString& eventType = event->type();
</span><del>- if (eventType == keypressEvent) {
</del><ins>+ if (eventType == keydownEvent || eventType == keypressEvent) {
</ins><span class="cx"> if (event->isKeyboardEvent())
</span><span class="cx"> if (Frame* frame = document()->frame())
</span><span class="cx"> frame->eventHandler()->defaultKeyboardEventHandler(static_cast<KeyboardEvent*>(event));
</span></span></pre></div>
<a id="trunkWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/EventHandler.cpp (19957 => 19958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/EventHandler.cpp 2007-03-05 05:34:10 UTC (rev 19957)
+++ trunk/WebCore/page/EventHandler.cpp 2007-03-05 05:40:16 UTC (rev 19958)
</span><span class="lines">@@ -1243,14 +1243,13 @@
</span><span class="cx"> else
</span><span class="cx"> node = doc->documentElement();
</span><span class="cx"> if (!node)
</span><del>- return false;
</del><ins>+ return 0;
</ins><span class="cx"> }
</span><span class="cx"> return EventTargetNodeCast(node);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool EventHandler::keyEvent(const PlatformKeyboardEvent& keyEvent)
</span><span class="cx"> {
</span><del>- bool result;
</del><span class="cx"> // Check for cases where we are too early for events -- possible unmatched key up
</span><span class="cx"> // from pressing return in the location bar.
</span><span class="cx"> EventTargetNode* node = eventTargetNodeForDocument(m_frame->document());
</span><span class="lines">@@ -1260,31 +1259,37 @@
</span><span class="cx"> if (!keyEvent.isKeyUp())
</span><span class="cx"> m_frame->loader()->resetMultipleFormSubmissionProtection();
</span><span class="cx">
</span><del>- result = !node->dispatchKeyEvent(keyEvent);
-
- // Get the target node again, in case the focus has changed
- // during the keyDown event handler
- node = eventTargetNodeForDocument(m_frame->document());
- if (!node)
- return false;
-
- // We want to send both a down and a press for the initial key event. (This is the behavior of other browsers)
- // To get the rest of WebCore to do this, we send a second KeyPress with "is repeat" set to true,
- // which causes it to send a press to the DOM.
- // We should do this a better way.
- if (!keyEvent.isKeyUp() && !keyEvent.isAutoRepeat()) {
- PlatformKeyboardEvent keyPressedEvent(keyEvent);
- keyPressedEvent.setIsAutoRepeat(true);
- if (!node->dispatchKeyEvent(keyPressedEvent))
- result = true;
- }
-
- return result;
</del><ins>+ return !node->dispatchKeyEvent(keyEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventHandler::defaultKeyboardEventHandler(KeyboardEvent* event)
</span><span class="cx"> {
</span><del>- if (event->type() == keypressEvent) {
</del><ins>+ if (event->type() == keydownEvent) {
+ // Get the target node again, in case the focus has changed
+ if (EventTargetNode* node = eventTargetNodeForDocument(m_frame->document())) {
+ // Create a keypress event from the keydown event
+ RefPtr<KeyboardEvent> keypress;
+ const PlatformKeyboardEvent* keyEvent = event->keyEvent();
+ if (keyEvent) {
+ PlatformKeyboardEvent key = *keyEvent;
+ // Set "is repeat" to true, which will cause this PlatformKeyboardEvent to be interpreted as a keypress event.
+ // We should do this a better way.
+ key.setIsAutoRepeat(true);
+ keypress = new KeyboardEvent(key, event->view());
+ } else {
+ keypress = new KeyboardEvent(keypressEvent, event->bubbles(), event->cancelable(),
+ event->view(), event->keyIdentifier(), event->keyLocation(),
+ event->ctrlKey(), event->altKey(), event->shiftKey(), event->metaKey(), event->altGraphKey());
+ }
+ keypress->setUnderlyingEvent(event);
+
+ // Dispatch the new keypress event
+ ExceptionCode ec;
+ node->dispatchEvent(keypress, ec, true);
+ if (keypress->defaultHandled())
+ event->setDefaultHandled();
+ }
+ } else if (event->type() == keypressEvent) {
</ins><span class="cx"> m_frame->editor()->handleKeyPress(event);
</span><span class="cx"> if (event->defaultHandled())
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>