Changeset 109826 in webkit


Ignore:
Timestamp:
Mar 5, 2012 5:35:47 PM (12 years ago)
Author:
enrica@apple.com
Message:

Can't type on some websites (plug-ins steal key events).
<rdar://problem/10892291>

When the plugin is disabled, it is necessary to reset _pluginComplexTextInputIdentifier
in order to return the correct input context. Failure to do so results in the inputContext
method to return the plugin input context instead of the context of the browser view.

Reviewed by Sam Weinig.

  • UIProcess/API/mac/WKView.mm:

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

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r109812 r109826  
     12012-03-05  Enrica Casucci  <enrica@apple.com>
     2
     3        Can't type on some websites (plug-ins steal key events).
     4        <rdar://problem/10892291>
     5
     6        When the plugin is disabled, it is necessary to reset _pluginComplexTextInputIdentifier
     7        in order to return the correct input context. Failure to do so results in the inputContext
     8        method to return the plugin input context instead of the context of the browser view.
     9       
     10        Reviewed by Sam Weinig.
     11
     12        * UIProcess/API/mac/WKView.mm:
     13        (-[WKView _setPluginComplexTextInputState:]):
     14        (-[WKView _handlePluginComplexTextInputKeyDown:]):
     15
    1162012-03-05  Anders Carlsson  <andersca@apple.com>
    217
  • trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

    r109804 r109826  
    375375    // Send back an empty string to the plug-in. This will disable text input.
    376376    _data->_page->sendComplexTextInputToPlugin(_data->_pluginComplexTextInputIdentifier, String());
     377    _data->_pluginComplexTextInputIdentifier = 0;   // Always reset the identifier when the plugin is disabled.
    377378}
    378379
     
    12641265        _data->_page->sendComplexTextInputToPlugin(_data->_pluginComplexTextInputIdentifier, string);
    12651266
    1266         if (!usingLegacyCocoaTextInput)
     1267        if (!usingLegacyCocoaTextInput) {
    12671268            _data->_pluginComplexTextInputState = PluginComplexTextInputDisabled;
     1269            _data->_pluginComplexTextInputIdentifier = 0;   // Always reset the identifier when the plugin is disabled.
     1270        }
    12681271    }
    12691272
Note: See TracChangeset for help on using the changeset viewer.