Changeset 23926 in webkit

Timestamp:

Jul 2, 2007 12:42:02 AM (17 years ago)

Author:

oliver

Message:

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:]):

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebHTMLView.mm (modified) (2 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+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:]):
+
 2007-07-01  Oliver Hunt  <oliver@apple.com>
 

trunk/WebKit/WebView/WebHTMLView.mm

@@ -5476 +5476 @@
     // We don't support inserting an attributed string but input methods don't appear to require this.
     NSString *text;
-    if ([string isKindOfClass:[NSAttributedString class]])
+    bool isFromInputMethod = [self hasMarkedText];
+    if ([string isKindOfClass:[NSAttributedString class]]) {
         text = [string string];
-    else
+        // 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
         text = string;
 
@@ -5492 +5502 @@
         // another way to determine if the call is from the input method
         bool shouldSaveCommand = parameters && parameters->shouldSaveCommand;
-        bool isFromInputMethod = [self hasMarkedText];
         if (event && shouldSaveCommand && !isFromInputMethod) {
             KeypressCommand command;