Changeset 112415 in webkit

Timestamp:

Mar 28, 2012 11:20:59 AM (12 years ago)

Author:

andersca@apple.com

Message:

REGRESSION (r109826): Can't type into Flash text fields
​https://bugs.webkit.org/show_bug.cgi?id=82488
<rdar://problem/11022004>

Reviewed by Sam Weinig.

This was caused by the fix in r109826. Revert that change and fix the original bug by notifying the UI process
that the plug-in lost focus when it's destroyed. This will correctly reset the text input state (merely setting
the text input state to PluginComplexTextInputDisabled doesn't reset the state correctly).

• UIProcess/API/mac/WKView.mm:

(-[WKView _setPluginComplexTextInputState:]):
(-[WKView _handlePluginComplexTextInputKeyDown:]):

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::~PluginView):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-03-28  Anders Carlsson  <andersca@apple.com>
+
+        REGRESSION (r109826): Can't type into Flash text fields
+        https://bugs.webkit.org/show_bug.cgi?id=82488
+        <rdar://problem/11022004>
+
+        Reviewed by Sam Weinig.
+
+        This was caused by the fix in r109826. Revert that change and fix the original bug by notifying the UI process
+        that the plug-in lost focus when it's destroyed. This will correctly reset the text input state (merely setting 
+        the text input state to PluginComplexTextInputDisabled doesn't reset the state correctly).
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _setPluginComplexTextInputState:]):
+        (-[WKView _handlePluginComplexTextInputKeyDown:]):
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::~PluginView):
+
 2012-03-28  Balazs Kelemen  <kbalazs@webkit.org>
 

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

@@ -386 +386 @@
     // Send back an empty string to the plug-in. This will disable text input.
     _data->_page->sendComplexTextInputToPlugin(_data->_pluginComplexTextInputIdentifier, String());
-    _data->_pluginComplexTextInputIdentifier = 0;   // Always reset the identifier when the plugin is disabled.
 }
 
@@ -1276 +1275 @@
         _data->_page->sendComplexTextInputToPlugin(_data->_pluginComplexTextInputIdentifier, string);
 
-        if (!usingLegacyCocoaTextInput) {
+        if (!usingLegacyCocoaTextInput)
             _data->_pluginComplexTextInputState = PluginComplexTextInputDisabled;
-            _data->_pluginComplexTextInputIdentifier = 0;   // Always reset the identifier when the plugin is disabled.
-        }
     }
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -290 +290 @@
         m_isBeingDestroyed = false;
 #if PLATFORM(MAC)
-        setComplexTextInputState(PluginComplexTextInputDisabled);
+        pluginFocusOrWindowFocusChanged(false);
 #endif
     }