Changeset 83697 in webkit

Timestamp:

Apr 12, 2011 9:35:33 PM (13 years ago)

Author:

ap@apple.com

Message:

2011-04-12 Alexey Proskuryakov <​ap@apple.com>

Reviewed by Oliver Hunt.

REGRESSION (WebKit2): Input methods are active in non-editable content
​https://bugs.webkit.org/show_bug.cgi?id=58404
<rdar://problem/9275940>

• UIProcess/API/mac/WKView.mm: (-[WKView insertText:]): Re-add the old variant of this function, because it's not only part of deprecated NSTextInput protocol, but it's also part of NSResponder, and it's called when the input context in nil. (-[WKView inputContext]): Return nil when not in editable content.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-12  Alexey Proskuryakov  <ap@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        REGRESSION (WebKit2): Input methods are active in non-editable content
+        https://bugs.webkit.org/show_bug.cgi?id=58404
+        <rdar://problem/9275940>
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView insertText:]): Re-add the old variant of this function, because it's not only part
+        of deprecated NSTextInput protocol, but it's also part of NSResponder, and it's called when
+        the input context in nil.
+        (-[WKView inputContext]): Return nil when not in editable content.
+
 2011-04-12  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -1071 +1071 @@
 }
 
+- (void)insertText:(id)string
+{
+    // Unlike and NSTextInputClient variant with replacementRange, this NSResponder method is called when there is no input context,
+    // so text input processing isn't performed. We are not going to actually insert any text in that case, but saving an insertText
+    // command ensures that a keypress event is dispatched as appropriate.
+    [self insertText:string replacementRange:NSMakeRange(NSNotFound, 0)];
+}
+
 - (void)insertText:(id)string replacementRange:(NSRange)replacementRange
 {
@@ -1233 +1241 @@
 - (NSTextInputContext *)inputContext
 {
-    if (_data->_pluginComplexTextInputIdentifier && !_data->_interpretKeyEventsParameters)
+    WKViewInterpretKeyEventsParameters* parameters = _data->_interpretKeyEventsParameters;
+
+    if (_data->_pluginComplexTextInputIdentifier && !parameters)
         return [[WKTextInputWindowController sharedTextInputWindowController] inputContext];
+
+    // Disable text input machinery when in non-editable content. An invisible inline input area affects performance, and can prevent Expose from working.
+    if (parameters && !parameters->cachedTextInputState.selectionIsEditable)
+        return nil;
+    if (!_data->_page->selectionState().isContentEditable)
+        return nil;
 
     return [super inputContext];