Changeset 93723 in webkit


Ignore:
Timestamp:
Aug 24, 2011, 1:02:37 PM (14 years ago)
Author:
andersca@apple.com
Message:

Rename -[WKTextInputWindowController keyboardInputSourceChanged] to unmarkText to indicate what the method does
https://bugs.webkit.org/show_bug.cgi?id=66883

Reviewed by Beth Dakin.

  • UIProcess/API/mac/WKTextInputWindowController.h:
  • UIProcess/API/mac/WKTextInputWindowController.mm:

(-[WKTextInputPanel _unmarkText]):
(-[WKTextInputWindowController unmarkText]):

  • UIProcess/API/mac/WKView.mm:

(-[WKView _pluginFocusOrWindowFocusChanged:pluginComplexTextInputIdentifier:]):

Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r93720 r93723  
     12011-08-24  Anders Carlsson  <andersca@apple.com>
     2
     3        Rename -[WKTextInputWindowController keyboardInputSourceChanged] to unmarkText to indicate what the method does
     4        https://bugs.webkit.org/show_bug.cgi?id=66883
     5
     6        Reviewed by Beth Dakin.
     7
     8        * UIProcess/API/mac/WKTextInputWindowController.h:
     9        * UIProcess/API/mac/WKTextInputWindowController.mm:
     10        (-[WKTextInputPanel _unmarkText]):
     11        (-[WKTextInputWindowController unmarkText]):
     12        * UIProcess/API/mac/WKView.mm:
     13        (-[WKView _pluginFocusOrWindowFocusChanged:pluginComplexTextInputIdentifier:]):
     14
    1152011-08-24  Oliver Hunt  <oliver@apple.com>
    216
  • trunk/Source/WebKit2/UIProcess/API/mac/WKTextInputWindowController.h

    r93670 r93723  
    3636
    3737- (NSTextInputContext *)inputContext;
    38 - (BOOL)hasMarkedText;
    3938- (BOOL)interpretKeyEvent:(NSEvent *)event usingLegacyCocoaTextInput:(BOOL)usingLegacyCocoaTextInput string:(NSString **)string;
    4039
    41 - (void)keyboardInputSourceChanged;
     40- (BOOL)hasMarkedText;
     41- (void)unmarkText;
    4242
    4343@end
  • trunk/Source/WebKit2/UIProcess/API/mac/WKTextInputWindowController.mm

    r93670 r93723  
    3434
    3535- (NSTextInputContext *)_inputContext;
     36- (BOOL)_interpretKeyEvent:(NSEvent *)event usingLegacyCocoaTextInput:(BOOL)usingLegacyCocoaTextInput string:(NSString **)string;
     37
    3638- (BOOL)_hasMarkedText;
    37 - (BOOL)_interpretKeyEvent:(NSEvent *)event usingLegacyCocoaTextInput:(BOOL)usingLegacyCocoaTextInput string:(NSString **)string;
     39- (void)_unmarkText;
    3840
    3941@end
     
    7779}
    7880
    79 - (void)_keyboardInputSourceChanged
     81- (void)_unmarkText
    8082{
    8183    [_inputTextView setString:@""];
     
    168170}
    169171
    170 - (void)keyboardInputSourceChanged
     172- (void)unmarkText
    171173{
    172     [_panel _keyboardInputSourceChanged];
     174    [_panel _unmarkText];
    173175}
    174176
  • trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

    r93712 r93723  
    23322332
    23332333    if (inputSourceChanged) {
    2334         // Inform the out of line window that the input source changed.
    2335         [[WKTextInputWindowController sharedTextInputWindowController] keyboardInputSourceChanged];
     2334        // The input source changed, go ahead and discard any entered text.
     2335        [[WKTextInputWindowController sharedTextInputWindowController] unmarkText];
    23362336    }
    23372337
Note: See TracChangeset for help on using the changeset viewer.