Changeset 44164 in webkit

Timestamp:

May 26, 2009 4:57:23 PM (15 years ago)

Author:

mitz@apple.com

Message:

Reviewed by Darin Adler.

• fix <rdar://problem/6922371> REGRESSION (r43973): Can't type first character with an umlaut, circumflex, or accent in Mail or in a wiki

• WebView/WebHTMLView.mm: (isTextInput): Moved here. (isInPasswordField): Moved here. (-[WebHTMLView becomeFirstResponder]): Update the exposeInputContext flag and let NSApplication update the input manager with the new input context if necessary. (-[WebHTMLView _updateSelectionForInputManager]): Changed to use the NSApp global instead of +[NSApplication sharedApplication].

Location:

trunk/WebKit/mac

Files:

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

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2009-05-26  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix <rdar://problem/6922371> REGRESSION (r43973): Can't type first
+          character with an umlaut, circumflex, or accent in Mail or in a wiki
+
+        * WebView/WebHTMLView.mm:
+        (isTextInput): Moved here.
+        (isInPasswordField): Moved here.
+        (-[WebHTMLView becomeFirstResponder]): Update the exposeInputContext
+        flag and let NSApplication update the input manager with the new input
+        context if necessary.
+        (-[WebHTMLView _updateSelectionForInputManager]): Changed to use the
+        NSApp global instead of +[NSApplication sharedApplication].
+
 2009-05-26  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKit/mac/WebView/WebHTMLView.mm

@@ -3627 +3627 @@
 }
 
+// Utility function to make sure we don't return anything through the NSTextInput
+// API when an editable region is not currently focused.
+static BOOL isTextInput(Frame* coreFrame)
+{
+    return coreFrame && !coreFrame->selection()->isNone() && coreFrame->selection()->isContentEditable();
+}
+
+static BOOL isInPasswordField(Frame* coreFrame)
+{
+    return coreFrame && coreFrame->selection()->isInPasswordField();
+}
+
 - (BOOL)becomeFirstResponder
 {
@@ -3639 +3651 @@
     if (!frame)
         return YES;
-    
+
+    BOOL exposeInputContext = isTextInput(frame) && !isInPasswordField(frame);
+    if (exposeInputContext != _private->exposeInputContext) {
+        _private->exposeInputContext = exposeInputContext;
+        [NSApp updateWindows];
+    }
+
     frame->editor()->setStartNewKillRingSequence(true);
 
@@ -5484 +5502 @@
 }
 
-// Utility function to make sure we don't return anything through the NSTextInput
-// API when an editable region is not currently focused.
-static BOOL isTextInput(Frame* coreFrame)
-{
-    return coreFrame && !coreFrame->selection()->isNone() && coreFrame->selection()->isContentEditable();
-}
-
-static BOOL isInPasswordField(Frame* coreFrame)
-{
-    return coreFrame && coreFrame->selection()->isInPasswordField();
-}
-
 - (NSTextInputContext *)inputContext
 {
@@ -5856 +5862 @@
         // Let AppKit cache a potentially input context.
         _private->exposeInputContext = exposeInputContext;
-        [[NSApplication sharedApplication] updateWindows];
+        [NSApp updateWindows];
     }