Title: [93723] trunk/Source/WebKit2
- Revision
- 93723
- Author
- ander...@apple.com
- Date
- 2011-08-24 13:02:37 -0700 (Wed, 24 Aug 2011)
Log 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:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (93722 => 93723)
--- trunk/Source/WebKit2/ChangeLog 2011-08-24 19:56:41 UTC (rev 93722)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-24 20:02:37 UTC (rev 93723)
@@ -1,3 +1,17 @@
+2011-08-24 Anders Carlsson <ander...@apple.com>
+
+ 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:]):
+
2011-08-24 Oliver Hunt <oli...@apple.com>
JSNPObject and JSNPMethod create their structure in their constructors
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKTextInputWindowController.h (93722 => 93723)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKTextInputWindowController.h 2011-08-24 19:56:41 UTC (rev 93722)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKTextInputWindowController.h 2011-08-24 20:02:37 UTC (rev 93723)
@@ -35,10 +35,10 @@
+ (WKTextInputWindowController *)sharedTextInputWindowController;
- (NSTextInputContext *)inputContext;
-- (BOOL)hasMarkedText;
- (BOOL)interpretKeyEvent:(NSEvent *)event usingLegacyCocoaTextInput:(BOOL)usingLegacyCocoaTextInput string:(NSString **)string;
-- (void)keyboardInputSourceChanged;
+- (BOOL)hasMarkedText;
+- (void)unmarkText;
@end
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKTextInputWindowController.mm (93722 => 93723)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKTextInputWindowController.mm 2011-08-24 19:56:41 UTC (rev 93722)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKTextInputWindowController.mm 2011-08-24 20:02:37 UTC (rev 93723)
@@ -33,9 +33,11 @@
}
- (NSTextInputContext *)_inputContext;
-- (BOOL)_hasMarkedText;
- (BOOL)_interpretKeyEvent:(NSEvent *)event usingLegacyCocoaTextInput:(BOOL)usingLegacyCocoaTextInput string:(NSString **)string;
+- (BOOL)_hasMarkedText;
+- (void)_unmarkText;
+
@end
#define inputWindowHeight 20
@@ -76,7 +78,7 @@
return self;
}
-- (void)_keyboardInputSourceChanged
+- (void)_unmarkText
{
[_inputTextView setString:@""];
[self orderOut:nil];
@@ -167,9 +169,9 @@
return [_panel _interpretKeyEvent:event usingLegacyCocoaTextInput:usingLegacyCocoaTextInput string:string];
}
-- (void)keyboardInputSourceChanged
+- (void)unmarkText
{
- [_panel _keyboardInputSourceChanged];
+ [_panel _unmarkText];
}
@end
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (93722 => 93723)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-08-24 19:56:41 UTC (rev 93722)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-08-24 20:02:37 UTC (rev 93723)
@@ -2331,8 +2331,8 @@
}
if (inputSourceChanged) {
- // Inform the out of line window that the input source changed.
- [[WKTextInputWindowController sharedTextInputWindowController] keyboardInputSourceChanged];
+ // The input source changed, go ahead and discard any entered text.
+ [[WKTextInputWindowController sharedTextInputWindowController] unmarkText];
}
// This will force the current input context to be updated to its correct value.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
