Changeset 21728 in webkit

Timestamp:

May 24, 2007, 1:57:00 PM (17 years ago)

Author:

oliver

Message:

2007-05-24 Oliver Hunt <​oliver@apple.com>

Reviewed by Adam, Darin, and Geoff.

Fix for <rdar://problem/5000470> REGRESSION: The IM reconvert
function returns incorrect symbol due to inconsistent range
domains in TSM

Text Services Management uses ranges provided by the
NSTextInput API to index into the string return by
-[WebHTMLView string]. As a result some input methods
incorrectly get their candidate text from the beginning
of the document instead of from the input element.

TSM prefers to query -textStorage over -string so as a
workaround we provide an implementation of -textStorage that
returns the content of the current text input. TSM only ever
queries the result of textStorage as an NSAttributedString so
we do not need to implement a fake NSTextStorage class

This should not cause harm to anything else as textStorage is
actually a method on NSTextView, which we clearly are not. TSM
only queries the method because it uses respondsToSelector to
control behaviour.

• WebView/WebHTMLView.mm: (-[WebHTMLView textStorage]):

Location:

trunk/WebKit

Files:

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

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-05-24  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Adam, Darin, and Geoff.
+
+        Fix for <rdar://problem/5000470> REGRESSION: The IM reconvert
+        function returns incorrect symbol due to inconsistent range
+        domains in TSM
+
+        Text Services Management uses ranges provided by the
+        NSTextInput API to index into the string return by
+        -[WebHTMLView string]. As a result some input methods
+        incorrectly get their candidate text from the beginning
+        of the document instead of from the input element.
+
+        TSM prefers to query -textStorage over -string so as a
+        workaround we provide an implementation of -textStorage that
+        returns the content of the current text input.  TSM only ever
+        queries the result of textStorage as an NSAttributedString so
+        we do not need to implement a fake NSTextStorage class
+
+        This should not cause harm to anything else as textStorage is
+        actually a method on NSTextView, which we clearly are not. TSM
+        only queries the method because it uses respondsToSelector to
+        control behaviour.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView textStorage]):
+
+
 2007-05-24  David Harrison  <harrison@apple.com>
 

trunk/WebKit/WebView/WebHTMLView.mm

@@ -5893 +5893 @@
 }
 
+- (NSAttributedString *)textStorage
+{
+    NSAttributedString *result = [self attributedSubstringFromRange:NSMakeRange(0, UINT_MAX)];
+    // We have to return an empty string rather than null to prevent TSM from calling -string
+    return result ? result : [[[NSAttributedString alloc] initWithString:@""] autorelease];
+}
+
 - (NSAttributedString *)_attributeStringFromDOMRange:(DOMRange *)range
 {