[webkit-changes] [123515] trunk/Source/WebKit2

Tue, 24 Jul 2012 13:15:59 -0700

Title: [123515] trunk/Source/WebKit2
Revision
123515
Author
[email protected]
Date
2012-07-24 13:15:40 -0700 (Tue, 24 Jul 2012)

Log Message

[Mac WK2] Improve text input logging
https://bugs.webkit.org/show_bug.cgi?id=92147

Reviewed by Andreas Kling.

* UIProcess/API/mac/WKView.mm:
(-[WKView insertText:replacementRange:]):
(-[WKView keyUp:]):
(-[WKView keyDown:]):
(-[WKView flagsChanged:]):
(-[WKView _executeSavedKeypressCommands]):
(-[WKView _notifyInputContextAboutDiscardedComposition]):
(-[WKView _interpretKeyEvent:savingCommandsTo:WebCore::]):
(-[WKView _updateSecureInputState]):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (123514 => 123515)


--- trunk/Source/WebKit2/ChangeLog	2012-07-24 20:11:04 UTC (rev 123514)
+++ trunk/Source/WebKit2/ChangeLog	2012-07-24 20:15:40 UTC (rev 123515)
@@ -1,3 +1,20 @@
+2012-07-24  Alexey Proskuryakov  <[email protected]>
+
+        [Mac WK2] Improve text input logging
+        https://bugs.webkit.org/show_bug.cgi?id=92147
+
+        Reviewed by Andreas Kling.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView insertText:replacementRange:]):
+        (-[WKView keyUp:]):
+        (-[WKView keyDown:]):
+        (-[WKView flagsChanged:]):
+        (-[WKView _executeSavedKeypressCommands]):
+        (-[WKView _notifyInputContextAboutDiscardedComposition]):
+        (-[WKView _interpretKeyEvent:savingCommandsTo:WebCore::]):
+        (-[WKView _updateSecureInputState]):
+
 2012-07-24  Christophe Dumez  <[email protected]>
 
         [EFL][WK2] Provide more useful output when an injected bundle cannot be loaded

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (123514 => 123515)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2012-07-24 20:11:04 UTC (rev 123514)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2012-07-24 20:15:40 UTC (rev 123515)
@@ -1201,6 +1201,7 @@
     // - If it's sent outside of keyboard event processing (e.g. from Character Viewer, or when confirming an inline input area with a mouse),
     // then we also execute it immediately, as there will be no other chance.
     if (parameters && !isFromInputMethod) {
+        // FIXME: Handle replacementRange in this case, too. It's known to occur in practice when canceling Press and Hold (see <rdar://11940670>).
         ASSERT(replacementRange.location == NSNotFound);
         KeypressCommand command("insertText:", text);
         parameters->commands->append(command);
@@ -1272,6 +1273,7 @@
 
 - (void)keyUp:(NSEvent *)theEvent
 {
+    LOG(TextInput, "keyUp:%p %@", theEvent, theEvent);
     _data->_page->handleKeyboardEvent(NativeWebKeyboardEvent(theEvent, self));
 }
 
@@ -1326,13 +1328,17 @@
 
 - (void)keyDown:(NSEvent *)theEvent
 {
+    LOG(TextInput, "keyDown:%p %@%s", theEvent, theEvent, (theEvent == _data->_keyDownEventBeingResent) ? " (re-sent)" : "");
+
     // There's a chance that responding to this event will run a nested event loop, and
     // fetching a new event might release the old one. Retaining and then autoreleasing
     // the current event prevents that from causing a problem inside WebKit or AppKit code.
     [[theEvent retain] autorelease];
 
-    if ([self _tryHandlePluginComplexTextInputKeyDown:theEvent])
+    if ([self _tryHandlePluginComplexTextInputKeyDown:theEvent]) {
+        LOG(TextInput, "...handled by plug-in");
         return;
+    }
 
     // We could be receiving a key down from AppKit if we have re-sent an event
     // that maps to an action that is currently unavailable (for example a copy when
@@ -1347,6 +1353,8 @@
 
 - (void)flagsChanged:(NSEvent *)theEvent
 {
+    LOG(TextInput, "flagsChanged:%p %@", theEvent, theEvent);
+
     // There's a chance that responding to this event will run a nested event loop, and
     // fetching a new event might release the old one. Retaining and then autoreleasing
     // the current event prevents that from causing a problem inside WebKit or AppKit code.
@@ -1372,10 +1380,14 @@
     if (parameters->executingSavedKeypressCommands)
         return;
 
+    LOG(TextInput, "Executing %u saved keypress commands...", parameters->commands->size());
+
     parameters->executingSavedKeypressCommands = true;
     parameters->eventInterpretationHadSideEffects |= _data->_page->executeKeypressCommands(*parameters->commands);
     parameters->commands->clear();
     parameters->executingSavedKeypressCommands = false;
+
+    LOG(TextInput, "...done executing saved keypress commands.");
 }
 
 - (void)_notifyInputContextAboutDiscardedComposition
@@ -1386,6 +1398,7 @@
     if (![[self window] isKeyWindow] || self != [[self window] firstResponder])
         return;
 
+    LOG(TextInput, "-> discardMarkedText");
     [[super inputContext] discardMarkedText]; // Inform the input method that we won't have an inline input area despite having been asked to.
 }
 
@@ -2371,15 +2384,20 @@
     parameters.commands = &commands;
     _data->_interpretKeyEventsParameters = &parameters;
 
+    LOG(TextInput, "-> interpretKeyEvents:%p %@", event, event);
     [self interpretKeyEvents:[NSArray arrayWithObject:event]];
 
     _data->_interpretKeyEventsParameters = 0;
 
     // An input method may consume an event and not tell us (e.g. when displaying a candidate window),
     // in which case we should not bubble the event up the DOM.
-    if (parameters.consumedByIM)
+    if (parameters.consumedByIM) {
+        LOG(TextInput, "...event %p was consumed by an input method", event);
         return YES;
+    }
 
+    LOG(TextInput, "...interpretKeyEvents for event %p done, returns %d", event, parameters.eventInterpretationHadSideEffects);
+
     // If we have already executed all or some of the commands, the event is "handled". Note that there are additional checks on web process side.
     return parameters.eventInterpretationHadSideEffects;
 }
@@ -2827,10 +2845,12 @@
         if (!_data->_inSecureInputState)
             EnableSecureEventInput();
         static NSArray *romanInputSources = [[NSArray alloc] initWithObjects:&NSAllRomanInputSourcesLocaleIdentifier count:1];
+        LOG(TextInput, "-> setAllowedInputSourceLocales:romanInputSources");
         [context setAllowedInputSourceLocales:romanInputSources];
     } else {
         if (_data->_inSecureInputState)
             DisableSecureEventInput();
+        LOG(TextInput, "-> setAllowedInputSourceLocales:nil");
         [context setAllowedInputSourceLocales:nil];
     }
     _data->_inSecureInputState = isInPasswordField;

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to