<!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>[23924] trunk/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/23924">23924</a></dd>
<dt>Author</dt> <dd>oliver</dd>
<dt>Date</dt> <dd>2007-07-01 22:18:19 -0700 (Sun, 01 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Reviewed by Alexey.
Fix for <rdar://problem/5306210> Some events are still passed to WebCore despite being handled by the IM
http://bugs.webkit.org/show_bug.cgi?id=14457
We have to assume that the IM will consume all events, so we remove the dependency
on -[WebHTMLView hasMarkedText].
* WebView/WebHTMLView.mm:
(-[WebHTMLView _interceptEditingKeyEvent:shouldSaveCommand:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitChangeLog">trunk/WebKit/ChangeLog</a></li>
<li><a href="#trunkWebKitWebViewWebHTMLViewmm">trunk/WebKit/WebView/WebHTMLView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/ChangeLog (23923 => 23924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/ChangeLog 2007-07-02 04:13:07 UTC (rev 23923)
+++ trunk/WebKit/ChangeLog 2007-07-02 05:18:19 UTC (rev 23924)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2007-07-01 Oliver Hunt <oliver@apple.com>
+
+ Reviewed by Alexey.
+
+ Fix for <rdar://problem/5306210> Some events are still passed to WebCore despite being handled by the IM
+ http://bugs.webkit.org/show_bug.cgi?id=14457
+
+ We have to assume that the IM will consume all events, so we remove the dependency
+ on -[WebHTMLView hasMarkedText].
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _interceptEditingKeyEvent:shouldSaveCommand:]):
+
</ins><span class="cx"> 2007-06-29 John Sullivan <sullivan@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Oliver Hunt.
</span></span></pre></div>
<a id="trunkWebKitWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/WebView/WebHTMLView.mm (23923 => 23924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/WebView/WebHTMLView.mm 2007-07-02 04:13:07 UTC (rev 23923)
+++ trunk/WebKit/WebView/WebHTMLView.mm 2007-07-02 05:18:19 UTC (rev 23924)
</span><span class="lines">@@ -5136,9 +5136,10 @@
</span><span class="cx"> WebHTMLViewInterpretKeyEventsParameters parameters;
</span><span class="cx"> parameters.eventWasHandled = false;
</span><span class="cx"> parameters.shouldSaveCommand = shouldSave;
</span><del>- // If we're performing input composition assume that the IM has consumed the event,
- // and only change this assumption in one of the NSTextInput/Responder callbacks is used.
- parameters.consumedByIM = [self hasMarkedText];
</del><ins>+ // If we're intercepting the initial IM call we assume that the IM has consumed the event,
+ // and only change this assumption if one of the NSTextInput/Responder callbacks is used.
+ // We assume the IM will *not* consume hotkey sequences
+ parameters.consumedByIM = !event->metaKey() && shouldSave;
</ins><span class="cx">
</span><span class="cx"> if (const PlatformKeyboardEvent* platformEvent = event->keyEvent()) {
</span><span class="cx"> NSEvent *macEvent = platformEvent->macEvent();
</span></span></pre>
</div>
</div>
</body>
</html>