Changeset 93670 in webkit

Timestamp:

Aug 23, 2011 5:29:47 PM (13 years ago)

Author:

andersca@apple.com

Message:

Prepare WKTextInputWindowController for the new text input model
​https://bugs.webkit.org/show_bug.cgi?id=66826

Reviewed by Sam Weinig.

Add -[WKTextInputWindowController hasMarkedText] and make interpretKeyEvent take an
additional usingLegacyCocoaTextInput flag. No functionality change.

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

(-[WKTextInputPanel _interpretKeyEvent:usingLegacyCocoaTextInput:string:]):
(-[WKTextInputPanel _hasMarkedText]):
(-[WKTextInputWindowController hasMarkedText]):
(-[WKTextInputWindowController interpretKeyEvent:usingLegacyCocoaTextInput:string:]):

• UIProcess/API/mac/WKView.mm:

(-[WKView keyDown:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKTextInputWindowController.h (modified) (1 diff)
• UIProcess/API/mac/WKTextInputWindowController.mm (modified) (4 diffs)
• UIProcess/API/mac/WKView.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-08-23  Anders Carlsson  <andersca@apple.com>
+
+        Prepare WKTextInputWindowController for the new text input model
+        https://bugs.webkit.org/show_bug.cgi?id=66826
+
+        Reviewed by Sam Weinig.
+
+        Add -[WKTextInputWindowController hasMarkedText] and make interpretKeyEvent take an
+        additional usingLegacyCocoaTextInput flag. No functionality change.
+
+        * UIProcess/API/mac/WKTextInputWindowController.h:
+        * UIProcess/API/mac/WKTextInputWindowController.mm:
+        (-[WKTextInputPanel _interpretKeyEvent:usingLegacyCocoaTextInput:string:]):
+        (-[WKTextInputPanel _hasMarkedText]):
+        (-[WKTextInputWindowController hasMarkedText]):
+        (-[WKTextInputWindowController interpretKeyEvent:usingLegacyCocoaTextInput:string:]):
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView keyDown:]):
+
 2011-08-23  Gopal Raghavan  <gopal.1.raghavan@nokia.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKTextInputWindowController.h

@@ -36 +36 @@
 
 - (NSTextInputContext *)inputContext;
-- (BOOL)interpretKeyEvent:(NSEvent *)event string:(NSString **)string;
+- (BOOL)hasMarkedText;
+- (BOOL)interpretKeyEvent:(NSEvent *)event usingLegacyCocoaTextInput:(BOOL)usingLegacyCocoaTextInput string:(NSString **)string;
 
 - (void)keyboardInputSourceChanged;

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

@@ -34 +34 @@
 
 - (NSTextInputContext *)_inputContext;
-- (BOOL)_interpretKeyEvent:(NSEvent *)event string:(NSString **)string;
+- (BOOL)_hasMarkedText;
+- (BOOL)_interpretKeyEvent:(NSEvent *)event usingLegacyCocoaTextInput:(BOOL)usingLegacyCocoaTextInput string:(NSString **)string;
 
 @end
@@ -82 +83 @@
 }
 
-- (BOOL)_interpretKeyEvent:(NSEvent *)event string:(NSString **)string
+- (BOOL)_interpretKeyEvent:(NSEvent *)event usingLegacyCocoaTextInput:(BOOL)usingLegacyCocoaTextInput string:(NSString **)string
 {
     BOOL hadMarkedText = [_inputTextView hasMarkedText];
@@ -123 +124 @@
 }
 
+- (BOOL)_hasMarkedText
+{
+    return [_inputTextView hasMarkedText];
+}
+
 @end
 
@@ -152 +158 @@
 }
 
-- (BOOL)interpretKeyEvent:(NSEvent *)event string:(NSString **)string
+- (BOOL)hasMarkedText
 {
-    return [_panel _interpretKeyEvent:event string:string];
+    return [_panel _hasMarkedText];
+}
+
+- (BOOL)interpretKeyEvent:(NSEvent *)event usingLegacyCocoaTextInput:(BOOL)usingLegacyCocoaTextInput string:(NSString **)string
+{
+    return [_panel _interpretKeyEvent:event usingLegacyCocoaTextInput:usingLegacyCocoaTextInput string:string];
 }
 

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

@@ -1253 +1253 @@
         // Try feeding the keyboard event directly to the plug-in.
         NSString *string = nil;
-        if ([[WKTextInputWindowController sharedTextInputWindowController] interpretKeyEvent:theEvent string:&string]) {
+        if ([[WKTextInputWindowController sharedTextInputWindowController] interpretKeyEvent:theEvent usingLegacyCocoaTextInput:NO string:&string]) {
             if (string)
                 _data->_page->sendComplexTextInputToPlugin(_data->_pluginComplexTextInputIdentifier, string);