<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205092] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205092">205092</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-08-27 17:36:05 -0700 (Sat, 27 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTypingCommandcpp">trunk/Source/WebCore/editing/TypingCommand.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementcpp">trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205091 => 205092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-28 00:15:53 UTC (rev 205091)
+++ trunk/Source/WebCore/ChangeLog 2016-08-28 00:36:05 UTC (rev 205092)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+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):
+
</ins><span class="cx"> 2016-08-27 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove more custom JavaScript bindings
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (205091 => 205092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2016-08-28 00:15:53 UTC (rev 205091)
+++ trunk/Source/WebCore/editing/Editor.cpp 2016-08-28 00:36:05 UTC (rev 205092)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> #include "InsertListCommand.h"
</span><span class="cx"> #include "KeyboardEvent.h"
</span><span class="cx"> #include "KillRing.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "ModifySelectionListLevel.h"
</span><span class="cx"> #include "NodeList.h"
</span><span class="lines">@@ -197,6 +198,8 @@
</span><span class="cx">
</span><span class="cx"> bool Editor::handleTextEvent(TextEvent* event)
</span><span class="cx"> {
</span><ins>+ LOG(Editing, "Editor %p handleTextEvent (data %s)", this, event->data().utf8().data());
+
</ins><span class="cx"> // Default event handling for Drag and Drop will be handled by DragController
</span><span class="cx"> // so we leave the event for it.
</span><span class="cx"> if (event->isDrop())
</span><span class="lines">@@ -1033,6 +1036,8 @@
</span><span class="cx">
</span><span class="cx"> void Editor::appliedEditing(PassRefPtr<CompositeEditCommand> cmd)
</span><span class="cx"> {
</span><ins>+ LOG(Editing, "Editor %p appliedEditing", this);
+
</ins><span class="cx"> document().updateLayout();
</span><span class="cx">
</span><span class="cx"> EditCommandComposition* composition = cmd->composition();
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTypingCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TypingCommand.cpp (205091 => 205092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TypingCommand.cpp 2016-08-28 00:15:53 UTC (rev 205091)
+++ trunk/Source/WebCore/editing/TypingCommand.cpp 2016-08-28 00:36:05 UTC (rev 205092)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "InsertLineBreakCommand.h"
</span><span class="cx"> #include "InsertParagraphSeparatorCommand.h"
</span><span class="cx"> #include "InsertTextCommand.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "MathMLElement.h"
</span><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "TextIterator.h"
</span><span class="lines">@@ -167,6 +168,8 @@
</span><span class="cx"> RefPtr<Frame> frame = document.frame();
</span><span class="cx"> ASSERT(frame);
</span><span class="cx">
</span><ins>+ LOG(Editing, "TypingCommand::insertText (text %s)", text.utf8().data());
+
</ins><span class="cx"> VisibleSelection currentSelection = frame->selection().selection();
</span><span class="cx">
</span><span class="cx"> String newText = dispatchBeforeTextInsertedEvent(text, selectionForInsertion, compositionType == TextCompositionUpdate);
</span><span class="lines">@@ -380,6 +383,8 @@
</span><span class="cx">
</span><span class="cx"> void TypingCommand::insertTextAndNotifyAccessibility(const String &text, bool selectInsertedText)
</span><span class="cx"> {
</span><ins>+ LOG(Editing, "TypingCommand %p insertTextAndNotifyAccessibility (text %s, selectInsertedText %d)", this, text.utf8().data(), selectInsertedText);
+
</ins><span class="cx"> AccessibilityReplacedText replacedText(frame().selection().selection());
</span><span class="cx"> insertText(text, selectInsertedText);
</span><span class="cx"> replacedText.postTextStateChangeNotification(document().existingAXObjectCache(), AXTextEditTypeTyping, text, frame().selection().selection());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp (205091 => 205092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2016-08-28 00:15:53 UTC (rev 205091)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2016-08-28 00:36:05 UTC (rev 205092)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "HTMLInputElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "NodeTraversal.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><span class="lines">@@ -109,6 +110,8 @@
</span><span class="cx"> if (!isTextFormControl())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG(Editing, "HTMLTextFormControlElement %p didEditInnerTextValue", this);
+
</ins><span class="cx"> m_lastChangeWasUserEdit = true;
</span><span class="cx"> subtreeHasChanged();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (205091 => 205092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2016-08-28 00:15:53 UTC (rev 205091)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2016-08-28 00:36:05 UTC (rev 205092)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> #include "Image.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "KeyboardEvent.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "MouseEvent.h"
</span><span class="cx"> #include "MouseEventWithHitTestResults.h"
</span><span class="lines">@@ -3013,6 +3014,8 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<FrameView> protector(m_frame.view());
</span><span class="cx">
</span><ins>+ LOG(Editing, "EventHandler %p keyEvent (text %s keyIdentifier %s)", this, initialKeyEvent.text().utf8().data(), initialKeyEvent.keyIdentifier().utf8().data());
+
</ins><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> if (m_frame.document()->webkitIsFullScreen() && !isKeyEventAllowedInFullScreen(initialKeyEvent))
</span><span class="cx"> return false;
</span><span class="lines">@@ -3536,6 +3539,8 @@
</span><span class="cx">
</span><span class="cx"> bool EventHandler::handleTextInputEvent(const String& text, Event* underlyingEvent, TextEventInputType inputType)
</span><span class="cx"> {
</span><ins>+ LOG(Editing, "EventHandler %p handleTextInputEvent (text %s)", this, text.utf8().data());
+
</ins><span class="cx"> // Platforms should differentiate real commands like selectAll from text input in disguise (like insertNewline),
</span><span class="cx"> // and avoid dispatching text input events from keydown default handlers.
</span><span class="cx"> ASSERT(!is<KeyboardEvent>(underlyingEvent) || downcast<KeyboardEvent>(*underlyingEvent).type() == eventNames().keypressEvent);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (205091 => 205092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-08-28 00:15:53 UTC (rev 205091)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-08-28 00:36:05 UTC (rev 205092)
</span><span class="lines">@@ -1958,8 +1958,10 @@
</span><span class="cx"> m_keyEventQueue.append(event);
</span><span class="cx">
</span><span class="cx"> m_process->responsivenessTimer().start();
</span><del>- if (m_keyEventQueue.size() == 1) // Otherwise, sent from DidReceiveEvent message handler.
</del><ins>+ if (m_keyEventQueue.size() == 1) { // Otherwise, sent from DidReceiveEvent message handler.
+ LOG(KeyHandling, " UI process: sent keyEvent from handleKeyboardEvent");
</ins><span class="cx"> m_process->send(Messages::WebPage::KeyEvent(event), m_pageID);
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPreferencesStore WebPageProxy::preferencesStore() const
</span><span class="lines">@@ -4857,7 +4859,7 @@
</span><span class="cx"> case WebEvent::KeyUp:
</span><span class="cx"> case WebEvent::RawKeyDown:
</span><span class="cx"> case WebEvent::Char: {
</span><del>- LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s", webKeyboardEventTypeString(type));
</del><ins>+ LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s (queue empty %d)", webKeyboardEventTypeString(type), m_keyEventQueue.isEmpty());
</ins><span class="cx">
</span><span class="cx"> MESSAGE_CHECK(!m_keyEventQueue.isEmpty());
</span><span class="cx"> NativeWebKeyboardEvent event = m_keyEventQueue.takeFirst();
</span><span class="lines">@@ -4864,9 +4866,10 @@
</span><span class="cx">
</span><span class="cx"> MESSAGE_CHECK(type == event.type());
</span><span class="cx">
</span><del>- if (!m_keyEventQueue.isEmpty())
</del><ins>+ if (!m_keyEventQueue.isEmpty()) {
+ LOG(KeyHandling, " UI process: sent keyEvent from didReceiveEvent");
</ins><span class="cx"> m_process->send(Messages::WebPage::KeyEvent(m_keyEventQueue.first()), m_pageID);
</span><del>- else {
</del><ins>+ } else {
</ins><span class="cx"> if (auto* automationSession = process().processPool().automationSession())
</span><span class="cx"> automationSession->keyboardEventsFlushedForPage(*this);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>