Changeset 93548 in webkit

Timestamp:

Aug 22, 2011 2:56:22 PM (13 years ago)

Author:

andersca@apple.com

Message:

Update the text input context when the plug-in focus changes and not when the complex text input state changes
​https://bugs.webkit.org/show_bug.cgi?id=66716

Reviewed by Darin Adler.

• UIProcess/API/mac/WKView.mm:

(-[WKView _pluginFocusOrWindowFocusChanged:pluginComplexTextInputIdentifier:]):
(-[WKView _setPluginComplexTextInputState:WebKit::pluginComplexTextInputIdentifier:]):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ -1 @@
-2011-08-21  Michael Saboff  <msaboff@apple.com>
+2011-08-22  Anders Carlsson  <andersca@apple.com>
+
+        Update the text input context when the plug-in focus changes and not when the complex text input state changes
+        https://bugs.webkit.org/show_bug.cgi?id=66716
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _pluginFocusOrWindowFocusChanged:pluginComplexTextInputIdentifier:]):
+        (-[WKView _setPluginComplexTextInputState:WebKit::pluginComplexTextInputIdentifier:]):
+
+2011-08-22  Michael Saboff  <msaboff@apple.com>
 
         REGRESSION (r92231): Apple campus proposal PDF doesn't display in Safari

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

@@ -2288 +2288 @@
 - (void)_pluginFocusOrWindowFocusChanged:(BOOL)pluginHasFocusAndWindowHasFocus pluginComplexTextInputIdentifier:(uint64_t)pluginComplexTextInputIdentifier
 {
-    // FIXME: Implement.
-}
-
-- (void)_setPluginComplexTextInputState:(WebKit::PluginComplexTextInputState)pluginComplexTextInputState pluginComplexTextInputIdentifier:(uint64_t)pluginComplexTextInputIdentifier
-{
     BOOL inputSourceChanged = _data->_pluginComplexTextInputIdentifier;
-    BOOL complexTextInputEnabled = (pluginComplexTextInputState == PluginComplexTextInputEnabledLegacy);
-
-    if (complexTextInputEnabled) {
+
+    if (pluginHasFocusAndWindowHasFocus) {
         // Check if we're already allowing text input for this plug-in.
         if (pluginComplexTextInputIdentifier == _data->_pluginComplexTextInputIdentifier)
@@ -2304 +2298 @@
 
     } else {
-        // Check if we got a request to disable complex text input for a plug-in that is not the current plug-in.
+        // Check if we got a request to unfocus a plug-in that isn't focused.
         if (pluginComplexTextInputIdentifier != _data->_pluginComplexTextInputIdentifier)
             return;
@@ -2318 +2312 @@
     // This will force the current input context to be updated to its correct value.
     [NSApp updateWindows];
+}
+
+- (void)_setPluginComplexTextInputState:(WebKit::PluginComplexTextInputState)pluginComplexTextInputState pluginComplexTextInputIdentifier:(uint64_t)pluginComplexTextInputIdentifier
+{
+    if (pluginComplexTextInputIdentifier != _data->_pluginComplexTextInputIdentifier) {
+        // We're asked to update the state for a plug-in that doesn't have focus.
+        return;
+    }
+
+    // FIXME: Actually update the state here when using the new Cocoa text input model.
 }