Title: [93548] trunk/Source/WebKit2
- Revision
- 93548
- Author
- [email protected]
- Date
- 2011-08-22 14:56:22 -0700 (Mon, 22 Aug 2011)
Log 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:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (93547 => 93548)
--- trunk/Source/WebKit2/ChangeLog 2011-08-22 21:49:06 UTC (rev 93547)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-22 21:56:22 UTC (rev 93548)
@@ -1,5 +1,16 @@
-2011-08-21 Michael Saboff <[email protected]>
+2011-08-22 Anders Carlsson <[email protected]>
+ 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 <[email protected]>
+
REGRESSION (r92231): Apple campus proposal PDF doesn't display in Safari
https://bugs.webkit.org/show_bug.cgi?id=66464
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (93547 => 93548)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-08-22 21:49:06 UTC (rev 93547)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-08-22 21:56:22 UTC (rev 93548)
@@ -2287,15 +2287,9 @@
- (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)
return;
@@ -2303,7 +2297,7 @@
_data->_pluginComplexTextInputIdentifier = pluginComplexTextInputIdentifier;
} 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;
@@ -2319,6 +2313,16 @@
[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.
+}
+
- (void)_setPageHasCustomRepresentation:(BOOL)pageHasCustomRepresentation
{
_data->_pdfViewController = nullptr;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
