Changeset 205092 in webkit

Timestamp:

Aug 27, 2016, 5:36:05 PM (9 years ago)

Author:

Simon Fraser

Message:

Add more Editing logging
​https://bugs.webkit.org/show_bug.cgi?id=161287

Reviewed by Darin Adler.

Add logging which tracks how key events get from the UI process to the
web process, and down to form fields.

• editing/Editor.cpp:

(WebCore::Editor::handleTextEvent):
(WebCore::Editor::appliedEditing):

• editing/TypingCommand.cpp:

(WebCore::TypingCommand::insertText):
(WebCore::TypingCommand::insertTextAndNotifyAccessibility):

• html/HTMLTextFormControlElement.cpp:

(WebCore::HTMLTextFormControlElement::didEditInnerTextValue):

• page/EventHandler.cpp:

(WebCore::EventHandler::keyEvent):
(WebCore::EventHandler::handleTextInputEvent):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/Editor.cpp (modified) (3 diffs)
• WebCore/editing/TypingCommand.cpp (modified) (3 diffs)
• WebCore/html/HTMLTextFormControlElement.cpp (modified) (2 diffs)
• WebCore/page/EventHandler.cpp (modified) (3 diffs)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-27  Simon Fraser  <simon.fraser@apple.com>
+
+        Add more Editing logging
+        https://bugs.webkit.org/show_bug.cgi?id=161287
+
+        Reviewed by Darin Adler.
+
+        Add logging which tracks how key events get from the UI process to the
+        web process, and down to form fields.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::handleTextEvent):
+        (WebCore::Editor::appliedEditing):
+        * editing/TypingCommand.cpp:
+        (WebCore::TypingCommand::insertText):
+        (WebCore::TypingCommand::insertTextAndNotifyAccessibility):
+        * html/HTMLTextFormControlElement.cpp:
+        (WebCore::HTMLTextFormControlElement::didEditInnerTextValue):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::keyEvent):
+        (WebCore::EventHandler::handleTextInputEvent):
+
 2016-08-27  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -63 +63 @@
 #include "KeyboardEvent.h"
 #include "KillRing.h"
+#include "Logging.h"
 #include "MainFrame.h"
 #include "ModifySelectionListLevel.h"
@@ -198 +199 @@
 bool Editor::handleTextEvent(TextEvent* event)
 {
+    LOG(Editing, "Editor %p handleTextEvent (data %s)", this, event->data().utf8().data());
+
     // Default event handling for Drag and Drop will be handled by DragController
     // so we leave the event for it.
@@ -1034 +1037 @@
 void Editor::appliedEditing(PassRefPtr<CompositeEditCommand> cmd)
 {
+    LOG(Editing, "Editor %p appliedEditing", this);
+
     document().updateLayout();
 

trunk/Source/WebCore/editing/TypingCommand.cpp

@@ -39 +39 @@
 #include "InsertParagraphSeparatorCommand.h"
 #include "InsertTextCommand.h"
+#include "Logging.h"
 #include "MathMLElement.h"
 #include "RenderElement.h"
@@ -167 +168 @@
     RefPtr<Frame> frame = document.frame();
     ASSERT(frame);
+
+    LOG(Editing, "TypingCommand::insertText (text %s)", text.utf8().data());
 
     VisibleSelection currentSelection = frame->selection().selection();
@@ -381 +384 @@
 void TypingCommand::insertTextAndNotifyAccessibility(const String &text, bool selectInsertedText)
 {
+    LOG(Editing, "TypingCommand %p insertTextAndNotifyAccessibility (text %s, selectInsertedText %d)", this, text.utf8().data(), selectInsertedText);
+
     AccessibilityReplacedText replacedText(frame().selection().selection());
     insertText(text, selectInsertedText);

trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp

@@ -39 +39 @@
 #include "HTMLNames.h"
 #include "HTMLParserIdioms.h"
+#include "Logging.h"
 #include "NodeTraversal.h"
 #include "Page.h"
@@ -109 +110 @@
     if (!isTextFormControl())
         return;
+
+    LOG(Editing, "HTMLTextFormControlElement %p didEditInnerTextValue", this);
 
     m_lastChangeWasUserEdit = true;

trunk/Source/WebCore/page/EventHandler.cpp

@@ -64 +64 @@
 #include "InspectorInstrumentation.h"
 #include "KeyboardEvent.h"
+#include "Logging.h"
 #include "MainFrame.h"
 #include "MouseEvent.h"
@@ -3014 +3015 @@
     RefPtr<FrameView> protector(m_frame.view());
 
+    LOG(Editing, "EventHandler %p keyEvent (text %s keyIdentifier %s)", this, initialKeyEvent.text().utf8().data(), initialKeyEvent.keyIdentifier().utf8().data());
+
 #if ENABLE(FULLSCREEN_API)
     if (m_frame.document()->webkitIsFullScreen() && !isKeyEventAllowedInFullScreen(initialKeyEvent))
@@ -3537 +3540 @@
 bool EventHandler::handleTextInputEvent(const String& text, Event* underlyingEvent, TextEventInputType inputType)
 {
+    LOG(Editing, "EventHandler %p handleTextInputEvent (text %s)", this, text.utf8().data());
+
     // Platforms should differentiate real commands like selectAll from text input in disguise (like insertNewline),
     // and avoid dispatching text input events from keydown default handlers.

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1959 +1959 @@
 
     m_process->responsivenessTimer().start();
-    if (m_keyEventQueue.size() == 1) // Otherwise, sent from DidReceiveEvent message handler.
+    if (m_keyEventQueue.size() == 1) { // Otherwise, sent from DidReceiveEvent message handler.
+        LOG(KeyHandling, " UI process: sent keyEvent from handleKeyboardEvent");
         m_process->send(Messages::WebPage::KeyEvent(event), m_pageID);
+    }
 }
 
@@ -4858 +4860 @@
     case WebEvent::RawKeyDown:
     case WebEvent::Char: {
-        LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s", webKeyboardEventTypeString(type));
+        LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s (queue empty %d)", webKeyboardEventTypeString(type), m_keyEventQueue.isEmpty());
 
         MESSAGE_CHECK(!m_keyEventQueue.isEmpty());
@@ -4865 +4867 @@
         MESSAGE_CHECK(type == event.type());
 
-        if (!m_keyEventQueue.isEmpty())
+        if (!m_keyEventQueue.isEmpty()) {
+            LOG(KeyHandling, " UI process: sent keyEvent from didReceiveEvent");
             m_process->send(Messages::WebPage::KeyEvent(m_keyEventQueue.first()), m_pageID);
-        else {
+        } else {
             if (auto* automationSession = process().processPool().automationSession())
                 automationSession->keyboardEventsFlushedForPage(*this);