<!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>[23926] trunk/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/23926">23926</a></dd>
<dt>Author</dt> <dd>oliver</dd>
<dt>Date</dt> <dd>2007-07-02 00:42:02 -0700 (Mon, 02 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Reviewed by Justin.
Fix for
<rdar://problem/5290113> WebKit does not correctly handle replacement ranges from the IM in -[WebHTMLView insertText:]
http://bugs.webkit.org/show_bug.cgi?id=13664
We replicate the logic of -[WebHTMLView setMarkedText:selectedRange:] to handle the Input Method
feeding us a replacement string through insertText: so we can handle IMs that use insertText to
replace text.
* WebView/WebHTMLView.mm:
(-[WebHTMLView insertText:]):</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 (23925 => 23926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/ChangeLog 2007-07-02 05:48:00 UTC (rev 23925)
+++ trunk/WebKit/ChangeLog 2007-07-02 07:42:02 UTC (rev 23926)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2007-07-02 Oliver Hunt <oliver@apple.com>
+
+ Reviewed by Justin.
+
+ Fix for
+ <rdar://problem/5290113> WebKit does not correctly handle replacement ranges from the IM in -[WebHTMLView insertText:]
+ http://bugs.webkit.org/show_bug.cgi?id=13664
+
+ We replicate the logic of -[WebHTMLView setMarkedText:selectedRange:] to handle the Input Method
+ feeding us a replacement string through insertText: so we can handle IMs that use insertText to
+ replace text.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView insertText:]):
+
</ins><span class="cx"> 2007-07-01 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Alexey.
</span></span></pre></div>
<a id="trunkWebKitWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/WebView/WebHTMLView.mm (23925 => 23926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/WebView/WebHTMLView.mm 2007-07-02 05:48:00 UTC (rev 23925)
+++ trunk/WebKit/WebView/WebHTMLView.mm 2007-07-02 07:42:02 UTC (rev 23926)
</span><span class="lines">@@ -5475,9 +5475,19 @@
</span><span class="cx">
</span><span class="cx"> // We don't support inserting an attributed string but input methods don't appear to require this.
</span><span class="cx"> NSString *text;
</span><del>- if ([string isKindOfClass:[NSAttributedString class]])
</del><ins>+ bool isFromInputMethod = [self hasMarkedText];
+ if ([string isKindOfClass:[NSAttributedString class]]) {
</ins><span class="cx"> text = [string string];
</span><del>- else
</del><ins>+ // We deal with the NSTextInputReplacementRangeAttributeName attribute from NSAttributedString here
+ // simply because it is used by at least one Input Method -- it corresonds to the kEventParamTextInputSendReplaceRange
+ // event in TSM. This behaviour matches that of -[WebHTMLView setMarkedText:selectedRange:] when it receives an
+ // NSAttributedString
+ NSString *rangeString = [string attribute:NSTextInputReplacementRangeAttributeName atIndex:0 longestEffectiveRange:NULL inRange:NSMakeRange(0, [text length])];
+ if (rangeString) {
+ [[self _bridge] selectNSRange:NSRangeFromString(rangeString)];
+ isFromInputMethod = YES;
+ }
+ } else
</ins><span class="cx"> text = string;
</span><span class="cx">
</span><span class="cx"> bool eventHandled = false;
</span><span class="lines">@@ -5491,7 +5501,6 @@
</span><span class="cx"> // FIXME: In theory, this could be wrong for some input methods, so we should try to find
</span><span class="cx"> // another way to determine if the call is from the input method
</span><span class="cx"> bool shouldSaveCommand = parameters && parameters->shouldSaveCommand;
</span><del>- bool isFromInputMethod = [self hasMarkedText];
</del><span class="cx"> if (event && shouldSaveCommand && !isFromInputMethod) {
</span><span class="cx"> KeypressCommand command;
</span><span class="cx"> command.text = text;
</span></span></pre>
</div>
</div>
</body>
</html>